diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index ed94643dbe36..ad29d17a6394 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -24,6 +24,13 @@ /tools/docker/ @Fira /Dockerfile @Fira +# Forest2001 + +/code/game/machinery/ARES @realforest2001 +/tgui/packages/tgui/interfaces/AresAdmin.jsx @realforest2001 +/tgui/packages/tgui/interfaces/AresInterface.jsx @realforest2001 +/tgui/packages/tgui/interfaces/WorkingJoe.jsx @realforest2001 + # Nanu /maps @Nanu308 diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml index e76e224522a0..716686b51433 100644 --- a/.github/workflows/ci_suite.yml +++ b/.github/workflows/ci_suite.yml @@ -6,21 +6,23 @@ on: merge_group: jobs: run_linters: - if: "!contains(github.event.head_commit.message, '[ci skip]')" + if: ( !contains(github.event.head_commit.message, '[ci skip]') ) name: Run Linters runs-on: ubuntu-latest concurrency: group: run_linters-${{ github.head_ref || github.run_id }} cancel-in-progress: true steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 + with: + fetch-depth: 0 - name: Restore SpacemanDMM cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/SpacemanDMM key: ${{ runner.os }}-spacemandmm-${{ secrets.CACHE_PURGE_KEY }} - name: Restore Yarn cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: tgui/.yarn/cache key: ${{ runner.os }}-yarn-${{ secrets.CACHE_PURGE_KEY }}-${{ hashFiles('tgui/yarn.lock') }} @@ -28,7 +30,7 @@ jobs: ${{ runner.os }}-build- ${{ runner.os }}- - name: Restore Rust cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.cargo key: ${{ runner.os }}-rust @@ -75,7 +77,7 @@ jobs: - run: ./DMCompiler_linux-x64/DMCompiler --suppress-unimplemented colonialmarines.dme compile_all_maps: - if: "!contains(github.event.head_commit.message, '[ci skip]')" + if: ( !contains(github.event.head_commit.message, '[ci skip]') ) name: Compile Maps runs-on: ubuntu-latest steps: @@ -92,7 +94,7 @@ jobs: tools/build/build --ci dm -DCIBUILDING -DCITESTING -DALL_MAPS find_all_maps: - if: "!contains(github.event.head_commit.message, '[ci skip]')" + if: ( !contains(github.event.head_commit.message, '[ci skip]') ) name: Find Maps to Test runs-on: ubuntu-latest outputs: @@ -117,7 +119,7 @@ jobs: ALTERNATE_TESTS_JSON=$(jq -nRc '[inputs | capture("^(?[0-9]+)\\.(?[0-9]+): (?.+)$")]' .github/alternate_byond_versions.txt) echo "alternate_tests=$ALTERNATE_TESTS_JSON" >> $GITHUB_OUTPUT run_all_tests: - if: "!contains(github.event.head_commit.message, '[ci skip]')" + if: ( !contains(github.event.head_commit.message, '[ci skip]') ) name: Unit Tests needs: [find_all_maps] strategy: @@ -132,7 +134,7 @@ jobs: map: ${{ matrix.map }} run_alternate_tests: - if: "!contains(github.event.head_commit.message, '[ci skip]') && needs.find_all_maps.outputs.alternate_tests != '[]'" + if: ( !contains(github.event.head_commit.message, '[ci skip]') && needs.find_all_maps.outputs.alternate_tests != '[]' ) name: Alternate Tests needs: [find_all_maps] strategy: @@ -149,7 +151,7 @@ jobs: minor: ${{ matrix.setup.minor }} check_alternate_tests: - if: "!contains(github.event.head_commit.message, '[ci skip]') && needs.find_all_maps.outputs.alternate_tests != '[]'" + if: ( !contains(github.event.head_commit.message, '[ci skip]') && needs.find_all_maps.outputs.alternate_tests != '[]' ) name: Check Alternate Tests needs: [run_alternate_tests] runs-on: ubuntu-latest @@ -157,7 +159,7 @@ jobs: - run: echo Alternate tests passed. test_windows: - if: "!contains(github.event.head_commit.message, '[ci skip]')" + if: ( !contains(github.event.head_commit.message, '[ci skip]') ) name: Windows Build runs-on: windows-latest concurrency: diff --git a/.github/workflows/generate_documentation.yml b/.github/workflows/generate_documentation.yml index c2898dfa9c57..7c178d1ac93b 100644 --- a/.github/workflows/generate_documentation.yml +++ b/.github/workflows/generate_documentation.yml @@ -5,7 +5,7 @@ on: - master jobs: generate_documentation: - if: "!contains(github.event.head_commit.message, '[ci skip]')" + if: ( !contains(github.event.head_commit.message, '[ci skip]') ) runs-on: ubuntu-latest concurrency: gen-docs steps: diff --git a/code/__DEFINES/__game.dm b/code/__DEFINES/__game.dm index e95ea026d749..f84b3d316d3c 100644 --- a/code/__DEFINES/__game.dm +++ b/code/__DEFINES/__game.dm @@ -187,6 +187,7 @@ #define DOCK_ATTEMPT_TIMEOUT 20 SECONDS #define DROPSHIP_WARMUP_TIME 10 SECONDS #define DROPSHIP_DROP_MSG_DELAY 30 SECONDS +#define DROPSHIP_DROP_FIRE_DELAY 20 SECONDS #define DROPSHIP_TRANSIT_DURATION 100 SECONDS #define DROPSHIP_CORSAT_DURATION 30 SECONDS #define ELEVATOR_TRANSIT_DURATION 5 SECONDS diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index 71b2b6f4b6ac..d9d62010e7b5 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -147,10 +147,12 @@ most of them are tied into map-placed objects. This should be reworked in the fu // Yautja Access Levels /// Requires a visible ID chip to open #define ACCESS_YAUTJA_SECURE 390 +/// Elites+ only +#define ACCESS_YAUTJA_ELITE 391 /// Elders+ only -#define ACCESS_YAUTJA_ELDER 391 +#define ACCESS_YAUTJA_ELDER 392 /// Ancients only -#define ACCESS_YAUTJA_ANCIENT 392 +#define ACCESS_YAUTJA_ANCIENT 393 /// Anything in a tutorial sequence that shouldn't be accessed #define ACCESS_TUTORIAL_LOCKED 998 diff --git a/code/__DEFINES/camera.dm b/code/__DEFINES/camera.dm index ea578874136d..758cafa6ceab 100644 --- a/code/__DEFINES/camera.dm +++ b/code/__DEFINES/camera.dm @@ -7,6 +7,8 @@ #define CAMERA_NET_ALAMO "Alamo" #define CAMERA_NET_NORMANDY "Normandy" #define CAMERA_NET_SAIPAN "Saipan" +#define CAMERA_NET_MORANA "Morana" +#define CAMERA_NET_DEVANA "Devana" #define CAMERA_NET_COLONY "Colony" #define CAMERA_NET_ARES "ARES" diff --git a/code/__DEFINES/client_prefs.dm b/code/__DEFINES/client_prefs.dm index 20d5177dbaea..440044424a53 100644 --- a/code/__DEFINES/client_prefs.dm +++ b/code/__DEFINES/client_prefs.dm @@ -36,6 +36,7 @@ #define TOGGLE_LATE_JOIN_CURRENT_SLOT (1<<17) //Whether joining during the round ignores assigned character slot for the job and uses currently selected slot. #define TOGGLE_ABILITY_DEACTIVATION_OFF (1<<18) // This toggles whether selecting the same ability again can toggle it off #define TOGGLE_AMMO_DISPLAY_TYPE (1<<19)/// limit how often the ammo is displayed when using semi-automatic fire +#define TOGGLE_AUTO_SHOVE_OFF (1<<20) /// Toggles between automatically shoving xenomorphs in the way as Queen. #define JOB_SLOT_RANDOMISED_SLOT -1 #define JOB_SLOT_CURRENT_SLOT 0 diff --git a/code/__DEFINES/cooldowns.dm b/code/__DEFINES/cooldowns.dm index 9368caf3c6e3..a90dd27b8baf 100644 --- a/code/__DEFINES/cooldowns.dm +++ b/code/__DEFINES/cooldowns.dm @@ -5,6 +5,8 @@ #define COOLDOWN_ITEM_HOOD_SOUND "item_hood_sound" #define COOLDOWN_LIGHT "cooldown_light" +#define COOLDOWN_PRINTER_ERROR "cooldown_printer_error" + //Define for ship alt #define COOLDOWN_ALTITUDE_CHANGE "altitude_change" diff --git a/code/__DEFINES/dcs/signals/atom/mob/living/signals_xeno.dm b/code/__DEFINES/dcs/signals/atom/mob/living/signals_xeno.dm index e76768a82b46..4e044735793c 100644 --- a/code/__DEFINES/dcs/signals/atom/mob/living/signals_xeno.dm +++ b/code/__DEFINES/dcs/signals/atom/mob/living/signals_xeno.dm @@ -85,3 +85,13 @@ /// used in /datum/component/status_effect/cleanse() #define COMSIG_XENO_DEBUFF_CLEANSE "xeno_debuff_cleanse" + +/// From /mob/living/carbon/xenomorph/verb/Deevolve() +#define COMSIG_XENO_DEEVOLVE "xeno_deevolve" + +/// From /mob/living/carbon/xenomorph/proc/do_evolve(): (castepick) +#define COMSIG_XENO_TRY_EVOLVE "xeno_try_evolve" + #define COMPONENT_OVERRIDE_EVOLVE (1<<0) + +/// From /mob/living/carbon/xenomorph/proc/do_evolve() +#define COMSIG_XENO_EVOLVE_TO_NEW_CASTE "xeno_evolve_to_new_caste" diff --git a/code/__DEFINES/dcs/signals/atom/signals_area.dm b/code/__DEFINES/dcs/signals/atom/signals_area.dm new file mode 100644 index 000000000000..609b9e69e660 --- /dev/null +++ b/code/__DEFINES/dcs/signals/atom/signals_area.dm @@ -0,0 +1,2 @@ +/// From /area/proc/purge_weeds() +#define COMSIG_AREA_RESIN_DISALLOWED "area_weeds_disallowed" diff --git a/code/__DEFINES/equipment.dm b/code/__DEFINES/equipment.dm index bf7d10a6b96f..6f10e79ac061 100644 --- a/code/__DEFINES/equipment.dm +++ b/code/__DEFINES/equipment.dm @@ -178,7 +178,9 @@ /// 2 tiles of full and 2 of partial impairment #define VISION_IMPAIR_STRONG 5 /// 3 tiles of full and 2 of partial impairment (original one) -#define VISION_IMPAIR_MAX 6 +#define VISION_IMPAIR_ULTRA 6 +/// Full blindness, 1 tile visibility +#define VISION_IMPAIR_MAX 7 //VISION IMPAIRMENT LEVELS=========================================================================== @@ -467,6 +469,8 @@ GLOBAL_LIST_INIT(slot_to_contained_sprite_shorthand, list( #define ACCESSORY_SLOT_DECOR "Decor" #define ACCESSORY_SLOT_MEDAL "Medal" #define ACCESSORY_SLOT_PONCHO "Ponchos" +#define ACCESSORY_SLOT_TROPHY "Trophy" +#define ACCESSORY_SLOT_MASK "Mask" /// Used for uniform armor inserts. #define ACCESSORY_SLOT_ARMOR_C "Chest armor" @@ -526,19 +530,32 @@ GLOBAL_LIST_INIT(uniform_categories, list( // Storage flags -#define STORAGE_ALLOW_EMPTY (1<<0) // Whether the storage object has the 'empty' verb, which dumps all the contents on the floor -#define STORAGE_QUICK_EMPTY (1<<1) // Whether the storage object can quickly be emptied (no delay) -#define STORAGE_QUICK_GATHER (1<<2) // Whether the storage object can quickly collect all items from a tile via the 'toggle mode' verb -#define STORAGE_ALLOW_DRAWING_METHOD_TOGGLE (1<<3) // Whether this storage object can have its items drawn (pouches) -#define STORAGE_USING_DRAWING_METHOD (1<<4) // Whether this storage object has its items drawn (versus just opening it) -#define STORAGE_USING_FIFO_DRAWING (1<<5) // Wether the storage object can have items in it's leftmost slot be drawn -#define STORAGE_CLICK_EMPTY (1<<6) // Whether you can click to empty an item -#define STORAGE_CLICK_GATHER (1<<7) // Whether it is possible to use this storage object in an inverse way, - // so you can have the item in your hand and click items on the floor to pick them up -#define STORAGE_SHOW_FULLNESS (1<<8) // Whether our storage object on hud changes color when full -#define STORAGE_CONTENT_NUM_DISPLAY (1<<9) // Whether the storage object groups contents of the same type and displays them as a number. Only works for slot-based storage objects. -#define STORAGE_GATHER_SIMULTAENOUSLY (1<<10) // Whether the storage object can pick up all the items in a tile -#define STORAGE_ALLOW_QUICKDRAW (1<<11) // Whether the storage can be drawn with E or Holster verb +/// Whether the storage object has the 'empty' verb, which dumps all the contents on the floor +#define STORAGE_ALLOW_EMPTY (1<<0) +/// Whether the storage object can quickly be emptied (no delay) +#define STORAGE_QUICK_EMPTY (1<<1) +/// Whether the storage object can quickly collect all items from a tile via the 'toggle mode' verb +#define STORAGE_QUICK_GATHER (1<<2) +/// Whether this storage object can have its items drawn (pouches) +#define STORAGE_ALLOW_DRAWING_METHOD_TOGGLE (1<<3) +/// Whether this storage object has its items drawn (versus just opening it) +#define STORAGE_USING_DRAWING_METHOD (1<<4) +/// Wether the storage object can have items in it's leftmost slot be drawn +#define STORAGE_USING_FIFO_DRAWING (1<<5) +/// Whether you can click to empty an item +#define STORAGE_CLICK_EMPTY (1<<6) +/// Whether it is possible to use this storage object in an inverse way, so you can have the item in your hand and click items on the floor to pick them up +#define STORAGE_CLICK_GATHER (1<<7) +/// Whether our storage object on hud changes color when full +#define STORAGE_SHOW_FULLNESS (1<<8) +/// Whether the storage object groups contents of the same type and displays them as a number. Only works for slot-based storage objects. +#define STORAGE_CONTENT_NUM_DISPLAY (1<<9) +/// Whether the storage object can pick up all the items in a tile +#define STORAGE_GATHER_SIMULTAENOUSLY (1<<10) +/// Whether the storage can be drawn with E or Holster verb +#define STORAGE_ALLOW_QUICKDRAW (1<<11) +/// Whether using this item will try not to empty it if possible +#define STORAGE_DISABLE_USE_EMPTY (1<<12) #define STORAGE_FLAGS_DEFAULT (STORAGE_SHOW_FULLNESS|STORAGE_GATHER_SIMULTAENOUSLY|STORAGE_ALLOW_EMPTY) #define STORAGE_FLAGS_BOX (STORAGE_FLAGS_DEFAULT) diff --git a/code/__DEFINES/flags.dm b/code/__DEFINES/flags.dm index fc3772e66ff2..16e7c69bc254 100644 --- a/code/__DEFINES/flags.dm +++ b/code/__DEFINES/flags.dm @@ -33,6 +33,8 @@ #define EMOTE_IMPORTANT (1<<2) /// Does the emote not have a message? #define EMOTE_NO_MESSAGE (1<<3) +/// Can only code call this event instead of the player. +#define EMOTE_FORCED_AUDIO (1<<4) // Bitflags for Working Joe emotes /// Working Joe emote diff --git a/code/__DEFINES/human.dm b/code/__DEFINES/human.dm index 1fbeff73192b..1f7203fb310d 100644 --- a/code/__DEFINES/human.dm +++ b/code/__DEFINES/human.dm @@ -191,6 +191,7 @@ #define SYNTH_GEN_ONE "First Generation Synthetic" #define SYNTH_GEN_TWO "Second Generation Synthetic" #define SYNTH_GEN_THREE "Third Generation Synthetic" +#define SYNTH_K9 "Synthetic K9" #define PLAYER_SYNTHS list(SYNTH_GEN_ONE, SYNTH_GEN_TWO, SYNTH_GEN_THREE) #define SYNTH_TYPES list(SYNTH_COLONY, SYNTH_COLONY_GEN_ONE, SYNTH_COLONY_GEN_TWO, SYNTH_COMBAT, SYNTH_INFILTRATOR, SYNTH_WORKING_JOE, SYNTH_GEN_ONE, SYNTH_GEN_TWO, SYNTH_GEN_THREE) diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm index 0173a55e2d17..ebd4a7a38179 100644 --- a/code/__DEFINES/job.dm +++ b/code/__DEFINES/job.dm @@ -64,9 +64,14 @@ GLOBAL_LIST_INIT(job_squad_roles, JOB_SQUAD_ROLES_LIST) #define JOB_MEDIC_ROLES_LIST list(JOB_SQUAD_MEDIC, JOB_CMO, JOB_DOCTOR, JOB_NURSE, JOB_RESEARCHER, JOB_SURGEON) #define JOB_CORPORATE_LIAISON "Corporate Liaison" + #define JOB_COMBAT_REPORTER "Combat Correspondent" +#define JOB_CIVIL_ROLES /datum/timelock/civil +#define JOB_CIVIL_ROLES_LIST list(JOB_COMBAT_REPORTER) + #define JOB_MESS_SERGEANT "Mess Technician" #define JOB_SYNTH "Synthetic" +#define JOB_SYNTH_K9 "Synthetic K9" #define JOB_WORKING_JOE "Working Joe" #define JOB_CO "Commanding Officer" @@ -213,6 +218,9 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST) #define ROLES_WY_CORPORATE list(JOB_EXECUTIVE_SUPERVISOR, JOB_EXECUTIVE_SPECIALIST, JOB_SENIOR_EXECUTIVE, JOB_EXECUTIVE, JOB_JUNIOR_EXECUTIVE, JOB_TRAINEE) #define ROLES_WY_LEADERSHIP list(JOB_DIRECTOR, JOB_PMC_DIRECTOR, JOB_CHIEF_EXECUTIVE, JOB_DIVISION_MANAGER, JOB_ASSISTANT_MANAGER) +#define JOB_CORPORATE_ROLES /datum/timelock/corporate +#define JOB_CORPORATE_ROLES_LIST list(JOB_CORPORATE_LIAISON, JOB_WO_CORPORATE_LIAISON, JOB_DIRECTOR, JOB_PMC_DIRECTOR, JOB_CHIEF_EXECUTIVE, JOB_DIVISION_MANAGER, JOB_ASSISTANT_MANAGER, JOB_EXECUTIVE_SUPERVISOR, JOB_EXECUTIVE_SPECIALIST, JOB_SENIOR_EXECUTIVE, JOB_EXECUTIVE, JOB_JUNIOR_EXECUTIVE, JOB_TRAINEE) + //-------- WY Goons --------// #define JOB_WY_GOON "WY Corporate Security" #define JOB_WY_GOON_TECH "WY Corporate Security Technician" @@ -260,29 +268,35 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST) #define JOB_FORECON_SMARTGUNNER "Reconnaissance Smartgunner" //-------- UPP --------// -#define JOB_UPP "UPP Private" +#define JOB_UPP "UPP Ryadovoy" #define JOB_UPP_CONSCRIPT "UPP Conscript" -#define JOB_UPP_ENGI "UPP Korporal Sapper" -#define JOB_UPP_MEDIC "UPP Korporal Medic" +#define JOB_UPP_ENGI "UPP MSzht Engineer" +#define JOB_UPP_MEDIC "UPP MSzht Medic" #define JOB_UPP_SPECIALIST "UPP Serzhant" -#define JOB_UPP_LEADER "UPP Master Serzhant" +#define JOB_UPP_LEADER "UPP Starshiy Serzhant" #define JOB_UPP_POLICE "UPP Politsiya" +#define JOB_UPP_LT_OFFICER "UPP Mladshiy Leytenant" #define JOB_UPP_SUPPLY "UPP Logistics Technician" -#define JOB_UPP_LT_OFFICER "UPP Leytenant" #define JOB_UPP_LT_DOKTOR "UPP Leytenant Doktor" -#define JOB_UPP_SRLT_OFFICER "UPP Senior Leytenant" +#define JOB_UPP_SRLT_OFFICER "UPP Starshiy Leytenant" #define JOB_UPP_KPT_OFFICER "UPP Kapitan" #define JOB_UPP_MAY_OFFICER "UPP Mayjor" -#define JOB_UPP_LTKOL_OFFICER "UPP Leytenant Kolonel" -#define JOB_UPP_KOL_OFFICER "UPP Kolonel" -#define JOB_UPP_MAY_GENERAL "UPP Mayjor General" -#define JOB_UPP_LT_GENERAL "UPP Leytenant General" -#define JOB_UPP_GENERAL "UPP Army General" +#define JOB_UPP_LTKOL_OFFICER "UPP Podpolkovnik" +#define JOB_UPP_KOL_OFFICER "UPP Polkovnik" +#define JOB_UPP_BRIG_GENERAL "UPP General Mayjor" +#define JOB_UPP_MAY_GENERAL "UPP General Leytenant" +#define JOB_UPP_LT_GENERAL "UPP General Polkovnik" +#define JOB_UPP_GENERAL "UPP General Armii" +#define SQUAD_UPP_1 "Akula" +#define SQUAD_UPP_2 "Bizon" +#define SQUAD_UPP_3 "Chayka" +#define SQUAD_UPP_4 "Delfin" +#define SQUAD_UPP_5 "UPPKdo" #define JOB_UPP_COMBAT_SYNTH "UPP Combat Synthetic" #define JOB_UPP_SUPPORT_SYNTH "UPP Support Synthetic" -#define UPP_JOB_LIST list(JOB_UPP, JOB_UPP_ENGI, JOB_UPP_MEDIC, JOB_UPP_SPECIALIST, JOB_UPP_LEADER, JOB_UPP_POLICE, JOB_UPP_LT_OFFICER, JOB_UPP_LT_DOKTOR, JOB_UPP_SRLT_OFFICER, JOB_UPP_KPT_OFFICER, JOB_UPP_KOL_OFFICER, JOB_UPP_COMBAT_SYNTH) +#define UPP_JOB_LIST list(JOB_UPP, JOB_UPP_ENGI, JOB_UPP_MEDIC, JOB_UPP_SPECIALIST, JOB_UPP_LEADER, JOB_UPP_POLICE, JOB_UPP_LT_OFFICER, JOB_UPP_LT_DOKTOR, JOB_UPP_SUPPLY, JOB_UPP_SRLT_OFFICER, JOB_UPP_KPT_OFFICER, JOB_UPP_KOL_OFFICER, JOB_UPP_SUPPORT_SYNTH, JOB_UPP_COMMISSAR) #define UPP_JOB_GRUNT_LIST list(JOB_UPP, JOB_UPP_ENGI, JOB_UPP_MEDIC, JOB_UPP_SPECIALIST, JOB_UPP_LEADER, JOB_UPP_POLICE, JOB_UPP_CREWMAN) #define JOB_UPP_COMMANDO "UPP Junior Kommando" @@ -366,6 +380,22 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST) #define DUTCH_JOB_LIST list(JOB_DUTCH_ARNOLD, JOB_DUTCH_RIFLEMAN, JOB_DUTCH_MINIGUNNER, JOB_DUTCH_FLAMETHROWER, JOB_DUTCH_MEDIC) +//---------- RESPONDERS ----------// +/// This root job should never appear ingame, it's used to select the character slot. +#define JOB_FAX_RESPONDER "Fax Responder" +#define JOB_FAX_RESPONDER_USCM_HC "USCM-HC Communications Officer" +#define JOB_FAX_RESPONDER_USCM_PVST "Provost Communications Officer" +#define JOB_FAX_RESPONDER_WY "WY Communications Executive" +#define JOB_FAX_RESPONDER_UPP "UPP Communications Officer" +#define JOB_FAX_RESPONDER_TWE "TWE Communications Officer" +#define JOB_FAX_RESPONDER_CLF "CLF Information Correspondant" +#define JOB_FAX_RESPONDER_CMB "CMB Deputy Operations Officer" +#define JOB_FAX_RESPONDER_PRESS "Free Press Relay Operator" + +#define FAX_RESPONDER_JOB_LIST list(JOB_FAX_RESPONDER_USCM_HC, JOB_FAX_RESPONDER_USCM_PVST, JOB_FAX_RESPONDER_WY, JOB_FAX_RESPONDER_UPP, JOB_FAX_RESPONDER_TWE, JOB_FAX_RESPONDER_CLF, JOB_FAX_RESPONDER_CMB, JOB_FAX_RESPONDER_PRESS) + + +//---------- ANTAG ----------// #define JOB_PREDATOR "Predator" #define JOB_XENOMORPH "Xenomorph" #define JOB_XENOMORPH_QUEEN "Queen" diff --git a/code/__DEFINES/keybinding.dm b/code/__DEFINES/keybinding.dm index 3f4c90eaf7b9..035f0d8f214b 100644 --- a/code/__DEFINES/keybinding.dm +++ b/code/__DEFINES/keybinding.dm @@ -49,15 +49,15 @@ #define COMSIG_KB_HUMAN_ISSUE_ORDER_MOVE "keybinding_human_issue_order_move" #define COMSIG_KB_HUMAN_ISSUE_ORDER_HOLD "keybinding_human_issue_order_hold" #define COMSIG_KB_HUMAN_ISSUE_ORDER_FOCUS "keybinding_human_issue_order_focus" - #define COMSIG_KB_HUMAN_SPECIALIST_ACTIVATION_ONE "keybinding_human_specialist_activation_one" #define COMSIG_KB_HUMAN_SPECIALIST_ACTIVATION_TWO "keybinding_human_specialist_activation_two" - #define COMSIG_KB_HUMAN_ROTATE_CHAIR "keybinding_human_rotate_chair" - #define COMSIG_KB_HUMAN_SHOW_HELD_ITEM "keybinding_human_show_held_item" - #define COMSIG_KB_HUMAN_CYCLE_HELMET_HUD "keybinding_human_cycle_helmet_hud" +#define COMSIG_KB_HUMAN_PIXEL_SHIFT_GRABBED_NORTH "keybinding_human_pixel_shift_grabbed_north" +#define COMSIG_KB_HUMAN_PIXEL_SHIFT_GRABBED_SOUTH "keybinding_human_pixel_shift_grabbed_south" +#define COMSIG_KB_HUMAN_PIXEL_SHIFT_GRABBED_EAST "keybinding_human_pixel_shift_grabbed_east" +#define COMSIG_KB_HUMAN_PIXEL_SHIFT_GRABBED_WEST "keybinding_human_pixel_shift_grabbed_west" // Human Inventory Navigation #define COMSIG_KB_HUMAN_INTERACT_OTHER_HAND "keybinding_human_interact_other_hand" @@ -178,7 +178,7 @@ // Yautja Bracer #define COMSIG_KB_YAUTJA_TOGGLE_NOTIFICATION_SOUND "keybinding_yautja_toggle_notification_sound" #define COMSIG_KB_YAUTJA_BRACER_MESSAGE "keybinding_yautja_bracer_message" -#define COMSIG_KB_YAUTJA_WRISTBLADES "keybinding_yautja_wristblades" +#define COMSIG_KB_YAUTJA_BRACER_ATTACHMENT "keybinding_yautja_bracer_attachement" #define COMSIG_KB_YAUTJA_TRACK_GEAR "keybinding_yautja_track_gear" #define COMSIG_KB_YAUTJA_CLOAKER "keybinding_yautja_cloaker" #define COMSIG_KB_YAUTJA_CASTER "keybinding_yautja_caster" diff --git a/code/__DEFINES/maps.dm b/code/__DEFINES/maps.dm index ef3d17572f0d..84c0fc429732 100644 --- a/code/__DEFINES/maps.dm +++ b/code/__DEFINES/maps.dm @@ -120,3 +120,8 @@ require only minor tweaks. /// A map key that corresponds to being one exclusively for Space. #define SPACE_KEY "space" + +#define SENTRY_TOP_LEFT "top_left" +#define SENTRY_TOP_RIGHT "top_right" +#define SENTRY_BOTTOM_LEFT "bottom_left" +#define SENTRY_BOTTOM_RIGHT "bottom_right" diff --git a/code/__DEFINES/minimap.dm b/code/__DEFINES/minimap.dm index 0d05b7be6e1b..23fb97fdbc7e 100644 --- a/code/__DEFINES/minimap.dm +++ b/code/__DEFINES/minimap.dm @@ -1,4 +1,3 @@ - #define MINIMAP_FLAG_XENO (1<<0) #define MINIMAP_FLAG_USCM (1<<1) #define MINIMAP_FLAG_PMC (1<<2) @@ -17,12 +16,15 @@ #define MINIMAP_FLAG_XENO_RENEGADE (1<<15) #define MINIMAP_FLAG_ALL (1<<16) - 1 -///Converts the overworld x and y to minimap x and y values +///The minimap zoom scale #define MINIMAP_SCALE 2 +///Converts the overworld x and y to minimap x and y values #define MINIMAP_PIXEL_FROM_WORLD(val) (val * MINIMAP_SCALE - 3) -//actual size of a users screen in pixels +///The actual size of a users screen in pixels #define SCREEN_PIXEL_SIZE 480 +///The actual size of the minimap in pixels +#define MINIMAP_PIXEL_SIZE 512 GLOBAL_LIST_INIT(all_minimap_flags, bitfield2list(MINIMAP_FLAG_ALL)) @@ -68,18 +70,6 @@ GLOBAL_LIST_INIT(all_minimap_flags, bitfield2list(MINIMAP_FLAG_ALL)) #define MINIMAP_SQUAD_SOF "#400000" #define MINIMAP_SQUAD_INTEL "#053818" -#define MINIMAP_ICON_BACKGROUND_CIVILIAN "#7D4820" -#define MINIMAP_ICON_BACKGROUND_CIC "#3f3f3f" -#define MINIMAP_ICON_BACKGROUND_USCM "#888888" -#define MINIMAP_ICON_BACKGROUND_XENO "#3a064d" - -#define MINIMAP_ICON_COLOR_COMMANDER "#c6fcfc" -#define MINIMAP_ICON_COLOR_HEAD "#F0C542" -#define MINIMAP_ICON_COLOR_BRONZE "#eb9545" - -#define MINIMAP_ICON_COLOR_DOCTOR "#b83737" - - //Prison #define MINIMAP_AREA_CELL_MAX "#570101ee" #define MINIMAP_AREA_CELL_HIGH "#a54b01ee" diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index 53ad9904abd0..a30d90524a6b 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -218,6 +218,7 @@ #define SPECIAL_BONEBREAK (1<<13) //species do not get their bonebreak chance modified by endurance #define NO_SHRAPNEL (1<<14) #define HAS_HARDCRIT (1<<15) +#define NO_OVERLAYS (1<<16) // Stop OnMob overlays from appearing on sprite //================================================= @@ -346,6 +347,7 @@ GLOBAL_LIST_INIT(default_xeno_onmob_icons, list( #define SPECIES_HUMAN "Human" #define SPECIES_YAUTJA "Yautja" #define SPECIES_SYNTHETIC "Synthetic" +#define SPECIES_SYNTHETIC_K9 "Synthetic K9" #define SPECIES_MONKEY "Monkey" #define SPECIES_ZOMBIE "Zombie" @@ -384,3 +386,12 @@ GLOBAL_LIST_INIT(default_xeno_onmob_icons, list( #define MOBILITY_FLAGS_LYING_CAPABLE_DEFAULT (MOBILITY_MOVE | MOBILITY_STAND | MOBILITY_LIEDOWN) #define MOBILITY_FLAGS_CARBON_DEFAULT (MOBILITY_MOVE | MOBILITY_STAND | MOBILITY_REST | MOBILITY_LIEDOWN) #define MOBILITY_FLAGS_REST_CAPABLE_DEFAULT (MOBILITY_MOVE | MOBILITY_STAND | MOBILITY_REST | MOBILITY_LIEDOWN) + +/// Sleeps for X and will perform return if A is qdeleted or a dead mob. +#define SLEEP_CHECK_DEATH(X, A) \ + sleep(X); \ + if(QDELETED(A)) return; \ + if(ismob(A)) { \ + var/mob/sleep_check_death_mob = A; \ + if(sleep_check_death_mob.stat == DEAD) return; \ + } diff --git a/code/__DEFINES/mode.dm b/code/__DEFINES/mode.dm index 1933f3da25d9..ace71bc626b8 100644 --- a/code/__DEFINES/mode.dm +++ b/code/__DEFINES/mode.dm @@ -73,6 +73,11 @@ #define MODE_DISPOSABLE_MOBS (1<<10) // Toggles if mobs fit in disposals or not. Off by default. #define MODE_BYPASS_JOE (1<<11) // Toggles if ghosts can bypass Working Joe spawn limitations, does NOT bypass WL requirement. Off by default. #define MODE_DISABLE_JOE_RESPAWN (1<<12) // Toggles if ghosts can respawn as Working Joes after dying as one when 15 minutes have passed. Off by default +#define MODE_INDESTRUCTIBLE_SPLINTS (1<<13) //Toggle is splints are to become nanosplints +#define MODE_NO_INTERNAL_BLEEDING (1<<14) // Toggles all internal bleeding behavior to cause normal bleeding instead +#define MODE_LZ_HAZARD_ACTIVATED (1<<15) // Distress Signal: Spawns miasma 3 minutes after round start +#define MODE_MORTAR_LASER_WARNING (1<<16) // Blinking laser before mortar impact + #define ROUNDSTATUS_FOG_DOWN 1 #define ROUNDSTATUS_PODDOORS_OPEN 2 @@ -117,6 +122,7 @@ #define ROLE_WHITELISTED 16 #define ROLE_NO_ACCOUNT 32 #define ROLE_CUSTOM_SPAWN 64 +#define ROLE_HIDDEN 128 //================================================= //Role defines, specifically lists of roles for job bans, crew manifests and the like. @@ -125,19 +131,29 @@ GLOBAL_LIST_INIT(ROLES_COMMAND, list(JOB_CO, JOB_XO, JOB_SO, JOB_AUXILIARY_OFFIC //Marine roles #define ROLES_OFFICERS list(JOB_CO, JOB_XO, JOB_SO, JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_CAS_PILOT, JOB_DROPSHIP_PILOT, JOB_TANK_CREW, JOB_DROPSHIP_CREW_CHIEF, JOB_SEA, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_SYNTH, JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE) GLOBAL_LIST_INIT(ROLES_CIC, list(JOB_CO, JOB_XO, JOB_SO, JOB_WO_CO, JOB_WO_XO)) +GLOBAL_LIST_INIT(ROLES_CIC_ANTAG, list(JOB_UPP_SRLT_OFFICER, JOB_UPP_KPT_OFFICER, JOB_UPP_KOL_OFFICER, JOB_UPP_COMMISSAR)) GLOBAL_LIST_INIT(ROLES_AUXIL_SUPPORT, list(JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_CAS_PILOT, JOB_DROPSHIP_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_TANK_CREW, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_WO_PILOT)) +GLOBAL_LIST_INIT(ROLES_AUXIL_SUPPORT_ANTAG, list(JOB_UPP_CREWMAN)) GLOBAL_LIST_INIT(ROLES_MISC, list(JOB_SYNTH, JOB_WORKING_JOE, JOB_SEA, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_MESS_SERGEANT, JOB_WO_CORPORATE_LIAISON, JOB_WO_SYNTH)) +GLOBAL_LIST_INIT(ROLES_MISC_ANTAG, list(JOB_UPP_COMBAT_SYNTH, JOB_UPP_SUPPORT_SYNTH)) GLOBAL_LIST_INIT(ROLES_POLICE, list(JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE)) +GLOBAL_LIST_INIT(ROLES_POLICE_ANTAG, list(JOB_UPP_POLICE)) GLOBAL_LIST_INIT(ROLES_ENGINEERING, list(JOB_CHIEF_ENGINEER, JOB_ORDNANCE_TECH, JOB_MAINT_TECH, JOB_WO_CHIEF_ENGINEER, JOB_WO_ORDNANCE_TECH)) +GLOBAL_LIST_INIT(ROLES_ENGINEERING_ANTAG, list()) GLOBAL_LIST_INIT(ROLES_REQUISITION, list(JOB_CHIEF_REQUISITION, JOB_CARGO_TECH, JOB_WO_CHIEF_REQUISITION, JOB_WO_REQUISITION)) +GLOBAL_LIST_INIT(ROLES_REQUISITION_ANTAG, list(JOB_UPP_SUPPLY)) GLOBAL_LIST_INIT(ROLES_MEDICAL, list(JOB_CMO, JOB_RESEARCHER, JOB_DOCTOR, JOB_NURSE, JOB_WO_CMO, JOB_WO_RESEARCHER, JOB_WO_DOCTOR)) -GLOBAL_LIST_INIT(ROLES_MARINES, list(JOB_SQUAD_LEADER, JOB_SQUAD_TEAM_LEADER, JOB_SQUAD_SPECIALIST, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MEDIC, JOB_SQUAD_ENGI, JOB_SQUAD_MARINE)) +GLOBAL_LIST_INIT(ROLES_MEDICAL_ANTAG, list(JOB_UPP_LT_DOKTOR)) +GLOBAL_LIST_INIT(ROLES_MARINES, list(JOB_SQUAD_LEADER, JOB_SQUAD_TEAM_LEADER, JOB_SQUAD_SPECIALIST, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MEDIC, JOB_SQUAD_ENGI, JOB_SQUAD_MARINE)) +GLOBAL_LIST_INIT(ROLES_MARINES_ANTAG, list(JOB_UPP, JOB_UPP_ENGI, JOB_UPP_MEDIC, JOB_UPP_SPECIALIST, JOB_UPP_LEADER)) GLOBAL_LIST_INIT(ROLES_SQUAD_ALL, list(SQUAD_MARINE_1, SQUAD_MARINE_2, SQUAD_MARINE_3, SQUAD_MARINE_4, SQUAD_MARINE_5, SQUAD_MARINE_CRYO, SQUAD_MARINE_INTEL)) GLOBAL_LIST_INIT(ROLES_WO, list(JOB_WO_CO, JOB_WO_XO, JOB_WO_CORPORATE_LIAISON, JOB_WO_SYNTH, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_WO_PILOT, JOB_WO_CHIEF_ENGINEER, JOB_WO_ORDNANCE_TECH, JOB_WO_CHIEF_REQUISITION, JOB_WO_REQUISITION, JOB_WO_CMO, JOB_WO_DOCTOR, JOB_WO_RESEARCHER, JOB_WO_SQUAD_MARINE, JOB_WO_SQUAD_MEDIC, JOB_WO_SQUAD_ENGINEER, JOB_WO_SQUAD_SMARTGUNNER, JOB_WO_SQUAD_SPECIALIST, JOB_WO_SQUAD_LEADER)) + + //Groundside roles GLOBAL_LIST_INIT(ROLES_XENO, list(JOB_XENOMORPH_QUEEN, JOB_XENOMORPH)) -GLOBAL_LIST_INIT(ROLES_WHITELISTED, list(JOB_SYNTH_SURVIVOR, JOB_CO_SURVIVOR, JOB_PREDATOR)) +GLOBAL_LIST_INIT(ROLES_WHITELISTED, list(JOB_SYNTH_SURVIVOR, JOB_CO_SURVIVOR, JOB_PREDATOR, JOB_FAX_RESPONDER)) GLOBAL_LIST_INIT(ROLES_SPECIAL, list(JOB_SURVIVOR)) GLOBAL_LIST_INIT(ROLES_USCM, ROLES_CIC + GLOB.ROLES_POLICE + GLOB.ROLES_AUXIL_SUPPORT + GLOB.ROLES_MISC + GLOB.ROLES_ENGINEERING + GLOB.ROLES_REQUISITION + GLOB.ROLES_MEDICAL + GLOB.ROLES_MARINES - ROLES_WO) @@ -146,6 +162,8 @@ GLOBAL_LIST_INIT(ROLES_GROUND, GLOB.ROLES_XENO + ROLES_SPECIAL + ROLES_WHITELIST GLOBAL_LIST_INIT(ROLES_DISTRESS_SIGNAL, GLOB.ROLES_USCM + GLOB.ROLES_GROUND) GLOBAL_LIST_INIT(ROLES_FACTION_CLASH, ROLES_USCM + JOB_PREDATOR) +GLOBAL_LIST_INIT(ROLES_CM_VS_UPP, ROLES_USCM + UPP_JOB_LIST) + GLOBAL_LIST_INIT(ROLES_UNASSIGNED, list(JOB_SQUAD_MARINE)) //Role lists used for switch() checks in show_blurb_uscm(). Cosmetic, determines ex. "Engineering, USS Almayer", "2nd Bat. 'Falling Falcons'" etc. @@ -195,13 +213,8 @@ GLOBAL_LIST_INIT(whitelist_hierarchy, list(WHITELIST_NORMAL, WHITELIST_COUNCIL, ///Senior Enlisted Advisor, auto granted by R_MENTOR #define WHITELIST_MENTOR (1<<15) - -#define WHITELISTS_GENERAL (WHITELIST_YAUTJA|WHITELIST_COMMANDER|WHITELIST_SYNTHETIC|WHITELIST_MENTOR|WHITELIST_JOE) -#define WHITELISTS_COUNCIL (WHITELIST_YAUTJA_COUNCIL|WHITELIST_COMMANDER_COUNCIL|WHITELIST_SYNTHETIC_COUNCIL) -#define WHITELISTS_LEGACY_COUNCIL (WHITELIST_YAUTJA_COUNCIL_LEGACY|WHITELIST_COMMANDER_COUNCIL_LEGACY|WHITELIST_SYNTHETIC_COUNCIL_LEGACY) -#define WHITELISTS_LEADER (WHITELIST_YAUTJA_LEADER|WHITELIST_COMMANDER_LEADER|WHITELIST_SYNTHETIC_LEADER) - -#define WHITELIST_EVERYTHING (WHITELISTS_GENERAL|WHITELISTS_COUNCIL|WHITELISTS_LEADER) +///Fax Responder +#define WHITELIST_FAX_RESPONDER (1<<16) #define COUNCIL_LIST list(WHITELIST_COMMANDER_COUNCIL, WHITELIST_SYNTHETIC_COUNCIL, WHITELIST_YAUTJA_COUNCIL) #define SENATOR_LIST list(WHITELIST_COMMANDER_LEADER, WHITELIST_SYNTHETIC_LEADER, WHITELIST_YAUTJA_LEADER) @@ -225,6 +238,7 @@ DEFINE_BITFIELD(whitelist_status, list( "WHITELIST_SYNTHETIC_COUNCIL_LEGACY" = WHITELIST_SYNTHETIC_COUNCIL_LEGACY, "WHITELIST_SYNTHETIC_LEADER" = WHITELIST_SYNTHETIC_LEADER, "WHITELIST_MENTOR" = WHITELIST_MENTOR, + "WHITELIST_FAX_RESPONDER" = WHITELIST_FAX_RESPONDER, )) //================================================= @@ -277,9 +291,10 @@ DEFINE_BITFIELD(whitelist_status, list( #define FACTION_YAUTJA "Yautja" #define FACTION_ZOMBIE "Zombie" #define FACTION_MONKEY "Monkey" // Nanu +#define FACTION_FAX "Fax Responder" #define FACTION_LIST_MARINE list(FACTION_MARINE) -#define FACTION_LIST_HUMANOID list(FACTION_MARINE, FACTION_PMC, FACTION_WY, FACTION_WY_DEATHSQUAD, FACTION_CLF, FACTION_CONTRACTOR, FACTION_MARSHAL, FACTION_UPP, FACTION_FREELANCER, FACTION_SURVIVOR, FACTION_NEUTRAL, FACTION_COLONIST, FACTION_MERCENARY, FACTION_DUTCH, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_YAUTJA, FACTION_ZOMBIE, FACTION_TWE) +#define FACTION_LIST_HUMANOID list(FACTION_MARINE, FACTION_PMC, FACTION_WY, FACTION_WY_DEATHSQUAD, FACTION_CLF, FACTION_CONTRACTOR, FACTION_MARSHAL, FACTION_UPP, FACTION_FREELANCER, FACTION_SURVIVOR, FACTION_NEUTRAL, FACTION_COLONIST, FACTION_MERCENARY, FACTION_DUTCH, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_YAUTJA, FACTION_ZOMBIE, FACTION_TWE, FACTION_FAX) #define FACTION_LIST_ERT_OTHER list(FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO) #define FACTION_LIST_ERT_ALL list(FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_WY, FACTION_CLF, FACTION_CONTRACTOR, FACTION_UPP, FACTION_FREELANCER, FACTION_MERCENARY, FACTION_DUTCH, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_MARSHAL, FACTION_TWE) #define FACTION_LIST_WY list(FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_WY) diff --git a/code/__DEFINES/objects.dm b/code/__DEFINES/objects.dm index 26db2f3d2254..21ac8d21fcc5 100644 --- a/code/__DEFINES/objects.dm +++ b/code/__DEFINES/objects.dm @@ -72,7 +72,7 @@ #define PULSE_SLOW 1 //<60 bpm #define PULSE_NORM 2 //60-90 bpm #define PULSE_FAST 3 //90-120 bpm -#define PULSE_2FAST 4 //>120 bpm +#define PULSE_FASTER 4 //>120 bpm #define PULSE_THREADY 5 //occurs during hypovolemic shock //proc/get_pulse methods diff --git a/code/__DEFINES/paygrade_defs/marines.dm b/code/__DEFINES/paygrade_defs/marines.dm index 74b659630820..bb9b185f53dc 100644 --- a/code/__DEFINES/paygrade_defs/marines.dm +++ b/code/__DEFINES/paygrade_defs/marines.dm @@ -78,3 +78,6 @@ /// MO10S, Commandant of the Marine Corps #define PAY_SHORT_MO10S "MO10S" + +/// SYN_K9, Synthetic K9 +#define PAY_SHORT_SYN_K9 "K9" diff --git a/code/__DEFINES/paygrade_defs/upp.dm b/code/__DEFINES/paygrade_defs/upp.dm index d753d531b67d..b4d105bef041 100644 --- a/code/__DEFINES/paygrade_defs/upp.dm +++ b/code/__DEFINES/paygrade_defs/upp.dm @@ -4,22 +4,22 @@ /// UE, #define PAY_SHORT_UEC "UEC" -/// UE1, Private +/// UE1, Private/Ryadovoy #define PAY_SHORT_UE1 "UE1" -/// UE2, Private First Class +/// UE2, Private First Class/Efreitor #define PAY_SHORT_UE2 "UE2" -/// UE3, Korporal +/// UE3, Korporal/Mladshiy Serzhant #define PAY_SHORT_UE3 "UE3" -/// UE4, unior Serzhant +/// UE4, Junior Serzhant/Serzhant #define PAY_SHORT_UE4 "UE4" -/// UE5, Serzhant +/// UE5, Serzhant/Starshiy Serzhant #define PAY_SHORT_UE5 "UE5" -/// UE6, Master Serzhant +/// UE6, Master Serzhant/Starshyna #define PAY_SHORT_UE6 "UE6" /// UC1, Junior Kommando @@ -31,32 +31,32 @@ /// UC3, 1st Kommando #define PAY_SHORT_UC3 "UC3" -/// UO1, Leytenant +/// UO1, Leytenant/Mladshiy Leytenant #define PAY_SHORT_UO1 "UO1" -/// UO2, Senior Leytenant +/// UO2, Senior Leytenant/Starshiy Leytenant #define PAY_SHORT_UO2 "UO2" -/// UO3, Kapitan +/// UO3, Kapitan/Captain #define PAY_SHORT_UO3 "UO3" -/// UO4, Mayjor +/// UO4, Mayjor/Major #define PAY_SHORT_UO4 "UO4" /// UO4P, Political Commissar #define PAY_SHORT_UO4P "UO4P" -/// UO5, Leytenant Kolonel +/// UO5, Leytenant Kolonel/Podpolkovnik #define PAY_SHORT_UO5 "UO5" -/// UO6, Kolonel +/// UO6, Kolonel/Polkovnik #define PAY_SHORT_UO6 "UO6" -/// UO7, Mayjor General +/// UO7, Mayjor General/General Leytenant #define PAY_SHORT_UO7 "UO7" -/// UO8, Leytenant General +/// UO8, Leytenant General/General Polkovnik #define PAY_SHORT_UO8 "UO8" -/// UO9, Army General +/// UO9, Army General/General Armii #define PAY_SHORT_UO9 "UO9" diff --git a/code/__DEFINES/shuttles.dm b/code/__DEFINES/shuttles.dm index 1c79fe03945f..ab9d0f1bffde 100644 --- a/code/__DEFINES/shuttles.dm +++ b/code/__DEFINES/shuttles.dm @@ -114,10 +114,14 @@ #define DROPSHIP_ALAMO "dropship_alamo" #define DROPSHIP_NORMANDY "dropship_normandy" #define DROPSHIP_SAIPAN "dropship_saipan" +#define DROPSHIP_MORANA "dropship_morana" +#define DROPSHIP_DEVANA "dropship_devana" #define ALMAYER_DROPSHIP_LZ1 "almayer-hangar-lz1" #define ALMAYER_DROPSHIP_LZ2 "almayer-hangar-lz2" +#define UPP_DROPSHIP_LZ2 "upp-hangar-lz1" + #define DROPSHIP_FLYBY_ID "special_flight" #define DROPSHIP_LZ1 "dropship-lz1" #define DROPSHIP_LZ2 "dropship-lz2" @@ -143,3 +147,4 @@ #define ADMIN_LANDING_PAD_3 "base-ert3" #define ADMIN_LANDING_PAD_4 "base-ert4" #define ADMIN_LANDING_PAD_5 "base-ert5" +#define ADMIN_LANDING_PAD_6 "base-ert6" diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm index 88496c79d630..9b709b9be3e5 100644 --- a/code/__DEFINES/subsystems.dm +++ b/code/__DEFINES/subsystems.dm @@ -141,6 +141,7 @@ #define SS_INIT_RADIO 2 #define SS_INIT_TIMER 100 #define SS_INIT_UNSPECIFIED 0 +#define SS_INIT_PREDSHIPS -19 #define SS_INIT_ASSETS -20 #define SS_INIT_TICKER -21 #define SS_INIT_VOTE -23 @@ -148,7 +149,6 @@ #define SS_INIT_ENTITYMANAGER -28 #define SS_INIT_PLAYTIME -29 #define SS_INIT_STICKY -30 -#define SS_INIT_PREDSHIPS -31 #define SS_INIT_OBJECTIVES -32 #define SS_INIT_MINIMAP -34 #define SS_INIT_STATPANELS -98 diff --git a/code/__DEFINES/typecheck/humanoids.dm b/code/__DEFINES/typecheck/humanoids.dm index 76f561e5fa1f..9f39d66a5012 100644 --- a/code/__DEFINES/typecheck/humanoids.dm +++ b/code/__DEFINES/typecheck/humanoids.dm @@ -17,6 +17,7 @@ #define isworkingjoe(A) (ishuman(A) && istype(A?:species, /datum/species/synthetic/colonial/working_joe)) #define ishazardjoe(A) (ishuman(A) && istype(A?:species, /datum/species/synthetic/colonial/working_joe/hazard)) #define isinfiltratorsynthetic(A) (ishuman(A) && istype(A?:species, /datum/species/synthetic/infiltrator)) +#define isk9synth(A) (ishuman(A) && istype(A?:species, /datum/species/synthetic/synth_k9)) //Specic group checks, use instead of typechecks (but use traits instead) #define issamespecies(A, B) (A.species?.group == B.species?.group) diff --git a/code/__DEFINES/urls.dm b/code/__DEFINES/urls.dm index 5d3fca1a2032..2745b41336d4 100644 --- a/code/__DEFINES/urls.dm +++ b/code/__DEFINES/urls.dm @@ -9,3 +9,4 @@ #define URL_WIKI_MACROS "Macros" #define URL_WIKI_SOP "Standard_Operating_Procedure" #define URL_WIKI_CO_RULES "CO_Council_Rulings" +#define URL_WIKI_FAX_RESPONDER "Fax_Responder" diff --git a/code/__DEFINES/vendors.dm b/code/__DEFINES/vendors.dm index 70e30edddf24..c118ad45b501 100644 --- a/code/__DEFINES/vendors.dm +++ b/code/__DEFINES/vendors.dm @@ -40,6 +40,7 @@ #define VENDOR_THEME_USCM 1 #define VENDOR_THEME_CLF 2 #define VENDOR_THEME_UPP 3 +#define VENDOR_THEME_YAUTJA 4 #define VENDOR_ITEM_REGULAR 1 #define VENDOR_ITEM_MANDATORY 2 diff --git a/code/__DEFINES/weapon_stats.dm b/code/__DEFINES/weapon_stats.dm index 1c3c09e9b28d..7313ebf80562 100644 --- a/code/__DEFINES/weapon_stats.dm +++ b/code/__DEFINES/weapon_stats.dm @@ -66,7 +66,7 @@ It DOES NOT control where your bullets go, that's scatter and projectile varianc ////SCATTER//// */ -#define SCATTER_AMOUNT_NEURO 60 +#define SCATTER_AMOUNT_NEURO 45 #define SCATTER_AMOUNT_TIER_1 15 #define SCATTER_AMOUNT_TIER_2 10 #define SCATTER_AMOUNT_TIER_3 8 diff --git a/code/__DEFINES/xeno.dm b/code/__DEFINES/xeno.dm index 850c3e0ebeee..8e7fb2af647b 100644 --- a/code/__DEFINES/xeno.dm +++ b/code/__DEFINES/xeno.dm @@ -174,7 +174,7 @@ /// The time when xenos can start taking over comm towers #define XENO_COMM_ACQUISITION_TIME (55 MINUTES) -/// The time it takes for a pylon to give one larva while activated +/// The time it takes for a pylon to give one royal resin while activated #define XENO_PYLON_ACTIVATION_COOLDOWN (5 MINUTES) /// The time until you can re-corrupt a comms relay after the last pylon was destroyed @@ -255,6 +255,7 @@ #define XENO_HEALTH_TIER_14 950 * XENO_UNIVERSAL_HPMULT #define XENO_HEALTH_QUEEN 1000 * XENO_UNIVERSAL_HPMULT #define XENO_HEALTH_IMMORTAL 1200 * XENO_UNIVERSAL_HPMULT +#define XENO_HEALTH_KING 1500 * XENO_UNIVERSAL_HPMULT // Plasma bands #define XENO_NO_PLASMA 0 @@ -434,6 +435,7 @@ // Armor mods. Use the above defines for some guidance // In general, +20 armor should be a little more than +20% effective HP, however, // the higher the Xeno's base armor, the greater the effect. +#define XENO_ARMOR_MOD_TINY 2.5 #define XENO_ARMOR_MOD_VERY_SMALL 5 #define XENO_ARMOR_MOD_SMALL 10 #define XENO_ARMOR_MOD_MED 15 @@ -665,9 +667,10 @@ #define XENO_SHIELD_SOURCE_GARDENER 8 #define XENO_SHIELD_SOURCE_SHIELD_PILLAR 9 #define XENO_SHIELD_SOURCE_CUMULATIVE_GENERIC 10 +#define XENO_SHIELD_SOURCE_KING_BULWARKSPELL 11 //XENO CASTES -#define XENO_CASTE_LARVA "Bloody Larva" +#define XENO_CASTE_LARVA "Larva" #define XENO_CASTE_PREDALIEN_LARVA "Predalien Larva" #define XENO_CASTE_FACEHUGGER "Facehugger" #define XENO_CASTE_LESSER_DRONE "Lesser Drone" @@ -693,13 +696,17 @@ #define XENO_CASTE_CRUSHER "Crusher" #define XENO_CASTE_RAVAGER "Ravager" #define XENO_T3_CASTES list(XENO_CASTE_BOILER, XENO_CASTE_PRAETORIAN, XENO_CASTE_CRUSHER, XENO_CASTE_RAVAGER) -//special + +//Tier 4 +#define XENO_CASTE_KING "King" #define XENO_CASTE_QUEEN "Queen" + +//special #define XENO_CASTE_PREDALIEN "Predalien" #define XENO_CASTE_HELLHOUND "Hellhound" #define XENO_SPECIAL_CASTES list(XENO_CASTE_QUEEN, XENO_CASTE_PREDALIEN, XENO_CASTE_HELLHOUND) -#define ALL_XENO_CASTES list(XENO_CASTE_LARVA, XENO_CASTE_PREDALIEN_LARVA, XENO_CASTE_FACEHUGGER, XENO_CASTE_LESSER_DRONE, XENO_CASTE_DRONE, XENO_CASTE_RUNNER, XENO_CASTE_SENTINEL, XENO_CASTE_DEFENDER, XENO_CASTE_BURROWER, XENO_CASTE_CARRIER, XENO_CASTE_HIVELORD, XENO_CASTE_LURKER, XENO_CASTE_WARRIOR, XENO_CASTE_SPITTER, XENO_CASTE_BOILER, XENO_CASTE_PRAETORIAN, XENO_CASTE_CRUSHER, XENO_CASTE_RAVAGER, XENO_CASTE_QUEEN, XENO_CASTE_PREDALIEN, XENO_CASTE_HELLHOUND) +#define ALL_XENO_CASTES list(XENO_CASTE_LARVA, XENO_CASTE_PREDALIEN_LARVA, XENO_CASTE_FACEHUGGER, XENO_CASTE_LESSER_DRONE, XENO_CASTE_DRONE, XENO_CASTE_RUNNER, XENO_CASTE_SENTINEL, XENO_CASTE_DEFENDER, XENO_CASTE_BURROWER, XENO_CASTE_CARRIER, XENO_CASTE_HIVELORD, XENO_CASTE_LURKER, XENO_CASTE_WARRIOR, XENO_CASTE_SPITTER, XENO_CASTE_BOILER, XENO_CASTE_PRAETORIAN, XENO_CASTE_CRUSHER, XENO_CASTE_RAVAGER, XENO_CASTE_QUEEN, XENO_CASTE_PREDALIEN, XENO_CASTE_HELLHOUND, XENO_CASTE_KING) // Checks if two hives are allied to each other. // PARAMETERS: @@ -767,3 +774,8 @@ #define JOIN_AS_FACEHUGGER_DELAY (3 MINUTES) #define JOIN_AS_LESSER_DRONE_DELAY (30 SECONDS) + +// larva states +#define LARVA_STATE_BLOODY 0 +#define LARVA_STATE_NORMAL 1 +#define LARVA_STATE_MATURE 2 diff --git a/code/__HELPERS/sanitize_values.dm b/code/__HELPERS/sanitize_values.dm index 291246e621a0..7c6f9046a9b9 100644 --- a/code/__HELPERS/sanitize_values.dm +++ b/code/__HELPERS/sanitize_values.dm @@ -77,3 +77,23 @@ if(65 to 70) . += ascii2text(ascii+32) //letters A to F - translates to lowercase else return default return . + +/proc/sanitize_gear(list/gear, client/user) + var/list/sanitized_gear = list() + var/running_cost = 0 + + for(var/gear_option in gear) + if(!GLOB.gear_datums_by_name[gear_option]) + continue + + var/datum/gear/gear_datum = GLOB.gear_datums_by_name[gear_option] + var/new_total = running_cost + gear_datum.cost + + if(new_total > MAX_GEAR_COST) + to_chat(user, SPAN_WARNING("Your [gear_option] was removed from your loadout as it exceeded the point limit.")) + continue + + running_cost = new_total + sanitized_gear += gear_option + + return sanitized_gear diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 069bf49f8d37..d31108544465 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -1450,6 +1450,7 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new) return TRUE #define VARSET_LIST_CALLBACK(target, var_name, var_value) CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(___callbackvarset), ##target, ##var_name, ##var_value) +#define VARSET_LIST_REMOVE_CALLBACK(target, var_value) CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(___callbackvarsetlistremove), ##target, ##var_value) //dupe code because dm can't handle 3 level deep macros #define VARSET_CALLBACK(datum, var, var_value) CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(___callbackvarset), ##datum, NAMEOF(##datum, ##var), ##var_value) /// Same as VARSET_CALLBACK, but uses a weakref to the datum. @@ -1474,6 +1475,10 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new) else datum.vars[var_name] = var_value +/proc/___callbackvarsetlistremove(list, var_value) + if(length(list)) + list -= var_value + //don't question just accept /proc/pass(...) return diff --git a/code/__pragmas.dm b/code/__pragmas.dm index 309883fbda20..ac6541a4a1b2 100644 --- a/code/__pragmas.dm +++ b/code/__pragmas.dm @@ -22,6 +22,9 @@ #pragma DanglingVarType error #pragma MissingInterpolatedExpression error #pragma InvalidIndexOperation error +#pragma PointlessPositionalArgument error +#pragma ProcArgumentGlobal error //3000-3999 #pragma EmptyBlock error +#pragma AmbiguousInOrder error diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm index 6db0d5c550bd..f08585846879 100644 --- a/code/_globalvars/bitfields.dm +++ b/code/_globalvars/bitfields.dm @@ -303,6 +303,7 @@ DEFINE_BITFIELD(storage_flags, list( "STORAGE_CONTENT_NUM_DISPLAY" = STORAGE_CONTENT_NUM_DISPLAY, "STORAGE_GATHER_SIMULTAENOUSLY" = STORAGE_GATHER_SIMULTAENOUSLY, "STORAGE_ALLOW_QUICKDRAW" = STORAGE_ALLOW_QUICKDRAW, + "STORAGE_DISABLE_USE_EMPTY" = STORAGE_DISABLE_USE_EMPTY, )) DEFINE_BITFIELD(datum_flags, list( @@ -435,6 +436,7 @@ DEFINE_BITFIELD(toggleable_flags, list( "MODE_DISPOSABLE_MOBS" = MODE_DISPOSABLE_MOBS, "MODE_BYPASS_JOE" = MODE_BYPASS_JOE, "MODE_DISABLE_JOE_RESPAWN" = MODE_DISABLE_JOE_RESPAWN, + "MODE_LZ_HAZARD_ACTIVATED" = MODE_LZ_HAZARD_ACTIVATED )) DEFINE_BITFIELD(state, list( diff --git a/code/_globalvars/global_lists.dm b/code/_globalvars/global_lists.dm index dadf5d597255..ccb0f2b3c570 100644 --- a/code/_globalvars/global_lists.dm +++ b/code/_globalvars/global_lists.dm @@ -220,11 +220,15 @@ GLOBAL_LIST_INIT_TYPED(hive_datum, /datum/hive_status, list( XENO_HIVE_TUTORIAL = new /datum/hive_status/tutorial() )) +GLOBAL_VAR_INIT(king_acquisition_time, 1 HOURS + 30 MINUTES + rand(0, 25) MINUTES) GLOBAL_LIST_INIT(xeno_evolve_times, setup_xeno_evolve_times()) /proc/setup_xeno_evolve_times() for(var/datum/caste_datum/caste as anything in subtypesof(/datum/caste_datum)) - LAZYADDASSOCLIST(., num2text(initial(caste.minimum_evolve_time)), caste) + if(initial(caste.caste_type) == XENO_CASTE_KING) + LAZYADDASSOCLIST(., num2text(GLOB.king_acquisition_time), caste) + else + LAZYADDASSOCLIST(., num2text(initial(caste.minimum_evolve_time)), caste) GLOBAL_LIST_INIT(custom_event_info_list, setup_custom_event_info()) diff --git a/code/_globalvars/lists/names.dm b/code/_globalvars/lists/names.dm index 09ad2b422d3c..b48d797a8594 100644 --- a/code/_globalvars/lists/names.dm +++ b/code/_globalvars/lists/names.dm @@ -37,3 +37,6 @@ GLOBAL_LIST_INIT(first_names_female_dutch, list("Chelsea", "Mira", "Jessica", "C GLOBAL_LIST_INIT(monkey_names, list("Abu", "Aldo", "Bear", "Bingo", "Clyde", "Crystal", "Gordo", "George", "Koko", "Marcel", "Nim", "Rafiki", "Spike", "Banana", "Boots", "Bubbles", "Smiley", "Winston")) GLOBAL_LIST_INIT(weapon_surnames, list("Adze", "Axe", "Bagh Nakha", "Bo", "Bola", "Bow", "Bowman", "Cannon", "Carbine", "Cestus", "Club", "Culverin", "Dagger", "Dao", "Derringer", "Dha", "Dussack", "Emeici", "Falchion", "Fan", "Flyssa", "Gauntlet", "Hammer", "Halberd", "Harquebus", "Hatchet", "Hwando", "Katar", "Kampilan", "Knuckles", "Lance", "Lancer", "Larim", "Maduvu", "Mace", "Maru", "Mauser", "Messer", "Mine", "Mubucae", "Nyepel", "Onager", "Pata", "Pike", "Ram", "Saber", "Seax", "Shamsir", "Sickle", "Sling", "Spear", "Spears", "Staff", "Sword", "Tekko")) + +GLOBAL_LIST_INIT(pred_names, list("Nu'koir", "Za-ai'stba", "Au'stbep", "Gihn'thill", "Au'stbep", "Tud'tab", "Gehtu-a", "U-dan'dchu", "Bua'dtu", "A'ytein", "Yu-thwuahtou", "Yon'ta", "Pan'teiat", "Ban'ti", "Ve'thiad", "Ga-aiteith", "A'kah", "Dachande")) +GLOBAL_LIST_INIT(pred_last_names, list("Tha'jo", "Ba'ytui", "Thwa'dtei", "Vah'ka")) diff --git a/code/controllers/configuration/entries/general.dm b/code/controllers/configuration/entries/general.dm index bad72cc8397c..a41a619e602f 100644 --- a/code/controllers/configuration/entries/general.dm +++ b/code/controllers/configuration/entries/general.dm @@ -369,6 +369,12 @@ The default value assumes youtube-dl is in your system PATH /datum/config_entry/string/invoke_youtubedl protection = CONFIG_ENTRY_LOCKED | CONFIG_ENTRY_HIDDEN +/datum/config_entry/string/cobalt_base_api + protection = CONFIG_ENTRY_LOCKED | CONFIG_ENTRY_HIDDEN + + +/datum/config_entry/string/cobalt_api_key + protection = CONFIG_ENTRY_LOCKED | CONFIG_ENTRY_HIDDEN /datum/config_entry/number/error_cooldown // The "cooldown" time for each occurrence of a unique error config_entry_value = 600 diff --git a/code/controllers/subsystem/communications.dm b/code/controllers/subsystem/communications.dm index c4661ff5a673..1e4480ef8afa 100644 --- a/code/controllers/subsystem/communications.dm +++ b/code/controllers/subsystem/communications.dm @@ -93,6 +93,8 @@ Radiochat range: 1441 to 1489 (most devices refuse to be tune to other frequency #define UPP_MED_FREQ 1254 #define UPP_CCT_FREQ 1255 #define UPP_KDO_FREQ 1259 +#define UPP_DS1_FREQ 1260 +#define UPP_DS2_FREQ 1261 //CLF Channels (1270-1289) #define CLF_FREQ 1271 @@ -197,6 +199,8 @@ GLOBAL_LIST_INIT(radiochannels, list( RADIO_CHANNEL_UPP_MED = UPP_MED_FREQ, RADIO_CHANNEL_UPP_CCT = UPP_CCT_FREQ, RADIO_CHANNEL_UPP_KDO = UPP_KDO_FREQ, + RADIO_CHANNEL_UPP_MORANA = UPP_DS1_FREQ, + RADIO_CHANNEL_UPP_KOROLOV = UPP_DS2_FREQ, RADIO_CHANNEL_CLF_GEN = CLF_FREQ, RADIO_CHANNEL_CLF_CMD = CLF_CMD_FREQ, diff --git a/code/controllers/subsystem/minimap.dm b/code/controllers/subsystem/minimap.dm index 8c2cbc7c5ee7..ffd1d4eca700 100644 --- a/code/controllers/subsystem/minimap.dm +++ b/code/controllers/subsystem/minimap.dm @@ -46,53 +46,72 @@ SUBSYSTEM_DEF(minimaps) minimaps_by_z["[level]"] = new /datum/hud_displays if(!is_ground_level(level) && !is_mainship_level(level)) continue - var/icon/icon_gen = new('icons/ui_icons/minimap.dmi') //480x480 blank icon template for drawing on the map + + var/icon/icon_gen = new('icons/ui_icons/minimap.dmi') //600x600 blank icon template for drawing on the map + var/xmin = world.maxx + var/ymin = world.maxy + var/xmax = 1 + var/ymax = 1 + for(var/xval in 1 to world.maxx) for(var/yval in 1 to world.maxy) //Scan all the turfs and draw as needed - var/turf/location = locate(xval,yval,level) - if(istype(location, /turf/open/space)) - continue + var/turf/location = locate(xval, yval, level) if(location.z != level) continue + if(location.density) + if(!istype(location, /turf/closed/wall/almayer/outer)) // Ignore almayer border + xmin = min(xmin, xval) + ymin = min(ymin, yval) + xmax = max(xmax, xval) + ymax = max(ymax, yval) icon_gen.DrawBox(location.minimap_color, xval, yval) continue + + if(istype(location, /turf/open/space)) + continue + var/atom/movable/alttarget = (locate(/obj/structure/machinery/door) in location) || (locate(/obj/structure/fence) in location) if(alttarget) + xmin = min(xmin, xval) + ymin = min(ymin, yval) + xmax = max(xmax, xval) + ymax = max(ymax, yval) icon_gen.DrawBox(alttarget.minimap_color, xval, yval) continue + var/area/turfloc = location.loc if(turfloc.minimap_color) + xmin = min(xmin, xval) + ymin = min(ymin, yval) + xmax = max(xmax, xval) + ymax = max(ymax, yval) icon_gen.DrawBox(BlendRGB(location.minimap_color, turfloc.minimap_color, 0.5), xval, yval) continue + + xmin = min(xmin, xval) + ymin = min(ymin, yval) + xmax = max(xmax, xval) + ymax = max(ymax, yval) icon_gen.DrawBox(location.minimap_color, xval, yval) - icon_gen.Scale(480 * MINIMAP_SCALE ,480 * MINIMAP_SCALE) //scale it up x2 to make it easer to see - icon_gen.Crop(1, 1, min(icon_gen.Width(), 480), min(icon_gen.Height(), 480)) //then cut all the empty pixels - - //generation is done, now we need to center the icon to someones view, this can be left out if you like it ugly and will halve SSinit time - //calculate the offset of the icon - var/largest_x = 0 - var/smallest_x = SCREEN_PIXEL_SIZE - var/largest_y = 0 - var/smallest_y = SCREEN_PIXEL_SIZE - for(var/xval=1 to SCREEN_PIXEL_SIZE step 2) - for(var/yval=1 to SCREEN_PIXEL_SIZE step 2) - if(!icon_gen.GetPixel(xval, yval)) - continue - if(xval > largest_x) - largest_x = xval - else if(xval < smallest_x) - smallest_x = xval - if(yval > largest_y) - largest_y = yval - else if(yval < smallest_y) - smallest_y = yval - minimaps_by_z["[level]"].x_offset = floor((SCREEN_PIXEL_SIZE-largest_x-smallest_x) / MINIMAP_SCALE) - minimaps_by_z["[level]"].y_offset = floor((SCREEN_PIXEL_SIZE-largest_y-smallest_y) / MINIMAP_SCALE) + xmin = xmin * MINIMAP_SCALE - 1 + ymin = ymin * MINIMAP_SCALE - 1 + xmax = min(xmax * MINIMAP_SCALE, MINIMAP_PIXEL_SIZE) + ymax = min(ymax * MINIMAP_SCALE, MINIMAP_PIXEL_SIZE) + + icon_gen.Scale(icon_gen.Width() * MINIMAP_SCALE, icon_gen.Height() * MINIMAP_SCALE) //scale it up x2 to make it easer to see + icon_gen.Crop(xmin, ymin, MINIMAP_PIXEL_SIZE + xmin - 1, MINIMAP_PIXEL_SIZE + ymin - 1) //then trim it down also cutting anything unused on the bottom left - icon_gen.Shift(EAST, minimaps_by_z["[level]"].x_offset) - icon_gen.Shift(NORTH, minimaps_by_z["[level]"].y_offset) + // Determine and assign the offsets + minimaps_by_z["[level]"].x_offset = floor((MINIMAP_PIXEL_SIZE - xmax - 1) / MINIMAP_SCALE) - xmin + minimaps_by_z["[level]"].y_offset = floor((MINIMAP_PIXEL_SIZE - ymax - 1) / MINIMAP_SCALE) - ymin + minimaps_by_z["[level]"].x_max = xmax + minimaps_by_z["[level]"].y_max = ymax + + // Center the map icon + icon_gen.Shift(EAST, minimaps_by_z["[level]"].x_offset + xmin) + icon_gen.Shift(NORTH, minimaps_by_z["[level]"].y_offset + ymin) minimaps_by_z["[level]"].hud_image = icon_gen //done making the image! @@ -196,6 +215,10 @@ SUBSYSTEM_DEF(minimaps) var/x_offset = 0 ///y offset of the actual icons to keep it to screens var/y_offset = 0 + ///max x for this zlevel + var/x_max = 1 + ///max y for this zlevel + var/y_max = 1 /datum/hud_displays/New() ..() @@ -329,13 +352,13 @@ SUBSYSTEM_DEF(minimaps) * * zlevel: zlevel to fetch map for * * flags: map flags to fetch from */ -/datum/controller/subsystem/minimaps/proc/fetch_minimap_object(zlevel, flags) - var/hash = "[zlevel]-[flags]" +/datum/controller/subsystem/minimaps/proc/fetch_minimap_object(zlevel, flags, shifting = FALSE) + var/hash = "[zlevel]-[flags]-[shifting]" if(hashed_minimaps[hash]) return hashed_minimaps[hash] - var/atom/movable/screen/minimap/map = new(null, zlevel, flags) + var/atom/movable/screen/minimap/map = new(null, zlevel, flags, shifting) if (!map.icon) //Don't wanna save an unusable minimap for a z-level. - CRASH("Empty and unusable minimap generated for '[zlevel]-[flags]'") //Can be caused by atoms calling this proc before minimap subsystem initializing. + CRASH("Empty and unusable minimap generated for '[zlevel]-[flags]-[shifting]'") //Can be caused by atoms calling this proc before minimap subsystem initializing. hashed_minimaps[hash] = map return map @@ -522,14 +545,57 @@ SUBSYSTEM_DEF(minimaps) layer = ABOVE_HUD_LAYER screen_loc = "1,1" mouse_opacity = MOUSE_OPACITY_TRANSPARENT - -/atom/movable/screen/minimap/Initialize(mapload, target, flags) + appearance_flags = TILE_BOUND + /// How many pixels to shift each update + var/shift_size = 8 + /// The horizontal max for this map (set at Initialize) + var/x_max = 1 + /// The vertical max for this map (set at Initialize) + var/y_max = 1 + /// The current x pixel shift + var/cur_x_shift = 0 + /// The current y pixel shift + var/cur_y_shift = 0 + /// Whether the horizontal shift is currently pushing the map westward + var/west_x_shift = TRUE + /// Whether the vertical shift is currently pushing the map southward + var/south_y_shift = TRUE + +/atom/movable/screen/minimap/Initialize(mapload, target, flags, shifting = FALSE) . = ..() if(!SSminimaps.minimaps_by_z["[target]"]) return icon = SSminimaps.minimaps_by_z["[target]"].hud_image SSminimaps.add_to_updaters(src, flags, target) + x_max = SSminimaps.minimaps_by_z["[target]"].x_max + y_max = SSminimaps.minimaps_by_z["[target]"].y_max + + if(shifting && (x_max > SCREEN_PIXEL_SIZE || y_max > SCREEN_PIXEL_SIZE)) + START_PROCESSING(SSobj, src) + if(findtext(screen_loc, "1") != 1) // We're detecting the first position matching, not the 1 there + CRASH("Shifting a minimap screen_loc of '[screen_loc]' is not currently implemented!") // Just need to do string manip in process to support it + +/atom/movable/screen/minimap/process() + if(x_max > SCREEN_PIXEL_SIZE) + if(west_x_shift) + cur_x_shift = min(cur_x_shift + shift_size, x_max - SCREEN_PIXEL_SIZE) + if(cur_x_shift == x_max - SCREEN_PIXEL_SIZE) + west_x_shift = !west_x_shift + else + cur_x_shift = max(cur_x_shift - shift_size, 0) + if(cur_x_shift == 0) + west_x_shift = !west_x_shift + if(y_max > SCREEN_PIXEL_SIZE) + if(south_y_shift) + cur_y_shift = min(cur_y_shift + shift_size, y_max - SCREEN_PIXEL_SIZE) + if(cur_y_shift == y_max - SCREEN_PIXEL_SIZE) + south_y_shift = !south_y_shift + else + cur_y_shift = max(cur_y_shift - shift_size, 0) + if(cur_y_shift == 0) + south_y_shift = !south_y_shift + screen_loc = "1:-[cur_x_shift],1:-[cur_y_shift]" // Pixel shift the map /** * Action that gives the owner access to the minimap pool @@ -547,6 +613,8 @@ SUBSYSTEM_DEF(minimaps) var/atom/movable/screen/minimap/map ///This is mostly for the AI & other things which do not move groundside. var/default_overwatch_level = 0 + ///Whether this minimap should shift or not + var/shifting = FALSE /datum/action/minimap/Destroy() map = null @@ -566,7 +634,7 @@ SUBSYSTEM_DEF(minimaps) . = ..() if(default_overwatch_level) - map = SSminimaps.fetch_minimap_object(default_overwatch_level, minimap_flags) + map = SSminimaps.fetch_minimap_object(default_overwatch_level, minimap_flags, shifting) else RegisterSignal(target, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(on_owner_z_change)) @@ -577,7 +645,7 @@ SUBSYSTEM_DEF(minimaps) if(!SSminimaps.minimaps_by_z["[z_level]"] || !SSminimaps.minimaps_by_z["[z_level]"].hud_image) return - map = SSminimaps.fetch_minimap_object(z_level, minimap_flags) + map = SSminimaps.fetch_minimap_object(z_level, minimap_flags, shifting) /datum/action/minimap/remove_from(mob/target) . = ..() @@ -599,9 +667,9 @@ SUBSYSTEM_DEF(minimaps) if(!SSminimaps.minimaps_by_z["[newz]"] || !SSminimaps.minimaps_by_z["[newz]"].hud_image) return if(default_overwatch_level) - map = SSminimaps.fetch_minimap_object(default_overwatch_level, minimap_flags) + map = SSminimaps.fetch_minimap_object(default_overwatch_level, minimap_flags, shifting) return - map = SSminimaps.fetch_minimap_object(newz, minimap_flags) + map = SSminimaps.fetch_minimap_object(newz, minimap_flags, shifting) /datum/action/minimap/xeno minimap_flags = MINIMAP_FLAG_XENO @@ -610,10 +678,15 @@ SUBSYSTEM_DEF(minimaps) minimap_flags = MINIMAP_FLAG_USCM marker_flags = MINIMAP_FLAG_USCM +/datum/action/minimap/upp + minimap_flags = MINIMAP_FLAG_UPP + marker_flags = MINIMAP_FLAG_UPP + /datum/action/minimap/observer minimap_flags = MINIMAP_FLAG_ALL marker_flags = NONE hidden = TRUE + shifting = TRUE /datum/tacmap var/allowed_flags = MINIMAP_FLAG_USCM @@ -960,6 +1033,7 @@ SUBSYSTEM_DEF(minimaps) map = SSminimaps.fetch_minimap_object(zlevel, flags) map.screen_loc = "[map_ref]:1,1" map.assigned_map = map_ref + map.appearance_flags = NONE // If you really want TILE_BOUND for the tacmaps, you need to CENTER it but it won't be scaled right /datum/tacmap_holder/Destroy() map = null diff --git a/code/controllers/subsystem/objectives_controller.dm b/code/controllers/subsystem/objectives_controller.dm index 38accda46004..d889400cb42e 100644 --- a/code/controllers/subsystem/objectives_controller.dm +++ b/code/controllers/subsystem/objectives_controller.dm @@ -1,4 +1,4 @@ -#define CORPSES_TO_SPAWN 25 +#define CORPSES_TO_SPAWN 100 SUBSYSTEM_DEF(objectives) name = "Objectives" @@ -314,7 +314,7 @@ SUBSYSTEM_DEF(objectives) for(var/datum/cm_objective/objective in medium_value) while(LAZYLEN(objective.required_objectives) < objective.number_of_clues_to_generate && LAZYLEN(low_value)) var/datum/cm_objective/req = pick(low_value) - if(req in objective.required_objectives || (req.objective_flags & OBJECTIVE_DEAD_END)) + if((req in objective.required_objectives) || (req.objective_flags & OBJECTIVE_DEAD_END)) continue //don't want to pick the same thing twice OR use a dead-end objective. link_objectives(req, objective) @@ -327,7 +327,7 @@ SUBSYSTEM_DEF(objectives) for(var/datum/cm_objective/objective in high_value) while(LAZYLEN(objective.required_objectives) < objective.number_of_clues_to_generate && LAZYLEN(medium_value)) var/datum/cm_objective/req = pick(medium_value) - if(req in objective.required_objectives || (req.objective_flags & OBJECTIVE_DEAD_END)) + if((req in objective.required_objectives) || (req.objective_flags & OBJECTIVE_DEAD_END)) continue //don't want to pick the same thing twice OR use a dead-end objective. link_objectives(req, objective) @@ -340,7 +340,7 @@ SUBSYSTEM_DEF(objectives) for(var/datum/cm_objective/objective in extreme_value) while(LAZYLEN(objective.required_objectives) < objective.number_of_clues_to_generate && LAZYLEN(high_value)) var/datum/cm_objective/req = pick(high_value) - if(req in objective.required_objectives || (req.objective_flags & OBJECTIVE_DEAD_END)) + if((req in objective.required_objectives) || (req.objective_flags & OBJECTIVE_DEAD_END)) continue //don't want to pick the same thing twice OR use a dead-end objective. link_objectives(req, objective) @@ -353,7 +353,7 @@ SUBSYSTEM_DEF(objectives) for(var/datum/cm_objective/objective in absolute_value) while(LAZYLEN(objective.required_objectives) < objective.number_of_clues_to_generate && LAZYLEN(extreme_value)) var/datum/cm_objective/req = pick(extreme_value) - if(req in objective.required_objectives || (req.objective_flags & OBJECTIVE_DEAD_END)) + if((req in objective.required_objectives) || (req.objective_flags & OBJECTIVE_DEAD_END)) continue //don't want to pick the same thing twice OR use a dead-end objective. link_objectives(req, objective) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index c3648df6ba29..3141b9fd2369 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -425,7 +425,8 @@ SUBSYSTEM_DEF(ticker) var/mob/M = J.spawn_in_player(player) if(istype(M)) J.equip_job(M) - EquipCustomItems(M) + if(player.ckey in GLOB.donator_items) + to_chat(player, SPAN_BOLDNOTICE("You have gear available in the personal gear vendor near Requisitions.")) if(M.client) var/client/C = M.client @@ -455,7 +456,9 @@ SUBSYSTEM_DEF(ticker) captainless = FALSE if(player.job) GLOB.RoleAuthority.equip_role(player, GLOB.RoleAuthority.roles_by_name[player.job], late_join = FALSE) - EquipCustomItems(player) + if(player.ckey in GLOB.donator_items) + to_chat(player, SPAN_BOLDNOTICE("You have gear available in the personal gear vendor near Requisitions.")) + if(player.client) var/client/C = player.client if(C.player_data && C.player_data.playtime_loaded && length(C.player_data.playtimes) == 0) diff --git a/code/datums/ammo/ammo.dm b/code/datums/ammo/ammo.dm index 587ffd805b6c..43f4e8ac0031 100644 --- a/code/datums/ammo/ammo.dm +++ b/code/datums/ammo/ammo.dm @@ -240,7 +240,7 @@ final_angle += rand(-total_scatter_angle, total_scatter_angle) var/turf/new_target = get_angle_target_turf(curloc, final_angle, 30) - P.fire_at(new_target, original_P.firer, original_P.shot_from, P.ammo.max_range, P.ammo.shell_speed, original_P.original) //Fire! + P.fire_at(new_target, original_P.firer, original_P.shot_from, P.ammo.max_range, P.ammo.shell_speed, original_P.original, FALSE) //Fire! /datum/ammo/proc/drop_flame(turf/turf, datum/cause_data/cause_data) // ~Art updated fire 20JAN17 if(!istype(turf)) diff --git a/code/datums/ammo/bullet/lever_action.dm b/code/datums/ammo/bullet/lever_action.dm index e1475146b21f..54019f35d6ef 100644 --- a/code/datums/ammo/bullet/lever_action.dm +++ b/code/datums/ammo/bullet/lever_action.dm @@ -12,6 +12,7 @@ accuracy = HIT_ACCURACY_TIER_1 shell_speed = AMMO_SPEED_TIER_6 accurate_range = 14 + effective_range_max = 7 handful_state = "lever_action_bullet" //unused and not working. need to refactor MD code. Unobtainable. @@ -34,6 +35,7 @@ damage = 70 //blanks CAN hurt you if shot very close penetration = 0 accuracy = HIT_ACCURACY_TIER_1 + effective_range_max = 0 damage_falloff = DAMAGE_FALLOFF_BLANK //not much, though (comparatively) shell_speed = AMMO_SPEED_TIER_5 handful_state = "training_lever_action_bullet" diff --git a/code/datums/ammo/bullet/pistol.dm b/code/datums/ammo/bullet/pistol.dm index 8b5239ba9127..f55691e8b2f6 100644 --- a/code/datums/ammo/bullet/pistol.dm +++ b/code/datums/ammo/bullet/pistol.dm @@ -94,6 +94,8 @@ name = "stun pistol bullet" sound_override = null + accuracy = HIT_ACCURACY_TIER_4 + // Used by M1911, Deagle and KT-42 /datum/ammo/bullet/pistol/heavy name = "heavy pistol bullet" diff --git a/code/datums/ammo/bullet/shotgun.dm b/code/datums/ammo/bullet/shotgun.dm index e71114dc24de..a1255605899a 100644 --- a/code/datums/ammo/bullet/shotgun.dm +++ b/code/datums/ammo/bullet/shotgun.dm @@ -11,10 +11,11 @@ name = "shotgun slug" handful_state = "slug_shell" - accurate_range = 6 + accurate_range = 8 max_range = 8 damage = 70 penetration = ARMOR_PENETRATION_TIER_4 + accuracy = HIT_ACCURACY_TIER_3 damage_armor_punch = 2 handful_state = "slug_shell" @@ -65,7 +66,7 @@ damage_type = BURN flags_ammo_behavior = AMMO_BALLISTIC - accuracy = -HIT_ACCURACY_TIER_2 + accuracy = HIT_ACCURACY_TIER_2 max_range = 12 damage = 55 penetration= ARMOR_PENETRATION_TIER_1 diff --git a/code/datums/ammo/bullet/special_ammo.dm b/code/datums/ammo/bullet/special_ammo.dm index b6d1ad4c93c3..ae5d63c79569 100644 --- a/code/datums/ammo/bullet/special_ammo.dm +++ b/code/datums/ammo/bullet/special_ammo.dm @@ -9,17 +9,18 @@ icon_state = "redbullet" flags_ammo_behavior = AMMO_BALLISTIC - damage_falloff = DAMAGE_FALLOFF_TIER_7 + damage_falloff = DAMAGE_FALLOFF_TIER_6 max_range = 12 accuracy = HIT_ACCURACY_TIER_4 damage = 30 penetration = 0 - effective_range_max = 7 + effective_range_max = 5 /datum/ammo/bullet/smartgun/armor_piercing name = "armor-piercing smartgun bullet" icon_state = "bullet" + damage_falloff = DAMAGE_FALLOFF_TIER_8 accurate_range = 12 accuracy = HIT_ACCURACY_TIER_2 damage = 20 diff --git a/code/datums/ammo/misc.dm b/code/datums/ammo/misc.dm index 28610f283df2..d7ba89b83c5b 100644 --- a/code/datums/ammo/misc.dm +++ b/code/datums/ammo/misc.dm @@ -184,7 +184,7 @@ /datum/ammo/flare/starshell/set_bullet_traits() LAZYADD(traits_to_give, list( BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_iff), - BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary, stacks = 1) + BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_incendiary, stacks = 2) )) /datum/ammo/souto diff --git a/code/datums/ammo/rocket.dm b/code/datums/ammo/rocket.dm index d1050ed32062..f6e37abd24f5 100644 --- a/code/datums/ammo/rocket.dm +++ b/code/datums/ammo/rocket.dm @@ -277,8 +277,9 @@ /datum/ammo/rocket/custom name = "custom rocket" - accurate_range = 8 - max_range = 8 + accuracy = HIT_ACCURACY_TIER_5 + accurate_range = 7 + max_range = 7 /datum/ammo/rocket/custom/proc/prime(atom/atom, obj/projectile/projectile) var/obj/item/weapon/gun/launcher/rocket/launcher = projectile.shot_from diff --git a/code/datums/ammo/shrapnel.dm b/code/datums/ammo/shrapnel.dm index 836e142489e1..1db9f7b61631 100644 --- a/code/datums/ammo/shrapnel.dm +++ b/code/datums/ammo/shrapnel.dm @@ -39,7 +39,7 @@ name = ".22 hornet round" icon_state = "hornet_round" flags_ammo_behavior = AMMO_BALLISTIC - damage = 20 + damage = 8 shrapnel_chance = 0 shell_speed = AMMO_SPEED_TIER_3//she fast af boi penetration = ARMOR_PENETRATION_TIER_5 diff --git a/code/datums/ammo/xeno.dm b/code/datums/ammo/xeno.dm index 7b5c8ee71257..697fc83e641c 100644 --- a/code/datums/ammo/xeno.dm +++ b/code/datums/ammo/xeno.dm @@ -37,15 +37,21 @@ neuro_callback = CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(apply_neuro)) -/proc/apply_neuro(mob/living/M, power, insta_neuro) +/proc/apply_neuro(mob/living/M, power, insta_neuro = FALSE, drain_stims = FALSE, drain_medchems = FALSE) if(skillcheck(M, SKILL_ENDURANCE, SKILL_ENDURANCE_MAX) && !insta_neuro) M.visible_message(SPAN_DANGER("[M] withstands the neurotoxin!")) return //endurance 5 makes you immune to weak neurotoxin if(ishuman(M)) var/mob/living/carbon/human/H = M + if(drain_stims) + for(var/datum/reagent/generated/stim in H.reagents.reagent_list) + H.reagents.remove_reagent(stim.id, power, TRUE) if(H.chem_effect_flags & CHEM_EFFECT_RESIST_NEURO || H.species.flags & NO_NEURO) H.visible_message(SPAN_DANGER("[M] shrugs off the neurotoxin!")) return //species like zombies or synths are immune to neurotoxin + if(drain_medchems) + for(var/datum/reagent/medical/med in H.reagents.reagent_list) + H.reagents.remove_reagent(med.id, power, TRUE) if(!isxeno(M)) if(insta_neuro) @@ -55,7 +61,7 @@ return if(ishuman(M)) - M.apply_effect(2.5, SUPERSLOW) + M.apply_effect(4, SUPERSLOW) M.visible_message(SPAN_DANGER("[M]'s movements are slowed.")) var/no_clothes_neuro = FALSE @@ -89,10 +95,10 @@ if(ishuman(M)) var/mob/living/carbon/human/H = M if(H.status_flags & XENO_HOST) - neuro_callback.Invoke(H, effect_power, TRUE) + neuro_callback.Invoke(H, effect_power, TRUE, TRUE, TRUE) return - neuro_callback.Invoke(M, effect_power, FALSE) + neuro_callback.Invoke(M, effect_power, FALSE, TRUE, TRUE) /datum/ammo/xeno/toxin/medium //Spitter name = "neurotoxic spatter" @@ -110,7 +116,7 @@ max_range = 6 - 1 /datum/ammo/xeno/toxin/queen/on_hit_mob(mob/M,obj/projectile/P) - neuro_callback.Invoke(M, effect_power, TRUE) + neuro_callback.Invoke(M, effect_power, TRUE, FALSE, FALSE) /datum/ammo/xeno/toxin/shotgun name = "neurotoxic droplet" @@ -121,7 +127,6 @@ accuracy_var_high = PROJECTILE_VARIANCE_TIER_6 accurate_range = 5 max_range = 5 - scatter = SCATTER_AMOUNT_NEURO bonus_projectiles_amount = EXTRA_PROJECTILES_TIER_4 /datum/ammo/xeno/toxin/shotgun/New() @@ -132,6 +137,7 @@ /datum/ammo/xeno/toxin/shotgun/additional name = "additional neurotoxic droplets" + scatter = SCATTER_AMOUNT_NEURO bonus_projectiles_amount = 0 /datum/ammo/xeno/acid diff --git a/code/datums/bug_report.dm b/code/datums/bug_report.dm index fd82d4950b91..4025ce38718f 100644 --- a/code/datums/bug_report.dm +++ b/code/datums/bug_report.dm @@ -56,7 +56,7 @@ /datum/tgui_bug_report_form/proc/sanitize_payload(list/params) for(var/param in params) - params[param] = sanitize(params[param], list("\t"=" ","�"=" ")) + params[param] = sanitize(params[param], list("\t"=" ","�"=" ","<"=" ",">"=" ","&"=" ")) return params diff --git a/code/datums/components/deevolve_cooldown.dm b/code/datums/components/deevolve_cooldown.dm new file mode 100644 index 000000000000..ea91f4dd0eff --- /dev/null +++ b/code/datums/components/deevolve_cooldown.dm @@ -0,0 +1,38 @@ +#define XENO_DEEVOLVE_COOLDOWN 5 MINUTES + +/** + * A component that should be on all xenos that should be prevented from de-evolution manipulation. + */ +/datum/component/deevolve_cooldown + /// The xeno that we are bound to + var/mob/living/carbon/xenomorph/parent_xeno + /// Assoc list of caste define to timerid of recent de-evolves this xeno has performed that are still on cooldown + var/list/deevolves_on_cooldown = list() + +/datum/component/deevolve_cooldown/Initialize(mob/living/carbon/xenomorph/old_xeno) + parent_xeno = parent + if(!istype(parent_xeno)) + return COMPONENT_INCOMPATIBLE + var/datum/component/deevolve_cooldown/old_component = old_xeno?.GetComponent(/datum/component/deevolve_cooldown) + if(old_component) + deevolves_on_cooldown = old_component.deevolves_on_cooldown + +/datum/component/deevolve_cooldown/RegisterWithParent() + RegisterSignal(parent_xeno, COMSIG_XENO_DEEVOLVE, PROC_REF(on_deevolve)) + RegisterSignal(parent_xeno, COMSIG_XENO_TRY_EVOLVE, PROC_REF(on_try_evolve)) + +/datum/component/deevolve_cooldown/UnregisterFromParent() + UnregisterSignal(parent_xeno, list(COMSIG_XENO_DEEVOLVE, COMSIG_XENO_TRY_EVOLVE)) + +/// Signal handler for COMSIG_XENO_DEEVOLVE to add the current xeno as a de-evolution +/datum/component/deevolve_cooldown/proc/on_deevolve() + deevolves_on_cooldown[parent_xeno.caste_type] = addtimer(VARSET_LIST_REMOVE_CALLBACK(deevolves_on_cooldown, "[parent_xeno.caste_type]"), XENO_DEEVOLVE_COOLDOWN, TIMER_STOPPABLE) + return + +/// Signal handler for COMSIG_XENO_TRY_EVOLVE to determine is the evolution is allowed +/datum/component/deevolve_cooldown/proc/on_try_evolve(mob/living/carbon/xenomorph/old_xeno, castepick) + var/on_cooldown_timer = deevolves_on_cooldown[castepick] + if(on_cooldown_timer) + to_chat(old_xeno, SPAN_WARNING("We cannot evolve into this caste again yet! ([DisplayTimeText(timeleft(on_cooldown_timer), 1)] remaining)")) + return COMPONENT_OVERRIDE_EVOLVE + return FALSE diff --git a/code/datums/components/resin_cleanup.dm b/code/datums/components/resin_cleanup.dm new file mode 100644 index 000000000000..4305e4b358a4 --- /dev/null +++ b/code/datums/components/resin_cleanup.dm @@ -0,0 +1,19 @@ +/** + * Handles cleaning up resin when the area requests it + */ +/datum/component/resin_cleanup + +/datum/component/resin_cleanup/Initialize(...) + var/area/parent_area = get_area(parent) + + RegisterSignal(parent_area, COMSIG_AREA_RESIN_DISALLOWED, PROC_REF(cleanup_resin)) + +/datum/component/resin_cleanup/proc/cleanup_resin() + SIGNAL_HANDLER + + if(isturf(parent)) + var/turf/parent_turf = parent + addtimer(CALLBACK(parent_turf, TYPE_PROC_REF(/turf, ScrapeAway)), rand(1 SECONDS, 5 SECONDS)) + return + + QDEL_IN(parent, rand(1 SECONDS, 5 SECONDS)) diff --git a/code/datums/components/weed_food.dm b/code/datums/components/weed_food.dm index ce6fe35e4a28..4c8d6112fde2 100644 --- a/code/datums/components/weed_food.dm +++ b/code/datums/components/weed_food.dm @@ -228,8 +228,6 @@ UnregisterSignal(parent_buckle, COMSIG_OBJ_AFTER_BUCKLE) parent_buckle = null - if(parent_mob.is_xeno_grabbable()) - return FALSE if(!(parent_mob.status_flags & PERMANENTLY_DEAD)) var/mob/living/carbon/human/parent_human = parent_mob if(istype(parent_human) && !parent_human.undefibbable) diff --git a/code/datums/decorators/gamemode_decorator.dm b/code/datums/decorators/gamemode_decorator.dm index 0684735e7205..d7ac81e21971 100644 --- a/code/datums/decorators/gamemode_decorator.dm +++ b/code/datums/decorators/gamemode_decorator.dm @@ -119,4 +119,31 @@ GAMEMODE_DECORATOR(/obj/item/clothing/suit/storage/marine/M35, /datum/game_mode/ ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH) )) +//************ USCM Helmet Values ************// + +GAMEMODE_DECORATOR(/obj/item/clothing/head/helmet/marine, /datum/game_mode/extended/faction_clash, list( + ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGH), + ARMOR_EDIT(armor_bomb, CLOTHING_ARMOR_MEDIUM), + ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH) +)) + +GAMEMODE_DECORATOR(/obj/item/clothing/head/helmet/marine/specialist, /datum/game_mode/extended/faction_clash, list( + ARMOR_EDIT(armor_bomb, CLOTHING_ARMOR_ULTRAHIGH), +)) + +//************ Shoe Values ************// + +GAMEMODE_DECORATOR(/obj/item/clothing/shoes/marine, /datum/game_mode/extended/faction_clash, list( + ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGHPLUS), + ARMOR_EDIT(armor_bomb, CLOTHING_ARMOR_MEDIUM), + ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_MEDIUMHIGH) +)) + +//************ Glove Values ************// + +GAMEMODE_DECORATOR(/obj/item/clothing/gloves/marine, /datum/game_mode/extended/faction_clash, list( + ARMOR_EDIT(armor_bullet, CLOTHING_ARMOR_HIGH), + ARMOR_EDIT(armor_internaldamage, CLOTHING_ARMOR_HIGH) +)) + //*********************** ------------------ ***********************// diff --git a/code/datums/elements/bullet_trait/damage_boost.dm b/code/datums/elements/bullet_trait/damage_boost.dm index 20175d11256a..b4733396135a 100644 --- a/code/datums/elements/bullet_trait/damage_boost.dm +++ b/code/datums/elements/bullet_trait/damage_boost.dm @@ -55,6 +55,7 @@ GLOBAL_LIST_INIT(damage_boost_vehicles, typecacheof(/obj/vehicle/multitile)) /datum/element/bullet_trait_damage_boost/proc/check_type(atom/A) if(istype(A, /obj/structure/machinery/door)) return "door" + else if(istype(A, /turf/closed/wall)) return "wall" //add more cases for other interactions (switch doesn't seem to work with istype) else return 0 @@ -73,6 +74,12 @@ GLOBAL_LIST_INIT(damage_boost_vehicles, typecacheof(/obj/vehicle/multitile)) active_damage_mult = 1 //no bonus damage else active_damage_mult = damage_mult + if("wall") + var/turf/closed/wall/hit_wall = hit_atom + if(locate(/mob/living) in hit_wall) + active_damage_mult = 1 //block bonus damage reflected on mobs from wall turfs + else + active_damage_mult = damage_mult //add more cases for other interactions else active_damage_mult = damage_mult diff --git a/code/datums/emergency_calls/clf.dm b/code/datums/emergency_calls/clf.dm index 5441ba3103a7..8400e72fa605 100644 --- a/code/datums/emergency_calls/clf.dm +++ b/code/datums/emergency_calls/clf.dm @@ -33,6 +33,8 @@ to_chat(H, SPAN_BOLD("The arrival of the USCM Battalion, the Falling Falcons, and their flagship, the [MAIN_SHIP_NAME], have reaffirmed that the United Americas considers the Neroid Sector part of their holdings.")) to_chat(H, SPAN_BOLD("It is up to you and your fellow colonists to make them realize their trespasses. This sector is no longer theirs.")) + to_chat(H, SPAN_WARNING(FONT_SIZE_HUGE("YOU ARE HOSTILE to the USCM"))) + /datum/emergency_call/clf/create_member(datum/mind/M, turf/override_spawn_loc) var/turf/spawn_loc = override_spawn_loc ? override_spawn_loc : get_spawn_point() diff --git a/code/datums/emergency_calls/cryo_marines.dm b/code/datums/emergency_calls/cryo_marines.dm index 56fa434d09c3..7b675af8bb97 100644 --- a/code/datums/emergency_calls/cryo_marines.dm +++ b/code/datums/emergency_calls/cryo_marines.dm @@ -15,7 +15,7 @@ /datum/emergency_call/cryo_squad/spawn_candidates(quiet_launch, announce_incoming, override_spawn_loc) var/datum/squad/marine/cryo/cryo_squad = GLOB.RoleAuthority.squads_by_type[/datum/squad/marine/cryo] - leaders = cryo_squad.num_leaders + leaders = cryo_squad.roles_in[JOB_SQUAD_LEADER] . = ..() shipwide_ai_announcement("Successfully deployed [mob_max] Foxtrot marines, of which [length(members)] are ready for duty.") if(mob_max > length(members)) @@ -45,7 +45,7 @@ sleep(5) var/datum/squad/marine/cryo/cryo_squad = GLOB.RoleAuthority.squads_by_type[/datum/squad/marine/cryo] - if(leaders < cryo_squad.max_leaders && (!mind || (HAS_FLAG(human.client.prefs.toggles_ert, PLAY_LEADER) && check_timelock(human.client, JOB_SQUAD_LEADER, time_required_for_job)))) + if(leaders < cryo_squad.roles_cap[JOB_SQUAD_LEADER] && (!mind || (HAS_FLAG(human.client.prefs.toggles_ert, PLAY_LEADER) && check_timelock(human.client, JOB_SQUAD_LEADER, time_required_for_job)))) leader = human leaders++ human.client?.prefs.copy_all_to(human, JOB_SQUAD_LEADER, TRUE, TRUE) diff --git a/code/datums/emergency_calls/cryo_marines_heavy.dm b/code/datums/emergency_calls/cryo_marines_heavy.dm index 42f25a461254..b3fcc390d964 100644 --- a/code/datums/emergency_calls/cryo_marines_heavy.dm +++ b/code/datums/emergency_calls/cryo_marines_heavy.dm @@ -18,7 +18,7 @@ /datum/emergency_call/cryo_squad_equipped/spawn_candidates(quiet_launch, announce_incoming, override_spawn_loc) var/datum/squad/marine/cryo/cryo_squad = GLOB.RoleAuthority.squads_by_type[/datum/squad/marine/cryo] - leaders = cryo_squad.num_leaders + leaders = cryo_squad.roles_in[JOB_SQUAD_LEADER] . = ..() if(length(members)) shipwide_ai_announcement("Successfully deployed [length(members)] Foxtrot marines.") @@ -36,7 +36,7 @@ sleep(5) var/datum/squad/marine/cryo/cryo_squad = GLOB.RoleAuthority.squads_by_type[/datum/squad/marine/cryo] - if(leaders < cryo_squad.max_leaders && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_LEADER) && check_timelock(H.client, JOB_SQUAD_LEADER, time_required_for_job)) + if(leaders < cryo_squad.roles_cap[JOB_SQUAD_LEADER] && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_LEADER) && check_timelock(H.client, JOB_SQUAD_LEADER, time_required_for_job)) leader = H leaders++ arm_equipment(H, /datum/equipment_preset/uscm/leader_equipped/cryo, TRUE, TRUE) diff --git a/code/datums/emergency_calls/deathsquad.dm b/code/datums/emergency_calls/deathsquad.dm index 649f40c8cb83..7808f46d3109 100644 --- a/code/datums/emergency_calls/deathsquad.dm +++ b/code/datums/emergency_calls/deathsquad.dm @@ -48,6 +48,8 @@ to_chat(person, SPAN_ROLE_BODY("Whiteout protocol is in effect for the target, all assets onboard are to be liquidated with expediency unless otherwise instructed by Weyland Yutani personnel holding the position of Director or above.")) arm_equipment(person, /datum/equipment_preset/pmc/w_y_whiteout, TRUE, TRUE) + to_chat(person, SPAN_WARNING(FONT_SIZE_HUGE("YOU ARE [hostility? "HOSTILE":"FRIENDLY"] to the USCM"))) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), person, SPAN_BOLD("Objectives: [objectives]")), 1 SECONDS) /datum/emergency_call/death/low_threat @@ -83,6 +85,8 @@ to_chat(person, SPAN_ROLE_BODY("Whiteout protocol is in effect for the target, all assets onboard are to be liquidated with expediency unless otherwise instructed by Weyland Yutani personnel holding the position of Director or above.")) arm_equipment(person, /datum/equipment_preset/pmc/w_y_whiteout/low_threat, TRUE, TRUE) + to_chat(person, SPAN_WARNING(FONT_SIZE_HUGE("YOU ARE [hostility? "HOSTILE":"FRIENDLY"] to the USCM"))) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), person, SPAN_BOLD("Objectives: [objectives]")), 1 SECONDS) //################################################################################################ diff --git a/code/datums/emergency_calls/deus_vult.dm b/code/datums/emergency_calls/deus_vult.dm index a5ba948c767e..f1863496d50d 100644 --- a/code/datums/emergency_calls/deus_vult.dm +++ b/code/datums/emergency_calls/deus_vult.dm @@ -37,4 +37,7 @@ to_chat(H, SPAN_ROLE_BODY("You must clear out any traces of the unholy from this wretched place!")) to_chat(H, SPAN_ROLE_BODY("Follow any orders directly from the Higher Power!")) + + to_chat(M, SPAN_WARNING(FONT_SIZE_HUGE("YOU ARE [hostility? "HOSTILE":"FRIENDLY"] to the USCM"))) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, SPAN_BOLD("Objectives: [objectives]")), 1 SECONDS) diff --git a/code/datums/emergency_calls/emergency_call.dm b/code/datums/emergency_calls/emergency_call.dm index e956a9731c7c..241a5b3ba6d6 100644 --- a/code/datums/emergency_calls/emergency_call.dm +++ b/code/datums/emergency_calls/emergency_call.dm @@ -272,7 +272,7 @@ if(announce_incoming) marine_announcement(dispatch_message, "Distress Beacon", 'sound/AI/distressreceived.ogg', logging = ARES_LOG_SECURITY) //Announcement that the Distress Beacon has been answered, does not hint towards the chosen ERT - message_admins("Distress beacon: [src.name] finalized, setting up candidates.") + message_admins("Distress beacon: [src.name] finalized, setting up candidates. [hostility? "[SPAN_WARNING("(THEY ARE HOSTILE)")]":"(they are friendly)"].") //Let the deadchat know what's up since they are usually curious for(var/mob/dead/observer/M in GLOB.observer_list) diff --git a/code/datums/emergency_calls/ert_stations.dm b/code/datums/emergency_calls/ert_stations.dm index 5a129723bad0..947007d25d70 100644 --- a/code/datums/emergency_calls/ert_stations.dm +++ b/code/datums/emergency_calls/ert_stations.dm @@ -18,3 +18,6 @@ /datum/lazy_template/ert/uscm_station map_name = "uscm_ert_station" + +/datum/lazy_template/fax_response_base + map_name = "fax_responder_base" diff --git a/code/datums/emergency_calls/hefa_knight.dm b/code/datums/emergency_calls/hefa_knight.dm index 2af2f99f443e..d6c974181f3e 100644 --- a/code/datums/emergency_calls/hefa_knight.dm +++ b/code/datums/emergency_calls/hefa_knight.dm @@ -19,3 +19,6 @@ arm_equipment(H, /datum/equipment_preset/fun/hefa/melee, FALSE, TRUE) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, SPAN_BOLD("Objectives: [objectives]")), 1 SECONDS) + + + to_chat(H, SPAN_WARNING(FONT_SIZE_HUGE("YOU ARE [hostility? "HOSTILE":"FRIENDLY"] to the USCM"))) diff --git a/code/datums/emergency_calls/mercs.dm b/code/datums/emergency_calls/mercs.dm index 33a261a1da5e..642478421322 100644 --- a/code/datums/emergency_calls/mercs.dm +++ b/code/datums/emergency_calls/mercs.dm @@ -50,6 +50,7 @@ else to_chat(H, SPAN_NOTICE(SPAN_BOLD("To this end, you have been contacted by Weyland-Yutani of the USCSS Royce to assist the [MAIN_SHIP_NAME].."))) to_chat(H, SPAN_NOTICE(SPAN_BOLD("Ensure they are not destroyed."))) + to_chat(H, SPAN_WARNING(FONT_SIZE_HUGE("YOU ARE [hostility? "HOSTILE":"FRIENDLY"] to the USCM"))) /datum/emergency_call/mercs/create_member(datum/mind/M, turf/override_spawn_loc) var/turf/spawn_loc = override_spawn_loc ? override_spawn_loc : get_spawn_point() @@ -131,6 +132,7 @@ else to_chat(H, SPAN_NOTICE(SPAN_BOLD("To this end, you have been contacted by Weyland-Yutani of the USCSS Royce to assist the [MAIN_SHIP_NAME].."))) to_chat(H, SPAN_NOTICE(SPAN_BOLD("Ensure they are not destroyed."))) + to_chat(H, SPAN_WARNING(FONT_SIZE_HUGE("YOU ARE [hostility? "HOSTILE":"FRIENDLY"] to the USCM"))) /datum/emergency_call/heavy_mercs/create_member(datum/mind/M, turf/override_spawn_loc) var/turf/spawn_loc = override_spawn_loc ? override_spawn_loc : get_spawn_point() diff --git a/code/datums/emergency_calls/upp.dm b/code/datums/emergency_calls/upp.dm index cb5db1f0e3b9..b5ae046c9b6a 100644 --- a/code/datums/emergency_calls/upp.dm +++ b/code/datums/emergency_calls/upp.dm @@ -2,7 +2,7 @@ //UPP Strike Team /datum/emergency_call/upp - name = "UPP Naval Infantry (Squad)" + name = "UPP Naval Infantry (Squad) (RANDOM)" mob_max = 9 probability = 20 shuttle_id = MOBILE_SHUTTLE_ID_ERT3 @@ -32,12 +32,12 @@ to_chat(M, SPAN_BOLD("You grew up in relatively simple family in [pick(75;"Eurasia", 25;"a famished UPP colony")] with few belongings or luxuries.")) to_chat(M, SPAN_BOLD("The family you grew up with were [pick(50;"getting by", 25;"impoverished", 25;"starving")] and you were one of [pick(10;"two", 20;"three", 20;"four", 30;"five", 20;"six")] children.")) to_chat(M, SPAN_BOLD("You come from a long line of [pick(40;"crop-harvesters", 20;"soldiers", 20;"factory workers", 5;"scientists", 15;"engineers")], and quickly enlisted to improve your living conditions.")) - to_chat(M, SPAN_BOLD("Following your enlistment to the UPP military at the age of 17, you were assigned to the 17th 'Smoldering Sons' battalion (six hundred strong) under the command of Colonel Ganbaatar.")) + to_chat(M, SPAN_BOLD("Following your enlistment to the UPP military at the age of 17, you were assigned to the 17th 'Smoldering Sons' battalion (six hundred strong) under the command of Podpolkovnik Ganbaatar.")) else to_chat(M, SPAN_BOLD("You were brought online in a UPP engineering facility, knowing only your engineers for the first few weeks for your pseudo-life.")) to_chat(M, SPAN_BOLD("You were programmed with all of the medical and combat experience a military fighting force support asset required.")) to_chat(M, SPAN_BOLD("Throughout your career, your engineers, and later, your UPP compatriots, treated you like [pick(75;"a tool, and only that.", 25;"a person, despite your purpose.")]")) - to_chat(M, SPAN_BOLD("Some weeks after your unit integration, you were assigned to the 17th 'Smoldering Sons' battalion (six hundred strong) under the command of Colonel Ganbaatar.")) + to_chat(M, SPAN_BOLD("Some weeks after your unit integration, you were assigned to the 17th 'Smoldering Sons' battalion (six hundred strong) under the command of Podpolkovnik Ganbaatar.")) to_chat(M, SPAN_BOLD("You were shipped off with the battalion to one of the UPP's most remote territories, a gas giant designated MV-35 in the Anglo-Japanese Arm, in the Neroid Sector.")) to_chat(M, SPAN_BOLD("For the past 14 months, you and the rest of the Smoldering Sons have been stationed at MV-35's only facility, the helium refinery, Altai Station.")) to_chat(M, SPAN_BOLD("As MV-35 and Altai Station are the only UPP-held zones in the Neroid Sector for many lightyears, you have spent most of your military career holed up in crammed quarters in near darkness, waiting for supply shipments and transport escort deployments.")) @@ -46,9 +46,10 @@ to_chat(M, SPAN_BOLD("In an effort to protect the vulnerable MV-35 from the encroaching UA/USCM imperialists, the leadership of your battalion has opted this to be the best opportunity to strike at the Falling Falcons to catch them off guard.")) else to_chat(M, SPAN_BOLD("Despite this, the leadership of your battalion questions what may have prompted the distress signal from their rivals. Your squad is to find out why and to render aid to the beleaguered UA forces.")) - to_chat(M, SPAN_WARNING(FONT_SIZE_BIG("Glory to Colonel Ganbaatar."))) + to_chat(M, SPAN_WARNING(FONT_SIZE_BIG("Glory to Podpolkovnik Ganbaatar."))) to_chat(M, SPAN_WARNING(FONT_SIZE_BIG("Glory to the Smoldering Sons."))) to_chat(M, SPAN_WARNING(FONT_SIZE_BIG("Glory to the UPP."))) + to_chat(M, SPAN_WARNING(FONT_SIZE_HUGE("YOU ARE [hostility? "HOSTILE":"FRIENDLY"] to the USCM"))) ///////////////////UPP/////////////////////////// @@ -63,37 +64,37 @@ if(!leader && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_LEADER) && check_timelock(H.client, JOB_SQUAD_LEADER, time_required_for_job)) leader = H - arm_equipment(H, /datum/equipment_preset/upp/leader, TRUE, TRUE) + arm_equipment(H, /datum/equipment_preset/upp/leader/dressed, TRUE, TRUE) to_chat(H, SPAN_ROLE_HEADER("You are an Officer of the Union of Progressive People, a powerful socialist state that rivals the United Americas!")) else if(synths < max_synths && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_SYNTH) && H.client.check_whitelist_status(WHITELIST_SYNTHETIC)) synths++ to_chat(H, SPAN_ROLE_HEADER("You are a Combat Synthetic of the Union of Progressive People, a powerful socialist state that rivals the United Americas!")) - arm_equipment(H, /datum/equipment_preset/upp/synth, TRUE, TRUE) + arm_equipment(H, /datum/equipment_preset/upp/synth/dressed, TRUE, TRUE) else if(medics < max_medics && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_MEDIC) && check_timelock(H.client, JOB_SQUAD_MEDIC, time_required_for_job)) medics++ to_chat(H, SPAN_ROLE_HEADER("You are a Medic of the Union of Progressive People, a powerful socialist state that rivals the United Americas!")) - arm_equipment(H, /datum/equipment_preset/upp/medic, TRUE, TRUE) + arm_equipment(H, /datum/equipment_preset/upp/medic/dressed, TRUE, TRUE) else if(engineers < engineers && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_ENGINEER) && check_timelock(H.client, JOB_SQUAD_ENGI, time_required_for_job)) engineers++ to_chat(H, SPAN_ROLE_HEADER("You are a Sapper of the Union of Progressive People, a powerful socialist state that rivals the United Americas!")) - arm_equipment(H, /datum/equipment_preset/upp/sapper, TRUE, TRUE) + arm_equipment(H, /datum/equipment_preset/upp/sapper/dressed, TRUE, TRUE) else if(heavies < max_heavies && ((!heavy_pick && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_HEAVY)) || (heavy_pick && HAS_FLAG(H.client.prefs.toggles_ert, (PLAY_HEAVY|PLAY_SMARTGUNNER)))) && check_timelock(H.client, heavy_pick ? list(JOB_SQUAD_SPECIALIST, JOB_SQUAD_SMARTGUN) : JOB_SQUAD_SPECIALIST, time_required_for_job)) heavies++ to_chat(H, SPAN_ROLE_HEADER("You are a Sergeant of the Union of Progressive People, a powerful socialist state that rivals the United Americas!")) - var/equipment_path = /datum/equipment_preset/upp/specialist + var/equipment_path = /datum/equipment_preset/upp/specialist/dressed if(heavy_pick) if(HAS_FLAG(H.client.prefs.toggles_ert, PLAY_HEAVY) && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_SMARTGUNNER)) - equipment_path = pick(/datum/equipment_preset/upp/specialist, /datum/equipment_preset/upp/machinegunner) + equipment_path = pick(/datum/equipment_preset/upp/specialist/dressed, /datum/equipment_preset/upp/machinegunner/dressed) else if(HAS_FLAG(H.client.prefs.toggles_ert, PLAY_SMARTGUNNER) && !HAS_FLAG(H.client.prefs.toggles_ert, PLAY_HEAVY)) - equipment_path = /datum/equipment_preset/upp/machinegunner + equipment_path = /datum/equipment_preset/upp/machinegunner/dressed arm_equipment(H, equipment_path, TRUE, TRUE) else if(smartgunners < max_smartgunners && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_SMARTGUNNER) && check_timelock(H.client, JOB_SQUAD_SMARTGUN, time_required_for_job)) smartgunners++ to_chat(H, SPAN_ROLE_HEADER("You are a sergeant of the Union of Progressive People, a powerful socialist state that rivals the United Americas!")) - arm_equipment(H, /datum/equipment_preset/upp/machinegunner, TRUE, TRUE) + arm_equipment(H, /datum/equipment_preset/upp/machinegunner/dressed, TRUE, TRUE) else to_chat(H, SPAN_ROLE_HEADER("You are a soldier of the Union of Progressive People, a powerful socialist state that rivals the United Americas!")) - arm_equipment(H, /datum/equipment_preset/upp/soldier, TRUE, TRUE) + arm_equipment(H, /datum/equipment_preset/upp/soldier/dressed, TRUE, TRUE) print_backstory(H) diff --git a/code/datums/emergency_calls/upp_commando.dm b/code/datums/emergency_calls/upp_commando.dm index 53f117c26127..711d83c629bb 100644 --- a/code/datums/emergency_calls/upp_commando.dm +++ b/code/datums/emergency_calls/upp_commando.dm @@ -14,13 +14,13 @@ to_chat(M, SPAN_BOLD("You grew up in relativly simple family in [pick(75;"Eurasia", 25;"a famished UPP colony")] with few belongings or luxuries.")) to_chat(M, SPAN_BOLD("The family you grew up with were [pick(50;"getting by", 25;"impoverished", 25;"starving")] and you were one of [pick(10;"two", 20;"three", 20;"four", 30;"five", 20;"six")] children.")) to_chat(M, SPAN_BOLD("You come from a long line of [pick(40;"crop-harvesters", 20;"soldiers", 20;"factory workers", 5;"scientists", 15;"engineers")], and quickly enlisted to improve your living conditions.")) - to_chat(M, SPAN_BOLD("Following your enlistment UPP military at the age of 17 you were assigned to the 17th 'Smoldering Sons' battalion (six hundred strong) under the command of Colonel Ganbaatar.")) + to_chat(M, SPAN_BOLD("Following your enlistment UPP military at the age of 17 you were assigned to the 17th 'Smoldering Sons' battalion (six hundred strong) under the command of Podpolkovnik Ganbaatar.")) to_chat(M, SPAN_BOLD("You were shipped off with the battalion to one of the UPP's most remote territories, a gas giant designated MV-35 in the Anglo-Japanese Arm, in the Neroid Sector.")) to_chat(M, SPAN_BOLD("For the past 14 months, you and the rest of the Smoldering Sons have been stationed at MV-35's only facility, the helium refinery, Altai Station.")) to_chat(M, SPAN_BOLD("As MV-35 and Altai Station are the only UPP-held zones in the Neroid Sector for many lightyears, you have spent most of your military career holed up in crammed quarters in near darkness, waiting for supply shipments and transport escort deployments.")) to_chat(M, SPAN_BOLD("With the recent arrival of the enemy USCM battalion the 'Falling Falcons' and their flagship, the [MAIN_SHIP_NAME], the UPP has felt threatened in the sector.")) to_chat(M, SPAN_BOLD("In an effort to protect the vunerable MV-35 from the emproaching UA/USCM imperialists, the leadership of your battalion has opted this the best opportunity to strike at the Falling Falcons to catch them off guard.")) - to_chat(M, SPAN_WARNING(FONT_SIZE_BIG("Glory to Colonel Ganbaatar."))) + to_chat(M, SPAN_WARNING(FONT_SIZE_BIG("Glory to Podpolkovnik Ganbaatar."))) to_chat(M, SPAN_WARNING(FONT_SIZE_BIG("Glory to the Smoldering Sons."))) to_chat(M, SPAN_WARNING(FONT_SIZE_BIG("Glory to the UPP."))) to_chat(M, SPAN_NOTICE(" Use say :3 to speak in your native tongue.")) @@ -38,15 +38,15 @@ if(!leader && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_LEADER) && check_timelock(H.client, JOB_SQUAD_LEADER, time_required_for_job)) //First one spawned is always the leader. leader = H - arm_equipment(H, /datum/equipment_preset/upp/commando/leader, TRUE, TRUE) + arm_equipment(H, /datum/equipment_preset/upp/commando/leader/dressed, TRUE, TRUE) to_chat(H, SPAN_ROLE_HEADER("You are a Commando Team Leader of the Union of Progressive People, a powerful socialist state that rivals the United Americas!")) else if(medics < max_medics && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_MEDIC) && check_timelock(H.client, JOB_SQUAD_MEDIC, time_required_for_job)) medics++ to_chat(H, SPAN_ROLE_HEADER("You are a Commando Medic of the Union of Progressive People, a powerful socialist state that rivals the United Americas!")) - arm_equipment(H, /datum/equipment_preset/upp/commando/medic, TRUE, TRUE) + arm_equipment(H, /datum/equipment_preset/upp/commando/medic/dressed, TRUE, TRUE) else to_chat(H, SPAN_ROLE_HEADER("You are a Commando of the Union of Progressive People, a powerful socialist state that rivals the United Americas!")) - arm_equipment(H, /datum/equipment_preset/upp/commando, TRUE, TRUE) + arm_equipment(H, /datum/equipment_preset/upp/commando/dressed, TRUE, TRUE) print_backstory(H) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, SPAN_BOLD("Objectives: [objectives]")), 1 SECONDS) diff --git a/code/datums/emotes.dm b/code/datums/emotes.dm index 6e84052720d4..1560ce846b42 100644 --- a/code/datums/emotes.dm +++ b/code/datums/emotes.dm @@ -262,6 +262,9 @@ return FALSE if(is_type_in_typecache(user, mob_type_blacklist_typecache)) return FALSE + if(intentional) + if(emote_type & EMOTE_FORCED_AUDIO) + return FALSE if(status_check && !is_type_in_typecache(user, mob_type_ignore_stat_typecache)) if(user.stat > stat_allowed) if(!intentional) @@ -294,6 +297,9 @@ if(istype(user.wear_mask, /obj/item/clothing/mask/muzzle)) return FALSE + if(istype(user.wear_mask, /obj/item/clothing/mask/facehugger)) + return FALSE + if(only_forced_audio && intentional) return FALSE return TRUE diff --git a/code/datums/entities/player.dm b/code/datums/entities/player.dm index fbdcc11e1037..0cba1c1f303a 100644 --- a/code/datums/entities/player.dm +++ b/code/datums/entities/player.dm @@ -509,6 +509,8 @@ BSQL_PROTECT_DATUM(/datum/entity/player) error("ALARM: MISMATCH. Loaded player data for client [ckey], player data ckey is [player.ckey], id: [player.id]") player_data = player player_data.owning_client = src + if(!player_data.discord_link_id) + add_verb(src, /client/proc/discord_connect) if(!player_data.last_login) player_data.first_join_date = "[time2text(world.realtime, "YYYY-MM-DD hh:mm:ss")]" if(!player_data.first_join_date) diff --git a/code/datums/entities/player_sticky_ban.dm b/code/datums/entities/player_sticky_ban.dm index 70715d1ce2f0..bfe6342ec774 100644 --- a/code/datums/entities/player_sticky_ban.dm +++ b/code/datums/entities/player_sticky_ban.dm @@ -131,3 +131,127 @@ BSQL_PROTECT_DATUM(/datum/entity/stickyban) "ip", "linked_stickyban", ) + +/// Returns either a list containing the primary CKEYs this alt is connected to, +/// or FALSE. +/proc/get_player_is_alt(ckey) + var/list/datum/view_record/known_alt/alts = DB_VIEW(/datum/view_record/known_alt, DB_COMP("ckey", DB_EQUALS, ckey)) + if(!length(alts)) + return FALSE + + var/ckeys = list() + for(var/datum/view_record/known_alt/alt as anything in alts) + ckeys += alt.player_ckey + + return ckeys + +/client/proc/add_known_alt() + set name = "Add Known Alt" + set category = "Admin.Alt" + + var/player_ckey = ckey(tgui_input_text(src, "What is the player's primary Ckey?", "Player Ckey")) + if(!player_ckey) + return + + var/datum/entity/player/player = get_player_from_key(player_ckey) + if(!istype(player)) + return + + var/existing_alts = get_player_is_alt(player_ckey) + if(existing_alts) + var/confirm = tgui_alert(src, "Primary Ckey [player_ckey] is already an alt for [english_list(existing_alts)].", "Primary Ckey", list("Confirm", "Cancel")) + + if(confirm != "Confirm") + return + + var/whitelist_to_add = ckey(tgui_input_text(src, "What is the Ckey that should be added to known alts?", "Alt Ckey")) + if(!whitelist_to_add) + return + + var/alts_existing_primaries = get_player_is_alt(whitelist_to_add) + if(alts_existing_primaries) + if(player_ckey in alts_existing_primaries) + to_chat(src, SPAN_WARNING("The alt '[whitelist_to_add]' is already set as an alt Ckey for '[player_ckey]'.")) + return + + var/confirm = tgui_alert(src, "Alt is already an alt for [english_list(alts_existing_primaries)].", "Alt Ckey", list("Confirm", "Cancel")) + + if(confirm != "Confirm") + return + + var/datum/entity/known_alt/alt = DB_ENTITY(/datum/entity/known_alt) + alt.player_id = player.id + alt.player_ckey = player.ckey + alt.ckey = whitelist_to_add + + alt.save() + + to_chat(src, SPAN_NOTICE("[alt.ckey] added to the known alts of [player.ckey].")) + +/client/proc/remove_known_alt() + set name = "Remove Known Alt" + set category = "Admin.Alt" + + var/player_ckey = ckey(tgui_input_text(src, "What is the player's primary Ckey?", "Player Ckey")) + if(!player_ckey) + return + + var/datum/entity/player/player = get_player_from_key(player_ckey) + if(!istype(player)) + return + + var/existing_alts = get_player_is_alt(player_ckey) + if(existing_alts) + var/confirm = tgui_alert(src, "Primary Ckey [player_ckey] is already an alt for [english_list(existing_alts)].", "Primary Ckey", list("Confirm", "Cancel")) + + if(confirm != "Confirm") + return + + var/list/datum/view_record/known_alt/alts = DB_VIEW(/datum/view_record/known_alt, DB_COMP("player_id", DB_EQUALS, player.id)) + if(!length(alts)) + to_chat(src, SPAN_WARNING("User has no alts on record.")) + return + + var/options = list() + for(var/datum/view_record/known_alt/alt in alts) + options[alt.ckey] = alt.id + + var/picked = tgui_input_list(src, "Which known alt should be removed?", "Alt Removal", options) + if(!picked) + return + + var/picked_id = options[picked] + var/datum/entity/known_alt/to_delete = DB_ENTITY(/datum/entity/known_alt, picked_id) + to_delete.delete() + + to_chat(src, SPAN_NOTICE("[picked] removed from the known alts of [player.ckey].")) + +/datum/entity/known_alt + var/player_id + var/player_ckey + var/ckey + +/datum/entity_meta/known_alt + entity_type = /datum/entity/known_alt + table_name = "known_alts" + field_types = list( + "player_id" = DB_FIELDTYPE_BIGINT, + "player_ckey" = DB_FIELDTYPE_STRING_LARGE, + "ckey" = DB_FIELDTYPE_STRING_LARGE, + ) + +/datum/view_record/known_alt + var/id + var/player_id + var/player_ckey + var/ckey + +/datum/entity_view_meta/known_alt + root_record_type = /datum/entity/known_alt + destination_entity = /datum/view_record/known_alt + fields = list( + "id", + "player_id", + "player_ckey", + "ckey", + ) diff --git a/code/datums/factions/upp.dm b/code/datums/factions/upp.dm index 0506833f80c3..844e69545279 100644 --- a/code/datums/factions/upp.dm +++ b/code/datums/factions/upp.dm @@ -5,6 +5,9 @@ /datum/faction/upp/modify_hud_holder(image/holder, mob/living/carbon/human/H) var/hud_icon_state var/obj/item/card/id/ID = H.get_idcard() + var/default_color = FALSE //so squad units get red icons as survs and ERT + var/datum/squad/squad = H.assigned_squad + var/_role if(H.mind) _role = H.job @@ -13,12 +16,16 @@ switch(_role) if(JOB_UPP_MEDIC) hud_icon_state = "med" + default_color = TRUE if(JOB_UPP_ENGI) hud_icon_state = "sapper" + default_color = TRUE if(JOB_UPP_SPECIALIST) hud_icon_state = "spec" + default_color = TRUE if(JOB_UPP_LEADER) hud_icon_state = "sl" + default_color = TRUE if(JOB_UPP_POLICE) hud_icon_state = "mp" if(JOB_UPP_LT_OFFICER) @@ -29,10 +36,10 @@ hud_icon_state = "xo" if(JOB_UPP_MAY_OFFICER) hud_icon_state = "co" - if(JOB_UPP_LTKOL_OFFICER) - hud_icon_state = "co" if(JOB_UPP_KOL_OFFICER) hud_icon_state = "co" + if(JOB_UPP_BRIG_GENERAL) + hud_icon_state = "co" if(JOB_UPP_MAY_GENERAL) hud_icon_state = "co" if(JOB_UPP_LT_GENERAL) @@ -58,19 +65,32 @@ if(JOB_UPP_COMMISSAR) hud_icon_state = "commi" if(hud_icon_state) - holder.overlays += image('icons/mob/hud/marine_hud.dmi', H, "upp_[hud_icon_state]") + holder.overlays += image('icons/mob/hud/marine_hud.dmi', H, "upp_background") + var/image/rank_icon_image = image('icons/mob/hud/marine_hud.dmi', H, "upp_[hud_icon_state]") + if(istype(squad)) + rank_icon_image.color = squad.equipment_color + var/image/squad_circle = image('icons/mob/hud/marine_hud.dmi', H, "upp_squad_circle") + squad_circle.color = squad.equipment_color + holder.overlays += squad_circle + else + if(default_color) + rank_icon_image.color = "#e61919" + holder.overlays += rank_icon_image /datum/faction/upp/get_antag_guns_snowflake_equipment() return list( list("PRIMARY FIREARMS", 0, null, null, null), + list("Type 71 Pulse Rifle", 20, /obj/item/weapon/gun/rifle/type71, null, VENDOR_ITEM_RECOMMENDED), + list("Type 71 Pulse Rifle Carbine", 20, /obj/item/weapon/gun/rifle/type71/carbine, null, VENDOR_ITEM_REGULAR), list("Type 64 Submachinegun", 20, /obj/item/weapon/gun/smg/bizon/upp, null, VENDOR_ITEM_REGULAR), - list("Type 71 Pulse Rifle", 30, /obj/item/weapon/gun/rifle/type71, null, VENDOR_ITEM_REGULAR), - list("Type 71 Pulse Rifle Carbine", 30, /obj/item/weapon/gun/rifle/type71/carbine, null, VENDOR_ITEM_REGULAR), + list("Type 23 Riot Shotgun", 20, /obj/item/weapon/gun/shotgun/type23, null, VENDOR_ITEM_REGULAR), + list("PRIMARY AMMUNITION", 0, null, null, null), - list("Type 64 Helical Magazine (7.62x19mm)", 5, /obj/item/ammo_magazine/smg/bizon, null, VENDOR_ITEM_REGULAR), list("Type 71 AP Magazine (5.45x39mm)", 15, /obj/item/ammo_magazine/rifle/type71/ap, null, VENDOR_ITEM_REGULAR), list("Type 71 Magazine (5.45x39mm)", 5, /obj/item/ammo_magazine/rifle/type71, null, VENDOR_ITEM_REGULAR), + list("Type 64 Helical Magazine (7.62x19mm)", 5, /obj/item/ammo_magazine/smg/bizon, null, VENDOR_ITEM_REGULAR), + list("Handful of Heavy Buckshot Shells (8g)", 5, /obj/item/ammo_magazine/handful/shotgun/heavy/buckshot, null, VENDOR_ITEM_REGULAR), list("SIDEARMS", 0, null, null, null), list("Type 73 Pistol", 15, /obj/item/weapon/gun/pistol/t73, null, VENDOR_ITEM_REGULAR), @@ -86,6 +106,7 @@ list("Angled Grip", 15, /obj/item/attachable/angledgrip, null, VENDOR_ITEM_REGULAR), list("Burst Fire Assembly", 15, /obj/item/attachable/burstfire_assembly, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 15, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), + list("Magnetic Harness", 20, /obj/item/attachable/magnetic_harness, null, VENDOR_ITEM_REGULAR), list("Laser Sight", 15, /obj/item/attachable/lasersight, null, VENDOR_ITEM_REGULAR), list("Rail Flashlight", 5, /obj/item/attachable/flashlight, null, VENDOR_ITEM_REGULAR), list("Red-Dot Sight", 15, /obj/item/attachable/reddot, null, VENDOR_ITEM_REGULAR), @@ -102,27 +123,29 @@ /datum/faction/upp/get_antag_guns_sorted_equipment() return list( list("PRIMARY FIREARMS", -1, null, null), - list("Type 64 Submachinegun", 20, /obj/item/weapon/gun/smg/bizon/upp, VENDOR_ITEM_REGULAR), - list("Type 71 Pulse Rifle", 20, /obj/item/weapon/gun/rifle/type71, VENDOR_ITEM_REGULAR), - list("Type 71 Pulse Rifle Carbine", 20, /obj/item/weapon/gun/rifle/type71/carbine, VENDOR_ITEM_REGULAR), + list("Type 71 Pulse Rifle", 20, /obj/item/weapon/gun/rifle/type71, null, VENDOR_ITEM_REGULAR), + list("Type 71 Pulse Rifle Carbine", 20, /obj/item/weapon/gun/rifle/type71/carbine, null, VENDOR_ITEM_REGULAR), + list("Type 64 Submachinegun", 20, /obj/item/weapon/gun/smg/bizon/upp, null, VENDOR_ITEM_REGULAR), + list("Type 23 Riot Shotgun", 20, /obj/item/weapon/gun/shotgun/type23, null, VENDOR_ITEM_REGULAR), list("PRIMARY AMMUNITION", -1, null, null), - list("Type 64 Helical Magazine (7.62x19mm)", 60, /obj/item/ammo_magazine/smg/bizon, VENDOR_ITEM_REGULAR), - list("Type 71 AP Magazine (5.45x39mm)", 60, /obj/item/ammo_magazine/rifle/type71/ap, VENDOR_ITEM_REGULAR), - list("Type 71 Magazine (5.45x39mm)", 60, /obj/item/ammo_magazine/rifle/type71, VENDOR_ITEM_REGULAR), + list("Type 71 AP Magazine (5.45x39mm)", 60, /obj/item/ammo_magazine/rifle/type71/ap, null, VENDOR_ITEM_REGULAR), + list("Type 71 Magazine (5.45x39mm)", 60, /obj/item/ammo_magazine/rifle/type71, null, VENDOR_ITEM_RECOMMENDED), + list("Type 64 Helical Magazine (7.62x19mm)", 60, /obj/item/ammo_magazine/smg/bizon, null, VENDOR_ITEM_REGULAR), + list("Handful of Heavy Buckshot Shells (8g)", 60, /obj/item/ammo_magazine/handful/shotgun/heavy/buckshot, null, VENDOR_ITEM_REGULAR), list("SIDEARMS", -1, null, null), - list("Type 73 Pistol", 20, /obj/item/weapon/gun/pistol/t73, VENDOR_ITEM_REGULAR), - list("NP02 Pistol", 20, /obj/item/weapon/gun/pistol/np92, VENDOR_ITEM_REGULAR), - list("ZHNK-72 Revolver", 20, /obj/item/weapon/gun/revolver/upp, VENDOR_ITEM_REGULAR), + list("Type 73 Pistol", 20, /obj/item/weapon/gun/pistol/t73, null, VENDOR_ITEM_REGULAR), + list("NP02 Pistol", 20, /obj/item/weapon/gun/pistol/np92, null, VENDOR_ITEM_REGULAR), + list("ZHNK-72 Revolver", 20, /obj/item/weapon/gun/revolver/upp, null, VENDOR_ITEM_REGULAR), list("SIDEARM AMMUNITION", -1, null, null), - list("Type 73 Magazine (7.62x25mm Tokarev)", 40, /obj/item/ammo_magazine/pistol/t73, VENDOR_ITEM_REGULAR), - list("ZHNK-72 Speed Loader (7.62x38mmR)", 40, /obj/item/ammo_magazine/revolver/upp, VENDOR_ITEM_REGULAR), - list("NP92 Magazine (9x18mm Makarov)", 40, /obj/item/ammo_magazine/pistol/np92, VENDOR_ITEM_REGULAR), + list("Type 73 Magazine (7.62x25mm Tokarev)", 40, /obj/item/ammo_magazine/pistol/t73, null, VENDOR_ITEM_REGULAR), + list("NP92 Magazine (9x18mm Makarov)", 40, /obj/item/ammo_magazine/pistol/np92, null, VENDOR_ITEM_REGULAR), + list("ZHNK-72 Speed Loader (7.62x38mmR)", 40, /obj/item/ammo_magazine/revolver/upp, null, VENDOR_ITEM_REGULAR), list("UTILITIES", -1, null, null), - list("M94 Marking Flare Pack", 20, /obj/item/storage/box/m94, VENDOR_ITEM_RECOMMENDED), - list("Smoke Grenade", 5, /obj/item/explosive/grenade/smokebomb, VENDOR_ITEM_REGULAR), - list("Type 80 Bayonet", 40, /obj/item/attachable/bayonet/upp, VENDOR_ITEM_REGULAR), + list("M94 Marking Flare Pack", 20, /obj/item/storage/box/m94, null, VENDOR_ITEM_REGULAR), + list("Smoke Grenade", 5, /obj/item/explosive/grenade/smokebomb, null, VENDOR_ITEM_REGULAR), + list("Type 80 Bayonet", 40, /obj/item/attachable/bayonet/upp, null, VENDOR_ITEM_REGULAR), ) diff --git a/code/datums/factions/uscm.dm b/code/datums/factions/uscm.dm index 6a4b61289ea3..af45455424f8 100644 --- a/code/datums/factions/uscm.dm +++ b/code/datums/factions/uscm.dm @@ -17,7 +17,11 @@ if(JOB_SQUAD_ENGI) marine_rk = "engi" if(JOB_SQUAD_SPECIALIST) marine_rk = "spec" if(JOB_SQUAD_TEAM_LEADER) marine_rk = "tl" - if(JOB_SQUAD_MEDIC) marine_rk = "med" + if(JOB_SQUAD_MEDIC) + if(current_human.rank_fallback == "medk9") + marine_rk = "medk9" //We don't need Medics to lose their job when converting to K9 Handlers as it would duplicate JOB_SQUAD_MEDIC + else + marine_rk = "med" if(JOB_SQUAD_SMARTGUN) marine_rk = "gun" if(JOB_XO) marine_rk = "xo" if(JOB_CO) marine_rk = "co" @@ -139,6 +143,8 @@ border_rk = "command" if(JOB_SYNTH) marine_rk = "syn" + if(JOB_SYNTH_K9) + marine_rk = "syn_k9" if(JOB_MESS_SERGEANT) marine_rk = "messtech" // Provost diff --git a/code/datums/fluff_emails.dm b/code/datums/fluff_emails.dm index f7083541dd5a..12b7af74e1de 100644 --- a/code/datums/fluff_emails.dm +++ b/code/datums/fluff_emails.dm @@ -192,3 +192,48 @@ "} + +/datum/fluff_email/almayer/newgunny + title = "RE: New Gunny" + entry_text = {" + Hey man, you gotta be careful with those razors, + if our new Platoon Sergeant catches you trying to sell your stash, you'll be in for a world of pain. +
+
+ Way I heard it, he transferred in from dealing with the shittiest boot camp at Twentynine Palms, + so he's extra rough around the edges and might just cut you to ribbons with your own supply. + + "} + +/datum/fluff_email/almayer/immunization + title = "RE: Immunizations & Training" + entry_text = {" + One of the battalions just got mulched by a Beebop group and the AAR suggests their training was neglected, it's one hell of a shit show over here. + Command is breathing down everyone's necks and wants the entire regiment on high readiness. Orders are going out to immediately assess each battalion's state and conduct training. +
+
+ Make sure that the recent transfers to the battalion undergo the immunization program, you know the one that was prepared for Swamp Hopper. + It's apart of the readiness check, gotta be prepared for those plant-suckin shitholes like back on O'Bannon's. +
+
+ This is your heads-up, don't make me get chewed out chief. + + "} + +/datum/fluff_email/almayer/morevehicles + title = "RE: Any chance of replacement vehicles?" + entry_text = {" + No, sorry. What we lost on Tychon was what we had. Maisie thinks there might be enough spare bits left to refurbish + one of the old rust buckets, but the chances of that are next to nil unless she can pull more than coins from behind her ear. + + "} + +//Sticking this here because I'm too lazy to type it all out. +/* +/datum/fluff_email/almayer/ + title = "" + entry_text = {" + + + "} +*/ diff --git a/code/datums/global_variables.dm b/code/datums/global_variables.dm index 24d32bbf3552..87267ada41b6 100644 --- a/code/datums/global_variables.dm +++ b/code/datums/global_variables.dm @@ -211,7 +211,7 @@ to_chat(src, "A variable with this name ([param_var_name]) doesn't exist among global variables") return - if(param_var_name in locked && !check_rights(R_DEBUG)) + if((param_var_name in locked) && !check_rights(R_DEBUG)) return variable = param_var_name @@ -270,7 +270,7 @@ if(!variable) return var_value = global.vars[variable] - if(variable in locked && !check_rights(R_DEBUG)) + if((variable in locked) && !check_rights(R_DEBUG)) return if(!autodetect_class) diff --git a/code/datums/internet_media.dm b/code/datums/internet_media.dm new file mode 100644 index 000000000000..6c1c23b76e6b --- /dev/null +++ b/code/datums/internet_media.dm @@ -0,0 +1,112 @@ +/** + * Generic implementation to get a URL that can be sent to + * clients to play audio via [/datum/tgui_panel/proc/play_music], from a provided URL + */ +/datum/internet_media + /** + * If we have encountered an error while attempting to retrieve the URL + */ + var/error + +/** + * Handles a request for an audio file, from a provided media URL + * Must return a [/datum/media_response], which must have at least the [/datum/media_response/var/url] filled out + * + * If we are not returning a media_response, set the [/datum/internet_media/var/error] to be an error + */ +/datum/internet_media/proc/get_media(url) + RETURN_TYPE(/datum/media_response) + + CRASH("[type] does not override [nameof(__PROC__)].") + +/datum/internet_media/yt_dlp + +/datum/internet_media/yt_dlp/get_media(url) + var/ytdl = CONFIG_GET(string/invoke_youtubedl) + if(!ytdl) + error = "Youtube-dl FAILED: Not configured" + return + + if(findtext(url, ":") && !findtext(url, GLOB.is_http_protocol)) + error = "Youtube-dl FAILED: Non-http(s) URIs are not allowed. For youtube-dl shortcuts like ytsearch: please use the appropriate full url from the website." + return + + var/list/output = world.shelleo("[ytdl] --geo-bypass --format \"bestaudio\[ext=mp3]/best\[ext=mp4]\[height<=360]/bestaudio\[ext=m4a]/bestaudio\[ext=aac]\" --dump-single-json --no-playlist -- \"[shell_url_scrub(url)]\"") + var/errorlevel = output[SHELLEO_ERRORLEVEL] + var/stdout = output[SHELLEO_STDOUT] + var/stderr = output[SHELLEO_STDERR] + + if(errorlevel) + error = "Youtube-dl URL retrieval FAILED: [stderr]" + return + + var/data + + try + data = json_decode(stdout) + catch(var/exception/decode_error) + error = "Youtube-dl JSON parsing FAILED: [decode_error]: [stdout]" + return + + return new /datum/media_response(data["url"], data["title"], data["start_time"], data["end_time"]) + +/datum/internet_media/cobalt + +/datum/internet_media/cobalt/get_media(url) + var/cobalt = CONFIG_GET(string/cobalt_base_api) + if(!cobalt) + error = "cobalt.tools FAILED: Not configured" + return + + var/list/headers = list() + headers["Accept"] = "application/json" + headers["Content-Type"] = "application/json" + + var/auth_key = CONFIG_GET(string/cobalt_api_key) + if(auth_key) + headers["Authorization"] = "Api-Key [auth_key]" + + var/datum/http_request/request = new + request.prepare(RUSTG_HTTP_METHOD_POST, cobalt, json_encode(list( + "url" = url, + "downloadMode" = "audio" + )), headers) + + request.execute_blocking() + + var/datum/http_response/response_raw = request.into_response() + + if(response_raw.errored) + error = "cobalt.tools web request FAILED: [response_raw.error]" + return + + var/list/response + try + response = json_decode(response_raw.body) + catch(var/exception/decode_error) + error = "cobalt.tools JSON parsing FAILED: [decode_error]: [response_raw.body]" + return + + if(!(response["status"] in list("redirect", "tunnel"))) + error = "cobalt.tools request FAILED - invalid response: [response_raw.body]" + return + + return new /datum/media_response(response["url"]) + +/datum/media_response + var/url + var/title + var/start_time + var/end_time + +/datum/media_response/New(url, title, start_time, end_time) + if(isnull(url)) + CRASH("/datum/media_response created without a URL field.") + + src.url = url + src.title = title + src.start_time = start_time + src.end_time = end_time + +/datum/media_response/proc/get_list() + return list("url" = url, "title" = title, "start_time" = start_time, "end_time" = end_time) diff --git a/code/datums/keybinding/human.dm b/code/datums/keybinding/human.dm index 810ee828880b..0a2d015dc6ef 100644 --- a/code/datums/keybinding/human.dm +++ b/code/datums/keybinding/human.dm @@ -3,7 +3,7 @@ weight = WEIGHT_MOB /datum/keybinding/human/can_use(client/user) - return ishuman(user.mob) + return ishuman(user.mob) && user.mob.stat == CONSCIOUS /datum/keybinding/human/issue_order hotkey_keys = list("Unbound") @@ -135,3 +135,97 @@ cycle_action?.set_action_overlay(cycled_hud) return TRUE + +/datum/keybinding/human/pixel_shift + hotkey_keys = list("Unbound") + classic_keys = list("Unbound") + +/datum/keybinding/human/pixel_shift/can_use(client/user) + . = ..() + if(!.) + return + + var/mob/living/carbon/human/human_user = user.mob + var/obj/item/grab/grab = human_user.get_active_hand() + if(!istype(grab)) + return FALSE + var/obj/grabbed_atom = grab.grabbed_thing + if(ismob(grabbed_atom)) + return FALSE + if(grabbed_atom.anchored) + return FALSE + if(istype(grabbed_atom, /obj/structure)) + return FALSE + return TRUE + +/datum/keybinding/human/pixel_shift/north + name = "pixel_shift_grabbed_north" + full_name = "Pixel Shift Grabbed - North" + keybind_signal = COMSIG_KB_HUMAN_PIXEL_SHIFT_GRABBED_NORTH + +/datum/keybinding/human/pixel_shift/north/down(client/user) + . = ..() + if(.) + return + var/mob/living/carbon/human/human_user = user.mob + var/obj/item/grab/grab = human_user.get_active_hand() + var/obj/grabbed = grab.grabbed_thing + + if(grabbed.pixel_y >= 16) + return + grabbed.pixel_y += 1 + return TRUE + +/datum/keybinding/human/pixel_shift/south + name = "pixel_shift_grabbed_south" + full_name = "Pixel Shift Grabbed - South" + keybind_signal = COMSIG_KB_HUMAN_PIXEL_SHIFT_GRABBED_SOUTH + +/datum/keybinding/human/pixel_shift/south/down(client/user) + . = ..() + if(.) + return + var/mob/living/carbon/human/human_user = user.mob + var/obj/item/grab/grab = human_user.get_active_hand() + var/obj/grabbed = grab.grabbed_thing + + if(grabbed.pixel_y <= -16) + return + grabbed.pixel_y -= 1 + return TRUE + +/datum/keybinding/human/pixel_shift/east + name = "pixel_shift_grabbed_east" + full_name = "Pixel Shift Grabbed - East" + keybind_signal = COMSIG_KB_HUMAN_PIXEL_SHIFT_GRABBED_EAST + +/datum/keybinding/human/pixel_shift/east/down(client/user) + . = ..() + if(.) + return + var/mob/living/carbon/human/human_user = user.mob + var/obj/item/grab/grab = human_user.get_active_hand() + var/obj/grabbed = grab.grabbed_thing + + if(grabbed.pixel_x >= 16) + return + grabbed.pixel_x += 1 + return TRUE + +/datum/keybinding/human/pixel_shift/west + name = "pixel_shift_grabbed_west" + full_name = "Pixel Shift Grabbed - West" + keybind_signal = COMSIG_KB_HUMAN_PIXEL_SHIFT_GRABBED_WEST + +/datum/keybinding/human/pixel_shift/west/down(client/user) + . = ..() + if(.) + return + var/mob/living/carbon/human/human_user = user.mob + var/obj/item/grab/grab = human_user.get_active_hand() + var/obj/grabbed = grab.grabbed_thing + + if(grabbed.pixel_x <= -16) + return + grabbed.pixel_x -= 1 + return TRUE diff --git a/code/datums/keybinding/yautja.dm b/code/datums/keybinding/yautja.dm index 947d80854a35..2933684f8bba 100644 --- a/code/datums/keybinding/yautja.dm +++ b/code/datums/keybinding/yautja.dm @@ -118,12 +118,12 @@ if(istype(H.gloves, /obj/item/clothing/gloves/yautja/hunter)) return TRUE -/datum/keybinding/yautja/bracer_hunter/wristblades +/datum/keybinding/yautja/bracer_hunter/bracer_attachments hotkey_keys = list("Unbound") classic_keys = list("Unbound") - name = "wristblades" - full_name = "Toggle wristblades" - keybind_signal = COMSIG_KB_YAUTJA_WRISTBLADES + name = "Bracer Attachments" + full_name = "Use Bracer Attachments" + keybind_signal = COMSIG_KB_YAUTJA_BRACER_ATTACHMENT /datum/keybinding/yautja/bracer_hunter/track_gear hotkey_keys = list("Unbound") @@ -277,7 +277,7 @@ hotkey_keys = list("Unbound") classic_keys = list("Unbound") name = "bracername" - full_name = "Toggle bracer name" + full_name = "Toggle Bracer Name" keybind_signal = COMSIG_KB_YAUTJA_BRACERNAME /datum/keybinding/yautja/bracer_hunter/bracername/down(client/user) diff --git a/code/datums/langchat/langchat.dm b/code/datums/langchat/langchat.dm index b82b03b51774..317f80642c45 100644 --- a/code/datums/langchat/langchat.dm +++ b/code/datums/langchat/langchat.dm @@ -10,6 +10,7 @@ /mob/living/carbon/xenomorph/hivelord/langchat_height = 64 /mob/living/carbon/xenomorph/defender/langchat_height = 48 /mob/living/carbon/xenomorph/warrior/langchat_height = 48 +/mob/living/carbon/xenomorph/king/langchat_height = 64 #define LANGCHAT_LONGEST_TEXT 64 #define LANGCHAT_WIDTH 96 diff --git a/code/datums/map_config.dm b/code/datums/map_config.dm index fc527f07a9e0..2880b7b84d43 100644 --- a/code/datums/map_config.dm +++ b/code/datums/map_config.dm @@ -32,6 +32,7 @@ var/announce_text = "" var/infection_announce_text = "" + var/liaison_briefing = "" var/squads_max_num = 4 @@ -347,6 +348,9 @@ if(json["infection_announce_text"]) infection_announce_text = json["infection_announce_text"] + if(json["liaison_briefing"]) + liaison_briefing = json["liaison_briefing"] + if(json["weather_holder"]) weather_holder = text2path(json["weather_holder"]) if(!weather_holder) diff --git a/code/datums/mob_hud.dm b/code/datums/mob_hud.dm index 64ad6e31280a..c2cb0d8791f0 100644 --- a/code/datums/mob_hud.dm +++ b/code/datums/mob_hud.dm @@ -478,6 +478,7 @@ GLOBAL_LIST_INIT_TYPED(huds, /datum/mob_hud, list( holder2.icon_state = "huddeaddefib" holder3.icon_state = "huddead" holder2_set = 1 + update_minimap_icon() else if(is_heart_broken()) // broken heart icon holder.icon_state = "huddeadheart" diff --git a/code/datums/paygrades/factions/upp/upp.dm b/code/datums/paygrades/factions/upp/upp.dm index 3eef33921137..afa07a96572f 100644 --- a/code/datums/paygrades/factions/upp/upp.dm +++ b/code/datums/paygrades/factions/upp/upp.dm @@ -12,37 +12,38 @@ /datum/paygrade/upp/ue1 paygrade = PAY_SHORT_UE1 - name = "Private" - prefix = "PVT." + name = "Ryadovoy" + prefix = "Rya." + pay_multiplier = 0.1 /datum/paygrade/upp/ue2 paygrade = PAY_SHORT_UE2 - name = "Private First Class" - prefix = "PFC." - pay_multiplier = 0.2 + name = "Efreitor" + prefix = "Efr." + pay_multiplier = 0.15 /datum/paygrade/upp/ue3 paygrade = PAY_SHORT_UE3 - name = "Korporal" - prefix = "Kpl." + name = "Mladshiy Serzhant" + prefix = "MSzht." pay_multiplier = 0.3 /datum/paygrade/upp/ue4 paygrade = PAY_SHORT_UE4 - name = "Junior Serzhant" - prefix = "JrSzh." + name = "Serzhant" + prefix = "Sgt." pay_multiplier = 0.5 /datum/paygrade/upp/ue5 paygrade = PAY_SHORT_UE5 - name = "Serzhant" - prefix = "Szh." + name = "Starshiy Serzhant" + prefix = "SSgt." pay_multiplier = 0.7 /datum/paygrade/upp/ue6 paygrade = PAY_SHORT_UE6 - name = "Master Serzhant" - prefix = "MSzh." + name = "Starshyna" + prefix = "StS" pay_multiplier = 0.9 //UPP Commandos @@ -69,15 +70,15 @@ //UPP Officers /datum/paygrade/upp/uo1 paygrade = PAY_SHORT_UO1 - name = "Leytenant" - prefix = "Lt." + name = "Mladshiy Leytenant" + prefix = "MsLt." pay_multiplier = 1.25 officer_grade = GRADE_OFFICER /datum/paygrade/upp/uo2 paygrade = PAY_SHORT_UO2 - name = "Senior Leytenant" - prefix = "Sr. LT." + name = "Starshiy Leytenant" + prefix = "SrLt." pay_multiplier = 1.5 officer_grade = GRADE_OFFICER @@ -104,35 +105,35 @@ /datum/paygrade/upp/uo5 paygrade = PAY_SHORT_UO5 - name = "Leytenant Kolonel" - prefix = "Lt. Kol." + name = "Podpolkovnik" + prefix = "Pdk." pay_multiplier = 3 officer_grade = GRADE_OFFICER /datum/paygrade/upp/uo6 paygrade = PAY_SHORT_UO6 - name = "Kolonel" - prefix = "Kol." + name = "Polkovnik" + prefix = "Plk." pay_multiplier = 4 officer_grade = GRADE_OFFICER /datum/paygrade/upp/uo7 paygrade = PAY_SHORT_UO7 - name = "Mayjor General" - prefix = "May. Gen." + name = "General Leytenant" + prefix = "GenLt." pay_multiplier = 5 officer_grade = GRADE_FLAG /datum/paygrade/upp/uo8 paygrade = PAY_SHORT_UO8 - name = "Leytenant General" - prefix = "Lt. Gen." + name = "General Polkovnik" + prefix = "GenPlk" pay_multiplier = 6 officer_grade = GRADE_FLAG /datum/paygrade/upp/uo9 paygrade = PAY_SHORT_UO9 - name = "Army General" - prefix = "Gen." + name = "General Armii" + prefix = "GenArm." pay_multiplier = 7 officer_grade = GRADE_FLAG diff --git a/code/datums/paygrades/factions/uscm/marine.dm b/code/datums/paygrades/factions/uscm/marine.dm index 6a1446dd6b60..f6f77b717a98 100644 --- a/code/datums/paygrades/factions/uscm/marine.dm +++ b/code/datums/paygrades/factions/uscm/marine.dm @@ -231,3 +231,13 @@ ranking = 25 pay_multiplier = 7 officer_grade = GRADE_FLAG + +//Historical Background: Combat Dogs were given the lowest officer rank possible, they have no notional command but if someone were to abuse the animal, the offender could be charged with assaulting an officer. +/datum/paygrade/marine/k9 + paygrade = PAY_SHORT_SYN_K9 + name = "Second Lieutenant Combat Lifesaver" + prefix = "2ndLt Combat Lifesaver" + rank_pin = /obj/item/clothing/accessory/ranks/marine/o1 + ranking = 12 + pay_multiplier = 0 + officer_grade = GRADE_OFFICER diff --git a/code/datums/skills/civilian.dm b/code/datums/skills/civilian.dm index ff9cadf02913..b37fdad883c7 100644 --- a/code/datums/skills/civilian.dm +++ b/code/datums/skills/civilian.dm @@ -97,6 +97,7 @@ CIVILIAN /datum/skills/civilian/survivor/pmc/medic name = "Survivor PMC Medic" additional_skills = list( + SKILL_CQC = SKILL_CQC_TRAINED, SKILL_POLICE = SKILL_POLICE_SKILLED, SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, @@ -109,6 +110,7 @@ CIVILIAN /datum/skills/civilian/survivor/pmc/engineer name = "Survivor PMC Engineer" additional_skills = list( + SKILL_CQC = SKILL_CQC_TRAINED, SKILL_POLICE = SKILL_POLICE_SKILLED, SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, @@ -120,6 +122,23 @@ CIVILIAN SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, ) +/datum/skills/civilian/survivor/pmc/lead + name = "Survivor PMC Team Leader" + additional_skills = list( + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_VEHICLE = SKILL_VEHICLE_SMALL, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, + SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, + SKILL_JTAC = SKILL_JTAC_TRAINED, + ) + /datum/skills/civilian/survivor/doctor name = "Survivor Doctor" additional_skills = list( @@ -224,3 +243,15 @@ CIVILIAN SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, ) + +/datum/skills/civilian/fax_responder + name = "Comms Relay Worker" //Used for fax responder presets, allowing use of appropriate HUDs and basics. + skills = list( + SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, + SKILL_LEADERSHIP = SKILL_LEAD_MASTER, + SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_ENGINEER = SKILL_ENGINEER_NOVICE, + SKILL_VEHICLE = SKILL_VEHICLE_SMALL, + SKILL_INTEL = SKILL_INTEL_EXPERT, + ) diff --git a/code/datums/skills/synthetic.dm b/code/datums/skills/synthetic.dm index c4d7296dee5d..dd33dca59028 100644 --- a/code/datums/skills/synthetic.dm +++ b/code/datums/skills/synthetic.dm @@ -12,7 +12,6 @@ SYNTHETIC SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MASTER, SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, - SKILL_LEADERSHIP = SKILL_LEAD_EXPERT, SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, SKILL_MEDICAL = SKILL_MEDICAL_MASTER, SKILL_SURGERY = SKILL_SURGERY_EXPERT, @@ -33,8 +32,8 @@ SYNTHETIC name = SYNTH_COLONY skills = list( SKILL_CQC = SKILL_CQC_EXPERT, - SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, - SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_MASTER, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MASTER, SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, @@ -88,3 +87,28 @@ SYNTHETIC SKILL_DOMESTIC = SKILL_DOMESTIC_MASTER, SKILL_ANTAG = SKILL_ANTAG_AGENT, ) + +/datum/skills/synth_k9 + name = "Synthetic K9" + skills = list( + SKILL_CQC = SKILL_CQC_MASTER, + SKILL_ENGINEER = SKILL_ENGINEER_DEFAULT, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_DEFAULT, + SKILL_FIREARMS = SKILL_FIREARMS_CIVILIAN, + SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, + SKILL_LEADERSHIP = SKILL_LEAD_NOVICE, + SKILL_OVERWATCH = SKILL_OVERWATCH_DEFAULT, + SKILL_MEDICAL = SKILL_MEDICAL_MASTER, + SKILL_SURGERY = SKILL_SURGERY_DEFAULT, + SKILL_RESEARCH = SKILL_RESEARCH_DEFAULT, + SKILL_MELEE_WEAPONS = SKILL_MELEE_SUPER, + SKILL_PILOT = SKILL_PILOT_EXPERT, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_MAX, + SKILL_POWERLOADER = SKILL_POWERLOADER_DEFAULT, + SKILL_VEHICLE = SKILL_VEHICLE_DEFAULT, + SKILL_JTAC = SKILL_JTAC_NOVICE, + SKILL_INTEL = SKILL_INTEL_NOVICE, + SKILL_DOMESTIC = SKILL_DOMESTIC_MASTER, + SKILL_NAVIGATIONS = SKILL_NAVIGATIONS_DEFAULT, + ) diff --git a/code/datums/xeno_shields/shield_types/king_shield.dm b/code/datums/xeno_shields/shield_types/king_shield.dm new file mode 100644 index 000000000000..c8a54bf2c5d5 --- /dev/null +++ b/code/datums/xeno_shields/shield_types/king_shield.dm @@ -0,0 +1,20 @@ +/// Shield can be equal to a maximum of percent_maxhealth_damagecap of the receiver's max hp +/datum/xeno_shield/king_shield + duration = 10 SECONDS + decay_amount_per_second = 100 + /// The maximum damage multiplier of max health to apply in a hit + var/percent_maxhealth_damagecap = 0.1 + +/datum/xeno_shield/king_shield/on_hit(damage) + var/relative_damage_cap = linked_xeno.maxHealth * percent_maxhealth_damagecap + + if(damage > relative_damage_cap) + damage = relative_damage_cap + return ..(damage) + + +/datum/xeno_shield/king_shield/on_removal() + . = ..() + if(linked_xeno) + // Remove the shield overlay early + linked_xeno.remove_suit_layer() diff --git a/code/datums/xeno_shields/xeno_shield.dm b/code/datums/xeno_shields/xeno_shield.dm index 49f04f19e6e6..dba5698fc53e 100644 --- a/code/datums/xeno_shields/xeno_shield.dm +++ b/code/datums/xeno_shields/xeno_shield.dm @@ -61,7 +61,7 @@ // Use the type var if you need to construct a shield with different on hit behavior, damage reduction, etc. /mob/living/carbon/xenomorph/proc/add_xeno_shield(\ added_amount, shield_source, type = /datum/xeno_shield, \ - duration = -1, decay_amount_per_second = 1, \ + duration, decay_amount_per_second, \ add_shield_on = FALSE, max_shield = 200) for (var/datum/xeno_shield/curr_shield in xeno_shields) if (shield_source == curr_shield.shield_source) @@ -78,12 +78,14 @@ new_shield.shield_source = shield_source xeno_shields += new_shield new_shield.last_damage_taken = world.time // So we don't insta-delete our shield. - - new_shield.decay_amount_per_second = decay_amount_per_second + if(decay_amount_per_second) + new_shield.decay_amount_per_second = decay_amount_per_second + if(duration) + new_shield.duration = duration new_shield.linked_xeno = src - if(duration > -1) - addtimer(CALLBACK(new_shield, TYPE_PROC_REF(/datum/xeno_shield, begin_decay)), duration) + if(new_shield.duration > -1) + addtimer(CALLBACK(new_shield, TYPE_PROC_REF(/datum/xeno_shield, begin_decay)), new_shield.duration) overlay_shields() return new_shield diff --git a/code/game/area/BigRed.dm b/code/game/area/BigRed.dm index c5e96c78175a..78091f7387a8 100644 --- a/code/game/area/BigRed.dm +++ b/code/game/area/BigRed.dm @@ -20,6 +20,7 @@ name = "\improper Garage Workshop" icon_state = "green" ceiling = CEILING_METAL + linked_lz = DROPSHIP_LZ1 /area/bigred/ground/ship name = "\improper Crashed Vessel" @@ -262,6 +263,7 @@ sound_environment = SOUND_ENVIRONMENT_ROOM soundscape_playlist = list() minimap_color = MINIMAP_AREA_RESEARCH + unoviable_timer = FALSE /area/bigredv2/caves/lambda/virology name = "\improper Lambda Virology" @@ -289,6 +291,7 @@ ambience_exterior = AMBIENCE_CAVE soundscape_playlist = SCAPE_PL_CAVE base_muffle = MUFFLE_HIGH + unoviable_timer = FALSE // serve for the security checkpoint. /area/bigredv2/outside/lambda_cave_cas @@ -310,7 +313,7 @@ icon = 'icons/turf/area_kutjevo.dmi' icon_state = "oob" is_resin_allowed = FALSE - flags_area = AREA_NOTUNNEL + flags_area = AREA_NOTUNNEL|AREA_UNWEEDABLE can_build_special = FALSE soundscape_interval = 0 @@ -329,7 +332,7 @@ /area/bigredv2/outside/nw name = "\improper Northwest Colony Grounds" icon_state = "northwest" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 soundscape_playlist = SCAPE_PL_DESERT_STORM /area/bigredv2/outside/nw/ceiling @@ -348,7 +351,7 @@ /area/bigredv2/outside/w name = "\improper Western Colony Grounds" icon_state = "west" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 /area/bigredv2/outside/e name = "\improper Eastern Colony Grounds" @@ -368,7 +371,7 @@ /area/bigredv2/outside/sw name = "\improper Southwest Colony Grounds" icon_state = "southwest" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 soundscape_playlist = SCAPE_PL_DESERT_STORM /area/bigredv2/caves @@ -387,7 +390,7 @@ name = "\improper Southwest Abandoned Mining Caves" icon_state = "bluenew" color = "purple" - + unoviable_timer = FALSE /area/bigredv2/caves/eta ceiling = CEILING_UNDERGROUND_METAL_BLOCK_CAS @@ -395,6 +398,7 @@ ambience_exterior = AMBIENCE_ALMAYER sound_environment = SOUND_ENVIRONMENT_ROOM soundscape_playlist = list() + unoviable_timer = FALSE /area/bigredv2/outside/eta name = "\improper Eta Labs Compound" @@ -422,25 +426,27 @@ name = "\improper Cargo" icon_state = "storage" ceiling = CEILING_METAL - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 /area/bigredv2/outside/general_store name = "\improper General Store" icon_state = "blueold" ceiling = CEILING_METAL - + linked_lz = DROPSHIP_LZ2 /area/bigredv2/outside/marshal_office name = "\improper Marshal Offices" icon_state = "brig" ceiling = CEILING_METAL minimap_color = MINIMAP_AREA_SEC + linked_lz = DROPSHIP_LZ1 /area/bigredv2/outside/medical name = "\improper Hospital" icon_state = "CMO" ceiling = CEILING_METAL minimap_color = MINIMAP_AREA_MEDBAY + linked_lz = DROPSHIP_LZ1 /area/bigredv2/outside/admin_building name = "\improper Administration" @@ -461,6 +467,7 @@ ceiling_muffle = FALSE base_muffle = MUFFLE_MEDIUM minimap_color = MINIMAP_AREA_MEDBAY + linked_lz = DROPSHIP_LZ1 /area/bigredv2/outside/dorms name = "\improper Dormitories" @@ -496,14 +503,14 @@ name = "\improper Space Port" icon_state = "green" ceiling = CEILING_GLASS - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 is_landing_zone = TRUE /area/bigredv2/outside/space_port_lz2 name = "\improper Cargo Landing Pad" icon_state = "green" ceiling = CEILING_NONE - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 is_landing_zone = TRUE minimap_color = MINIMAP_AREA_LZ @@ -512,7 +519,7 @@ name = "\improper LZ1 Communications Relay" icon_state = "ass_line" ceiling = CEILING_UNDERGROUND_METAL_ALLOW_CAS - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 ceiling_muffle = FALSE base_muffle = MUFFLE_LOW is_landing_zone = TRUE @@ -520,10 +527,12 @@ /area/bigredv2/outside/telecomm/lz2_cave name = "\improper Central Grounds Communications Relay" is_landing_zone = FALSE + linked_lz = DROPSHIP_LZ2 /area/bigredv2/outside/telecomm/n_cave name = "\improper North Cave Communications Relay" is_landing_zone = FALSE + linked_lz = DROPSHIP_LZ1 /area/bigredv2/outside/telecomm/warehouse name = "\improper Warehouse Communications Relay" @@ -550,6 +559,11 @@ name = "\improper Engineering Complex" icon_state = "engine" ceiling = CEILING_METAL + linked_lz = DROPSHIP_LZ2 + +/area/bigredv2/outside/engineering/reactor + name = "\improper Main Reactor" + linked_lz = null /area/bigredv2/outside/storage name = "\improper Storage" @@ -601,6 +615,7 @@ soundscape_playlist = SCAPE_PL_CAVE base_muffle = MUFFLE_HIGH minimap_color = MINIMAP_AREA_RESEARCH_CAVE + unoviable_timer = FALSE /area/bigredv2/caves_se name = "\improper Southeastern Caves" @@ -611,6 +626,7 @@ ambience_exterior = AMBIENCE_CAVE soundscape_playlist = SCAPE_PL_CAVE base_muffle = MUFFLE_HIGH + unoviable_timer = FALSE /area/bigredv2/caves_east name = "\improper Eastern Caves" @@ -621,6 +637,7 @@ ambience_exterior = AMBIENCE_CAVE soundscape_playlist = SCAPE_PL_CAVE base_muffle = MUFFLE_HIGH + unoviable_timer = FALSE /area/bigredv2/caves_north name = "\improper Northern Caves" @@ -636,7 +653,6 @@ minimap_color = MINIMAP_AREA_LZ icon_state = "tcomsatcham" requires_power = FALSE - is_resin_allowed = FALSE /area/bigredv2/landing/console name = "\improper LZ1 'Telecomms'" @@ -650,21 +666,25 @@ name = "\improper Northern Caves Entrance" icon_state = "garden" ceiling = CEILING_UNDERGROUND_ALLOW_CAS + linked_lz = DROPSHIP_LZ1 /area/bigredv2/outside/lz1_telecomm_cas name = "\improper Virology Caves Entrance" icon_state = "garden" ceiling = CEILING_UNDERGROUND_ALLOW_CAS + linked_lz = DROPSHIP_LZ1 /area/bigredv2/outside/lz2_west_cas name = "\improper Southwestern Caves Entrance" icon_state = "garden" ceiling = CEILING_UNDERGROUND_ALLOW_CAS + linked_lz = DROPSHIP_LZ2 /area/bigredv2/outside/lz2_south_cas name = "\improper ETA Lockdown Caves Entrance" icon_state = "garden" ceiling = CEILING_UNDERGROUND_ALLOW_CAS + linked_lz = DROPSHIP_LZ2 /area/bigredv2/outside/filtration_cave_cas name = "\improper Filtration Lockdown Caves Entrance" diff --git a/code/game/area/Corsat.dm b/code/game/area/Corsat.dm index 7d2a55fac97f..6006ea6b0f8e 100644 --- a/code/game/area/Corsat.dm +++ b/code/game/area/Corsat.dm @@ -30,12 +30,10 @@ /area/corsat/sigma/north name = "\improper Sigma Sector North Hallway" icon_state = "sigma_hallway_north" - is_resin_allowed = FALSE /area/corsat/sigma/hangar name = "\improper Landing Bay Sigma" icon_state = "sigma_hangar" - is_resin_allowed = FALSE is_landing_zone = TRUE /area/corsat/sigma/hangar/monorail @@ -104,22 +102,18 @@ /area/corsat/sigma/cargo name = "\improper Sigma Cargo" icon_state = "sigma_cargo" - is_resin_allowed = FALSE /area/corsat/sigma/laundry name = "\improper Sigma Laundry" icon_state = "sigma_laundry" - is_resin_allowed = FALSE /area/corsat/sigma/lavatory name = "\improper Sigma Lavatory" icon_state = "sigma_lavatory" - is_resin_allowed = FALSE /area/corsat/sigma/cafe name = "\improper Sigma Cafe" icon_state = "sigma_cafe" - is_resin_allowed = FALSE /area/corsat/sigma/dorms name = "\improper Sigma Residential Module" @@ -216,7 +210,6 @@ /area/corsat/gamma/hangar name = "\improper Landing Bay Gamma" icon_state = "gamma_hangar" - is_resin_allowed = FALSE is_landing_zone = TRUE /area/corsat/gamma/hangar/monorail @@ -260,7 +253,6 @@ /area/corsat/gamma/foyer name = "\improper Gamma Foyer" icon_state = "gamma_foyer" - is_resin_allowed = FALSE /area/corsat/gamma/hallwaymain name = "\improper Gamma Sector West Hallway" @@ -309,7 +301,6 @@ /area/corsat/gamma/cargo name = "\improper Gamma Cargo" icon_state = "gamma_cargo" - is_resin_allowed = FALSE /area/corsat/gamma/cargo/lobby name = "\improper Gamma Cargo Lobby" @@ -378,12 +369,10 @@ /area/corsat/gamma/rnr/bar name = "\improper CORSAT Bar" icon_state = "corsat_bar" - is_resin_allowed = FALSE /area/corsat/gamma/rnr/arcade name = "\improper CORSAT Arcade" icon_state = "corsat_arcade" - is_resin_allowed = FALSE /area/corsat/gamma/rnr/library name = "\improper CORSAT Library" diff --git a/code/game/area/DesertDam.dm b/code/game/area/DesertDam.dm index 9f53494b1bbf..c636d8ba01aa 100644 --- a/code/game/area/DesertDam.dm +++ b/code/game/area/DesertDam.dm @@ -11,68 +11,65 @@ // areas under rock /area/desert_dam/interior ceiling = CEILING_UNDERGROUND_METAL_ALLOW_CAS + //NorthEastern Lab Section /area/desert_dam/interior/lab_northeast name = "Northeastern Lab" icon_state = "purple" minimap_color = MINIMAP_AREA_RESEARCH + unoviable_timer = FALSE + /area/desert_dam/interior/lab_northeast/east_lab_lobby name = "East Lab Lobby" icon_state = "green" + /area/desert_dam/interior/lab_northeast/east_lab_west_hallway name = "East Lab Western Hallway" icon_state = "blue" + /area/desert_dam/interior/lab_northeast/east_lab_central_hallway name = "East Lab Central Hallway" icon_state = "green" + /area/desert_dam/interior/lab_northeast/east_lab_east_hallway name = "East Lab East Hallway" icon_state = "yellow" + /area/desert_dam/interior/lab_northeast/east_lab_workshop name = "East Lab Workshop" icon_state = "ass_line" -/area/desert_dam/interior/lab_northeast/east_lab_storage - name = "East Lab Storage " - icon_state = "storage" -/area/desert_dam/interior/lab_northeast/east_lab_RD_office - name = "East Lab Research Director's Office" - icon_state = "yellow" + /area/desert_dam/interior/lab_northeast/east_lab_maintenence name = "East Lab Maintenence" icon_state = "maintcentral" + /area/desert_dam/interior/lab_northeast/east_lab_containment name = "East Lab Containment" icon_state = "purple" + /area/desert_dam/interior/lab_northeast/east_lab_RND name = "East Lab Research and Development" icon_state = "purple" + /area/desert_dam/interior/lab_northeast/east_lab_biology name = "East Lab Biology" icon_state = "purple" -/area/desert_dam/interior/lab_northeast/east_lab_surgery - name = "East Lab Surgery" - icon_state = "red" + /area/desert_dam/interior/lab_northeast/east_lab_excavation name = "East Lab Excavation Prep" icon_state = "blue" + /area/desert_dam/interior/lab_northeast/east_lab_west_entrance name = "East Lab West Entrance" icon_state = "purple" + /area/desert_dam/interior/lab_northeast/east_lab_east_entrance name = "East Lab Entrance" icon_state = "purple" -/area/desert_dam/interior/lab_northeast/east_lab_security_checkpoint - name = "East Lab Security Checkpoint" - icon_state = "purple" -/area/desert_dam/interior/lab_northeast/east_lab_security_office - name = "East Lab Security Office" - icon_state = "security" + /area/desert_dam/interior/lab_northeast/east_lab_security_armory name = "East Lab Armory" icon_state = "armory" -/area/desert_dam/interior/lab_northeast/east_lab_xenobiology - name = "East Lab Xenobiology" - icon_state = "red" //Dam Interior /area/desert_dam/interior/dam_interior @@ -81,78 +78,104 @@ /area/desert_dam/interior/dam_interior/engine_room name = "Engineering Generator Room" icon_state = "yellow" + /area/desert_dam/interior/dam_interior/control_room name = "Engineering Control Room" icon_state = "red" + /area/desert_dam/interior/dam_interior/smes_main name = "Engineering Main Substation" icon_state = "purple" + /area/desert_dam/interior/dam_interior/smes_backup name = "Engineering Secondary Backup Substation" icon_state = "green" + /area/desert_dam/interior/dam_interior/engine_east_wing name = "Engineering East Engine Wing" icon_state = "blue-red" + /area/desert_dam/interior/dam_interior/engine_west_wing name = "Engineering West Engine Wing" icon_state = "yellow" + /area/desert_dam/interior/dam_interior/lobby name = "Engineering Lobby" icon_state = "purple" + /area/desert_dam/interior/dam_interior/atmos_storage name = "Engineering Atmospheric Storage" icon_state = "purple" + /area/desert_dam/interior/dam_interior/northwestern_tunnel name = "Engineering Northwestern Tunnel" icon_state = "green" + /area/desert_dam/interior/dam_interior/north_tunnel name = "Engineering Northern Tunnel" icon_state = "blue-red" + /area/desert_dam/interior/dam_interior/west_tunnel name = "Engineering Western Tunnel" icon_state = "yellow" + /area/desert_dam/interior/dam_interior/central_tunnel name = "Engineering Central Tunnel" icon_state = "red" + /area/desert_dam/interior/dam_interior/south_tunnel name = "Engineering Southern Tunnel" icon_state = "purple" + /area/desert_dam/interior/dam_interior/northeastern_tunnel name = "Engineering Northeastern Tunnel" icon_state = "green" + /area/desert_dam/interior/dam_interior/CE_office name = "Engineering Chief Engineer's Office" icon_state = "yellow" + /area/desert_dam/interior/dam_interior/workshop name = "Engineering Workshop" icon_state = "purple" + /area/desert_dam/interior/dam_interior/hanger name = "Engineering Hangar" icon_state = "hangar" + linked_lz = DROPSHIP_LZ1 + /area/desert_dam/interior/dam_interior/hangar_storage name = "Engineering Hangar Storage" icon_state = "storage" + /area/desert_dam/interior/dam_interior/auxilary_tool_storage name = "Engineering Auxiliary Tool Storage" icon_state = "red" + /area/desert_dam/interior/dam_interior/primary_tool_storage name = "Engineering Primary Tool Storage" icon_state = "blue" + /area/desert_dam/interior/dam_interior/tech_storage name = "Engineering Secure Tech Storage" icon_state = "dark" + /area/desert_dam/interior/dam_interior/break_room name = "Engineering Breakroom" icon_state = "yellow" + /area/desert_dam/interior/dam_interior/disposals name = "Engineering Disposals" icon_state = "disposal" + /area/desert_dam/interior/dam_interior/western_dam_cave name = "Engineering West Entrance" icon_state = "red" + /area/desert_dam/interior/dam_interior/office name = "Engineering Office" icon_state = "red" + /area/desert_dam/interior/dam_interior name = "Engineering" icon_state = "" @@ -160,15 +183,19 @@ /area/desert_dam/interior/dam_interior/north_tunnel_entrance name = "Engineering North Tunnel Entrance" icon_state = "yellow" + /area/desert_dam/interior/dam_interior/east_tunnel_entrance name = "Engineering East Tunnel Entrance" icon_state = "yellow" + /area/desert_dam/interior/dam_interior/south_tunnel_entrance name = "Engineering South Tunnel Entrance" icon_state = "red" + /area/desert_dam/interior/dam_interior/garage name = "Garage" icon_state = "green" + /area/desert_dam/interior/caves name = "Caves" ceiling = CEILING_DEEP_UNDERGROUND @@ -178,35 +205,28 @@ soundscape_interval = 25 sound_environment = SOUND_ENVIRONMENT_AUDITORIUM minimap_color = MINIMAP_AREA_CAVES -/area/desert_dam/interior/caves/northern_caves - name = "Northern Caves" - icon_state = "red" + /area/desert_dam/interior/caves/east_caves name = "Eastern Caves" icon_state = "red" + unoviable_timer = FALSE /area/desert_dam/interior/caves/central_caves name = "Central Caves" icon_state = "yellow" -/area/desert_dam/interior/caves/central_caves/entrances/east_tunnel_entrance - name = "Eastern Central Tunnel Entrance" - icon_state = "red" -/area/desert_dam/interior/caves/central_caves/entrances/south_tunnel_entrance - name = "Southern Central Tunnel Entrance" - icon_state = "red" -/area/desert_dam/interior/caves/central_caves/entrances/west_tunnel_entrance - name = "Western Central Tunnel Entrance" - icon_state = "red" + unoviable_timer = FALSE /area/desert_dam/interior/caves/temple name = "Sand Temple" icon_state = "green" + unoviable_timer = FALSE //BUILDING //areas not under rock // ceiling = CEILING_METAL /area/desert_dam/building ceiling = CEILING_METAL + //Substations /area/desert_dam/building/substation name = "Substation" @@ -217,25 +237,26 @@ name = "Command Substation" icon_state = "northewestern_ss" is_landing_zone = TRUE + linked_lz = DROPSHIP_LZ1 + /area/desert_dam/building/substation/northeast name = "Command Substation" icon_state = "northeastern_ss" -/area/desert_dam/building/substation/east - name = "Command Substation" - icon_state = "eastern_ss" -/area/desert_dam/building/substation/southeast - name = "Command Substation" - icon_state = "southeastern_ss" + unoviable_timer = FALSE + /area/desert_dam/building/substation/central name = "Command Substation" icon_state = "central_ss" + unoviable_timer = FALSE + /area/desert_dam/building/substation/southwest name = "Command Substation" icon_state = "southwestern_ss" + /area/desert_dam/building/substation/west name = "Command Substation" icon_state = "western_ss" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 //Administration /area/desert_dam/building/administration @@ -244,76 +265,94 @@ /area/desert_dam/building/administration/control_room name = "Administration Landing Control Room" icon_state = "yellow" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 + /area/desert_dam/building/administration/lobby name = "Administration Lobby" icon_state = "green" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 + /area/desert_dam/building/administration/hallway name = "Administration Hallway" icon_state = "purple" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 + /area/desert_dam/building/administration/office name = "Administration Office" icon_state = "blue-red" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 + /area/desert_dam/building/administration/overseer_office name = "Administration Overseer's Office" icon_state = "red" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 + /area/desert_dam/building/administration/meetingrooom name = "Administration Meeting Room" icon_state = "yellow" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 + /area/desert_dam/building/administration/archives name = "Administration Archives" icon_state = "green" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 //Bar /area/desert_dam/building/bar/bar name = "Bar" icon_state = "yellow" + /area/desert_dam/building/bar/backroom name = "Bar Backroom" icon_state = "green" + /area/desert_dam/building/bar/bar_restroom name = "Bar Restroom" icon_state = "purple" //Cafe +/area/desert_dam/building/cafeteria + name = "DO NOT USE" + icon_state = "purple" + unoviable_timer = FALSE + /area/desert_dam/building/cafeteria/cafeteria name = "Cafeteria" icon_state = "yellow" + /area/desert_dam/building/cafeteria/backroom name = "Cafeteria Backroom" icon_state = "green" -/area/desert_dam/building/cafeteria/restroom - name = "Cafeteria Restroom" - icon_state = "purple" + /area/desert_dam/building/cafeteria/loading name = "Cafeteria Loading Room" icon_state = "blue-red" + /area/desert_dam/building/cafeteria/cold_room name = "Cafeteria Coldroom" icon_state = "red" //Dorms +/area/desert_dam/building/dorms + name = "DO NOT USE" + icon_state = "purple" + unoviable_timer = FALSE + /area/desert_dam/building/dorms/hallway_northwing name = "Dormitory North Wing" icon_state = "yellow" + /area/desert_dam/building/dorms/hallway_westwing name = "Dormitory West Wing" icon_state = "green" -/area/desert_dam/building/dorms/hallway_eastwing - name = "Dormitory East Wing" - icon_state = "purple" + /area/desert_dam/building/dorms/restroom name = "Dormitory Showers" icon_state = "blue-red" + /area/desert_dam/building/dorms/pool name = "Dormitory Pool Room" icon_state = "red" @@ -322,67 +361,84 @@ //Medical /area/desert_dam/building/medical minimap_color = MINIMAP_AREA_MEDBAY + unoviable_timer = FALSE /area/desert_dam/building/medical/garage name = "Medical Garage" icon_state = "garage" + /area/desert_dam/building/medical/emergency_room name = "Medical Emergency Room" icon_state = "medbay" + /area/desert_dam/building/medical/treatment_room name = "Medical Treatment Room" icon_state = "medbay2" + /area/desert_dam/building/medical/lobby name = "Medical Lobby" icon_state = "medbay3" + /area/desert_dam/building/medical/chemistry name = "Medical Pharmacy" icon_state = "medbay" + /area/desert_dam/building/medical/west_wing_hallway - name = "Medical West Wing " + name = "Medical West Wing" icon_state = "medbay2" + /area/desert_dam/building/medical/north_wing_hallway name = "Medical North Wing" icon_state = "medbay3" + /area/desert_dam/building/medical/east_wing_hallway name = "Medical East Wing" icon_state = "medbay" + /area/desert_dam/building/medical/primary_storage name = "Medical Primary Storage" icon_state = "red" + /area/desert_dam/building/medical/surgery_room_one name = "Medical Surgery Room One" icon_state = "yellow" + /area/desert_dam/building/medical/surgery_room_two name = "Medical Surgery Room Two" icon_state = "purple" + /area/desert_dam/building/medical/surgury_observation name = "Medical Surgery Observation" icon_state = "medbay2" + /area/desert_dam/building/medical/morgue name = "Medical Morgue" icon_state = "blue" + /area/desert_dam/building/medical/break_room name = "Medical Breakroom" icon_state = "medbay" + /area/desert_dam/building/medical/CMO name = "Medical CMO's Office" icon_state = "CMO" + /area/desert_dam/building/medical/office1 name = "Medical Office One" icon_state = "red" + /area/desert_dam/building/medical/office2 name = "Medical Office Two" icon_state = "blue" -/area/desert_dam/building/medical/patient_wing - name = "Medical Patient Wing" - icon_state = "medbay2" + /area/desert_dam/building/medical/virology_wing name = "Medical Virology Wing" icon_state = "medbay3" + /area/desert_dam/building/medical/virology_isolation name = "Medical Virology Isolation" icon_state = "medbay" + /area/desert_dam/building/medical name = "Medical" icon_state = "medbay2" @@ -392,15 +448,17 @@ /area/desert_dam/building/warehouse/warehouse name = "Warehouse" icon_state = "yellow" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 + /area/desert_dam/building/warehouse/loading name = "Warehouse Loading Room" icon_state = "red" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 + /area/desert_dam/building/warehouse/breakroom name = "Warehouse Breakroom" icon_state = "green" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 //Hydroponics @@ -410,23 +468,19 @@ /area/desert_dam/building/hydroponics/hydroponics name = "Hydroponics" icon_state = "hydro" + /area/desert_dam/building/hydroponics/hydroponics_storage name = "Hydroponics Storage" icon_state = "green" + /area/desert_dam/building/hydroponics/hydroponics_loading name = "Hydroponics Loading Room" icon_state = "garage" + /area/desert_dam/building/hydroponics/hydroponics_breakroom name = "Hydroponics Breakroom" icon_state = "red" - -//Telecoms -/area/desert_dam/building/telecommunication - name = "Telecommunications" - icon_state = "yellow" - is_resin_allowed = FALSE - //Water Treatment Plant 1 /area/desert_dam/building/water_treatment_one minimap_color = MINIMAP_AREA_ENGI @@ -434,74 +488,69 @@ /area/desert_dam/building/water_treatment_one name = "Water Treatment One" icon_state = "yellow" + //Water Treatment Plant 1 /area/desert_dam/building/water_treatment_one/lobby name = "Water Treatment One Lobby" icon_state = "red" + /area/desert_dam/building/water_treatment_one/breakroom name = "Water Treatment One Breakroom" icon_state = "green" + /area/desert_dam/building/water_treatment_one/garage name = "Water Treatment One Garage" icon_state = "garage" -/area/desert_dam/building/water_treatment_one/sedimentation - name = "Water Treatment One Sedimentation" - icon_state = "blue" + /area/desert_dam/building/water_treatment_one/equipment name = "Water Treatment One Equipment Room" icon_state = "red" + /area/desert_dam/building/water_treatment_one/hallway name = "Water Treatment One Hallway" icon_state = "purple" + /area/desert_dam/building/water_treatment_one/control_room name = "Water Treatment One Control Room" icon_state = "yellow" + /area/desert_dam/building/water_treatment_one/purification name = "Water Treatment One Purification" icon_state = "green" + /area/desert_dam/building/water_treatment_one/floodgate_control name = "Water Treatment One Floodgate Control" icon_state = "green" -/area/desert_dam/building/water_treatment_one/floodgate_control/central - name = "Central Floodgate Control" - icon_state = "green" - -/area/desert_dam/building/water_treatment_one/floodgate_control/central2 - name = "Central Floodgate Control Storage" - icon_state = "green" - //Water Treatment Plant 2 /area/desert_dam/building/water_treatment_two minimap_color = MINIMAP_AREA_ENGI + unoviable_timer = FALSE /area/desert_dam/building/water_treatment_two name = "Water Treatment Two" icon_state = "yellow" + /area/desert_dam/building/water_treatment_two/lobby name = "Water Treatment Two Lobby" icon_state = "red" -/area/desert_dam/building/water_treatment_two/breakroom - name = "Water Treatment Two Breakroom" - icon_state = "green" -/area/desert_dam/building/water_treatment_two/garage - name = "Water Treatment Two Garage" - icon_state = "garage" -/area/desert_dam/building/water_treatment_two/sedimentation - name = "Water Treatment Two Sedimentation" - icon_state = "blue" + /area/desert_dam/building/water_treatment_two/equipment name = "Water Treatment Two Equipment" icon_state = "red" + /area/desert_dam/building/water_treatment_two/hallway name = "Water Treatment Two Hallway" icon_state = "purple" + /area/desert_dam/building/water_treatment_two/control_room name = "Water Treatment Two Control Room" icon_state = "yellow" + /area/desert_dam/building/water_treatment_two/purification name = "Water Treatment Two Purification" icon_state = "green" + /area/desert_dam/building/water_treatment_two/floodgate_control name = "Water Treatment Two Floodgate Control" icon_state = "green" @@ -527,54 +576,67 @@ /area/desert_dam/building/security/prison name = "Security Prison" icon_state = "sec_prison" + /area/desert_dam/building/security/marshals_office name = "Security Marshal's Office" icon_state = "sec_hos" + /area/desert_dam/building/security/armory name = "Security Armory" icon_state = "armory" + /area/desert_dam/building/security/warden name = "Security Warden's Office" icon_state = "Warden" + /area/desert_dam/building/security/interrogation name = "Security Interrogation" icon_state = "interrogation" -/area/desert_dam/building/security/backroom - name = "Security Interrogation" - icon_state = "sec_backroom" + /area/desert_dam/building/security/observation name = "Security Observation" icon_state = "observatory" + /area/desert_dam/building/security/detective name = "Security Detective's Office" icon_state = "detective" + /area/desert_dam/building/security/office name = "Security Office" icon_state = "yellow" + /area/desert_dam/building/security/lobby name = "Security Lobby" icon_state = "green" + /area/desert_dam/building/security/northern_hallway name = "Security North Hallway" icon_state = "purple" + /area/desert_dam/building/security/courtroom name = "Security Courtroom" icon_state = "courtroom" + /area/desert_dam/building/security/evidence name = "Security Evidence" icon_state = "red" + /area/desert_dam/building/security/holding name = "Security Holding Room" icon_state = "yellow" + /area/desert_dam/building/security/southern_hallway name = "Security South Hallway" icon_state = "green" + /area/desert_dam/building/security/deathrow name = "Security Death Row" icon_state = "cells_max_n" + /area/desert_dam/building/security/execution_chamber name = "Security Execution Chamber" icon_state = "red" + /area/desert_dam/building/security/staffroom name = "Security Staffroom" icon_state = "security" @@ -583,100 +645,29 @@ /area/desert_dam/building/church name = "Church" icon_state = "courtroom" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 //Mining area +/area/desert_dam/building/mining + name = "DO NOT USE" + icon_state = "purple" + unoviable_timer = FALSE + /area/desert_dam/building/mining/workshop name = "Mining Workshop" icon_state = "yellow" + /area/desert_dam/building/mining/workshop_foyer name = "Mining Workshop Foyer" icon_state = "purple" -//Legacy Areas for mining - /* -/area/desert_dam/building/mining/garage - name = "Mining Garage" - icon_state = "garage" -/area/desert_dam/building/mining/boxing_room - name = "Mining Boxing Room" - icon_state = "red" -/area/desert_dam/building/mining/loading_room - name = "Mining Loading Bay" - icon_state = "yellow" -/area/desert_dam/building/mining/break_room - name = "Mining Breakroom" - icon_state = "purple" -/area/desert_dam/building/mining/locker_room - name = "Mining Locker Room" - icon_state = "green" -/area/desert_dam/building/mining/lobby - name = "Mining Lobby" - icon_state = "red" -/area/desert_dam/building/mining/front_desk - name = "Mining Front Desk" - icon_state = "green" -/area/desert_dam/building/mining/foremans_office - name = "Mining Foreman's Office" - icon_state = "yellow" -/area/desert_dam/building/mining/maintenance_north - name = "Mining Maintenance North" - icon_state = "dark160" -/area/desert_dam/building/mining/maintenance_east - name = "Mining Maintenance East" - icon_state = "dark128" -/area/desert_dam/building/mining/bunkhouse - name = "Mining Bunkhouse" - icon_state = "red" -/area/desert_dam/building/mining/construction_site - name = "Construction Site" - icon_state = "yellow" -*/ - //NorthWest Lab Buildings /area/desert_dam/building/lab_northwest minimap_color = MINIMAP_AREA_RESEARCH -/area/desert_dam/building/lab_northwest/west_lab_robotics - name = "West Lab Robotics" - icon_state = "ass_line" -/area/desert_dam/building/lab_northwest/west_lab_robotics_mechbay - name = "West Lab Mechbay" - icon_state = "purple" -/area/desert_dam/building/lab_northwest/west_lab_east_hallway - name = "West Lab Hallway" - icon_state = "red" -/area/desert_dam/building/lab_northwest/west_lab_west_hallway - name = "West Lab Hallway" - icon_state = "red" -/area/desert_dam/building/lab_northwest/west_lab_maintenance - name = "West Lab Maintenance" - icon_state = "purple" -/area/desert_dam/building/lab_northwest/west_lab_chemistry - name = "West Lab Chemistry" - icon_state = "yellow" -/area/desert_dam/building/lab_northwest/west_lab_cafeteria - name = "West Lab Cafeteria" - icon_state = "blue" -/area/desert_dam/building/lab_northwest/west_lab_kitchen - name = "West Lab Kitchen" - icon_state = "kitchen" -/area/desert_dam/building/lab_northwest/west_lab_dormitory - name = "West Lab Dormitory" - icon_state = "red" -/area/desert_dam/building/lab_northwest/west_lab_meeting_room - name = "West Lab Meeting Room" - icon_state = "purple" /area/desert_dam/building/lab_northwest/west_lab_xenoflora name = "West Lab Xenoflora" icon_state = "purple" -/area/desert_dam/building/lab_northeast/checkpoint - name = "East Lab Checkpoint" - icon_state = "red" -/area/desert_dam/building/lab_northeast/garage - name = "East Lab Garage" - icon_state = "garage" - //EXTERIOR //under open sky @@ -697,114 +688,130 @@ /area/desert_dam/exterior/landing_pad_one name = "Airstrip Landing Pad" icon_state = "landing_pad" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 is_landing_zone = TRUE minimap_color = MINIMAP_AREA_LZ -/area/desert_dam/exterior/landing_pad_one_external - name = "Airstrip Landing Valley" - icon_state = "landing_pad_ext" - is_resin_allowed = FALSE - minimap_color = MINIMAP_AREA_LZ - - //Landing Pad for the Normandy. THIS IS NOT THE SHUTTLE AREA /area/desert_dam/exterior/landing_pad_two name = "Aerodrome Landing Pad" icon_state = "landing_pad" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 is_landing_zone = TRUE minimap_color = MINIMAP_AREA_LZ -/area/desert_dam/exterior/landing_pad_two_external - name = "Aerodrome Landing Valley" - icon_state = "landing_pad_ext" - is_resin_allowed = FALSE - minimap_color = MINIMAP_AREA_LZ - //Valleys //Near LZ //TODO: incorporate valleys and substrations for floodlight coverage /area/desert_dam/exterior/valley + name = "Valley" + icon_state = "red" + /area/desert_dam/exterior/valley/valley_northwest name = "Northwest Valley" icon_state = "valley_north_west" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 + /area/desert_dam/exterior/valley/valley_cargo name = "Shipping Valley" icon_state = "valley_south_west" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 + /area/desert_dam/exterior/valley/valley_telecoms name = "Telecomms Valley" icon_state = "valley_west" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 + +/area/desert_dam/exterior/valley/valley_security + name = "Security Valley" + icon_state = "valley_west" // Generic bridge used in nightmare inserts... Can in fact be different places (sigh) /area/desert_dam/exterior/valley/valley_bridge name = "Valley Bridge" icon_state = "valley" - //telecomms areas /area/desert_dam/exterior/telecomm name = "\improper Trijent Dam Communications Relay" icon_state = "ass_line" - is_resin_allowed = FALSE ceiling_muffle = FALSE base_muffle = MUFFLE_LOW always_unpowered = 0 /area/desert_dam/exterior/telecomm/lz2_containers name = "\improper Containers Communications Relay" + linked_lz = DROPSHIP_LZ2 /area/desert_dam/exterior/telecomm/lz2_tcomms name = "\improper Telecomms Communications Relay" + linked_lz = DROPSHIP_LZ2 + /area/desert_dam/exterior/telecomm/lz2_storage name = "\improper East LZ2 Communications Relay" + linked_lz = DROPSHIP_LZ2 + /area/desert_dam/exterior/telecomm/lz1_south name = "\improper South LZ1 Communications Relay" + linked_lz = DROPSHIP_LZ1 /area/desert_dam/exterior/telecomm/lz1_valley name = "\improper LZ1 Valley Communications Relay" + linked_lz = DROPSHIP_LZ1 /area/desert_dam/exterior/telecomm/lz1_xenoflora name = "\improper Xenoflora Communications Relay" + linked_lz = DROPSHIP_LZ1 //Away from LZ /area/desert_dam/exterior/valley/valley_labs name = "Lab Valley" icon_state = "valley_north" + /area/desert_dam/exterior/valley/valley_mining name = "Mining Valley" icon_state = "valley_east" + unoviable_timer = FALSE + /area/desert_dam/exterior/valley/valley_civilian name = "Civilian Valley" icon_state = "valley_south_excv" + unoviable_timer = FALSE + /area/desert_dam/exterior/valley/valley_medical name = "Medical Valley" icon_state = "valley" + unoviable_timer = FALSE + /area/desert_dam/exterior/valley/valley_hydro name = "Hydro Valley" icon_state = "valley" + /area/desert_dam/exterior/valley/valley_crashsite name = "Crash Site Valley" icon_state = "yellow" + unoviable_timer = FALSE + /area/desert_dam/exterior/valley/north_valley_dam name = "North Dam Valley" icon_state = "valley" + /area/desert_dam/exterior/valley/south_valley_dam name = "South Dam Valley" icon_state = "valley" + /area/desert_dam/exterior/valley/bar_valley_dam name = "Bar Valley" icon_state = "yellow" + /area/desert_dam/exterior/valley/valley_wilderness name = "Wilderness Valley" icon_state = "central" + unoviable_timer = FALSE //Rivers @@ -829,43 +836,33 @@ A.check_filtered() - //End of the river areas, no Next -/area/desert_dam/exterior/river/riverside_northwest - name = "Northwestern Riverbed" - icon_state = "bluenew" /area/desert_dam/exterior/river/riverside_central_north name = "Northern Central Riverbed" icon_state = "purple" + /area/desert_dam/exterior/river/riverside_central_south name = "Southern Central Riverbed" icon_state = "purple" + /area/desert_dam/exterior/river/riverside_south name = "Southern Riverbed" icon_state = "bluenew" + /area/desert_dam/exterior/river/riverside_east name = "Eastern Riverbed" icon_state = "bluenew" -/area/desert_dam/exterior/river/riverside_northeast - name = "Northeastern Riverbed" - icon_state = "bluenew" + //The filtration plants - This area isn't for the WHOLE plant, but the areas that have water in them, so the water changes color as well. /area/desert_dam/exterior/river/filtration_a name = "Filtration Plant A" -/area/desert_dam/exterior/river/filtration_b - name = "Filtration Plant B" - //Areas that are rivers, but will not change because they're before the floodgates /area/desert_dam/exterior/river_mouth/southern name = "Southern River Mouth" icon_state = "purple" -/area/desert_dam/exterior/river_mouth/eastern - name = "Eastern River Mouth" - icon_state = "purple" - /area/desert_dam/landing/console name = "LZ1 'Admin'" icon_state = "tcomsatcham" @@ -880,14 +877,18 @@ //Transit Shuttle /area/shuttle/tri_trans1/alpha icon_state = "shuttle" + /area/shuttle/tri_trans1/away icon_state = "away1" + /area/shuttle/tri_trans1/omega icon_state = "shuttle2" /area/shuttle/tri_trans2/alpha icon_state = "shuttlered" + /area/shuttle/tri_trans2/away icon_state = "away2" + /area/shuttle/tri_trans2/omega icon_state = "shuttle2" diff --git a/code/game/area/IceColony.dm b/code/game/area/IceColony.dm index 40289b92b5ad..f17c60dfdcb2 100644 --- a/code/game/area/IceColony.dm +++ b/code/game/area/IceColony.dm @@ -56,7 +56,6 @@ /area/ice_colony/exterior/surface/landing_pad name = "\improper Aerodrome Landing Pad" icon_state = "landing_pad" - is_resin_allowed = FALSE minimap_color = MINIMAP_AREA_LZ //Landing Pad for the Vindi. THIS IS NOT THE SHUTTLE AREA @@ -64,14 +63,12 @@ name = "\improper Emergency Landing Pad" icon_state = "landing_pad" minimap_color = MINIMAP_AREA_LZ - is_resin_allowed = FALSE //Everything around the physical landing pad /area/ice_colony/exterior/surface/landing_pad_external name = "\improper Aerodrome Landing Valley" icon_state = "landing_pad_ext" - is_resin_allowed = FALSE minimap_color = MINIMAP_AREA_LZ //Aerodrome Container Yard @@ -79,7 +76,6 @@ name = "\improper Aerodrome Container Yard" icon_state = "container_yard" minimap_color = MINIMAP_AREA_LZ - is_resin_allowed = FALSE // // Valleys @@ -357,7 +353,6 @@ /area/ice_colony/surface/hangar/hallway name = "\improper Aerodrome Hangar Hallway" - is_resin_allowed = FALSE /area/ice_colony/surface/hangar/alpha name = "\improper Aerodrome Hangar 'Alpha'" @@ -366,7 +361,6 @@ /area/ice_colony/surface/hangar/beta name = "\improper Aerodrome Hangar 'Beta'" icon_state = "hangar_beta" - is_resin_allowed = FALSE /area/ice_colony/surface/hangar/checkpoint name = "\improper Aerodrome Hangar Security Checkpoint" @@ -631,7 +625,6 @@ /area/ice_colony/underground/maintenance/north name = "\improper Underground Northern Maintenance" icon_state = "asmaint" - is_resin_allowed = FALSE /* * Underground - Medbay @@ -692,7 +685,6 @@ /area/ice_colony/underground/requesition name = "\improper Underground Requesitions" icon_state = "quart" - is_resin_allowed = FALSE /area/ice_colony/underground/requesition/lobby name = "\improper Underground Requesitions Lobby" @@ -705,7 +697,6 @@ /area/ice_colony/underground/requesition/sec_storage name = "\improper Underground Requesitions Secure Storage" icon_state = "storage" - is_resin_allowed = TRUE /* * Underground - Research @@ -773,7 +764,6 @@ name = "\improper Underground Hangar" icon_state = "hangar" ceiling = CEILING_NONE - is_resin_allowed = FALSE /* * Underground - Storage diff --git a/code/game/area/LV522_Chances_Claim.dm b/code/game/area/LV522_Chances_Claim.dm index c3e5c96ad4d7..1df454cdb0d0 100644 --- a/code/game/area/LV522_Chances_Claim.dm +++ b/code/game/area/LV522_Chances_Claim.dm @@ -26,7 +26,7 @@ icon_state = "unknown" ceiling = CEILING_MAX is_resin_allowed = FALSE - flags_area = AREA_NOTUNNEL + flags_area = AREA_NOTUNNEL|AREA_UNWEEDABLE /area/lv522/oob/w_y_vault name = "LV522 - Weyland Secure Vault" @@ -37,9 +37,9 @@ /area/lv522/landing_zone_1 name = "Chance's Claim - Landing Zone One" icon_state = "explored" - is_resin_allowed = FALSE is_landing_zone = TRUE minimap_color = MINIMAP_AREA_LZ + linked_lz = DROPSHIP_LZ1 /area/lv522/landing_zone_1/ceiling ceiling = CEILING_METAL @@ -57,6 +57,7 @@ name = "Chance's Claim - Dropship Alamo Landing Zone" icon_state = "shuttle" icon = 'icons/turf/area_shiva.dmi' + linked_lz = DROPSHIP_LZ1 /area/lv522/landing_zone_1/lz1_console name = "Chance's Claim - Dropship Alamo Console" @@ -68,9 +69,9 @@ /area/lv522/landing_zone_2 name = "Chance's Claim - Landing Zone Two" icon_state = "explored" - is_resin_allowed = FALSE is_landing_zone = TRUE minimap_color = MINIMAP_AREA_LZ + linked_lz = DROPSHIP_LZ2 /area/lv522/landing_zone_2/ceiling ceiling = CEILING_METAL @@ -79,6 +80,7 @@ name = "Chance's Claim - Dropship Normandy Landing Zone" icon_state = "shuttle2" icon = 'icons/turf/area_shiva.dmi' + linked_lz = DROPSHIP_LZ2 /area/lv522/landing_zone_2/lz2_console name = "Chance's Claim - Dropship Normandy Console" @@ -115,6 +117,11 @@ icon_state = "green" ceiling = CEILING_NONE +/area/lv522/outdoors/colony_streets/containers + name = "Colony Streets - Container Yard" + icon_state = "yellow" + unoviable_timer = FALSE + /area/lv522/outdoors/colony_streets/windbreaker name = "Colony Windbreakers" icon_state = "tcomsatcham" @@ -129,24 +136,29 @@ soundscape_playlist = SCAPE_PL_LV522_INDOORS /area/lv522/outdoors/colony_streets/central_streets - name = "Central Street - West" + name = "Central Streets - West" icon_state = "west" + linked_lz = DROPSHIP_LZ1 /area/lv522/outdoors/colony_streets/east_central_street - name = "Central Street - East" + name = "Central Streets - East" icon_state = "east" + linked_lz = DROPSHIP_LZ2 /area/lv522/outdoors/colony_streets/south_street name = "Colony Streets - South" icon_state = "south" + linked_lz = list(DROPSHIP_LZ2, DROPSHIP_LZ1) /area/lv522/outdoors/colony_streets/south_east_street name = "Colony Streets - Southeast" icon_state = "southeast" + linked_lz = DROPSHIP_LZ2 /area/lv522/outdoors/colony_streets/south_west_street name = "Colony Streets - Southwest" icon_state = "southwest" + linked_lz = DROPSHIP_LZ1 /area/lv522/outdoors/colony_streets/north_west_street name = "Colony Streets - Northwest" @@ -173,30 +185,34 @@ /area/lv522/indoors/toilet name = "LV522 - Outdoor Toilets" icon_state = "green" + linked_lz = DROPSHIP_LZ2 /area/lv522/indoors/lone_buildings/engineering name = "Emergency Engineering" icon_state = "engine_smes" minimap_color = MINIMAP_AREA_ENGI + linked_lz = DROPSHIP_LZ1 /area/lv522/indoors/lone_buildings/spaceport name = "North LZ1 - Spaceport" icon_state = "red" minimap_color = MINIMAP_AREA_LZ - is_resin_allowed = FALSE /area/lv522/indoors/lone_buildings/outdoor_bot name = "East LZ1 - Outdoor T-Comms" icon_state = "yellow" ceiling = CEILING_GLASS + linked_lz = DROPSHIP_LZ1 /area/lv522/indoors/lone_buildings/storage_blocks name = "Outdoor Storage" icon_state = "blue" + linked_lz = list(DROPSHIP_LZ2, DROPSHIP_LZ1) /area/lv522/indoors/lone_buildings/chunk name = "Chunk 'N Dump" icon_state = "blue" + linked_lz = DROPSHIP_LZ1 //A Block /area/lv522/indoors/a_block @@ -317,6 +333,7 @@ name = "B-Block" icon_state = "red" ceiling = CEILING_METAL + linked_lz = DROPSHIP_LZ1 /area/lv522/indoors/b_block/hydro name = "B-Block - Hydroponics" @@ -325,6 +342,7 @@ /area/lv522/indoors/b_block/hydro/glass ceiling = CEILING_GLASS + linked_lz = list(DROPSHIP_LZ2, DROPSHIP_LZ1) /area/lv522/indoors/b_block/bar name = "B-Block - Bar" @@ -334,12 +352,14 @@ name = "B-Block - Hydroponics Bridge Network" icon_state = "hallC1" ceiling = CEILING_GLASS + linked_lz = list(DROPSHIP_LZ2, DROPSHIP_LZ1) //C Block /area/lv522/indoors/c_block name = "C-Block" icon_state = "green" + linked_lz = DROPSHIP_LZ2 /area/lv522/indoors/c_block/cargo name = "C-Block - Cargo" @@ -348,6 +368,7 @@ /area/lv522/indoors/c_block/mining name = "C-Block - Mining" icon_state = "yellow" + linked_lz = DROPSHIP_LZ2 /area/lv522/indoors/c_block/garage name = "C-Block - Garage" @@ -403,6 +424,7 @@ ceiling = CEILING_REINFORCED_METAL ambience_exterior = AMBIENCE_SHIP minimap_color = MINIMAP_AREA_ENGI + unoviable_timer = FALSE /area/lv522/atmos/outdoor name = "Atmospheric Processor - Outdoors" diff --git a/code/game/area/LV624.dm b/code/game/area/LV624.dm index 464067e827d3..6ff833bda51d 100644 --- a/code/game/area/LV624.dm +++ b/code/game/area/LV624.dm @@ -37,7 +37,7 @@ name ="\improper Western Jungle" icon_state = "west" //ambience = list('sound/ambience/jungle_amb1.ogg') - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 /area/lv624/ground/jungle/west_jungle/ceiling ceiling = CEILING_GLASS @@ -71,6 +71,7 @@ name ="\improper West Central Jungle" icon_state = "west" //ambience = list('sound/ambience/jungle_amb1.ogg') + linked_lz = DROPSHIP_LZ2 /area/lv624/ground/jungle/east_central_jungle name ="\improper East Central Jungle" @@ -177,27 +178,31 @@ /area/lv624/ground/colony/north_tcomms_road name = "\improper North T-Comms Road" icon_state = "north" + linked_lz = DROPSHIP_LZ2 /area/lv624/ground/colony/west_tcomms_road name = "\improper West T-Comms Road" icon_state = "west" + linked_lz = DROPSHIP_LZ2 /area/lv624/ground/colony/telecomm name = "\improper LZ1 Communications Relay" icon_state = "ass_line" ceiling = CEILING_UNDERGROUND_METAL_ALLOW_CAS - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 ceiling_muffle = FALSE base_muffle = MUFFLE_LOW always_unpowered = FALSE /area/lv624/ground/colony/telecomm/cargo name = "\improper Far North Storage Dome Communications Relay" + linked_lz = DROPSHIP_LZ1 /area/lv624/ground/colony/telecomm/sw_lz1 name = "\improper South-West LZ1 Communications Relay" ceiling = CEILING_NONE + linked_lz = DROPSHIP_LZ1 /area/lv624/ground/colony/telecomm/tcommdome name = "\improper Telecomms Dome Communications Relay" @@ -209,6 +214,7 @@ /area/lv624/ground/colony/telecomm/sw_lz2 name = "\improper South-West LZ2 Communications Relay" ceiling = CEILING_NONE + linked_lz = DROPSHIP_LZ2 // ambience = list('sound/ambience/jungle_amb1.ogg') @@ -224,6 +230,7 @@ ceiling = CEILING_UNDERGROUND_BLOCK_CAS sound_environment = SOUND_ENVIRONMENT_AUDITORIUM minimap_color = MINIMAP_AREA_CAVES + unoviable_timer = FALSE /area/lv624/ground/caves/west_caves name ="\improper Western Caves" @@ -278,14 +285,15 @@ /area/lv624/lazarus/landing_zones ceiling = CEILING_NONE - is_resin_allowed = FALSE is_landing_zone = TRUE /area/lv624/lazarus/landing_zones/lz1 name = "\improper Alamo Landing Zone" + linked_lz = DROPSHIP_LZ1 /area/lv624/lazarus/landing_zones/lz2 name = "\improper Normandy Landing Zone" + linked_lz = DROPSHIP_LZ2 /area/lv624/lazarus name = "\improper Lazarus" @@ -295,6 +303,7 @@ /area/lv624/lazarus/corporate_dome name = "\improper Corporate Dome" icon_state = "green" + linked_lz = DROPSHIP_LZ2 /area/lv624/lazarus/yggdrasil name = "\improper Yggdrasil Tree" @@ -329,17 +338,17 @@ /area/lv624/lazarus/kitchen name = "\improper Kitchen" icon_state = "kitchen" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 /area/lv624/lazarus/canteen name = "\improper Canteen" icon_state = "cafeteria" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 /area/lv624/lazarus/main_hall name = "\improper Main Hallway" icon_state = "hallC1" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 /area/lv624/lazarus/toilet name = "\improper Dormitory Toilet" @@ -361,23 +370,23 @@ /area/lv624/lazarus/sleep_female name = "\improper Female Dorm" icon_state = "Sleep" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 /area/lv624/lazarus/quart name = "\improper Quartermasters" icon_state = "quart" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 /area/lv624/lazarus/quartstorage name = "\improper Cargo Bay" icon_state = "quartstorage" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 /area/lv624/lazarus/quartstorage/outdoors name = "\improper Cargo Bay Area" icon_state = "purple" ceiling = CEILING_NONE - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 always_unpowered = TRUE /area/lv624/lazarus/engineering @@ -394,11 +403,12 @@ name = "\improper Secure Storage" icon_state = "storage" flags_area = AREA_NOTUNNEL + linked_lz = DROPSHIP_LZ2 /area/lv624/lazarus/robotics name = "\improper Robotics" icon_state = "ass_line" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 /area/lv624/lazarus/research name = "\improper Research Lab" diff --git a/code/game/area/Prison_Station_FOP.dm b/code/game/area/Prison_Station_FOP.dm index b1bfbc093c16..0b71dc248520 100644 --- a/code/game/area/Prison_Station_FOP.dm +++ b/code/game/area/Prison_Station_FOP.dm @@ -10,7 +10,6 @@ /area/prison/security name = "\improper Security Department" icon_state = "security" - is_resin_allowed = FALSE minimap_color = MINIMAP_AREA_SEC /area/prison/security/briefing @@ -35,7 +34,6 @@ /area/prison/security/monitoring icon_state = "sec_prison" - is_resin_allowed = TRUE /area/prison/security/monitoring/lowsec/ne name = "\improper Northeast Low-Security Monitoring" @@ -64,7 +62,6 @@ /area/prison/security/checkpoint icon_state = "checkpoint1" - is_resin_allowed = TRUE /area/prison/security/checkpoint/medsec name = "\improper Medium-Security Checkpoint" @@ -89,7 +86,6 @@ /area/prison/security/checkpoint/hangar name = "\improper Main Hangar Traffic Control" - is_resin_allowed = FALSE is_landing_zone = TRUE /area/prison/storage @@ -168,7 +164,6 @@ /area/prison/toilet/security name = "\improper Security Restooms" - is_resin_allowed = FALSE /area/prison/toilet/research name = "\improper Research Restooms" @@ -202,7 +197,6 @@ /area/prison/maintenance/staff_research name = "\improper Staff-Research Maintenance" icon_state = "maint_research_starboard" - is_resin_allowed = FALSE /area/prison/maintenance/research_medbay name = "\improper Research-Infirmary Maintenance" @@ -211,7 +205,6 @@ /area/prison/maintenance/hangar_barracks name = "\improper Hangar-Barracks Maintenance" icon_state = "maint_e_shuttle" - is_resin_allowed = FALSE is_landing_zone = TRUE /area/prison/canteen @@ -262,7 +255,6 @@ /area/prison/hallway/entrance name = "\improper Entrance Hallway" icon_state = "entry" - is_resin_allowed = FALSE /area/prison/hallway/central name = "\improper Central Ring" @@ -409,17 +401,14 @@ /area/prison/research name = "\improper Biological Research Department" icon_state = "research" - is_resin_allowed = FALSE /area/prison/research/RD name = "\improper Research Director's office" icon_state = "disposal" - is_resin_allowed = FALSE /area/prison/research/secret name = "\improper Classified Research" icon_state = "toxlab" - is_resin_allowed = TRUE /area/prison/research/secret/dissection name = "\improper Dissection" @@ -458,15 +447,11 @@ /area/prison/monorail/east name = "\improper East Monorail Station" - is_resin_allowed = FALSE is_landing_zone = TRUE /area/prison/monorail/west name = "\improper West Monorail Station" -/area/prison/hanger - is_resin_allowed = FALSE - /area/prison/hanger/main name = "\improper Main Hanger" icon_state = "hangar_alpha" @@ -484,7 +469,6 @@ /area/prison/hangar_storage/research name = "\improper Research Hangar Storage" icon_state = "toxstorage" - is_resin_allowed = FALSE is_landing_zone = TRUE /area/prison/hangar_storage/research/shuttle @@ -494,7 +478,6 @@ /area/prison/telecomms name = "\improper Telecommunications" icon_state = "tcomsatcham" - is_resin_allowed = FALSE /area/prison/pirate name = "Tramp Freighter \"Rocinante\"" diff --git a/code/game/area/Sulaco.dm b/code/game/area/Sulaco.dm index 8facf9d44fd6..c1fad4eb715c 100644 --- a/code/game/area/Sulaco.dm +++ b/code/game/area/Sulaco.dm @@ -10,7 +10,6 @@ /area/shuttle/drop1 //soundscape_playlist = list('sound/soundscape/drum1.ogg') soundscape_interval = 30 //seconds - is_resin_allowed = FALSE flags_area = AREA_NOTUNNEL is_landing_zone = TRUE ceiling = CEILING_REINFORCED_METAL @@ -26,6 +25,7 @@ icon_state = "shuttlered" base_muffle = MUFFLE_HIGH base_lighting_alpha = 255 + is_resin_allowed = FALSE /area/shuttle/drop1/LV624 name = "\improper Dropship Alamo" @@ -69,7 +69,6 @@ /area/shuttle/drop2 //soundscape_playlist = list('sound/soundscape/drum1.ogg') soundscape_interval = 30 //seconds - is_resin_allowed = FALSE flags_area = AREA_NOTUNNEL is_landing_zone = TRUE ceiling = CEILING_REINFORCED_METAL @@ -80,6 +79,7 @@ icon_state = "shuttle" base_muffle = MUFFLE_HIGH base_lighting_alpha = 255 + is_resin_allowed = FALSE /area/shuttle/drop2/LV624 name = "\improper Dropship Normandy" @@ -123,7 +123,6 @@ /area/shuttle/drop3 //soundscape_playlist = list('sound/soundscape/drum1.ogg') soundscape_interval = 30 //seconds - is_resin_allowed = FALSE flags_area = AREA_NOTUNNEL is_landing_zone = TRUE ceiling = CEILING_REINFORCED_METAL @@ -168,6 +167,99 @@ name = "\improper Saipan Landing Zone" icon_state = "away2" +//UPP DROPSHIP + +/area/shuttle/drop_upp/Enter(atom/movable/O, atom/oldloc) + if(istype(O, /obj/structure/barricade)) + return FALSE + return TRUE + +/area/shuttle/drop_upp + soundscape_interval = 30 //seconds + flags_area = AREA_NOTUNNEL + is_landing_zone = TRUE + ceiling = CEILING_REINFORCED_METAL + base_lighting_alpha = 0 + +/area/shuttle/drop_upp/morana + name = "\improper Dropship Morana" + icon_state = "shuttle" + base_muffle = MUFFLE_HIGH + base_lighting_alpha = 255 + +/area/shuttle/drop_upp/LV624 + name = "\improper Dropship Morana" + ambience_exterior = AMBIENCE_LV624 + icon_state = "shuttle2" + +/area/shuttle/drop_upp/prison + name = "\improper Dropship Morana" + ambience_exterior = AMBIENCE_PRISON + icon_state = "shuttle2" + +/area/shuttle/drop_upp/BigRed + name = "\improper Dropship Morana" + ambience_exterior = AMBIENCE_BIGRED + icon_state = "shuttle2" + +/area/shuttle/drop_upp/ice_colony + name = "\improper Dropship Morana" + icon_state = "shuttle2" + +/area/shuttle/drop_upp/DesertDam + name = "\improper Dropship Morana" + ambience_exterior = AMBIENCE_TRIJENT + icon_state = "shuttle2" + +/area/shuttle/drop_upp/transit + ambience_exterior = 'sound/ambience/dropship_ambience_loop.ogg' + name = "\improper Dropship Morana Transit" + icon_state = "shuttlered" + +/area/shuttle/drop_upp/lz_upp + name = "\improper Morana Landing Zone" + icon_state = "away2" + +//// + +/area/shuttle/drop_upp2/devana + name = "\improper Dropship Devana" + icon_state = "shuttle" + base_muffle = MUFFLE_HIGH + base_lighting_alpha = 255 + +/area/shuttle/drop_upp2/LV624 + name = "\improper Dropship Devana" + ambience_exterior = AMBIENCE_LV624 + icon_state = "shuttle2" + +/area/shuttle/drop_upp2/prison + name = "\improper Dropship Devana" + ambience_exterior = AMBIENCE_PRISON + icon_state = "shuttle2" + +/area/shuttle/drop_upp2/BigRed + name = "\improper Dropship Devana" + ambience_exterior = AMBIENCE_BIGRED + icon_state = "shuttle2" + +/area/shuttle/drop_upp2/ice_colony + name = "\improper Dropship Devana" + icon_state = "shuttle2" + +/area/shuttle/drop_upp2/DesertDam + name = "\improper Dropship Devana" + ambience_exterior = AMBIENCE_TRIJENT + icon_state = "shuttle2" + +/area/shuttle/drop_upp2/transit + ambience_exterior = 'sound/ambience/dropship_ambience_loop.ogg' + name = "\improper Dropship Devana Transit" + icon_state = "shuttlered" + +/area/shuttle/drop_upp2/lz_upp + name = "\improper Devana Landing Zone" + icon_state = "away2" //DISTRESS SHUTTLES diff --git a/code/game/area/admin_level.dm b/code/game/area/admin_level.dm index 9dc43256f4de..f522ca24cd16 100644 --- a/code/game/area/admin_level.dm +++ b/code/game/area/admin_level.dm @@ -142,6 +142,10 @@ soundscape_playlist = SCAPE_PL_ELEVATOR_MUSIC icon_state = "yellow" +/area/adminlevel/ert_station/fax_response_station + name = "Sector Comms Relay" + icon_state = "green" + //Simulation area /area/adminlevel/simulation name = "Simulated Reality" diff --git a/code/game/area/almayer.dm b/code/game/area/almayer.dm index 55f65c8ecdef..1007f155ace4 100644 --- a/code/game/area/almayer.dm +++ b/code/game/area/almayer.dm @@ -720,7 +720,7 @@ flags_area = AREA_AVOID_BIOSCAN|AREA_NOTUNNEL|AREA_CONTAINMENT /area/almayer/medical/containment/cell/cl - name = "\improper Containment" + name = "\improper Storage Room" /area/almayer/medical/chemistry name = "\improper Medical Chemical laboratory" diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index db0702200d16..17ba24a9695c 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -82,6 +82,13 @@ /// Doesn't need to be set for areas/Z levels that are marked as admin-only var/block_game_interaction = FALSE + /// Which, if any, LZ this area belongs to. If an area belongs to an LZ, if that LZ is designated as the primary + /// LZ, all weeds will be destroyed and further weed placement disabled + var/linked_lz = FALSE + + /// How long this area should be un-oviable + var/unoviable_timer = 25 MINUTES + /area/New() // This interacts with the map loader, so it needs to be set immediately @@ -105,6 +112,13 @@ update_base_lighting() + if(unoviable_timer) + SSticker.OnRoundstart(CALLBACK(src, PROC_REF(handle_ovi_timer))) + + if((flags_area & AREA_UNWEEDABLE) && is_resin_allowed) + is_resin_allowed = FALSE + log_mapping("[src] has AREA_UNWEEDABLE flag but has is_resin_allowed as true! Forcing is_resin_allowed false...") + /area/proc/initialize_power(override_power) if(requires_power) if(override_power) //Reset everything if you want to override. @@ -418,3 +432,14 @@ areas_in_z["[z]"] = list() areas_in_z["[z]"] += src +/** + * Purges existing weeds, and prevents future weeds from being placed. + */ +/area/proc/purge_weeds() + SEND_SIGNAL(src, COMSIG_AREA_RESIN_DISALLOWED) + + is_resin_allowed = FALSE + +/// From roundstart, sets a timer to make an area oviable. +/area/proc/handle_ovi_timer() + addtimer(VARSET_CALLBACK(src, unoviable_timer, FALSE), unoviable_timer) diff --git a/code/game/area/kutjevo.dm b/code/game/area/kutjevo.dm index 1180e10a761e..52ce5b56f257 100644 --- a/code/game/area/kutjevo.dm +++ b/code/game/area/kutjevo.dm @@ -15,11 +15,13 @@ name = "Kutjevo - Dropship Alamo Landing Zone" icon_state = "shuttle" icon = 'icons/turf/area_kutjevo.dmi' + linked_lz = DROPSHIP_LZ1 /area/shuttle/drop2/kutjevo name = "Kutjevo - Dropship Normandy Landing Zone" icon_state = "shuttle2" icon = 'icons/turf/area_kutjevo.dmi' + linked_lz = DROPSHIP_LZ2 /area/kutjevo/exterior name = "Kutjevo - Exterior" @@ -34,16 +36,14 @@ requires_power = 1 /area/kutjevo/interior/oob - name = "Kutjevo - Out Of Bounds" + name = "Kutjevo - Out Of Bounds" ceiling = CEILING_MAX icon_state = "oob" is_resin_allowed = FALSE - flags_area = AREA_NOTUNNEL + flags_area = AREA_NOTUNNEL|AREA_UNWEEDABLE /area/kutjevo/interior/oob/dev_room name = "Kutjevo - Credits Room" - is_resin_allowed = FALSE - flags_area = AREA_NOTUNNEL icon_state = "kutjevo" //exterior map areas @@ -52,42 +52,51 @@ name = "Kutjevo Auxilliary Landing Zone" icon_state = "lz_pad" weather_enabled = FALSE - unlimited_power = 1//ds computer - is_resin_allowed = FALSE + unlimited_power = 1 //ds computer is_landing_zone = TRUE + linked_lz = DROPSHIP_LZ2 /area/kutjevo/exterior/lz_dunes name = "Kutjevo - Landing Zone Dunes" icon_state = "lz_dunes" - is_resin_allowed = FALSE weather_enabled = FALSE - unlimited_power = 1//DS Computer + unlimited_power = 1 //DS Computer is_landing_zone = TRUE + linked_lz = DROPSHIP_LZ1 /area/kutjevo/exterior/lz_river name = "Kutjevo - Power Station River" icon_state = "lz_river" + linked_lz = DROPSHIP_LZ1 /area/kutjevo/exterior/spring name = "Kutjevo - Southern Spring" icon_state = "lz_river" + unoviable_timer = FALSE /area/kutjevo/exterior/scrubland - name = "Kutjevo - Scrubland" + name = "Kutjevo - North Scrubland" icon_state = "scrubland" + linked_lz = DROPSHIP_LZ2 + +/area/kutjevo/exterior/scrubland/south + name = "Kutjevo - South Scrubland" + linked_lz = list(DROPSHIP_LZ1, DROPSHIP_LZ2) /area/kutjevo/exterior/stonyfields name = "Kutjevo - Stony Fields" icon_state = "stone_fields" + linked_lz = DROPSHIP_LZ1 /area/kutjevo/exterior/Northwest_Colony name = "Kutjevo - Northwest Colony Grounds" icon_state = "rf_dunes" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 /area/kutjevo/exterior/runoff_dunes name = "Kutjevo - Runoff Dunes" icon_state = "rf_dunes" + linked_lz = DROPSHIP_LZ1 /area/kutjevo/exterior/runoff_river name = "Kutjevo - Runoff River" @@ -108,6 +117,7 @@ /area/kutjevo/exterior/construction name = "Kutjevo - Abandoned Construction" icon_state = "construction" + unoviable_timer = FALSE /area/kutjevo/exterior/complex_border name = "Kutjevo Complex - Exterior" @@ -129,21 +139,24 @@ /area/kutjevo/exterior/telecomm name = "Kutjevo - Communications Relay" icon_state = "ass_line" - is_resin_allowed = FALSE ceiling_muffle = FALSE base_muffle = MUFFLE_LOW /area/kutjevo/exterior/telecomm/lz1_north name = "Kutjevo - North LZ1 Communications Relay" + linked_lz = DROPSHIP_LZ1 /area/kutjevo/exterior/telecomm/lz1_south name = "Kutjevo - South LZ1 Communications Relay" + linked_lz = DROPSHIP_LZ1 /area/kutjevo/exterior/telecomm/lz2_north name = "Kutjevo - North LZ2 Communications Relay" + linked_lz = DROPSHIP_LZ2 /area/kutjevo/exterior/telecomm/lz2_south name = "Kutjevo - South LZ2 Communications Relay" + linked_lz = DROPSHIP_LZ2 //interior areas + caves @@ -203,21 +216,21 @@ name = "Kutjevo Complex - Northwest Colony Dorms" icon_state = "Colony_int" ceiling = CEILING_METAL - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 is_landing_zone = TRUE /area/kutjevo/interior/complex/Northwest_Flight_Control name = "Kutjevo Complex - Northwest Flight Control Room" icon_state = "Colony_int" ceiling = CEILING_METAL - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 is_landing_zone = TRUE /area/kutjevo/interior/complex/Northwest_Security_Checkpoint name = "Kutjevo Complex - Northwest Security Checkpoint" icon_state = "Colony_int" ceiling = CEILING_METAL - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 minimap_color = MINIMAP_AREA_SEC is_landing_zone = TRUE @@ -227,6 +240,7 @@ ceiling = CEILING_METAL icon_state = "power" minimap_color = MINIMAP_AREA_ENGI + linked_lz = DROPSHIP_LZ1 /area/kutjevo/interior/power/comms name = "Kutjevo - Hydroelectric Dam Comms Relay" @@ -237,11 +251,13 @@ name = "Kutjevo - Abandoned Construction Interior" ceiling = CEILING_METAL icon_state = "construction_int" + unoviable_timer = FALSE /area/kutjevo/interior/foremans_office name = "Kutjevo - Foreman's Office" ceiling = CEILING_METAL icon_state = "foremans" + unoviable_timer = FALSE /area/kutjevo/interior/botany_bay_int name = "Kutjevo - Space Weed Farm Interior" @@ -263,26 +279,31 @@ ceiling = CEILING_UNDERGROUND_ALLOW_CAS icon_state = "colony_caves_0" minimap_color = MINIMAP_AREA_CAVES + unoviable_timer = FALSE /area/kutjevo/interior/colony_central/mine_elevator name = "Kutjevo - Central Colony Elevator" ceiling = CEILING_UNDERGROUND_ALLOW_CAS icon_state = "colony_caves_0" + unoviable_timer = FALSE /area/kutjevo/interior/colony_north name = "Kutjevo - North Colony Caves" ceiling = CEILING_DEEP_UNDERGROUND icon_state = "colony_caves_1" + unoviable_timer = FALSE /area/kutjevo/interior/colony_S_East name = "Kutjevo - North East Colony Caves" ceiling = CEILING_DEEP_UNDERGROUND icon_state = "colony_caves_2" + unoviable_timer = FALSE /area/kutjevo/interior/colony_N_East name = "Kutjevo - South East Colony Caves" ceiling = CEILING_DEEP_UNDERGROUND icon_state = "colony_caves_2" + unoviable_timer = FALSE /area/kutjevo/interior/colony_South name = "Kutjevo - South Colony Caves" @@ -294,3 +315,4 @@ ceiling = CEILING_DEEP_UNDERGROUND icon_state = "colony_caves_3" minimap_color = MINIMAP_AREA_ENGI_CAVE + unoviable_timer = FALSE diff --git a/code/game/area/prison_v3_fiorina.dm b/code/game/area/prison_v3_fiorina.dm index c02ed0310816..ef9c5fa31913 100644 --- a/code/game/area/prison_v3_fiorina.dm +++ b/code/game/area/prison_v3_fiorina.dm @@ -16,7 +16,7 @@ icon_state = "oob" ceiling = CEILING_MAX is_resin_allowed = FALSE - flags_area = AREA_NOTUNNEL + flags_area = AREA_NOTUNNEL|AREA_UNWEEDABLE /area/fiorina/maintenance name = "Fiorina - Maintenance" @@ -29,6 +29,8 @@ icon_state = "tumor0" temperature = 309.15 //its uh, gettin' kinda warm in here SL... ceiling = CEILING_UNDERGROUND_METAL_BLOCK_CAS + unoviable_timer = FALSE + /area/fiorina/tumor/deep icon_state = "tumor0-deep" @@ -70,33 +72,34 @@ name = "Fiorina - LZ" is_landing_zone = TRUE minimap_color = MINIMAP_AREA_LZ - is_resin_allowed = FALSE /area/fiorina/lz/near_lzI name = "Fiorina - LZ1 Aux Port" + linked_lz = DROPSHIP_LZ1 /area/fiorina/lz/near_lzII name = "Fiorina - LZ2 Prison Port" + linked_lz = DROPSHIP_LZ2 /area/fiorina/lz/console_I name = "Fiorina - LZ1 Control Console" icon_state = "lz1" - requires_power = 0 + requires_power = FALSE /area/fiorina/lz/console_II name = "Fiorina - LZ2 Control Console" icon_state = "lz2" - requires_power = 0 + requires_power = FALSE /area/shuttle/drop1/prison_v3 name = "Fiorina - Dropship Alamo Landing Zone" icon_state = "shuttle" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 /area/shuttle/drop2/prison_v3 name = "Fiorina - Normandy Landing Zone" icon_state = "shuttle2" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 //STATION AREAS AAAA /area/fiorina/station @@ -108,23 +111,41 @@ name = "Fiorina - Low Security Cells" icon_state = "station1" +/area/fiorina/station/lowsec/showers_laundry + name = "Fiorina - Low Security Showers & Laundry" + linked_lz = DROPSHIP_LZ2 + +/area/fiorina/station/lowsec/east + name = "Fiorina - Low Security Eastside" + /area/fiorina/station/power_ring name = "Fiorina - Engineering Ring" icon_state = "power0" minimap_color = MINIMAP_AREA_ENGI + linked_lz = list(DROPSHIP_LZ2, DROPSHIP_LZ1) + +/area/fiorina/station/power_ring/reactor + name = "Fiorina - Engineering Reactor" + linked_lz = null /area/fiorina/station/disco - name = "Fiorina - Disco Storage" + name = "Fiorina - West Disco Storage" icon_state = "disco" +/area/fiorina/station/disco/east_disco + name = "Fiorina - East Disco Storage" + linked_lz = DROPSHIP_LZ1 + /area/fiorina/station/flight_deck name = "Fiorina - Flight Deck" icon_state = "police_line" + linked_lz = DROPSHIP_LZ1 /area/fiorina/station/security name = "Fiorina - Security Hub" icon_state = "security_hub" minimap_color = MINIMAP_AREA_SEC + linked_lz = DROPSHIP_LZ2 /area/fiorina/station/security/wardens name = "Fiorina - Warden's Office" @@ -155,6 +176,7 @@ /area/fiorina/station/civres_blue name = "Fiorina - Blue Block Residences" icon_state = "station1" + unoviable_timer = FALSE /area/fiorina/station/medbay name = "Fiorina - Medical Bay" @@ -166,12 +188,22 @@ icon_state = "station0" minimap_color = MINIMAP_AREA_RESEARCH +/area/fiorina/station/research_cells/west + name = "Fiorina - West Research Cellblock" + +/area/fiorina/station/research_cells/east + name = "Fiorina - East Research Cellblock" + linked_lz = DROPSHIP_LZ1 + +/area/fiorina/station/research_cells/basketball + name = "Fiorina - Basketball Court" + linked_lz = DROPSHIP_LZ1 //telecomms areas /area/fiorina/station/telecomm name = "Fiorina - Communications Relay" icon_state = "ass_line" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 ceiling_muffle = FALSE base_muffle = MUFFLE_LOW @@ -190,9 +222,12 @@ /area/fiorina/station/telecomm/lz2_engineering name = "Fiorina - Engineering Secondary Communications Relay" + linked_lz = DROPSHIP_LZ2 /area/fiorina/station/telecomm/lz2_north name = "Fiorina - LZ2 North Communications Relay" + linked_lz = DROPSHIP_LZ2 /area/fiorina/station/telecomm/lz2_maint name = "Fiorina - Backup Communications Relay" + linked_lz = DROPSHIP_LZ2 diff --git a/code/game/area/shiva.dm b/code/game/area/shiva.dm index dee9eb5f0aea..c336affeef10 100644 --- a/code/game/area/shiva.dm +++ b/code/game/area/shiva.dm @@ -14,14 +14,14 @@ name = "Shiva's Snowball - Dropship Alamo Landing Zone" icon_state = "shuttle" icon = 'icons/turf/area_shiva.dmi' - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 minimap_color = MINIMAP_AREA_LZ /area/shuttle/drop2/shiva name = "Shiva's Snowball - Dropship Normandy Landing Zone" icon_state = "shuttle2" icon = 'icons/turf/area_shiva.dmi' - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 minimap_color = MINIMAP_AREA_LZ /area/shiva/exterior/lz1_console @@ -48,38 +48,36 @@ ceiling = CEILING_MAX icon_state = "oob" is_resin_allowed = FALSE - flags_area = AREA_NOTUNNEL + flags_area = AREA_NOTUNNEL|AREA_UNWEEDABLE /area/shiva/interior/oob/dev_room name = "Shiva's Snowball - Secret Room" - is_resin_allowed = FALSE - flags_area = AREA_NOTUNNEL icon_state = "shiva" //telecomms areas - exterior /area/shiva/exterior/telecomm name = "Shiva's Snowball - Communications Relay" icon_state = "ass_line" - is_resin_allowed = FALSE /area/shiva/exterior/telecomm/lz1_north name = "Shiva's Snowball - North LZ1 Communications Relay" minimap_color = MINIMAP_AREA_LZ + linked_lz = DROPSHIP_LZ1 /area/shiva/exterior/telecomm/lz2_southeast name = "Shiva's Snowball - South-East LZ2 Communications Relay" minimap_color = MINIMAP_AREA_LZ + linked_lz = DROPSHIP_LZ2 /area/shiva/exterior/telecomm/lz2_northeast name = "Shiva's Snowball - North-East LZ2 Communications Relay" minimap_color = MINIMAP_AREA_LZ - + linked_lz = DROPSHIP_LZ2 //telecomms areas - interior /area/shiva/interior/telecomm name = "Shiva's Snowball - Communications Relay" icon_state = "ass_line" - is_resin_allowed = FALSE /area/shiva/interior/telecomm/lz1_biceps name = "Shiva's Snowball - Fort Biceps Communications Relay" @@ -89,44 +87,53 @@ /area/shiva/interior/telecomm/lz1_flight name = "Shiva's Snowball - LZ1 Aerodrome Communications Relay" minimap_color = MINIMAP_AREA_LZ + linked_lz = DROPSHIP_LZ1 /area/shiva/interior/telecomm/lz2_research name = "Shiva's Snowball - Argentinian Communications Relay" minimap_color = MINIMAP_AREA_LZ + linked_lz = DROPSHIP_LZ2 //telecomms areas - caves /area/shiva/caves/telecomm name = "Shiva's Snowball - Communications Relay" icon_state = "ass_line" - is_resin_allowed = FALSE /area/shiva/caves/telecomm/lz2_south name = "Shiva's Snowball - Backup Communications Relay" minimap_color = MINIMAP_AREA_LZ + linked_lz = DROPSHIP_LZ2 //exterior areas /area/shiva/exterior/lz1_valley name = "Shiva's Snowball - Landing Valley" icon_state = "landing_valley" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 is_landing_zone = TRUE minimap_color = MINIMAP_AREA_LZ /area/shiva/exterior/lz2_fortress name = "Shiva's Snowball - Landing Bulwark" icon_state = "lz2_fortress" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 is_landing_zone = TRUE minimap_color = MINIMAP_AREA_LZ /area/shiva/exterior/valley name = "Shiva's Snowball - Storage Bunker Valley" icon_state = "junkyard1" + unoviable_timer = FALSE + +/area/shiva/exterior/southwest_valley + name = "Shiva's Snowball - Southwest Valley" + icon_state = "sw" + linked_lz = DROPSHIP_LZ1 /area/shiva/exterior/cp_colony_grounds name = "Shiva's Snowball - Colony Grounds" icon_state = "junkyard2" + unoviable_timer = FALSE /area/shiva/exterior/junkyard name = "Shiva's Snowball - Junkyard" @@ -139,14 +146,17 @@ /area/shiva/exterior/junkyard/cp_bar name = "Shiva's Snowball - Bar Grounds" icon_state = "bar0" + unoviable_timer = FALSE /area/shiva/exterior/cp_s_research name = "Shiva's Snowball - Research Hab Exterior" icon_state = "junkyard1" + unoviable_timer = FALSE /area/shiva/exterior/cp_lz2 name = "Shiva's Snowball - North Colony Grounds" icon_state = "junkyard3" + linked_lz = DROPSHIP_LZ2 /area/shiva/exterior/research_alley name = "Shiva's Snowball - South Research Alley" @@ -165,6 +175,7 @@ /area/shiva/interior/caves/right_spiders name = "Shiva's Snowball - Forgotten Passage" icon_state = "caves1" + unoviable_timer = FALSE /area/shiva/interior/caves/left_spiders name = "Shiva's Snowball - Crevice Passage" @@ -174,19 +185,23 @@ name = "Shiva's Snowball - South LZ2 Caves" icon_state = "caves3" minimap_color = MINIMAP_AREA_LZ + linked_lz = DROPSHIP_LZ2 /area/shiva/interior/caves/cp_camp name = "Shiva's Snowball - Cave Camp" icon_state = "bar3" + linked_lz = list(DROPSHIP_LZ1, DROPSHIP_LZ2) /area/shiva/interior/caves/research_caves name = "Shiva's Snowball - South Research Hab Caves" icon_state = "caves2" minimap_color = MINIMAP_AREA_RESEARCH_CAVE + unoviable_timer = FALSE /area/shiva/interior/caves/medseceng_caves name = "Shiva's Snowball - South Med-Sec-Eng Complex Caves" icon_state = "caves3" + unoviable_timer = FALSE /area/shiva/interior/colony name = "Shiva's Snowball - Colony MegaStruct(TM)" @@ -214,19 +229,17 @@ /area/shiva/interior/colony/research_hab name = "Shiva's Snowball - Research Hab Interior" icon_state = "res2" + unoviable_timer = FALSE /area/shiva/interior/colony/medseceng name = "Shiva's Snowball - Colony MegaStruct(TM) Med-Sec-Eng Segment" icon_state = "res0" - -/area/shiva/interior/colony/deck - name = "Shiva's Snowball - Colony MegaStruct(TM) Open Deck" - icon_state = "res1" - ceiling = CEILING_GLASS + unoviable_timer = FALSE /area/shiva/interior/aerodrome name = "Shiva's Snowball - Aerodrome" icon_state = "hangars0" + linked_lz = DROPSHIP_LZ1 /area/shiva/interior/bar name = "Shiva's Snowball - Anti-Freeze Bar" @@ -239,6 +252,7 @@ /area/shiva/interior/warehouse name = "Shiva's Snowball - Blue Warehouse" icon_state = "hangars1" + linked_lz = DROPSHIP_LZ1 /area/shiva/interior/warehouse/caves name = "Shiva's Snowball - Blue Warehouse Ice Cave" @@ -247,23 +261,28 @@ /area/shiva/interior/valley_huts name = "Shiva's Snowball - Valley Bunker 1" icon_state = "hangars1" + unoviable_timer = FALSE /area/shiva/interior/valley_huts/no2 name = "Shiva's Snowball - Valley Bunker 2" icon_state = "hangars2" + unoviable_timer = FALSE /area/shiva/interior/valley_huts/disposals name = "Shiva's Snowball - Valley Disposals" icon_state = "hangars3" + unoviable_timer = FALSE /area/shiva/interior/garage name = "Shiva's Snowball - Cargo Tug Repair Station" icon_state = "hangars2" + unoviable_timer = FALSE /area/shiva/interior/lz2_habs name = "Shiva's Snowball - Argentinian Research Headquarters" icon_state = "bar1" is_landing_zone = TRUE + linked_lz = DROPSHIP_LZ2 /area/shiva/interior/aux_power name = "Shiva's Snowball - Auxiliary Generator Station" diff --git a/code/game/area/shuttles.dm b/code/game/area/shuttles.dm index 3a8d53ab30b7..1890f31925be 100644 --- a/code/game/area/shuttles.dm +++ b/code/game/area/shuttles.dm @@ -73,6 +73,7 @@ /area/shuttle/escape_pod icon = 'icons/turf/area_almayer.dmi' icon_state = "lifeboat" + flags_area = AREA_NOTUNNEL /area/shuttle/escape_pod/afterShuttleMove(new_parallax_dir) . = ..() diff --git a/code/game/area/space_station_13_areas.dm b/code/game/area/space_station_13_areas.dm index 6b3084ba8068..a4deed0bc171 100644 --- a/code/game/area/space_station_13_areas.dm +++ b/code/game/area/space_station_13_areas.dm @@ -24,8 +24,9 @@ NOTE: there are two lists of areas in the end of this file: centcom and station power_environ = FALSE temperature = TCMB pressure = 0 - flags_area = AREA_NOTUNNEL + flags_area = AREA_NOTUNNEL|AREA_UNWEEDABLE weather_enabled = FALSE + is_resin_allowed = FALSE //fix for issue https://github.com/cmss13-devs/cmss13/issues/2191 base_muffle = AREA_MUTED diff --git a/code/game/area/strata.dm b/code/game/area/strata.dm index 8b1132c2dce1..66e087626944 100644 --- a/code/game/area/strata.dm +++ b/code/game/area/strata.dm @@ -21,14 +21,14 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed icon_state = "shuttle" base_lighting_alpha = 255 minimap_color = MINIMAP_AREA_LZ - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 /area/shuttle/drop2/strata name = "Dropship Normandy Landing Zone" icon_state = "shuttle2" base_lighting_alpha = 255 minimap_color = MINIMAP_AREA_LZ - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 //Begin actual area definitions. There's probably a better way to do this. @@ -41,7 +41,6 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed /area/strata/ag name = "Above Ground Area" icon_state = "ag" - is_resin_allowed = TRUE /area/strata/ag/exterior name = "Exterior Above Ground Area" @@ -62,7 +61,6 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed /area/strata/ug name = "Under Ground Area" icon_state = "ug" - is_resin_allowed = TRUE ceiling = CEILING_UNDERGROUND_ALLOW_CAS /area/strata/ug/interior @@ -90,25 +88,25 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed name = "Do not use." icon_state = "landingzone_2" minimap_color = MINIMAP_AREA_LZ - is_resin_allowed = FALSE /area/strata/ag/exterior/landing_zones/lz2 name = "Landing Zone 2 Pad - Ice Fields" unlimited_power = 1 //So the DS computer always works for the Queen weather_enabled = FALSE is_landing_zone = TRUE + linked_lz = DROPSHIP_LZ2 /area/strata/ag/exterior/landing_zones/near_lz2 name = "Landing Zone 2 - Ice Fields" icon_state = "nearlz2" weather_enabled = TRUE is_landing_zone = TRUE + linked_lz = DROPSHIP_LZ2 /area/strata/ag/interior/landing_zones name = "Do not use." icon_state = "landingzone_1" minimap_color = MINIMAP_AREA_LZ - is_resin_allowed = FALSE weather_enabled = FALSE ceiling = CEILING_NONE @@ -116,11 +114,13 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed name = "Landing Zone 1 Pad - Mining Aerodrome" unlimited_power = 1 //So the DS computer always works for the Queen is_landing_zone = TRUE + linked_lz = DROPSHIP_LZ1 /area/strata/ag/interior/landing_zones/near_lz1 name = "Landing Zone 1 - Mining Aerodrome" icon_state = "nearlz1" is_landing_zone = TRUE + linked_lz = DROPSHIP_LZ1 //-Caves @@ -133,11 +133,13 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed /area/strata/ag/exterior/caves/lz_caves name = "External Mining Aerodrome Caves" + linked_lz = DROPSHIP_LZ1 /area/strata/ag/exterior/jungle/carplake_center name = "Deep Jungle - Carp Lake Center Island" icon_state = "ug_jung_1" weather_enabled = TRUE + unoviable_timer = FALSE //-Marsh @@ -147,34 +149,42 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed /area/strata/ag/exterior/marsh/spring_marshes name = "Cryo-Thermal Springs Marshes" + linked_lz = list(DROPSHIP_LZ1, DROPSHIP_LZ2) /area/strata/ag/exterior/marsh/water_marshes name = "Cryo-Thermal Water Marshes" + linked_lz = DROPSHIP_LZ2 /area/strata/ag/exterior/marsh/island_marshes name = "Cryo-Thermal Island Marshes" is_landing_zone = TRUE + linked_lz = DROPSHIP_LZ2 /area/strata/ag/exterior/marsh/relay_marshes name = "Cryo-Thermal Relay Marshes" is_landing_zone = TRUE + linked_lz = DROPSHIP_LZ2 /area/strata/ag/exterior/marsh/center name = "Cryo-Thermal Springs" icon_state = "marshcenter" + linked_lz = list(DROPSHIP_LZ1, DROPSHIP_LZ2) /area/strata/ag/exterior/marsh/river name = "Cryo-Thermal River" icon_state = "marshriver" + linked_lz = DROPSHIP_LZ1 /area/strata/ag/exterior/marsh/crash name = "Cryo-Thermal Crashed Lifeboat" icon_state = "marshship" + linked_lz = list(DROPSHIP_LZ1, DROPSHIP_LZ2) /area/strata/ag/exterior/marsh/water name = "Cryo-Thermal Water" icon_state = "marshwater" temperature = TCMB //space cold + linked_lz = DROPSHIP_LZ2 //-Outside "interiors" @@ -204,9 +214,11 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed /area/strata/ag/exterior/paths/flight_control_exterior name = "Flight Control Exterior" + linked_lz = DROPSHIP_LZ1 /area/strata/ag/exterior/paths/mining_outpost_exterior name = "Mining Outpost Exterior" + linked_lz = DROPSHIP_LZ1 /area/strata/ag/exterior/paths/north_outpost name = "Outpost - North Access Channel" @@ -215,6 +227,7 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed /area/strata/ag/exterior/paths/far_north_outpost name = "Far North Of The Outpost" icon_state = "cabin" + unoviable_timer = FALSE /area/strata/ag/exterior/paths/south_outpost name = "South Of The Outpost" @@ -235,23 +248,12 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed name = "Sorokyne Outpost" icon_state = "shed_x_ag" minimap_color = MINIMAP_AREA_CAVES + ceiling = CEILING_UNDERGROUND_METAL_ALLOW_CAS /area/strata/ag/interior/outpost/foyer name = "Outpost Main Foyer" icon_state = "outpost_gen_1" -/area/strata/ag/interior/outpost/hallways - name = "Do not use." - icon_state = "outpost_admin_3" - minimap_color = MINIMAP_AREA_GLASS - ceiling = CEILING_GLASS - -/area/strata/ag/interior/outpost/hallways/north - name = "Outpost North Hallways" - -/area/strata/ag/interior/outpost/hallways/south - name = "Outpost South Hallways" - /area/strata/ag/interior/outpost/maint name = "Outpost Canteen - Eastern Maintenance" icon_state = "outpost_maint" @@ -283,46 +285,39 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed name = "Outpost Administration" icon_state = "outpost_admin_0" minimap_color = MINIMAP_AREA_COMMAND + ceiling = CEILING_GLASS /area/strata/ag/interior/outpost/canteen name = "Outpost Canteen" icon_state = "outpost_canteen_0" + ceiling = CEILING_GLASS /area/strata/ag/interior/outpost/canteen/bar name = "Outpost Bar" icon_state = "outpost_canteen_2" -/area/strata/ag/interior/outpost/canteen/lower_cafeteria - name = "Outpost Cafeteria" - icon_state = "outpost_canteen_0" - -/area/strata/ag/interior/outpost/canteen/personal_storage - name = "Outpost Personal Storage" - //-Mining Outpost /area/strata/ag/interior/mining_outpost name = "Do not use." minimap_color = MINIMAP_AREA_MINING + linked_lz = DROPSHIP_LZ1 + ceiling = CEILING_UNDERGROUND_METAL_ALLOW_CAS /area/strata/ag/interior/mining_outpost/central - name = "Mining Outpost Central Hallway" + name = "Mining Outpost Central" icon_state = "dorms_0" + ceiling = CEILING_GLASS /area/strata/ag/interior/mining_outpost/south_dormitories name = "Mining Outpost South Dormitories" icon_state = "dorms_3" + ceiling = CEILING_GLASS /area/strata/ag/interior/mining_outpost/maintenance name = "Mining Outpost Dormitory Maintenance" icon_state = "outpost_maint" -/area/strata/ag/interior/mining_outpost/hallways - name = "Mining Outpost Hallways" - icon_state = "outpost_admin_3" - minimap_color = MINIMAP_AREA_GLASS - ceiling = CEILING_GLASS - /area/strata/ag/interior/mining_outpost/hive name = "Mining Outpost Dormitory Thermal Storage" icon_state = "dorms_beno" @@ -330,6 +325,7 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed /area/strata/ag/interior/mining_outpost/canteen name = "Mining Outpost Dormitory Canteen" icon_state = "dorms_canteen" + ceiling = CEILING_GLASS /area/strata/ag/interior/mining_outpost/flight_control name = "Mining Outpost Flight Control" @@ -347,11 +343,13 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed icon_state = "offices" minimap_color = MINIMAP_AREA_COMMAND ceiling = CEILING_UNDERGROUND_METAL_ALLOW_CAS + linked_lz = DROPSHIP_LZ1 /area/strata/ag/interior/outside/wooden_hospital name = "Wooden Hospital - Hospital Proper" icon_state = "cabin3" minimap_color = MINIMAP_AREA_CAVES + unoviable_timer = FALSE /area/strata/ag/interior/mountain name = "Outside mountain" @@ -388,6 +386,7 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed name = "Do not use." icon_state = "outpost_engi_3" minimap_color = MINIMAP_AREA_ENGI + linked_lz = DROPSHIP_LZ2 /area/strata/ag/interior/outside/engineering/parts_storage name = "Engineering Parts Storage" @@ -415,6 +414,7 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed icon_state = "hive_1" ceiling = CEILING_UNDERGROUND_BLOCK_CAS minimap_color = MINIMAP_AREA_CAVES_DEEP + unoviable_timer = FALSE //-Underground Dorms @@ -431,21 +431,26 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed /area/strata/ug/interior/outpost/underground_dorms/sec1 name = "Underground Security Dorm #1" + unoviable_timer = FALSE /area/strata/ug/interior/outpost/underground_dorms/sec2 name = "Underground Security Dorm #2" + unoviable_timer = FALSE /area/strata/ug/interior/outpost/underground_dorms/admin1 name = "Underground General Staff Dorm #1" /area/strata/ug/interior/outpost/underground_dorms/admin2 name = "Underground General Staff Dorm #2" + unoviable_timer = FALSE /area/strata/ug/interior/outpost/underground_dorms/admin3 name = "Underground General Staff Dorm #3" + unoviable_timer = FALSE /area/strata/ug/interior/outpost/underground_dorms/admin4 name = "Underground General Staff Dorm #4" + unoviable_timer = FALSE /area/strata/ug/interior/outpost/underground_dorms/med1 name = "Underground Medical Dorm #1" @@ -472,6 +477,7 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed /area/strata/ug/interior/jungle/carplake name = "Do not use." icon_state = "ug_jung_1" + unoviable_timer = FALSE /area/strata/ug/interior/jungle/carplake/north name = "Deep Jungle - North of Carp Lake" @@ -488,10 +494,12 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed /area/strata/ug/interior/jungle/platform/south name = "Deep Jungle - South of Underground Platform" icon_state = "ug_jung_4" + unoviable_timer = FALSE /area/strata/ug/interior/jungle/platform/east name = "Deep Jungle - East of Underground Platform" icon_state = "ug_jung_0" + unoviable_timer = FALSE /area/strata/ug/interior/jungle/structures name = "Do not use." @@ -502,6 +510,7 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed icon_state = "ug_jung_2" name = "Deep Jungle - Classified Research Station" minimap_color = MINIMAP_AREA_RESEARCH + unoviable_timer = FALSE /area/strata/ug/interior/jungle/structures/research/south icon_state = "ug_jung_3" @@ -522,6 +531,7 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed icon_state = "ug_jung_5" name = "Deep Jungle - Planetary Core Monitoring" minimap_color = MINIMAP_AREA_CAVES_STRUCTURE + unoviable_timer = FALSE /area/strata/ug/interior/jungle/structures/monitoring/west icon_state = "ug_jung_6" @@ -541,10 +551,12 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed /area/strata/ug/interior/jungle/structures/ruin icon_state = "ug_jung_mine_4" name = "Deep Jungle - Ancient Dorms" + unoviable_timer = FALSE /area/strata/ug/interior/jungle/tearlake name = "Deep Jungle - Weeping Pool" icon_state = "ug_jung_3" + unoviable_timer = FALSE //-Others @@ -552,5 +564,5 @@ EXTERIOR is FUCKING FREEZING, and refers to areas out in the open and or exposed name = "Super Secret Credits Room" icon_state = "marshwater" is_resin_allowed = FALSE - flags_area = AREA_NOTUNNEL + flags_area = AREA_NOTUNNEL|AREA_UNWEEDABLE diff --git a/code/game/area/varadero.dm b/code/game/area/varadero.dm index b0e5d283fdcd..b22cb5c8d936 100644 --- a/code/game/area/varadero.dm +++ b/code/game/area/varadero.dm @@ -17,7 +17,7 @@ name = "New Varadero - Dropship Alamo Landing Zone" icon_state = "shuttle" icon = 'icons/turf/area_varadero.dmi' - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 minimap_color = MINIMAP_AREA_LZ @@ -25,7 +25,7 @@ name = "New Varadero - Dropship Normandy Landing Zone" icon_state = "shuttle2" icon = 'icons/turf/area_varadero.dmi' - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 minimap_color = MINIMAP_AREA_LZ //Parent areas @@ -51,7 +51,7 @@ /area/varadero/interior/comms1 name = "New Varadero - Cargo Generator" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 icon_state = "comms1" minimap_color = MINIMAP_AREA_ENGI_CAVE @@ -59,15 +59,17 @@ name = "New Varadero - Communications Project Site" icon_state = "comms2" minimap_color = MINIMAP_AREA_ENGI_CAVE + linked_lz = DROPSHIP_LZ2 /area/varadero/interior/comms3 name = "New Varadero - Engineering Communications" icon_state = "comms3" minimap_color = MINIMAP_AREA_ENGI_CAVE + linked_lz = DROPSHIP_LZ2 /area/varadero/exterior/comms4 name = "New Varadero - Walkway Extension" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 icon_state = "comms4" minimap_color = MINIMAP_AREA_ENGI_CAVE @@ -76,21 +78,19 @@ ceiling = CEILING_MAX icon_state = "oob" is_resin_allowed = FALSE - flags_area = AREA_NOTUNNEL + flags_area = AREA_NOTUNNEL|AREA_UNWEEDABLE //landing zone computers /area/varadero/exterior/lz1_console name = "New Varadero - Pontoon Dock" requires_power = FALSE - is_resin_allowed = FALSE minimap_color = MINIMAP_AREA_LZ is_landing_zone = TRUE /area/varadero/exterior/lz1_console/two name = "New Varadero - Palm Airfield" requires_power = FALSE - is_resin_allowed = FALSE minimap_color = MINIMAP_AREA_LZ //exterior areas @@ -98,29 +98,30 @@ /area/varadero/exterior/lz1_near name = "New Varadero - Pontoon Airfield" icon_state = "lz1" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 minimap_color = MINIMAP_AREA_LZ is_landing_zone = TRUE /area/varadero/exterior/lz2_near name = "New Varadero - Palm Airfield" icon_state = "lz2" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 minimap_color = MINIMAP_AREA_LZ is_landing_zone = TRUE /area/varadero/exterior/pontoon_beach name = "New Varadero - Rockabilly Beach" icon_state = "varadero0" - is_resin_allowed = FALSE + linked_lz = list(DROPSHIP_LZ1, DROPSHIP_LZ2) minimap_color = MINIMAP_AREA_JUNGLE /area/varadero/exterior/pontoon_beach/lz is_landing_zone = TRUE + linked_lz = DROPSHIP_LZ1 /area/varadero/exterior/eastbeach name = "New Varadero - East Beach" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 icon_state = "varadero1" minimap_color = MINIMAP_AREA_JUNGLE @@ -136,14 +137,13 @@ /area/varadero/exterior/eastocean name = "New Varadero - East Ocean" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ2 flags_area = AREA_NOTUNNEL icon_state = "varadero2" minimap_color = MINIMAP_AREA_CONTESTED_ZONE /area/varadero/exterior/farocean name = "New Varadero - Far Ocean" - is_resin_allowed = FALSE flags_area = AREA_NOTUNNEL icon_state = "varadero3" minimap_color = MINIMAP_AREA_CONTESTED_ZONE @@ -154,14 +154,14 @@ /area/varadero/interior/beach_bar name = "New Varadero - Beach Bar" icon_state = "varadero4" - is_resin_allowed = FALSE + linked_lz = list(DROPSHIP_LZ1, DROPSHIP_LZ2) minimap_color = MINIMAP_AREA_JUNGLE sound_environment = SOUND_ENVIRONMENT_ROOM /area/varadero/interior/dock_control name = "New Varadero - Dock Control" icon_state = "varadero3" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 minimap_color = MINIMAP_AREA_JUNGLE sound_environment = SOUND_ENVIRONMENT_ROOM is_landing_zone = TRUE @@ -169,7 +169,7 @@ /area/varadero/interior/cargo name = "New Varadero - Cargo" icon_state = "req0" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 minimap_color = MINIMAP_AREA_ENGI /area/varadero/interior/hall_NW @@ -179,7 +179,7 @@ /area/varadero/interior/hall_N name = "New Varadero - Hallway N" icon_state = "hall2" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 /area/varadero/interior/hall_SE name = "New Varadero - Hallway SE" @@ -188,13 +188,13 @@ /area/varadero/interior/chapel name = "New Vardero - Chapel" icon_state = "offices1" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 minimap_color = MINIMAP_AREA_COMMAND_CAVE /area/varadero/interior/morgue name = "New Varadero - Morgue" icon_state = "offices0" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 minimap_color = MINIMAP_AREA_MEDBAY_CAVE /area/varadero/interior/medical @@ -209,7 +209,7 @@ /area/varadero/interior/maintenance/north name = "New Varadero - Northern Maintenance" icon_state = "tunnels1" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 /area/varadero/interior/maintenance/research name = "New Varadero - Research Maintenance" @@ -217,10 +217,17 @@ minimap_color = MINIMAP_AREA_RESEARCH_CAVE /area/varadero/interior/maintenance/security - name = "New Varadero - Security Maintenance" + name = "New Varadero - Sec. Maintenance" icon_state = "tunnels2" minimap_color = MINIMAP_AREA_SEC_CAVE +/area/varadero/interior/maintenance/security/north + name = "New Varadero - North Sec. Maintenance" + linked_lz = DROPSHIP_LZ2 + +/area/varadero/interior/maintenance/security/south + name = "New Varadero - South Sec. Maintenance" + /area/varadero/interior/research name = "New Varadero - Research Offices" icon_state = "offices4" @@ -230,6 +237,7 @@ name = "New Varadero - Electrical Annex" icon_state = "req4" minimap_color = MINIMAP_AREA_ENGI + linked_lz = DROPSHIP_LZ2 /area/varadero/interior/toilets name = "New Varadero - Restrooms" @@ -257,7 +265,7 @@ /area/varadero/interior/library name = "New Varadero - Library" icon_state = "offices0" - is_resin_allowed = FALSE + linked_lz = DROPSHIP_LZ1 minimap_color = MINIMAP_AREA_COMMAND_CAVE /area/varadero/interior/court @@ -312,7 +320,7 @@ power_equip = FALSE power_environ = FALSE minimap_color = MINIMAP_AREA_RESEARCH_CAVE - + unoviable_timer = FALSE /area/varadero/interior_protected/caves/central name = "New Varadero - Grass Caves" @@ -331,10 +339,10 @@ name = "New Varadero - Southern Maintenance" icon_state = "deepcaves4" minimap_color = MINIMAP_AREA_CAVES + unoviable_timer = FALSE /area/varadero/interior_protected/vessel name = "New Varadero - Unknown Vessel" icon_state = "predship" minimap_color = MINIMAP_AREA_SHIP - - + unoviable_timer = FALSE diff --git a/code/game/gamemodes/cm_initialize.dm b/code/game/gamemodes/cm_initialize.dm index 4cfc02eecad9..cd2cdd18fe88 100644 --- a/code/game/gamemodes/cm_initialize.dm +++ b/code/game/gamemodes/cm_initialize.dm @@ -48,6 +48,7 @@ Additional game mode variables. var/list/dead_queens // A list of messages listing the dead queens var/list/predators = list() var/list/joes = list() + var/list/fax_responders = list() var/xeno_required_num = 0 //We need at least one. You can turn this off in case we don't care if we spawn or don't spawn xenos. var/xeno_starting_num = 0 //To clamp starting xenos. @@ -119,10 +120,10 @@ Additional game mode variables. xeno_starting_num = clamp((GLOB.readied_players/CONFIG_GET(number/xeno_number_divider)), xeno_required_num, INFINITY) //(n, minimum, maximum) surv_starting_num = clamp((GLOB.readied_players/CONFIG_GET(number/surv_number_divider)), 2, 8) //this doesnt run marine_starting_num = length(GLOB.player_list) - xeno_starting_num - surv_starting_num - for(var/datum/squad/sq in GLOB.RoleAuthority.squads) - if(sq) - sq.max_engineers = engi_slot_formula(marine_starting_num) - sq.max_medics = medic_slot_formula(marine_starting_num) + for(var/datum/squad/target_squad in GLOB.RoleAuthority.squads) + if(target_squad) + target_squad.roles_cap[JOB_SQUAD_ENGI] = engi_slot_formula(marine_starting_num) + target_squad.roles_cap[JOB_SQUAD_MEDIC] = medic_slot_formula(marine_starting_num) for(var/i in GLOB.RoleAuthority.roles_by_name) var/datum/job/J = GLOB.RoleAuthority.roles_by_name[i] @@ -255,6 +256,105 @@ Additional game mode variables. return new_predator +//===================================================\\ + + //FAX RESPONDER INITIALIZE\\ + +//===================================================\\ + +/datum/game_mode/proc/check_fax_responder_late_join(mob/responder, show_warning = TRUE) + if(!responder.client) + return FALSE + if(!(responder?.client.check_whitelist_status(WHITELIST_FAX_RESPONDER))) + if(show_warning) + to_chat(responder, SPAN_WARNING("You are not whitelisted!")) + return FALSE + if(show_warning && tgui_alert(responder, "Confirm joining as a Fax Responder.", "Confirmation", list("Yes", "No"), 10 SECONDS) != "Yes") + return FALSE + if(!get_fax_responder_slots(responder)) + if(show_warning) + to_chat(responder, SPAN_WARNING("No slots available!")) + return FALSE + return TRUE + +/datum/game_mode/proc/get_fax_responder_slots(mob/responder_candidate) + var/list/options = list() + if(!responder_candidate.client) + return FALSE + if(!(responder_candidate.client.check_whitelist_status(WHITELIST_FAX_RESPONDER))) + to_chat(responder_candidate, SPAN_WARNING("You are not whitelisted!")) + return FALSE + + for(var/job in FAX_RESPONDER_JOB_LIST) + var/datum/job/fax_responder_job = GLOB.RoleAuthority.roles_by_name[job] + var/job_max = fax_responder_job.total_positions + if((fax_responder_job.current_positions < job_max) && fax_responder_job.can_play_role(responder_candidate.client)) + options += job + return options + +/datum/game_mode/proc/attempt_to_join_as_fax_responder(mob/responder_candidate, from_lobby = FALSE) + var/list/options = get_fax_responder_slots(responder_candidate) + if(!options || !options.len) + to_chat(responder_candidate, SPAN_WARNING("No Available Slot!")) + if(from_lobby) + var/mob/new_player/lobbied = responder_candidate + lobbied.new_player_panel() + return FALSE + + var/choice = tgui_input_list(responder_candidate, "What Fax Responder do you want to join as?", "Which Responder?", options, 30 SECONDS) + if(!(choice in FAX_RESPONDER_JOB_LIST)) + to_chat(responder_candidate, SPAN_WARNING("Error: No valid responder selected.")) + if(from_lobby) + var/mob/new_player/lobbied = responder_candidate + lobbied.new_player_panel() + return FALSE + + if(!transform_fax_responder(responder_candidate, choice)) + if(from_lobby) + var/mob/new_player/lobbied = responder_candidate + lobbied.new_player_panel() + return FALSE + + if(responder_candidate) + responder_candidate.moveToNullspace() //Nullspace it for garbage collection later. + return TRUE + +/datum/game_mode/proc/transform_fax_responder(mob/responder_candidate, sub_job) + if(!(sub_job in FAX_RESPONDER_JOB_LIST)) + return FALSE + + if(!responder_candidate.client) // Legacy - probably due to spawn code sync sleeps + log_debug("Null client attempted to transform_fax_responder") + return FALSE + if(!loaded_fax_base) + loaded_fax_base = SSmapping.lazy_load_template(/datum/lazy_template/fax_response_base, force = TRUE) + if(!loaded_fax_base) + log_debug("Error loading fax response base!") + return FALSE + + responder_candidate.client.prefs.find_assigned_slot(JOB_FAX_RESPONDER) + + var/turf/spawn_point = get_turf(pick(GLOB.latejoin_by_job[sub_job])) + var/mob/living/carbon/human/new_responder = new(spawn_point) + responder_candidate.mind.transfer_to(new_responder, TRUE) + new_responder.client?.prefs.copy_all_to(new_responder, JOB_FAX_RESPONDER, TRUE, TRUE) + + var/datum/job/fax_responder_job = GLOB.RoleAuthority.roles_by_name[sub_job] + + if(!fax_responder_job) + qdel(new_responder) + return FALSE + + // This is usually done in assign_role, a proc which is not executed in this case, since check_fax_responder_late_join is running its own checks. + fax_responder_job.current_positions++ + GLOB.RoleAuthority.equip_role(new_responder, fax_responder_job, new_responder.loc) + SSticker.minds += new_responder.mind + + message_admins(FONT_SIZE_XL(SPAN_RED("([new_responder.key]) joined as a [sub_job], [new_responder.real_name]."))) + new_responder.add_fax_responder() + + return TRUE + //===================================================\\ diff --git a/code/game/gamemodes/cm_process.dm b/code/game/gamemodes/cm_process.dm index d6519bbcd887..2c11af9ca6f9 100644 --- a/code/game/gamemodes/cm_process.dm +++ b/code/game/gamemodes/cm_process.dm @@ -254,7 +254,7 @@ GLOBAL_VAR_INIT(next_admin_bioscan, 30 MINUTES) for(var/mob/living/carbon/human/current_human as anything in GLOB.alive_human_list) if(!(current_human.z && (current_human.z in z_levels) && !istype(current_human.loc, /turf/open/space))) continue - if(current_human.faction in FACTION_LIST_WY || current_human.job == "Corporate Liaison") //The CL is assigned the USCM faction for gameplay purposes + if((current_human.faction in FACTION_LIST_WY) || current_human.job == "Corporate Liaison") //The CL is assigned the USCM faction for gameplay purposes num_WY++ num_headcount++ continue diff --git a/code/game/gamemodes/colonialmarines/colonialmarines.dm b/code/game/gamemodes/colonialmarines/colonialmarines.dm index 14f5397b1f91..9fb0553a35c2 100644 --- a/code/game/gamemodes/colonialmarines/colonialmarines.dm +++ b/code/game/gamemodes/colonialmarines/colonialmarines.dm @@ -19,6 +19,11 @@ var/list/running_round_stats = list() var/list/lz_smoke = list() + /** + * How long, after first drop, should the resin protection in proximity to the selected LZ last + */ + var/near_lz_protection_delay = 8 MINUTES + //////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////// @@ -140,27 +145,41 @@ var/right = marine_dropship.x + marine_dropship.dwidth + 2 var/z = marine_dropship.z + var/dropship_type = marine_dropship.type + // Bottom left - options += get_valid_sentry_turfs(left, bottom, z, width=5, height=2, structures_to_ignore=structures_to_break) - options += get_valid_sentry_turfs(left, bottom + 2, z, width=2, height=6, structures_to_ignore=structures_to_break) + if(GLOB.sentry_spawns[dropship_type]?[SENTRY_BOTTOM_LEFT]) + options += GLOB.sentry_spawns[dropship_type][SENTRY_BOTTOM_LEFT] + else + options += get_valid_sentry_turfs(left, bottom, z, width=5, height=2, structures_to_ignore=structures_to_break) + options += get_valid_sentry_turfs(left, bottom + 2, z, width=2, height=6, structures_to_ignore=structures_to_break) spawn_lz_sentry(pick(options), structures_to_break) // Bottom right options.Cut() - options += get_valid_sentry_turfs(right-4, bottom, z, width=5, height=2, structures_to_ignore=structures_to_break) - options += get_valid_sentry_turfs(right-1, bottom + 2, z, width=2, height=6, structures_to_ignore=structures_to_break) + if(GLOB.sentry_spawns[dropship_type]?[SENTRY_BOTTOM_RIGHT]) + options += GLOB.sentry_spawns[dropship_type][SENTRY_BOTTOM_RIGHT] + else + options += get_valid_sentry_turfs(right-4, bottom, z, width=5, height=2, structures_to_ignore=structures_to_break) + options += get_valid_sentry_turfs(right-1, bottom + 2, z, width=2, height=6, structures_to_ignore=structures_to_break) spawn_lz_sentry(pick(options), structures_to_break) // Top left options.Cut() - options += get_valid_sentry_turfs(left, top-1, z, width=5, height=2, structures_to_ignore=structures_to_break) - options += get_valid_sentry_turfs(left, top-7, z, width=2, height=6, structures_to_ignore=structures_to_break) + if(GLOB.sentry_spawns[dropship_type]?[SENTRY_TOP_LEFT]) + options += GLOB.sentry_spawns[dropship_type][SENTRY_TOP_LEFT] + else + options += get_valid_sentry_turfs(left, top-1, z, width=5, height=2, structures_to_ignore=structures_to_break) + options += get_valid_sentry_turfs(left, top-7, z, width=2, height=6, structures_to_ignore=structures_to_break) spawn_lz_sentry(pick(options), structures_to_break) // Top right options.Cut() - options += get_valid_sentry_turfs(right-4, top-1, z, width=5, height=2, structures_to_ignore=structures_to_break) - options += get_valid_sentry_turfs(right-1, top-7, z, width=2, height=6, structures_to_ignore=structures_to_break) + if(GLOB.sentry_spawns[dropship_type]?[SENTRY_TOP_RIGHT]) + options += GLOB.sentry_spawns[dropship_type][SENTRY_TOP_RIGHT] + else + options += get_valid_sentry_turfs(right-4, top-1, z, width=5, height=2, structures_to_ignore=structures_to_break) + options += get_valid_sentry_turfs(right-1, top-7, z, width=2, height=6, structures_to_ignore=structures_to_break) spawn_lz_sentry(pick(options), structures_to_break) ///Returns a list of non-dense turfs using the given block arguments ignoring the provided structure types @@ -193,6 +212,10 @@ /datum/game_mode/colonialmarines/proc/start_lz_hazards() if(SSobjectives.first_drop_complete) return // Just for sanity + if(!MODE_HAS_TOGGLEABLE_FLAG(MODE_LZ_HAZARD_ACTIVATED)) + return + + log_game("Distress Signal LZ hazards active!") INVOKE_ASYNC(src, PROC_REF(warn_lz_hazard), locate(/obj/structure/machinery/computer/shuttle/dropship/flight/lz1)) INVOKE_ASYNC(src, PROC_REF(warn_lz_hazard), locate(/obj/structure/machinery/computer/shuttle/dropship/flight/lz2)) addtimer(CALLBACK(src, PROC_REF(spawn_lz_hazards)), OB_TRAVEL_TIMING + 1 SECONDS) @@ -238,6 +261,69 @@ smoke.time_to_live = rand(1, 5) lz_smoke.Cut() +/// Called during the dropship flight, clears resin and indicates to those in flight that resin near the LZ has been cleared. +/datum/game_mode/colonialmarines/proc/warn_resin_clear(obj/docking_port/mobile/marine_dropship) + clear_proximity_resin() + + var/list/announcement_mobs = list() + for(var/area/area in marine_dropship.shuttle_areas) + for(var/mob/mob in area) + shake_camera(mob, steps = 3, strength = 1) + announcement_mobs += mob + + announcement_helper("Dropship [marine_dropship.name] dispersing [/obj/effect/particle_effect/smoke/weedkiller::name] due to potential biological infestation.", MAIN_AI_SYSTEM, announcement_mobs, 'sound/effects/rocketpod_fire.ogg') + +/** + * Clears any built resin in the areas around the landing zone, + * when the dropship first deploys. + */ +/datum/game_mode/colonialmarines/proc/clear_proximity_resin() + var/datum/cause_data/cause_data = create_cause_data(/obj/effect/particle_effect/smoke/weedkiller::name) + + for(var/area/near_area as anything in GLOB.all_areas) + var/area_lz = near_area.linked_lz + if(!area_lz) + continue + + if(islist(area_lz)) + if(!(active_lz.linked_lz in area_lz)) + continue + + else if(area_lz != active_lz.linked_lz) + continue + + for(var/turf/turf in near_area) + if(turf.density) + if(!istype(turf, /turf/closed/wall)) + continue + var/turf/closed/wall/wall = turf + if(wall.hull) + continue + new /obj/effect/particle_effect/smoke/weedkiller(turf, null, cause_data) + + near_area.purge_weeds() + + addtimer(CALLBACK(src, PROC_REF(allow_proximity_resin)), near_lz_protection_delay) + +/** + * If the area was previously weedable, and this was disabled by the + * LZ proximity, re-enable the weedability + */ +/datum/game_mode/colonialmarines/proc/allow_proximity_resin() + for(var/area/near_area as anything in GLOB.all_areas) + var/area_lz = near_area.linked_lz + if(!area_lz) + continue + + if(area_lz != active_lz.linked_lz) + continue + + if(initial(near_area.is_resin_allowed) == FALSE) + continue + + near_area.is_resin_allowed = TRUE + + #define MONKEYS_TO_TOTAL_RATIO 1/32 /datum/game_mode/colonialmarines/proc/spawn_smallhosts() @@ -403,6 +489,8 @@ /datum/game_mode/colonialmarines/ds_first_drop(obj/docking_port/mobile/marine_dropship) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(show_blurb_uscm)), DROPSHIP_DROP_MSG_DELAY) + addtimer(CALLBACK(src, PROC_REF(warn_resin_clear), marine_dropship), DROPSHIP_DROP_FIRE_DELAY) + add_current_round_status_to_end_results("First Drop") clear_lz_hazards() diff --git a/code/game/gamemodes/colonialmarines/whiskey_outpost.dm b/code/game/gamemodes/colonialmarines/whiskey_outpost.dm index cfe67465df07..3947447e4da0 100644 --- a/code/game/gamemodes/colonialmarines/whiskey_outpost.dm +++ b/code/game/gamemodes/colonialmarines/whiskey_outpost.dm @@ -26,7 +26,7 @@ /datum/job/civilian/doctor/whiskey = JOB_DOCTOR, /datum/job/civilian/researcher/whiskey = JOB_RESEARCHER, /datum/job/logistics/engineering/whiskey = JOB_CHIEF_ENGINEER, - /datum/job/logistics/tech/maint/whiskey = JOB_MAINT_TECH, + /datum/job/logistics/maint/whiskey = JOB_MAINT_TECH, /datum/job/logistics/cargo/whiskey = JOB_CARGO_TECH, /datum/job/civilian/liaison/whiskey = JOB_CORPORATE_LIAISON, /datum/job/marine/leader/whiskey = JOB_SQUAD_LEADER, diff --git a/code/game/gamemodes/colonialmarines/whiskey_outpost/equipping.dm b/code/game/gamemodes/colonialmarines/whiskey_outpost/equipping.dm index d5ff07391b5e..617f957f9aec 100644 --- a/code/game/gamemodes/colonialmarines/whiskey_outpost/equipping.dm +++ b/code/game/gamemodes/colonialmarines/whiskey_outpost/equipping.dm @@ -189,12 +189,12 @@ Ensure power is up, and the bunker is well defended. You share your bunker crew //************************************* //---------------MAINT TECH------------- //*************************************/ -/datum/job/logistics/tech/maint/whiskey +/datum/job/logistics/maint/whiskey title = JOB_WO_ORDNANCE_TECH supervisors = "the bunker crew master and the quartermaster" gear_preset = /datum/equipment_preset/wo/bc -/datum/job/logistics/tech/maint/whiskey/generate_entry_message(mob/living/carbon/human/H) +/datum/job/logistics/maint/whiskey/generate_entry_message(mob/living/carbon/human/H) . = {"You've worked here for a while, figuring it was a pretty comfy job. Now you gotta fight for your life. Have fun with that. Assist both the Bunker Crew Master and the Quartermaster in their duties."} diff --git a/code/game/gamemodes/colonialmarines/xenovsxeno.dm b/code/game/gamemodes/colonialmarines/xenovsxeno.dm index e1672f362731..2a7b29cea5b0 100644 --- a/code/game/gamemodes/colonialmarines/xenovsxeno.dm +++ b/code/game/gamemodes/colonialmarines/xenovsxeno.dm @@ -91,9 +91,9 @@ initialize_post_xenomorph_list(GLOB.xeno_hive_spawns) round_time_lobby = world.time - for(var/area/A in GLOB.all_areas) - if(!(A.is_resin_allowed)) - A.is_resin_allowed = TRUE + for(var/area/cur_area in GLOB.all_areas) + cur_area.is_resin_allowed = TRUE + cur_area.unoviable_timer = FALSE open_podlocks("map_lockdown") diff --git a/code/game/gamemodes/extended/cm_vs_upp.dm b/code/game/gamemodes/extended/cm_vs_upp.dm new file mode 100644 index 000000000000..db274492ac21 --- /dev/null +++ b/code/game/gamemodes/extended/cm_vs_upp.dm @@ -0,0 +1,16 @@ +/datum/game_mode/extended/faction_clash/cm_vs_upp + name = "Faction Clash UPP CM" + config_tag = "Faction Clash UPP CM" + flags_round_type = MODE_THUNDERSTORM|MODE_FACTION_CLASH + toggleable_flags = MODE_NO_SNIPER_SENTRY|MODE_NO_ATTACK_DEAD|MODE_NO_STRIPDRAG_ENEMY|MODE_STRONG_DEFIBS|MODE_BLOOD_OPTIMIZATION|MODE_NO_COMBAT_CAS|MODE_INDESTRUCTIBLE_SPLINTS|MODE_NO_INTERNAL_BLEEDING|MODE_MORTAR_LASER_WARNING + taskbar_icon = 'icons/taskbar/gml_hvh.png' + +/datum/game_mode/extended/faction_clash/cm_vs_upp/get_roles_list() + return GLOB.ROLES_CM_VS_UPP + +/datum/game_mode/extended/faction_clash/cm_vs_upp/post_setup() + . = ..() + SSweather.force_weather_holder(/datum/weather_ss_map_holder/faction_clash) + for(var/area/area in GLOB.all_areas) + area.base_lighting_alpha = 150 + area.update_base_lighting() diff --git a/code/game/gamemodes/extended/extended_clash.dm b/code/game/gamemodes/extended/extended_clash.dm index e0e526d91afa..24b672dced7b 100644 --- a/code/game/gamemodes/extended/extended_clash.dm +++ b/code/game/gamemodes/extended/extended_clash.dm @@ -2,8 +2,7 @@ name = "Faction Clash" config_tag = "Faction Clash" flags_round_type = MODE_THUNDERSTORM|MODE_FACTION_CLASH - toggleable_flags = MODE_NO_SNIPER_SENTRY|MODE_NO_ATTACK_DEAD|MODE_NO_STRIPDRAG_ENEMY|MODE_STRONG_DEFIBS|MODE_BLOOD_OPTIMIZATION|MODE_NO_COMBAT_CAS - taskbar_icon = 'icons/taskbar/gml_hvh.png' + toggleable_flags = MODE_NO_SNIPER_SENTRY|MODE_NO_ATTACK_DEAD|MODE_NO_STRIPDRAG_ENEMY|MODE_STRONG_DEFIBS|MODE_BLOOD_OPTIMIZATION|MODE_NO_COMBAT_CAS|MODE_INDESTRUCTIBLE_SPLINTS|MODE_MORTAR_LASER_WARNING /datum/game_mode/extended/faction_clash/get_roles_list() return GLOB.ROLES_FACTION_CLASH diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 603f0313f840..d746248034a1 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -40,6 +40,9 @@ GLOBAL_VAR_INIT(cas_tracking_id_increment, 0) //this var used to assign unique t var/hardcore = FALSE + ///Whether or not the fax response station has loaded. + var/loaded_fax_base = FALSE + /datum/game_mode/New() ..() if(taskbar_icon) diff --git a/code/game/jobs/job/antag/other/pred.dm b/code/game/jobs/job/antag/other/pred.dm index 967ef73a7d1f..d47681efe534 100644 --- a/code/game/jobs/job/antag/other/pred.dm +++ b/code/game/jobs/job/antag/other/pred.dm @@ -52,9 +52,10 @@ /datum/job/antag/predator/announce_entry_message(mob/new_predator, account, whitelist_status) - to_chat(new_predator, SPAN_NOTICE("You are Yautja, a great and noble predator!")) - to_chat(new_predator, SPAN_NOTICE("Your job is to first study your opponents. A hunt cannot commence unless intelligence is gathered.")) + to_chat(new_predator, SPAN_NOTICE("You are Yautja, a great and noble hunter!")) + to_chat(new_predator, SPAN_NOTICE("Follow the guidance of your elders and experienced hunters.")) to_chat(new_predator, SPAN_NOTICE("Hunt at your discretion, yet be observant rather than violent.")) + to_chat(new_predator, SPAN_NOTICE("Most importantly, remember that dying in battle is the highest honour a Yautja could ask for.")) /datum/job/antag/predator/generate_entry_conditions(mob/living/M, whitelist_status) . = ..() diff --git a/code/game/jobs/job/civilians/civilian.dm b/code/game/jobs/job/civilians/civilian.dm index a9631f2ed9c1..94865eb3b1b1 100644 --- a/code/game/jobs/job/civilians/civilian.dm +++ b/code/game/jobs/job/civilians/civilian.dm @@ -7,3 +7,18 @@ /datum/timelock/medic/New(name, time_required, list/roles) . = ..() src.roles = JOB_MEDIC_ROLES_LIST + +/datum/timelock/corporate + name = "Corporate Roles" + +/datum/timelock/corporate/New(name, time_required, list/roles) + . = ..() + src.roles = JOB_CORPORATE_ROLES_LIST + + +/datum/timelock/civil + name = "Civil Roles" + +/datum/timelock/civil/New(name, time_required, list/roles) + . = ..() + src.roles = JOB_CIVIL_ROLES_LIST diff --git a/code/game/jobs/job/command/cic/captain.dm b/code/game/jobs/job/command/cic/captain.dm index 30fa455beeee..4fae09ce808b 100644 --- a/code/game/jobs/job/command/cic/captain.dm +++ b/code/game/jobs/job/command/cic/captain.dm @@ -32,7 +32,7 @@ return get_desired_status(player.prefs.commander_status, WHITELIST_NORMAL) /datum/job/command/commander/announce_entry_message(mob/living/carbon/human/H) - addtimer(CALLBACK(src, PROC_REF(do_announce_entry_message), H), 1.5 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(all_hands_on_deck), "Attention all hands, [H.get_paygrade(0)] [H.real_name] on deck!"), 1.5 SECONDS) return ..() /datum/job/command/commander/generate_entry_conditions(mob/living/M, whitelist_status) @@ -44,16 +44,6 @@ SIGNAL_HANDLER GLOB.marine_leaders -= JOB_CO -/datum/job/command/commander/proc/do_announce_entry_message(mob/living/carbon/human/H) - all_hands_on_deck("Attention all hands, [H.get_paygrade(0)] [H.real_name] on deck!") - //for(var/i in GLOB.co_secure_boxes) - //var/obj/structure/closet/secure_closet/securecom/S = i - //var/loc_to_spawn = S.opened ? get_turf(S) : S - //var/obj/item/weapon/gun/rifle/m46c/I = new(loc_to_spawn) - //new /obj/item/clothing/suit/storage/marine/MP/CO(loc_to_spawn) - //new /obj/item/clothing/head/helmet/marine/CO(loc_to_spawn) - //I.name_after_co(H, I) - /obj/effect/landmark/start/captain name = JOB_CO icon_state = "co_spawn" diff --git a/code/game/jobs/job/command/cic/executive.dm b/code/game/jobs/job/command/cic/executive.dm index f03c384bbb86..9f2135f5ee52 100644 --- a/code/game/jobs/job/command/cic/executive.dm +++ b/code/game/jobs/job/command/cic/executive.dm @@ -22,6 +22,10 @@ AddTimelock(/datum/job/command/executive, list( JOB_SQUAD_LEADER = 10 HOURS, )) +/datum/job/command/executive/announce_entry_message(mob/living/carbon/human/H) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(all_hands_on_deck), "Attention all hands, [H.get_paygrade(0)] [H.real_name] on deck!"), 1.5 SECONDS) + return ..() + /obj/effect/landmark/start/executive name = JOB_XO icon_state = "xo_spawn" diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm index 0323d2a02733..08701e0ff425 100644 --- a/code/game/jobs/job/job.dm +++ b/code/game/jobs/job/job.dm @@ -23,7 +23,7 @@ var/minimum_playtime_as_job = 3 HOURS - var/gear_preset //Gear preset name used for this job + var/datum/equipment_preset/gear_preset //Gear preset name used for this job var/list/gear_preset_whitelist = list()//Gear preset name used for council snowflakes ;) //For generating entry messages @@ -39,6 +39,8 @@ var/job_options /// If TRUE, this job will spawn w/ a cryo emergency kit during evac/red alert var/gets_emergency_kit = TRUE + /// Under what faction menu the job gets displayed in lobby + var/faction_menu = FACTION_NEUTRAL //neutral to cover uscm jobs for now as loads of them are under civil and stuff mainly ment for other faction /datum/job/New() . = ..() diff --git a/code/game/jobs/job/marine/squad/engineer.dm b/code/game/jobs/job/marine/squad/engineer.dm index a4422572f218..66b667aa133c 100644 --- a/code/game/jobs/job/marine/squad/engineer.dm +++ b/code/game/jobs/job/marine/squad/engineer.dm @@ -8,9 +8,9 @@ entry_message_body = "You have the equipment and skill to build fortifications, reroute power lines, and bunker down. Your squaddies will look to you when it comes to construction in the field of battle." /datum/job/marine/engineer/set_spawn_positions(count) - for(var/datum/squad/sq in GLOB.RoleAuthority.squads) - if(sq) - sq.max_engineers = engi_slot_formula(count) + for(var/datum/squad/target_squad in GLOB.RoleAuthority.squads) + if(target_squad) + target_squad.roles_cap[title] = engi_slot_formula(count) /datum/job/marine/engineer/get_total_positions(latejoin=0) var/slots = engi_slot_formula(get_total_marines()) @@ -21,9 +21,9 @@ total_positions_so_far = slots if(latejoin) - for(var/datum/squad/sq in GLOB.RoleAuthority.squads) - if(sq) - sq.max_engineers = slots + for(var/datum/squad/target_squad in GLOB.RoleAuthority.squads) + if(target_squad) + target_squad.roles_cap[title] = slots return (slots*4) diff --git a/code/game/jobs/job/marine/squad/medic.dm b/code/game/jobs/job/marine/squad/medic.dm index 450d1176658f..9161ee082d8c 100644 --- a/code/game/jobs/job/marine/squad/medic.dm +++ b/code/game/jobs/job/marine/squad/medic.dm @@ -8,9 +8,9 @@ entry_message_body = "You tend the wounds of your squad mates and make sure they are healthy and active. You may not be a fully-fledged doctor, but you stand between life and death when it matters." /datum/job/marine/medic/set_spawn_positions(count) - for(var/datum/squad/sq in GLOB.RoleAuthority.squads) - if(sq) - sq.max_medics = medic_slot_formula(count) + for(var/datum/squad/target_squad in GLOB.RoleAuthority.squads) + if(target_squad) + target_squad.roles_cap[title] = medic_slot_formula(count) /datum/job/marine/medic/get_total_positions(latejoin=0) var/slots = medic_slot_formula(get_total_marines()) @@ -21,9 +21,9 @@ total_positions_so_far = slots if(latejoin) - for(var/datum/squad/sq in GLOB.RoleAuthority.squads) - if(sq) - sq.max_medics = slots + for(var/datum/squad/target_squad in GLOB.RoleAuthority.squads) + if(target_squad) + target_squad.roles_cap[title] = slots return (slots*4) diff --git a/code/game/jobs/job/marine/squads.dm b/code/game/jobs/job/marine/squads.dm index 26cca9019639..76033fa4a769 100644 --- a/code/game/jobs/job/marine/squads.dm +++ b/code/game/jobs/job/marine/squads.dm @@ -43,21 +43,20 @@ var/list/access = list() /// Can use any squad vendor regardless of squad connection var/omni_squad_vendor = FALSE - /// maximum # of engineers allowed in the squad - var/max_engineers = 3 - /// maximum # of squad medics allowed in the squad - var/max_medics = 4 - /// maximum # of specs allowed in the squad - var/max_specialists = 1 - /// maximum # of fireteam leaders allowed in the suqad - var/max_tl = 2 - /// maximum # of smartgunners allowed in the squad - var/max_smartgun = 1 - /// maximum # of squad leaders allowed in the squad - var/max_leaders = 1 + /// Squad roles max caps per role list + var/list/roles_cap = list( + JOB_SQUAD_MARINE = null, + JOB_SQUAD_ENGI = 3, + JOB_SQUAD_MEDIC = 4, + JOB_SQUAD_SMARTGUN = 1, + JOB_SQUAD_SPECIALIST = 1, + JOB_SQUAD_TEAM_LEADER = 2, + JOB_SQUAD_LEADER = 1, + ) + /// Squad roles actual number of players list + var/list/roles_in = list() /// Squad headsets default radio frequency var/radio_freq = 1461 - /// Whether this squad can be used by marines var/usable = FALSE /// Whether this squad can be picked at roundstart @@ -65,7 +64,7 @@ // Whether the squad is available for squad management var/locked = FALSE /// Whether it is visible in overwatch - var/active = FALSE + var/active = TRUE //this var in fact looks COMPLEATLY useless as visibility in overwatch is also determined by faction /// Which faction the squad is in var/faction = FACTION_MARINE @@ -88,12 +87,6 @@ ) //3 FTs where references to marines stored. var/list/squad_info_data = list() - var/num_engineers = 0 - var/num_medics = 0 - var/num_leaders = 0 - var/num_smartgun = 0 - var/num_specialists = 0 - var/num_tl = 0 var/count = 0 //Current # in the squad var/list/marines_list = list() // list of mobs (or name, not always a mob ref) in that squad. @@ -110,10 +103,14 @@ var/minimap_color = MINIMAP_SQUAD_UNKNOWN + ///Icon for the background of minimap icon + var/background_icon = "background" + ///Should we add the name of our squad in front of their name? Ex: Alpha Hospital Corpsman var/prepend_squad_name_to_assignment = TRUE + /datum/squad/marine name = "Root" usable = TRUE @@ -128,6 +125,7 @@ access = list(ACCESS_MARINE_ALPHA) radio_freq = ALPHA_FREQ minimap_color = MINIMAP_SQUAD_ALPHA + background_icon = "background_alpha" /datum/squad/marine/bravo name = SQUAD_MARINE_2 @@ -136,6 +134,7 @@ access = list(ACCESS_MARINE_BRAVO) radio_freq = BRAVO_FREQ minimap_color = MINIMAP_SQUAD_BRAVO + background_icon = "background_bravo" /datum/squad/marine/charlie name = SQUAD_MARINE_3 @@ -144,6 +143,7 @@ access = list(ACCESS_MARINE_CHARLIE) radio_freq = CHARLIE_FREQ minimap_color = MINIMAP_SQUAD_CHARLIE + background_icon = "background_charlie" /datum/squad/marine/delta name = SQUAD_MARINE_4 @@ -152,6 +152,7 @@ access = list(ACCESS_MARINE_DELTA) radio_freq = DELTA_FREQ minimap_color = MINIMAP_SQUAD_DELTA + background_icon = "background_delta" /datum/squad/marine/echo name = SQUAD_MARINE_5 @@ -161,6 +162,7 @@ radio_freq = ECHO_FREQ omni_squad_vendor = TRUE minimap_color = MINIMAP_SQUAD_ECHO + background_icon = "background_echo" active = FALSE roundstart = FALSE @@ -172,6 +174,7 @@ chat_color = "#c47a50" access = list(ACCESS_MARINE_ALPHA, ACCESS_MARINE_BRAVO, ACCESS_MARINE_CHARLIE, ACCESS_MARINE_DELTA) minimap_color = MINIMAP_SQUAD_FOXTROT + background_icon = "background_foxtrot" omni_squad_vendor = TRUE radio_freq = CRYO_FREQ @@ -186,16 +189,20 @@ equipment_color = "#053818" minimap_color = MINIMAP_SQUAD_INTEL radio_freq = INTEL_FREQ + background_icon = "background_intel" roundstart = FALSE prepend_squad_name_to_assignment = FALSE - max_engineers = 0 - max_medics = 0 - max_specialists = 0 - max_tl = 0 - max_smartgun = 0 - max_leaders = 0 + roles_cap = list( + JOB_SQUAD_MARINE = null, + JOB_SQUAD_ENGI = 0, + JOB_SQUAD_MEDIC = 0, + JOB_SQUAD_SMARTGUN = 0, + JOB_SQUAD_SPECIALIST = 0, + JOB_SQUAD_TEAM_LEADER = 0, + JOB_SQUAD_LEADER = 0, + ) /datum/squad/marine/sof name = SQUAD_SOF @@ -205,6 +212,7 @@ squad_type = "Team" lead_icon = "soctl" minimap_color = MINIMAP_SQUAD_SOF + background_icon = "background_sof" active = FALSE roundstart = FALSE @@ -216,6 +224,7 @@ chat_color = "#553EB2" radio_freq = CBRN_FREQ minimap_color = "#3B2A7B" + background_icon = "background_cbrn" active = FALSE roundstart = FALSE @@ -227,6 +236,7 @@ chat_color = "#32CD32" radio_freq = FORECON_FREQ minimap_color = "#32CD32" + background_icon = "background_forecon" active = FALSE roundstart = FALSE @@ -238,6 +248,7 @@ chat_color = "#5a2c2c" radio_freq = SOF_FREQ minimap_color = "#5a2c2c" + background_icon = "background_civillian" active = FALSE roundstart = FALSE @@ -250,33 +261,42 @@ usable = TRUE omni_squad_vendor = TRUE faction = FACTION_UPP + radio_freq = UPP_FREQ + roles_cap = list( + JOB_UPP_ENGI = 3, + JOB_UPP_MEDIC = 4, + JOB_UPP_SPECIALIST = 1, + JOB_UPP_LEADER = 1, + ) /datum/squad/upp/one - name = "UPPS1" + name = SQUAD_UPP_1 equipment_color = "#e61919" chat_color = "#e67d7d" /datum/squad/upp/twp - name = "UPPS2" + name = SQUAD_UPP_2 equipment_color = "#ffc32d" chat_color = "#ffe650" /datum/squad/upp/three - name = "UPPS3" + name = SQUAD_UPP_3 equipment_color = "#c864c8" chat_color = "#ff96ff" /datum/squad/upp/four - name = "UPPS4" + name = SQUAD_UPP_4 equipment_color = "#4148c8" chat_color = "#828cff" /datum/squad/upp/kdo - name = "UPPKdo" + name = SQUAD_UPP_5 equipment_color = "#c47a50" chat_color = "#c47a50" squad_type = "Team" locked = TRUE + usable = FALSE + //############################### /datum/squad/pmc name = "Root" @@ -340,15 +360,15 @@ break /// Sets an overwatch officer for the squad, returning TRUE on success -/datum/squad/proc/assume_overwatch(mob/M) +/datum/squad/proc/assume_overwatch(mob/target_mob) var/mob/previous if(overwatch_officer) - if(overwatch_officer == M) + if(overwatch_officer == target_mob) return FALSE previous = overwatch_officer overwatch_officer = null clear_ref_tracking(previous) - overwatch_officer = M + overwatch_officer = target_mob RegisterSignal(overwatch_officer, COMSIG_PARENT_QDELETING, PROC_REF(personnel_deleted), override = TRUE) return TRUE @@ -362,30 +382,31 @@ return TRUE /// Clear deletion signal as needed for mob - to call *after* removal -/datum/squad/proc/clear_ref_tracking(mob/M) - if(!M) return FALSE - if(M in marines_list) +/datum/squad/proc/clear_ref_tracking(mob/target_mob) + if(!target_mob) return FALSE - if(overwatch_officer == M) + if(target_mob in marines_list) return FALSE - UnregisterSignal(M, COMSIG_PARENT_QDELETING) + if(overwatch_officer == target_mob) + return FALSE + UnregisterSignal(target_mob, COMSIG_PARENT_QDELETING) return TRUE /// Clear references in squad listing upon deletion. Zap also erases the kept records. /// NOTE: zap will be set true for a forced COMSIG_PARENT_QDELETING -/datum/squad/proc/personnel_deleted(mob/M, zap = FALSE) +/datum/squad/proc/personnel_deleted(mob/target_mob, zap = FALSE) SIGNAL_HANDLER - if(M == overwatch_officer) + if(target_mob == overwatch_officer) overwatch_officer = null - if(M == squad_leader) + if(target_mob == squad_leader) squad_leader = null - SStracking.stop_tracking(tracking_id, M) + SStracking.stop_tracking(tracking_id, target_mob) if(zap) - marines_list.Remove(M) + marines_list.Remove(target_mob) return - var/idx = marines_list.Find(M) + var/idx = marines_list.Find(target_mob) if(idx) - marines_list[idx] = M.name // legacy behavior, replace mob ref index by name. very weird + marines_list[idx] = target_mob.name // legacy behavior, replace mob ref index by name. very weird /* * Send a text message to the squad members following legacy overwatch usage @@ -411,9 +432,9 @@ if(leader_only) targets = list(squad_leader) else - for(var/mob/M in marines_list) - if(!M.stat && M.client) - targets += M.client + for(var/mob/target_mob in marines_list) + if(!target_mob.stat && target_mob.client) + targets += target_mob.client if(displayed_icon) message = "[icon2html(displayed_icon, targets, dir = null)] [message]" @@ -451,72 +472,82 @@ to_chat(SL, "[SPAN_BLUE("SL Overwatch: [nametext][text]")]", type = MESSAGE_TYPE_RADIO) return else - for(var/mob/living/carbon/human/M in marines_list) - if(!M.stat && M.client) //Only living and connected people in our squad + for(var/mob/living/carbon/human/target_mob in marines_list) + if(!target_mob.stat && target_mob.client) //Only living and connected people in our squad if(plus_name) - M << sound('sound/effects/tech_notification.ogg') - to_chat(M, "[SPAN_BLUE("Overwatch: [nametext][text]")]", type = MESSAGE_TYPE_RADIO) + target_mob << sound('sound/effects/tech_notification.ogg') + to_chat(target_mob, "[SPAN_BLUE("Overwatch: [nametext][text]")]", type = MESSAGE_TYPE_RADIO) //Straight-up insert a marine into a squad. //This sets their ID, increments the total count, and so on. Everything else is done in job_controller.dm. //So it does not check if the squad is too full already, or randomize it, etc. -/datum/squad/proc/put_marine_in_squad(mob/living/carbon/human/M, obj/item/card/id/ID) - - if(!istype(M)) +/datum/squad/proc/put_marine_in_squad(mob/living/carbon/human/target_mob, obj/item/card/id/id_card) + if(!istype(target_mob)) return FALSE //Logic - if(!src.usable) + if(!usable) return FALSE - if(!M.job) + if(!target_mob.job) return FALSE //Not yet - if(M.assigned_squad) + if(target_mob.assigned_squad) return FALSE //already in a squad - var/obj/item/card/id/C = ID - if(!C) - C = M.get_idcard() - if(!C) - C = M.get_active_hand() - if(!istype(C)) + if(!id_card) + id_card = target_mob.wear_id + if(!id_card) + id_card = target_mob.get_active_hand() + + if(!istype(id_card)) return FALSE //No ID found - var/assignment = M.job + var/assignment = target_mob.job var/paygrade var/list/extra_access = list() - switch(GET_DEFAULT_ROLE(M.job)) + var/mob_role = GET_DEFAULT_ROLE(target_mob.job) + switch(mob_role) if(JOB_SQUAD_ENGI) assignment = JOB_SQUAD_ENGI - num_engineers++ - C.claimedgear = FALSE + id_card.claimedgear = FALSE if(JOB_SQUAD_MEDIC) assignment = JOB_SQUAD_MEDIC - num_medics++ - C.claimedgear = FALSE + id_card.claimedgear = FALSE if(JOB_SQUAD_SPECIALIST) assignment = JOB_SQUAD_SPECIALIST - num_specialists++ if(JOB_SQUAD_TEAM_LEADER) assignment = JOB_SQUAD_TEAM_LEADER - num_tl++ - M.important_radio_channels += radio_freq + target_mob.important_radio_channels += radio_freq if(JOB_SQUAD_SMARTGUN) assignment = JOB_SQUAD_SMARTGUN - num_smartgun++ if(JOB_SQUAD_LEADER) if(squad_leader && GET_DEFAULT_ROLE(squad_leader.job) != JOB_SQUAD_LEADER) //field promoted SL var/old_lead = squad_leader demote_squad_leader() //replaced by the real one SStracking.start_tracking(tracking_id, old_lead) assignment = squad_type + " Leader" - squad_leader = M - SStracking.set_leader(tracking_id, M) - SStracking.start_tracking("marine_sl", M) + squad_leader = target_mob + SStracking.set_leader(tracking_id, target_mob) + SStracking.start_tracking("marine_sl", target_mob) - if(GET_DEFAULT_ROLE(M.job) == JOB_SQUAD_LEADER) //field promoted SL don't count as real ones - num_leaders++ + if(JOB_UPP_ENGI) + assignment = JOB_SQUAD_ENGI + id_card.claimedgear = FALSE + if(JOB_UPP_MEDIC) + assignment = JOB_SQUAD_MEDIC + id_card.claimedgear = FALSE + if(JOB_UPP_SPECIALIST) + assignment = JOB_SQUAD_SPECIALIST + if(JOB_UPP_LEADER) + if(squad_leader && GET_DEFAULT_ROLE(squad_leader.job) != JOB_UPP_LEADER) //field promoted SL + var/old_lead = squad_leader + demote_squad_leader() //replaced by the real one + SStracking.start_tracking(tracking_id, old_lead) + assignment = squad_type + " Leader" + squad_leader = target_mob + SStracking.set_leader(tracking_id, target_mob) + SStracking.start_tracking("marine_sl", target_mob) if(JOB_MARINE_RAIDER) assignment = JOB_MARINE_RAIDER @@ -530,97 +561,88 @@ demote_squad_leader() //replaced by the real one SStracking.start_tracking(tracking_id, old_lead) assignment = squad_type + " Leader" - squad_leader = M - SStracking.set_leader(tracking_id, M) - SStracking.start_tracking("marine_sl", M) - if(GET_DEFAULT_ROLE(M.job) == JOB_MARINE_RAIDER_SL) //field promoted SL don't count as real ones - num_leaders++ + squad_leader = target_mob + SStracking.set_leader(tracking_id, target_mob) + SStracking.start_tracking("marine_sl", target_mob) + mob_role = JOB_SQUAD_LEADER if(JOB_MARINE_RAIDER_CMD) assignment = JOB_MARINE_RAIDER_CMD if(name == JOB_MARINE_RAIDER) assignment = "Officer" - RegisterSignal(M, COMSIG_PARENT_QDELETING, PROC_REF(personnel_deleted), override = TRUE) + if(mob_role in roles_cap) + roles_in[mob_role]++ + + RegisterSignal(target_mob, COMSIG_PARENT_QDELETING, PROC_REF(personnel_deleted), override = TRUE) if(assignment != JOB_SQUAD_LEADER) - SStracking.start_tracking(tracking_id, M) + SStracking.start_tracking(tracking_id, target_mob) count++ //Add up the tally. This is important in even squad distribution. - if(GET_DEFAULT_ROLE(M.job) != JOB_SQUAD_MARINE) - log_admin("[key_name(M)] has been assigned as [name] [M.job]") // we don't want to spam squad marines but the others are useful + if(GET_DEFAULT_ROLE(target_mob.job) != JOB_SQUAD_MARINE) + log_admin("[key_name(target_mob)] has been assigned as [name] [target_mob.job]") // we don't want to spam squad marines but the others are useful - marines_list += M - M.assigned_squad = src //Add them to the squad - C.access += (src.access + extra_access) //Add their squad access to their ID + marines_list += target_mob + target_mob.assigned_squad = src //Add them to the squad + id_card.access += (src.access + extra_access) //Add their squad access to their ID if(prepend_squad_name_to_assignment) - C.assignment = "[name] [assignment]" + id_card.assignment = "[name] [assignment]" else - C.assignment = assignment + id_card.assignment = assignment - SEND_SIGNAL(M, COMSIG_SET_SQUAD) + SEND_SIGNAL(target_mob, COMSIG_SET_SQUAD) if(paygrade) - C.paygrade = paygrade - C.name = "[C.registered_name]'s ID Card ([C.assignment])" + id_card.paygrade = paygrade + id_card.name = "[id_card.registered_name]'s ID Card ([id_card.assignment])" - var/obj/item/device/radio/headset/almayer/marine/headset = locate() in list(M.wear_l_ear, M.wear_r_ear) + var/obj/item/device/radio/headset/almayer/marine/headset = locate() in list(target_mob.wear_l_ear, target_mob.wear_r_ear) if(headset && radio_freq) headset.set_frequency(radio_freq) - M.update_inv_head() - M.update_inv_wear_suit() - M.update_inv_gloves() + target_mob.update_inv_head() + target_mob.update_inv_wear_suit() + target_mob.update_inv_gloves() return TRUE //proc used by the overwatch console to transfer marine to another squad -/datum/squad/proc/remove_marine_from_squad(mob/living/carbon/human/M, obj/item/card/id/ID) - if(M.assigned_squad != src) +/datum/squad/proc/remove_marine_from_squad(mob/living/carbon/human/target_mob, obj/item/card/id/id_card) + if(target_mob.assigned_squad != src) return //not assigned to the correct squad - var/obj/item/card/id/C = ID - if(!istype(C)) - C = M.get_idcard() - if(!istype(C)) + if(!istype(id_card)) + id_card = target_mob.get_idcard() + if(!istype(id_card)) return FALSE //Abort, no ID found - C.access -= src.access - C.assignment = M.job - C.name = "[C.registered_name]'s ID Card ([C.assignment])" + id_card.access -= src.access + id_card.assignment = target_mob.job + id_card.name = "[id_card.registered_name]'s ID Card ([id_card.assignment])" - forget_marine_in_squad(M) + forget_marine_in_squad(target_mob) //gracefully remove a marine from squad system, alive, dead or otherwise -/datum/squad/proc/forget_marine_in_squad(mob/living/carbon/human/M) - if(M.assigned_squad.squad_leader == M) - if(GET_DEFAULT_ROLE(M.job) != JOB_SQUAD_LEADER) //a field promoted SL, not a real one +/datum/squad/proc/forget_marine_in_squad(mob/living/carbon/human/target_mob) + if(target_mob.assigned_squad.squad_leader == target_mob) + if(GET_DEFAULT_ROLE(target_mob.job) != JOB_SQUAD_LEADER || GET_DEFAULT_ROLE(target_mob.job) != JOB_UPP_LEADER) //a field promoted SL, not a real one demote_squad_leader() else - M.assigned_squad.squad_leader = null + target_mob.assigned_squad.squad_leader = null update_squad_leader() else - if(M.assigned_fireteam) - if(fireteam_leaders[M.assigned_fireteam] == M) - unassign_ft_leader(M.assigned_fireteam, TRUE, FALSE) - unassign_fireteam(M, FALSE) + if(target_mob.assigned_fireteam) + if(fireteam_leaders[target_mob.assigned_fireteam] == target_mob) + unassign_ft_leader(target_mob.assigned_fireteam, TRUE, FALSE) + unassign_fireteam(target_mob, FALSE) count-- - marines_list -= M - personnel_deleted(M, zap = TRUE) // Free all refs and Zap it entierly as this is on purpose - clear_ref_tracking(M) + marines_list -= target_mob + personnel_deleted(target_mob, zap = TRUE) // Free all refs and Zap it entierly as this is on purpose + clear_ref_tracking(target_mob) update_free_mar() - M.assigned_squad = null + target_mob.assigned_squad = null - switch(GET_DEFAULT_ROLE(M.job)) - if(JOB_SQUAD_ENGI) - num_engineers-- - if(JOB_SQUAD_MEDIC) - num_medics-- - if(JOB_SQUAD_SPECIALIST) - num_specialists-- - if(JOB_SQUAD_SMARTGUN) - num_smartgun-- - if(JOB_SQUAD_TEAM_LEADER) - num_tl-- - if(JOB_SQUAD_LEADER) - num_leaders-- + var/slot_check = GET_DEFAULT_ROLE(target_mob.job) + if(slot_check && !isnull(roles_cap[slot_check])) + roles_in[slot_check]-- //proc for demoting current Squad Leader /datum/squad/proc/demote_squad_leader(leader_killed) @@ -630,39 +652,60 @@ SStracking.stop_tracking("marine_sl", old_lead) squad_leader = null - switch(GET_DEFAULT_ROLE(old_lead.job)) - if(JOB_SQUAD_SPECIALIST) - old_lead.comm_title = "Spc" - if(JOB_SQUAD_ENGI) - old_lead.comm_title = "ComTech" - if(JOB_SQUAD_MEDIC) - old_lead.comm_title = "HM" - if(JOB_SQUAD_TEAM_LEADER) - old_lead.comm_title = "FTL" - if(JOB_SQUAD_SMARTGUN) - old_lead.comm_title = "SG" - if(JOB_SQUAD_LEADER) - if(!leader_killed) - old_lead.comm_title = "Sgt" - if(JOB_MARINE_RAIDER) - old_lead.comm_title = "Op." - if(JOB_MARINE_RAIDER_SL) - old_lead.comm_title = "TL." - if(JOB_MARINE_RAIDER_CMD) - old_lead.comm_title = "CMD." - else - old_lead.comm_title = "RFN" - - if(GET_DEFAULT_ROLE(old_lead.job) != JOB_SQUAD_LEADER || !leader_killed) - var/obj/item/device/radio/headset/almayer/marine/R = old_lead.get_type_in_ears(/obj/item/device/radio/headset/almayer/marine) - if(R) - for(var/obj/item/device/encryptionkey/squadlead/acting/key in R.keys) - R.keys -= key - qdel(key) - R.recalculateChannels() - var/obj/item/card/id/card = old_lead.get_idcard() - if(card) - card.access -= ACCESS_MARINE_LEADER + switch(faction) + if (FACTION_UPP) + switch(GET_DEFAULT_ROLE(old_lead.job)) + if(JOB_UPP_SPECIALIST) + old_lead.comm_title = "Spec" + if(JOB_UPP_ENGI) + old_lead.comm_title = "Sapper" + if(JOB_UPP_MEDIC) + old_lead.comm_title = "Med" + if(JOB_UPP_LEADER) + if(!leader_killed) + old_lead.comm_title = "MSzh" + else + old_lead.comm_title = "Sld" + if(GET_DEFAULT_ROLE(old_lead.job) != JOB_UPP_LEADER || !leader_killed) + var/obj/item/device/radio/headset/headset = old_lead.get_type_in_ears(/obj/item/device/radio/headset/distress/UPP) + if(headset) + for(var/obj/item/device/encryptionkey/upp/command/acting/key in headset.keys) + headset.keys -= key + qdel(key) + headset.recalculateChannels() + if (FACTION_MARINE) + switch(GET_DEFAULT_ROLE(old_lead.job)) + if(JOB_SQUAD_SPECIALIST) + old_lead.comm_title = "Spc" + if(JOB_SQUAD_ENGI) + old_lead.comm_title = "ComTech" + if(JOB_SQUAD_MEDIC) + old_lead.comm_title = "HM" + if(JOB_SQUAD_TEAM_LEADER) + old_lead.comm_title = "FTL" + if(JOB_SQUAD_SMARTGUN) + old_lead.comm_title = "SG" + if(JOB_SQUAD_LEADER) + if(!leader_killed) + old_lead.comm_title = "Sgt" + if(JOB_MARINE_RAIDER) + old_lead.comm_title = "Op." + if(JOB_MARINE_RAIDER_SL) + old_lead.comm_title = "TL." + if(JOB_MARINE_RAIDER_CMD) + old_lead.comm_title = "CMD." + else + old_lead.comm_title = "RFN" + if(GET_DEFAULT_ROLE(old_lead.job) != JOB_SQUAD_LEADER || !leader_killed) + var/obj/item/device/radio/headset/almayer/marine/headset = old_lead.get_type_in_ears(/obj/item/device/radio/headset/almayer/marine) + if(headset) + for(var/obj/item/device/encryptionkey/squadlead/acting/key in headset.keys) + headset.keys -= key + qdel(key) + headset.recalculateChannels() + var/obj/item/card/id/card = old_lead.get_idcard() + if(card) + card.access -= ACCESS_MARINE_LEADER REMOVE_TRAITS_IN(old_lead, TRAIT_SOURCE_SQUAD_LEADER) old_lead.hud_set_squad() old_lead.update_inv_head() //updating marine helmet leader overlays @@ -781,13 +824,14 @@ SStracking.start_tracking(new_id, H) //moved the main proc for ft management from human.dm here to make it support both examine and squad info way to edit fts -/datum/squad/proc/manage_fireteams(mob/living/carbon/human/target) - var/obj/item/card/id/ID = target.get_idcard() - if(!ID || !(ID.rank in GLOB.ROLES_MARINES)) +/datum/squad/proc/manage_fireteams(mob/living/carbon/human/target_mob) + var/obj/item/card/id/ID = target_mob.get_idcard() + + if(!ID || ((!(ID.rank in GLOB.ROLES_MARINES) && faction == FACTION_MARINE) || (!(ID.rank in GLOB.ROLES_MARINES_ANTAG) && faction == FACTION_UPP))) return - if(ID.rank == JOB_SQUAD_LEADER || squad_leader == target) //if SL/aSL are chosen + if(ID.rank == JOB_SQUAD_LEADER || squad_leader == target_mob) //if SL/aSL are chosen var/choice = tgui_input_list(squad_leader, "Manage Fireteams and Team leaders.", "Fireteams Management", list("Cancel", "Unassign Fireteam 1 Leader", "Unassign Fireteam 2 Leader", "Unassign Fireteam 3 Leader", "Unassign all Team Leaders")) - if(target.assigned_squad != src) + if(target_mob.assigned_squad != src) return //in case they somehow change squad while SL is choosing if(squad_leader.is_mob_incapacitated() || !hasHUD(squad_leader,"squadleader")) return //if SL got knocked out or demoted while choosing @@ -797,77 +841,77 @@ if("Unassign Fireteam 3 Leader") unassign_ft_leader("FT3", TRUE) if("Unassign all Team Leaders") unassign_all_ft_leaders() else return - target.hud_set_squad() + target_mob.hud_set_squad() return - if(target.assigned_fireteam) - if(fireteam_leaders[target.assigned_fireteam] == target) //Check if person already is FT leader + if(target_mob.assigned_fireteam) + if(fireteam_leaders[target_mob.assigned_fireteam] == target_mob) //Check if person already is FT leader var/choice = tgui_input_list(squad_leader, "Manage Fireteams and Team leaders.", "Fireteams Management", list("Cancel", "Unassign from Team Leader position")) - if(target.assigned_squad != src) + if(target_mob.assigned_squad != src) return if(squad_leader.is_mob_incapacitated() || !hasHUD(squad_leader,"squadleader")) return if(choice == "Unassign from Team Leader position") - unassign_ft_leader(target.assigned_fireteam, TRUE) - target.hud_set_squad() + unassign_ft_leader(target_mob.assigned_fireteam, TRUE) + target_mob.hud_set_squad() return var/choice = tgui_input_list(squad_leader, "Manage Fireteams and Team leaders.", "Fireteams Management", list("Remove from Fireteam", "Assign to Fireteam 1", "Assign to Fireteam 2", "Assign to Fireteam 3", "Assign as Team Leader")) - if(target.assigned_squad != src) + if(target_mob.assigned_squad != src) return if(squad_leader.is_mob_incapacitated() || !hasHUD(squad_leader,"squadleader")) return switch(choice) - if("Remove from Fireteam") unassign_fireteam(target) - if("Assign to Fireteam 1") assign_fireteam("FT1", target) - if("Assign to Fireteam 2") assign_fireteam("FT2", target) - if("Assign to Fireteam 3") assign_fireteam("FT3", target) - if("Assign as Team Leader") assign_ft_leader(target.assigned_fireteam, target) + if("Remove from Fireteam") unassign_fireteam(target_mob) + if("Assign to Fireteam 1") assign_fireteam("FT1", target_mob) + if("Assign to Fireteam 2") assign_fireteam("FT2", target_mob) + if("Assign to Fireteam 3") assign_fireteam("FT3", target_mob) + if("Assign as Team Leader") assign_ft_leader(target_mob.assigned_fireteam, target_mob) else return - target.hud_set_squad() + target_mob.hud_set_squad() return var/choice = tgui_input_list(squad_leader, "Manage Fireteams and Team leaders.", "Fireteams Management", list("Cancel", "Assign to Fireteam 1", "Assign to Fireteam 2", "Assign to Fireteam 3")) - if(target.assigned_squad != src) + if(target_mob.assigned_squad != src) return if(squad_leader.is_mob_incapacitated() || !hasHUD(squad_leader,"squadleader")) return switch(choice) - if("Assign to Fireteam 1") assign_fireteam("FT1", target) - if("Assign to Fireteam 2") assign_fireteam("FT2", target) - if("Assign to Fireteam 3") assign_fireteam("FT3", target) + if("Assign to Fireteam 1") assign_fireteam("FT1", target_mob) + if("Assign to Fireteam 2") assign_fireteam("FT2", target_mob) + if("Assign to Fireteam 3") assign_fireteam("FT3", target_mob) else return - target.hud_set_squad() + target_mob.hud_set_squad() return //Managing MIA and KIA statuses for marines -/datum/squad/proc/change_squad_status(mob/living/carbon/human/target) - if(target == squad_leader) +/datum/squad/proc/change_squad_status(mob/living/carbon/human/target_mob) + if(target_mob == squad_leader) return //you can't mark yourself KIA var/choice = tgui_input_list(squad_leader, "Marine status management: M.I.A. for missing marines, K.I.A. for confirmed unrevivable dead.", "Squad Management", list("Cancel", "Remove status", "M.I.A.", "K.I.A.")) - if(target.assigned_squad != src) + if(target_mob.assigned_squad != src) return //in case they somehow change squad while SL is choosing if(squad_leader.is_mob_incapacitated() || !hasHUD(squad_leader,"squadleader")) return //if SL got knocked out or demoted while choosing switch(choice) - if("Remove status") target.squad_status = null + if("Remove status") target_mob.squad_status = null if("M.I.A.") - target.squad_status = choice - to_chat(squad_leader, FONT_SIZE_BIG(SPAN_BLUE("You set [target]'s status as Missing In Action."))) - if(target.stat == CONSCIOUS) - to_chat(target, FONT_SIZE_HUGE(SPAN_BLUE("You were marked as Missing In Action by Squad Leader."))) + target_mob.squad_status = choice + to_chat(squad_leader, FONT_SIZE_BIG(SPAN_BLUE("You set [target_mob]'s status as Missing In Action."))) + if(target_mob.stat == CONSCIOUS) + to_chat(target_mob, FONT_SIZE_HUGE(SPAN_BLUE("You were marked as Missing In Action by Squad Leader."))) if("K.I.A.") - target.squad_status = choice - if(target.assigned_fireteam) - if(fireteam_leaders[target.assigned_fireteam] == target) - unassign_ft_leader(target.assigned_fireteam, TRUE, FALSE) - unassign_fireteam(target, FALSE) - to_chat(squad_leader, FONT_SIZE_BIG(SPAN_BLUE("You set [target]'s status as Killed In Action. If they were Team Leader or in fireteam, they were demoted and unassigned."))) - if(target.stat == CONSCIOUS) - to_chat(target, FONT_SIZE_HUGE(SPAN_BLUE("You were marked as Killed In Action by Squad Leader."))) + target_mob.squad_status = choice + if(target_mob.assigned_fireteam) + if(fireteam_leaders[target_mob.assigned_fireteam] == target_mob) + unassign_ft_leader(target_mob.assigned_fireteam, TRUE, FALSE) + unassign_fireteam(target_mob, FALSE) + to_chat(squad_leader, FONT_SIZE_BIG(SPAN_BLUE("You set [target_mob]'s status as Killed In Action. If they were Team Leader or in fireteam, they were demoted and unassigned."))) + if(target_mob.stat == CONSCIOUS) + to_chat(target_mob, FONT_SIZE_HUGE(SPAN_BLUE("You were marked as Killed In Action by Squad Leader."))) else return - if(target.assigned_fireteam) - update_fireteam(target.assigned_fireteam) + if(target_mob.assigned_fireteam) + update_fireteam(target_mob.assigned_fireteam) else update_free_mar() - target.hud_set_squad() + target_mob.hud_set_squad() return diff --git a/code/game/jobs/job/special/responders.dm b/code/game/jobs/job/special/responders.dm new file mode 100644 index 000000000000..4fc6d162b2d7 --- /dev/null +++ b/code/game/jobs/job/special/responders.dm @@ -0,0 +1,83 @@ +/datum/job/fax_responder + title = JOB_FAX_RESPONDER + gear_preset = /datum/equipment_preset/fax_responder + selection_class = "job_command" + supervisors = "CMSS13 Administration Staff" + total_positions = 1 + spawn_positions = 1 + + late_joinable = FALSE + + flags_startup_parameters = ROLE_ADMIN_NOTIFY|ROLE_WHITELISTED|ROLE_NO_ACCOUNT|ROLE_CUSTOM_SPAWN|ROLE_HIDDEN + flags_whitelist = WHITELIST_FAX_RESPONDER + +/datum/job/fax_responder/on_config_load() + entry_message_body = "Your job is to answer faxes sent to your fax machine. You are answering on behalf of the CMSS13 staff team and are therefore expected to behave appropriately. Failure to adhere to expectations may result in loss of the role or a server ban. Non-staff players of this role are not able to authorise ERTs through their faxes." + return ..() + +/datum/job/fax_responder/uscm_hc + title = JOB_FAX_RESPONDER_USCM_HC + gear_preset = /datum/equipment_preset/fax_responder/uscm + +AddTimelock(/datum/job/fax_responder/uscm_hc, list( + JOB_POLICE_ROLES = 25 HOURS, + JOB_COMMAND_ROLES = 75 HOURS, +)) + +/datum/job/fax_responder/uscm_pvst + title = JOB_FAX_RESPONDER_USCM_PVST + gear_preset = /datum/equipment_preset/fax_responder/uscm/provost + +AddTimelock(/datum/job/fax_responder/uscm_pvst, list( + JOB_POLICE_ROLES = 75 HOURS, + JOB_COMMAND_ROLES = 75 HOURS, +)) + +/datum/job/fax_responder/wy + title = JOB_FAX_RESPONDER_WY + gear_preset = /datum/equipment_preset/fax_responder/wey_yu + +AddTimelock(/datum/job/fax_responder/wy, list( + JOB_CORPORATE_ROLES = 75 HOURS, +)) + +/datum/job/fax_responder/upp + title = JOB_FAX_RESPONDER_UPP + gear_preset = /datum/equipment_preset/fax_responder/upp + +AddTimelock(/datum/job/fax_responder/upp, list( + JOB_COMMAND_ROLES = 75 HOURS, +)) + +/datum/job/fax_responder/twe + title = JOB_FAX_RESPONDER_TWE + gear_preset = /datum/equipment_preset/fax_responder/twe + +AddTimelock(/datum/job/fax_responder/twe, list( + JOB_COMMAND_ROLES = 75 HOURS, +)) + +/datum/job/fax_responder/clf + title = JOB_FAX_RESPONDER_CLF + gear_preset = /datum/equipment_preset/fax_responder/clf + +AddTimelock(/datum/job/fax_responder/clf, list( + JOB_COMMAND_ROLES = 75 HOURS, +)) + +/datum/job/fax_responder/cmb + title = JOB_FAX_RESPONDER_CMB + gear_preset = /datum/equipment_preset/fax_responder/cmb + +AddTimelock(/datum/job/fax_responder/cmb, list( + JOB_POLICE_ROLES = 75 HOURS, + JOB_COMMAND_ROLES = 25 HOURS, +)) + +/datum/job/fax_responder/press + title = JOB_FAX_RESPONDER_PRESS + gear_preset = /datum/equipment_preset/fax_responder/press + +AddTimelock(/datum/job/fax_responder/press, list( + JOB_CIVIL_ROLES = 25 HOURS, +)) diff --git a/code/game/jobs/role_authority.dm b/code/game/jobs/role_authority.dm index 6801807b9693..1c2cce5ecbdb 100644 --- a/code/game/jobs/role_authority.dm +++ b/code/game/jobs/role_authority.dm @@ -366,7 +366,7 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou J.current_positions++ return TRUE -/datum/authority/branch/role/proc/check_role_entry(mob/new_player/M, datum/job/J, latejoin = FALSE) +/datum/authority/branch/role/proc/check_role_entry(mob/new_player/M, datum/job/J, latejoin = FALSE, faction) if(jobban_isbanned(M, J.title)) return FALSE if(J.role_ban_alternative && jobban_isbanned(M, J.role_ban_alternative)) @@ -379,6 +379,9 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou return FALSE if(latejoin && !J.late_joinable) return FALSE + if(faction && faction != J.faction_menu) + return FALSE + return TRUE /datum/authority/branch/role/proc/free_role(datum/job/J, latejoin = 1) //Want to make sure it's a job, and nothing like a MODE or special role. @@ -386,65 +389,35 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou J.current_positions-- return 1 -/datum/authority/branch/role/proc/free_role_admin(datum/job/J, latejoin = 1, user) //Specific proc that used for admin "Free Job Slots" verb (round tab) - if(!istype(J) || J.total_positions == -1) +/datum/authority/branch/role/proc/free_role_admin(datum/job/job, latejoin = TRUE, user) //Specific proc that used for admin "Free Job Slots" verb (round tab) + if(!istype(job) || job.total_positions == -1) return - if(J.current_positions < 1) //this should be filtered earlier, but we still check just in case - to_chat(user, "There are no [J] job slots occupied.") + if(job.current_positions < 1) //this should be filtered earlier, but we still check just in case + to_chat(user, "There are no [job] job slots occupied.") return //here is the main reason this proc exists - to remove freed squad jobs from squad, //so latejoining person ends in the squad which's job was freed and not random one - var/datum/squad/sq = null - if(GLOB.job_squad_roles.Find(J.title)) + var/datum/squad/squad = null + if(GLOB.job_squad_roles.Find(job.title)) var/list/squad_list = list() - for(sq in GLOB.RoleAuthority.squads) - if(sq.usable) - squad_list += sq - sq = null - sq = input(user, "Select squad you want to free [J.title] slot from.", "Squad Selection") as null|anything in squad_list - if(!sq) + for(squad in GLOB.RoleAuthority.squads) + if(squad.roundstart && squad.usable && squad.name != "Root") + squad_list += squad + squad = null + squad = tgui_input_list(user, "Select squad you want to free [job.title] slot from.", "Squad Selection", squad_list) + if(!squad) return - switch(J.title) - if(JOB_SQUAD_ENGI) - if(sq.num_engineers > 0) - sq.num_engineers-- - else - to_chat(user, "There are no [J.title] slots occupied in [sq.name] Squad.") - return - if(JOB_SQUAD_MEDIC) - if(sq.num_medics > 0) - sq.num_medics-- - else - to_chat(user, "There are no [J.title] slots occupied in [sq.name] Squad.") - return - if(JOB_SQUAD_SPECIALIST) - if(sq.num_specialists > 0) - sq.num_specialists-- - else - to_chat(user, "There are no [J.title] slots occupied in [sq.name] Squad.") - return - if(JOB_SQUAD_SMARTGUN) - if(sq.num_smartgun > 0) - sq.num_smartgun-- - else - to_chat(user, "There are no [J.title] slots occupied in [sq.name] Squad.") - return - if(JOB_SQUAD_TEAM_LEADER) - if(sq.num_tl > 0) - sq.num_tl-- - else - to_chat(user, "There are no [J.title] slots occupied in [sq.name] Squad.") - return - if(JOB_SQUAD_LEADER) - if(sq.num_leaders > 0) - sq.num_leaders-- - else - to_chat(user, "There are no [J.title] slots occupied in [sq.name] Squad.") - return - J.current_positions-- - message_admins("[key_name(user)] freed the [J.title] job slot[sq ? " in [sq.name] Squad" : ""].") - return 1 + + if(squad.roles_in[job.title] > 0) + squad.roles_in[job.title]-- + else + to_chat(user, "There are no [job.title] slots occupied in [squad.name] Squad.") + return + + job.current_positions-- + message_admins("[key_name(user)] freed the [job.title] job slot[squad ? " in [squad.name] Squad" : ""].") + return TRUE /datum/authority/branch/role/proc/modify_role(datum/job/J, amount) if(!istype(J)) @@ -524,6 +497,8 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou join_turf = get_turf(pick(GLOB.spawns_by_squad_and_job[assigned_squad][new_job.type])) else if(GLOB.spawns_by_job[new_job.type]) join_turf = get_turf(pick(GLOB.spawns_by_job[new_job.type])) + else if(GLOB.spawns_by_job[new_job.title]) + join_turf = get_turf(pick(GLOB.spawns_by_job[new_job.title])) else if(assigned_squad && GLOB.latejoin_by_squad[assigned_squad]) join_turf = get_turf(pick(GLOB.latejoin_by_squad[assigned_squad])) else @@ -542,188 +517,66 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou SEND_SIGNAL(new_human, COMSIG_POST_SPAWN_UPDATE) SSround_recording.recorder.track_player(new_human) -//Find which squad has the least population. If all 4 squads are equal it should just use a random one -/datum/authority/branch/role/proc/get_lowest_squad(mob/living/carbon/human/H) - if(!length(squads)) //Something went wrong, our squads aren't set up. - to_world("Warning, something messed up in get_lowest_squad(). No squads set up!") - return null - - - //we make a list of squad that is randomized so alpha isn't always lowest squad. - var/list/squads_copy = squads.Copy() - var/list/mixed_squads = list() - - for(var/i= 1 to length(squads_copy)) - var/datum/squad/S = pick_n_take(squads_copy) - if (S.roundstart && S.usable && S.faction == H.faction && S.name != "Root") - mixed_squads += S - - var/datum/squad/lowest = pick(mixed_squads) - - var/datum/pref_squad_name - if(H && H.client && H.client.prefs.preferred_squad && H.client.prefs.preferred_squad != "None") - pref_squad_name = H.client.prefs.preferred_squad - - for(var/datum/squad/L in mixed_squads) - if(L.usable) - if(pref_squad_name && L.name == pref_squad_name) - lowest = L - break - - - if(!lowest) - to_world("Warning! Bug in get_random_squad()!") - return null - - var/lowest_count = lowest.count - var/current_count = 0 - - if(!pref_squad_name) - //Loop through squads. - for(var/datum/squad/S in mixed_squads) - if(!S) - to_world("Warning: Null squad in get_lowest_squad. Call a coder!") - break //null squad somehow, let's just abort - current_count = S.count //Grab our current squad's # - if(current_count >= (lowest_count - 2)) //Current squad count is not much lower than the chosen one. Skip it. - continue - lowest_count = current_count //We found a winner! This squad is much lower than our default. Make it the new default. - lowest = S //'Select' this squad. - - return lowest //Return whichever squad won the competition. - //This proc is a bit of a misnomer, since there's no actual randomization going on. -/datum/authority/branch/role/proc/randomize_squad(mob/living/carbon/human/H, skip_limit = FALSE) - if(!H) +/datum/authority/branch/role/proc/randomize_squad(mob/living/carbon/human/human, skip_limit = FALSE) + if(!human) return if(!length(squads)) - to_chat(H, "Something went wrong with your squad randomizer! Tell a coder!") + to_chat(human, "Something went wrong with your squad randomizer! Tell a coder!") return //Shit, where's our squad data - if(H.assigned_squad) //Wait, we already have a squad. Get outta here! + if(human.assigned_squad) //Wait, we already have a squad. Get outta here! return - //we make a list of squad that is randomized so alpha isn't always lowest squad. - var/list/squads_copy = squads.Copy() - var/list/mixed_squads = list() - // The following code removes non useable squads from the lists of squads we assign marines too. - for(var/i= 1 to length(squads_copy)) - var/datum/squad/S = pick_n_take(squads_copy) - if (S.roundstart && S.usable && S.faction == H.faction && S.name != "Root") - mixed_squads += S - //Deal with IOs first - if(H.job == JOB_INTEL) + if(human.job == JOB_INTEL) var/datum/squad/intel_squad = get_squad_by_name(SQUAD_MARINE_INTEL) if(!intel_squad || !istype(intel_squad)) //Something went horribly wrong! - to_chat(H, "Something went wrong with randomize_squad()! Tell a coder!") + to_chat(human, "Something went wrong with randomize_squad()! Tell a coder!") return - intel_squad.put_marine_in_squad(H) //Found one, finish up + intel_squad.put_marine_in_squad(human) return - //Deal with non-standards first. - //Non-standards are distributed regardless of squad population. - //If the number of available positions for the job are more than max_whatever, it will break. - //Ie. 8 squad medic jobs should be available, and total medics in squads should be 8. - if(H.job != JOB_SQUAD_MARINE && H.job != "Reinforcements") - var/pref_squad_name - if(H && H.client && H.client.prefs.preferred_squad && H.client.prefs.preferred_squad != "None") - pref_squad_name = H.client.prefs.preferred_squad - - var/datum/squad/lowest - - switch(H.job) - if(JOB_SQUAD_ENGI) - for(var/datum/squad/S in mixed_squads) - if(S.usable && S.roundstart) - if(!skip_limit && S.num_engineers >= S.max_engineers) continue - if(pref_squad_name && S.name == pref_squad_name) - S.put_marine_in_squad(H) //fav squad has a spot for us, no more searching needed. - return - - if(!lowest) - lowest = S - else if(S.num_engineers < lowest.num_engineers) - lowest = S - - if(JOB_SQUAD_MEDIC) - for(var/datum/squad/S in mixed_squads) - if(S.usable && S.roundstart) - if(!skip_limit && S.num_medics >= S.max_medics) continue - if(pref_squad_name && S.name == pref_squad_name) - S.put_marine_in_squad(H) //fav squad has a spot for us. - return - - if(!lowest) - lowest = S - else if(S.num_medics < lowest.num_medics) - lowest = S - - if(JOB_SQUAD_LEADER) - for(var/datum/squad/S in mixed_squads) - if(S.usable && S.roundstart) - if(!skip_limit && S.num_leaders >= S.max_leaders) continue - if(pref_squad_name && S.name == pref_squad_name) - S.put_marine_in_squad(H) //fav squad has a spot for us. - return - - if(!lowest) - lowest = S - else if(S.num_leaders < lowest.num_leaders) - lowest = S - - if(JOB_SQUAD_SPECIALIST) - for(var/datum/squad/S in mixed_squads) - if(S.usable && S.roundstart) - if(!skip_limit && S.num_specialists >= S.max_specialists) continue - if(pref_squad_name && S.name == pref_squad_name) - S.put_marine_in_squad(H) //fav squad has a spot for us. - return - - if(!lowest) - lowest = S - else if(S.num_specialists < lowest.num_specialists) - lowest = S - - if(JOB_SQUAD_TEAM_LEADER) - for(var/datum/squad/S in mixed_squads) - if(S.usable && S.roundstart) - if(!skip_limit && S.num_tl >= S.max_tl) continue - if(pref_squad_name && S.name == pref_squad_name) - S.put_marine_in_squad(H) //fav squad has a spot for us. - return - - if(!lowest) - lowest = S - else if(S.num_tl < lowest.num_tl) - lowest = S - - if(JOB_SQUAD_SMARTGUN) - for(var/datum/squad/S in mixed_squads) - if(S.usable && S.roundstart) - if(!skip_limit && S.num_smartgun >= S.max_smartgun) continue - if(pref_squad_name && S.name == pref_squad_name) - S.put_marine_in_squad(H) //fav squad has a spot for us. - return - - if(!lowest) - lowest = S - else if(S.num_smartgun < lowest.num_smartgun) - lowest = S + var/slot_check + if(human.job != "Reinforcements") + slot_check = GET_DEFAULT_ROLE(human.job) + + //we make a list of squad that is randomized so alpha isn't always lowest squad. + var/list/mixed_squads = list() + for(var/datum/squad/squad in squads) + if(squad.roundstart && squad.usable && squad.faction == human.faction && squad.name != "Root") + mixed_squads += squad + + var/preferred_squad + if(human?.client?.prefs?.preferred_squad) + preferred_squad = human.client.prefs.preferred_squad + + var/datum/squad/lowest + for(var/datum/squad/squad in mixed_squads) + if(slot_check && !isnull(squad.roles_cap[slot_check]) && !skip_limit) + if(squad.roles_in[slot_check] >= squad.roles_cap[slot_check]) + continue + + if(preferred_squad == "None") + if(squad.put_marine_in_squad(human)) + return + + else if(squad.name == preferred_squad) //fav squad has a spot for us, no more searching needed. + if(squad.put_marine_in_squad(human)) + return + if(!lowest) - var/ranpick = rand(1,4) - lowest = mixed_squads[ranpick] - if(lowest) lowest.put_marine_in_squad(H) - else to_chat(H, "Something went badly with randomize_squad()! Tell a coder!") + lowest = squad - else - //Deal with marines. They get distributed to the lowest populated squad. - var/datum/squad/given_squad = get_lowest_squad(H) - if(!given_squad || !istype(given_squad)) //Something went horribly wrong! - to_chat(H, "Something went wrong with randomize_squad()! Tell a coder!") - return - given_squad.put_marine_in_squad(H) //Found one, finish up + else if(slot_check) + if(squad.roles_in[slot_check] < lowest.roles_in[slot_check]) + lowest = squad + + if(!lowest || !lowest.put_marine_in_squad(human)) + to_world("Warning! Bug in get_random_squad()!") + return + return /datum/authority/branch/role/proc/get_caste_by_text(name) var/mob/living/carbon/xenomorph/M @@ -770,6 +623,8 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou M = /mob/living/carbon/xenomorph/predalien if(XENO_CASTE_HELLHOUND) M = /mob/living/carbon/xenomorph/hellhound + if(XENO_CASTE_KING) + M = /mob/living/carbon/xenomorph/king return M @@ -814,23 +669,7 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou // returns TRUE if transfer_marine's role is at max capacity in the new squad /datum/authority/branch/role/proc/check_squad_capacity(mob/living/carbon/human/transfer_marine, datum/squad/new_squad) - switch(transfer_marine.job) - if(JOB_SQUAD_LEADER) - if(new_squad.num_leaders >= new_squad.max_leaders) - return TRUE - if(JOB_SQUAD_SPECIALIST) - if(new_squad.num_specialists >= new_squad.max_specialists) - return TRUE - if(JOB_SQUAD_ENGI) - if(new_squad.num_engineers >= new_squad.max_engineers) - return TRUE - if(JOB_SQUAD_MEDIC) - if(new_squad.num_medics >= new_squad.max_medics) - return TRUE - if(JOB_SQUAD_SMARTGUN) - if(new_squad.num_smartgun >= new_squad.max_smartgun) - return TRUE - if(JOB_SQUAD_TEAM_LEADER) - if(new_squad.num_tl >= new_squad.max_tl) - return TRUE + if(!isnull(new_squad.roles_cap[transfer_marine.job])) + if(new_squad.roles_in[transfer_marine.job] >= new_squad.roles_cap[transfer_marine.job]) + return TRUE return FALSE diff --git a/code/game/jobs/whitelist.dm b/code/game/jobs/whitelist.dm index 8cd91a494c83..b83f30729e3d 100644 --- a/code/game/jobs/whitelist.dm +++ b/code/game/jobs/whitelist.dm @@ -18,6 +18,8 @@ LAZYADD(., "commander") if(player.check_whitelist_status(WHITELIST_SYNTHETIC)) LAZYADD(., "synthetic") + if(player.check_whitelist_status(WHITELIST_FAX_RESPONDER)) + LAZYADD(., "responder") /client/load_player_data_info(datum/entity/player/player) . = ..() @@ -44,8 +46,10 @@ #define WL_PANEL_RIGHT_YAUTJA (1<<2) #define WL_PANEL_RIGHT_MENTOR (1<<3) #define WL_PANEL_RIGHT_OVERSEER (1<<4) +#define WL_PANEL_RIGHT_MANAGER (1<<5) #define WL_PANEL_ALL_COUNCILS (WL_PANEL_RIGHT_CO|WL_PANEL_RIGHT_SYNTH|WL_PANEL_RIGHT_YAUTJA) -#define WL_PANEL_ALL_RIGHTS (WL_PANEL_RIGHT_CO|WL_PANEL_RIGHT_SYNTH|WL_PANEL_RIGHT_YAUTJA|WL_PANEL_RIGHT_MENTOR|WL_PANEL_RIGHT_OVERSEER) +#define WL_PANEL_RIGHTS_OVERSEER (WL_PANEL_RIGHT_CO|WL_PANEL_RIGHT_SYNTH|WL_PANEL_RIGHT_YAUTJA|WL_PANEL_RIGHT_OVERSEER) +#define WL_PANEL_ALL_RIGHTS (WL_PANEL_RIGHT_CO|WL_PANEL_RIGHT_SYNTH|WL_PANEL_RIGHT_YAUTJA|WL_PANEL_RIGHT_MENTOR|WL_PANEL_RIGHT_OVERSEER|WL_PANEL_RIGHT_MANAGER) /datum/whitelist_panel var/viewed_player = list() @@ -68,7 +72,7 @@ if(person.check_whitelist_status(WHITELIST_YAUTJA_LEADER)) rights |= WL_PANEL_RIGHT_YAUTJA if(rights == WL_PANEL_ALL_COUNCILS) - return WL_PANEL_ALL_RIGHTS + rights |= WL_PANEL_RIGHTS_OVERSEER return rights /datum/whitelist_panel/tgui_interact(mob/user, datum/tgui/ui) @@ -114,7 +118,7 @@ GLOBAL_LIST_INIT(syn_flags, list( )) GLOBAL_LIST_INIT(yaut_flags, list( list(name = "Yautja", bitflag = WHITELIST_YAUTJA, permission = WL_PANEL_RIGHT_YAUTJA), - list(name = "Legacy Holder", bitflag = WHITELIST_YAUTJA_LEGACY, permission = WL_PANEL_RIGHT_OVERSEER), + list(name = "Legacy Holder", bitflag = WHITELIST_YAUTJA_LEGACY, permission = WL_PANEL_RIGHT_MANAGER), list(name = "Council", bitflag = WHITELIST_YAUTJA_COUNCIL, permission = WL_PANEL_RIGHT_YAUTJA), list(name = "Legacy Council", bitflag = WHITELIST_YAUTJA_COUNCIL_LEGACY, permission = WL_PANEL_RIGHT_YAUTJA), list(name = "Senator", bitflag = WHITELIST_YAUTJA_LEADER, permission = WL_PANEL_RIGHT_OVERSEER) @@ -122,6 +126,7 @@ GLOBAL_LIST_INIT(yaut_flags, list( GLOBAL_LIST_INIT(misc_flags, list( list(name = "Senior Enlisted Advisor", bitflag = WHITELIST_MENTOR, permission = WL_PANEL_RIGHT_MENTOR), list(name = "Working Joe", bitflag = WHITELIST_JOE, permission = WL_PANEL_RIGHT_SYNTH), + list(name = "Fax Responder", bitflag = WHITELIST_FAX_RESPONDER, permission = WL_PANEL_RIGHT_MANAGER), )) /datum/whitelist_panel/ui_static_data(mob/user) diff --git a/code/game/machinery/ARES/apollo_pda.dm b/code/game/machinery/ARES/apollo_pda.dm index ba579b030d99..1742734cce66 100644 --- a/code/game/machinery/ARES/apollo_pda.dm +++ b/code/game/machinery/ARES/apollo_pda.dm @@ -14,6 +14,7 @@ var/current_menu = "login" var/last_menu = "off" + var/base_icon_state = "karnak" var/authentication = APOLLO_ACCESS_LOGOUT /// The last person to login. @@ -62,11 +63,11 @@ /obj/item/device/working_joe_pda/update_icon() . = ..() if(last_menu == "off") - icon_state = "karnak_off" + icon_state = "[base_icon_state]_off" else if(current_menu == "login") - icon_state = "karnak_login_anim" + icon_state = "[base_icon_state]_login_anim" else - icon_state = "karnak_on_anim" + icon_state = "[base_icon_state]_on_anim" // ------ Maintenance Controller UI ------ // /obj/item/device/working_joe_pda/attack_self(mob/user) @@ -411,3 +412,9 @@ if(playsound) var/sound = pick('sound/machines/pda_button1.ogg', 'sound/machines/pda_button2.ogg') playsound(src, sound, 15, TRUE) + +/obj/item/device/working_joe_pda/uscm + name = "KN5500/2 PDA" + desc = "A portable interface used by AI technicians, capable of connecting to the local command AI to relay tasking information. Built to withstand a nuclear bomb." + icon_state = "karnak_uscm_off" + base_icon_state = "karnak_uscm" diff --git a/code/game/machinery/autolathe_datums.dm b/code/game/machinery/autolathe_datums.dm index 9c8ee271845d..fcff34a86f8e 100644 --- a/code/game/machinery/autolathe_datums.dm +++ b/code/game/machinery/autolathe_datums.dm @@ -49,7 +49,7 @@ /datum/autolathe/recipe/weldertool name = "blowtorch" - path = /obj/item/tool/weldingtool + path = /obj/item/tool/weldingtool/empty category = AUTOLATHE_CATEGORY_TOOLS /datum/autolathe/recipe/screwdriver diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 4f6f4df4ef08..e0eac6e1043c 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -15,16 +15,38 @@ var/enemy_mp = 25 var/gameover = 0 var/blocked = 0 //Player cannot attack/heal while set - var/list/prizes = list( /obj/item/storage/box/MRE = 3, - /obj/item/spacecash/c10 = 4, - /obj/item/ammo_magazine/flamer_tank = 1, - /obj/item/tool/lighter/zippo = 2, - /obj/item/tool/weldingtool = 1, - /obj/item/storage/box/uscm_mre = 2, - /obj/item/device/camera = 2, - /obj/item/device/camera_film = 4, - /obj/item/cell/crap/empty = 3, - /obj/item/tool/hand_labeler = 1 + var/list/prizes = list( /obj/item/tool/lighter/zippo = 4, + /obj/item/spacecash/ewallet = 100, worth = 25, + /obj/item/facepaint/sniper = 4, + /obj/item/toy/gun = 4, + /obj/item/toy/crossbow = 4, + /obj/item/toy/sword = 5, + /obj/item/toy/katana = 1, + /obj/item/toy/spinningtoy = 2, + /obj/item/toy/prize/ripley = 2, + /obj/item/toy/prize/fireripley = 2, + /obj/item/toy/prize/deathripley = 2, + /obj/item/toy/prize/gygax = 2, + /obj/item/toy/prize/durand = 2, + /obj/item/toy/prize/honk = 2, + /obj/item/toy/prize/marauder = 2, + /obj/item/toy/prize/seraph = 2, + /obj/item/toy/prize/mauler = 2, + /obj/item/toy/prize/odysseus = 2, + /obj/item/toy/bikehorn = 2, // honk + /obj/item/clothing/head/collectable/tophat/super = 2, + /obj/item/toy/plush/farwa = 2, + /obj/item/toy/plush/barricade = 2, + /obj/item/toy/plush/shark = 2, + /obj/item/toy/plush/bee = 2, + /obj/item/toy/plush/moth = 2, + /obj/item/toy/plush/rock = 5, + /obj/item/storage/box/snappops = 5, + /obj/item/facepaint/lipstick = 1, + /obj/item/facepaint/lipstick/jade = 1, + /obj/item/clothing/head/headband/gray = 5, + /obj/item/clothing/head/headband/red = 5, + /obj/item/clothing/mask/tornscarf = 5, ) /obj/structure/machinery/computer/arcade diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index f9dc5815e568..35bfb3e1c3b8 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -8,7 +8,7 @@ //Used for logging people entering cryosleep and important items they are carrying. GLOBAL_LIST_EMPTY(frozen_crew) -GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = list(), SQUAD_MARINE_3 = list(), SQUAD_MARINE_4 = list(), "MP" = list(), "REQ" = list(), "Eng" = list(), "Med" = list(), "Yautja" = list())) +GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = list(), SQUAD_MARINE_3 = list(), SQUAD_MARINE_4 = list(), "MP" = list(), "REQ" = list(), "Eng" = list(), "Med" = list(), "Yautja" = list(), "Responders" = list())) //Main cryopod console. @@ -229,8 +229,8 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li var/list/dept_console = GLOB.frozen_items["REQ"] if(ishuman(occupant)) - var/mob/living/carbon/human/H = occupant - switch(H.job) + var/mob/living/carbon/human/cryo_human = occupant + switch(cryo_human.job) if(JOB_POLICE, JOB_WARDEN, JOB_CHIEF_POLICE) dept_console = GLOB.frozen_items["MP"] if(JOB_NURSE, JOB_DOCTOR, JOB_RESEARCHER, JOB_CMO) @@ -240,7 +240,10 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li if(JOB_PREDATOR) dept_console = GLOB.frozen_items["Yautja"] - H.species.handle_cryo(H) + if(cryo_human.job in FAX_RESPONDER_JOB_LIST) + cryo_human.despawn_fax_responder() + + cryo_human.species.handle_cryo(cryo_human) var/list/deleteempty = list(/obj/item/storage/backpack/marine/satchel) @@ -262,7 +265,7 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li item_loop: for(var/obj/item/W in items) - if(((W.flags_inventory & CANTSTRIP) || (W.flags_item & NODROP) || (W.flags_item & NO_CRYO_STORE)) && !gearless_role(occupant)) //We don't keep donor items, undroppable/unremovable items, and specifically filtered items + if((W.flags_inventory & CANTSTRIP) || (W.flags_item & NODROP) || (W.flags_item & NO_CRYO_STORE) || gearless_role(occupant)) //We don't keep donor items, undroppable/unremovable items, and specifically filtered items if(istype(W, /obj/item/clothing/suit/storage)) var/obj/item/clothing/suit/storage/SS = W for(var/obj/item/I in SS.pockets) //But we keep stuff inside them @@ -321,6 +324,9 @@ GLOBAL_LIST_INIT(frozen_items, list(SQUAD_MARINE_1 = list(), SQUAD_MARINE_2 = li stripped_items: for(var/obj/item/A in strippeditems) + if(gearless_role(occupant)) + qdel(A) + continue stripped_items for(var/DAA in deleteall) if(istype(A, DAA)) qdel(A) diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index 52c904e81ded..89b9356cd174 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -904,6 +904,9 @@ /obj/structure/machinery/door/airlock/hatch/cockpit/three icon = 'icons/obj/structures/doors/dropship3_pilot.dmi' +/obj/structure/machinery/door/airlock/hatch/cockpit/upp + icon = 'icons/obj/structures/doors/dropship_upp_pilot.dmi' + //PRISON AIRLOCKS /obj/structure/machinery/door/airlock/prison name = "cell Door" diff --git a/code/game/machinery/doors/multi_tile.dm b/code/game/machinery/doors/multi_tile.dm index 2b05e2c77772..70bf4e43bc4a 100644 --- a/code/game/machinery/doors/multi_tile.dm +++ b/code/game/machinery/doors/multi_tile.dm @@ -333,6 +333,14 @@ name = "\improper Saipan cargo door" icon = 'icons/obj/structures/doors/dropship3_cargo.dmi' +/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/upp + name = "\improper Morana cargo door" + icon = 'icons/obj/structures/doors/dropship_upp_cargo.dmi' + +/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/upp2 + name = "\improper Devana cargo door" + icon = 'icons/obj/structures/doors/dropship_upp_cargo.dmi' + /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside width = 2 @@ -348,6 +356,14 @@ name = "\improper Saipan crew hatch" icon = 'icons/obj/structures/doors/dropship3_side2.dmi' +/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/upp + name = "\improper Morana crew hatch" + icon = 'icons/obj/structures/doors/dropship_upp_side2.dmi' + +/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/upp2 + name = "\improper Devana crew hatch" + icon = 'icons/obj/structures/doors/dropship_upp_side2.dmi' + /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/blastdoor name = "bulkhead blast door" icon = 'icons/obj/structures/doors/almayerblastdoor.dmi' diff --git a/code/game/machinery/doors/poddoor/almayer.dm b/code/game/machinery/doors/poddoor/almayer.dm index 2b296412df7d..b7d19eaa7252 100644 --- a/code/game/machinery/doors/poddoor/almayer.dm +++ b/code/game/machinery/doors/poddoor/almayer.dm @@ -32,6 +32,15 @@ /obj/structure/machinery/door/poddoor/almayer/blended/white/open density = FALSE +/obj/structure/machinery/door/poddoor/almayer/blended/liaison + name = "hull" + desc = "A metal wall used to separate rooms and make up the ship." + icon_state = "liaison_pdoor1" + base_icon_state = "liaison_pdoor" + +/obj/structure/machinery/door/poddoor/almayer/blended/liaison/open + density = FALSE + /obj/structure/machinery/door/poddoor/almayer/blended/aicore icon_state = "aidoor1" base_icon_state = "aidoor" diff --git a/code/game/machinery/doors/runed_sandstone.dm b/code/game/machinery/doors/runed_sandstone.dm index a6de7348dd7f..e51877395d75 100644 --- a/code/game/machinery/doors/runed_sandstone.dm +++ b/code/game/machinery/doors/runed_sandstone.dm @@ -24,10 +24,10 @@ /obj/structure/machinery/door/airlock/sandstone/runed/attackby(obj/item/W as obj, mob/user as mob) // ..() user.set_interaction(src) - if (!istype(W, /obj/item/weapon/wristblades || !isyautja(user))) + if (!istype(W, /obj/item/weapon/bracer_attachment || !isyautja(user))) return - if(istype(W, /obj/item/weapon/wristblades)) + if(istype(W, /obj/item/weapon/bracer_attachment)) playsound(user.loc, 'sound/effects/bladeinsert.ogg', 25, 0) var/list/options = list() diff --git a/code/game/machinery/fax_machine.dm b/code/game/machinery/fax_machine.dm index b15117bb2554..4b5df130c96d 100644 --- a/code/game/machinery/fax_machine.dm +++ b/code/game/machinery/fax_machine.dm @@ -1,5 +1,6 @@ -GLOBAL_LIST_INIT_TYPED(allfaxes, /obj/structure/machinery/faxmachine, list()) -GLOBAL_LIST_EMPTY(alldepartments) +GLOBAL_LIST_INIT_TYPED(all_faxmachines, /obj/structure/machinery/faxmachine, list()) +GLOBAL_LIST_EMPTY(all_fax_departments) +GLOBAL_LIST_EMPTY(all_faxcodes) #define DEPARTMENT_WY "Weyland-Yutani" #define DEPARTMENT_HC "USCM High Command" @@ -9,8 +10,24 @@ GLOBAL_LIST_EMPTY(alldepartments) #define DEPARTMENT_TWE "Three World Empire" #define DEPARTMENT_UPP "Union of Progress Peoples" #define DEPARTMENT_CLF "Colonial Liberation Front" +#define DEPARTMENT_TARGET "Specific Machine Code"//Used to send to a single specific machine. #define HIGHCOM_DEPARTMENTS list(DEPARTMENT_WY, DEPARTMENT_HC, DEPARTMENT_CMB, DEPARTMENT_PROVOST, DEPARTMENT_PRESS, DEPARTMENT_TWE, DEPARTMENT_UPP, DEPARTMENT_CLF) +#define FAX_NET_USCM "USCM Encrypted Network" +#define FAX_NET_USCM_HC "USCM High Command Quantum Relay" +#define FAX_NET_WY "Weyland-Yutani Secure Network" +#define FAX_NET_WY_COL "Weyland-Yutani Public Network" +#define FAX_NET_WY_HC "Weyland-Yutani Quantum Relay" +#define FAX_NET_CMB "NC4 UA Federal Secure Network - CMB Relay" +#define FAX_NET_TWE "TWE Encrypted Network" +#define FAX_NET_TWE_HC "TWE Imperial Command Quantum Relay" +#define FAX_NET_UPP "UPP Encrypted Network" +#define FAX_NET_UPP_HC "UPP High Command Quantum Relay" +#define FAX_NET_CLF "Peridia Encrypted Network" +#define FAX_NET_CLF_HC "Peridia Quantum Relay" +#define FAX_NET_PRESS_HC "Free Press Quantum Relay" +#define FAX_HC_NETWORKS list(FAX_NET_USCM_HC, FAX_NET_WY_HC, FAX_NET_CMB, FAX_NET_TWE_HC, FAX_NET_UPP_HC, FAX_NET_CLF_HC, FAX_NET_PRESS_HC) + /obj/structure/machinery/faxmachine // why not fax_machine? name = "\improper General Purpose Fax Machine" icon = 'icons/obj/structures/machinery/library.dmi' @@ -35,24 +52,81 @@ GLOBAL_LIST_EMPTY(alldepartments) ///Target department var/target_department = DEPARTMENT_WY + var/target_machine_id = "No ID Selected" // list for img and their photo reference to be stored into the admin's cache. var/list/photo_list = list() ///Fluff network shown by fax machine when logged in - var/network = "Weyland-Yutani Public Network" + var/network = FAX_NET_WY_COL ///storer var for cooldown on sending faxes var/fax_cooldown = 300 COOLDOWN_DECLARE(send_cooldown) + /// Unique identifier for the fax machine. + var/machine_id_tag + /// Whether or not the ID tag can be changed by proc. + var/fixed_id_tag = FALSE + /obj/structure/machinery/faxmachine/Initialize(mapload, ...) . = ..() - GLOB.allfaxes += src + GLOB.all_faxmachines += src update_departments() + generate_id_tag() + +/obj/structure/machinery/faxmachine/proc/generate_id_tag(force = FALSE) + if(fixed_id_tag && !force) + return FALSE + if(machine_id_tag) + GLOB.all_faxcodes -= machine_id_tag + + var/id_tag_prefix + var/id_tag_suffix = "[rand(1000, 9999)][pick(GLOB.alphabet_uppercase)][pick(GLOB.alphabet_uppercase)]" + var/id_tag_final + switch(network) + if(FAX_NET_USCM) + id_tag_prefix = "UA-M"//United Americas Military + if(FAX_NET_USCM_HC) + id_tag_final = FAX_NET_USCM_HC + if(FAX_NET_CMB) + id_tag_final = FAX_NET_CMB + if(FAX_NET_WY) + id_tag_prefix = "WY-SCN"//Weyland Yutani Secure Corporate Network + if(FAX_NET_WY_COL) + id_tag_prefix = "WYC"//Weyland Yutani Communications + if(FAX_NET_WY_HC) + id_tag_final = FAX_NET_WY_HC + if(FAX_NET_TWE) + id_tag_prefix = "ICN"//Imperial Communication Network + if(FAX_NET_TWE_HC) + id_tag_final = FAX_NET_TWE_HC + if(FAX_NET_UPP) + id_tag_prefix = "UFR"//Union Fax Relay + if(FAX_NET_UPP_HC) + id_tag_final = FAX_NET_UPP_HC + if(FAX_NET_CLF) + id_tag_prefix = "PRD"//PeRiDia + if(FAX_NET_CLF_HC) + id_tag_final = FAX_NET_CLF_HC + if(FAX_NET_PRESS_HC) + id_tag_final = FAX_NET_PRESS_HC + + if(!id_tag_final) + id_tag_final = "[id_tag_prefix]-[id_tag_suffix]" + if(id_tag_final in GLOB.all_faxcodes) + generate_id_tag() + return FALSE + + machine_id_tag = id_tag_final + if(machine_id_tag == network) + return TRUE + GLOB.all_faxcodes += id_tag_final + return TRUE /obj/structure/machinery/faxmachine/Destroy() - GLOB.allfaxes -= src + GLOB.all_faxmachines -= src + GLOB.all_faxcodes -= machine_id_tag . = ..() /obj/structure/machinery/faxmachine/initialize_pass_flags(datum/pass_flags_container/PF) @@ -129,24 +203,26 @@ GLOBAL_LIST_EMPTY(alldepartments) return /obj/structure/machinery/faxmachine/proc/update_departments() - if( !("[department]" in GLOB.alldepartments) ) //Initialize departments. This will work with multiple fax machines. - GLOB.alldepartments += department - if(!(DEPARTMENT_WY in GLOB.alldepartments)) - GLOB.alldepartments += DEPARTMENT_WY - if(!(DEPARTMENT_HC in GLOB.alldepartments)) - GLOB.alldepartments += DEPARTMENT_HC - if(!(DEPARTMENT_PROVOST in GLOB.alldepartments)) - GLOB.alldepartments += DEPARTMENT_PROVOST - if(!(DEPARTMENT_CMB in GLOB.alldepartments)) - GLOB.alldepartments += DEPARTMENT_CMB - if(!(DEPARTMENT_PRESS in GLOB.alldepartments)) - GLOB.alldepartments += DEPARTMENT_PRESS - if(!(DEPARTMENT_TWE in GLOB.alldepartments)) - GLOB.alldepartments += DEPARTMENT_TWE - if(!(DEPARTMENT_UPP in GLOB.alldepartments)) - GLOB.alldepartments += DEPARTMENT_UPP - if(!(DEPARTMENT_CLF in GLOB.alldepartments)) - GLOB.alldepartments += DEPARTMENT_CLF + if(!(DEPARTMENT_TARGET in GLOB.all_fax_departments)) + GLOB.all_fax_departments += DEPARTMENT_TARGET + if( !("[department]" in GLOB.all_fax_departments) ) //Initialize departments. This will work with multiple fax machines. + GLOB.all_fax_departments += department + if(!(DEPARTMENT_WY in GLOB.all_fax_departments)) + GLOB.all_fax_departments += DEPARTMENT_WY + if(!(DEPARTMENT_HC in GLOB.all_fax_departments)) + GLOB.all_fax_departments += DEPARTMENT_HC + if(!(DEPARTMENT_PROVOST in GLOB.all_fax_departments)) + GLOB.all_fax_departments += DEPARTMENT_PROVOST + if(!(DEPARTMENT_CMB in GLOB.all_fax_departments)) + GLOB.all_fax_departments += DEPARTMENT_CMB + if(!(DEPARTMENT_PRESS in GLOB.all_fax_departments)) + GLOB.all_fax_departments += DEPARTMENT_PRESS + if(!(DEPARTMENT_TWE in GLOB.all_fax_departments)) + GLOB.all_fax_departments += DEPARTMENT_TWE + if(!(DEPARTMENT_UPP in GLOB.all_fax_departments)) + GLOB.all_fax_departments += DEPARTMENT_UPP + if(!(DEPARTMENT_CLF in GLOB.all_fax_departments)) + GLOB.all_fax_departments += DEPARTMENT_CLF // TGUI SHIT \\ @@ -169,6 +245,7 @@ GLOBAL_LIST_EMPTY(alldepartments) data["department"] = department data["network"] = network + data["machine_id_tag"] = machine_id_tag return data @@ -181,7 +258,17 @@ GLOBAL_LIST_EMPTY(alldepartments) data["paper_name"] = original_fax.name data["authenticated"] = authenticated + data["target_department"] = target_department + if(target_department == DEPARTMENT_TARGET) + data["target_department"] = target_machine_id + + if(target_department in HIGHCOM_DEPARTMENTS) + data["highcom_dept"] = TRUE + else + data["highcom_dept"] = FALSE + + data["awake_responder"] = is_department_responder_awake(target_department) data["worldtime"] = world.time data["nextfaxtime"] = send_cooldown @@ -266,8 +353,15 @@ GLOBAL_LIST_EMPTY(alldepartments) if("select") var/last_target_department = target_department - target_department = tgui_input_list(ui.user, "Which department?", "Choose a department", GLOB.alldepartments) - if(!target_department) target_department = last_target_department + target_department = tgui_input_list(ui.user, "Which department?", "Choose a department", GLOB.all_fax_departments) + if(!target_department) + target_department = last_target_department + if(target_department == DEPARTMENT_TARGET) + var/new_target_machine_id = tgui_input_list(ui.user, "Which machine?", "Choose a machine code", GLOB.all_faxcodes) + if(!new_target_machine_id) + target_department = last_target_department + else + target_machine_id = new_target_machine_id . = TRUE if("auth") @@ -330,15 +424,18 @@ GLOBAL_LIST_EMPTY(alldepartments) /obj/structure/machinery/faxmachine/proc/outgoing_fax_message(mob/user) - var/datum/fax/faxcontents = new(fax_paper_copy.info, photo_list) + var/datum/fax/faxcontents = new(fax_paper_copy.info, photo_list, fax_paper_copy.name) GLOB.fax_contents += faxcontents var/scan_department = target_department + var/the_target_department = target_department if(department in HIGHCOM_DEPARTMENTS) scan_department = department + else if(target_department == DEPARTMENT_TARGET) + the_target_department = "Fax Machine [target_machine_id]" - var/msg_admin = SPAN_STAFF_IC("[target_department]: [key_name(user, 1)] ") + var/msg_admin = SPAN_STAFF_IC("[the_target_department]: [key_name(user, 1)] ") msg_admin += "[CC_MARK(user)] [ADMIN_PP(user)] [ADMIN_VV(user)] [ADMIN_SM(user)] [ADMIN_JMP_USER(user)] " switch(scan_department) @@ -372,7 +469,7 @@ GLOBAL_LIST_EMPTY(alldepartments) msg_admin += SPAN_STAFF_IC("Receiving fax via secure connection ... view message") - var/msg_ghost = SPAN_NOTICE("[target_department]: ") + var/msg_ghost = SPAN_NOTICE("[the_target_department]: ") msg_ghost += "Receiving fax via secure connection ... view message" send_fax(faxcontents) @@ -404,80 +501,81 @@ GLOBAL_LIST_EMPTY(alldepartments) /obj/structure/machinery/faxmachine/proc/send_fax(datum/fax/faxcontents) - for(var/obj/structure/machinery/faxmachine/F in GLOB.allfaxes) - if(F != src && F.department == target_department) - if(!faxcontents) - return - if(! (F.inoperable() ) ) + var/list/target_machines = list() + for(var/obj/structure/machinery/faxmachine/pos_target in GLOB.all_faxmachines) + if(target_department == DEPARTMENT_TARGET) + if(pos_target != src && pos_target.machine_id_tag == target_machine_id) + target_machines += pos_target + else + if(pos_target != src && pos_target.department == target_department) + target_machines += pos_target + + for(var/obj/structure/machinery/faxmachine/target in target_machines) + if(!faxcontents) + return + if(!(target.inoperable())) - flick("[initial(icon_state)]receive", F) + flick("[initial(icon_state)]receive", target) - // give the sprite some time to flick - spawn(30) - var/obj/item/paper/P = new(F.loc,faxcontents.photo_list) + // give the sprite some time to flick + spawn(30) + var/obj/item/paper/P = new(target.loc,faxcontents.photo_list) + if(!faxcontents.paper_name) P.name = "faxed message" - P.info = "[faxcontents.data]" - P.update_icon() - - switch(network) - if("USCM High Command Quantum Relay") - var/image/stampoverlay = image('icons/obj/items/paper.dmi') - stampoverlay.icon_state = "paper_stamp-uscm" - P.stamps += "
This paper has been stamped by the USCM High Command Quantum Relay." - if("NC4 UA Federal Secure Network - CMB Relay") - var/image/stampoverlay = image('icons/obj/items/paper.dmi') - stampoverlay.icon_state = "paper_stamp-cmb" - if(!P.stamped) - P.stamped = new - P.stamped += /obj/item/tool/stamp - P.overlays += stampoverlay - P.stamps += "
This paper has been stamped by The Office of Colonial Marshals." - if("Weyland-Yutani Quantum Relay") - var/image/stampoverlay = image('icons/obj/items/paper.dmi') - stampoverlay.icon_state = "paper_stamp-weyyu" - if(!P.stamped) - P.stamped = new - P.stamped += /obj/item/tool/stamp - P.overlays += stampoverlay - P.stamps += "
This paper has been stamped and encrypted by the Weyland-Yutani Quantum Relay (tm)." - if("TWE Royal Marines Commando Quantum Relay") - var/image/stampoverlay = image('icons/obj/items/paper.dmi') - stampoverlay.icon_state = "paper_stamp-twe" - if(!P.stamped) - P.stamped = new - P.stamped += /obj/item/tool/stamp - P.overlays += stampoverlay - P.stamps += "
This paper has been stamped by the TWE Royal Marines Commando Quantum Relay." - if("UPP High Kommand Quantum Relay") - var/image/stampoverlay = image('icons/obj/items/paper.dmi') - stampoverlay.icon_state = "paper_stamp-upp" - if(!P.stamped) - P.stamped = new - P.stamped += /obj/item/tool/stamp - P.overlays += stampoverlay - P.stamps += "
This paper has been stamped by the UPP High Kommand Quantum Relay." - if("CLF Gureilla Command Quantum Relay") - var/image/stampoverlay = image('icons/obj/items/paper.dmi') - stampoverlay.icon_state = "paper_stamp-clf" - if(!P.stamped) - P.stamped = new - P.stamped += /obj/item/tool/stamp - P.overlays += stampoverlay - P.stamps += "
This paper has been stamped and encrypted by the CLF Gureilla Command Quantum Relay." - - playsound(F.loc, "sound/items/polaroid1.ogg", 15, 1) + else + P.name = "faxed message ([faxcontents.paper_name])" + P.info = "[faxcontents.data]" + P.update_icon() + var/image/stampoverlay = image('icons/obj/items/paper.dmi') + var/encrypted = FALSE + + switch(network) + if(FAX_NET_USCM_HC) + stampoverlay.icon_state = "paper_stamp-uscm" + encrypted = TRUE + if(FAX_NET_CMB) + stampoverlay.icon_state = "paper_stamp-cmb" + network = "NC4 UA Federal Secure Network." + encrypted = TRUE + if(FAX_NET_WY_HC) + stampoverlay.icon_state = "paper_stamp-weyyu" + encrypted = TRUE + if(FAX_NET_TWE_HC) + stampoverlay.icon_state = "paper_stamp-twe" + encrypted = TRUE + if(FAX_NET_UPP_HC) + stampoverlay.icon_state = "paper_stamp-upp" + encrypted = TRUE + if(FAX_NET_CLF_HC) + stampoverlay.icon_state = "paper_stamp-clf" + encrypted = TRUE + if(FAX_NET_PRESS_HC) + stampoverlay.icon_state = "paper_stamp-rd" + encrypted = TRUE + else + stampoverlay.icon_state = "paper_stamp-fax" + + + if(encrypted) + if(!P.stamped) + P.stamped = new + P.stamped += /obj/item/tool/stamp + P.stamps += "
This paper has been stamped and encrypted by the [network]." + else + P.stamps += "
This paper has been sent by [machine_id_tag]." + P.overlays += stampoverlay + playsound(target.loc, "sound/items/polaroid1.ogg", 15, 1) qdel(faxcontents) /obj/structure/machinery/faxmachine/cmb name = "\improper CMB Incident Command Center Fax Machine" - department = "Colonial Marshal Bureau, Anchorpoint Station" - network = "NC4 UA Federal Secure Network - CMB Relay" + network = FAX_NET_CMB department = DEPARTMENT_CMB /obj/structure/machinery/faxmachine/corporate name = "\improper W-Y Corporate Fax Machine" department = "W-Y Local Office" - network = "Weyland-Yutani Secure Network" + network = FAX_NET_WY /obj/structure/machinery/faxmachine/corporate/liaison department = "W-Y Liaison" @@ -485,12 +583,12 @@ GLOBAL_LIST_EMPTY(alldepartments) /obj/structure/machinery/faxmachine/corporate/highcom department = DEPARTMENT_WY target_department = "W-Y Liaison" - network = "Weyland-Yutani Quantum Relay" + network = FAX_NET_WY_HC /obj/structure/machinery/faxmachine/uscm name = "\improper USCM Military Fax Machine" department = "USCM Local Operations" - network = "USCM Encrypted Network" + network = FAX_NET_USCM target_department = DEPARTMENT_HC /obj/structure/machinery/faxmachine/uscm/command @@ -502,7 +600,7 @@ GLOBAL_LIST_EMPTY(alldepartments) /obj/structure/machinery/faxmachine/uscm/command/highcom department = DEPARTMENT_HC target_department = "Commanding Officer" - network = "USCM High Command Quantum Relay" + network = FAX_NET_USCM_HC /obj/structure/machinery/faxmachine/uscm/brig name = "\improper USCM Provost Fax Machine" @@ -515,8 +613,45 @@ GLOBAL_LIST_EMPTY(alldepartments) /obj/structure/machinery/faxmachine/uscm/brig/provost department = DEPARTMENT_PROVOST target_department = "Brig" - network = "USCM High Command Quantum Relay" - + network = FAX_NET_USCM_HC + +/obj/structure/machinery/faxmachine/upp + name = "\improper UPP Military Fax Machine" + department = "UPP Local Operations" + network = FAX_NET_UPP + target_department = DEPARTMENT_UPP + +/obj/structure/machinery/faxmachine/upp/highcom + department = DEPARTMENT_UPP + network = FAX_NET_UPP_HC + target_department = "UPP Local Operations" + +/obj/structure/machinery/faxmachine/clf + name = "\improper Hacked General Purpose Fax Machine" + department = "CLF Local Operations" + network = FAX_NET_CLF + target_department = DEPARTMENT_CLF + +/obj/structure/machinery/faxmachine/clf/highcom + department = DEPARTMENT_CLF + network = FAX_NET_CLF_HC + target_department = "CLF Local Operations" + +/obj/structure/machinery/faxmachine/twe + name = "\improper TWE Military Fax Machine" + department = "TWE Local Operations" + network = FAX_NET_TWE + target_department = DEPARTMENT_TWE + +/obj/structure/machinery/faxmachine/twe/highcom + department = DEPARTMENT_TWE + network = FAX_NET_TWE_HC + target_department = "TWE Local Operations" + +/obj/structure/machinery/faxmachine/press/highcom + department = DEPARTMENT_PRESS + network = FAX_NET_PRESS_HC + target_department = "General Public" ///The deployed fax machine backpack /obj/structure/machinery/faxmachine/backpack @@ -526,6 +661,14 @@ GLOBAL_LIST_EMPTY(alldepartments) needs_power = FALSE use_power = USE_POWER_NONE health = 150 + var/obj/item/device/fax_backpack/faxbag + +/obj/structure/machinery/faxmachine/backpack/New(loc, portable_id_tag) + . = ..() + if(portable_id_tag) + machine_id_tag = portable_id_tag + fixed_id_tag = TRUE + GLOB.all_faxcodes += machine_id_tag ///The wearable and deployable part of the fax machine backpack /obj/item/device/fax_backpack @@ -537,6 +680,7 @@ GLOBAL_LIST_EMPTY(alldepartments) w_class = SIZE_HUGE flags_equip_slot = SLOT_BACK flags_item = ITEM_OVERRIDE_NORTHFACE + var/machine_id_tag /obj/item/device/fax_backpack/attack_self(mob/user) //activate item version fax inhand to deploy if(!ishuman(user)) @@ -570,10 +714,12 @@ GLOBAL_LIST_EMPTY(alldepartments) to_chat(user, SPAN_NOTICE("You begin to deploy [src]...")) if(do_after(user, 4.5 SECONDS, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) to_chat(user, SPAN_NOTICE("You deploy [src].")) - var/obj/structure/machinery/faxmachine/backpack/deployedfax = new(deployturf) + var/obj/structure/machinery/faxmachine/backpack/deployedfax = new(deployturf, machine_id_tag) + deployedfax.faxbag = src transfer_label_component(deployedfax) playsound(src.loc, 'sound/machines/print.ogg', 40, 1) - qdel(src) + user.drop_held_item(src) + forceMove(deployedfax) return return ..() @@ -589,9 +735,10 @@ GLOBAL_LIST_EMPTY(alldepartments) if(do_after(user, 4.5 SECONDS, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) playsound(src.loc, 'sound/items/Ratchet.ogg', 25, 1) to_chat(user, SPAN_NOTICE("You pick up [src].")) - var/obj/item/device/fax_backpack/faxbag = new(loc) transfer_label_component(faxbag) user.put_in_hands(faxbag) + if(faxbag.machine_id_tag != machine_id_tag) + faxbag.machine_id_tag = machine_id_tag qdel(src) return return ..() @@ -599,8 +746,40 @@ GLOBAL_LIST_EMPTY(alldepartments) /datum/fax var/data var/list/photo_list + var/paper_name -/datum/fax/New(data, photo_list) +/datum/fax/New(new_data, new_photo_list, new_name) . = ..() - src.data = data - src.photo_list = photo_list + data = new_data + photo_list = new_photo_list + if(new_name != "paper") + paper_name = new_name + + + +/obj/structure/machinery/faxmachine/proc/is_department_responder_awake(target_department) + if(!(target_department in HIGHCOM_DEPARTMENTS)) + return FALSE + var/target_job = JOB_FAX_RESPONDER + switch(target_department) + if(DEPARTMENT_CLF) + target_job = JOB_FAX_RESPONDER_CLF + if(DEPARTMENT_CMB) + target_job = JOB_FAX_RESPONDER_CMB + if(DEPARTMENT_HC) + target_job = JOB_FAX_RESPONDER_USCM_HC + if(DEPARTMENT_PRESS) + target_job = JOB_FAX_RESPONDER_PRESS + if(DEPARTMENT_PROVOST) + target_job = JOB_FAX_RESPONDER_USCM_PVST + if(DEPARTMENT_TWE) + target_job = JOB_FAX_RESPONDER_TWE + if(DEPARTMENT_UPP) + target_job = JOB_FAX_RESPONDER_UPP + if(DEPARTMENT_WY) + target_job = JOB_FAX_RESPONDER_WY + + for(var/mob/living/carbon/human/responder in SSticker.mode.fax_responders) + if(!(responder.stat) && (responder.job == target_job)) + return TRUE + return FALSE diff --git a/code/game/machinery/nuclearbomb.dm b/code/game/machinery/nuclearbomb.dm index 42b5d95694cb..1ee8cfd66e70 100644 --- a/code/game/machinery/nuclearbomb.dm +++ b/code/game/machinery/nuclearbomb.dm @@ -576,7 +576,7 @@ GLOBAL_VAR_INIT(bomb_set, FALSE) hive = GLOB.hive_datum[hivenumber] if(!length(hive.totalXenos)) return - xeno_announcement(SPAN_XENOANNOUNCE("We get a sense of impending doom... the hive killer is ready to be activated."), hive.hivenumber, XENO_GENERAL_ANNOUNCE) + xeno_announcement(SPAN_XENOANNOUNCE("We get a sense of impending doom... the hive killer is ready to be activated. Our only chance now is to disable the device itself."), hive.hivenumber, XENO_GENERAL_ANNOUNCE) return announcement_helper("DECRYPTION IN [floor(decryption_time/10)] SECONDS.", "[MAIN_AI_SYSTEM] Nuclear Tracker", humans_uscm, 'sound/misc/notice1.ogg') @@ -609,7 +609,7 @@ GLOBAL_VAR_INIT(bomb_set, FALSE) hive = GLOB.hive_datum[hivenumber] if(!length(hive.totalXenos)) continue - xeno_announcement(SPAN_XENOANNOUNCE("The tallhosts have started the initial phase of a hive killer at [get_area_name(loc)]! Destroy their communications relays!"), hive.hivenumber, XENO_GENERAL_ANNOUNCE) + xeno_announcement(SPAN_XENOANNOUNCE("The tallhosts have started the initial phase of a hive killer at [get_area_name(loc)]! You have about [time_left] to destroy at least one of their communications relays!"), hive.hivenumber, XENO_GENERAL_ANNOUNCE) return announcement_helper("ALERT.\n\nNUCLEAR EXPLOSIVE DECRYPTION HALTED.", "[MAIN_AI_SYSTEM] Nuclear Tracker", humans_uscm, 'sound/misc/notice1.ogg') diff --git a/code/game/machinery/robot_fabricator.dm b/code/game/machinery/robot_fabricator.dm index e0cc2b0c3a02..a3bded9fe962 100644 --- a/code/game/machinery/robot_fabricator.dm +++ b/code/game/machinery/robot_fabricator.dm @@ -112,7 +112,7 @@ Please wait until completion...
build_cost = 75000 var/building = build_type - if (building in subtypesof(/obj/item/robot_parts) + /obj/item/fake_robot_head) + if (building in (subtypesof(/obj/item/robot_parts) + /obj/item/fake_robot_head)) if (src.metal_amount >= build_cost) src.operating = 1 src.update_use_power(USE_POWER_ACTIVE) diff --git a/code/game/machinery/vending/cm_vending.dm b/code/game/machinery/vending/cm_vending.dm index f2f4c2fbda61..0e27e804d12a 100644 --- a/code/game/machinery/vending/cm_vending.dm +++ b/code/game/machinery/vending/cm_vending.dm @@ -833,6 +833,8 @@ GLOBAL_LIST_EMPTY(vending_products) .["theme"] = VENDOR_THEME_UPP if(FACTION_CLF) .["theme"] = VENDOR_THEME_CLF + if(FACTION_YAUTJA) + .["theme"] = VENDOR_THEME_YAUTJA .["show_points"] = show_points | use_snowflake_points /obj/structure/machinery/cm_vending/ui_assets(mob/user) diff --git a/code/game/machinery/vending/vending_types.dm b/code/game/machinery/vending/vending_types.dm index 85d08641bfdf..e3d95f192e2d 100644 --- a/code/game/machinery/vending/vending_types.dm +++ b/code/game/machinery/vending/vending_types.dm @@ -277,8 +277,8 @@ ) /obj/structure/machinery/vending/sea - name = "\improper SeaTech" - desc = "An equipment vendor designed to save lives" + name = "\improper SEATech" + desc = "An equipment vendor designed to save lives." product_ads = "Semper Fi!;First to Fight!;Ooh Rah.;Leathernecks!;The Few. The Proud.;Esprit de Corps;Jarhead.;Devil Dogs." icon_state = "sec" icon_deny = "sec-deny" diff --git a/code/game/machinery/vending/vendor_types/antag/antag_clothing.dm b/code/game/machinery/vending/vendor_types/antag/antag_clothing.dm index 85210e1aaa3f..a282173ef66a 100644 --- a/code/game/machinery/vending/vendor_types/antag/antag_clothing.dm +++ b/code/game/machinery/vending/vendor_types/antag/antag_clothing.dm @@ -100,3 +100,174 @@ /obj/item/storage/large_holster/katana/full, /obj/item/storage/large_holster/machete/full, ) + +//------UPP Synthetic Snowflake------ + +/obj/structure/machinery/cm_vending/clothing/synth/upp + name = "\improper UPP Synthetic Conformity Unit" + desc = "A vendor with a large snowflake on it. Stolen from Wey-Yu Fashion Division." + icon_state = "snowflake" + show_points = TRUE + use_snowflake_points = TRUE + vendor_theme = VENDOR_THEME_UPP + req_access = list(ACCESS_UPP_LEADERSHIP) + vendor_role = list(JOB_SYNTH, JOB_SYNTH_SURVIVOR, JOB_WORKING_JOE, JOB_UPP_SUPPORT_SYNTH, JOB_UPP_COMBAT_SYNTH, JOB_CMB_SYN, JOB_PMC_SYNTH) + + vend_delay = 1 SECONDS + +/obj/structure/machinery/cm_vending/clothing/synth/upp/get_listed_products(mob/user) + return GLOB.cm_vending_clothing_synth_upp + +//------------UPP SNOWFLAKE VENDOR--------------- + +GLOBAL_LIST_INIT(cm_vending_clothing_synth_upp, list( + list("UPP FATIGUES", 0, null, null, null), + list("UPP Soldier Fatigues", 12, /obj/item/clothing/under/marine/veteran/UPP, null, VENDOR_ITEM_REGULAR), + list("UPP Engineer Fatigues", 12, /obj/item/clothing/under/marine/veteran/UPP/engi, null, VENDOR_ITEM_REGULAR), + list("UPP Medic Fatigues", 12, /obj/item/clothing/under/marine/veteran/UPP/medic, null, VENDOR_ITEM_REGULAR), + list("UPP MP Fatigues", 12, /obj/item/clothing/under/marine/veteran/UPP/mp, null, VENDOR_ITEM_REGULAR), + list("UPP Officer Fatigues", 12, /obj/item/clothing/under/marine/veteran/UPP/officer, null, VENDOR_ITEM_REGULAR), + + list("NON-STANDARD UNIFORMS", 0, null, null, null), + list("UPP Civilian-style overalls, Orange", 12, /obj/item/clothing/under/marine/veteran/UPP/civi1, null, VENDOR_ITEM_REGULAR), + list("UPP Civilian-style overalls, Tan", 12, /obj/item/clothing/under/marine/veteran/UPP/civi2, null, VENDOR_ITEM_REGULAR), + list("UPP Civilian-style shirt and pants", 12, /obj/item/clothing/under/marine/veteran/UPP/civi3, null, VENDOR_ITEM_REGULAR), + list("UPP Civilian-style vest and pants", 12, /obj/item/clothing/under/marine/veteran/UPP/civi4, null, VENDOR_ITEM_REGULAR), + list("Medical Scrubs, Blue", 12, /obj/item/clothing/under/rank/medical/blue, null, VENDOR_ITEM_REGULAR), + list("Medical Scrubs, Light Blue", 12, /obj/item/clothing/under/rank/medical/lightblue, null, VENDOR_ITEM_REGULAR), + list("Medical Scrubs, Green", 12, /obj/item/clothing/under/rank/medical/green, null, VENDOR_ITEM_REGULAR), + list("Medical Scrubs, Purple", 12, /obj/item/clothing/under/rank/medical/purple, null, VENDOR_ITEM_REGULAR), + list("Medical Scrubs, Olive", 12, /obj/item/clothing/under/rank/medical/olive, null, VENDOR_ITEM_REGULAR), + list("Medical Scrubs, Grey", 12, /obj/item/clothing/under/rank/medical/grey, null, VENDOR_ITEM_REGULAR), + list("Medical Scrubs, White", 12, /obj/item/clothing/under/rank/medical, null, VENDOR_ITEM_REGULAR), + list("White T-Shirt and Brown Jeans", 12, /obj/item/clothing/under/tshirt/w_br, null, VENDOR_ITEM_REGULAR), + list("Gray T-Shirt and Blue Jeans", 12, /obj/item/clothing/under/tshirt/gray_blu, null, VENDOR_ITEM_REGULAR), + list("Red T-Shirt and Black Jeans", 12, /obj/item/clothing/under/tshirt/r_bla, null, VENDOR_ITEM_REGULAR), + list("Frontier Jumpsuit", 12, /obj/item/clothing/under/rank/synthetic/frontier, null, VENDOR_ITEM_REGULAR), + list("Grey Utilities", 12, /obj/item/clothing/under/rank/synthetic/utility/yellow, null, VENDOR_ITEM_REGULAR), + list("Grey Utilities and Blue Jeans", 12, /obj/item/clothing/under/rank/synthetic/utility/red, null, VENDOR_ITEM_REGULAR), + list("Blue Utilities and Brown Jeans", 12, /obj/item/clothing/under/rank/synthetic/utility/blue, null, VENDOR_ITEM_REGULAR), + list("White Service Uniform", 12, /obj/item/clothing/under/colonist/white_service, null, VENDOR_ITEM_REGULAR), + list("Steward Clothes", 12, /obj/item/clothing/under/colonist/wy_joliet_shopsteward, null, VENDOR_ITEM_REGULAR), + list("Red Dress Skirt", 12, /obj/item/clothing/under/blackskirt, null, VENDOR_ITEM_REGULAR), + list("Blue Suit Pants", 12, /obj/item/clothing/under/liaison_suit/blue, null, VENDOR_ITEM_REGULAR), + list("Brown Suit Pants", 12, /obj/item/clothing/under/liaison_suit/brown, null, VENDOR_ITEM_REGULAR), + list("White Suit Pants", 12, /obj/item/clothing/under/liaison_suit/corporate_formal, null, VENDOR_ITEM_REGULAR), + list("Working Joe Uniform", 36, /obj/item/clothing/under/rank/synthetic/joe, null, VENDOR_ITEM_REGULAR), + + list("GLASSES", 0, null, null, null), + list("HealthMate HUD", 12, /obj/item/clothing/glasses/hud/health, null, VENDOR_ITEM_REGULAR), + list("Marine RPG Glasses", 12, /obj/item/clothing/glasses/regular, null, VENDOR_ITEM_REGULAR), + list("Optical Meson Scanner", 12, /obj/item/clothing/glasses/meson, null, VENDOR_ITEM_REGULAR), + list("PatrolMate HUD", 12, /obj/item/clothing/glasses/hud/security, null, VENDOR_ITEM_REGULAR), + list("Security HUD Glasses", 12, /obj/item/clothing/glasses/sunglasses/sechud, null, VENDOR_ITEM_REGULAR), + list("Sunglasses", 12, /obj/item/clothing/glasses/sunglasses, null, VENDOR_ITEM_REGULAR), + list("Welding Goggles", 12, /obj/item/clothing/glasses/welding, null, VENDOR_ITEM_REGULAR), + + list("SHOES", 0, null, null, null), + list("UPP Boots", 12, /obj/item/clothing/shoes/marine/upp/knife, null, VENDOR_ITEM_REGULAR), + list("Shoes, Black", 12, /obj/item/clothing/shoes/black, null, VENDOR_ITEM_REGULAR), + list("Shoes, Blue", 12, /obj/item/clothing/shoes/blue, null, VENDOR_ITEM_REGULAR), + list("Shoes, Brown", 12, /obj/item/clothing/shoes/brown, null, VENDOR_ITEM_REGULAR), + list("Shoes, Green", 12, /obj/item/clothing/shoes/green, null, VENDOR_ITEM_REGULAR), + list("Shoes, Purple", 12, /obj/item/clothing/shoes/purple, null, VENDOR_ITEM_REGULAR), + list("Shoes, Red", 12, /obj/item/clothing/shoes/red, null, VENDOR_ITEM_REGULAR), + list("Shoes, White", 12, /obj/item/clothing/shoes/white, null, VENDOR_ITEM_REGULAR), + list("Shoes, Yellow", 12, /obj/item/clothing/shoes/yellow, null, VENDOR_ITEM_REGULAR), + list("Shoes, Seegson", 24, /obj/item/clothing/shoes/dress, null, VENDOR_ITEM_REGULAR), + + list("HEADWEAR", 0, null, null, null), + list("UL2 cap", 12, /obj/item/clothing/head/uppcap, null, VENDOR_ITEM_REGULAR), + list("UL2c cap", 12, /obj/item/clothing/head/uppcap/civi, null, VENDOR_ITEM_REGULAR), + list("UL3 peaked cap", 12, /obj/item/clothing/head/uppcap/peaked, null, VENDOR_ITEM_REGULAR), + list("UL8 ushanka", 12, /obj/item/clothing/head/uppcap/ushanka, null, VENDOR_ITEM_REGULAR), + list("UL8c ushanka", 12, /obj/item/clothing/head/uppcap/ushanka/civi, null, VENDOR_ITEM_REGULAR), + list("Surgical Cap, Blue", 12, /obj/item/clothing/head/surgery/blue, null, VENDOR_ITEM_REGULAR), + list("Surgical Cap, Blue", 12, /obj/item/clothing/head/surgery/purple, null, VENDOR_ITEM_REGULAR), + list("Surgical Cap, Green", 12, /obj/item/clothing/head/surgery/green, null, VENDOR_ITEM_REGULAR), + list("Beanie", 12, /obj/item/clothing/head/beanie, null, VENDOR_ITEM_REGULAR), + list("Beret, Engineering", 12, /obj/item/clothing/head/beret/eng, null, VENDOR_ITEM_REGULAR), + list("Beret, Purple", 12, /obj/item/clothing/head/beret/jan, null, VENDOR_ITEM_REGULAR), + list("Beret, Red", 12, /obj/item/clothing/head/beret/cm/red, null, VENDOR_ITEM_REGULAR), + list("Beret, Standard", 12, /obj/item/clothing/head/beret/cm, null, VENDOR_ITEM_REGULAR), + list("Beret, Tan", 12, /obj/item/clothing/head/beret/cm/tan, null, VENDOR_ITEM_REGULAR), + list("Beret, Green", 12, /obj/item/clothing/head/beret/cm, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), + list("Beret, Black", 12, /obj/item/clothing/head/beret/cm/black, null, VENDOR_ITEM_REGULAR), + list("Beret, White", 12, /obj/item/clothing/head/beret/cm/white, null, VENDOR_ITEM_REGULAR), + list("Bio Hood", 12, /obj/item/clothing/head/bio_hood/synth, null, VENDOR_ITEM_REGULAR), + list("Fedora", 12, /obj/item/clothing/head/fedora, null, VENDOR_ITEM_REGULAR), + + list("HELMET", 0, null, null, null), + list("UM4 Helmet", 12, /obj/item/clothing/head/helmet/marine/veteran/UPP, null, VENDOR_ITEM_REGULAR), + list("White Corpsman Helmet (Non-Standard)", 12, /obj/item/clothing/head/helmet/marine/medic/white, null, VENDOR_ITEM_REGULAR), + list("Attachable Helmet Shield", 12, /obj/item/prop/helmetgarb/riot_shield, null, VENDOR_ITEM_REGULAR), + + list("MASK", 0, null, null, null), + list("Surgical Mask", 12, /obj/item/clothing/mask/surgical, null, VENDOR_ITEM_REGULAR), + list("Rebreather", 12, /obj/item/clothing/mask/rebreather, null, VENDOR_ITEM_REGULAR), + list("Skull Balaclava, Blue", 12, /obj/item/clothing/mask/rebreather/skull, null, VENDOR_ITEM_REGULAR), + list("Skull balaclava, Black", 12, /obj/item/clothing/mask/rebreather/skull/black, null, VENDOR_ITEM_REGULAR), + list("Balaclava", 12, /obj/item/clothing/mask/rebreather/scarf, null, VENDOR_ITEM_REGULAR), + list("Balaclava (Green)", 12, /obj/item/clothing/mask/rebreather/scarf/green, null, VENDOR_ITEM_REGULAR), + list("Balaclava (Tan)", 12, /obj/item/clothing/mask/rebreather/scarf/tan, null, VENDOR_ITEM_REGULAR), + list("Balaclava (Grey)", 12, /obj/item/clothing/mask/rebreather/scarf/gray, null, VENDOR_ITEM_REGULAR), + list("Wrap (Grey)", 12, /obj/item/clothing/mask/rebreather/scarf/tacticalmask, null, VENDOR_ITEM_REGULAR), + list("Wrap (Red)", 12, /obj/item/clothing/mask/rebreather/scarf/tacticalmask/red, null, VENDOR_ITEM_REGULAR), + list("Wrap (Green)", 12, /obj/item/clothing/mask/rebreather/scarf/tacticalmask/green, null, VENDOR_ITEM_REGULAR), + list("Wrap (Tan)", 12, /obj/item/clothing/mask/rebreather/scarf/tacticalmask/tan, null, VENDOR_ITEM_REGULAR), + list("Wrap (Black)", 12, /obj/item/clothing/mask/rebreather/scarf/tacticalmask/black, null, VENDOR_ITEM_REGULAR), + list("Scarf", 12, /obj/item/clothing/mask/tornscarf, null, VENDOR_ITEM_REGULAR), + list("Scarf (Green)", 12, /obj/item/clothing/mask/tornscarf/green, null, VENDOR_ITEM_REGULAR), + list("Scarf (Snow)", 12, /obj/item/clothing/mask/tornscarf/snow, null, VENDOR_ITEM_REGULAR), + list("Scarf (Desert)", 12, /obj/item/clothing/mask/tornscarf/desert, null, VENDOR_ITEM_REGULAR), + list("Scarf (Urban)", 12, /obj/item/clothing/mask/tornscarf/urban, null, VENDOR_ITEM_REGULAR), + list("Scarf (Black)", 12, /obj/item/clothing/mask/tornscarf/black, null, VENDOR_ITEM_REGULAR), + + list("SUIT", 0, null, null, null), + list("Bomber Jacket, Brown", 12, /obj/item/clothing/suit/storage/bomber, null, VENDOR_ITEM_REGULAR), + list("Bomber Jacket, Black", 12, /obj/item/clothing/suit/storage/bomber/alt, null, VENDOR_ITEM_REGULAR), + list("External Webbing", 12, /obj/item/clothing/suit/storage/webbing, null, VENDOR_ITEM_REGULAR), + list("Utility Vest", 12, /obj/item/clothing/suit/storage/utility_vest, null, VENDOR_ITEM_REGULAR), + list("Hazard Vest(Orange)", 12, /obj/item/clothing/suit/storage/hazardvest, null, VENDOR_ITEM_REGULAR), + list("Hazard Vest(Blue)", 12, /obj/item/clothing/suit/storage/hazardvest/blue, null, VENDOR_ITEM_REGULAR), + list("Hazard Vest(Yellow)", 12, /obj/item/clothing/suit/storage/hazardvest/yellow, null, VENDOR_ITEM_REGULAR), + list("Hazard Vest(Black)", 12, /obj/item/clothing/suit/storage/hazardvest/black, null, VENDOR_ITEM_REGULAR), + list("Synthetic's Snow Suit", 12, /obj/item/clothing/suit/storage/snow_suit/synth, null, VENDOR_ITEM_REGULAR), + list("Windbreaker, Brown", 12, /obj/item/clothing/suit/storage/windbreaker/windbreaker_brown, null, VENDOR_ITEM_REGULAR), + list("Windbreaker, Grey", 12, /obj/item/clothing/suit/storage/windbreaker/windbreaker_gray, null, VENDOR_ITEM_REGULAR), + list("Windbreaker, Green", 12, /obj/item/clothing/suit/storage/windbreaker/windbreaker_green, null, VENDOR_ITEM_REGULAR), + list("Windbreaker, First Responder", 12, /obj/item/clothing/suit/storage/windbreaker/windbreaker_fr, null, VENDOR_ITEM_REGULAR), + list("Windbreaker, Exploration", 12, /obj/item/clothing/suit/storage/windbreaker/windbreaker_covenant, null, VENDOR_ITEM_REGULAR), + list("Labcoat", 12, /obj/item/clothing/suit/storage/labcoat, null, VENDOR_ITEM_REGULAR), + list("Labcoat, Researcher", 12, /obj/item/clothing/suit/storage/labcoat/researcher, null, VENDOR_ITEM_REGULAR), + list("Quartermaster Jacket", 12, /obj/item/clothing/suit/storage/jacket/marine/RO, null, VENDOR_ITEM_REGULAR), + list("Bio Suit", 12, /obj/item/clothing/suit/storage/synthbio, null, VENDOR_ITEM_REGULAR), + list("Black Suit Jacket", 12, /obj/item/clothing/suit/storage/jacket/marine/corporate/black, null, VENDOR_ITEM_REGULAR), + list("Brown Suit Jacket", 12, /obj/item/clothing/suit/storage/jacket/marine/corporate/brown, null, VENDOR_ITEM_REGULAR), + list("Blue Suit Jacket", 12, /obj/item/clothing/suit/storage/jacket/marine/corporate/blue, null, VENDOR_ITEM_REGULAR), + list("Brown Vest", 12, /obj/item/clothing/suit/storage/jacket/marine/vest, null, VENDOR_ITEM_REGULAR), + list("Tan Vest", 12, /obj/item/clothing/suit/storage/jacket/marine/vest/tan, null, VENDOR_ITEM_REGULAR), + list("Grey Vest", 12, /obj/item/clothing/suit/storage/jacket/marine/vest/grey, null, VENDOR_ITEM_REGULAR), + + list("BACKPACK", 0, null, null, null), + list("Combat Pack", 12, /obj/item/storage/backpack/lightpack/upp, VENDOR_ITEM_REGULAR), + list("UPP Sapper Welderpack", 12, /obj/item/storage/backpack/marine/engineerpack/upp, VENDOR_ITEM_REGULAR), + list("Satchel, Leather", 12, /obj/item/storage/backpack/satchel, null, VENDOR_ITEM_REGULAR), + list("Satchel, Medical", 12, /obj/item/storage/backpack/satchel/med, null, VENDOR_ITEM_REGULAR), + + list("OTHER", 0, null, null, null), + list("UPP patch", 6, /obj/item/clothing/accessory/patch/upp, null, VENDOR_ITEM_REGULAR), + list("UPP Naval Infantry patch", 6, /obj/item/clothing/accessory/patch/upp/naval, null, VENDOR_ITEM_REGULAR), + list("UPP Airborne Reconnaissance patch", 6, /obj/item/clothing/accessory/patch/upp/airborne, null, VENDOR_ITEM_REGULAR), + list("Red Armband", 6, /obj/item/clothing/accessory/armband, null, VENDOR_ITEM_REGULAR), + list("Purple Armband", 6, /obj/item/clothing/accessory/armband/science, null, VENDOR_ITEM_REGULAR), + list("Yellow Armband", 6, /obj/item/clothing/accessory/armband/engine, null, VENDOR_ITEM_REGULAR), + list("Green Armband", 6, /obj/item/clothing/accessory/armband/medgreen, null, VENDOR_ITEM_REGULAR), + list("Blue Tie", 6, /obj/item/clothing/accessory/blue, null, VENDOR_ITEM_REGULAR), + list("Green Tie", 6, /obj/item/clothing/accessory/green, null, VENDOR_ITEM_REGULAR), + list("Black Tie", 6, /obj/item/clothing/accessory/black, null, VENDOR_ITEM_REGULAR), + list("Gold Tie", 6, /obj/item/clothing/accessory/gold, null, VENDOR_ITEM_REGULAR), + list("Red Tie", 6, /obj/item/clothing/accessory/red, null, VENDOR_ITEM_REGULAR), + list("Purple Tie", 6, /obj/item/clothing/accessory/purple, null, VENDOR_ITEM_REGULAR), + list("Dress Gloves", 6, /obj/item/clothing/gloves/marine/dress, null, VENDOR_ITEM_REGULAR), +)) diff --git a/code/game/machinery/vending/vendor_types/antag/antag_gear.dm b/code/game/machinery/vending/vendor_types/antag/antag_gear.dm index 3e847b4919de..68d3edd98f35 100644 --- a/code/game/machinery/vending/vendor_types/antag/antag_gear.dm +++ b/code/game/machinery/vending/vendor_types/antag/antag_gear.dm @@ -46,13 +46,7 @@ /obj/item/roller, /obj/item/tool/surgery/surgical_line, /obj/item/tool/surgery/synthgraft, - ) - -/obj/effect/essentials_set/upp_heavy - spawned_gear_list = list( - /obj/item/weapon/gun/pkp, - /obj/item/ammo_magazine/pkp, - /obj/item/ammo_magazine/pkp, + /obj/structure/bed/medevac_stretcher/upp, ) /obj/effect/essentials_set/leader/upp diff --git a/code/game/machinery/vending/vendor_types/antag/antag_guns_snowflake.dm b/code/game/machinery/vending/vendor_types/antag/antag_guns_snowflake.dm index 73a2c7346a4c..87f1469ec574 100644 --- a/code/game/machinery/vending/vendor_types/antag/antag_guns_snowflake.dm +++ b/code/game/machinery/vending/vendor_types/antag/antag_guns_snowflake.dm @@ -36,14 +36,6 @@ //--------------ESSENTIALS------------------------ -/obj/effect/essentials_set/medic/upp - spawned_gear_list = list( - /obj/item/bodybag/cryobag, - /obj/item/device/defibrillator, - /obj/item/storage/firstaid/adv, - /obj/item/device/healthanalyzer, - /obj/item/roller, - ) /obj/effect/essentials_set/upp_heavy spawned_gear_list = list( @@ -52,6 +44,13 @@ /obj/item/ammo_magazine/minigun, ) +/obj/effect/essentials_set/upp_heavy_pkp + spawned_gear_list = list( + /obj/item/weapon/gun/pkp, + /obj/item/ammo_magazine/pkp, + /obj/item/ammo_magazine/pkp, + ) + /obj/effect/essentials_set/leader/upp spawned_gear_list = list( /obj/item/explosive/plastic, diff --git a/code/game/machinery/vending/vendor_types/antag/antag_guns_sorted.dm b/code/game/machinery/vending/vendor_types/antag/antag_guns_sorted.dm index ab319f1eca1d..052cd6d82b21 100644 --- a/code/game/machinery/vending/vendor_types/antag/antag_guns_sorted.dm +++ b/code/game/machinery/vending/vendor_types/antag/antag_guns_sorted.dm @@ -7,6 +7,8 @@ req_one_access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_UPP_GENERAL, ACCESS_CLF_GENERAL) req_access = null listed_products = list() + use_points = FALSE + use_snowflake_points = FALSE /obj/structure/machinery/cm_vending/sorted/cargo_guns/antag_guns/Initialize() . = ..() diff --git a/code/game/machinery/vending/vendor_types/antag/antag_predator.dm b/code/game/machinery/vending/vendor_types/antag/antag_predator.dm new file mode 100644 index 000000000000..f4bb17cd35a8 --- /dev/null +++ b/code/game/machinery/vending/vendor_types/antag/antag_predator.dm @@ -0,0 +1,212 @@ +GLOBAL_LIST_INIT(cm_vending_equipment_yautja, list( + list("Essential Hunting Supplies", 0, null, null, null), + list("Hunting Equipment", 0, list(/obj/item/clothing/under/chainshirt/hunter, /obj/item/storage/backpack/yautja, /obj/item/storage/medicomp/full, /obj/item/device/yautja_teleporter), MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), + list("Armor", 0, list(/obj/item/clothing/suit/armor/yautja/hunter, /obj/item/clothing/mask/gas/yautja/hunter, /obj/item/clothing/accessory/mask, /obj/item/clothing/shoes/yautja/hunter/knife), MARINE_CAN_BUY_COMBAT_ARMOR, VENDOR_ITEM_MANDATORY), + + list("Main Weapons (CHOOSE 1)", 0, null, null, null), + list("The Primary Hunting Sword", 0, /obj/item/weapon/yautja/sword, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED), + list("The Rending Hunting Sword", 0, /obj/item/weapon/yautja/sword/alt_1, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED), + list("The Piercing Hunting Sword", 0, /obj/item/weapon/yautja/sword/alt_2, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED), + list("The Severing Hunting Sword", 0, /obj/item/weapon/yautja/sword/alt_3, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED), + list("The Taruulan Staff", 0, /obj/item/weapon/yautja/sword/staff, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED), + list("The Sundering Chain-Whip", 0, /obj/item/weapon/yautja/chain, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED), + list("The Cleaving War-Scythe", 0, /obj/item/weapon/yautja/scythe, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED), + list("The Ripping War-Scythe", 0, /obj/item/weapon/yautja/scythe/alt, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED), + list("The Adaptive Combi-Stick", 0, /obj/item/weapon/yautja/chained/combistick, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED), + list("The Butchering War Axe", 0, /obj/item/weapon/yautja/chained/war_axe, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED), + list("The Lumbering Glaive", 0, /obj/item/weapon/twohanded/yautja/glaive, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED), + list("The Imposing Glaive", 0, /obj/item/weapon/twohanded/yautja/glaive/alt, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED), + list("The Crushing Longaxe", 0, /obj/item/weapon/twohanded/yautja/glaive/longaxe, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED), + + list("Bracer Attachments", 0, null, null, null), + list("Wrist Blades", 0,list(/obj/item/bracer_attachments/wristblades, /obj/item/bracer_attachments/wristblades), MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_MANDATORY), + list("The Fearsome Scimitars", 0, list(/obj/item/bracer_attachments/scimitars, /obj/item/bracer_attachments/scimitars), MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED), + list("The Skewering Scimitars", 0, list(/obj/item/bracer_attachments/scimitars_alt, /obj/item/bracer_attachments/scimitars_alt), MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED), + + list("Secondary Equipment (CHOOSE 2)", 0, null, null, null), + list("The Fleeting Spike Launcher", 0, /obj/item/weapon/gun/launcher/spike, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("The Swift Plasma Pistol", 0, /obj/item/weapon/gun/energy/yautja/plasmapistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("The Agile Drone", 0, /obj/item/falcon_drone, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("The Purifying Smart-Disc", 0, /obj/item/explosive/grenade/spawnergrenade/smartdisc, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("The Steadfast Shield", 0, /obj/item/weapon/shield/riot/yautja, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + + list("Clothing Accessory (CHOOSE 1)", 0, null, null, null), + list("Third-Cape", 0, /obj/item/clothing/yautja_cape/third, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Half-Cape", 0, /obj/item/clothing/yautja_cape/half, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Quarter-Cape", 0, /obj/item/clothing/yautja_cape/quarter, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Poncho", 0, /obj/item/clothing/yautja_cape/poncho, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + )) + +GLOBAL_LIST_INIT(cm_vending_elder_yautja, list( + list("Essential Hunting Supplies", 0, null, null, null), + list("Hunting Equipment", 0, list(/obj/item/clothing/under/chainshirt/hunter, /obj/item/storage/backpack/yautja, /obj/item/storage/medicomp/full, /obj/item/device/yautja_teleporter), MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), + list("Armor", 0, list(/obj/item/clothing/suit/armor/yautja/hunter, /obj/item/clothing/mask/gas/yautja/hunter, /obj/item/clothing/accessory/mask, /obj/item/clothing/shoes/yautja/hunter/knife), MARINE_CAN_BUY_COMBAT_ARMOR, VENDOR_ITEM_MANDATORY), + + list("Main Weapons (CHOOSE 1)", 0, null, null, null), + list("The Primary Hunting Sword", 0, /obj/item/weapon/yautja/sword, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED), + list("The Rending Hunting Sword", 0, /obj/item/weapon/yautja/sword/alt_1, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED), + list("The Piercing Hunting Sword", 0, /obj/item/weapon/yautja/sword/alt_2, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED), + list("The Severing Hunting Sword", 0, /obj/item/weapon/yautja/sword/alt_3, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED), + list("The Sundering Chain-Whip", 0, /obj/item/weapon/yautja/chain, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED), + list("The Cleaving War-Scythe", 0, /obj/item/weapon/yautja/scythe, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED), + list("The Ripping War-Scythe", 0, /obj/item/weapon/yautja/scythe/alt, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED), + list("The Adaptive Combi-Stick", 0, /obj/item/weapon/yautja/chained/combistick, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED), + list("The Butchering War Axe", 0, /obj/item/weapon/yautja/chained/war_axe, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED), + list("The Lumbering Glaive", 0, /obj/item/weapon/twohanded/yautja/glaive, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED), + list("The Imposing Glaive", 0, /obj/item/weapon/twohanded/yautja/glaive/alt, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED), + + list("Bracer Attachments", 0, null, null, null), + list("Wrist Blades", 0,list(/obj/item/bracer_attachments/wristblades, /obj/item/bracer_attachments/wristblades), MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_MANDATORY), + list("The Fearsome Scimitars", 0, list(/obj/item/bracer_attachments/scimitars, /obj/item/bracer_attachments/scimitars), MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED), + list("The Skewering Scimitars", 0, list(/obj/item/bracer_attachments/scimitars_alt, /obj/item/bracer_attachments/scimitars_alt), MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED), + + list("Secondary Equipment (CHOOSE 2)", 0, null, null, null), + list("The Fleeting Spike Launcher", 0, /obj/item/weapon/gun/launcher/spike, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("The Swift Plasma Pistol", 0, /obj/item/weapon/gun/energy/yautja/plasmapistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("The Agile Drone", 0, /obj/item/falcon_drone, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("The Purifying Smart-Disc", 0, /obj/item/explosive/grenade/spawnergrenade/smartdisc, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("The Steadfast Shield", 0, /obj/item/weapon/shield/riot/yautja, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + + list("Clothing Accessory (CHOOSE 1)", 0, null, null, null), + list("Third-Cape", 0, /obj/item/clothing/yautja_cape/third, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Half-Cape", 0, /obj/item/clothing/yautja_cape/half, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Quarter-Cape", 0, /obj/item/clothing/yautja_cape/quarter, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Poncho", 0, /obj/item/clothing/yautja_cape/poncho, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Damaged-Cape", 0, /obj/item/clothing/yautja_cape/damaged, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Ceremonial Cape", 0, /obj/item/clothing/yautja_cape/ceremonial, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Full-Cape", 0, /obj/item/clothing/yautja_cape, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + )) + +/obj/structure/machinery/cm_vending/clothing/yautja + name = "\improper Yautja Hunting Gear Rack" + desc = "A gear rack for hunting." + icon = 'icons/obj/items/hunter/pred_vendor.dmi' + icon_state = "pred_vendor_left" + req_access = list(ACCESS_YAUTJA_SECURE) + vendor_role = list(JOB_PREDATOR) + show_points = FALSE + vendor_theme = VENDOR_THEME_YAUTJA + +/obj/structure/machinery/cm_vending/clothing/yautja/can_access_to_vend(mob/user, display = TRUE, ignore_hack = FALSE) + if(!allowed(user)) + if(display) + to_chat(user, SPAN_WARNING("Access denied.")) + vend_fail() + return FALSE + + if(LAZYLEN(vendor_role) && !vendor_role.Find(user.job)) + if(display) + to_chat(user, SPAN_WARNING("This machine isn't for you.")) + vend_fail() + return FALSE + return TRUE + +/obj/structure/machinery/cm_vending/clothing/yautja/left_centre + icon_state = "pred_vendor_lcenter" + +/obj/structure/machinery/cm_vending/clothing/yautja/centre + icon_state = "pred_vendor_centre" + +/obj/structure/machinery/cm_vending/clothing/yautja/right_centre + icon_state = "pred_vendor_rcentre" + +/obj/structure/machinery/cm_vending/clothing/yautja/right + icon_state = "pred_vendor_right" + +/obj/structure/machinery/cm_vending/clothing/yautja/get_listed_products(mob/user) + return GLOB.cm_vending_equipment_yautja + +/obj/structure/machinery/cm_vending/clothing/yautja/elder + name = "\improper Yautja Elder Hunting Gear Rack" + icon_state = "pred_vendor_elder_left" + req_access = list(ACCESS_YAUTJA_ELITE) + +/obj/structure/machinery/cm_vending/clothing/yautja/elder/right + icon_state = "pred_vendor_elder_right" + +/obj/structure/machinery/cm_vending/clothing/yautja/elder/get_listed_products(mob/user) + return GLOB.cm_vending_elder_yautja + +//Armour Prefs +/obj/item/clothing/suit/armor/yautja/post_vendor_spawn_hook(mob/living/carbon/human/user) + if(!user?.client?.prefs) + return + var/client/mob_client = user.client + + if(mob_client.prefs.predator_use_legacy != "None") + switch(mob_client.prefs.predator_use_legacy) + if("dragon") + icon_state = "halfarmor_elder_tr" + LAZYSET(item_state_slots, WEAR_JACKET, "halfarmor_elder_tr") + if("swamp") + icon_state = "halfarmor_elder_joshuu" + LAZYSET(item_state_slots, WEAR_JACKET, "halfarmor_elder_joshuu") + if("enforcer") + icon_state = "halfarmor_elder_feweh" + LAZYSET(item_state_slots, WEAR_JACKET, "halfarmor_elder_feweh") + if("collector") + icon_state = "halfarmor_elder_n" + LAZYSET(item_state_slots, WEAR_JACKET, "halfarmor_elder_n") + user.update_inv_wear_suit() + return + + icon_state = "halfarmor[mob_client.prefs.predator_armor_type]_[mob_client.prefs.predator_armor_material]" + LAZYSET(item_state_slots, WEAR_JACKET, "halfarmor[mob_client.prefs.predator_armor_type]_[mob_client.prefs.predator_armor_material]") + user.update_inv_wear_suit() + +//Mask Prefs +/obj/item/clothing/mask/gas/yautja/hunter/post_vendor_spawn_hook(mob/living/carbon/human/user) + if(!user?.client?.prefs) + return + var/client/mob_client = user.client + + if(mob_client.prefs.predator_use_legacy != "None") + switch(mob_client.prefs.predator_use_legacy) + if("Dragon") + icon_state = "pred_mask_elder_tr" + LAZYSET(item_state_slots, WEAR_FACE, "pred_mask_elder_tr") + if("Swamp") + icon_state = "pred_mask_elder_joshuu" + LAZYSET(item_state_slots, WEAR_FACE, "pred_mask_elder_joshuu") + if("Enforcer") + icon_state = "pred_mask_elder_feweh" + LAZYSET(item_state_slots, WEAR_FACE, "pred_mask_elder_feweh") + if("Collector") + icon_state = "pred_mask_elder_n" + LAZYSET(item_state_slots, WEAR_FACE, "pred_mask_elder_n") + user.update_inv_wear_mask() + return + + icon_state = "pred_mask[mob_client.prefs.predator_mask_type]_[mob_client.prefs.predator_mask_material]" + LAZYSET(item_state_slots, WEAR_FACE, "pred_mask[mob_client.prefs.predator_mask_type]_[mob_client.prefs.predator_mask_material]") + user.update_inv_wear_mask() + +/obj/item/clothing/accessory/mask/post_vendor_spawn_hook(mob/living/carbon/human/user) + if(!user?.client?.prefs) + return + var/client/mob_client = user.client + if(mob_client.prefs.predator_accessory_type) + icon_state = "pred_accessory[mob_client.prefs.predator_accessory_type]_[mob_client.prefs.predator_mask_material]" + else + qdel(src) + + +//Greaves Prefs + +/obj/item/clothing/shoes/yautja/hunter/post_vendor_spawn_hook(mob/living/carbon/human/user) + if(!user?.client?.prefs) + return + var/client/mob_client = user.client + + icon_state = "y-boots[mob_client.prefs.predator_boot_type]_[mob_client.prefs.predator_greave_material]" + user.update_inv_shoes() + +//Cape Prefs + +/obj/item/clothing/yautja_cape/post_vendor_spawn_hook(mob/living/carbon/human/user) + if(!user?.client?.prefs) + return + var/client/mob_client = user.client + + color = mob_client.prefs.predator_cape_color + user.update_inv_back() diff --git a/code/game/machinery/vending/vendor_types/crew/combat_correspondent.dm b/code/game/machinery/vending/vendor_types/crew/combat_correspondent.dm index 81bee126dbc8..986510335fbe 100644 --- a/code/game/machinery/vending/vendor_types/crew/combat_correspondent.dm +++ b/code/game/machinery/vending/vendor_types/crew/combat_correspondent.dm @@ -4,10 +4,10 @@ GLOBAL_LIST_INIT(cm_vending_clothing_combat_correspondent, list( list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), list("Essential Reporter's Set", 0, /obj/effect/essentials_set/cc, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), list("Leather Satchel", 0, /obj/item/storage/backpack/satchel, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR), + list("Press Broadcasting Camera", 0, /obj/item/device/camera/broadcasting, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED), list("CIVILIAN EQUIPMENT (TAKE ALL)", 0, null, null, null), list("Portable Press Fax Machine", 0, /obj/item/device/fax_backpack, CIVILIAN_CAN_BUY_BACKPACK, VENDOR_ITEM_RECOMMENDED), - list("Press Broadcasting Camera", 0, /obj/item/device/camera/broadcasting, CIVILIAN_CAN_BUY_UTILITY, VENDOR_ITEM_RECOMMENDED), list("UNIFORM (CHOOSE 1)", 0, null, null, null), list("Black Uniform", 0, /obj/item/clothing/under/marine/reporter/black, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/crew/k9_synth.dm b/code/game/machinery/vending/vendor_types/crew/k9_synth.dm new file mode 100644 index 000000000000..9dc13058749b --- /dev/null +++ b/code/game/machinery/vending/vendor_types/crew/k9_synth.dm @@ -0,0 +1,28 @@ +/obj/structure/machinery/cm_vending/clothing/k9_synth + name = "\improper Wey-Yu Synthetic K9 Equipment Requisitions" + desc = "An automated equipment vendor for Synthetic K9s." + show_points = FALSE + req_access = list(ACCESS_MARINE_SYNTH) + vendor_role = list(JOB_SYNTH_K9) + +/obj/structure/machinery/cm_vending/clothing/k9_synth/get_listed_products(mob/user) + return GLOB.cm_vending_clothing_k9_synth + +//------------GEAR--------------- + +GLOBAL_LIST_INIT(cm_vending_clothing_k9_synth, list( + list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), + list("Headset", 0, /obj/item/device/radio/headset/almayer/mcom/synth, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), + list("K9 Serial ID Tags", 0, /obj/item/clothing/under/rank/synthetic/synth_k9, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), + list("Name Changer", 0, /obj/item/k9_name_changer/, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_MANDATORY), + + list("HANDLER KIT (CHOOSE 1)", 0, null, null, null), + list("Squad Corpsman -> K9 Handler", 0, /obj/item/storage/box/kit/k9_handler/corpsman, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_RECOMMENDED), + list("Military Police -> K9 Handler", 0, /obj/item/storage/box/kit/k9_handler/mp, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_REGULAR), + + list("CARRYPACK (CHOOSE 1)", 0, null, null, null), + list("Medical Carry Harness", 0, /obj/item/storage/backpack/marine/k9_synth/medicalpack, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_RECOMMENDED), + list("Cargo Carry Harness", 0, /obj/item/storage/backpack/marine/k9_synth/cargopack, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR), + list("MP Carry Harness", 0, /obj/item/storage/backpack/marine/k9_synth/mppack, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR), + + )) diff --git a/code/game/machinery/vending/vendor_types/crew/senior_officers.dm b/code/game/machinery/vending/vendor_types/crew/senior_officers.dm index e724d2f33a3b..a057e5f51161 100644 --- a/code/game/machinery/vending/vendor_types/crew/senior_officers.dm +++ b/code/game/machinery/vending/vendor_types/crew/senior_officers.dm @@ -87,9 +87,10 @@ GLOBAL_LIST_INIT(cm_vending_clothing_chief_engineer, list( list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), list("Insulated Gloves", 0, /obj/item/clothing/gloves/yellow, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY), list("Headset", 0, /obj/item/device/radio/headset/almayer/ce, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), - list("Toolbelt", 0, /obj/item/storage/belt/utility/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_MANDATORY), list("Marine Combat Boots", 0, /obj/item/clothing/shoes/marine, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY), list("Welding Goggles", 0, /obj/item/clothing/glasses/welding, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_MANDATORY), + list("KN5500/2 PDA", 0, /obj/item/device/working_joe_pda/uscm, MARINE_CAN_BUY_KIT, VENDOR_ITEM_MANDATORY), + list("Tactical Compact Nailgun", 0, /obj/item/weapon/gun/smg/nailgun/compact/tactical, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), list("UNIFORM (CHOOSE 1)", 0, null, null, null), list("Chief Engineer Uniform", 0, /obj/item/clothing/under/marine/officer/ce, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_RECOMMENDED), @@ -115,6 +116,11 @@ GLOBAL_LIST_INIT(cm_vending_clothing_chief_engineer, list( list("Technician Welderpack", 0, /obj/item/storage/backpack/marine/engineerpack, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR), list("Welding Kit", 0, /obj/item/tool/weldpack, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR), + list("BELT (CHOOSE 1)", 0, null, null, null), + list("M277 Pattern Construction Rig", 0, /obj/item/storage/belt/utility/construction, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), + list("M276 G8-A General Utility Pouch", 0, /obj/item/storage/backpack/general_belt, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), + list("Toolbelt", 0, /obj/item/storage/belt/utility/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), + list("POUCHES (CHOOSE 2)", 0, null, null, null), list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), @@ -128,7 +134,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_chief_engineer, list( list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Fuel Tank Strap Pouch", 0, /obj/item/storage/pouch/flamertank, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - + list("Engineer kit Pouch", 0, /obj/item/storage/pouch/engikit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("PERSONAL SIDEARM (CHOOSE 1)", 0, null, null, null), list("M4A3 Service Pistol", 0, /obj/item/storage/belt/gun/m4a3/full, MARINE_CAN_BUY_SECONDARY, VENDOR_ITEM_RECOMMENDED), @@ -141,6 +147,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_chief_engineer, list( list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Small Tool Webbing (Full)", 0, /obj/item/clothing/accessory/storage/tool_webbing/small/equipped, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), list("DEPLOYMENT GEAR", 0, null, null, null), @@ -483,7 +490,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_auxiliary_officer, list( list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), list("Insulated Gloves", 0, /obj/item/clothing/gloves/yellow, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY), list("Officer Uniform", 0, /obj/item/clothing/under/marine/officer/bridge, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), - list("Headset", 0, /obj/item/device/radio/headset/almayer/qm, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), + list("Headset", 0, /obj/item/device/radio/headset/almayer/mcom/cdrcom, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), list("Auxiliary Support Officer Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/service/aso, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), list("BAG (CHOOSE 1)", 0, null, null, null), diff --git a/code/game/machinery/vending/vendor_types/crew/synthetic.dm b/code/game/machinery/vending/vendor_types/crew/synthetic.dm index 240155176efa..bd7ba7cb04dc 100644 --- a/code/game/machinery/vending/vendor_types/crew/synthetic.dm +++ b/code/game/machinery/vending/vendor_types/crew/synthetic.dm @@ -80,8 +80,8 @@ list("Space Cleaner", 2, /obj/item/reagent_container/spray/cleaner, null, VENDOR_ITEM_REGULAR), list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), list("Machete Scabbard (Full)", 2, /obj/item/storage/large_holster/machete/full, null, VENDOR_ITEM_REGULAR), - list("Stethoscope", 2, /obj/item/clothing/accessory/stethoscope, null, VENDOR_ITEM_REGULAR) - + list("Stethoscope", 2, /obj/item/clothing/accessory/stethoscope, null, VENDOR_ITEM_REGULAR), + list("Penlight", 2, /obj/item/device/flashlight/pen, null, VENDOR_ITEM_REGULAR) ) //------------CLOTHING VENDOR--------------- @@ -356,9 +356,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth_snowflake, list( list("Gold Tie", 6, /obj/item/clothing/accessory/gold, null, VENDOR_ITEM_REGULAR), list("Red Tie", 6, /obj/item/clothing/accessory/red, null, VENDOR_ITEM_REGULAR), list("Purple Tie", 6, /obj/item/clothing/accessory/purple, null, VENDOR_ITEM_REGULAR), - list("Stethoscope", 6, /obj/item/clothing/accessory/stethoscope, null, VENDOR_ITEM_REGULAR), list("Dress Gloves", 6, /obj/item/clothing/gloves/marine/dress, null, VENDOR_ITEM_REGULAR), - )) /obj/structure/machinery/cm_vending/clothing/synth/snowflake diff --git a/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm b/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm index 2dd5bdf2ee68..a05d7286ea16 100644 --- a/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm +++ b/code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm @@ -353,6 +353,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_vehicle_crew, list( //Not essentials sets but fuck it the code's here /obj/effect/essentials_set/tank/ltb + desc = "A giant cannon firing explosive 86mm shells. You'd be lucky if this even leaves the dust of whatever you hit with it." spawned_gear_list = list( /obj/item/hardpoint/primary/cannon, /obj/item/ammo_magazine/hardpoint/ltb_cannon, @@ -363,6 +364,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_vehicle_crew, list( ) /obj/effect/essentials_set/tank/gatling + desc = "A primary LTAA Minigun utilizing AP ammo for tanks. The barrel spins up as it is fired, improving its fire rate and accuracy dramatically. Capable of shredding apart even the thickest walls in seconds." spawned_gear_list = list( /obj/item/hardpoint/primary/minigun, /obj/item/ammo_magazine/hardpoint/ltaaap_minigun, @@ -370,6 +372,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_vehicle_crew, list( ) /obj/effect/essentials_set/tank/dragonflamer + desc = "A heavy flamer that spews out high-combustion napalm in a wide radius. The fuel burns intensely and quickly, which allows for it to be used offensively by armoured vehicles." spawned_gear_list = list( /obj/item/hardpoint/primary/flamer, /obj/item/ammo_magazine/hardpoint/primary_flamer, @@ -377,6 +380,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_vehicle_crew, list( ) /obj/effect/essentials_set/tank/autocannon + desc = "An automatic cannon for tanks, capable of firing precisely even at long ranges. Loads 20mm explosive shells." spawned_gear_list = list( /obj/item/hardpoint/primary/autocannon, /obj/item/ammo_magazine/hardpoint/ace_autocannon, @@ -386,12 +390,14 @@ GLOBAL_LIST_INIT(cm_vending_clothing_vehicle_crew, list( ) /obj/effect/essentials_set/tank/tankflamer + desc = "A small LZR-N Flamer Unit - a modified version of your bog standard flamer." spawned_gear_list = list( /obj/item/hardpoint/secondary/small_flamer, /obj/item/ammo_magazine/hardpoint/secondary_flamer, ) /obj/effect/essentials_set/tank/tow + desc = "A quint rocket launcher capable of firing four rockets in quick succession." spawned_gear_list = list( /obj/item/hardpoint/secondary/towlauncher, /obj/item/ammo_magazine/hardpoint/towlauncher, @@ -399,12 +405,14 @@ GLOBAL_LIST_INIT(cm_vending_clothing_vehicle_crew, list( ) /obj/effect/essentials_set/tank/m56cupola + desc = "A permanently fixed M56D, firing standard issue 10x28mm rounds." spawned_gear_list = list( /obj/item/hardpoint/secondary/m56cupola, /obj/item/ammo_magazine/hardpoint/m56_cupola, ) /obj/effect/essentials_set/tank/tankgl + desc = "A magazine feed grenade launcher capable of holding 10 grenades. This model loads M40 grenades." spawned_gear_list = list( /obj/item/hardpoint/secondary/grenade_launcher, /obj/item/ammo_magazine/hardpoint/tank_glauncher, diff --git a/code/game/machinery/vending/vendor_types/medical.dm b/code/game/machinery/vending/vendor_types/medical.dm index 7b3b3fa7f567..476e9f160ec2 100644 --- a/code/game/machinery/vending/vendor_types/medical.dm +++ b/code/game/machinery/vending/vendor_types/medical.dm @@ -276,8 +276,12 @@ /obj/structure/machinery/cm_vending/sorted/medical/get_examine_text(mob/living/carbon/human/user) . = ..() + if(inoperable()) + return . if(healthscan) . += SPAN_NOTICE("[src] offers assisted medical scans, for ease of use with minimal training. Present the target in front of the scanner to scan.") + if(allow_supply_link_restock && get_supply_link()) + . += SPAN_NOTICE("A supply link is connected.") /obj/structure/machinery/cm_vending/sorted/medical/ui_data(mob/user) . = ..() @@ -719,7 +723,7 @@ wrenchable = TRUE hackable = TRUE healthscan = FALSE - allow_supply_link_restock = FALSE + allow_supply_link_restock = TRUE chem_refill = null /obj/structure/machinery/cm_vending/sorted/medical/blood/bolted diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm index f59f9543592a..fb27581b0fa2 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm @@ -86,6 +86,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_engi, list( list("HELMET OPTICS", 0, null, null, null), list("Medical Helmet Optic", 12, /obj/item/device/helmet_visor/medical, null, VENDOR_ITEM_REGULAR), + list("Welding Visor", 5, /obj/item/device/helmet_visor/welding_visor, null, VENDOR_ITEM_REGULAR), list("PAMPHLETS", 0, null, null, null), list("JTAC Pamphlet", 15, /obj/item/pamphlet/skill/jtac, null, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm index 8cb71a57872f..d9cd2c54681b 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm @@ -37,7 +37,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_leader, list( list("HELMET OPTICS", 0, null, null, null), list("Welding Visor", 5, /obj/item/device/helmet_visor/welding_visor, null, VENDOR_ITEM_REGULAR), list("Medical Helmet Optic", 4, /obj/item/device/helmet_visor/medical, null, VENDOR_ITEM_RECOMMENDED), - list("Night Vision Optic", 20, /obj/item/device/helmet_visor/night_vision, null, VENDOR_ITEM_RECOMMENDED), + list("Night Vision Optic", 25, /obj/item/device/helmet_visor/night_vision, null, VENDOR_ITEM_RECOMMENDED), list("ENGINEERING SUPPLIES", 0, null, null, null), list("Insulated Gloves", 3, /obj/item/clothing/gloves/yellow, null, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm index 6db49ebdd6a2..241d021d7c76 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm @@ -8,8 +8,6 @@ GLOBAL_LIST_INIT(cm_vending_gear_medic, list( list("Burn Kit", 2, /obj/item/stack/medical/advanced/ointment, null, VENDOR_ITEM_RECOMMENDED), list("Trauma Kit", 2, /obj/item/stack/medical/advanced/bruise_pack, null, VENDOR_ITEM_RECOMMENDED), list("Medical Splints", 1, /obj/item/stack/medical/splint, null, VENDOR_ITEM_RECOMMENDED), - list("Gauze", 1, /obj/item/stack/medical/bruise_pack, null, VENDOR_ITEM_REGULAR), - list("Ointment", 1, /obj/item/stack/medical/ointment, null, VENDOR_ITEM_REGULAR), list("Blood Bag (O-)", 4, /obj/item/reagent_container/blood/OMinus, null, VENDOR_ITEM_REGULAR), list("FIRSTAID KITS", 0, null, null, null), @@ -20,6 +18,15 @@ GLOBAL_LIST_INIT(cm_vending_gear_medic, list( list("Oxygen Firstaid Kit", 6, /obj/item/storage/firstaid/o2, null, VENDOR_ITEM_REGULAR), list("Radiation Firstaid Kit", 6, /obj/item/storage/firstaid/rad, null, VENDOR_ITEM_REGULAR), + list("PILL BOTTLES", 0, null, null, null), + list("Pill Bottle (Bicaridine)", 5, /obj/item/storage/pill_bottle/bicaridine, null, VENDOR_ITEM_RECOMMENDED), + list("Pill Bottle (Dexalin)", 5, /obj/item/storage/pill_bottle/dexalin, null, VENDOR_ITEM_REGULAR), + list("Pill Bottle (Dylovene)", 5, /obj/item/storage/pill_bottle/antitox, null, VENDOR_ITEM_REGULAR), + list("Pill Bottle (Inaprovaline)", 5, /obj/item/storage/pill_bottle/inaprovaline, null, VENDOR_ITEM_REGULAR), + list("Pill Bottle (Kelotane)", 5, /obj/item/storage/pill_bottle/kelotane, null, VENDOR_ITEM_RECOMMENDED), + list("Pill Bottle (Peridaxon)", 5, /obj/item/storage/pill_bottle/peridaxon, null, VENDOR_ITEM_REGULAR), + list("Pill Bottle (Tramadol)", 5, /obj/item/storage/pill_bottle/tramadol, null, VENDOR_ITEM_RECOMMENDED), + list("AUTOINJECTORS", 0, null, null, null), list("Autoinjector (Bicaridine)", 1, /obj/item/reagent_container/hypospray/autoinjector/bicaridine, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Dexalin+)", 1, /obj/item/reagent_container/hypospray/autoinjector/dexalinp, null, VENDOR_ITEM_REGULAR), @@ -30,24 +37,12 @@ GLOBAL_LIST_INIT(cm_vending_gear_medic, list( list("Autoinjector (Tramadol)", 1, /obj/item/reagent_container/hypospray/autoinjector/tramadol, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Tricord)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), - list("PILL BOTTLES", 0, null, null, null), - list("Pill Bottle (Bicaridine)", 5, /obj/item/storage/pill_bottle/bicaridine, null, VENDOR_ITEM_RECOMMENDED), - list("Pill Bottle (Dexalin)", 5, /obj/item/storage/pill_bottle/dexalin, null, VENDOR_ITEM_REGULAR), - list("Pill Bottle (Dylovene)", 5, /obj/item/storage/pill_bottle/antitox, null, VENDOR_ITEM_REGULAR), - list("Pill Bottle (Inaprovaline)", 5, /obj/item/storage/pill_bottle/inaprovaline, null, VENDOR_ITEM_REGULAR), - list("Pill Bottle (Kelotane)", 5, /obj/item/storage/pill_bottle/kelotane, null, VENDOR_ITEM_RECOMMENDED), - list("Pill Bottle (Peridaxon)", 5, /obj/item/storage/pill_bottle/peridaxon, null, VENDOR_ITEM_REGULAR), - list("Pill Bottle (Tramadol)", 5, /obj/item/storage/pill_bottle/tramadol, null, VENDOR_ITEM_RECOMMENDED), - list("MEDICAL UTILITIES", 0, null, null, null), - list("Health Analyzer", 4, /obj/item/device/healthanalyzer, null, VENDOR_ITEM_REGULAR), - list("Roller Bed", 4, /obj/item/roller, null, VENDOR_ITEM_REGULAR), - list("Stasis Bag", 6, /obj/item/bodybag/cryobag, null, VENDOR_ITEM_REGULAR), - list("Pressurized Reagent Canister Pouch (EMPTY)", 3, /obj/item/storage/pouch/pressurized_reagent_canister, null, VENDOR_ITEM_REGULAR), - list("G8-A General Utility Pouch", 15, /obj/item/storage/backpack/general_belt, null, VENDOR_ITEM_REGULAR), list("MS-11 Smart Refill Tank", 6, /obj/item/reagent_container/glass/minitank, null, VENDOR_ITEM_REGULAR), list("FixOVein", 7, /obj/item/tool/surgery/FixOVein, null, VENDOR_ITEM_REGULAR), - + list("Roller Bed", 4, /obj/item/roller, null, VENDOR_ITEM_REGULAR), + list("Health Analyzer", 4, /obj/item/device/healthanalyzer, null, VENDOR_ITEM_REGULAR), + list("Stasis Bag", 6, /obj/item/bodybag/cryobag, null, VENDOR_ITEM_REGULAR), list("EXPLOSIVES", 0, null, null, null), list("M40 HEDP High Explosive Packet (x3 grenades)", 18, /obj/item/storage/box/packet/high_explosive, null, VENDOR_ITEM_REGULAR), @@ -85,10 +80,8 @@ GLOBAL_LIST_INIT(cm_vending_gear_medic, list( list("SU-6 Smart Pistol", 12, /obj/item/storage/box/guncase/smartpistol, null, VENDOR_ITEM_REGULAR), list("CLOTHING ITEMS", 0, null, null, null), - list("Machete Scabbard (Full)", 6, /obj/item/storage/large_holster/machete/full, null, VENDOR_ITEM_REGULAR), list("Machete Pouch (Full)", 8, /obj/item/storage/pouch/machete/full, null, VENDOR_ITEM_REGULAR), list("USCM Radio Telephone Pack", 15, /obj/item/storage/backpack/marine/satchel/rto, null, VENDOR_ITEM_REGULAR), - list("Fuel Tank Strap Pouch", 4, /obj/item/storage/pouch/flamertank, null, VENDOR_ITEM_REGULAR), list("Welding Goggles", 3, /obj/item/clothing/glasses/welding, null, VENDOR_ITEM_REGULAR), list("UTILITIES", 0, null, null, null), @@ -105,7 +98,6 @@ GLOBAL_LIST_INIT(cm_vending_gear_medic, list( list("Welding Visor", 5, /obj/item/device/helmet_visor/welding_visor, null, VENDOR_ITEM_REGULAR), list("PAMPHLETS", 0, null, null, null), - list("JTAC Pamphlet", 15, /obj/item/pamphlet/skill/jtac, null, VENDOR_ITEM_REGULAR), list("Engineering Pamphlet", 15, /obj/item/pamphlet/skill/engineer, null, VENDOR_ITEM_REGULAR), list("RADIO KEYS", 0, null, null, null), @@ -149,51 +141,43 @@ GLOBAL_LIST_INIT(cm_vending_clothing_medic, list( list("Medical Satchel", 0, /obj/item/storage/backpack/marine/satchel/medic, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_RECOMMENDED), list("BELT (CHOOSE 1)", 0, null, null, null), - list("M276 Ammo Load Rig", 0, /obj/item/storage/belt/marine, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), - list("M276 General Pistol Holster Rig", 0, /obj/item/storage/belt/gun/m4a3, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), - list("M276 Lifesaver Bag (Full)", 0, /obj/item/storage/belt/medical/lifesaver/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), - list("M276 Medical Storage Rig (Full)", 0, /obj/item/storage/belt/medical/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), - list("M276 M39 Holster Rig", 0, /obj/item/storage/belt/gun/m39, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), - list("M276 General Revolver Holster Rig", 0, /obj/item/storage/belt/gun/m44, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), - list("M276 M82F Holster Rig", 0, /obj/item/storage/belt/gun/flaregun, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), - list("M276 Shotgun Shell Loading Rig", 0, /obj/item/storage/belt/shotgun, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), - list("M276 M40 Grenade Rig", 0, /obj/item/storage/belt/grenade, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), + list("M276 Lifesaver Bag (Full)", 0, /obj/item/storage/belt/medical/lifesaver/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_MANDATORY), + list("M276 Medical Storage Rig (Full)", 0, /obj/item/storage/belt/medical/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_MANDATORY), list("POUCHES (CHOOSE 2)", 0, null, null, null), + list("Pressurized Reagent Canister Pouch (Revival Mix - Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival_tricord, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Pressurized Reagent Canister Pouch (Revival Mix - Peridaxon)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival_peri, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Kit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pressurized Reagent Canister Pouch (Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/tricordrazine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Pressurized Reagent Canister Pouch (EMPTY)", 0, /obj/item/storage/pouch/pressurized_reagent_canister, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Vial Pouch (Full)", 0, /obj/item/storage/pouch/vials/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("First Responder Pouch", 0, /obj/item/storage/pouch/first_responder, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Magazine Pouch", 0, /obj/item/storage/pouch/magazine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), - list("Medical Kit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Revival Mix - Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival_tricord, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Revival Mix - Peridaxon)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/revival_peri, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/tricordrazine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), - list("Pressurized Reagent Canister Pouch (EMPTY)", 0, /obj/item/storage/pouch/pressurized_reagent_canister, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Vial Pouch (Full)", 0, /obj/item/storage/pouch/vials/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), - list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), + list("Sterile Mask", 0, /obj/item/clothing/mask/surgical, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), - list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), - list("Sterile Mask", 0, /obj/item/clothing/mask/surgical, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR) + list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR) )) /obj/structure/machinery/cm_vending/clothing/medic diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm index 9860af9225fb..509e2b03c5b0 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm @@ -27,8 +27,8 @@ list("Box of Buckshot Shells (12g)", floor(scale * 5), /obj/item/ammo_magazine/shotgun/buckshot, VENDOR_ITEM_REGULAR), list("Box of Shotgun Slugs (12g)", floor(scale * 5), /obj/item/ammo_magazine/shotgun/slugs, VENDOR_ITEM_REGULAR), list("M4RA Magazine (10x24mm)", floor(scale * 15), /obj/item/ammo_magazine/rifle/m4ra, VENDOR_ITEM_REGULAR), - list("M39 HV Magazine (10x20mm)", floor(scale * 10), /obj/item/ammo_magazine/smg/m39, VENDOR_ITEM_REGULAR), - list("M41A Magazine (10x24mm)", floor(scale * 10), /obj/item/ammo_magazine/rifle, VENDOR_ITEM_REGULAR), + list("M39 HV Magazine (10x20mm)", floor(scale * 15), /obj/item/ammo_magazine/smg/m39, VENDOR_ITEM_REGULAR), + list("M41A Magazine (10x24mm)", floor(scale * 15), /obj/item/ammo_magazine/rifle, VENDOR_ITEM_REGULAR), list("SIDEARMS", -1, null, null), list("88 Mod 4 Combat Pistol", floor(scale * 10), /obj/item/weapon/gun/pistol/mod88, VENDOR_ITEM_REGULAR), diff --git a/code/game/objects/effects/afterimage.dm b/code/game/objects/effects/afterimage.dm index 544910961246..2ee28ac7710d 100644 --- a/code/game/objects/effects/afterimage.dm +++ b/code/game/objects/effects/afterimage.dm @@ -1,5 +1,6 @@ /obj/effect/afterimage as_image = TRUE + mouse_opacity = MOUSE_OPACITY_TRANSPARENT /** * Params: @@ -8,6 +9,8 @@ * - fading_duration: How long it takes for afterimage to fade * - fading_to_shift_ratio: How quickly afterimage will reach its target atom before fading (relative to the fading time) */ + + /obj/effect/afterimage/Initialize(mapload, atom/to_copy, fading_duration, fading_to_shift_ratio = 0.5) . = ..() if (!to_copy) diff --git a/code/game/objects/effects/aliens.dm b/code/game/objects/effects/aliens.dm index 45fbd5d4ba2b..1677676c8553 100644 --- a/code/game/objects/effects/aliens.dm +++ b/code/game/objects/effects/aliens.dm @@ -302,7 +302,7 @@ /// Factor of duration between acid progression var/acid_delay = 1 /// How much fuel the acid drains from the flare every acid tick - var/flare_damage = 500 + var/flare_damage = 600 var/barricade_damage = 40 var/in_weather = FALSE @@ -311,7 +311,7 @@ name = "weak acid" acid_delay = 2.5 //250% delay (40% speed) barricade_damage = 20 - flare_damage = 150 + flare_damage = 180 icon_state = "acid_weak" //Superacid @@ -319,7 +319,7 @@ name = "strong acid" acid_delay = 0.4 //40% delay (250% speed) barricade_damage = 100 - flare_damage = 1875 + flare_damage = 2250 icon_state = "acid_strong" /obj/effect/xenomorph/acid/Initialize(mapload, atom/target) diff --git a/code/game/objects/effects/bloodsplatter.dm b/code/game/objects/effects/bloodsplatter.dm index 96fa14c2a944..2ce87177c398 100644 --- a/code/game/objects/effects/bloodsplatter.dm +++ b/code/game/objects/effects/bloodsplatter.dm @@ -7,6 +7,7 @@ var/duration = 5 layer = ABOVE_XENO_LAYER var/splatter_type = "splatter" + mouse_opacity = MOUSE_OPACITY_TRANSPARENT /obj/effect/bloodsplatter/Initialize(mapload, set_dir, fx_duration, color_override) . = ..() diff --git a/code/game/objects/effects/client_image_holder.dm b/code/game/objects/effects/client_image_holder.dm new file mode 100644 index 000000000000..4bff6f2a48d1 --- /dev/null +++ b/code/game/objects/effects/client_image_holder.dm @@ -0,0 +1,99 @@ +/** + * Simple effect that holds an image + * to be shown to one or multiple clients only. + * + * Pass a list of mobs in initialize() that corresponds to all mobs that can see it. + * Code ripped from tgstation, though this has missing parts. Original path is 'code/modules/hallucination/_hallucination.dm' + */ + +/obj/effect/client_image_holder + invisibility = INVISIBILITY_OBSERVER + anchored = TRUE + + /// A list of mobs which can see us. + var/list/mob/who_sees_us + /// The created image, what we look like. + var/image/shown_image + /// The icon file the image uses. If null, we have no image + var/image_icon + /// The icon state the image uses + var/image_state + /// The x pixel offset of the image + var/image_pixel_x = 0 + /// The y pixel offset of the image + var/image_pixel_y = 0 + /// Optional, the color of the image + var/image_color + /// The layer of the image + var/image_layer = MOB_LAYER + /// The plane of the image + var/image_plane = GAME_PLANE + +/obj/effect/client_image_holder/Initialize(mapload, list/mobs_which_see_us) + if(isnull(mobs_which_see_us)) + return INITIALIZE_HINT_QDEL + + . = ..() + shown_image = generate_image() + + if(!islist(mobs_which_see_us)) + mobs_which_see_us = list(mobs_which_see_us) + + who_sees_us = list() + for(var/mob/seer as anything in mobs_which_see_us) + who_sees_us += seer + show_image_to(seer) + +/obj/effect/client_image_holder/Destroy(force) + if(shown_image) + for(var/mob/seer as anything in who_sees_us) + hide_image_from(seer) + who_sees_us -= seer + shown_image = null + + QDEL_NULL_LIST(who_sees_us) + return ..() + +/// Generates the image which we take on. +/obj/effect/client_image_holder/proc/generate_image() + var/image/created = image(image_icon, src, image_state, image_layer, dir = src.dir) + created.pixel_x = image_pixel_x + created.pixel_y = image_pixel_y + if(image_color) + created.color = image_color + return created + +/// Shows the image we generated to the passed mob +/obj/effect/client_image_holder/proc/show_image_to(mob/show_to) + SIGNAL_HANDLER + + show_to.client?.images |= shown_image + +/// Hides the image we generated from the passed mob +/obj/effect/client_image_holder/proc/hide_image_from(mob/hide_from) + SIGNAL_HANDLER + + hide_from.client?.images -= shown_image + +/// Simple helper for refreshing / showing the image to everyone in our list. +/obj/effect/client_image_holder/proc/regenerate_image() + for(var/mob/seer as anything in who_sees_us) + hide_image_from(seer) + + shown_image = generate_image() + + for(var/mob/seer as anything in who_sees_us) + show_image_to(seer) + +// Whenever we perform icon updates, regenerate our image +/obj/effect/client_image_holder/update_icon(updates = ALL) + . = ..() + regenerate_image() + +// If we move for some reason, regenerate our image +/obj/effect/client_image_holder/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change = TRUE) + . = ..() + if(!loc) + return + regenerate_image() + diff --git a/code/game/objects/effects/effect_system/smoke.dm b/code/game/objects/effects/effect_system/smoke.dm index d0ea5d2ed5ef..4e41550617bd 100644 --- a/code/game/objects/effects/effect_system/smoke.dm +++ b/code/game/objects/effects/effect_system/smoke.dm @@ -242,6 +242,20 @@ /obj/effect/particle_effect/smoke/miasma/ex_act(severity) return +/obj/effect/particle_effect/smoke/weedkiller + name = "C10-W Weedkiller" + amount = 1 + time_to_live = 15 + smokeranking = SMOKE_RANK_HARMLESS + opacity = FALSE + color = "#c2aac7" + alpha = 0 + +/obj/effect/particle_effect/smoke/weedkiller/Initialize(mapload, oldamount, datum/cause_data/new_cause_data) + . = ..() + + animate(src, alpha = 75, time = rand(1 SECONDS, 5 SECONDS)) + ///////////////////////////////////////////// // Sleep smoke ///////////////////////////////////////////// @@ -769,6 +783,22 @@ // XENO SMOKES +/obj/effect/particle_effect/smoke/king + opacity = FALSE + color = "#000000" + icon = 'icons/effects/effects.dmi' + icon_state = "sparks" + anchored = TRUE + mouse_opacity = MOUSE_OPACITY_TRANSPARENT + layer = BELOW_OBJ_LAYER + time_to_live = 5 + spread_speed = 1 + pixel_x = 0 + pixel_y = 0 + +/datum/effect_system/smoke_spread/king_doom + smoke_type = /obj/effect/particle_effect/smoke/king + /datum/effect_system/smoke_spread/xeno_acid smoke_type = /obj/effect/particle_effect/smoke/xeno_burn diff --git a/code/game/objects/effects/heavy_impact.dm b/code/game/objects/effects/heavy_impact.dm new file mode 100644 index 000000000000..1abf9c92a6ff --- /dev/null +++ b/code/game/objects/effects/heavy_impact.dm @@ -0,0 +1,13 @@ +//----------------------------------------- +//HEAVY IMPACT +//----------------------------------------- + +/obj/effect/heavy_impact + icon = 'icons/effects/heavyimpact.dmi' + icon_state = "heavyimpact" + var/duration = 1.3 SECONDS + +/obj/effect/heavy_impact/Initialize(mapload) + . = ..() + flick("heavyimpact", src) + AddElement(/datum/element/temporary, duration) diff --git a/code/game/objects/effects/king_leap.dm b/code/game/objects/effects/king_leap.dm new file mode 100644 index 000000000000..67f9ab5ed636 --- /dev/null +++ b/code/game/objects/effects/king_leap.dm @@ -0,0 +1,51 @@ +//----------------------------------------- +//KING LEAP +//----------------------------------------- + +#define LEAP_HEIGHT 210 //how high up leaps go, in pixels + +/obj/effect/king_leap + icon = 'icons/mob/xenos/king.dmi' + icon_state = "Normal King Charging" + layer = 4.7 + plane = -4 + pixel_x = -32 + var/duration = 10 + +/obj/effect/king_leap/Initialize(mapload, negative, dir) + . = ..() + setDir(dir) + INVOKE_ASYNC(src, PROC_REF(flight), negative) + AddElement(/datum/element/temporary, duration) + +/obj/effect/king_leap/proc/flight(negative) + if(negative) + animate(src, pixel_x = -LEAP_HEIGHT*0.1, pixel_z = LEAP_HEIGHT*0.15, time = 3, easing = BOUNCE_EASING) + else + animate(src, pixel_x = LEAP_HEIGHT*0.1, pixel_z = LEAP_HEIGHT*0.15, time = 3, easing = BOUNCE_EASING) + sleep(0.3 SECONDS) + icon_state = "Normal King Charging" + if(negative) + animate(src, pixel_x = -LEAP_HEIGHT, pixel_z = LEAP_HEIGHT, time = 7) + else + animate(src, pixel_x = LEAP_HEIGHT, pixel_z = LEAP_HEIGHT, time = 7) + +/obj/effect/king_leap/end + pixel_x = LEAP_HEIGHT + pixel_z = LEAP_HEIGHT + duration = 10 + +/obj/effect/king_leap/end/flight(negative) + if(negative) + pixel_x = -LEAP_HEIGHT + animate(src, pixel_x = -16, pixel_z = 0, time = 5) + else + animate(src, pixel_x = -16, pixel_z = 0, time = 5) + +/obj/effect/xenomorph/xeno_telegraph/king_attack_template + icon = 'icons/effects/96x96.dmi' + icon_state = "landing2" + layer = BELOW_MOB_LAYER + +/obj/effect/xenomorph/xeno_telegraph/king_attack_template/yellow + icon_state = "xenolandingyellow" diff --git a/code/game/objects/effects/landmarks/freed_mob_spawner.dm b/code/game/objects/effects/landmarks/freed_mob_spawner.dm index c0e34eed5473..a711fefc1d24 100644 --- a/code/game/objects/effects/landmarks/freed_mob_spawner.dm +++ b/code/game/objects/effects/landmarks/freed_mob_spawner.dm @@ -28,5 +28,5 @@ /obj/effect/landmark/freed_mob_spawner/upp_soldier name = "UPP Soldier" - equipment_path = /datum/equipment_preset/upp/soldier + equipment_path = /datum/equipment_preset/upp/soldier/dressed count_participant = TRUE diff --git a/code/game/objects/effects/landmarks/landmarks.dm b/code/game/objects/effects/landmarks/landmarks.dm index 87c820054475..13013b5bbfd4 100644 --- a/code/game/objects/effects/landmarks/landmarks.dm +++ b/code/game/objects/effects/landmarks/landmarks.dm @@ -213,6 +213,10 @@ /obj/effect/landmark/queen_spawn/Initialize(mapload, ...) . = ..() + + var/area/area = get_area(src) + area.unoviable_timer = FALSE + GLOB.queen_spawns += src /obj/effect/landmark/queen_spawn/Destroy() @@ -232,7 +236,7 @@ return ..() /obj/effect/landmark/xeno_hive_spawn - name = "xeno hive spawn" + name = "xeno vs xeno hive spawn" icon_state = "hive_spawn" /obj/effect/landmark/xeno_hive_spawn/Initialize(mapload, ...) @@ -274,6 +278,7 @@ anchored = TRUE var/job var/squad + var/job_list /obj/effect/landmark/start/Initialize(mapload, ...) . = ..() @@ -283,6 +288,15 @@ LAZYADD(GLOB.spawns_by_squad_and_job[squad][job], src) else LAZYADD(GLOB.spawns_by_job[job], src) + if(job_list) + for(var/job_from_list in job_list) + if(squad) + LAZYINITLIST(GLOB.spawns_by_squad_and_job[squad]) + LAZYADD(GLOB.spawns_by_squad_and_job[squad][job_from_list], src) + else + LAZYADD(GLOB.spawns_by_job[job_from_list], src) + else + return /obj/effect/landmark/start/Destroy() if(job) @@ -290,6 +304,14 @@ LAZYREMOVE(GLOB.spawns_by_squad_and_job[squad][job], src) else LAZYREMOVE(GLOB.spawns_by_job[job], src) + if(job_list) + for(var/job_from_list in job_list) + if(squad) + LAZYREMOVE(GLOB.spawns_by_squad_and_job[squad][job_from_list], src) + LAZYREMOVE(GLOB.latejoin_by_squad[squad][job_from_list], src) + else + LAZYREMOVE(GLOB.spawns_by_job[job_from_list], src) + LAZYREMOVE(GLOB.latejoin_by_job[job_from_list], src) return ..() /obj/effect/landmark/start/AISloc @@ -339,10 +361,10 @@ job = /datum/job/logistics/engineering/whiskey /obj/effect/landmark/start/whiskey/maint - job = /datum/job/logistics/tech/maint/whiskey + job = /datum/job/logistics/maint/whiskey /obj/effect/landmark/start/whiskey/tech - job = /datum/job/logistics/tech //Need to create a WO variant in the future + job = /datum/job/logistics/otech //Need to create a WO variant in the future //****************************************** MILITARY POLICE- HONOR-GUARD ************************************************/ /obj/effect/landmark/start/whiskey/warrant @@ -409,6 +431,7 @@ var/squad /// What job should latejoin on this landmark var/job + var/job_list /obj/effect/landmark/late_join/alpha name = "alpha late join" @@ -464,12 +487,17 @@ name = "Chief Military Police late join" job = JOB_CHIEF_POLICE + /obj/effect/landmark/late_join/Initialize(mapload, ...) . = ..() if(squad) LAZYADD(GLOB.latejoin_by_squad[squad], src) else if(job) LAZYADD(GLOB.latejoin_by_job[job], src) + else if(job_list) + for(var/job_to_add in job_list) + LAZYADD(GLOB.latejoin_by_job[job_to_add], src) + else GLOB.latejoin += src @@ -478,10 +506,46 @@ LAZYREMOVE(GLOB.latejoin_by_squad[squad], src) else if(job) LAZYREMOVE(GLOB.latejoin_by_job[job], src) + else if(job_list) + for(var/job_to_add in job_list) + LAZYREMOVE(GLOB.latejoin_by_job[job_to_add], src) else GLOB.latejoin -= src return ..() + +/obj/effect/landmark/late_join/responder/uscm + name = "USCM HC Fax Responder late join" + job = JOB_FAX_RESPONDER_USCM_HC + +/obj/effect/landmark/late_join/responder/uscm/provost + name = "USCM Provost Fax Responder late join" + job = JOB_FAX_RESPONDER_USCM_PVST + +/obj/effect/landmark/late_join/responder/wey_yu + name = "W-Y Fax Responder late join" + job = JOB_FAX_RESPONDER_WY + +/obj/effect/landmark/late_join/responder/upp + name = "UPP Fax Responder late join" + job = JOB_FAX_RESPONDER_UPP + +/obj/effect/landmark/late_join/responder/twe + name = "TWE Fax Responder late join" + job = JOB_FAX_RESPONDER_TWE + +/obj/effect/landmark/late_join/responder/clf + name = "CLF Fax Responder late join" + job = JOB_FAX_RESPONDER_CLF + +/obj/effect/landmark/late_join/responder/cmb + name = "CMB Fax Responder late join" + job = JOB_FAX_RESPONDER_CMB + +/obj/effect/landmark/late_join/responder/press + name = "Press Fax Responder late join" + job = JOB_FAX_RESPONDER_PRESS + //****************************************** STATIC COMMS ************************************************// /obj/effect/landmark/static_comms name = "static comms" diff --git a/code/game/objects/effects/landmarks/survivor_spawner.dm b/code/game/objects/effects/landmarks/survivor_spawner.dm index ce83712aee7b..57d2fd767c0d 100644 --- a/code/game/objects/effects/landmarks/survivor_spawner.dm +++ b/code/game/objects/effects/landmarks/survivor_spawner.dm @@ -111,20 +111,20 @@ synth_equipment = /datum/equipment_preset/synth/survivor/pmc intro_text = list("

You are a survivor of a crash landing!

",\ "You are NOT aware of the xenomorph threat.",\ - "Your primary objective is to heal up and survive. If you want to assault the hive - adminhelp.") + "Your primary objective is to survive. You believe a second dropship crashed somewhere to the north, which was carrying additional supplies.") story_text = "You are a PMC from Weyland-Yutani. Your ship was enroute to Solaris Ridge to escort an Assistant Manager. On the way, your ship received a distress signal from the colony about an attack. Worried that it might be a CLF attack, your pilot set full speed for the colony. However, during atmospheric entry the engine failed and you fell unconscious from the G-Forces. You wake up wounded... and see that the ship has crashed onto the colony. Your squadmates lie dead beside you, but there's some missing. Perhaps they survived and moved elsewhere? You need to find out what happened to the colony, see if you can find any of your squadmates, and find a way to contact Weyland-Yutani." roundstart_damage_min = 3 roundstart_damage_max = 10 roundstart_damage_times = 2 - spawn_priority = SPAWN_PRIORITY_HIGH + spawn_priority = SPAWN_PRIORITY_MEDIUM /obj/effect/landmark/survivor_spawner/bigred_crashed_pmc_medic equipment = /datum/equipment_preset/survivor/pmc/medic synth_equipment = /datum/equipment_preset/synth/survivor/pmc intro_text = list("

You are a survivor of a crash landing!

",\ "You are NOT aware of the xenomorph threat.",\ - "Your primary objective is to heal up and survive. If you want to assault the hive - adminhelp.") + "Your primary objective is to survive. You believe a second dropship crashed somewhere to the north, which was carrying additional supplies.") story_text = "You are a PMC medic from Weyland-Yutani. Your ship was enroute to Solaris Ridge to escort an Assistant Manager. On the way, your ship received a distress signal from the colony about an attack. Worried that it might be a CLF attack, your pilot set full speed for the colony. However, during atmospheric entry the engine failed and you fell unconscious from the G-Forces. You wake up wounded... and see that the ship has crashed onto the colony. Your squadmates lie dead beside you, but there's some missing. Perhaps they survived and moved elsewhere? You need to find out what happened to the colony, see if you can find any of your squadmates, and find a way to contact Weyland-Yutani." roundstart_damage_min = 3 roundstart_damage_max = 10 @@ -137,12 +137,25 @@ synth_equipment = /datum/equipment_preset/synth/survivor/pmc intro_text = list("

You are a survivor of a crash landing!

",\ "You are NOT aware of the xenomorph threat.",\ - "Your primary objective is to heal up and survive. If you want to assault the hive - adminhelp.") + "Your primary objective is to survive. You believe a second dropship crashed somewhere to the north, which was carrying additional supplies.") story_text = "You are a PMC engineer from Weyland-Yutani. Your ship was enroute to Solaris Ridge to escort an Assistant Manager. On the way, your ship received a distress signal from the colony about an attack. Worried that it might be a CLF attack, your pilot set full speed for the colony. However, during atmospheric entry the engine failed and you fell unconscious from the G-Forces. You wake up wounded... and see that the ship has crashed onto the colony. Your squadmates lie dead beside you, but there's some missing. Perhaps they survived and moved elsewhere? You need to find out what happened to the colony, see if you can find any of your squadmates, and find a way to contact Weyland-Yutani." roundstart_damage_min = 3 roundstart_damage_max = 10 roundstart_damage_times = 2 + spawn_priority = SPAWN_PRIORITY_HIGH + +/obj/effect/landmark/survivor_spawner/bigred_crashed_pmc_leader + equipment = /datum/equipment_preset/survivor/pmc/pmc_leader + synth_equipment = /datum/equipment_preset/synth/survivor/pmc + intro_text = list("

You are a survivor of a crash landing!

",\ + "You are NOT aware of the xenomorph threat.",\ + "Your primary objective is to survive. You believe a second dropship crashed somewhere to the north, which was carrying additional supplies.") + story_text = "You are a PMC team leader from Weyland-Yutani. Your ship was enroute to Solaris Ridge to escort an Assistant Manager. On the way, your ship received a distress signal from the colony about an attack. Worried that it might be a CLF attack, your pilot set full speed for the colony. However, during atmospheric entry the engine failed and you fell unconscious from the G-Forces. You wake up wounded... and see that the ship has crashed onto the colony. Your squadmates lie dead beside you, but there's some missing. Perhaps they survived and moved elsewhere? You need to find out what happened to the colony, see if you can find any of your squadmates, and find a way to contact Weyland-Yutani." + roundstart_damage_min = 3 + roundstart_damage_max = 10 + roundstart_damage_times = 2 + spawn_priority = SPAWN_PRIORITY_VERY_HIGH /obj/effect/landmark/survivor_spawner/bigred_crashed_cl @@ -150,7 +163,7 @@ synth_equipment = /datum/equipment_preset/synth/survivor/pmc intro_text = list("

You are a survivor of a crash landing!

",\ "You are NOT aware of the xenomorph threat.",\ - "Your primary objective is to heal up and survive. If you want to assault the hive - adminhelp.") + "Your primary objective is to survive. You believe a second dropship crashed somewhere to the north, which was carrying additional supplies.") story_text = "You are an Assistant Manager from Weyland-Yutani. You were being escorted onboard a PMC ship to Solaris Ridge. On the way, the ship received a distress signal from the colony about an attack. Worried that it might be a CLF attack, the pilot set full speed for the colony. However, during atmospheric entry the engine failed and you fell unconscious from the G-Forces. You wake up wounded... and see that the ship has crashed onto the colony. Your PMC escorts lie dead beside you, but there's some missing. Perhaps they survived and moved elsewhere? You must get up and find a way to contact Weyland-Yutani." roundstart_damage_min = 3 roundstart_damage_max = 10 diff --git a/code/game/objects/effects/shockwave.dm b/code/game/objects/effects/shockwave.dm index 37191aab388f..49b1e4b683b4 100644 --- a/code/game/objects/effects/shockwave.dm +++ b/code/game/objects/effects/shockwave.dm @@ -2,9 +2,11 @@ //Shockwaves //------------------------------------------ + /obj/effect/shockwave icon = 'icons/effects/light_overlays/shockwave.dmi' icon_state = "shockwave" + mouse_opacity = MOUSE_OPACITY_TRANSPARENT plane = DISPLACEMENT_PLATE_RENDER_LAYER pixel_x = -496 pixel_y = -496 diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 881b96c311f1..0d6704207629 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -163,6 +163,8 @@ var/ground_offset_x = 0 /// How much to offset the item randomly either way alongside Y visually var/ground_offset_y = 0 + /// bypass any species specific OnMob overlay blockers + var/force_overlays_on = FALSE /// Special storages this item prioritizes var/list/preferred_storage diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index f90e54ef7854..8316da964ae8 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -377,6 +377,7 @@ icon_state = "dogtag_taken" icon = 'icons/obj/items/card.dmi' w_class = SIZE_TINY + var/list/fallen_references var/list/fallen_names var/list/fallen_blood_types var/list/fallen_assgns @@ -384,6 +385,7 @@ /obj/item/dogtag/Initialize() . = ..() + fallen_references = list() fallen_names = list() fallen_blood_types = list() fallen_assgns = list() @@ -394,6 +396,7 @@ to_chat(user, SPAN_NOTICE("You join the [length(fallen_names)>1 ? "tags":"two tags"] together.")) name = "information dog tags" if(D.fallen_names) + fallen_references += D.fallen_references fallen_names += D.fallen_names fallen_blood_types += D.fallen_blood_types fallen_assgns += D.fallen_assgns diff --git a/code/game/objects/items/cosmetics.dm b/code/game/objects/items/cosmetics.dm index e03defc37dfe..2d02cbd82f9e 100644 --- a/code/game/objects/items/cosmetics.dm +++ b/code/game/objects/items/cosmetics.dm @@ -146,3 +146,36 @@ sharp = FALSE edge = FALSE force = 0 + +/obj/item/k9_name_changer + name = "K9 name implanter" + desc = "Syncs the implanted W-Y Serial Chip to the unit's preferred name." + icon = 'icons/obj/items/items.dmi' + icon_state = "efundcard" + w_class = SIZE_TINY + +/obj/item/k9_name_changer/attack_self(mob/user) + . = ..() + var/newname = capitalize(tgui_input_text(user, "What do you wish to be named", "Name:", encode = FALSE)) + if(!newname) + return + + var/verify = tgui_input_list(user, "Are you SURE you wish to be named: [newname]?", "Confirm", list("Yes", "No")) + if(verify != "Yes") + return + + user.change_real_name(user, newname) + if(istype(user, /mob/living/carbon/human)) + var/mob/living/carbon/human/altered_human = user + var/obj/item/card/id/ID = altered_human.get_idcard() + if(ID) + ID.name = "[altered_human.real_name]'s ID Card" + ID.registered_name = "[altered_human.real_name]" + if(ID.assignment) + ID.name += " ([ID.assignment])" + + var/genderswap = tgui_input_list(user, "Which Gender?", "Gender", list("Male", "Female")) + if(!genderswap) + return + user.gender = lowertext(genderswap) + qdel(src) diff --git a/code/game/objects/items/devices/binoculars.dm b/code/game/objects/items/devices/binoculars.dm index dd8b417f8e69..37e722a37773 100644 --- a/code/game/objects/items/devices/binoculars.dm +++ b/code/game/objects/items/devices/binoculars.dm @@ -14,7 +14,10 @@ throw_speed = SPEED_VERY_FAST /// If FALSE won't change icon_state to a camo marine bino. var/uses_camo = TRUE - + var/tile_offset = 11 + var/viewsize = 12 + var/hvh_tile_offset = 6 //same as miniscopes + var/hvh_zoom_viewsize = 7 //matter = list("metal" = 50,"glass" = 50) @@ -29,8 +32,10 @@ if(SEND_SIGNAL(user, COMSIG_BINOCULAR_ATTACK_SELF, src)) return - - zoom(user, 11, 12) + if(SSticker.mode && MODE_HAS_TOGGLEABLE_FLAG(MODE_NO_SNIPER_SENTRY)) + zoom(user, hvh_tile_offset, hvh_zoom_viewsize) + else + zoom(user, tile_offset, viewsize) /obj/item/device/binoculars/dropped(/obj/item/item, mob/user) . = ..() diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index de2a328de370..0a293fdb25f5 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -302,14 +302,14 @@ desc = "A red USCM issued flare. There are instructions on the side, it reads 'pull cord, make light'." w_class = SIZE_SMALL light_power = 2 - light_range = 5 + light_range = 7 icon_state = "flare" item_state = "flare" actions = list() //just pull it manually, neckbeard. raillight_compatible = 0 can_be_broken = FALSE var/burnt_out = FALSE - var/fuel = 0 + var/fuel = 16 MINUTES var/fuel_rate = AMOUNT_PER_TIME(1 SECONDS, 1 SECONDS) var/on_damage = 7 var/ammo_datum = /datum/ammo/flare @@ -327,7 +327,6 @@ /obj/item/device/flashlight/flare/Initialize() . = ..() - fuel = rand(9.5 MINUTES, 10.5 MINUTES) set_light_color(flame_tint) /obj/item/device/flashlight/flare/update_icon() @@ -362,9 +361,28 @@ /obj/item/device/flashlight/flare/process(delta_time) fuel -= fuel_rate * delta_time + flare_burn_down() if(fuel <= 0 || !on) burn_out() +/obj/item/device/flashlight/flare/proc/flare_burn_down() //Controls the way in which flares slowly die out. Needs to be overriden by children, or they will be forced to use this light behavior. + switch(fuel) //The code belows controls the timing on a flares burn out, and the corresponding reduction in effective range. + if(15.25 MINUTES to 16 MINUTES) + set_light_range(7) + if(14.5 MINUTES to 15.24 MINUTES) + set_light_range(6) + if(6.5 MINUTES to 14.49 MINUTES) + set_light_range(5) + if(5.0 MINUTES to 6.49 MINUTES) + set_light_range(4) + if(3.5 MINUTES to 4.99 MINUTES) + set_light_range(3) + if(2.0 MINUTES to 3.49 MINUTES) + set_light_range(2) + if(0 MINUTES to 1.99 MINUTES) + set_light_range(1) + set_light_power(0.5) // A power of 2 results in no light at all, while .5 results in a small light. + // Causes flares to stop with a rotation offset for visual purposes /obj/item/device/flashlight/flare/animation_spin(speed = 5, loop_amount = -1, clockwise = TRUE, sections = 3, angular_offset = 0, pixel_fuzz = 0) pixel_fuzz = 16 @@ -450,10 +468,14 @@ icon_state = "" //No sprite mouse_opacity = MOUSE_OPACITY_TRANSPARENT show_flame = FALSE + light_range = 7 /obj/item/device/flashlight/flare/on/illumination/Initialize() . = ..() - fuel = rand(4.5 MINUTES, 5.5 MINUTES) // Half the duration of a flare, but justified since it's invincible + fuel = rand(5.0 MINUTES, 6.0 MINUTES) // Approximately half the effective duration of a flare, but justified since it's invincible + +/obj/item/device/flashlight/flare/on/illumination/flare_burn_down() // Empty proc to override parent. + return /obj/item/device/flashlight/flare/on/illumination/update_icon() return @@ -472,12 +494,29 @@ anchored = TRUE//can't be picked up ammo_datum = /datum/ammo/flare/starshell show_flame = FALSE + light_range = 6 /obj/item/device/flashlight/flare/on/starshell_ash/Initialize(mapload, ...) if(mapload) return INITIALIZE_HINT_QDEL . = ..() - fuel = rand(30 SECONDS, 60 SECONDS) + fuel = rand(6.0 MINUTES, 6.5 MINUTES) + +/obj/item/device/flashlight/flare/on/starshell_ash/flare_burn_down() // Starshell's own burn_down curve, overrides parent flare. + switch(fuel) + if(6.0 MINUTES to 6.5 MINUTES) + set_light_range(6) + if(2.5 MINUTES to 5.99 MINUTES) + set_light_range(5) + if(2.0 MINUTES to 2.49 MINUTES) + set_light_range(4) + if(1.5 MINUTES to 1.99 MINUTES) + set_light_range(3) + if(1.0 MINUTES to 1.49 MINUTES) + set_light_range(2) + if(0 MINUTES to 0.99 MINUTES) + set_light_range(1) + set_light_power(0.5) /obj/item/device/flashlight/flare/on/illumination/chemical name = "chemical light" @@ -485,11 +524,17 @@ /obj/item/device/flashlight/flare/on/illumination/chemical/Initialize(mapload, amount) . = ..() - light_range = floor(amount * 0.04) - if(!light_range) + if(amount < 1) return INITIALIZE_HINT_QDEL - set_light(light_range) - fuel = amount * 5 SECONDS + var/square_amount = sqrt(amount) + // Fuel quickly ramps up to about 15.5 mins then tapers off the more volume there is (6s min) + fuel = max(((-150 / square_amount) - 2 * sqrt(amount + 2000) + 120), 0.1) MINUTES + // Range gradually ramps up from 1 to 15 + light_range = max(min(square_amount - 3, 15), MINIMUM_USEFUL_LIGHT_RANGE) + // Power slowly ramps up from 1 to 5 + light_power = min(0.1 * square_amount + 1, 5) + set_light(light_range, light_power) + /obj/item/device/flashlight/slime gender = PLURAL @@ -529,6 +574,7 @@ item_state = "cas_flare" layer = ABOVE_FLY_LAYER ammo_datum = /datum/ammo/flare/signal + light_range = 5 var/faction = "" var/datum/cas_signal/signal var/activate_message = TRUE @@ -539,6 +585,9 @@ . = ..() fuel = rand(160 SECONDS, 200 SECONDS) +/obj/item/device/flashlight/flare/signal/flare_burn_down() // Empty proc to override parent. + return + /obj/item/device/flashlight/flare/signal/attack_self(mob/living/carbon/human/user) if(!istype(user)) return diff --git a/code/game/objects/items/devices/helmet_visors.dm b/code/game/objects/items/devices/helmet_visors.dm index e2005a841bc3..723b6b4ef817 100644 --- a/code/game/objects/items/devices/helmet_visors.dm +++ b/code/game/objects/items/devices/helmet_visors.dm @@ -169,7 +169,7 @@ helmet_overlay = "weld_visor" /obj/item/device/helmet_visor/welding_visor/activate_visor(obj/item/clothing/head/helmet/marine/attached_helmet, mob/living/carbon/human/user) - attached_helmet.vision_impair = VISION_IMPAIR_MAX + attached_helmet.vision_impair = VISION_IMPAIR_ULTRA attached_helmet.flags_inventory |= COVEREYES|COVERMOUTH attached_helmet.flags_inv_hide |= HIDEEYES|HIDEFACE attached_helmet.eye_protection = EYE_PROTECTION_WELDING @@ -201,9 +201,9 @@ toggle_off_sound = 'sound/handling/toggle_nv2.ogg' /// The internal battery for the visor - var/obj/item/cell/high/power_cell + var/obj/item/cell/super/power_cell - /// About 5 minutes active use charge (hypothetically) + /// About 10 minutes active use charge (hypothetically) var/power_use = 33 /// The alpha of darkness we set to for the mob while the visor is on, not completely fullbright but see-able diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index 95fc3bb76f2c..86cb6f4dfb1e 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -216,12 +216,10 @@ /obj/item/device/encryptionkey/soc name = "\improper SOF Radio Encryption Key" icon_state = "binary_key" - channels = list(RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_INTEL = TRUE, RADIO_CHANNEL_JTAC = TRUE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_CRYO = FALSE) + channels = list(SQUAD_SOF = TRUE, RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_INTEL = TRUE, RADIO_CHANNEL_JTAC = TRUE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_CRYO = FALSE) /obj/item/device/encryptionkey/soc/forecon - name = "\improper SOF Radio Encryption Key" - icon_state = "binary_key" - channels = list(RADIO_CHANNEL_COLONY= TRUE) + channels = list(SQUAD_SOF = TRUE, RADIO_CHANNEL_COLONY = TRUE) //ERT, PMC @@ -287,6 +285,9 @@ /obj/item/device/encryptionkey/upp/command name = "\improper UPP Command Radio Encryption Key" channels = list(RADIO_CHANNEL_UPP_CMD = TRUE, RADIO_CHANNEL_UPP_GEN = TRUE, RADIO_CHANNEL_UPP_ENGI = TRUE, RADIO_CHANNEL_UPP_MED = TRUE, RADIO_CHANNEL_UPP_CCT = TRUE) + +/obj/item/device/encryptionkey/upp/command/acting + abstract = TRUE //--------------------------------------------------- //CLF Keys /obj/item/device/encryptionkey/clf diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 5842b3204f47..205fa7710312 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -165,6 +165,11 @@ to_chat(user, SPAN_NOTICE("This headset doesn't have any encryption keys! How useless...")) if(istype(W, /obj/item/device/encryptionkey/)) + for (var/obj/item/device/encryptionkey/key as anything in keys) + if (istype(key, W.type)) + to_chat(user, SPAN_NOTICE("A [W.name] is already installed on this device!")) + return + var/keycount = 0 for (var/obj/item/device/encryptionkey/key in keys) if(!key.abstract) @@ -362,7 +367,16 @@ ///Change the minimap icon to a dead icon /obj/item/device/radio/headset/proc/set_dead_on_minimap(z_level, marker_flags) - SSminimaps.add_marker(wearer, z_level, marker_flags, given_image = wearer.assigned_equipment_preset.get_minimap_icon(wearer), overlay_iconstates = list("defibbable")) + var/icon_to_use + if(world.time > wearer.timeofdeath + wearer.revive_grace_period - 1 MINUTES) + icon_to_use = "defibbable4" + else if(world.time > wearer.timeofdeath + wearer.revive_grace_period - 2 MINUTES) + icon_to_use = "defibbable3" + else if(world.time > wearer.timeofdeath + wearer.revive_grace_period - 3 MINUTES) + icon_to_use = "defibbable2" + else + icon_to_use = "defibbable" + SSminimaps.add_marker(wearer, z_level, marker_flags, given_image = wearer.assigned_equipment_preset.get_minimap_icon(wearer), overlay_iconstates = list(icon_to_use)) ///Change the minimap icon to a undefibbable icon /obj/item/device/radio/headset/proc/set_undefibbable_on_minimap(z_level, marker_flags) diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 489aa8827718..baef29b84e81 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -85,3 +85,11 @@ /obj/item/device/radio/intercom/saipan name = "dropship saipan intercom" frequency = DS3_FREQ + +/obj/item/device/radio/intercom/morana + name = "dropship morana intercom" + frequency = UPP_DS1_FREQ + +/obj/item/device/radio/intercom/devana + name = "dropship devana intercom" + frequency = UPP_DS2_FREQ diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 0e7680cd2f7d..e2a77e4b8977 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -8,6 +8,7 @@ PLANT ANALYZER MASS SPECTROMETER REAGENT SCANNER FORENSIC SCANNER +K9 SCANNER */ /obj/item/device/t_scanner name = "\improper T-ray scanner" @@ -491,3 +492,59 @@ FORENSIC SCANNER flags_atom = FPRINT flags_equip_slot = SLOT_WAIST inherent_traits = list(TRAIT_TOOL_TRADEBAND) + +/obj/item/device/k9_scanner + name = "\improper K9 tracking device" + desc = "A small handheld tool used to track Synthetic K9 helpers, they tend to run off to strange places at inopportune times..." + icon_state = "tracking0" + item_state = "tracking1" + pickup_sound = 'sound/handling/multitool_pickup.ogg' + drop_sound = 'sound/handling/multitool_drop.ogg' + flags_atom = FPRINT + force = 5 + w_class = SIZE_TINY + throwforce = 5 + throw_range = 15 + throw_speed = SPEED_VERY_FAST + + matter = list("metal" = 50,"glass" = 20) + + var/mob/living/carbon/human/tracked_k9 + +/obj/item/device/k9_scanner/Destroy() + . = ..() + tracked_k9 = null + +/obj/item/device/k9_scanner/attack(mob/attacked_mob as mob, mob/user as mob) + if(!isk9synth(attacked_mob)) + to_chat(user, SPAN_BOLDWARNING("ERROR: Cannot Sync To This.")) + return + //we now know the attacked mob is a k9 + tracked_k9 = attacked_mob + icon_state = "tracking1" + to_chat(user, SPAN_WARNING("[src] is now synced to: [attacked_mob].")) + +/obj/item/device/k9_scanner/attack_self(mob/user) + . = ..() + if (!tracked_k9) + to_chat(user, SPAN_WARNING("ERROR: No K9 unit currently tracked. Use scanner on K9 unit to track them.")) + return + + var/turf/self_turf = get_turf(src) + var/turf/scanner_turf = get_turf(tracked_k9) + var/area/self_area = get_area(self_turf) + var/area/scanner_area = get_area(scanner_turf) + + if(self_turf.z != scanner_turf.z || self_area.fake_zlevel != scanner_area.fake_zlevel) + to_chat(user, SPAN_BOLDWARNING("The [src] lights up: UNABLE TO REACH LINKED K9!")) + playsound(src, 'sound/machines/buzz-sigh.ogg', 15, TRUE) + return + + var/dist = get_dist(self_turf, scanner_turf) + var/direction = dir2text(Get_Compass_Dir(self_turf, scanner_turf)) + if(dist > 1) + to_chat(user, SPAN_BOLDNOTICE("[src] lights up: [tracked_k9] is '[dist] meters to the [direction]'")) + else + to_chat(user, SPAN_BOLDNOTICE("[src] lights up: --><--")) + playsound(src, 'sound/machines/ping.ogg', 15, TRUE) + diff --git a/code/game/objects/items/devices/walkman.dm b/code/game/objects/items/devices/walkman.dm index bef8e8f5ff79..b88bfb017abd 100644 --- a/code/game/objects/items/devices/walkman.dm +++ b/code/game/objects/items/devices/walkman.dm @@ -7,6 +7,7 @@ icon_state = "walkman" w_class = SIZE_SMALL flags_equip_slot = SLOT_WAIST | SLOT_EAR + flags_obj = OBJ_IS_HELMET_GARB actions_types = list(/datum/action/item_action/walkman/play_pause,/datum/action/item_action/walkman/next_song,/datum/action/item_action/walkman/restart_song) var/obj/item/device/cassette_tape/tape var/paused = TRUE @@ -311,6 +312,7 @@ icon = 'icons/obj/items/walkman.dmi' icon_state = "cassette_flip" w_class = SIZE_SMALL + flags_obj = OBJ_IS_HELMET_GARB black_market_value = 15 var/side1_icon = "cassette" var/flipped = FALSE //Tape side diff --git a/code/game/objects/items/explosives/explosive.dm b/code/game/objects/items/explosives/explosive.dm index 0be81ba8a0ed..bd9e57a108d8 100644 --- a/code/game/objects/items/explosives/explosive.dm +++ b/code/game/objects/items/explosives/explosive.dm @@ -19,8 +19,8 @@ var/max_container_volume = 120 var/current_container_volume = 0 var/assembly_stage = ASSEMBLY_EMPTY //The assembly_stage of the assembly - var/list/reaction_limits = list("max_ex_power" = 175, "base_ex_falloff" = 75, "max_ex_shards" = 32, - "max_fire_rad" = 5, "max_fire_int" = 20, "max_fire_dur" = 24, + var/list/reaction_limits = list("max_ex_power" = 180, "base_ex_falloff" = 80, "max_ex_shards" = 40, + "max_fire_rad" = 5, "max_fire_int" = 25, "max_fire_dur" = 24, "min_fire_rad" = 1, "min_fire_int" = 3, "min_fire_dur" = 3 ) var/falloff_mode = EXPLOSION_FALLOFF_SHAPE_LINEAR diff --git a/code/game/objects/items/explosives/grenades/chem_grenade.dm b/code/game/objects/items/explosives/grenades/chem_grenade.dm index 48430aacecc9..ce08d7dfe08d 100644 --- a/code/game/objects/items/explosives/grenades/chem_grenade.dm +++ b/code/game/objects/items/explosives/grenades/chem_grenade.dm @@ -8,8 +8,8 @@ customizable = TRUE underslug_launchable = TRUE allowed_sensors = list(/obj/item/device/assembly/timer) - max_container_volume = 90 - matter = list("metal" = 3750) + max_container_volume = 120 + matter = list("metal" = 4250) has_blast_wave_dampener = TRUE /obj/item/explosive/grenade/custom/prime() @@ -22,8 +22,8 @@ icon_state = "large_grenade_custom" allowed_containers = list(/obj/item/reagent_container/glass) max_container_volume = 180 - reaction_limits = list( "max_ex_power" = 215, "base_ex_falloff" = 90, "max_ex_shards" = 32, - "max_fire_rad" = 5, "max_fire_int" = 20, "max_fire_dur" = 24, + reaction_limits = list( "max_ex_power" = 220, "base_ex_falloff" = 120, "max_ex_shards" = 80, + "max_fire_rad" = 6, "max_fire_int" = 30, "max_fire_dur" = 32, "min_fire_rad" = 1, "min_fire_int" = 3, "min_fire_dur" = 3 ) underslug_launchable = FALSE diff --git a/code/game/objects/items/explosives/grenades/marines.dm b/code/game/objects/items/explosives/grenades/marines.dm index e669a27ab1a7..c3b334fbf19c 100644 --- a/code/game/objects/items/explosives/grenades/marines.dm +++ b/code/game/objects/items/explosives/grenades/marines.dm @@ -182,10 +182,10 @@ desc = "Functions identically to the standard AGM-F 40mm grenade, except instead of exploding into shrapnel, the hornet shell shoots off holo-targeting .22lr rounds. The equivalent to buckshot at-range." icon_state = "grenade_hornet" item_state = "grenade_hornet_active" - shrapnel_count = 5 + shrapnel_count = 15 shrapnel_type = /datum/ammo/bullet/shrapnel/hornet_rounds direct_hit_shrapnel = 5 - dispersion_angle = 15//tight cone + dispersion_angle = 25//tight cone /obj/item/explosive/grenade/high_explosive/airburst/starshell name = "\improper M74 AGM-S Star Shell" @@ -485,9 +485,9 @@ /// Factor to mutiply the effect range has on damage. var/falloff_dam_reduction_mult = 20 /// Post falloff calc damage is divided by this to get xeno slowdown - var/xeno_slowdown_numerator = 12 + var/xeno_slowdown_numerator = 11 /// Post falloff calc damage is multipled by this to get human stamina damage - var/human_stam_dam_factor = 0.9 + var/human_stam_dam_factor = 0.5 /obj/item/explosive/grenade/sebb/get_examine_text(mob/user) . = ..() @@ -613,14 +613,14 @@ mob.apply_damage(damage_applied, BURN) if((mob_dist < (range-3))) // 2 tiles around small superslow mob.Superslow(2) - mob.Slow(damage_applied/11) + mob.Slow(damage_applied/xeno_slowdown_numerator) if(mob_dist < 1) // Range based stuff, standing ontop of the equivalent of a canned lighting bolt should mess you up. mob.Superslow(3) // Note that humans will likely be in stamcrit so it's always worse for them when ontop of it and we can just balancing it on xenos. mob.eye_blurry = damage_applied/4 mob.Daze(1) else if((mob_dist < (range-1)) && (mob.mob_size < MOB_SIZE_XENO_VERY_SMALL)) // Flicker stun humans that are closer to the grenade and larvas too. - mob.apply_effect(1 + (damage_applied/100),WEAKEN) // 1 + damage/40 + mob.apply_effect(1 + (damage_applied/100),WEAKEN) // 1 + damage/100 mob.eye_blurry = damage_applied/8 else diff --git a/code/game/objects/items/explosives/mine.dm b/code/game/objects/items/explosives/mine.dm index 6e7aa2bdccc3..b92d3ccf97cb 100644 --- a/code/game/objects/items/explosives/mine.dm +++ b/code/game/objects/items/explosives/mine.dm @@ -17,8 +17,8 @@ antigrief_protection = TRUE allowed_sensors = list(/obj/item/device/assembly/prox_sensor) max_container_volume = 120 - reaction_limits = list( "max_ex_power" = 105, "base_ex_falloff" = 60, "max_ex_shards" = 32, - "max_fire_rad" = 5, "max_fire_int" = 12, "max_fire_dur" = 18, + reaction_limits = list( "max_ex_power" = 100, "base_ex_falloff" = 80, "max_ex_shards" = 40, + "max_fire_rad" = 4, "max_fire_int" = 20, "max_fire_dur" = 18, "min_fire_rad" = 2, "min_fire_int" = 3, "min_fire_dur" = 3 ) angle = 60 diff --git a/code/game/objects/items/explosives/plastic.dm b/code/game/objects/items/explosives/plastic.dm index c6a3dfaed5f9..2ac3c475aef5 100644 --- a/code/game/objects/items/explosives/plastic.dm +++ b/code/game/objects/items/explosives/plastic.dm @@ -9,13 +9,13 @@ w_class = SIZE_SMALL allowed_sensors = list(/obj/item/device/assembly/prox_sensor, /obj/item/device/assembly/signaller, /obj/item/device/assembly/timer) max_container_volume = 180 - reaction_limits = list( "max_ex_power" = 260, "base_ex_falloff" = 90, "max_ex_shards" = 64, - "max_fire_rad" = 6, "max_fire_int" = 26, "max_fire_dur" = 30, + reaction_limits = list( "max_ex_power" = 280, "base_ex_falloff" = 120, "max_ex_shards" = 100, + "max_fire_rad" = 4, "max_fire_int" = 50, "max_fire_dur" = 20, "min_fire_rad" = 2, "min_fire_int" = 4, "min_fire_dur" = 5 ) var/deploying_time = 50 - var/penetration = 1.5 // How much damage adjacent walls receive + var/penetration = 2 // How much damage adjacent walls receive var/timer = 10 // detonation time var/min_timer = 10 var/atom/plant_target = null //which atom the plstique explosive is planted on diff --git a/code/game/objects/items/explosives/warhead.dm b/code/game/objects/items/explosives/warhead.dm index 1b7ec1ed4f94..e026e635fad7 100644 --- a/code/game/objects/items/explosives/warhead.dm +++ b/code/game/objects/items/explosives/warhead.dm @@ -12,8 +12,8 @@ max_container_volume = 210 allow_star_shape = FALSE matter = list("metal" = 11250) //3 sheets - reaction_limits = list( "max_ex_power" = 240, "base_ex_falloff" = 90,"max_ex_shards" = 64, - "max_fire_rad" = 6, "max_fire_int" = 40, "max_fire_dur" = 48, + reaction_limits = list( "max_ex_power" = 220, "base_ex_falloff" = 160,"max_ex_shards" = 80, + "max_fire_rad" = 4, "max_fire_int" = 45, "max_fire_dur" = 48, "min_fire_rad" = 2, "min_fire_int" = 4, "min_fire_dur" = 5 ) has_blast_wave_dampener = TRUE @@ -24,8 +24,8 @@ icon_state = "warhead_mortar" max_container_volume = 240 matter = list("metal" = 11250) //3 sheets - reaction_limits = list( "max_ex_power" = 360, "base_ex_falloff" = 90, "max_ex_shards" = 128, - "max_fire_rad" = 8, "max_fire_int" = 40, "max_fire_dur" = 48, + reaction_limits = list( "max_ex_power" = 360, "base_ex_falloff" = 130, "max_ex_shards" = 200, + "max_fire_rad" = 8, "max_fire_int" = 45, "max_fire_dur" = 48, "min_fire_rad" = 3, "min_fire_int" = 5, "min_fire_dur" = 5 ) has_blast_wave_dampener = TRUE diff --git a/code/game/objects/items/fulton.dm b/code/game/objects/items/fulton.dm index 9cdc2b78b609..5cd2d0470eaa 100644 --- a/code/game/objects/items/fulton.dm +++ b/code/game/objects/items/fulton.dm @@ -23,6 +23,7 @@ GLOBAL_LIST_EMPTY(deployed_fultons) var/turf/original_location = null var/attachable_atoms = list(/obj/structure/closet/crate) var/datum/turf_reservation/reservation + var/faction /obj/item/stack/fulton/New(loc, amount, atom_to_attach) ..() @@ -125,6 +126,7 @@ GLOBAL_LIST_EMPTY(deployed_fultons) F.add_fingerprint(user) user.count_niche_stat(STATISTICS_NICHE_FULTON) use(1) + F.faction = user.faction F.deploy_fulton() else to_chat(user, SPAN_WARNING("You can't attach [src] to [target_atom].")) diff --git a/code/game/objects/items/pamphlets.dm b/code/game/objects/items/pamphlets.dm index d8bbb2a01432..315b8e26b99e 100644 --- a/code/game/objects/items/pamphlets.dm +++ b/code/game/objects/items/pamphlets.dm @@ -99,6 +99,43 @@ ID.set_assignment((user.assigned_squad ? (user.assigned_squad.name + " ") : "") + "Spotter") GLOB.data_core.manifest_modify(user.real_name, WEAKREF(user), "Spotter") +/obj/item/pamphlet/skill/k9_handler + name = "K9 handler instructional pamphlet" + desc = "A pamphlet used to quickly impart vital knowledge. This one has the image of a Synthetic K9 Rescue unit on it." + icon_state = "pamphlet_k9_handler" + trait = /datum/character_trait/skills/k9_handler + bypass_pamphlet_limit = TRUE + +/obj/item/pamphlet/skill/k9_handler/can_use(mob/living/carbon/human/user) + if(isk9synth(user)) + to_chat(user, SPAN_WARNING("You don't need to use this! Give it to another marine to make them your handler.")) + return FALSE + + if(user.job != JOB_SQUAD_MEDIC && user.job != JOB_POLICE) + to_chat(user, SPAN_WARNING("This is not meant for you.")) + return + + var/obj/item/card/id/ID = user.get_idcard() + if(!istype(ID)) //not wearing an ID + to_chat(user, SPAN_WARNING("You should wear your ID before doing this.")) + return FALSE + if(!ID.check_biometrics(user)) + to_chat(user, SPAN_WARNING("You should wear your ID before doing this.")) + return FALSE + + return ..() + +/obj/item/pamphlet/skill/k9_handler/on_use(mob/living/carbon/human/user) + . = ..() + user.rank_fallback = "medk9" + user.hud_set_squad() + user.assigned_equipment_preset.minimap_icon = "medic_k9" + user.update_minimap_icon() + + var/obj/item/card/id/ID = user.get_idcard() + ID.set_assignment((user.assigned_squad ? (user.assigned_squad.name + " ") : "") + "K9 Handler") + GLOB.data_core.manifest_modify(user.real_name, WEAKREF(user), "K9 Handler") + /obj/item/pamphlet/skill/machinegunner name = "heavy machinegunner instructional pamphlet" desc = "A pamphlet used to quickly impart vital knowledge. This one has an engineering and a machinegun insignia." diff --git a/code/game/objects/items/reagent_containers/autoinjectors.dm b/code/game/objects/items/reagent_containers/autoinjectors.dm index 9c4726371f90..885c3f75ddb6 100644 --- a/code/game/objects/items/reagent_containers/autoinjectors.dm +++ b/code/game/objects/items/reagent_containers/autoinjectors.dm @@ -265,6 +265,13 @@ else to_chat(user, SPAN_DANGER("You have no idea where to inject [src].")) + if(uses_left == 0) + addtimer(CALLBACK(src, PROC_REF(remove_crystal)), 120 SECONDS) + +/obj/item/reagent_container/hypospray/autoinjector/yautja/proc/remove_crystal() + visible_message(SPAN_DANGER("[src] collapses into nothing.")) + qdel(src) + /obj/item/reagent_container/hypospray/autoinjector/skillless name = "first-aid autoinjector" chemname = "tricordrazine" diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index c4a496a12366..0636244bb0fd 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -271,6 +271,13 @@ var/indestructible_splints = FALSE +/obj/item/stack/medical/splint/Initialize(mapload, amount) + . = ..() + if(SSticker.mode && MODE_HAS_TOGGLEABLE_FLAG(MODE_INDESTRUCTIBLE_SPLINTS)) + icon_state = "nanosplint" + indestructible_splints = TRUE + update_icon() + /obj/item/stack/medical/splint/attack(mob/living/carbon/M, mob/user) if(..()) return 1 diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 9fcaf43d2af3..805f0ecf4030 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -453,6 +453,26 @@ xeno_icon_state = "medicpack" xeno_types = list(/mob/living/carbon/xenomorph/runner, /mob/living/carbon/xenomorph/praetorian, /mob/living/carbon/xenomorph/drone, /mob/living/carbon/xenomorph/warrior, /mob/living/carbon/xenomorph/defender, /mob/living/carbon/xenomorph/sentinel, /mob/living/carbon/xenomorph/spitter) +/obj/item/storage/backpack/marine/k9_synth/ + icon_override = 'icons/mob/humans/species/synth_k9/onmob/synth_k9_overlays.dmi' + uniform_restricted = list(/obj/item/clothing/under/rank/synthetic/synth_k9) //K9 Synth only + force_overlays_on = TRUE + +/obj/item/storage/backpack/marine/k9_synth/cargopack + name = "\improper M209 portable K9 backpack" + desc = "Form fitted for the K9 Rescue Unit line of synthetics. Designed to lug gear into the battlefield." + icon_state = "marinepack_k9" + +/obj/item/storage/backpack/marine/k9_synth/medicalpack + name = "\improper M210 portable K9 medical backpack" + desc = "Form fitted for the K9 Rescue Unit line of synthetics. For carrying medical supplies." + icon_state = "marinepack_medic_k9" + +/obj/item/storage/backpack/marine/k9_synth/mppack + name = "\improper M553 portable K9 police backpack" + desc = "Form fitted for the K9 Rescue Unit line of synthetics. For carrying MP Equipment." + icon_state = "mppack_k9" + /obj/item/storage/backpack/marine/medic/upp name = "\improper UPP corpsman backpack" desc = "Uncommon issue backpack worn by UPP medics from isolated sectors. You can swear you can see a faded USCM symbol." diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 139d90ff33ce..b1e7f65b82d0 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -301,10 +301,10 @@ new /obj/item/stack/medical/splint(src) /obj/item/storage/belt/medical/lifesaver/full/dutch/fill_preset_inventory() - new /obj/item/stack/medical/advanced/bruise_pack(src) - new /obj/item/stack/medical/advanced/bruise_pack(src) - new /obj/item/stack/medical/advanced/ointment(src) - new /obj/item/stack/medical/advanced/ointment(src) + new /obj/item/stack/medical/advanced/bruise_pack/upgraded(src) + new /obj/item/stack/medical/advanced/bruise_pack/upgraded(src) + new /obj/item/stack/medical/advanced/ointment/upgraded(src) + new /obj/item/stack/medical/advanced/ointment/upgraded(src) new /obj/item/reagent_container/hypospray/autoinjector/adrenaline(src) new /obj/item/reagent_container/hypospray/autoinjector/dexalinp(src) new /obj/item/reagent_container/hypospray/autoinjector/oxycodone(src) @@ -315,7 +315,7 @@ new /obj/item/storage/pill_bottle/inaprovaline(src) new /obj/item/storage/pill_bottle/tramadol(src) new /obj/item/storage/pill_bottle/peridaxon(src) - new /obj/item/stack/medical/splint(src) + new /obj/item/stack/medical/splint/nano(src) new /obj/item/device/healthanalyzer(src) new /obj/item/storage/pill_bottle/imidazoline(src) new /obj/item/storage/pill_bottle/alkysine(src) @@ -343,6 +343,17 @@ new /obj/item/reagent_container/hypospray/autoinjector/oxycodone(src) new /obj/item/device/healthanalyzer(src) +/obj/item/storage/belt/medical/lifesaver/dutch/partial/fill_preset_inventory() + new /obj/item/stack/medical/advanced/bruise_pack/upgraded(src) + new /obj/item/stack/medical/advanced/ointment/upgraded(src) + new /obj/item/stack/medical/splint/nano(src) + new /obj/item/reagent_container/hypospray/autoinjector/oxycodone(src) + new /obj/item/storage/pill_bottle/bicaridine(src) + new /obj/item/storage/pill_bottle/kelotane(src) + new /obj/item/storage/pill_bottle/inaprovaline(src) + new /obj/item/storage/pill_bottle/tramadol(src) + new /obj/item/device/healthanalyzer(src) + /obj/item/storage/belt/medical/lifesaver/upp name = "\improper Type 41 pattern lifesaver bag" desc = "The Type 41 load rig is the standard load-bearing equipment of the UPP military. This configuration mounts a duffel bag filled with a range of injectors and light medical supplies, and is common among medics." @@ -1307,6 +1318,16 @@ "icon_x" = -11, "icon_y" = -5)) +/obj/item/storage/belt/gun/m39/full/fill_preset_inventory() + handle_item_insertion(new /obj/item/weapon/gun/smg/m39(src)) + for(var/i = 1 to storage_slots - 1) + new /obj/item/ammo_magazine/smg/m39(src) + +/obj/item/storage/belt/gun/m39/full/extended/fill_preset_inventory() + handle_item_insertion(new /obj/item/weapon/gun/smg/m39(src)) + for(var/i = 1 to storage_slots - 1) + new /obj/item/ammo_magazine/smg/m39/extended(src) + #define MAXIMUM_MAGAZINE_COUNT 2 /obj/item/storage/belt/gun/xm51 diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index a684586675a6..405dcefeff5f 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -321,6 +321,9 @@ /obj/item/tool/surgery/scalpel, /obj/item/tool/surgery/hemostat, /obj/item/tool/surgery/retractor, + /obj/item/tool/surgery/surgical_line, + /obj/item/tool/surgery/synthgraft, + /obj/item/tool/surgery/FixOVein, ) /obj/item/storage/surgical_case/regular @@ -345,7 +348,7 @@ /obj/item/toy/dice, /obj/item/paper, ) - storage_flags = STORAGE_FLAGS_BOX|STORAGE_CLICK_GATHER|STORAGE_QUICK_GATHER + storage_flags = STORAGE_FLAGS_BOX|STORAGE_CLICK_GATHER|STORAGE_QUICK_GATHER|STORAGE_DISABLE_USE_EMPTY storage_slots = null use_sound = "pillbottle" max_storage_space = 16 @@ -359,6 +362,23 @@ maptext_x = 18 maptext_y = 3 + var/base_icon = "pill_canister" + var/static/list/possible_colors = list( + "Orange" = "", + "Blue" = "1", + "Yellow" = "2", + "Light Purple" = "3", + "Light Grey" = "4", + "White" = "5", + "Light Green" = "6", + "Cyan" = "7", + "Bordeaux" = "8", + "Aquamarine" = "9", + "Grey" = "10", + "Red" = "11", + "Black" = "12", + ) + /obj/item/storage/pill_bottle/Initialize() . = ..() if(display_maptext == FALSE) @@ -515,28 +535,14 @@ /obj/item/storage/pill_bottle/proc/choose_color(mob/user) if(!user) user = usr - var/static/list/possible_colors = list( - "Orange" = "", - "Blue" = "1", - "Yellow" = "2", - "Light Purple" = "3", - "Light Grey" = "4", - "White" = "5", - "Light Green" = "6", - "Cyan" = "7", - "Bordeaux" = "8", - "Aquamarine" = "9", - "Grey" = "10", - "Red" = "11", - "Black" = "12", - ) + var/selected_color = tgui_input_list(user, "Select a color.", "Color choice", possible_colors) if(!selected_color) return selected_color = possible_colors[selected_color] - icon_state = "pill_canister" + selected_color + icon_state = base_icon + selected_color to_chat(user, SPAN_NOTICE("You color [src].")) update_icon() @@ -759,7 +765,7 @@ max_w_class = 0 max_storage_space = 4 skilllock = SKILL_MEDICAL_DEFAULT - storage_flags = STORAGE_FLAGS_BOX + storage_flags = STORAGE_FLAGS_BOX|STORAGE_DISABLE_USE_EMPTY display_maptext = FALSE /obj/item/storage/pill_bottle/packet/Initialize() diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm index 5993aa6b6f67..1f9de36b2a99 100644 --- a/code/game/objects/items/storage/pouch.dm +++ b/code/game/objects/items/storage/pouch.dm @@ -190,7 +190,7 @@ /obj/item/storage/pouch/firstaid name = "first-aid pouch" - desc = "It contains, by default, autoinjectors. But it may also hold ointments, bandages, and pill packets." + desc = "A small pouch that can hold basic medical equipment, such as autoinjectors and bandages." icon_state = "firstaid" storage_slots = 4 can_hold = list( @@ -202,7 +202,7 @@ ) /obj/item/storage/pouch/firstaid/full - desc = "Contains a painkiller autoinjector, first-aid autoinjector, some ointment, and some bandages." + desc = "Contains a variety of autoinjectors for quickly treating injuries." /obj/item/storage/pouch/firstaid/full/fill_preset_inventory() new /obj/item/reagent_container/hypospray/autoinjector/bicaridine(src) @@ -210,12 +210,18 @@ new /obj/item/reagent_container/hypospray/autoinjector/tramadol(src) new /obj/item/reagent_container/hypospray/autoinjector/emergency(src) +/obj/item/storage/pouch/firstaid/full/alternate + desc = "Contains a first-aid autoinjector, bandages, ointment, and splints." + /obj/item/storage/pouch/firstaid/full/alternate/fill_preset_inventory() new /obj/item/reagent_container/hypospray/autoinjector/tricord(src) new /obj/item/stack/medical/splint(src) new /obj/item/stack/medical/ointment(src) new /obj/item/stack/medical/bruise_pack(src) +/obj/item/storage/pouch/firstaid/full/pills + desc = "Contains a variety of pill packets for treating many injuries." + /obj/item/storage/pouch/firstaid/full/pills/fill_preset_inventory() new /obj/item/storage/pill_bottle/packet/bicaridine(src) new /obj/item/storage/pill_bottle/packet/kelotane(src) @@ -1412,6 +1418,7 @@ icon_state = "cassette_pouch_closed" var/base_icon_state = "cassette_pouch" w_class = SIZE_SMALL + flags_obj = OBJ_IS_HELMET_GARB can_hold = list(/obj/item/device/cassette_tape, /obj/item/tape/regulation) storage_slots = 3 diff --git a/code/game/objects/items/storage/smartpack.dm b/code/game/objects/items/storage/smartpack.dm index 3763064aa333..afdfbdfa2246 100644 --- a/code/game/objects/items/storage/smartpack.dm +++ b/code/game/objects/items/storage/smartpack.dm @@ -176,7 +176,8 @@ update_icon(user) /obj/item/storage/backpack/marine/smartpack/proc/protective_form(mob/living/carbon/human/user) - if(!istype(user) || activated_form || immobile_form) + if(!istype(user) || activated_form || immobile_form || user.stat == DEAD) + to_chat(user, SPAN_WARNING("You cannot use the S-V42 prototype smartpack right now.")) return if(battery_charge < PROTECTIVE_COST) @@ -224,7 +225,8 @@ /obj/item/storage/backpack/marine/smartpack/proc/immobile_form(mob/living/user) - if(activated_form) + if(activated_form || user.stat == DEAD) + to_chat(user, SPAN_WARNING("You cannot use the S-V42 prototype smartpack right now.")) return if(battery_charge < IMMOBILE_COST && !immobile_form) @@ -263,7 +265,8 @@ /obj/item/storage/backpack/marine/smartpack/proc/repair_form(mob/user) - if(!ishuman(user) || activated_form || repairing) + if(!ishuman(user) || activated_form || repairing || user.stat == DEAD) + to_chat(user, SPAN_WARNING("You cannot use the S-V42 prototype smartpack right now.")) return if(battery_charge < REPAIR_COST) @@ -322,6 +325,8 @@ item_state = "w_smartpack" icon_state = "w_smartpack" +/obj/item/storage/backpack/marine/smartpack/white/drained + battery_charge = 0 #undef BACKPACK_LIGHT_LEVEL #undef PROTECTIVE_COST diff --git a/code/game/objects/items/storage/storage.dm b/code/game/objects/items/storage/storage.dm index c04de364baf7..1e1d12760cab 100644 --- a/code/game/objects/items/storage/storage.dm +++ b/code/game/objects/items/storage/storage.dm @@ -857,7 +857,8 @@ W is always an item. stop_warning prevents messaging. user may be null.**/ //Clicking on itself will empty it, if it has contents and the verb to do that. Contents but no verb means nothing happens. if(length(contents)) - empty(user) + if (!(storage_flags & STORAGE_DISABLE_USE_EMPTY)) + empty(user) return //Otherwise we'll try to fold it. diff --git a/code/game/objects/items/tools/flame_tools.dm b/code/game/objects/items/tools/flame_tools.dm index 8af7d15e0ff3..45097c57c153 100644 --- a/code/game/objects/items/tools/flame_tools.dm +++ b/code/game/objects/items/tools/flame_tools.dm @@ -27,6 +27,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM icon_state = "candle1" item_state = "candle1" w_class = SIZE_TINY + flags_obj = OBJ_IS_HELMET_GARB var/wax = 800 diff --git a/code/game/objects/items/tools/maintenance_tools.dm b/code/game/objects/items/tools/maintenance_tools.dm index f45953040a07..d5c7e371025d 100644 --- a/code/game/objects/items/tools/maintenance_tools.dm +++ b/code/game/objects/items/tools/maintenance_tools.dm @@ -159,6 +159,7 @@ */ /obj/item/tool/weldingtool name = "blowtorch" + desc = "A blowtorch for welding and cutting metals." icon = 'icons/obj/items/items.dmi' icon_state = "welder" pickup_sound = 'sound/handling/weldingtool_pickup.ogg' @@ -188,6 +189,8 @@ var/welding = 0 /// The max amount of fuel the welder can hold var/max_fuel = 40 + /// Adding this line of code to determine whether a welder should have fuel when created or not. + var/starting_fuel = TRUE /// Used to slowly deplete the fuel when the tool is left on. var/weld_tick = 0 var/has_welding_screen = FALSE @@ -196,7 +199,9 @@ /obj/item/tool/weldingtool/Initialize() . = ..() create_reagents(max_fuel) - reagents.add_reagent("fuel", max_fuel) + if (starting_fuel) + reagents.add_reagent("fuel", max_fuel) + base_icon_state = initial(icon_state) return @@ -417,6 +422,9 @@ to_chat(H, SPAN_WARNING("Your eyes are really starting to hurt. This can't be good for you!")) return FALSE +/obj/item/tool/weldingtool/empty + starting_fuel = FALSE + /obj/item/tool/weldingtool/largetank name = "industrial blowtorch" max_fuel = 60 diff --git a/code/game/objects/items/toys/cards.dm b/code/game/objects/items/toys/cards.dm index 89aea51bb8c0..4c466fba43f2 100644 --- a/code/game/objects/items/toys/cards.dm +++ b/code/game/objects/items/toys/cards.dm @@ -21,6 +21,7 @@ icon = 'icons/obj/items/playing_cards.dmi' icon_state = "deck" w_class = SIZE_TINY + flags_obj = OBJ_IS_HELMET_GARB var/base_icon = "deck" var/max_cards = 52 @@ -50,6 +51,7 @@ icon_state = "deck_uno" base_icon = "deck_uno" max_cards = 108 + flags_obj = OBJ_IS_HELMET_GARB /obj/item/toy/deck/uno/populate_deck() var/card_id = 1 diff --git a/code/game/objects/items/toys/toys.dm b/code/game/objects/items/toys/toys.dm index 91d8164dcf38..cda721aae515 100644 --- a/code/game/objects/items/toys/toys.dm +++ b/code/game/objects/items/toys/toys.dm @@ -241,6 +241,7 @@ /obj/item/toy/prize icon_state = "ripleytoy" var/cooldown = 0 + w_class = SIZE_TINY //all credit to skasi for toy mech fun ideas /obj/item/toy/prize/attack_self(mob/user) @@ -315,6 +316,7 @@ desc = "Mini-Mecha action figure! Collect them all! 11/11." icon_state = "phazonprize" + /obj/item/toy/inflatable_duck name = "inflatable duck" desc = "No bother to sink or swim when you can just float!" diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 25b5b7eafff1..98c4d1938725 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -263,7 +263,7 @@ SPAN_NOTICE("You hear metal clanking.")) else buckled_mob.visible_message(\ - SPAN_NOTICE("[buckled_mob.name] unbuckled \himself!"),\ + SPAN_NOTICE("[buckled_mob.name] unbuckled [buckled_mob.p_them()]self!"),\ SPAN_NOTICE("You unbuckle yourself from [src]."),\ SPAN_NOTICE("You hear metal clanking")) unbuckle(buckled_mob) diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index 9e0fcf297346..6706f0a2f2ed 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -110,7 +110,7 @@ /obj/structure/proc/do_climb(mob/living/user, mods) if(!can_climb(user)) - return + return FALSE var/list/climbdata = list("climb_delay" = climb_delay) SEND_SIGNAL(user, COMSIG_LIVING_CLIMB_STRUCTURE, climbdata) @@ -120,10 +120,10 @@ user.visible_message(SPAN_WARNING("[user] starts [flags_atom & ON_BORDER ? "leaping over" : climb_over_string] \the [src]!")) if(!do_after(user, final_climb_delay, INTERRUPT_NO_NEEDHAND, BUSY_ICON_GENERIC, numticks = 2)) - return + return FALSE if(!can_climb(user)) - return + return FALSE var/turf/TT = get_turf(src) if(flags_atom & ON_BORDER) @@ -145,6 +145,7 @@ user.forceMove(TT) for(var/atom/movable/thing as anything in grabbed_things) // grabbed things aren't moved to the tile immediately to: make the animation better, preserve the grab thing.forceMove(TT) + return TRUE /obj/structure/proc/structure_shaken() diff --git a/code/game/objects/structures/barricade/handrail.dm b/code/game/objects/structures/barricade/handrail.dm index 2fde8de3fe98..f1cb891a9588 100644 --- a/code/game/objects/structures/barricade/handrail.dm +++ b/code/game/objects/structures/barricade/handrail.dm @@ -18,6 +18,18 @@ var/build_state = BARRICADE_BSTATE_SECURED var/reinforced = FALSE //Reinforced to be a cade or not var/can_be_reinforced = TRUE //can we even reinforce this handrail or not? + ///Whether a ground z-level handrail allows auto-climbing on harm intent + var/autoclimb = TRUE + +/obj/structure/barricade/handrail/Initialize(mapload, ...) + . = ..() + if(!is_ground_level(z)) + if(autoclimb && is_mainship_level(z)) + RegisterSignal(SSdcs, COMSIG_GLOB_HIJACK_LANDED, PROC_REF(reset_autoclimb)) + autoclimb = FALSE + +/obj/structure/barricade/handrail/proc/reset_autoclimb() + autoclimb = initial(autoclimb) /obj/structure/barricade/handrail/update_icon() overlays.Cut() @@ -40,6 +52,38 @@ if(E.icon_path && E.obj_icon_state_path) overlays += image(E.icon_path, icon_state = E.obj_icon_state_path) +/obj/structure/barricade/handrail/Collided(atom/movable/movable) + if(!ismob(movable)) + return ..() + + if(istype(movable, /mob/living/carbon/xenomorph/ravager) || istype(movable, /mob/living/carbon/xenomorph/crusher)) + var/mob/living/carbon/xenomorph/xenomorph = movable + if(!xenomorph.stat) + visible_message(SPAN_DANGER("[xenomorph] plows straight through [src]!")) + deconstruct(FALSE) + return + else + if(!autoclimb) + return ..() + + if(movable.last_bumped == world.time) + return ..() + + var/mob/living/climber = movable + if(climber.a_intent != INTENT_HARM) + return ..() + + climber.client?.move_delay += 3 DECISECONDS + if(do_climb(climber)) + if(prob(25)) + if(ishuman(climber)) + var/mob/living/carbon/human/human = climber + human.apply_damage(5, BRUTE, no_limb_loss = TRUE) + else + climber.apply_damage(5, BRUTE) + climber.visible_message(SPAN_WARNING("[climber] injures themselves vaulting over [src]."), SPAN_WARNING("You hit yourself as you vault over [src].")) + ..() + /obj/structure/barricade/handrail/get_examine_text(mob/user) . = ..() switch(build_state) diff --git a/code/game/objects/structures/cargo_container.dm b/code/game/objects/structures/cargo_container.dm index 66d0cc8c18e0..343a6b06c23b 100644 --- a/code/game/objects/structures/cargo_container.dm +++ b/code/game/objects/structures/cargo_container.dm @@ -8,6 +8,36 @@ health = 200 opacity = TRUE anchored = TRUE + ///multiples any demage taken from bullets + var/bullet_damage_multiplier = 0.2 + ///multiples any demage taken from explosion + var/explosion_damage_multiplier = 2 + +/obj/structure/cargo_container/bullet_act(obj/projectile/projectile) + . = ..() + update_health(projectile.damage * bullet_damage_multiplier) + +/obj/structure/cargo_container/attack_alien(mob/living/carbon/xenomorph/xenomorph) + . = ..() + var/damage = ((floor((xenomorph.melee_damage_lower + xenomorph.melee_damage_upper)/2)) ) + + //Frenzy bonus + if(xenomorph.frenzy_aura > 0) + damage += (xenomorph.frenzy_aura * FRENZY_DAMAGE_MULTIPLIER) + + xenomorph.animation_attack_on(src) + + xenomorph.visible_message(SPAN_DANGER("[xenomorph] slashes [src]!"), \ + SPAN_DANGER("You slash [src]!")) + + update_health(damage) + + return XENO_ATTACK_ACTION + +/obj/structure/cargo_container/ex_act(severity, direction) + . = ..() + update_health(severity * explosion_damage_multiplier) + //Note, for Watatsumi, Grant, and Arious, "left" and "leftmid" are both the left end of the container, but "left" is generic and "leftmid" has the Sat Mover mark on it /obj/structure/cargo_container/watatsumi name = "Watatsumi Cargo Container" diff --git a/code/game/objects/structures/fence.dm b/code/game/objects/structures/fence.dm index 93d9d7727e5d..c2c7d516107b 100644 --- a/code/game/objects/structures/fence.dm +++ b/code/game/objects/structures/fence.dm @@ -62,7 +62,7 @@ tforce = 40 else if(isobj(AM)) var/obj/item/I = AM - tforce = I.throwforce + tforce = I.throwforce/2 health = max(0, health - tforce) healthcheck() @@ -162,11 +162,17 @@ if(W.flags_item & NOBLUDGEON) return - if(HAS_TRAIT(W, TRAIT_TOOL_WIRECUTTERS)) + if(HAS_TRAIT(W, TRAIT_TOOL_WIRECUTTERS) || istype(W, /obj/item/attachable/bayonet) || istype(W, /obj/item/weapon/bracer_attachment)) user.visible_message(SPAN_NOTICE("[user] starts cutting through [src] with [W]."), SPAN_NOTICE("You start cutting through [src] with [W].")) playsound(src.loc, 'sound/items/Wirecutter.ogg', 25, 1) - if(do_after(user, 30 * user.get_skill_duration_multiplier(SKILL_CONSTRUCTION), INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) + + //Bayonets and Wristblades are 3/4th as effective at cutting fences + var duration = 10 * user.get_skill_duration_multiplier(SKILL_CONSTRUCTION) + if(istype(W, /obj/item/attachable/bayonet) || istype(W, /obj/item/weapon/bracer_attachment)) + duration *= 1.5 + + if(do_after(user, duration, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) playsound(loc, 'sound/items/Wirecutter.ogg', 25, 1) user.visible_message(SPAN_NOTICE("[user] cuts through [src] with [W]."), SPAN_NOTICE("You cut through [src] with [W].")) diff --git a/code/game/objects/structures/pipes/standard/manifolds.dm b/code/game/objects/structures/pipes/standard/manifolds.dm index dfbc027455b6..10b8557532b2 100644 --- a/code/game/objects/structures/pipes/standard/manifolds.dm +++ b/code/game/objects/structures/pipes/standard/manifolds.dm @@ -107,6 +107,7 @@ /obj/structure/pipes/standard/manifold/hidden/supply/no_boom name = "Reinforced Air supply pipe manifold" explodey = FALSE + color = PIPE_COLOR_PURPLE /obj/structure/pipes/standard/manifold/hidden/yellow color = PIPE_COLOR_YELLOW @@ -189,6 +190,7 @@ /obj/structure/pipes/standard/manifold/fourway/hidden/supply/no_boom name = "reinforced 4-way air supply pipe manifold" explodey = FALSE + color = PIPE_COLOR_PURPLE /obj/structure/pipes/standard/manifold/fourway/hidden/yellow color = PIPE_COLOR_YELLOW diff --git a/code/game/objects/structures/pipes/standard/simple.dm b/code/game/objects/structures/pipes/standard/simple.dm index 93a92e51f71b..d37af23732ae 100644 --- a/code/game/objects/structures/pipes/standard/simple.dm +++ b/code/game/objects/structures/pipes/standard/simple.dm @@ -107,6 +107,7 @@ /obj/structure/pipes/standard/simple/hidden/supply/no_boom name = "Reinforced Air supply pipe" explodey = FALSE + color = PIPE_COLOR_PURPLE /obj/structure/pipes/standard/simple/hidden/yellow color = PIPE_COLOR_YELLOW diff --git a/code/game/objects/structures/pipes/standard/standard_misc.dm b/code/game/objects/structures/pipes/standard/standard_misc.dm index d0028ce862cb..46cebc891f29 100644 --- a/code/game/objects/structures/pipes/standard/standard_misc.dm +++ b/code/game/objects/structures/pipes/standard/standard_misc.dm @@ -110,6 +110,7 @@ /obj/structure/pipes/standard/cap/hidden/supply/no_boom name = "reinforced supply pipe endcap" explodey = FALSE + color = PIPE_COLOR_PURPLE /obj/structure/pipes/standard/tank diff --git a/code/game/objects/structures/platforms.dm b/code/game/objects/structures/platforms.dm index 5510d319ee1e..d69d5a5a07c1 100644 --- a/code/game/objects/structures/platforms.dm +++ b/code/game/objects/structures/platforms.dm @@ -11,36 +11,18 @@ density = TRUE throwpass = TRUE //You can throw objects over this, despite its density. layer = OBJ_LAYER - breakable = FALSE + breakable = TRUE flags_atom = ON_BORDER unacidable = TRUE climb_delay = CLIMB_DELAY_SHORT projectile_coverage = PROJECTILE_COVERAGE_NONE - -/obj/structure/platform/stair_cut - icon_state = "platform_stair"//icon will be honked in all dirs except (1), that's because the behavior breaks if it ain't (1) - dir = 1 -/obj/structure/platform/stair_cut/alt - icon_state = "platform_stair_alt" - dir = 1 - + var/stat = 0 + var/creaking_sound + var/breaking_sound + var/shove_time /obj/structure/platform/Initialize() . = ..() - var/image/I = image(icon, src, "platform_overlay", LADDER_LAYER, dir)//ladder layer puts us just above weeds. - switch(dir) - if(SOUTH) - layer = ABOVE_MOB_LAYER+0.1 - I.pixel_y = -16 - if(NORTH) - I.pixel_y = 16 - if(EAST) - I.pixel_x = 16 - layer = ABOVE_MOB_LAYER+0.1 - if(WEST) - I.pixel_x = -16 - layer = ABOVE_MOB_LAYER+0.1 - overlays += I /obj/structure/platform/initialize_pass_flags(datum/pass_flags_container/PF) ..() @@ -59,9 +41,39 @@ return ..() -/obj/structure/platform/ex_act() +/obj/structure/platform/ex_act(severity) + if(explo_proof) + return + switch(severity) + if(EXPLOSION_THRESHOLD_VLOW to EXPLOSION_THRESHOLD_LOW) + if(prob(15)) + broken() + return + if(EXPLOSION_THRESHOLD_LOW to EXPLOSION_THRESHOLD_HIGH) + if(prob(30)) + broken() + return + if(EXPLOSION_THRESHOLD_HIGH to INFINITY) + broken() + return return +/obj/structure/platform/get_examine_text(mob/user) + . = ..() + + if(stat & BROKEN) + . += SPAN_WARNING("It looks destroyed.") + +/obj/structure/platform/update_icon() + if(stat & BROKEN) + icon_state = "[initial(icon_state)]_broken" + +/obj/structure/platform/proc/broken() + stat |= BROKEN + density = FALSE + layer = ABOVE_BLOOD_LAYER //lets hope it will appear under everything except weeds and blood. + update_icon() + /obj/structure/platform/attackby(obj/item/W, mob/user) . = ..() if(user.pulling) @@ -79,6 +91,48 @@ SPAN_WARNING("You finish dragging \the [user.pulling] onto \the [src].")) user.pulling.forceMove(move_to_turf) +/obj/structure/platform/attack_alien(mob/living/carbon/xenomorph/user) + if(user.action_busy) + return XENO_NO_DELAY_ACTION + if(user.a_intent != INTENT_DISARM) + return XENO_NO_DELAY_ACTION + + if(stat & BROKEN) + to_chat(user, SPAN_WARNING("Its already destroyed!")) + return XENO_NO_DELAY_ACTION + + if(stat & explo_proof) + to_chat(user, SPAN_WARNING("Its too strong for us!")) + return XENO_NO_DELAY_ACTION + + user.visible_message(SPAN_WARNING("[user] begins to lean against [src]."), \ + SPAN_WARNING("You start to stomp and pressure [src]."), null, 5, CHAT_TYPE_XENO_COMBAT) + playsound(loc, creaking_sound, 30, 1) + + var/shove_time + switch(user.mob_size) + if(MOB_SIZE_XENO_VERY_SMALL) + shove_time = 30 SECONDS + if(MOB_SIZE_XENO_SMALL) + shove_time = 9 SECONDS + if(MOB_SIZE_XENO) + shove_time = 7 SECONDS + if(MOB_SIZE_BIG) + shove_time = 4 SECONDS + if(MOB_SIZE_IMMOBILE) + shove_time = 2 SECONDS + + xeno_attack_delay(user) //Adds delay here and returns nothing because otherwise it'd cause lag *after* finishing the shove. + + if(!do_after(user, shove_time, INTERRUPT_ALL, BUSY_ICON_HOSTILE, numticks = shove_time * 0.1)) + return + user.animation_attack_on(src) + user.visible_message(SPAN_DANGER("[user] collapses [src] down!"), \ + SPAN_DANGER("You collapse [src] down!"), null, 5, CHAT_TYPE_XENO_COMBAT) + playsound(loc, breaking_sound, 25, 1) + broken() + return XENO_NO_DELAY_ACTION + /obj/structure/platform_decoration name = "platform" desc = "A square metal surface resting on four legs." @@ -94,15 +148,6 @@ /obj/structure/platform_decoration/Initialize() . = ..() - switch(dir) - if (NORTH) - layer = ABOVE_MOB_LAYER+0.2 - if (SOUTH) - layer = ABOVE_MOB_LAYER+0.2 - if (SOUTHEAST) - layer = ABOVE_MOB_LAYER+0.2 - if (SOUTHWEST) - layer = ABOVE_MOB_LAYER+0.2 /obj/structure/platform_decoration/initialize_pass_flags(datum/pass_flags_container/PF) ..() @@ -114,96 +159,360 @@ //Map variants// -//Strata purple ice// -/obj/structure/platform_decoration/strata - name = "ice rock corner" - desc = "A solid chunk of desolate rocks and ice." - icon_state = "strata_platform_deco" +// +//Parent used to attach sounds depending on material they are made from.// +// -/obj/structure/platform/strata - name = "ice rock edge" - desc = "A solid chunk of desolate rocks and ice. Looks like you could climb it with some difficulty." - icon_state = "strata_platform" +/obj/structure/platform/metal + icon_state = "platform" + creaking_sound = 'sound/effects/metal_creaking.ogg' + breaking_sound = 'sound/effects/metalhit.ogg' -//Strata wall metal platforms -/obj/structure/platform_decoration/strata/metal - name = "raised metal corner" - desc = "A raised level of metal, often used to elevate areas above others. This is the corner." - icon_state = "strata_metalplatform_deco" +/obj/structure/platform/stone + icon_state = "kutjevo_rock" + creaking_sound = 'sound/effects/rock_creaking.ogg' + breaking_sound = 'sound/effects/meteorimpact.ogg' -/obj/structure/platform/strata/metal - name = "raised metal edge" - desc = "A raised level of metal, often used to elevate areas above others. You could probably climb it." - icon_state = "strata_metalplatform" +//------------------------------// +// Metal Stairs Platforms // +//------------------------------// + +/obj/structure/platform/metal/stair_cut + icon_state = "platform_stair" //icon will be honked in all dirs except (1 = NORTH), that's because the behavior breaks if it ain't (1), don't use (2) its made as mapping tool visual indicator. + dir = NORTH + +/obj/structure/platform/metal/stair_cut/platform_left + icon_state = "platform_stair" + +/obj/structure/platform/metal/stair_cut/platform_right + icon_state = "platform_stair_alt" + +/obj/structure/platform/metal/stair_cut/kutjevo_smooth_left + icon_state = "kutjevo_platform_sm_stair" + +/obj/structure/platform/metal/stair_cut/kutjevo_smooth_right + icon_state = "kutjevo_platform_sm_stair_alt" + +/obj/structure/platform/metal/stair_cut/strata_left + icon_state = "strata_metalplatform_stair" -//Kutjevo metal platforms +/obj/structure/platform/metal/stair_cut/strata_right + icon_state = "strata_metalplatform_stair_alt" -/obj/structure/platform/kutjevo +/obj/structure/platform/metal/stair_cut/shiva_left + icon_state = "shiva_stair" + +/obj/structure/platform/metal/stair_cut/shiva_right + icon_state = "shiva_stair_alt" + +//------------------------------// +// Stone Stairs Platforms // +//------------------------------// + +/obj/structure/platform/stone/stair_cut + icon_state = "kutjevo_rock_stair" //icon will be honked in all dirs except (1 = NORTH), that's because the behavior breaks if it ain't (1), don't use (2) its made as mapping tool visual indicator. + dir = NORTH + +/obj/structure/platform/stone/stair_cut/shiva_left + icon_state = "strata_platform_stair" + +/obj/structure/platform/stone/stair_cut/shiva_right + icon_state = "strata_platform_stair_alt" + +/obj/structure/platform/stone/stair_cut/kutjevo_left + icon_state = "kutjevo_rock_stair" + +/obj/structure/platform/stone/stair_cut/kutjevo_right + icon_state = "kutjevo_rock_stair_alt" + +/obj/structure/platform/stone/stair_cut/stone_left + icon_state = "stone_stair" + +/obj/structure/platform/stone/stair_cut/stone_right + icon_state = "stone_stair_alt" + +/obj/structure/platform/stone/stair_cut/sandstone_left + icon_state = "sandstone_stair" + color = "#c6a480" + +/obj/structure/platform/stone/stair_cut/sandstone_right + icon_state = "sandstone_stair_alt" + color = "#c6a480" + +/obj/structure/platform/stone/stair_cut/runed_sandstone_left + icon_state = "stone_stair" + color = "#b29082" + +/obj/structure/platform/stone/stair_cut/runed_sandstone_right + icon_state = "stone_stair_alt" + color = "#b29082" + +//------------------------------------// +// Metal based Platforms // +//------------------------------------// + +/obj/structure/platform/metal/almayer/north //I didn't have good name so... they will be called almayer for now as replacement for "platform". + dir = NORTH +/obj/structure/platform/metal/almayer/east + dir = EAST +/obj/structure/platform/metal/almayer/west + dir = WEST + + +/obj/structure/platform/metal/kutjevo icon_state = "kutjevo_platform" name = "raised metal edge" desc = "A raised level of metal, often used to elevate areas above others, or construct bridges. You could probably climb it." -/obj/structure/platform_decoration/kutjevo - name = "raised metal corner" - desc = "The corner of what appears to be raised piece of metal, often used to imply the illusion of elevation in non-Euclidean 2d spaces. But you don't know that, you're just a spaceman with a rifle." - icon_state = "kutjevo_platform_deco" +/obj/structure/platform/metal/kutjevo/north + dir = NORTH +/obj/structure/platform/metal/kutjevo/east + dir = EAST +/obj/structure/platform/metal/kutjevo/west + dir = WEST -/obj/structure/platform/kutjevo/smooth +/obj/structure/platform/metal/kutjevo_smooth icon_state = "kutjevo_platform_sm" name = "raised metal edge" desc = "A raised level of metal, often used to elevate areas above others, or construct bridges. You could probably climb it." -/obj/structure/platform/kutjevo/smooth/stair_plate +/obj/structure/platform/metal/kutjevo_smooth/north + dir = NORTH +/obj/structure/platform/metal/kutjevo_smooth/east + dir = EAST +/obj/structure/platform/metal/kutjevo_smooth/west + dir = WEST + + +/obj/structure/platform/metal/kutjevo_smooth/stair_plate icon_state = "kutjevo_stair_plate" -/obj/structure/platform_decoration/kutjevo/smooth - name = "raised metal corner" - desc = "The corner of what appears to be raised piece of metal, often used to imply the illusion of elevation in non-Euclidean 2d spaces. But you don't know that, you're just a spaceman with a rifle." - icon_state = "kutjevo_platform_sm_deco" -/obj/structure/platform/kutjevo/rock - icon_state = "kutjevo_rock" +/obj/structure/platform/metal/shiva + icon_state = "shiva" + name = "raised rubber cord platform" + desc = "Reliable steel and a polymer rubber substitute. Doesn't crack under cold weather." + +/obj/structure/platform/metal/shiva/north + dir = NORTH +/obj/structure/platform/metal/shiva/east + dir = EAST +/obj/structure/platform/metal/shiva/west + dir = WEST + + +/obj/structure/platform/metal/strata + name = "raised metal edge" + desc = "A raised level of metal, often used to elevate areas above others. You could probably climb it." + icon_state = "strata_metalplatform" + +/obj/structure/platform/metal/strata/north + dir = NORTH +/obj/structure/platform/metal/strata/east + dir = EAST +/obj/structure/platform/metal/strata/west + dir = WEST + +//------------------------------------// +// Rock based Platforms // +//------------------------------------// + +/obj/structure/platform/stone/kutjevo name = "raised rock edges" desc = "A collection of stones and rocks that provide ample grappling and vaulting opportunity. Indicates a change in elevation. You could probably climb it." -/obj/structure/platform_decoration/kutjevo/rock - name = "raised rock corner" - desc = "A collection of stones and rocks that cap the edge of some conveniently 1-meter-long lengths of perfectly climbable chest high walls." - icon_state = "kutjevo_rock_deco" +/obj/structure/platform/stone/kutjevo/north + dir = NORTH +/obj/structure/platform/stone/kutjevo/east + dir = EAST +/obj/structure/platform/stone/kutjevo/west + dir = WEST + + +/obj/structure/platform/stone/strata + name = "ice rock edge" + desc = "A solid chunk of desolate rocks and ice. Looks like you could climb it with some difficulty." + icon_state = "strata_platform" + +/obj/structure/platform/stone/strata/north + dir = NORTH +/obj/structure/platform/stone/strata/east + dir = EAST +/obj/structure/platform/stone/strata/west + dir = WEST -/obj/structure/platform/mineral +/obj/structure/platform/stone/mineral icon_state = "stone" -/obj/structure/platform_decoration/mineral - icon_state = "stone_deco" -/obj/structure/platform/mineral/sandstone +/obj/structure/platform/stone/mineral/north + dir = NORTH +/obj/structure/platform/stone/mineral/east + dir = EAST +/obj/structure/platform/stone/mineral/west + dir = WEST + + +/obj/structure/platform/stone/sandstone name = "sandstone platform" desc = "A platform supporting elevated ground, made of sandstone. Has what seem to be ancient hieroglyphs on its side." + icon_state = "sandstone" color = "#c6a480" -/obj/structure/platform/mineral/sandstone/runed +/obj/structure/platform/stone/sandstone/north + dir = NORTH +/obj/structure/platform/stone/sandstone/east + dir = EAST +/obj/structure/platform/stone/sandstone/west + dir = WEST + + +/obj/structure/platform/stone/runed_sandstone name = "sandstone temple platform" + icon_state = "stone" color = "#b29082" +/obj/structure/platform/stone/runed_sandstone/north + dir = NORTH +/obj/structure/platform/stone/runed_sandstone/east + dir = EAST +/obj/structure/platform/stone/runed_sandstone/west + dir = WEST + +//------------------------------------// +// Metal based Platforms "decoration" // +//------------------------------------// + +/obj/structure/platform_decoration/metal/almayer/north + dir = NORTH +/obj/structure/platform_decoration/metal/almayer/east + dir = EAST +/obj/structure/platform_decoration/metal/almayer/west + dir = WEST +/obj/structure/platform_decoration/metal/almayer/northeast + dir = NORTHEAST +/obj/structure/platform_decoration/metal/almayer/northwest + dir = NORTHWEST +/obj/structure/platform_decoration/metal/almayer/southeast + dir = SOUTHEAST +/obj/structure/platform_decoration/metal/almayer/southwest + dir = SOUTHWEST + + +/obj/structure/platform_decoration/metal/kutjevo + name = "raised metal corner" + desc = "The corner of what appears to be raised piece of metal, often used to imply the illusion of elevation in non-Euclidean 2d spaces. But you don't know that, you're just a spaceman with a rifle." + icon_state = "kutjevo_platform_deco" +/obj/structure/platform_decoration/metal/kutjevo/north + dir = NORTH +/obj/structure/platform_decoration/metal/kutjevo/east + dir = EAST +/obj/structure/platform_decoration/metal/kutjevo/west + dir = WEST -/obj/structure/platform_decoration/mineral/sandstone - name = "sandstone platform corner" - desc = "A platform corner supporting elevated ground, made of sandstone. Has what seem to be ancient hieroglyphs on its side." - color = "#c6a480" -/obj/structure/platform/shiva/catwalk - icon_state = "shiva" - name = "raised rubber cord platform" - desc = "Reliable steel and a polymer rubber substitute. Doesn't crack under cold weather." +/obj/structure/platform_decoration/metal/kutjevo_smooth + name = "raised metal corner" + desc = "The corner of what appears to be raised piece of metal, often used to imply the illusion of elevation in non-Euclidean 2d spaces. But you don't know that, you're just a spaceman with a rifle." + icon_state = "kutjevo_platform_sm_deco" + +/obj/structure/platform_decoration/metal/kutjevo_smooth/north + dir = NORTH +/obj/structure/platform_decoration/metal/kutjevo_smooth/east + dir = EAST +/obj/structure/platform_decoration/metal/kutjevo_smooth/west + dir = WEST + -/obj/structure/platform_decoration/shiva/catwalk +/obj/structure/platform_decoration/metal/shiva icon_state = "shiva_deco" name = "raised rubber cord platform" desc = "Reliable steel and a polymer rubber substitute. Doesn't crack under cold weather." -/obj/structure/platform_decoration/mineral/sandstone/runed +/obj/structure/platform_decoration/metal/shiva/north + dir = NORTH +/obj/structure/platform_decoration/metal/shiva/east + dir = EAST +/obj/structure/platform_decoration/metal/shiva/west + dir = WEST + + +/obj/structure/platform_decoration/metal/strata + name = "raised metal corner" + desc = "A raised level of metal, often used to elevate areas above others. This is the corner." + icon_state = "strata_metalplatform_deco" + +/obj/structure/platform_decoration/metal/strata/north + dir = NORTH +/obj/structure/platform_decoration/metal/strata/east + dir = EAST +/obj/structure/platform_decoration/metal/strata/west + dir = WEST + +//------------------------------------// +// Rock based Platforms "decoration" // +//------------------------------------// + +/obj/structure/platform_decoration/stone/kutjevo + name = "raised rock corner" + desc = "A collection of stones and rocks that cap the edge of some conveniently 1-meter-long lengths of perfectly climbable chest high walls." + icon_state = "kutjevo_rock_deco" + +/obj/structure/platform_decoration/stone/kutjevo/north + dir = NORTH +/obj/structure/platform_decoration/stone/kutjevo/east + dir = EAST +/obj/structure/platform_decoration/stone/kutjevo/west + dir = WEST + + +/obj/structure/platform_decoration/stone/strata + name = "ice rock corner" + desc = "A solid chunk of desolate rocks and ice." + icon_state = "strata_platform_deco" + +/obj/structure/platform_decoration/stone/strata/north + dir = NORTH +/obj/structure/platform_decoration/stone/strata/east + dir = EAST +/obj/structure/platform_decoration/stone/strata/west + dir = WEST + + +/obj/structure/platform_decoration/stone/mineral + icon_state = "stone_deco" + +/obj/structure/platform_decoration/stone/mineral/north + dir = NORTH +/obj/structure/platform_decoration/stone/mineral/east + dir = EAST +/obj/structure/platform_decoration/stone/mineral/west + dir = WEST + + +/obj/structure/platform_decoration/stone/sandstone + name = "sandstone platform corner" + desc = "A platform corner supporting elevated ground, made of sandstone. Has what seem to be ancient hieroglyphs on its side." + icon_state = "sandstone_deco" + color = "#c6a480" + +/obj/structure/platform_decoration/stone/sandstone/north + dir = NORTH +/obj/structure/platform_decoration/stone/sandstone/east + dir = EAST +/obj/structure/platform_decoration/stone/sandstone/west + dir = WEST + +/obj/structure/platform_decoration/stone/runed_sandstone name = "sandstone temple platform corner" + icon_state = "stone_deco" color = "#b29082" + +/obj/structure/platform_decoration/stone/runed_sandstone/north + dir = NORTH +/obj/structure/platform_decoration/stone/runed_sandstone/east + dir = EAST +/obj/structure/platform_decoration/stone/runed_sandstone/west + dir = WEST diff --git a/code/game/objects/structures/props.dm b/code/game/objects/structures/props.dm index 066f101f60bd..2a67cdc3637c 100644 --- a/code/game/objects/structures/props.dm +++ b/code/game/objects/structures/props.dm @@ -202,8 +202,6 @@ icon_state = "boulder1" desc = "A large rock. It's not cooking anything." icon = 'icons/obj/structures/props/dam.dmi' - unslashable = TRUE - unacidable = TRUE /obj/structure/prop/dam/boulder/boulder1 icon_state = "boulder1" /obj/structure/prop/dam/boulder/boulder2 @@ -218,8 +216,6 @@ icon = 'icons/obj/structures/props/boulder_large.dmi' bound_height = 64 bound_width = 64 - unslashable = TRUE - unacidable = TRUE /obj/structure/prop/dam/large_boulder/boulder1 icon_state = "boulder_large1" /obj/structure/prop/dam/large_boulder/boulder2 diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index eb9b5aa5e418..2055eae13e4e 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -333,6 +333,11 @@ GLOBAL_LIST_EMPTY(activated_medevac_stretchers) var/view_range = 5 var/obj/structure/dropship_equipment/medevac_system/linked_medevac surgery_duration_multiplier = SURGERY_SURFACE_MULT_AWFUL //On the one hand, it's a big stretcher. On the other hand, you have a big sheet covering the patient and those damned Fulton hookups everywhere. + var/faction = FACTION_MARINE + +/obj/structure/bed/medevac_stretcher/upp + name = "UPP medevac stretcher" + faction = FACTION_UPP /obj/structure/bed/medevac_stretcher/Destroy() if(stretcher_activated) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 760633348b81..425d4caadbdc 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -304,7 +304,7 @@ if(W.flags_item & ITEM_ABSTRACT) return - if(istype(W, /obj/item/weapon/wristblades)) + if(istype(W, /obj/item/weapon/bracer_attachment)) if(rand(0, 2) == 0) playsound(src.loc, 'sound/weapons/wristblades_hit.ogg', 25, 1) user.visible_message(SPAN_DANGER("[user] slices [src] apart!"), diff --git a/code/game/sim_manager/datums/simulator.dm b/code/game/sim_manager/datums/simulator.dm index 64ac58fbfcfc..98e76c1d9bad 100644 --- a/code/game/sim_manager/datums/simulator.dm +++ b/code/game/sim_manager/datums/simulator.dm @@ -4,7 +4,7 @@ // Necessary to prevent multiple users from simulating at the same time. var/static/detonation_cooldown = 0 - var/static/detonation_cooldown_time = 2 MINUTES + var/static/detonation_cooldown_time = 1 MINUTES var/static/sim_reboot_state = TRUE var/dummy_mode = CLF_MODE diff --git a/code/game/sound.dm b/code/game/sound.dm index 662bc8ff96e2..051fa578d957 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -373,6 +373,10 @@ sound = pick('sound/voice/warcry/male_go.ogg', 'sound/voice/warcry/male_attack.ogg', 'sound/voice/warcry/male_charge.ogg', 'sound/voice/warcry/male_charge2.ogg', 'sound/voice/warcry/warcry_male_1.ogg', 'sound/voice/warcry/warcry_male_2.ogg', 'sound/voice/warcry/warcry_male_3.ogg', 'sound/voice/warcry/warcry_male_4.ogg', 'sound/voice/warcry/warcry_male_5.ogg', 'sound/voice/warcry/warcry_male_6.ogg', 'sound/voice/warcry/warcry_male_7.ogg', 'sound/voice/warcry/warcry_male_8.ogg', 'sound/voice/warcry/warcry_male_9.ogg', 'sound/voice/warcry/warcry_male_10.ogg', 'sound/voice/warcry/warcry_male_11.ogg', 'sound/voice/warcry/warcry_male_12.ogg', 'sound/voice/warcry/warcry_male_13.ogg', 'sound/voice/warcry/warcry_male_14.ogg', 'sound/voice/warcry/warcry_male_15.ogg', 'sound/voice/warcry/warcry_male_16.ogg', 'sound/voice/warcry/warcry_male_17.ogg', 'sound/voice/warcry/warcry_male_18.ogg', 'sound/voice/warcry/warcry_male_19.ogg', 'sound/voice/warcry/warcry_male_20.ogg', 'sound/voice/warcry/warcry_male_21.ogg', 'sound/voice/warcry/warcry_male_22.ogg', 'sound/voice/warcry/warcry_male_23.ogg', 'sound/voice/warcry/warcry_male_24.ogg', 'sound/voice/warcry/warcry_male_25.ogg', 'sound/voice/warcry/warcry_male_26.ogg', 'sound/voice/warcry/warcry_male_27.ogg', 'sound/voice/warcry/warcry_male_28.ogg', 'sound/voice/warcry/warcry_male_29.ogg', 'sound/voice/warcry/warcry_male_30.ogg', 'sound/voice/warcry/warcry_male_31.ogg', 'sound/voice/warcry/warcry_male_32.ogg', 'sound/voice/warcry/warcry_male_33.ogg', 'sound/voice/warcry/warcry_male_34.ogg', 'sound/voice/warcry/warcry_male_35.ogg', 5;'sound/voice/warcry/warcry_male_rare_1.ogg', 5;'sound/voice/warcry/warcry_male_rare_2.ogg', 5;'sound/voice/warcry/warcry_male_rare_3.ogg', 5;'sound/voice/warcry/warcry_male_rare_4.ogg', 5;'sound/voice/warcry/warcry_male_rare_5.ogg') if("male_upp_warcry") sound = pick('sound/voice/upp_warcry/warcry_male_1.ogg', 'sound/voice/upp_warcry/warcry_male_2.ogg') + if("male_preburst") + sound = pick("sound/voice/human_male_preburst1.ogg", 'sound/voice/human_male_preburst2.ogg', 'sound/voice/human_male_preburst3.ogg', 'sound/voice/human_male_preburst4.ogg', 'sound/voice/human_male_preburst5.ogg', 'sound/voice/human_male_preburst6.ogg', 'sound/voice/human_male_preburst7.ogg', 'sound/voice/human_male_preburst8.ogg', 'sound/voice/human_male_preburst9.ogg') + if("male_hugged") + sound = pick("sound/voice/human_male_facehugged1.ogg", 'sound/voice/human_male_facehugged2.ogg', 'sound/voice/human_male_facehugged3.ogg') if("female_scream") sound = pick('sound/voice/human_female_scream_1.ogg','sound/voice/human_female_scream_2.ogg','sound/voice/human_female_scream_3.ogg','sound/voice/human_female_scream_4.ogg',5;'sound/voice/human_female_scream_5.ogg') if("female_pain") @@ -383,6 +387,10 @@ sound = pick('sound/voice/warcry/female_charge.ogg', 'sound/voice/warcry/female_yell1.ogg', 'sound/voice/warcry/warcry_female_1.ogg', 'sound/voice/warcry/warcry_female_2.ogg', 'sound/voice/warcry/warcry_female_3.ogg', 'sound/voice/warcry/warcry_female_4.ogg', 'sound/voice/warcry/warcry_female_5.ogg', 'sound/voice/warcry/warcry_female_6.ogg', 'sound/voice/warcry/warcry_female_7.ogg', 'sound/voice/warcry/warcry_female_8.ogg', 'sound/voice/warcry/warcry_female_9.ogg', 'sound/voice/warcry/warcry_female_10.ogg', 'sound/voice/warcry/warcry_female_11.ogg', 'sound/voice/warcry/warcry_female_12.ogg', 'sound/voice/warcry/warcry_female_13.ogg', 'sound/voice/warcry/warcry_female_14.ogg', 'sound/voice/warcry/warcry_female_15.ogg', 'sound/voice/warcry/warcry_female_16.ogg', 'sound/voice/warcry/warcry_female_17.ogg', 'sound/voice/warcry/warcry_female_18.ogg', 'sound/voice/warcry/warcry_female_19.ogg', 'sound/voice/warcry/warcry_female_20.ogg') if("female_upp_warcry") sound = pick('sound/voice/upp_warcry/warcry_female_1.ogg', 'sound/voice/upp_warcry/warcry_female_2.ogg') + if("female_preburst") + sound = pick("sound/voice/human_female_preburst1.ogg", 'sound/voice/human_female_preburst2.ogg', 'sound/voice/human_female_preburst3.ogg', 'sound/voice/human_female_preburst4.ogg', 'sound/voice/human_female_preburst5.ogg', 'sound/voice/human_female_preburst6.ogg', 'sound/voice/human_female_preburst7.ogg') + if("female_hugged") + sound = pick("sound/voice/human_female_facehugged1.ogg", 'sound/voice/human_female_facehugged2.ogg') if("rtb_handset") sound = pick('sound/machines/telephone/rtb_handset_1.ogg', 'sound/machines/telephone/rtb_handset_2.ogg', 'sound/machines/telephone/rtb_handset_3.ogg', 'sound/machines/telephone/rtb_handset_4.ogg', 'sound/machines/telephone/rtb_handset_5.ogg') if("talk_phone") @@ -396,6 +404,8 @@ sound = pick('sound/voice/cat_meow_1.ogg','sound/voice/cat_meow_2.ogg','sound/voice/cat_meow_3.ogg','sound/voice/cat_meow_4.ogg','sound/voice/cat_meow_5.ogg','sound/voice/cat_meow_6.ogg','sound/voice/cat_meow_7.ogg') if("pred_pain") sound = pick('sound/voice/pred_pain1.ogg','sound/voice/pred_pain2.ogg','sound/voice/pred_pain3.ogg','sound/voice/pred_pain4.ogg','sound/voice/pred_pain5.ogg',5;'sound/voice/pred_pain_rare1.ogg') + if("pred_preburst") + sound = pick('sound/voice/pred_pain_rare1.ogg') if("pred_death") sound = pick('sound/voice/pred_death1.ogg', 'sound/voice/pred_death2.ogg') if("pred_laugh4") diff --git a/code/game/turfs/closed.dm b/code/game/turfs/closed.dm index 5571773ddb0f..9ee077156ee3 100644 --- a/code/game/turfs/closed.dm +++ b/code/game/turfs/closed.dm @@ -296,6 +296,22 @@ /turf/closed/shuttle/dropship3/tornado/typhoon name = "\improper Typhoon" +/turf/closed/shuttle/upp_dropship + name = "\improper Morana" + icon = 'icons/turf/upp_dropship.dmi' + icon_state = "1" + +/turf/closed/shuttle/upp_dropship/transparent + opacity = FALSE + +/turf/closed/shuttle/upp_dropship2 + name = "\improper Devana" + icon = 'icons/turf/upp_dropship.dmi' + icon_state = "1" + +/turf/closed/shuttle/upp_dropship2/transparent + opacity = FALSE + /turf/closed/shuttle/escapepod name = "wall" icon = 'icons/turf/escapepods.dmi' diff --git a/code/game/turfs/floor_types.dm b/code/game/turfs/floor_types.dm index 096b39e988d2..5e72483f420f 100644 --- a/code/game/turfs/floor_types.dm +++ b/code/game/turfs/floor_types.dm @@ -1128,11 +1128,11 @@ /turf/open/floor/vault icon_state = "rockvault" -/turf/open/floor/vault/Initialize(mapload, type) - . = ..() - icon_state = "[type]vault" - +/turf/open/floor/vault/sandstone + icon_state = "sandstonevault" +/turf/open/floor/vault/alien + icon_state = "alienvault" /turf/open/floor/engine name = "reinforced floor" diff --git a/code/game/turfs/strata.dm b/code/game/turfs/strata.dm index 7d706808be50..914671c6a051 100644 --- a/code/game/turfs/strata.dm +++ b/code/game/turfs/strata.dm @@ -57,21 +57,6 @@ /turf/open/floor/strata/white_cyan3/southwest dir = SOUTHWEST -/turf/open/floor/strata/blue4 - icon_state = "blue4" - -/turf/open/floor/strata/blue4/north - dir = NORTH - -/turf/open/floor/strata/blue4/east - dir = EAST - -/turf/open/floor/strata/red3 - icon_state = "red3" - -/turf/open/floor/strata/red3/north - dir = NORTH - /turf/open/floor/strata/white_cyan3/north dir = NORTH @@ -81,23 +66,13 @@ /turf/open/floor/strata/white_cyan4/north dir = NORTH -/turf/open/floor/strata/red3/south - dir = SOUTH - /turf/open/floor/strata/white_cyan3/south dir = SOUTH /turf/open/floor/strata/white_cyan4/south dir = SOUTH -/turf/open/floor/strata/blue3 - icon_state = "blue3" - -/turf/open/floor/strata/blue3/southwest - dir = SOUTHWEST - -/turf/open/floor/strata/blue3/east - dir = EAST +////strata - cyan//// /turf/open/floor/strata/cyan1 icon_state = "cyan1" @@ -114,30 +89,91 @@ /turf/open/floor/strata/cyan3 icon_state = "cyan3" +/turf/open/floor/strata/cyan3/west + dir = WEST + /turf/open/floor/strata/cyan3/east dir = EAST +/turf/open/floor/strata/cyan3/north + dir = NORTH + +/turf/open/floor/strata/cyan3/northeast + dir = NORTHEAST + +/turf/open/floor/strata/cyan3/northwest + dir = NORTHWEST + +/turf/open/floor/strata/cyan3/southeast + dir = SOUTHEAST + +/turf/open/floor/strata/cyan3/southwest + dir = SOUTHWEST + /turf/open/floor/strata/cyan4 icon_state = "cyan4" /turf/open/floor/strata/cyan4/east dir = EAST +/turf/open/floor/strata/cyan4/north + dir = NORTH + +/turf/open/floor/strata/cyan4/west + dir = WEST + /turf/open/floor/strata/floor3 icon_state = "floor3" /turf/open/floor/strata/floor3/east dir = EAST +////strata - orange//// + /turf/open/floor/strata/orange_edge icon_state = "orange_edge" /turf/open/floor/strata/orange_edge/east dir = EAST -/turf/open/floor/strata/red3/east +/turf/open/floor/strata/orange_edge/west + dir = WEST + +/turf/open/floor/strata/orange_edge/north + dir = NORTH + +/turf/open/floor/strata/orange_edge/northeast + dir = NORTHEAST + +/turf/open/floor/strata/orange_edge/northwest + dir = NORTHWEST + +/turf/open/floor/strata/orange_edge/southwest + dir = SOUTHWEST + +/turf/open/floor/strata/orange_edge/southeast + dir = SOUTHEAST + +/turf/open/floor/strata/orange_cover + icon_state = "orange_cover" + +/turf/open/floor/strata/orange_icorner + icon_state = "orange_icorner" + +/turf/open/floor/strata/orange_icorner/north + dir = NORTH + +/turf/open/floor/strata/orange_icorner/west + dir = WEST + +/turf/open/floor/strata/orange_icorner/east dir = EAST +//------------// + +/turf/open/floor/strata/orange_tile + icon_state = "orange_tile" + /turf/open/floor/strata/white_cyan1 icon_state = "white_cyan1" @@ -159,21 +195,9 @@ /turf/open/floor/strata/white_cyan3/southeast dir = SOUTHEAST -/turf/open/floor/strata/blue3/west - dir = WEST - -/turf/open/floor/strata/cyan3/west - dir = WEST - /turf/open/floor/strata/multi_tiles/west dir = WEST -/turf/open/floor/strata/orange_edge/west - dir = WEST - -/turf/open/floor/strata/red3/west - dir = WEST - /turf/open/floor/strata/white_cyan2 icon_state = "white_cyan2" @@ -189,12 +213,50 @@ /turf/open/floor/strata/white_cyan3/northwest dir = NORTHWEST +////strata - blue//// + /turf/open/floor/strata/blue1 icon_state = "blue1" +/turf/open/floor/strata/blue2 + icon_state = "blue2" + +/turf/open/floor/strata/blue3 + icon_state = "blue3" + +/turf/open/floor/strata/blue3/east + dir = EAST + /turf/open/floor/strata/blue3/north dir = NORTH +/turf/open/floor/strata/blue3/west + dir = WEST + +/turf/open/floor/strata/blue3/southwest + dir = SOUTHWEST + +/turf/open/floor/strata/blue3/southeast + dir = SOUTHEAST + +/turf/open/floor/strata/blue3/northeast + dir = NORTHEAST + +/turf/open/floor/strata/blue3/northwest + dir = NORTHWEST + +/turf/open/floor/strata/blue4 + icon_state = "blue4" + +/turf/open/floor/strata/blue4/north + dir = NORTH + +/turf/open/floor/strata/blue4/east + dir = EAST + +/turf/open/floor/strata/blue4/west + dir = WEST + /turf/open/floor/strata/damaged3 icon_state = "damaged3" @@ -210,9 +272,14 @@ /turf/open/floor/strata/floorscorched2 icon_state = "floorscorched2" +////strata - green//// + /turf/open/floor/strata/green1 icon_state = "green1" +/turf/open/floor/strata/green2 + icon_state = "green2" + /turf/open/floor/strata/green3 icon_state = "green3" @@ -222,15 +289,21 @@ /turf/open/floor/strata/green3/east dir = EAST -/turf/open/floor/strata/green3/northeast - dir = NORTHEAST - /turf/open/floor/strata/green3/west dir = WEST /turf/open/floor/strata/green3/northwest dir = NORTHWEST +/turf/open/floor/strata/green3/northeast + dir = NORTHEAST + +/turf/open/floor/strata/green3/southeast + dir = SOUTHEAST + +/turf/open/floor/strata/green3/southwest + dir = SOUTHWEST + /turf/open/floor/strata/green4 icon_state = "green4" @@ -243,20 +316,7 @@ /turf/open/floor/strata/green4/west dir = WEST -/turf/open/floor/strata/orange_cover - icon_state = "orange_cover" - -/turf/open/floor/strata/orange_icorner - icon_state = "orange_icorner" - -/turf/open/floor/strata/orange_icorner/north - dir = NORTH - -/turf/open/floor/strata/orange_icorner/west - dir = WEST - -/turf/open/floor/strata/orange_tile - icon_state = "orange_tile" +////strata - purple//// /turf/open/floor/strata/purp1 icon_state = "purp1" @@ -270,12 +330,71 @@ /turf/open/floor/strata/purp3/east dir = EAST +/turf/open/floor/strata/purp3/north + dir = NORTH + +/turf/open/floor/strata/purp3/west + dir = WEST + +/turf/open/floor/strata/purp3/northeast + dir = NORTHEAST + +/turf/open/floor/strata/purp3/northwest + dir = NORTHWEST + +/turf/open/floor/strata/purp3/southeast + dir = SOUTHEAST + +/turf/open/floor/strata/purp3/southwest + dir = SOUTHWEST + +/turf/open/floor/strata/purp4 + icon_state = "purp4" + +/turf/open/floor/strata/purp4/north + dir = NORTH + +/turf/open/floor/strata/purp4/east + dir = EAST + +/turf/open/floor/strata/purp4/west + dir = WEST + +////strata - red//// + /turf/open/floor/strata/red1 icon_state = "red1" /turf/open/floor/strata/red2 icon_state = "red2" +/turf/open/floor/strata/red3 + icon_state = "red3" + +/turf/open/floor/strata/red3/west + dir = WEST + +/turf/open/floor/strata/red3/east + dir = EAST + +/turf/open/floor/strata/red3/north + dir = NORTH + +/turf/open/floor/strata/red3/south + dir = SOUTH + +/turf/open/floor/strata/red3/northeast + dir = NORTHEAST + +/turf/open/floor/strata/red3/northwest + dir = NORTHWEST + +/turf/open/floor/strata/red3/southeast + dir = SOUTHEAST + +/turf/open/floor/strata/red3/southwest + dir = SOUTHWEST + /turf/open/floor/strata/red4 icon_state = "red4" diff --git a/code/game/turfs/transit.dm b/code/game/turfs/transit.dm index 63c21fb0a4cf..a88ef54425e5 100644 --- a/code/game/turfs/transit.dm +++ b/code/game/turfs/transit.dm @@ -268,6 +268,14 @@ shuttle_tag = DROPSHIP_SAIPAN dir = SOUTH +/turf/open/space/transit/dropship/morana + shuttle_tag = DROPSHIP_MORANA + dir = SOUTH + +/turf/open/space/transit/dropship/devana + shuttle_tag = DROPSHIP_DEVANA + dir = SOUTH + /turf/open/space/transit/south dir = SOUTH diff --git a/code/game/turfs/walls/wall_types.dm b/code/game/turfs/walls/wall_types.dm index 6db61002c2fe..551cc561bf4a 100644 --- a/code/game/turfs/walls/wall_types.dm +++ b/code/game/turfs/walls/wall_types.dm @@ -627,6 +627,7 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen) icon_state = "solaris_rock" walltype = WALL_SOLARIS_ROCK hull = 1 + baseturfs = /turf/open/mars_cave/mars_cave_2 @@ -765,6 +766,11 @@ INITIALIZE_IMMEDIATE(/turf/closed/wall/indestructible/splashscreen) if(hivenumber == XENO_HIVE_NORMAL) RegisterSignal(SSdcs, COMSIG_GLOB_GROUNDSIDE_FORSAKEN_HANDLING, PROC_REF(forsaken_handling)) + if(!hull) + var/area/area = get_area(src) + if(area && area.linked_lz) + AddComponent(/datum/component/resin_cleanup) + /turf/closed/wall/resin/proc/forsaken_handling() SIGNAL_HANDLER if(is_ground_level(z)) diff --git a/code/game/turfs/walls/walls.dm b/code/game/turfs/walls/walls.dm index f82ba6ddadaf..e8c7d84d8baf 100644 --- a/code/game/turfs/walls/walls.dm +++ b/code/game/turfs/walls/walls.dm @@ -79,6 +79,12 @@ for(var/i in GLOB.cardinals) T = get_step(src, i) + if(istype(T, /turf/closed/wall)) + var/turf/closed/wall/neighbour_wall = T + + neighbour_wall.update_connections() + neighbour_wall.update_icon() + //nearby glowshrooms updated for(var/obj/effect/glowshroom/shroom in T) if(!shroom.floor) //shrooms drop to the floor diff --git a/code/game/verbs/discord.dm b/code/game/verbs/discord.dm index 2446c89aafe5..e9c69481c93c 100644 --- a/code/game/verbs/discord.dm +++ b/code/game/verbs/discord.dm @@ -1,4 +1,4 @@ -/client/verb/discord_connect() +/client/proc/discord_connect() set name = "Discord Certify" set category = "OOC" @@ -8,13 +8,6 @@ to_chat(src, SPAN_ALERTWARNING("You don't have enough minutes - [CONFIG_GET(number/certification_minutes) - total_playtime] remaining.")) return - if(!player_data) - load_player_data() - - if(player_data.discord_link) - to_chat(src, SPAN_ALERTWARNING("You already have a linked Discord. Ask an Admin to remove it.")) - return - var/datum/view_record/discord_identifier/ident = locate() in DB_VIEW(/datum/view_record/discord_identifier, DB_AND( DB_COMP("playerid", DB_EQUALS, player_data.id), DB_COMP("realtime", DB_GREATER, world.realtime - 4 HOURS), diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm index 4d52635c6f88..d379acac2722 100644 --- a/code/game/verbs/ooc.dm +++ b/code/game/verbs/ooc.dm @@ -142,7 +142,7 @@ var/display_name = S.key if(S.stat != DEAD && !isobserver(S)) - display_name = S.name + display_name = S.real_name msg = process_chat_markup(msg, list("*")) @@ -164,7 +164,7 @@ // Now handle admins display_name = S.key if(S.stat != DEAD && !isobserver(S)) - display_name = "[S.name]/([S.key])" + display_name = "[S.real_name]/([S.key])" for(var/client/C in GLOB.admins) if(!C.admin_holder || !(C.admin_holder.rights & R_MOD)) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index d2ea756405f4..e2096bcdac7b 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -74,6 +74,9 @@ GLOBAL_LIST_INIT(admin_verbs_default, list( /client/proc/cmd_admin_tacmaps_panel, /client/proc/other_records, /client/proc/toggle_admin_afk_safety, + /client/proc/add_known_alt, + /client/proc/remove_known_alt, + /client/proc/toogle_door_control, )) GLOBAL_LIST_INIT(admin_verbs_admin, list( @@ -143,6 +146,7 @@ GLOBAL_LIST_INIT(admin_verbs_minor_event, list( /client/proc/toggle_hardcore_perma, /client/proc/toggle_bypass_joe_restriction, /client/proc/toggle_joe_respawns, + /client/proc/toggle_lz_hazards, /datum/admins/proc/open_shuttlepanel, /client/proc/get_whitelisted_clients, )) @@ -156,7 +160,6 @@ GLOBAL_LIST_INIT(admin_verbs_major_event, list( /client/proc/set_autoreplacer, /client/proc/deactivate_autoreplacer, /client/proc/rerun_decorators, - /client/proc/toogle_door_control, /client/proc/map_template_load, /client/proc/load_event_level, /client/proc/cmd_fun_fire_ob, diff --git a/code/modules/admin/player_panel/actions/transform.dm b/code/modules/admin/player_panel/actions/transform.dm index 91a62b1a1d02..2fc52dbd1b9a 100644 --- a/code/modules/admin/player_panel/actions/transform.dm +++ b/code/modules/admin/player_panel/actions/transform.dm @@ -140,6 +140,11 @@ GLOBAL_LIST_INIT(pp_transformables, list( name = XENO_CASTE_PREDALIEN, key = /mob/living/carbon/xenomorph/predalien, color = "purple" + ), + list( + name = XENO_CASTE_KING, + key = /mob/living/carbon/xenomorph/king, + color="purple" ) ), diff --git a/code/modules/admin/tabs/admin_tab.dm b/code/modules/admin/tabs/admin_tab.dm index cf8fe41b66d7..ecc1471b69a3 100644 --- a/code/modules/admin/tabs/admin_tab.dm +++ b/code/modules/admin/tabs/admin_tab.dm @@ -886,3 +886,26 @@ SSticker.mode.toggleable_flags ^= MODE_DISABLE_JOE_RESPAWN message_admins("[src] has [MODE_HAS_TOGGLEABLE_FLAG(MODE_DISABLE_JOE_RESPAWN) ? "disabled" : "enabled"] Working Joe respawns.") + +/client/proc/toggle_lz_hazards() + set name = "Toggle LZ Hazards" + set category = "Admin.Flags" + set desc = "Distress Signal: Whether miasma smoke is spawned 3 minutes after the start of the round." + + if(!admin_holder || !check_rights(R_EVENT, TRUE)) + return + + if(!SSticker.mode) + to_chat(usr, SPAN_WARNING("A mode hasn't been selected yet!")) + return + + if(!istype(SSticker.mode, /datum/game_mode/colonialmarines)) + to_chat(usr, SPAN_WARNING("LZ hazards are only applicable to distress signal!")) + return + + if(ROUND_TIME > LZ_HAZARD_START) + to_chat(usr, SPAN_WARNING("Its too late to toggle this!")) + return + + SSticker.mode.toggleable_flags ^= MODE_LZ_HAZARD_ACTIVATED + message_admins("[src] has [MODE_HAS_TOGGLEABLE_FLAG(MODE_LZ_HAZARD_ACTIVATED) ? "enabled" : "disabled"] LZ hazards.") diff --git a/code/modules/admin/topic/topic.dm b/code/modules/admin/topic/topic.dm index 029eda204f3a..6f660323f8e3 100644 --- a/code/modules/admin/topic/topic.dm +++ b/code/modules/admin/topic/topic.dm @@ -1344,7 +1344,7 @@ // Stamps var/image/stampoverlay = image('icons/obj/items/paper.dmi') - stampoverlay.icon_state = "paper_stamp-uscm" + stampoverlay.icon_state = "paper_stamp-rd" if(!P.stamped) P.stamped = new P.stamped += /obj/item/tool/stamp diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm index 0763a0e10795..05bde482f504 100644 --- a/code/modules/admin/verbs/playsound.dm +++ b/code/modules/admin/verbs/playsound.dm @@ -16,36 +16,38 @@ var/announce_title = TRUE if(sound_mode == "Web") - var/ytdl = CONFIG_GET(string/invoke_youtubedl) - if(!ytdl) - to_chat(src, SPAN_BOLDWARNING("Youtube-dl was not configured, action unavailable"), confidential = TRUE) //Check config.txt for the INVOKE_YOUTUBEDL value + var/list/datum/internet_media/media_players = list() + + if(CONFIG_GET(string/invoke_youtubedl)) + media_players += new /datum/internet_media/yt_dlp + + if(CONFIG_GET(string/cobalt_base_api)) + media_players += new /datum/internet_media/cobalt + + if(!length(media_players)) + to_chat(src, SPAN_BOLDWARNING("Your server host has not set up any web media players.")) return - web_sound_input = input("Enter content URL (supported sites only)", "Play Internet Sound via youtube-dl") as text|null + web_sound_input = input("Enter content URL (supported sites only)", "Play Internet Sound") as text|null if(!istext(web_sound_input) || !length(web_sound_input)) return web_sound_input = trim(web_sound_input) - if(findtext(web_sound_input, ":") && !findtext(web_sound_input, GLOB.is_http_protocol)) - to_chat(src, SPAN_WARNING("Non-http(s) URIs are not allowed.")) - to_chat(src, SPAN_WARNING("For youtube-dl shortcuts like ytsearch: please use the appropriate full url from the website.")) - return + var/datum/media_response/response + for(var/datum/internet_media/player as anything in media_players) + response = player.get_media(web_sound_input) - var/list/output = world.shelleo("[ytdl] --geo-bypass --format \"bestaudio\[ext=mp3]/best\[ext=mp4]\[height<=360]/bestaudio\[ext=m4a]/bestaudio\[ext=aac]\" --dump-single-json --no-playlist -- \"[shell_url_scrub(web_sound_input)]\"") - var/errorlevel = output[SHELLEO_ERRORLEVEL] - var/stdout = output[SHELLEO_STDOUT] - var/stderr = output[SHELLEO_STDERR] + if(istype(response)) + break - if(errorlevel) - to_chat(src, SPAN_WARNING("Youtube-dl URL retrieval FAILED: [stderr]")) + if(!istype(response)) + to_chat(src, SPAN_BOLDWARNING("All configured web media players failed to provide a valid response:")) + for(var/datum/internet_media/player as anything in media_players) + to_chat(src, SPAN_WARNING("[player.type] error: [player.error]")) return - try - data = json_decode(stdout) - catch(var/exception/e) - to_chat(src, SPAN_WARNING("Youtube-dl JSON parsing FAILED: [e]: [stdout]")) - return + data = response.get_list() else if(sound_mode == "Upload") var/current_transport = CONFIG_GET(string/asset_transport) @@ -80,17 +82,21 @@ var/list/music_extra_data = list() if(data["url"]) music_extra_data["link"] = data["url"] - music_extra_data["title"] = data["title"] web_sound_url = data["url"] - title = data["title"] music_extra_data["start"] = data["start_time"] music_extra_data["end"] = data["end_time"] + if(isnull(data["title"])) + data["title"] = tgui_input_text(src, "What is the title of this media?", "Media Title") + title = data["title"] + music_extra_data["title"] = data["title"] + if(!must_send_assets && web_sound_url && !findtext(web_sound_url, GLOB.is_http_protocol)) to_chat(src, SPAN_BOLDWARNING("BLOCKED: Content URL not using http(s) protocol"), confidential = TRUE) to_chat(src, SPAN_WARNING("The media provider returned a content URL that isn't using the HTTP or HTTPS protocol"), confidential = TRUE) return + switch(tgui_alert(src, "Show the name of this sound to the players?", "Sound Name", list("Yes","No","Cancel"))) if("No") music_extra_data["title"] = "Admin sound" diff --git a/code/modules/almayer/machinery.dm b/code/modules/almayer/machinery.dm index d4ca5da20378..6ad4285ffb43 100644 --- a/code/modules/almayer/machinery.dm +++ b/code/modules/almayer/machinery.dm @@ -187,47 +187,6 @@ unslashable = TRUE unacidable = TRUE -/obj/structure/prop/almayer/ship_memorial - name = "slab of victory" - desc = "A ship memorial dedicated to the triumphs of the USCM and the fallen marines of this ship. On the left there are grand tales of victory etched into the slab. On the right there is a list of famous marines who have fallen in combat serving the USCM." - icon = 'icons/obj/structures/props/almayer_props64.dmi' - icon_state = "ship_memorial" - bound_width = 64 - bound_height = 32 - unslashable = TRUE - unacidable = TRUE - -/obj/structure/prop/almayer/ship_memorial/centcomm - name = "slab of remembrance" - desc = "A memorial to all Maintainer Team members that have retired from working on CM. No mentor names are present." - - -/obj/structure/prop/almayer/ship_memorial/centcomm/admin - desc = "A memorial to all Admins and Moderators who have retired from CM. No mentor names are present." - - -/obj/structure/prop/almayer/ship_memorial/attackby(obj/item/I, mob/user) - if(istype(I, /obj/item/dogtag)) - var/obj/item/dogtag/D = I - if(D.fallen_names) - to_chat(user, SPAN_NOTICE("You add [D] to [src].")) - GLOB.fallen_list += D.fallen_names - qdel(D) - return TRUE - else - . = ..() - -/obj/structure/prop/almayer/ship_memorial/get_examine_text(mob/user) - . = ..() - if((isobserver(user) || ishuman(user)) && GLOB.fallen_list) - var/faltext = "" - for(var/i = 1 to length(GLOB.fallen_list)) - if(i != length(GLOB.fallen_list)) - faltext += "[GLOB.fallen_list[i]], " - else - faltext += GLOB.fallen_list[i] - . += SPAN_NOTICE("To our fallen soldiers: [faltext].") - /obj/structure/prop/almayer/particle_cannon name = "\improper 75cm/140 Mark 74 General Atomics railgun" desc = "The Mark 74 Railgun is top of the line for space-based weaponry. Capable of firing a round with a diameter of 3/4ths of a meter at 24 kilometers per second. It also is capable of using a variety of round types which can be interchanged at any time with its newly designed feed system." diff --git a/code/modules/almayer/ship_memorial.dm b/code/modules/almayer/ship_memorial.dm new file mode 100644 index 000000000000..a1979908045f --- /dev/null +++ b/code/modules/almayer/ship_memorial.dm @@ -0,0 +1,386 @@ +/** + * Ship Memorial + * + * Lists all dead marines whose dog tags were recovered. + * Allows personnel, while alone, to inspect the memorial and see ghosts of the fallen. + * Squad marines have the ability to have a final goodbye with their squad if enough dog tags were collected. + */ + +#define COOLDOWN_SLAB_CHECK "cooldown_slab_check" +#define FLASHBACK_DEFAULT "flashback_default" +#define FLASHBACK_SQUAD "flashback_squad" +#define REQUIRED_DEAD_SQUADDIES 4 + +/obj/structure/prop/almayer/ship_memorial + name = "slab of victory" + desc = "A ship memorial dedicated to the triumphs of the USCM and the fallen marines of this ship. On the left there are grand tales of victory etched into the slab. On the right there is a list of famous marines who have fallen in combat serving the USCM." + icon = 'icons/obj/structures/props/almayer_props64.dmi' + icon_state = "ship_memorial" + bound_width = 64 + bound_height = 32 + unslashable = TRUE + unacidable = TRUE + //Sound files that play when a hallucination pops up. + ///Voicelines for male ghosts. + var/list/hallucination_sounds = list('sound/hallucinations/ghost_whisper_01.ogg', + 'sound/hallucinations/ghost_whisper_02.ogg', + 'sound/hallucinations/ghost_whisper_03.ogg', + 'sound/hallucinations/ghost_whisper_04.ogg', + 'sound/hallucinations/ghost_whisper_05.ogg', + 'sound/hallucinations/ghost_whisper_06.ogg', + 'sound/hallucinations/ghost_whisper_07.ogg', + 'sound/hallucinations/ghost_whisper_08.ogg', + 'sound/hallucinations/ghost_whisper_09.ogg', + 'sound/hallucinations/ghost_whisper_10.ogg', + 'sound/hallucinations/ghost_whisper_11.ogg', + 'sound/hallucinations/ghost_whisper_12.ogg', + 'sound/hallucinations/ghost_whisper_13.ogg' + ) + ///Voicelines for female ghosts. + var/list/hallucination_sounds_female = list('sound/hallucinations/ghost_whisper_female_01.ogg', + 'sound/hallucinations/ghost_whisper_female_02.ogg', + 'sound/hallucinations/ghost_whisper_female_03.ogg', + 'sound/hallucinations/ghost_whisper_female_04.ogg', + 'sound/hallucinations/ghost_whisper_female_05.ogg', + 'sound/hallucinations/ghost_whisper_female_06.ogg', + 'sound/hallucinations/ghost_whisper_female_07.ogg', + 'sound/hallucinations/ghost_whisper_female_08.ogg', + 'sound/hallucinations/ghost_whisper_female_09.ogg', + 'sound/hallucinations/ghost_whisper_female_10.ogg', + 'sound/hallucinations/ghost_whisper_female_11.ogg', + 'sound/hallucinations/ghost_whisper_female_12.ogg', + 'sound/hallucinations/ghost_whisper_female_13.ogg', + 'sound/hallucinations/ghost_whisper_female_14.ogg', + 'sound/hallucinations/ghost_whisper_female_15.ogg' + ) + ///All mobs that went through a squad flashback. + var/list/went_through_flashback = list() + ///Weakrefs of mobs of the dogtags that are placed on the slab. + var/list/datum/weakref/fallen_personnel = list() + +/obj/structure/prop/almayer/ship_memorial/centcomm + name = "slab of remembrance" + desc = "A memorial to all Maintainer Team members that have retired from working on CM. No mentor names are present." + +/obj/structure/prop/almayer/ship_memorial/centcomm/admin + desc = "A memorial to all Admins and Moderators who have retired from CM. No mentor names are present." + +/obj/structure/prop/almayer/ship_memorial/attackby(obj/item/attacking_item, mob/user) + if(istype(attacking_item, /obj/item/dogtag)) + var/obj/item/dogtag/attacking_dogtag = attacking_item + if(attacking_dogtag.fallen_names) + to_chat(user, SPAN_NOTICE("You add [attacking_dogtag] to [src].")) + GLOB.fallen_list += attacking_dogtag.fallen_names + fallen_personnel += attacking_dogtag.fallen_references + qdel(attacking_dogtag) + return TRUE + + return ..() + +/obj/structure/prop/almayer/ship_memorial/get_examine_text(mob/user) + . = ..() + if((isobserver(user) || ishuman(user)) && length(GLOB.fallen_list)) + var/faltext = "" + for(var/i = 1 to length(GLOB.fallen_list)) + if(i != length(GLOB.fallen_list)) + faltext += "[GLOB.fallen_list[i]], " + else + faltext += GLOB.fallen_list[i] + . += SPAN_NOTICE("To our fallen soldiers: [faltext].") + +/obj/structure/prop/almayer/ship_memorial/attack_hand(mob/living/carbon/human/user) + . = ..() + if(user.action_busy) + return ..() + + if(user in went_through_flashback) + to_chat(user, SPAN_NOTICE("It's all in the past now. You need to keep looking forward. It's what they would have wanted.")) + return ..() + + if(TIMER_COOLDOWN_CHECK(user, COOLDOWN_SLAB_CHECK)) + to_chat(user, SPAN_DANGER("You can't bring yourself to look at this right now.")) + return ..() + + ///References of all fallen personnel whose mobs still exist. + var/list/fallen_personnel_resolved = list() + resolve_refs(fallen_personnel_resolved) + + if(!length(fallen_personnel) || !length(fallen_personnel_resolved) || user.faction != FACTION_MARINE) + to_chat(user, SPAN_NOTICE("You start looking through the names on the slab but nothing catches your attention.")) + return ..() + + fallen_personnel_resolved = shuffle(fallen_personnel_resolved) + + to_chat(user, SPAN_NOTICE("You start looking through the names on the slab...")) + ///Text that's prefixed everytime a name is listed. + var/list/inspection_text = list("A name catches your eyes,", + "You know this name,", + "This one...", + "You recognize this name,", + "You take a deep breath and see", + "You remember them.", + "Your attention is drawn to this name,", + "You read the name on the slab,") + + var/list/voicelines = hallucination_sounds.Copy() + var/list/voicelines_female = hallucination_sounds_female.Copy() + + ///Did a flashback event trigger? + var/had_flashback = FALSE + for(var/i in 1 to clamp(length(fallen_personnel_resolved), 1, 8)) + if(!do_after(user, 4 SECONDS, INTERRUPT_ALL_OUT_OF_RANGE)) + if(had_flashback) + cancel_flashback(user, null, FLASHBACK_DEFAULT) + return ..() + + cancel_flashback(user) + return ..() + + ///Is someone else within a set range of the mob interacting with the slab? + var/interrupted_by_mob = FALSE + for(var/mob/living/mob in view(src, 6)) + if(mob != user && mob.stat == CONSCIOUS) + interrupted_by_mob = TRUE + + var/mob/living/carbon/human/person = fallen_personnel_resolved[i] + + //There is a chance for special flashback events to trigger, and a guaranteed one for squad marines + //if they recover enough dogtags from their squad. + if(!interrupted_by_mob && !had_flashback) + var/flashback_type + //If the user is part of a squad, check the memorial for dogtags belonging to their squad. + //If there are enough (equal or greater than REQUIRED_DEAD_SQUADDIES), trigger a special flashback sequence. + if(user.assigned_squad) + ///Every squad member of the user that is listed on the memorial. + var/list/squad_members = list() + for(var/mob/living/carbon/human/squad_member in fallen_personnel_resolved) + if(squad_member.assigned_squad == user.assigned_squad) + squad_members += squad_member + + if(length(squad_members) >= REQUIRED_DEAD_SQUADDIES) + flashback_type = FLASHBACK_SQUAD + INVOKE_ASYNC(src, PROC_REF(flashback_trigger), user, flashback_type, squad_members) + return + + if(prob(i*2) && length(fallen_personnel_resolved) >= 5) + had_flashback = TRUE + flashback_type = FLASHBACK_DEFAULT + INVOKE_ASYNC(src, PROC_REF(flashback_trigger), user, flashback_type, fallen_personnel_resolved) + + //If we somehow lose a mob reference, we need to account for it. + if(!person) + to_chat(user, SPAN_NOTICE("You can't bring yourself to read this name... you press on.")) + continue + + to_chat(user, SPAN_NOTICE("[pick_n_take(inspection_text)] [person], [GET_DEFAULT_ROLE(person.job)].")) + + if(interrupted_by_mob || !user.client) + continue + + ///The ghost that is generated this iteration. + var/obj/effect/client_image_holder/memorial_ghost/ghost = generate_ghost(person, user) + if(!ghost) + continue + + ///Gender of the generated ghost. + var/ghost_gender = person.get_gender() + if(ghost_gender == FEMALE) + playsound_client(user.client, pick_n_take(voicelines_female), ghost.loc, 55) + else + playsound_client(user.client, pick_n_take(voicelines), ghost.loc, 100) + + //Faulty generation can cause the ghost to get qdel'd before this proc runs. + if(!QDELETED(ghost)) + addtimer(CALLBACK(ghost, TYPE_PROC_REF(/obj/effect/client_image_holder/memorial_ghost, disappear)), rand(1.5 SECONDS, 1.9 SECONDS)) + + if(had_flashback) + TIMER_COOLDOWN_START(user, COOLDOWN_SLAB_CHECK, 60 SECONDS) + + ///A sentence that's displayed at the end of the slab interaction. + var/list/realization_text = list("Those people were your family.", + "You'll never forget. Even if it hurts to remember.", + "They're gone. And you'll never see them again.", + "You say your goodbyes silently.", + "Nothing good lasts forever.") + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), user, SPAN_NOTICE("[pick(realization_text)]")), 1 SECONDS) + +///Proc for resolving weakrefs from fallen_personnel. +/obj/structure/prop/almayer/ship_memorial/proc/resolve_refs(list/list_to_add) + for(var/i in 1 to length(fallen_personnel)) + var/resolved_mob = fallen_personnel[i].resolve() + if(resolved_mob) + list_to_add += resolved_mob + else + //weakref didn't get resolved, bad reference. remove it from the list. + fallen_personnel -= fallen_personnel[i] + +///Proc for canceling memorial interaction. Used when interrupted by a mob or when the do_after() is cancelled. +/obj/structure/prop/almayer/ship_memorial/proc/cancel_flashback(mob/user, list/ghosts, flashback_type) + switch(flashback_type) + if(FLASHBACK_DEFAULT) + to_chat(user, SPAN_DANGER("You turn away from the slab. You turn away from them all...")) + TIMER_COOLDOWN_START(user, COOLDOWN_SLAB_CHECK, 25 SECONDS) + if(FLASHBACK_SQUAD) + to_chat(user, SPAN_DANGER("You turn your back on your squad. You just can't. Not now.")) + TIMER_COOLDOWN_START(user, COOLDOWN_SLAB_CHECK, 10 SECONDS) + else + to_chat(user, SPAN_NOTICE("...maybe it's better to forget.")) + + if(length(ghosts)) + for(var/obj/effect/client_image_holder/memorial_ghost/ghost in ghosts) + ghost.disappear() + +///Proc for generating a ghost image of a mob. +/obj/structure/prop/almayer/ship_memorial/proc/generate_ghost(person, mob/living/user, range = 3) + if(!person) + return + + ///All acceptable turfs where the ghost could spawn. + var/list/ghost_turf = list() + for(var/turf/turf in range(user.loc, range)) + var/bad_turf = FALSE + if(turf.density || istype(turf, /turf/open/space)) + continue + + if(!(user in view(3, turf))) + continue + + for(var/obj/object in turf) + if(object.density || istype(object, /obj/effect/client_image_holder/memorial_ghost)) + bad_turf = TRUE + break + + for(var/mob/mob in turf) + bad_turf = TRUE + break + + if(bad_turf) + continue + + ghost_turf += turf + + if(!length(ghost_turf)) + return + + var/turf/spawn_loc = pick(ghost_turf) + var/dir_to_face = get_dir(spawn_loc, user.loc) + var/obj/effect/client_image_holder/memorial_ghost/ghost = new(spawn_loc, user, person, dir_to_face) + + return ghost + +///Proc that handles special flashback events. +/obj/structure/prop/almayer/ship_memorial/proc/flashback_trigger(mob/living/carbon/human/user, flashback_type = FLASHBACK_DEFAULT, list/mob_references) + playsound_client(user.client, 'sound/hallucinations/ears_ringing.ogg', user.loc, 40) + to_chat(user, SPAN_DANGER("It's like time has stopped. All you can focus on are the names on that list.")) + user.apply_effect(6, ROOT) + user.apply_effect(6, STUTTER) + + sleep(1 SECONDS) + + ///Every ghost that was generated in the flashback event. + var/list/image/all_ghosts = list() + + switch(flashback_type) + //Default flashback. Spawns ghost images of every (max 16) name listed on the memorial. + if(FLASHBACK_DEFAULT) + var/list/references_copy = mob_references.Copy() + for(var/i = clamp(length(references_copy), 1, 16), i > 0, i--) + if(!do_after(user, 0.1 SECONDS, INTERRUPT_ALL_OUT_OF_RANGE)) + cancel_flashback(user, all_ghosts, FLASHBACK_DEFAULT) + return + + for(var/times_to_generate = rand(1, 2), times_to_generate > 0, times_to_generate--) + all_ghosts += generate_ghost(pick_n_take(references_copy), user, 4) + + for(var/obj/effect/client_image_holder/memorial_ghost/ghost in all_ghosts) + ghost.disappear() + + //Special flashback reserved for squad marines that is guaranteed to trigger if there are REQUIRED_DEAD_SQUADDIES amount + //of squad dogtags on the memorial. Only counts the squad members from which the user is a part of. + //Spawns ghost images of all (max 12) dead squad members listed on the memorial. + //On completion, the user can no longer interact with the slab. A final goodbye. + if(FLASHBACK_SQUAD) + var/list/inspection_text = list("Could you have saved them? You sigh and continue reading.", + "Thinking someone is behind you, you turn around. Nothing. You look back at the names.", + "You're not alone. You're sure of it. The next name reads", + "Deep down, you knew it would come to this. You set your eyes back on the slab.", + "You always thought it'd be you on that slab. Guess not.", + "You wish you could have taken their place. You keep reading.", + "It goes dark for a moment. Then you see", + "This is what duty gets you. A name on a plaque. The following name reads", + "You had fond memories with these people.", + "It's a lot to take in. They're gone, and you'll never see them again.", + "Every name you read feels like a dead family member to remember.", + "It's almost as if they were still here. Alive. You keep reading," + ) + + inspection_text = shuffle(inspection_text) + + var/list/voicelines = hallucination_sounds.Copy() + var/list/voicelines_female = hallucination_sounds_female.Copy() + for(var/i = clamp(length(mob_references), 1, 12), i > 0, i--) + if(!do_after(user, 4 SECONDS, INTERRUPT_ALL_OUT_OF_RANGE)) + cancel_flashback(user, all_ghosts, FLASHBACK_SQUAD) + return + + for(var/mob/living/mob in view(src, 6)) + if(mob != user && mob.stat == CONSCIOUS) + cancel_flashback(user, all_ghosts, FLASHBACK_SQUAD) + return + + var/mob/living/carbon/human/picked_member = pick_n_take(mob_references) + var/obj/effect/client_image_holder/memorial_ghost/generated_ghost = generate_ghost(picked_member, user, 2) + all_ghosts += generated_ghost + + var/ghost_gender = picked_member.get_gender() + if(ghost_gender == FEMALE) + playsound_client(user.client, pick_n_take(voicelines_female), generated_ghost.loc, 55) + else + playsound_client(user.client, pick_n_take(voicelines), generated_ghost.loc, 100) + + to_chat(user, SPAN_DANGER("[pick_n_take(inspection_text)] [picked_member], [GET_DEFAULT_ROLE(picked_member.job)].")) + sleep(rand(0.5 SECONDS, 0.7 SECONDS)) + + went_through_flashback += user + sleep(5 SECONDS) + + for(var/obj/effect/client_image_holder/memorial_ghost/ghost in all_ghosts) + ghost.disappear() + + ///Name of the user, split so we can retrieve their first name. + var/list/split_name = splittext(user.name, " ") + to_chat(user, SPAN_NOTICE("You hear someone whisper 'Thank you, [split_name[1]]. Goodbye.' into your ear.")) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), user, SPAN_NOTICE("It feels final. Maybe it's time to look forward now.")), 3 SECONDS) + +#undef COOLDOWN_SLAB_CHECK +#undef FLASHBACK_DEFAULT +#undef FLASHBACK_SQUAD +#undef REQUIRED_DEAD_SQUADDIES + +/obj/effect/client_image_holder/memorial_ghost + desc = "May we never forget freedom isn't free." + var/mob/living/mob_reference + +/obj/effect/client_image_holder/memorial_ghost/proc/disappear() + var/time_to_disappear = rand(0.4 SECONDS, 0.8 SECONDS) + animate(shown_image, alpha = 0, QUAD_EASING, time = time_to_disappear) + QDEL_IN(src, time_to_disappear) + +/obj/effect/client_image_holder/memorial_ghost/Initialize(mapload, list/mobs_which_see_us, mob/living/reference = null, direction_to_face) + mob_reference = reference + if(!mob_reference) + return INITIALIZE_HINT_QDEL + + dir = direction_to_face + name = mob_reference.name + return ..() + +/obj/effect/client_image_holder/memorial_ghost/generate_image() + var/image/created = image(null, src, null, image_layer, src.dir, image_pixel_x, image_pixel_y) + created.appearance = mob_reference.appearance + created.transform = matrix(mob_reference.base_transform) + created.alpha = 0 + if(image_color) + created.color = image_color + animate(created, alpha = 120, QUAD_EASING, time = rand(0.3 SECONDS, 0.5 SECONDS)) + return created diff --git a/code/modules/asset_cache/asset_list.dm b/code/modules/asset_cache/asset_list.dm index 828472ad9573..3c721d923062 100644 --- a/code/modules/asset_cache/asset_list.dm +++ b/code/modules/asset_cache/asset_list.dm @@ -324,6 +324,33 @@ GLOBAL_LIST_EMPTY(asset_datums) /datum/asset/simple/namespaced/proc/get_htmlloader(filename) return url2htmlloader(SSassets.transport.get_asset_url(filename, assets[filename])) +/// A subtype to generate a JSON file from a list +/datum/asset/json + _abstract = /datum/asset/json + /// The filename, will be suffixed with ".json" + var/name + +/datum/asset/json/send(client) + return SSassets.transport.send_assets(client, "[name].json") + +/datum/asset/json/get_url_mappings() + return list( + "[name].json" = SSassets.transport.get_asset_url("[name].json"), + ) + +/datum/asset/json/register() + var/filename = "data/[name].json" + fdel(filename) + text2file(json_encode(generate()), filename) + SSassets.transport.register_asset("[name].json", fcopy_rsc(filename)) + fdel(filename) + +/// Returns the data that will be JSON encoded +/datum/asset/json/proc/generate() + SHOULD_CALL_PARENT(FALSE) + CRASH("generate() not implemented for [type]!") + + /datum/asset/changelog_item _abstract = /datum/asset/changelog_item var/item_filename diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm index 3ee8ef5b616d..a445652f264d 100644 --- a/code/modules/asset_cache/asset_list_items.dm +++ b/code/modules/asset_cache/asset_list_items.dm @@ -256,6 +256,7 @@ list("ass", "hudsquad_ass"), list("Eng", "hudsquad_engi"), list("Med", "hudsquad_med"), + list("medk9", "hudsquad_medk9"), list("SG", "hudsquad_gun"), list("Spc", "hudsquad_spec"), list("TL", "hudsquad_tl"), diff --git a/code/modules/asset_cache/assets/icon_ref_map.dm b/code/modules/asset_cache/assets/icon_ref_map.dm new file mode 100644 index 000000000000..6e2660fc7437 --- /dev/null +++ b/code/modules/asset_cache/assets/icon_ref_map.dm @@ -0,0 +1,27 @@ +/// Maps icon names to ref values +/datum/asset/json/icon_ref_map + name = "icon_ref_map" + +/datum/asset/json/icon_ref_map/generate() + var/list/data = list() //"icons/obj/drinks.dmi" => "[0xc000020]" + + //var/start = "0xc000000" + var/value = 0 + + while(TRUE) + value += 1 + var/ref = "\[0xc[num2text(value,6,16)]\]" + var/mystery_meat = locate(ref) + + if(isicon(mystery_meat)) + if(!isfile(mystery_meat)) // Ignore the runtime icons for now + continue + var/path = get_icon_dmi_path(mystery_meat) //Try to get the icon path + if(path) + data[path] = ref + else if(mystery_meat) + continue; //Some other non-icon resource, ogg/json/whatever + else //Out of resources end this, could also try to end this earlier as soon as runtime generated icons appear but eh + break; + + return data diff --git a/code/modules/autowiki/pages/supply_packs.dm b/code/modules/autowiki/pages/supply_packs.dm new file mode 100644 index 000000000000..a078a3ce75d4 --- /dev/null +++ b/code/modules/autowiki/pages/supply_packs.dm @@ -0,0 +1,38 @@ +/datum/autowiki/supply_packs + generate_multiple = TRUE + page = "Template:Autowiki/Content/SupplyPacks" + + +/datum/autowiki/supply_packs/generate_multiple() + + var/output = list() + + //Gets the subtypes of all supply_packs + for(var/typepath in subtypesof(/datum/supply_packs)) + var/datum/supply_packs/my_pack = GLOB.supply_packs_datums[typepath] + + + var/list/contents = list() + for(var/obj/contents_type as anything in my_pack.contains) + //So long as there is something in the contaienr it will add it to the list + if(!length(my_pack.contains)) + return + contents += contents_type::name + + var/obj/structure/closet/crate/container_typepath = my_pack.containertype + var/container_filename = container_typepath ? SANITIZE_FILENAME(escape_value(format_text("[container_typepath::icon]-[container_typepath::icon_state]"))) : null + if(container_filename && !fexists("data/autowiki_files/[container_filename].png")) + var/obj/structure/closet/crate/generating_crate = new my_pack.containertype + upload_icon(getFlatIcon(generating_crate, no_anim = TRUE), container_filename) + + var/page_name = SANITIZE_FILENAME(replacetext(strip_improper(my_pack.name), " ", "_")) + var/to_add = list(title = "Template:Autowiki/Content/SupplyPack/[page_name]", text = include_template("Autowiki/SupplyPack",list( + "icon" = container_filename, + "name" = my_pack.name, + "cost" = my_pack.cost, + "contents" = contents.Join(", ") + ) + )) + output += list(to_add) + + return output diff --git a/code/modules/buildmode/submodes/variable_edit.dm b/code/modules/buildmode/submodes/variable_edit.dm index 7517012583da..9013934eebf2 100644 --- a/code/modules/buildmode/submodes/variable_edit.dm +++ b/code/modules/buildmode/submodes/variable_edit.dm @@ -27,7 +27,7 @@ var/list/locked = list("vars", "key", "ckey", "client", "icon") selected_key = input(usr,"Enter variable name:" ,"Name", "name") - if(selected_key in locked && !check_rights(R_DEBUG,0)) + if((selected_key in locked) && !check_rights(R_DEBUG, FALSE)) return TRUE var/type = tgui_input_list(usr,"Select variable type:", "Type", list(TYPE_TEXT, TYPE_NUMBER, TYPE_MOB_REFERENCE, TYPE_OBJ_REFERENCE, TYPE_TURF_REFERENCE)) diff --git a/code/modules/character_traits/skills.dm b/code/modules/character_traits/skills.dm index 8cd82e1e109a..e02b7ef61f55 100644 --- a/code/modules/character_traits/skills.dm +++ b/code/modules/character_traits/skills.dm @@ -90,6 +90,11 @@ trait_desc = "Boosts the JTAC skill by 1. Crewmember received additional training in using JTAC equipment and Ghillie outfits." skill = SKILL_JTAC +/datum/character_trait/skills/k9_handler + trait_name = "K9 Handler Training" + trait_desc = "Allows the user to interface with Wey-Yu Synthetic K9 Units for rescue purposes" + skill = SKILL_JTAC + /datum/character_trait/skills/powerloader trait_name = "Powerloader Usage Training" trait_desc = "Boosts the powerloader skill to 1. Crewmember received training in operating powerloaders." diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index e3cb211311ba..ae16314546d1 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -43,6 +43,7 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list( /client/proc/toggle_auto_eject_to_hand, /client/proc/toggle_eject_to_hand, /client/proc/toggle_automatic_punctuation, + /client/proc/toggle_auto_shove, /client/proc/toggle_ammo_display_type, /client/proc/toggle_ability_deactivation, /client/proc/toggle_clickdrag_override, @@ -885,6 +886,9 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list( if((flag_to_check & WHITELIST_JOE) && CLIENT_IS_STAFF(src)) return TRUE + if((flag_to_check & WHITELIST_FAX_RESPONDER) && CLIENT_IS_STAFF(src)) + return TRUE + if(!player_data) load_player_data() if(!player_data) diff --git a/code/modules/client/color_picker.dm b/code/modules/client/color_picker.dm new file mode 100644 index 000000000000..f3eda08af544 --- /dev/null +++ b/code/modules/client/color_picker.dm @@ -0,0 +1,74 @@ +/datum/body_picker/ui_static_data(mob/user) + . = ..() + + .["icon"] = /datum/species::icobase + + .["body_types"] = list() + for(var/key in GLOB.body_type_list) + var/datum/body_type/type = GLOB.body_type_list[key] + .["body_types"] += list( + list("name" = type.name, "icon" = type.icon_name) + ) + + .["skin_colors"] = list() + for(var/key in GLOB.skin_color_list) + var/datum/skin_color/color = GLOB.skin_color_list[key] + .["skin_colors"] += list( + list("name" = color.name, "icon" = color.icon_name, "color" = color.color) + ) + + .["body_sizes"] = list() + for(var/key in GLOB.body_size_list) + var/datum/body_size/size = GLOB.body_size_list[key] + .["body_sizes"] += list( + list("name" = size.name, "icon" = size.icon_name) + ) + +/datum/body_picker/ui_data(mob/user) + . = ..() + + .["body_type"] = GLOB.body_type_list[user.client.prefs.body_type].icon_name + .["skin_color"] = GLOB.skin_color_list[user.client.prefs.skin_color].icon_name + .["body_size"] = GLOB.body_size_list[user.client.prefs.body_size].icon_name + +/datum/body_picker/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + + var/datum/preferences/prefs = ui.user.client.prefs + + switch(action) + if("type") + if(!GLOB.body_type_list[params["name"]]) + return + + prefs.body_type = params["name"] + + if("size") + if(!GLOB.body_size_list[params["name"]]) + return + + prefs.body_size = params["name"] + + if("color") + if(!GLOB.skin_color_list[params["name"]]) + return + + prefs.skin_color = params["name"] + + prefs.ShowChoices(ui.user) + return TRUE + +/datum/body_picker/tgui_interact(mob/user, datum/tgui/ui) + . = ..() + + ui = SStgui.try_update_ui(user, src, ui) + + if(!ui) + ui = new(user, src, "BodyPicker", "Body Picker") + ui.open() + ui.set_autoupdate(FALSE) + + winset(user, ui.window.id, "focus=true") + +/datum/body_picker/ui_state(mob/user) + return GLOB.always_state diff --git a/code/modules/client/hair_picker.dm b/code/modules/client/hair_picker.dm new file mode 100644 index 000000000000..c569c22297c5 --- /dev/null +++ b/code/modules/client/hair_picker.dm @@ -0,0 +1,171 @@ +/datum/hair_picker/ui_static_data(mob/user) + . = ..() + + .["hair_icon"] = /datum/sprite_accessory/hair::icon + .["facial_hair_icon"] = /datum/sprite_accessory/facial_hair::icon + + +/datum/hair_picker/ui_data(mob/user) + . = ..() + + var/datum/preferences/prefs = user.client.prefs + + .["hair_style"] = GLOB.hair_styles_list[prefs.h_style].icon_state + .["hair_color"] = rgb(prefs.r_hair, prefs.g_hair, prefs.b_hair) + + .["hair_styles"] = list() + for(var/key in GLOB.hair_styles_list) + var/datum/sprite_accessory/hair/hair = GLOB.hair_styles_list[key] + if(!hair.selectable) + continue + if(!(prefs.species in hair.species_allowed)) + continue + + .["hair_styles"] += list( + list("name" = hair.name, "icon" = hair.icon_state) + ) + + .["facial_hair_style"] = GLOB.facial_hair_styles_list[prefs.f_style].icon_state + .["facial_hair_color"] = rgb(prefs.r_facial, prefs.g_facial, prefs.b_facial) + + .["facial_hair_styles"] = list() + for(var/key in GLOB.facial_hair_styles_list) + var/datum/sprite_accessory/facial_hair/facial_hair = GLOB.facial_hair_styles_list[key] + if(!facial_hair.selectable) + continue + if(!(prefs.species in facial_hair.species_allowed)) + continue + if(facial_hair.gender != NEUTER && prefs.gender != facial_hair.gender) + continue + + .["facial_hair_styles"] += list( + list("name" = facial_hair.name, "icon" = facial_hair.icon_state) + ) + + .["gradient_available"] = !!(/datum/character_trait/hair_dye in prefs.traits) + .["gradient_style"] = prefs.grad_style + .["gradient_color"] = rgb(prefs.r_gradient, prefs.g_gradient, prefs.b_gradient) + + .["gradient_styles"] = list() + for(var/key in GLOB.hair_gradient_list) + var/datum/sprite_accessory/hair_gradient/gradient = GLOB.hair_gradient_list[key] + if(!gradient.selectable) + continue + if(!(prefs.species in gradient.species_allowed)) + continue + + .["gradient_styles"] += gradient.name + +/datum/hair_picker/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + + var/datum/preferences/prefs = ui.user.client.prefs + + switch(action) + if("hair") + var/datum/sprite_accessory/hair/hair = GLOB.hair_styles_list[params["name"]] + if(!hair) + return + + if(!hair.selectable) + return + + if(!(prefs.species in hair.species_allowed)) + return + + prefs.h_style = params["name"] + + if("hair_color") + var/param_color = params["color"] + if(!param_color) + return + + var/r = hex2num(copytext(param_color, 2, 4)) + var/g = hex2num(copytext(param_color, 4, 6)) + var/b = hex2num(copytext(param_color, 6, 8)) + + if(!isnum(r) || !isnum(g) || !isnum(b)) + return + + prefs.r_hair = clamp(r, 0, 255) + prefs.g_hair = clamp(g, 0, 255) + prefs.b_hair = clamp(b, 0, 255) + + if("facial_hair") + var/datum/sprite_accessory/facial_hair/facial_hair = GLOB.facial_hair_styles_list[params["name"]] + if(!facial_hair) + return + + if(!facial_hair.selectable) + return + + if(!(prefs.species in facial_hair.species_allowed)) + return + + if(facial_hair.gender != NEUTER && prefs.gender != facial_hair.gender) + return + + prefs.f_style = params["name"] + + if("facial_hair_color") + var/param_color = params["color"] + if(!param_color) + return + + var/r = hex2num(copytext(param_color, 2, 4)) + var/g = hex2num(copytext(param_color, 4, 6)) + var/b = hex2num(copytext(param_color, 6, 8)) + + if(!isnum(r) || !isnum(g) || !isnum(b)) + return + + prefs.r_facial = clamp(r, 0, 255) + prefs.g_facial = clamp(g, 0, 255) + prefs.b_facial = clamp(b, 0, 255) + + if("gradient") + var/datum/sprite_accessory/hair_gradient/gradient = GLOB.hair_gradient_list[params["name"]] + if(!gradient) + return + + if(!gradient.selectable) + return + + if(!(prefs.species in gradient.species_allowed)) + return + + prefs.grad_style = params["name"] + + if("gradient_color") + var/param_color = params["color"] + if(!param_color) + return + + var/r = hex2num(copytext(param_color, 2, 4)) + var/g = hex2num(copytext(param_color, 4, 6)) + var/b = hex2num(copytext(param_color, 6, 8)) + + if(!isnum(r) || !isnum(g) || !isnum(b)) + return + + prefs.r_gradient = clamp(r, 0, 255) + prefs.g_gradient = clamp(g, 0, 255) + prefs.b_gradient = clamp(b, 0, 255) + + prefs.ShowChoices(ui.user) + return TRUE + +/datum/hair_picker/tgui_interact(mob/user, datum/tgui/ui) + . = ..() + + ui = SStgui.try_update_ui(user, src, ui) + + if(!ui) + ui = new(user, src, "HairPicker", "Hair Picker") + ui.open() + ui.set_autoupdate(FALSE) + + winset(user, ui.window.id, "focus=true") + +/datum/hair_picker/ui_state(mob/user) + return GLOB.always_state diff --git a/code/modules/client/loadout_picker.dm b/code/modules/client/loadout_picker.dm new file mode 100644 index 000000000000..b535a5deb1d0 --- /dev/null +++ b/code/modules/client/loadout_picker.dm @@ -0,0 +1,89 @@ +/datum/loadout_picker/ui_static_data(mob/user) + . = ..() + + .["categories"] = list() + for(var/category in GLOB.gear_datums_by_category) + var/list/datum/gear/gears = GLOB.gear_datums_by_category[category] + + var/items = list() + + for(var/gear_key as anything in gears) + var/datum/gear/gear = gears[gear_key] + items += list( + list("name" = gear.display_name, "cost" = gear.cost, "icon" = gear.path::icon, "icon_state" = gear.path::icon_state) + ) + + .["categories"] += list( + list("name" = category, "items" = items) + ) + + .["max_points"] = MAX_GEAR_COST + +/datum/loadout_picker/ui_data(mob/user) + . = ..() + + var/datum/preferences/prefs = user.client?.prefs + if(!prefs) + return + + var/points = 0 + + .["loadout"] = list() + + for(var/item in prefs.gear) + var/datum/gear/gear = GLOB.gear_datums_by_name[item] + points += gear.cost + + .["loadout"] += list( + list("name" = gear.display_name, "cost" = gear.cost, "icon" = gear.path::icon, "icon_state" = gear.path::icon_state) + ) + + .["points"] = points + +/datum/loadout_picker/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + + var/datum/preferences/prefs = ui.user.client?.prefs + if(!prefs) + return + + switch(action) + if("add") + var/datum/gear/gear = GLOB.gear_datums_by_name[params["name"]] + if(!istype(gear)) + return + + var/total_cost = 0 + for(var/gear_name in prefs.gear) + total_cost += GLOB.gear_datums_by_name[gear_name].cost + + total_cost += gear.cost + if(total_cost > MAX_GEAR_COST) + return + + prefs.gear += gear.display_name + + if("remove") + var/datum/gear/gear = GLOB.gear_datums_by_name[params["name"]] + if(!istype(gear)) + return + + prefs.gear -= gear.display_name + + prefs.ShowChoices(ui.user) + return TRUE + +/datum/loadout_picker/tgui_interact(mob/user, datum/tgui/ui) + . = ..() + + ui = SStgui.try_update_ui(user, src, ui) + + if(!ui) + ui = new(user, src, "LoadoutPicker", "Loadout Picker") + ui.open() + ui.set_autoupdate(FALSE) + + winset(user, ui.window.id, "focus=true") + +/datum/loadout_picker/ui_state(mob/user) + return GLOB.always_state diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index b694e32a80b4..931574b6dc11 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -30,6 +30,11 @@ GLOBAL_LIST_INIT(bgstate_options, list( var/atom/movable/screen/rotate/alt/rotate_left var/atom/movable/screen/rotate/rotate_right + var/static/datum/hair_picker/hair_picker = new + var/static/datum/body_picker/body_picker = new + var/static/datum/traits_picker/traits_picker = new + var/static/datum/loadout_picker/loadout_picker = new + //doohickeys for savefiles var/path var/default_slot = 1 //Holder so it doesn't default to slot 1, rather the last one used @@ -95,13 +100,13 @@ GLOBAL_LIST_INIT(bgstate_options, list( var/predator_use_legacy = "None" var/predator_translator_type = "Modern" var/predator_mask_type = 1 + var/predator_accessory_type = 0 var/predator_armor_type = 1 var/predator_boot_type = 1 var/predator_armor_material = "ebony" var/predator_mask_material = "ebony" var/predator_greave_material = "ebony" var/predator_caster_material = "ebony" - var/predator_cape_type = "None" var/predator_cape_color = "#654321" var/predator_flavor_text = "" //CO-specific preferences @@ -341,11 +346,14 @@ GLOBAL_LIST_INIT(bgstate_options, list( dat += "

Physical Information:" dat += "®

" dat += "Age: [age]
" - dat += "Gender: [gender == MALE ? "Male" : "Female"]
" - dat += "Skin Color: [skin_color]
" - dat += "Body Size: [body_size]
" - dat += "Body Muscularity: [body_type]
" - dat += "Traits: Character Traits" + dat += "Gender: [gender == MALE ? "Male" : "Female"]

" + + dat += "Skin Color: [skin_color]
" + dat += "Body Size: [body_size]
" + dat += "Body Muscularity: [body_type]
" + dat += "Edit Body: Picker

" + + dat += "Traits: Character Traits" dat += "
" dat += "

Occupation Choices:

" @@ -357,30 +365,23 @@ GLOBAL_LIST_INIT(bgstate_options, list( dat += "
" dat += "

Hair and Eyes:

" - dat += "Hair: " - dat += "[h_style]" + dat += "Hair: [h_style]" dat += " | " - dat += "" - dat += "Color " - dat += "" + dat += "" + dat += "
" + + dat += "Facial Hair: [f_style]" + dat += " | " + dat += "" dat += "
" if(/datum/character_trait/hair_dye in traits) - dat += "Hair Gradient: " - dat += "[grad_style]" + dat += "Hair Gradient: [grad_style]" dat += " | " - dat += "" - dat += "Color " - dat += "" + dat += "" dat += "
" - dat += "Facial Hair: " - dat += "[f_style]" - dat += " | " - dat += "" - dat += "Color " - dat += "" - dat += "
" + dat += "Edit Hair: Picker

" dat += "Eye: " dat += "" @@ -397,7 +398,7 @@ GLOBAL_LIST_INIT(bgstate_options, list( dat += "Preferred Armor: [preferred_armor]
" dat += "Show Job Gear: [show_job_gear ? "True" : "False"]
" - dat += "Background: Cycle Background
" + dat += "Background: Cycle Background

" dat += "Custom Loadout: " var/total_cost = 0 @@ -411,16 +412,13 @@ GLOBAL_LIST_INIT(bgstate_options, list( var/datum/gear/G = GLOB.gear_datums_by_name[gear[i]] if(G) total_cost += G.cost - dat += "[gear[i]] ([G.cost] points) Remove
" + dat += "[gear[i]] ([G.cost] points)
" dat += "Used: [total_cost] points" else dat += "None" - if(total_cost < MAX_GEAR_COST) - dat += " Add" - if(LAZYLEN(gear)) - dat += " Clear" + dat += "
Open Loadout" dat += "
" @@ -531,6 +529,7 @@ GLOBAL_LIST_INIT(bgstate_options, list( dat += "Legacy Gear: [predator_use_legacy]
" dat += "Translator Type: [predator_translator_type]
" dat += "Mask Style: ([predator_mask_type])
" + dat += "Mask Accessory: ([predator_accessory_type])
" dat += "Armor Style: ([predator_armor_type])
" dat += "Greave Style: ([predator_boot_type])
" dat += "Mask Material: [predator_mask_material]
" @@ -541,7 +540,6 @@ GLOBAL_LIST_INIT(bgstate_options, list( dat += "
" dat += "

Clothing Setup:

" - dat += "Cape Type: [capitalize_first_letters(predator_cape_type)]
" dat += "Cape Color: " dat += "" dat += "Color " @@ -620,6 +618,8 @@ GLOBAL_LIST_INIT(bgstate_options, list( [toggle_prefs & TOGGLE_IGNORE_SELF ? "Off" : "On"]
" dat += "Toggle Help Intent Safety: \ [toggle_prefs & TOGGLE_HELP_INTENT_SAFETY ? "On" : "Off"]
" + dat += "Toggle Automatic Shove: \ + [toggle_prefs & TOGGLE_AUTO_SHOVE_OFF ? "Off" : "On"]
" dat += "Toggle Ability Deactivation: \ [toggle_prefs & TOGGLE_ABILITY_DEACTIVATION_OFF ? "Off" : "On"]
" dat += "Toggle Directional Assist: \ @@ -642,6 +642,7 @@ GLOBAL_LIST_INIT(bgstate_options, list( [toggle_prefs & TOGGLE_AMMO_DISPLAY_TYPE ? "On" : "Off"]
" dat += "Toggle Item Animations Detail Level
" dat += "Toggle Dual Wield Functionality
" + dat += "Toggle Auto Shove
" if(MENU_SPECIAL) //wart dat += "
" dat += "

ERT Settings:

" @@ -693,6 +694,8 @@ GLOBAL_LIST_INIT(bgstate_options, list( if(!job) debug_log("Missing job for prefs: [role_name]") continue + if(job.flags_startup_parameters & ROLE_HIDDEN) + continue index++ if((index >= limit) || (job.title in splitJobs)) HTML += "" @@ -1031,39 +1034,8 @@ GLOBAL_LIST_INIT(bgstate_options, list( set_job_slots(user) return TRUE if("loadout") - switch(href_list["task"]) - if("input") - var/gear_category = tgui_input_list(user, "Select gear category: ", "Gear to add", GLOB.gear_datums_by_category) - if(!gear_category) - return - var/choice = tgui_input_list(user, "Select gear to add: ", gear_category, GLOB.gear_datums_by_category[gear_category]) - if(!choice) - return - - var/total_cost = 0 - var/datum/gear/G - if(isnull(gear) || !islist(gear)) - gear = list() - if(length(gear)) - for(var/gear_name in gear) - G = GLOB.gear_datums_by_name[gear_name] - total_cost += G?.cost - - G = GLOB.gear_datums_by_category[gear_category][choice] - total_cost += G.cost - if(total_cost <= MAX_GEAR_COST) - gear += G.display_name - to_chat(user, SPAN_NOTICE("Added \the '[G.display_name]' for [G.cost] points ([MAX_GEAR_COST - total_cost] points remaining).")) - else - to_chat(user, SPAN_WARNING("Adding \the '[choice]' will exceed the maximum loadout cost of [MAX_GEAR_COST] points.")) - - if("remove") - var/i_remove = text2num(href_list["gear"]) - if(i_remove < 1 || i_remove > length(gear)) return - gear.Cut(i_remove, i_remove + 1) - - if("clear") - gear.Cut() + loadout_picker.tgui_interact(user) + return if("flavor_text") switch(href_list["task"]) @@ -1134,42 +1106,8 @@ GLOBAL_LIST_INIT(bgstate_options, list( winset(user, null, "input.focus=false") if("traits") - switch(href_list["task"]) - if("open") - open_character_traits(user) - return TRUE - if("change_slot") - var/trait_group = text2path(href_list["trait_group"]) - if(!GLOB.character_trait_groups[trait_group]) - trait_group = null - open_character_traits(user, trait_group) - return TRUE - if("give_trait") - var/trait_group = text2path(href_list["trait_group"]) - if(!GLOB.character_trait_groups[trait_group]) - trait_group = null - var/trait = text2path(href_list["trait"]) - var/datum/character_trait/character_trait = GLOB.character_traits[trait] - character_trait?.try_give_trait(src) - open_character_traits(user, trait_group) - if(character_trait.refresh_choices) - ShowChoices(user) - if(character_trait.refresh_mannequin) - update_preview_icon() - return TRUE - if("remove_trait") - var/trait_group = text2path(href_list["trait_group"]) - if(!GLOB.character_trait_groups[trait_group]) - trait_group = null - var/trait = text2path(href_list["trait"]) - var/datum/character_trait/character_trait = GLOB.character_traits[trait] - character_trait?.try_remove_trait(src) - open_character_traits(user, trait_group) - if(character_trait.refresh_choices) - ShowChoices(user) - if(character_trait.refresh_mannequin) - update_preview_icon() - return TRUE + traits_picker.tgui_interact(user) + return if("toggle_job_gear") show_job_gear = !show_job_gear @@ -1309,10 +1247,14 @@ GLOBAL_LIST_INIT(bgstate_options, list( return predator_translator_type = new_translator_type if("pred_mask_type") - var/new_predator_mask_type = tgui_input_number(user, "Choose your mask type:\n(1-12)", "Mask Selection", 1, 12, 1) + var/new_predator_mask_type = tgui_input_number(user, "Choose your mask type:\n(1-19)", "Mask Selection", 1, 19, 1) if(new_predator_mask_type) predator_mask_type = floor(text2num(new_predator_mask_type)) + if("pred_accessory_type") + var/new_predator_accessory_type = tgui_input_number(user, "Choose your mask accessory type:\n(0-1)", "accessory Selection", 0, 1, 0) + if(new_predator_accessory_type) + predator_accessory_type = floor(text2num(new_predator_accessory_type)) if("pred_armor_type") - var/new_predator_armor_type = tgui_input_number(user, "Choose your armor type:\n(1-7)", "Armor Selection", 1, 7, 1) + var/new_predator_armor_type = tgui_input_number(user, "Choose your armor type:\n(1-8)", "Armor Selection", 1, 8, 1) if(new_predator_armor_type) predator_armor_type = floor(text2num(new_predator_armor_type)) if("pred_boot_type") var/new_predator_boot_type = tgui_input_number(user, "Choose your greaves type:\n(1-4)", "Greave Selection", 1, 4, 1) @@ -1337,20 +1279,6 @@ GLOBAL_LIST_INIT(bgstate_options, list( if(!new_pred_caster_mat) return predator_caster_material = new_pred_caster_mat - if("pred_cape_type") - var/datum/job/J = GLOB.RoleAuthority.roles_by_name[JOB_PREDATOR] - var/whitelist_status = GLOB.clan_ranks_ordered[J.get_whitelist_status(owner)] - - var/list/options = list("None" = "None") - for(var/cape_name in GLOB.all_yautja_capes) - var/obj/item/clothing/yautja_cape/cape = GLOB.all_yautja_capes[cape_name] - if(whitelist_status >= initial(cape.clan_rank_required) || (initial(cape.councillor_override) && (whitelist_flags & (WHITELIST_YAUTJA_COUNCIL|WHITELIST_YAUTJA_COUNCIL_LEGACY)))) - options += list(capitalize_first_letters(cape_name) = cape_name) - - var/new_cape = tgui_input_list(user, "Choose your cape type:", "Cape Type", options) - if(!new_cape) - return - predator_cape_type = options[new_cape] if("pred_cape_color") var/new_cape_color = input(user, "Choose your cape color:", "Cape Color", predator_cape_color) as color|null if(!new_cape_color) @@ -1539,96 +1467,12 @@ GLOBAL_LIST_INIT(bgstate_options, list( metadata = strip_html(new_metadata) if("hair") - if(species == "Human") - var/new_hair = input(user, "Choose your character's hair color:", "Character Preference", rgb(r_hair, g_hair, b_hair)) as color|null - if(new_hair) - r_hair = hex2num(copytext(new_hair, 2, 4)) - g_hair = hex2num(copytext(new_hair, 4, 6)) - b_hair = hex2num(copytext(new_hair, 6, 8)) - - if("h_style") - var/list/valid_hairstyles = list() - for(var/hairstyle in GLOB.hair_styles_list) - var/datum/sprite_accessory/sprite_accessory = GLOB.hair_styles_list[hairstyle] - if( !(species in sprite_accessory.species_allowed)) - continue - if(!sprite_accessory.selectable) - continue - - valid_hairstyles[hairstyle] = GLOB.hair_styles_list[hairstyle] - valid_hairstyles = sortList(valid_hairstyles) - - var/new_h_style = input(user, "Choose your character's hair style:", "Character Preference") as null|anything in valid_hairstyles - if(new_h_style) - h_style = new_h_style - - if("grad") - if(species == "Human") - var/new_hair_grad = input(user, "Choose your character's hair gradient color:", "Character Preference", rgb(r_gradient, g_gradient, b_gradient)) as color|null - if(new_hair_grad) - r_gradient = hex2num(copytext(new_hair_grad, 2, 4)) - g_gradient = hex2num(copytext(new_hair_grad, 4, 6)) - b_gradient = hex2num(copytext(new_hair_grad, 6, 8)) - - if("grad_style") - var/list/valid_hair_gradients = list() - for(var/hair_gradient in GLOB.hair_gradient_list) - var/datum/sprite_accessory/sprite_accessory = GLOB.hair_gradient_list[hair_gradient] - if(!(species in sprite_accessory.species_allowed)) - continue - if(!sprite_accessory.selectable) - continue - valid_hair_gradients[hair_gradient] = GLOB.hair_gradient_list[hair_gradient] - valid_hair_gradients = sortList(valid_hair_gradients) - - var/new_h_gradient_style = input(user, "Choose your character's hair gradient style:", "Character Preference") as null|anything in valid_hair_gradients - if(new_h_gradient_style) - grad_style = new_h_gradient_style - - if ("skin_color") - var/new_skin_color = tgui_input_list(user, "Choose your character's skin color:", "Character Preferences", GLOB.skin_color_list) - - if (new_skin_color) - skin_color = new_skin_color - - if ("body_size") - var/new_body_size = tgui_input_list(user, "Choose your character's body size:", "Character Preferences", GLOB.body_size_list) - - if (new_body_size) - body_size = new_body_size + hair_picker.tgui_interact(user) + return - if ("body_type") - var/new_body_type = tgui_input_list(user, "Choose your character's body type:", "Character Preferences", GLOB.body_type_list) - - if (new_body_type) - body_type = new_body_type - - if("facial") - var/new_facial = input(user, "Choose your character's facial-hair color:", "Character Preference", rgb(r_facial, g_facial, b_facial)) as color|null - if(new_facial) - r_facial = hex2num(copytext(new_facial, 2, 4)) - g_facial = hex2num(copytext(new_facial, 4, 6)) - b_facial = hex2num(copytext(new_facial, 6, 8)) - - if("f_style") - var/list/valid_facialhairstyles = list() - for(var/facialhairstyle in GLOB.facial_hair_styles_list) - var/datum/sprite_accessory/sprite_accessory = GLOB.facial_hair_styles_list[facialhairstyle] - if(gender == MALE && sprite_accessory.gender == FEMALE) - continue - if(gender == FEMALE && sprite_accessory.gender == MALE) - continue - if( !(species in sprite_accessory.species_allowed)) - continue - if(!sprite_accessory.selectable) - continue - - valid_facialhairstyles[facialhairstyle] = GLOB.facial_hair_styles_list[facialhairstyle] - valid_facialhairstyles = sortList(valid_facialhairstyles) - - var/new_f_style = input(user, "Choose your character's facial-hair style:", "Character Preference") as null|anything in valid_facialhairstyles - if(new_f_style) - f_style = new_f_style + if ("body") + body_picker.tgui_interact(user) + return if("underwear") var/list/underwear_options = gender == MALE ? GLOB.underwear_m : GLOB.underwear_f @@ -1651,7 +1495,8 @@ GLOBAL_LIST_INIT(bgstate_options, list( ShowChoices(user) if("eyes") - var/new_eyes = input(user, "Choose your character's eye color:", "Character Preference", rgb(r_eyes, g_eyes, b_eyes)) as color|null + var/new_eyes = tgui_color_picker(user, "Choose your character's eye color:", "Character Preference", rgb(r_eyes, g_eyes, b_eyes)) + if(new_eyes) r_eyes = hex2num(copytext(new_eyes, 2, 4)) g_eyes = hex2num(copytext(new_eyes, 4, 6)) @@ -1815,6 +1660,11 @@ GLOBAL_LIST_INIT(bgstate_options, list( underwear = sanitize_inlist(underwear, gender == MALE ? GLOB.underwear_m : GLOB.underwear_f, initial(underwear)) undershirt = sanitize_inlist(undershirt, gender == MALE ? GLOB.undershirt_m : GLOB.undershirt_f, initial(undershirt)) + // Refresh hair picker + var/datum/tgui/picker_ui = SStgui.get_open_ui(user, hair_picker) + if(picker_ui) + picker_ui.send_update() + if("hear_adminhelps") toggles_sound ^= SOUND_ADMINHELP @@ -2024,6 +1874,8 @@ GLOBAL_LIST_INIT(bgstate_options, list( load_character() reload_cooldown = world.time + 50 + update_all_pickers(user) + if("open_load_dialog") if(!IsGuestKey(user.key)) open_load_dialog(user) @@ -2039,6 +1891,9 @@ GLOBAL_LIST_INIT(bgstate_options, list( var/mob/new_player/np = user if(istype(np)) np.new_player_panel_proc() + + update_all_pickers(user) + if("tgui_fancy") tgui_fancy = !tgui_fancy if("tgui_lock") @@ -2332,52 +2187,6 @@ GLOBAL_LIST_INIT(bgstate_options, list( alert("The key sequence is [key_buf].") return key_buf -/datum/preferences/proc/open_character_traits(mob/user, character_trait_group) - if(!read_traits) - read_traits = TRUE - for(var/trait in traits) - var/datum/character_trait/character_trait = GLOB.character_traits[trait] - trait_points -= character_trait.cost - var/dat = "" - dat += "
" - var/datum/character_trait_group/current_trait_group - var/i = 1 - for(var/trait_group in GLOB.character_trait_groups) - var/datum/character_trait_group/CTG = GLOB.character_trait_groups[trait_group] - if(!CTG.group_visible) - continue - var/button_class = "" - if(!character_trait_group && i == 1 || character_trait_group == trait_group) - button_class = "class='linkOn'" - current_trait_group = CTG - dat += "" - dat += CTG.trait_group_name - dat += "" - i++ - dat += "
" - dat += "
" - for(var/trait in current_trait_group.traits) - var/datum/character_trait/character_trait = trait - if(!character_trait.applyable) - continue - var/has_trait = (character_trait.type in traits) - var/task = has_trait ? "remove_trait" : "give_trait" - var/button_class = has_trait ? "class='linkOn'" : "" - dat += "" - dat += "" - dat += "
" - if(has_trait || character_trait.can_give_trait(src)) - dat += "" - dat += "[character_trait.trait_name]" - dat += "" - else - dat += "[character_trait.trait_name]" - var/cost_text = character_trait.cost ? " ([character_trait.cost] points)" : "" - dat += "[character_trait.trait_desc][cost_text]
" - dat += "" - show_browser(user, dat, "Character Traits", "character_traits") - update_preview_icon(TRUE) - /// Converts a client's list of completed tutorials into a string for saving /datum/preferences/proc/tutorial_list_to_savestring() if(!length(completed_tutorials)) @@ -2394,6 +2203,20 @@ GLOBAL_LIST_INIT(bgstate_options, list( completed_tutorials = splittext(savestring, ";") return completed_tutorials +/// Refreshes all open TGUI interfaces inside the character prefs menu +/datum/preferences/proc/update_all_pickers(mob/user) + var/datum/tgui/picker_ui = SStgui.get_open_ui(user, hair_picker) + picker_ui?.send_update() + + picker_ui = SStgui.get_open_ui(user, body_picker) + picker_ui?.send_update() + + picker_ui = SStgui.get_open_ui(user, loadout_picker) + picker_ui?.send_update() + + picker_ui = SStgui.get_open_ui(user, traits_picker) + picker_ui?.send_update() + #undef MENU_MARINE #undef MENU_XENOMORPH #undef MENU_CO diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index 79fd34b2660c..dc35ba261b2c 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -1,5 +1,5 @@ GLOBAL_LIST_EMPTY(gear_datums_by_category) -GLOBAL_LIST_EMPTY(gear_datums_by_name) +GLOBAL_LIST_EMPTY_TYPED(gear_datums_by_name, /datum/gear) /proc/populate_gear_list() var/datum/gear/G @@ -19,7 +19,7 @@ GLOBAL_LIST_EMPTY(gear_datums_by_name) /datum/gear var/display_name // Name/index. var/category //Used for sorting in the loadout selection. - var/path // Path to item. + var/obj/item/path // Path to item. var/cost = 2 // Number of points used. var/slot // Slot to equip to, if any. var/list/allowed_roles // Roles that can spawn with this item. @@ -81,6 +81,7 @@ GLOBAL_LIST_EMPTY(gear_datums_by_name) /datum/gear/eyewear/bimex_shades display_name = "BiMex personal shades" path = /obj/item/clothing/glasses/sunglasses/big + cost = 5 /datum/gear/eyewear/sunglasses display_name = "Sunglasses" diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index eb17609ebe63..c0efc44e58a5 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -1,5 +1,5 @@ #define SAVEFILE_VERSION_MIN 8 -#define SAVEFILE_VERSION_MAX 28 +#define SAVEFILE_VERSION_MAX 29 //handles converting savefiles to new formats //MAKE SURE YOU KEEP THIS UP TO DATE! @@ -180,6 +180,18 @@ completed_tutorials += "marine_req_1" S["completed_tutorials"] << tutorial_list_to_savestring() + if(savefile_version < 29) + var/hair_style = "" + S["hair_style_name"] >> hair_style + + switch(hair_style) + if("Shoulder-length Hair Alt") + hair_style = "Long Fringe" + if("Long Hair Alt") + hair_style = "Longer Fringe" + + S["hair_style_name"] << hair_style + savefile_version = SAVEFILE_VERSION_MAX return 1 @@ -266,13 +278,13 @@ S["pred_use_legacy"] >> predator_use_legacy S["pred_trans_type"] >> predator_translator_type S["pred_mask_type"] >> predator_mask_type + S["pred_accessory_type"] >> predator_accessory_type S["pred_armor_type"] >> predator_armor_type S["pred_boot_type"] >> predator_boot_type S["pred_mask_mat"] >> predator_mask_material S["pred_armor_mat"] >> predator_armor_material S["pred_greave_mat"] >> predator_greave_material S["pred_caster_mat"] >> predator_caster_material - S["pred_cape_type"] >> predator_cape_type S["pred_cape_color"] >> predator_cape_color S["pred_h_style"] >> predator_h_style S["pred_skin_color"] >> predator_skin_color @@ -352,13 +364,13 @@ predator_use_legacy = sanitize_inlist(predator_use_legacy, PRED_LEGACIES, initial(predator_use_legacy)) predator_translator_type = sanitize_inlist(predator_translator_type, PRED_TRANSLATORS, initial(predator_translator_type)) predator_mask_type = sanitize_integer(predator_mask_type,1,1000000,initial(predator_mask_type)) + predator_accessory_type = sanitize_integer(predator_accessory_type,0,1, initial(predator_accessory_type)) predator_armor_type = sanitize_integer(predator_armor_type,1,1000000,initial(predator_armor_type)) predator_boot_type = sanitize_integer(predator_boot_type,1,1000000,initial(predator_boot_type)) predator_mask_material = sanitize_inlist(predator_mask_material, PRED_MATERIALS, initial(predator_mask_material)) predator_armor_material = sanitize_inlist(predator_armor_material, PRED_MATERIALS, initial(predator_armor_material)) predator_greave_material = sanitize_inlist(predator_greave_material, PRED_MATERIALS, initial(predator_greave_material)) predator_caster_material = sanitize_inlist(predator_caster_material, PRED_MATERIALS + "retro", initial(predator_caster_material)) - predator_cape_type = sanitize_inlist(predator_cape_type, GLOB.all_yautja_capes + "None", initial(predator_cape_type)) predator_cape_color = sanitize_hexcolor(predator_cape_color, initial(predator_cape_color)) predator_h_style = sanitize_inlist(predator_h_style, GLOB.yautja_hair_styles_list, initial(predator_h_style)) predator_skin_color = sanitize_inlist(predator_skin_color, PRED_SKIN_COLOR, initial(predator_skin_color)) @@ -468,13 +480,13 @@ S["pred_use_legacy"] << predator_use_legacy S["pred_trans_type"] << predator_translator_type S["pred_mask_type"] << predator_mask_type + S["pred_accessory_type"] << predator_accessory_type S["pred_armor_type"] << predator_armor_type S["pred_boot_type"] << predator_boot_type S["pred_mask_mat"] << predator_mask_material S["pred_armor_mat"] << predator_armor_material S["pred_greave_mat"] << predator_greave_material S["pred_caster_mat"] << predator_caster_material - S["pred_cape_type"] << predator_cape_type S["pred_cape_color"] << predator_cape_color S["pred_h_style"] << predator_h_style S["pred_skin_color"] << predator_skin_color @@ -648,7 +660,7 @@ if(!organ_data) organ_data = list() - gear = sanitize_list(gear) + gear = sanitize_gear(gear, owner) traits = sanitize_list(traits) read_traits = FALSE diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm index 54ed868b9557..296f60216b39 100644 --- a/code/modules/client/preferences_toggles.dm +++ b/code/modules/client/preferences_toggles.dm @@ -278,6 +278,7 @@ "Toggle Ability Deactivation
", "Toggle Combat Click-Drag Override
", "Toggle Alternate-Fire Dual Wielding
", + "Toggle Auto Shove
", "Toggle Middle Mouse Swapping Hands
", "Toggle Vendors Vending to Hands
", "Toggle Item Animations
", @@ -357,6 +358,14 @@ to_chat(src, SPAN_BOLDNOTICE("Your messages will no longer be automatically punctuated if they are not punctuated already.")) prefs.save_preferences() +/client/proc/toggle_auto_shove() + prefs.toggle_prefs ^= TOGGLE_AUTO_SHOVE_OFF + if (prefs.toggle_prefs & TOGGLE_AUTO_SHOVE_OFF) + to_chat(src, SPAN_NOTICE("You will no longer automatically shove people in the way as the Queen.")) + else + to_chat(src, SPAN_NOTICE("You will now automatically shove people in the way as the Queen.")) + prefs.save_preferences() + /client/proc/toggle_ability_deactivation() // Toggle whether the current ability can be deactivated when re-selected prefs.toggle_prefs ^= TOGGLE_ABILITY_DEACTIVATION_OFF if (prefs.toggle_prefs & TOGGLE_ABILITY_DEACTIVATION_OFF) diff --git a/code/modules/client/traits_picker.dm b/code/modules/client/traits_picker.dm new file mode 100644 index 000000000000..bd2d312774f8 --- /dev/null +++ b/code/modules/client/traits_picker.dm @@ -0,0 +1,107 @@ +/datum/traits_picker/ui_static_data(mob/user) + . = ..() + + .["categories"] = list() + for(var/type in GLOB.character_trait_groups) + var/datum/character_trait_group/group = GLOB.character_trait_groups[type] + if(!group.group_visible) + continue + + var/traits = list() + + for(var/datum/character_trait/trait as anything in group.traits) + if(!trait.applyable) + continue + + traits += list( + list("name" = trait.trait_name, "desc" = trait.trait_desc, "cost" = trait.cost, "type" = trait.type) + ) + + .["categories"] += list( + list("name" = group.trait_group_name, "traits" = traits, "mutually_exclusive" = group.mutually_exclusive) + ) + +/datum/traits_picker/ui_data(mob/user) + . = ..() + + var/datum/preferences/prefs = user.client?.prefs + if(!prefs) + return + + if(!prefs.read_traits) + prefs.read_traits = TRUE + + for(var/trait in prefs.traits) + var/datum/character_trait/character_trait = GLOB.character_traits[trait] + prefs.trait_points -= character_trait.cost + + .["trait_points"] = prefs.trait_points + .["starting_points"] = initial(prefs.trait_points) + + + .["traits"] = list() + for(var/trait_type as anything in prefs.traits) + var/datum/character_trait/trait = GLOB.character_traits[trait_type] + .["traits"] += list( + list("name" = trait.trait_name, "desc" = trait.trait_desc, "cost" = trait.cost, "type" = trait_type) + ) + +/datum/traits_picker/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + + var/datum/preferences/prefs = ui.user.client?.prefs + if(!prefs) + return + + switch(action) + if("add") + var/trait = params["type"] + if(!trait) + return + + trait = text2path(trait) + if(!trait) + return + + var/datum/character_trait/character_trait = GLOB.character_traits[trait] + if(!character_trait) + return + + character_trait.try_give_trait(prefs) + if(character_trait.refresh_choices) + prefs.ShowChoices(ui.user) + + if("remove") + var/trait = params["type"] + if(!trait) + return + + trait = text2path(trait) + if(!trait) + return + + var/datum/character_trait/character_trait = GLOB.character_traits[trait] + if(!character_trait) + return + + character_trait.try_remove_trait(prefs) + if(character_trait.refresh_choices) + prefs.ShowChoices(ui.user) + + return TRUE + +/datum/traits_picker/tgui_interact(mob/user, datum/tgui/ui) + . = ..() + + ui = SStgui.try_update_ui(user, src, ui) + + if(!ui) + ui = new(user, src, "TraitsPicker", "Character Traits") + ui.open() + ui.set_autoupdate(FALSE) + + winset(user, ui.window.id, "focus=true") + +/datum/traits_picker/ui_state(mob/user) + return GLOB.always_state + diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 44d1e0a8bd0b..56c8bb5a6418 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -193,6 +193,7 @@ item_state = "eyepatch" flags_armor_protection = 0 flags_equip_slot = SLOT_EYES|SLOT_FACE + flags_obj = OBJ_IS_HELMET_GARB /obj/item/clothing/glasses/monocle name = "monocle" @@ -219,6 +220,7 @@ prescription = TRUE flags_armor_protection = 0 flags_equip_slot = SLOT_EYES|SLOT_FACE + flags_obj = OBJ_IS_HELMET_GARB /obj/item/clothing/glasses/regular/hipster name = "Prescription Glasses" @@ -257,6 +259,7 @@ item_state = "mBCG" prescription = TRUE flags_equip_slot = SLOT_EYES|SLOT_FACE + flags_obj = OBJ_IS_HELMET_GARB /obj/item/clothing/glasses/m42_goggles name = "\improper M42 scout sight" @@ -548,8 +551,8 @@ flags_inv_hide = HIDEEYES eye_protection = EYE_PROTECTION_WELDING has_tint = TRUE - vision_impair = VISION_IMPAIR_MAX - var/vision_impair_on = VISION_IMPAIR_MAX + vision_impair = VISION_IMPAIR_ULTRA + var/vision_impair_on = VISION_IMPAIR_ULTRA var/vision_impair_off = VISION_IMPAIR_NONE /obj/item/clothing/glasses/welding/attack_self() @@ -620,6 +623,7 @@ item_state = "sunglasses" darkness_view = -1 flags_equip_slot = SLOT_EYES|SLOT_FACE + flags_obj = OBJ_IS_HELMET_GARB eye_protection = EYE_PROTECTION_FLAVOR /obj/item/clothing/glasses/sunglasses/blindfold @@ -628,13 +632,14 @@ desc = "Covers the eyes, preventing sight." icon_state = "blindfold" item_state = "blindfold" - //vision_flags = DISABILITY_BLIND // This flag is only supposed to be used if it causes permanent blindness, not temporary because of glasses + vision_impair = VISION_IMPAIR_MAX /obj/item/clothing/glasses/sunglasses/prescription desc = "A mixture of coolness and the inherent nerdiness of a prescription. Somehow manages to conceal both." name = "prescription sunglasses" prescription = TRUE flags_equip_slot = SLOT_EYES|SLOT_FACE + flags_obj = OBJ_IS_HELMET_GARB /obj/item/clothing/glasses/sunglasses/big name = "\improper BiMex personal shades" @@ -644,7 +649,7 @@ eye_protection = EYE_PROTECTION_FLASH clothing_traits = list(TRAIT_BIMEX) flags_equip_slot = SLOT_EYES|SLOT_FACE - + flags_obj = OBJ_IS_HELMET_GARB /obj/item/clothing/glasses/sunglasses/aviator name = "aviator shades" @@ -652,6 +657,7 @@ icon_state = "aviator" item_state = "aviator" flags_equip_slot = SLOT_EYES|SLOT_FACE + flags_obj = OBJ_IS_HELMET_GARB /obj/item/clothing/glasses/sunglasses/sechud name = "Security HUD-Glasses" @@ -659,6 +665,7 @@ icon_state = "sunhud" eye_protection = EYE_PROTECTION_FLASH hud_type = MOB_HUD_SECURITY_ADVANCED + flags_obj = OBJ_IS_HELMET_GARB /obj/item/clothing/glasses/sunglasses/sechud/prescription name = "Prescription Security HUD-Glasses" diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index c54228368035..cfa3eb5566cf 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -261,6 +261,8 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( /obj/item/clothing/glasses/sunglasses/sechud = "sechud", /obj/item/clothing/glasses/eyepatch = "eyepatch", /obj/item/clothing/glasses/regular/hipster = "persc-glasses", + /obj/item/clothing/glasses/regular = "persc-glasses", + /obj/item/clothing/glasses/mbcg = "persc-glasses", // WALKMAN AND CASSETTES /obj/item/device/walkman = HELMET_GARB_RELAY_ICON_STATE, diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index edc4a81b364a..598a08ca4f82 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -33,7 +33,7 @@ siemens_coefficient = 0.9 w_class = SIZE_MEDIUM eye_protection = EYE_PROTECTION_WELDING - vision_impair = VISION_IMPAIR_MAX + vision_impair = VISION_IMPAIR_ULTRA /obj/item/clothing/head/welding/attack_self(mob/user) ..() @@ -49,7 +49,7 @@ return if(up) - vision_impair = VISION_IMPAIR_MAX + vision_impair = VISION_IMPAIR_ULTRA flags_inventory |= COVEREYES|COVERMOUTH|BLOCKSHARPOBJ flags_inv_hide |= HIDEEARS|HIDEEYES|HIDEFACE icon_state = initial(icon_state) diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 589fb3b97221..34d5764db21e 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -116,7 +116,7 @@ //Chef /obj/item/clothing/suit/chef/classic - name = "A classic chef's apron." + name = "A classic chef's apron" desc = "A basic, dull, white chef's apron." icon_state = "apronchef" item_state = "apronchef" diff --git a/code/modules/clothing/suits/marine_armor/ert.dm b/code/modules/clothing/suits/marine_armor/ert.dm index 90fb962ffa93..2070a7d33da2 100644 --- a/code/modules/clothing/suits/marine_armor/ert.dm +++ b/code/modules/clothing/suits/marine_armor/ert.dm @@ -452,7 +452,7 @@ /obj/item/device/walkman, ) flags_cold_protection = BODY_FLAG_CHEST|BODY_FLAG_GROIN|BODY_FLAG_LEGS|BODY_FLAG_FEET|BODY_FLAG_ARMS|BODY_FLAG_HANDS - min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROT + min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROT valid_accessory_slots = list(ACCESSORY_SLOT_MEDAL) /obj/item/clothing/suit/storage/militia/Initialize() diff --git a/code/modules/clothing/under/marine_uniform.dm b/code/modules/clothing/under/marine_uniform.dm index 8af2e7deb0f7..d12638c4c529 100644 --- a/code/modules/clothing/under/marine_uniform.dm +++ b/code/modules/clothing/under/marine_uniform.dm @@ -942,6 +942,15 @@ worn_state = "rdalt" flags_jumpsuit = FALSE +/obj/item/clothing/under/rank/synthetic/synth_k9 + name = "\improper W-Y K9 serial identification collar" + desc = "Contains a serialized manufacturing number related to this unit's manufacturing date and time." + icon = 'icons/mob/humans/species/synth_k9/onmob/synth_k9_overlays.dmi' + flags_item = NODROP + icon_state = "k9_dogtags" + worn_state = "k9_dogtags" + flags_jumpsuit = FALSE + /obj/item/clothing/under/rank/synthetic/frontier name = "\improper frontier jumpsuit" desc = "A cargo jumpsuit dressed down for full range of motion and state-of-the-art frontier temperature control. It's the best thing an engineer can wear in the Outer Veil." diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm index b5ce6fdbdda8..f8b4bf55c461 100644 --- a/code/modules/clothing/under/ties.dm +++ b/code/modules/clothing/under/ties.dm @@ -106,56 +106,60 @@ icon_state = "stethoscope" /obj/item/clothing/accessory/stethoscope/attack(mob/living/carbon/human/being, mob/living/user) - if(ishuman(being) && isliving(user)) - if(user.a_intent == INTENT_HELP) - var/body_part = parse_zone(user.zone_selected) - if(body_part) - var/sound = null - if(being.stat == DEAD || (being.status_flags&FAKEDEATH)) - sound = "can't hear anything at all, they must have kicked the bucket" - else - switch(body_part) - if("chest") - if(skillcheck(user, SKILL_MEDICAL, SKILL_MEDICAL_MEDIC)) // only medical personnel can take advantage of it - if(!ishuman(being)) - return // not a human; only humans have the variable internal_organs_by_name // "cast" it a human type since we confirmed it is one - if(isnull(being.internal_organs_by_name)) - return // they have no organs somehow - var/datum/internal_organ/heart/heart = being.internal_organs_by_name["heart"] - if(heart) - switch(heart.organ_status) - if(ORGAN_LITTLE_BRUISED) - sound = "hear small murmurs with each heart beat, it is possible that [being.p_their()] heart is subtly damaged" - if(ORGAN_BRUISED) - sound = "hear deviant heart beating patterns, result of probable heart damage" - if(ORGAN_BROKEN) - sound = "hear irregular and additional heart beating patterns, probably caused by impaired blood pumping, [being.p_their()] heart is certainly failing" - else - sound = "hear normal heart beating patterns, [being.p_their()] heart is surely healthy" - var/datum/internal_organ/lungs/lungs = being.internal_organs_by_name["lungs"] - if(lungs) - if(sound) - sound += ". You also " - switch(lungs.organ_status) - if(ORGAN_LITTLE_BRUISED) - sound += "hear some crackles when [being.p_they()] breath, [being.p_they()] is possibly suffering from a small damage to the lungs" - if(ORGAN_BRUISED) - sound += "hear unusual respiration sounds and noticeable difficulty to breath, possibly signalling ruptured lungs" - if(ORGAN_BROKEN) - sound += "barely hear any respiration sounds and a lot of difficulty to breath, [being.p_their()] lungs are heavily failing" - else - sound += "hear normal respiration sounds aswell, that means [being.p_their()] lungs are healthy, probably" - else - sound = "can't hear. Really, anything at all, how weird" - else - sound = "hear a lot of sounds... it's quite hard to distinguish, really" - if("eyes","mouth") - sound = "can't hear anything. Maybe that isn't the smartest idea" + if(!ishuman(being) || !isliving(user)) + return + + var/body_part = parse_zone(user.zone_selected) + if(!body_part) + return + + var/sound = null + if(being.stat == DEAD || (being.status_flags & FAKEDEATH)) + sound = "can't hear anything at all, they must have kicked the bucket" + user.visible_message("[user] places [src] against [being]'s [body_part] and listens attentively.", "You place [src] against [being.p_their()] [body_part] and... you [sound].") + return + + switch(body_part) + if("chest") + if(skillcheck(user, SKILL_MEDICAL, SKILL_MEDICAL_MEDIC)) // only medical personnel can take advantage of it + if(!ishuman(being)) + return // not a human; only humans have the variable internal_organs_by_name // "cast" it a human type since we confirmed it is one + if(isnull(being.internal_organs_by_name)) + return // they have no organs somehow + var/datum/internal_organ/heart/heart = being.internal_organs_by_name["heart"] + if(heart) + switch(heart.organ_status) + if(ORGAN_LITTLE_BRUISED) + sound = "hear small murmurs with each heart beat, it is possible that [being.p_their()] heart is subtly damaged" + if(ORGAN_BRUISED) + sound = "hear deviant heart beating patterns, result of probable heart damage" + if(ORGAN_BROKEN) + sound = "hear irregular and additional heart beating patterns, probably caused by impaired blood pumping, [being.p_their()] heart is certainly failing" else - sound = "hear a sound here and there, but none of them give you any good information" - user.visible_message("[user] places [src] against [being]'s [body_part] and listens attentively.", "You place [src] against [being.p_their()] [body_part] and... you [sound].") - return - return ..(being,user) + sound = "hear normal heart beating patterns, [being.p_their()] heart is surely healthy" + var/datum/internal_organ/lungs/lungs = being.internal_organs_by_name["lungs"] + if(lungs) + if(sound) + sound += ". You also " + switch(lungs.organ_status) + if(ORGAN_LITTLE_BRUISED) + sound += "hear some crackles when [being.p_they()] breath, [being.p_they()] is possibly suffering from a small damage to the lungs" + if(ORGAN_BRUISED) + sound += "hear unusual respiration sounds and noticeable difficulty to breath, possibly signalling ruptured lungs" + if(ORGAN_BROKEN) + sound += "barely hear any respiration sounds and a lot of difficulty to breath, [being.p_their()] lungs are heavily failing" + else + sound += "hear normal respiration sounds aswell, that means [being.p_their()] lungs are healthy, probably" + else + sound = "can't hear. Really, anything at all, how weird" + else + sound = "hear a lot of sounds... it's quite hard to distinguish, really" + if("eyes","mouth") + sound = "can't hear anything. Maybe that isn't the smartest idea" + else + sound = "hear a sound here and there, but none of them give you any good information" + user.visible_message("[user] places [src] against [being]'s [body_part] and listens attentively.", "You place [src] against [being.p_their()] [body_part] and... you [sound].") + //Medals /obj/item/clothing/accessory/medal @@ -387,11 +391,13 @@ desc = "A fire-resistant shoulder patch, worn by the men and women of the United States Colonial Marines." icon_state = "uscmpatch" jumpsuit_hide_states = (UNIFORM_SLEEVE_CUT|UNIFORM_JACKET_REMOVED) + flags_obj = OBJ_IS_HELMET_GARB /obj/item/clothing/accessory/patch/falcon name = "USCM Falling Falcons patch" desc = "A fire-resistant shoulder patch, worn by the men and women of the Falling Falcons, the 2nd battalion of the 4th brigade of the USCM." icon_state = "fallingfalconspatch" + flags_obj = OBJ_IS_HELMET_GARB /obj/item/clothing/accessory/patch/devils name = "USCM Solar Devils patch" diff --git a/code/modules/cm_aliens/XenoStructures.dm b/code/modules/cm_aliens/XenoStructures.dm index 58a386510e8a..fa9a90c496f1 100644 --- a/code/modules/cm_aliens/XenoStructures.dm +++ b/code/modules/cm_aliens/XenoStructures.dm @@ -21,7 +21,7 @@ unacidable = TRUE var/should_track_build = FALSE var/datum/cause_data/construction_data - var/list/blocks = list() + var/list/blockers = list() var/block_range = 0 /obj/effect/alien/resin/Initialize(mapload, mob/builder) @@ -29,17 +29,16 @@ if(istype(builder) && should_track_build) construction_data = create_cause_data(initial(name), builder) if(block_range) - for(var/turf/T in range(block_range, src)) - var/obj/effect/build_blocker/SP = new(T) - SP.linked_structure = src - blocks.Add(SP) + for(var/turf/turf in range(block_range, src)) + var/obj/effect/build_blocker/blocker = new(turf, src) + blockers.Add(blocker) + + var/area/current_area = get_area(src) + if(current_area.linked_lz) + AddComponent(/datum/component/resin_cleanup) /obj/effect/alien/resin/Destroy() - if(block_range) - for(var/obj/effect/build_blocker/SP as anything in blocks) - blocks -= SP - SP.linked_structure = null - qdel(SP) + QDEL_LIST(blockers) return ..() /obj/effect/alien/resin/proc/healthcheck() @@ -133,14 +132,20 @@ /obj/effect/build_blocker health = 500000 - unacidable = TRUE explo_proof = TRUE invisibility = 101 - alpha = 0 + /// The atom we are blocking for + var/atom/linked_structure - var/obj/effect/alien/resin/linked_structure +/obj/effect/build_blocker/New(loc, linked_structure) + . = ..() + src.linked_structure = linked_structure + +/obj/effect/build_blocker/Destroy(force) + linked_structure = null + return ..() /obj/effect/alien/resin/sticky name = "sticky resin" @@ -376,6 +381,10 @@ if(hivenumber == XENO_HIVE_NORMAL) RegisterSignal(SSdcs, COMSIG_GLOB_GROUNDSIDE_FORSAKEN_HANDLING, PROC_REF(forsaken_handling)) + var/area/area = get_area(src) + if(area && area.linked_lz) + AddComponent(/datum/component/resin_cleanup) + /obj/structure/mineral_door/resin/flamer_fire_act(dam = BURN_LEVEL_TIER_1) health -= dam healthcheck() @@ -844,6 +853,359 @@ return ..() +/obj/effect/alien/resin/king_cocoon + name = "alien cocoon" + desc = "A large pulsating cocoon." + icon = 'icons/obj/structures/alien/xenoKingHatchery.dmi' + icon_state = "static" + health = 4000 + pixel_x = -48 + pixel_y = -64 + density = TRUE + plane = FLOOR_PLANE + + /// The mob picked as a candidate to be the King + var/client/chosen_candidate + /// The hive associated with this cocoon + var/hive_number = XENO_HIVE_NORMAL + /// Whether the cocoon has hatched + var/hatched = FALSE + /// Current running timer + var/timer + /// Is currently rolling candidates + var/rolling_candidates = FALSE + /// Voting for King + var/list/mob/living/carbon/xenomorph/votes = list() + +/obj/effect/alien/resin/king_cocoon/Destroy() + if(!hatched) + marine_announcement("ALERT.\n\nUNUSUAL ENERGY BUILDUP IN [uppertext(get_area_name(loc))] HAS BEEN STOPPED.", "[MAIN_AI_SYSTEM] Biological Scanner", 'sound/misc/notice1.ogg') + var/datum/hive_status/hive + for(var/cur_hive_num in GLOB.hive_datum) + hive = GLOB.hive_datum[cur_hive_num] + if(!length(hive.totalXenos)) + continue + if(cur_hive_num == hive_number) + xeno_announcement(SPAN_XENOANNOUNCE("THE HATCHERY WAS DESTROYED! VENGEANCE!"), cur_hive_num, XENO_GENERAL_ANNOUNCE) + else + xeno_announcement(SPAN_XENOANNOUNCE("THE HATCHERY WAS DESTROYED!"), cur_hive_num, XENO_GENERAL_ANNOUNCE) + + var/datum/hive_status/hive = GLOB.hive_datum[hive_number] + hive.has_hatchery = FALSE + for(var/obj/effect/alien/resin/special/pylon/pylon as anything in hive.active_endgame_pylons) + pylon.protection_level = initial(pylon.protection_level) + pylon.update_icon() + + votes = null + chosen_candidate = null + + . = ..() + +/obj/effect/alien/resin/king_cocoon/Initialize(mapload, hivenumber) + . = ..() + if(hivenumber) + hive_number = hivenumber + + var/datum/hive_status/hatchery_hive = GLOB.hive_datum[hive_number] + hatchery_hive.has_hatchery = TRUE + color = hatchery_hive.color + + for(var/x_offset in -1 to 1) + for(var/y_offset in -1 to 1) + var/turf/turf_to_block = locate(x + x_offset, y + y_offset, z) + var/obj/effect/build_blocker/blocker = new(turf_to_block, src) + blockers += blocker + + timer = addtimer(CALLBACK(src, PROC_REF(start_growing)), 10 SECONDS, TIMER_UNIQUE|TIMER_STOPPABLE|TIMER_DELETE_ME) + addtimer(CALLBACK(src, PROC_REF(check_pylons)), 10 SECONDS, TIMER_UNIQUE|TIMER_STOPPABLE|TIMER_DELETE_ME|TIMER_LOOP) + + marine_announcement("ALERT.\n\nUNUSUAL ENERGY BUILDUP DETECTED IN [uppertext(get_area_name(loc))].\n\nESTIMATED TIME UNTIL COMPLETION - 10 MINUTES.", "[MAIN_AI_SYSTEM] Biological Scanner", 'sound/misc/notice1.ogg') + var/datum/hive_status/hive + for(var/cur_hive_num in GLOB.hive_datum) + hive = GLOB.hive_datum[cur_hive_num] + if(!length(hive.totalXenos)) + continue + if(cur_hive_num == hive_number) + xeno_announcement(SPAN_XENOANNOUNCE("The King is growing at [get_area_name(loc)]. Protect it at all costs!"), cur_hive_num, XENO_GENERAL_ANNOUNCE) + else + xeno_announcement(SPAN_XENOANNOUNCE("Another hive's King is growing at [get_area_name(loc)]."), cur_hive_num, XENO_GENERAL_ANNOUNCE) + +/// Callback for a repeating 10s timer to ensure both pylons are active (otherwise delete) and counts the number of marines groundside (would cause hatching to expedite). +/obj/effect/alien/resin/king_cocoon/proc/check_pylons() + var/datum/hive_status/hive = GLOB.hive_datum[hive_number] + + if(length(hive.active_endgame_pylons) < 2) + qdel(src) + return + + if(chosen_candidate || rolling_candidates) + return + + if(hatched) + return + + var/groundside_humans = 0 + for(var/mob/living/carbon/human/current_human as anything in GLOB.alive_human_list) + if(!(isspecieshuman(current_human) || isspeciessynth(current_human))) + continue + + var/turf/turf = get_turf(current_human) + if(is_ground_level(turf?.z)) + groundside_humans += 1 + + if(groundside_humans > 12) + return + + // Too few marines are now groundside, hatch immediately + deltimer(timer) + start_vote(expedite = TRUE) + +/// Causes the cocoon to change visually for growing and initiates the next timer. +/obj/effect/alien/resin/king_cocoon/proc/start_growing() + icon_state = "growing" + timer = addtimer(CALLBACK(src, PROC_REF(announce_halfway)), 5 MINUTES, TIMER_UNIQUE|TIMER_STOPPABLE|TIMER_DELETE_ME) + +/// Causes the halfway announcements and initiates the next timer. +/obj/effect/alien/resin/king_cocoon/proc/announce_halfway() + timer = addtimer(CALLBACK(src, PROC_REF(start_vote)), 4 MINUTES, TIMER_UNIQUE|TIMER_STOPPABLE|TIMER_DELETE_ME) + + marine_announcement("ALERT.\n\nUNUSUAL ENERGY BUILDUP DETECTED IN [uppertext(get_area_name(loc))].\n\nESTIMATED TIME UNTIL COMPLETION - 5 MINUTES.", "[MAIN_AI_SYSTEM] Biological Scanner", 'sound/misc/notice1.ogg') + var/datum/hive_status/hive + for(var/cur_hive_num in GLOB.hive_datum) + hive = GLOB.hive_datum[cur_hive_num] + if(!length(hive.totalXenos)) + continue + if(cur_hive_num == hive_number) + xeno_announcement(SPAN_XENOANNOUNCE("The King will hatch in approximately 5 minutes."), cur_hive_num, XENO_GENERAL_ANNOUNCE) + else + xeno_announcement(SPAN_XENOANNOUNCE("Another hive's King will hatch in approximately 5 minutes."), cur_hive_num, XENO_GENERAL_ANNOUNCE) + +#define KING_PLAYTIME_HOURS (50 HOURS) + +/** + * Returns TRUE is the candidate passed is valid: Returns TRUE is the candidate passed is valid: Has client, not facehugger, not lesser drone, not banished, and conditionally on playtime. + * + * Arguments: + * * hive: The hive_status to check banished ckeys against + * * candidate: The mob that we want to check + * * playtime_restricted: Determines whether being below KING_PLAYTIME_HOURS makes the candidate invalid + * * skip_playtime: Determines whether being above KING_PLAYTIME_HOURS makes the candidate invalid (does nothing unless playtime_restricted is FALSE) + */ +/obj/effect/alien/resin/king_cocoon/proc/is_candidate_valid(datum/hive_status/hive, mob/candidate, playtime_restricted = TRUE, skip_playtime = TRUE) + if(!candidate?.client) + return FALSE + if(isfacehugger(candidate) || islesserdrone(candidate)) + return FALSE + if(playtime_restricted) + if(candidate.client.get_total_xeno_playtime() < KING_PLAYTIME_HOURS) + return FALSE + else if(candidate.client.get_total_xeno_playtime() >= KING_PLAYTIME_HOURS && skip_playtime) + return FALSE // We do this under the assumption we tried it the other way already so don't ask twice + for(var/mob_name in hive.banished_ckeys) + if(hive.banished_ckeys[mob_name] == candidate.ckey) + return FALSE + return TRUE + +/** + * Returns TRUE if a valid candidate accepts a TGUI alert asking them to be King. + * + * Arguments: + * * hive: The hive_status to check banished ckeys against + * * candidate: The mob that we want to ask + * * playtime_restricted: Determines whether being below KING_PLAYTIME_HOURS makes the candidate invalid (otherwise above) + */ +/obj/effect/alien/resin/king_cocoon/proc/try_roll_candidate(datum/hive_status/hive, mob/candidate, playtime_restricted = TRUE) + if(!is_candidate_valid(hive, candidate, playtime_restricted)) + return FALSE + + return tgui_alert(candidate, "Would you like to become the King?", "Choice", list("Yes", "No"), 10 SECONDS) == "Yes" + +#undef KING_PLAYTIME_HOURS + +/** + * Tallies up votes by asking the passed candidate who they wish to vote for King. + * + * Arguments: + * * candidate: The mob that was want to ask + * * voting_candidates: A list of xenomorph mobs that are candidates + */ +/obj/effect/alien/resin/king_cocoon/proc/cast_vote(mob/candidate, list/mob/living/carbon/xenomorph/voting_candidates) + var/mob/living/carbon/xenomorph/choice = tgui_input_list(candidate, "Vote for a sister you wish to become the King.", "Choose a xeno", voting_candidates , 20 SECONDS) + + if(votes[choice]) + votes[choice] += 1 + else + votes[choice] = 1 + +/// Initiates a vote that will end in 20 seconds to vote for the King. Hatching will then begin in 1 minute unless expedited. +/obj/effect/alien/resin/king_cocoon/proc/start_vote(expedite = FALSE) + rolling_candidates = TRUE + var/datum/hive_status/hive = GLOB.hive_datum[hive_number] + + var/list/mob/living/carbon/xenomorph/voting_candidates = hive.totalXenos.Copy() - hive.living_xeno_queen + + for(var/mob/living/carbon/xenomorph/voting_candidate in voting_candidates) + if(!is_candidate_valid(hive, voting_candidate)) + voting_candidates -= voting_candidate + + for(var/mob/living/carbon/xenomorph/candidate in hive.totalXenos) + if(is_candidate_valid(hive, candidate, playtime_restricted = FALSE, skip_playtime = FALSE)) + INVOKE_ASYNC(src, PROC_REF(cast_vote), candidate, voting_candidates) + + addtimer(CALLBACK(src, PROC_REF(roll_candidates), voting_candidates, expedite), 20 SECONDS, TIMER_UNIQUE|TIMER_STOPPABLE|TIMER_DELETE_ME) + +/** + * Finalizes the vote for King opting to use a series of fallbacks in case a candidate declines. + * + * First is a vote where the first and or second top picked is asked. + * Then all other living xenos meeting the playtime requirement are asked. + * Then all xeno observer candidates meeting the playtime requirement are asked. + * Then all other living xenos not meeting the playtime requirement are asked. + * Then all other xeno observer candidates not meeting the playtime requirement are asked. + * Then finally if after all that, the search is given up and will ultimately result in a freed King mob. + * + * Arguments: + * * voting_candidates: A list of xenomorphs that are valid candidates to vote on. + * * expedite: Whether hatching should begin in a minute or immediately after a candidate is found. + */ +/obj/effect/alien/resin/king_cocoon/proc/roll_candidates(list/mob/living/carbon/xenomorph/voting_candidates, expedite = FALSE) + var/datum/hive_status/hive = GLOB.hive_datum[hive_number] + + var/primary_votes = 0 + var/mob/living/carbon/xenomorph/primary_candidate + var/secondary_votes = 0 + var/mob/living/carbon/xenomorph/secondary_candidate + + for(var/mob/living/carbon/xenomorph/candidate in votes) + if(votes[candidate] > primary_votes) + primary_votes = votes[candidate] + primary_candidate = candidate + else if(votes[candidate] > secondary_votes) + secondary_votes = votes[candidate] + secondary_candidate = candidate + + votes.Cut() + + if(prob(50) && try_roll_candidate(hive, primary_candidate, playtime_restricted = TRUE)) + chosen_candidate = primary_candidate.client + rolling_candidates = FALSE + start_hatching(expedite) + return + + voting_candidates -= primary_candidate + + + if(try_roll_candidate(hive, secondary_candidate, playtime_restricted = TRUE)) + chosen_candidate = secondary_candidate.client + rolling_candidates = FALSE + start_hatching(expedite) + return + + voting_candidates -= secondary_candidate + + // Otherwise ask all the living xenos (minus the player(s) who got voted on earlier) + for(var/mob/living/carbon/xenomorph/candidate in shuffle(voting_candidates)) + if(try_roll_candidate(hive, candidate, playtime_restricted = TRUE)) + chosen_candidate = candidate.client + rolling_candidates = FALSE + start_hatching(expedite) + return + // Then observers + var/list/observer_list_copy = shuffle(get_alien_candidates(hive)) + + for(var/mob/candidate in observer_list_copy) + if(try_roll_candidate(hive, candidate, playtime_restricted = TRUE)) + chosen_candidate = candidate.client + rolling_candidates = FALSE + start_hatching(expedite) + return + // Lastly all of the above again, without playtime requirements + for(var/mob/living/carbon/xenomorph/candidate in shuffle(hive.totalXenos.Copy() - hive.living_xeno_queen)) + if(try_roll_candidate(hive, candidate, playtime_restricted = FALSE)) + chosen_candidate = candidate.client + rolling_candidates = FALSE + start_hatching(expedite) + return + for(var/mob/candidate in observer_list_copy) + if(try_roll_candidate(hive, candidate, playtime_restricted = FALSE)) + chosen_candidate = candidate.client + rolling_candidates = FALSE + start_hatching(expedite) + return + message_admins("Failed to find a client for the King, releasing as freed mob.") + start_hatching(expedite) + +/// Starts the hatching in one minute, otherwise immediately if expedited +/obj/effect/alien/resin/king_cocoon/proc/start_hatching(expedite = FALSE) + if(expedite) + animate_hatch_king() + return + + marine_announcement("ALERT.\n\nUNUSUAL ENERGY BUILDUP DETECTED IN [get_area_name(loc)].\n\nESTIMATED TIME UNTIL COMPLETION - ONE MINUTE.", "[MAIN_AI_SYSTEM] Biological Scanner", 'sound/misc/notice1.ogg') + var/datum/hive_status/hive + for(var/cur_hive_num in GLOB.hive_datum) + hive = GLOB.hive_datum[cur_hive_num] + if(!length(hive.totalXenos)) + continue + if(cur_hive_num == hive_number) + xeno_announcement(SPAN_XENOANNOUNCE("The King will hatch in approximately one minute."), cur_hive_num, XENO_GENERAL_ANNOUNCE) + else + xeno_announcement(SPAN_XENOANNOUNCE("Another hive's King will hatch in approximately one minute."), cur_hive_num, XENO_GENERAL_ANNOUNCE) + + timer = addtimer(CALLBACK(src, PROC_REF(animate_hatch_king)), 1 MINUTES, TIMER_UNIQUE|TIMER_STOPPABLE|TIMER_DELETE_ME) + +/// Causes the cocoon to change visually for hatching and initiates the next timer. +/obj/effect/alien/resin/king_cocoon/proc/animate_hatch_king() + flick("hatching", src) + addtimer(CALLBACK(src, PROC_REF(hatch_king)), 2 SECONDS, TIMER_UNIQUE|TIMER_STOPPABLE) + + marine_announcement("ALERT.\n\nEXTREME ENERGY INFLUX DETECTED IN [get_area_name(loc)].\n\nCAUTION IS ADVISED.", "[MAIN_AI_SYSTEM] Biological Scanner", 'sound/misc/notice1.ogg') + var/datum/hive_status/hive + for(var/cur_hive_num in GLOB.hive_datum) + hive = GLOB.hive_datum[cur_hive_num] + if(!length(hive.totalXenos)) + continue + if(cur_hive_num == hive_number) + xeno_announcement(SPAN_XENOANNOUNCE("All hail the King."), cur_hive_num, XENO_GENERAL_ANNOUNCE) + else + xeno_announcement(SPAN_XENOANNOUNCE("Another hive's King has hatched!"), cur_hive_num, XENO_GENERAL_ANNOUNCE) + +/// Actually hatches the King transferring the candidate into the spawned mob and initiates the next timer. +/obj/effect/alien/resin/king_cocoon/proc/hatch_king() + icon_state = "hatched" + hatched = TRUE + + QDEL_LIST(blockers) + + var/mob/living/carbon/xenomorph/king/king = new(get_turf(src), null, hive_number) + if(chosen_candidate?.mob) + var/mob/old_mob = chosen_candidate.mob + old_mob.mind.transfer_to(king) + + if(isliving(old_mob) && old_mob.stat != DEAD) + old_mob.free_for_ghosts(TRUE) + else + king.free_for_ghosts(TRUE) + playsound(src, 'sound/voice/alien_queen_command.ogg', 75, 0) + + chosen_candidate = null + + // Gives some time for the King to get their barings before it can be OBed + addtimer(CALLBACK(src, PROC_REF(remove_ob_protection)), 1 MINUTES, TIMER_UNIQUE|TIMER_STOPPABLE|TIMER_DELETE_ME) + +/// The final step in the cocoon sequence: Resets pylon protection levels +/obj/effect/alien/resin/king_cocoon/proc/remove_ob_protection() + var/datum/hive_status/hive = GLOB.hive_datum[hive_number] + for(var/obj/effect/alien/resin/special/pylon/pylon as anything in hive.active_endgame_pylons) + pylon.protection_level = initial(pylon.protection_level) + pylon.update_icon() + +/obj/effect/alien/resin/king_cocoon/attack_alien(mob/living/carbon/xenomorph/attacking_alien) + if(attacking_alien.can_destroy_special() || hatched) + return ..() + + return XENO_NO_DELAY_ACTION + /obj/item/explosive/grenade/alien name = "alien grenade" desc = "an alien grenade." diff --git a/code/modules/cm_aliens/hivebuffs/hivebuff.dm b/code/modules/cm_aliens/hivebuffs/hivebuff.dm new file mode 100644 index 000000000000..2b140771e946 --- /dev/null +++ b/code/modules/cm_aliens/hivebuffs/hivebuff.dm @@ -0,0 +1,529 @@ +//GLOBAL DEFINES// + +#define HIVE_STARTING_BUFFPOINTS 0 +#define HIVE_MAX_BUFFPOINTS 10 +#define BUFF_POINTS_NAME "Royal resin" + +//LOCAL DEFINES// + +#define HIVEBUFF_TIER_MINOR "Minor" +#define HIVEBUFF_TIER_MAJOR "Major" + +/** + * + * HIVE BUFFS - XENOMORPH ENDGAME + * Contains all the class definitons and code for applying hivebuffs to xeno hives. + * Each buff consists of a /datum/hivebuff + * And associated on_engage and on_cease procs to handle behaviour of activating and ending the buffs + * Buffs are divided into 2 tiers, minor and major. + * + */ +/datum/hivebuff + /// Timer id for cooldown duration + var/_timer_id_cooldown = TIMER_ID_NULL + /// The hive that this buff is applied to. + var/datum/hive_status/hive + ///Name of the buff, short and to the point + var/name = "Hivebuff" + /// Description of what the buff does. + var/desc = "Base hivebuff" + /// Path to .dmi with hivebuff radial icons + var/hivebuff_radial_dmi = 'icons/ui_icons/hivebuff_radial.dmi' + /// Image to display on radial menu + var/radial_icon = "health" + /// Round time before the buff becomes available to purchase + var/roundtime_to_enable = 0 HOURS + + /// Flavour message to announce to the hive on buff application. Narrated to all players in the hive. + var/engage_flavourmessage + /// Flavour message to announce to the hive on buff expiry. Narrated to all players in the hive. + var/cease_flavourmessage + + /// Minor or Major buff. Governs announcements made and importance. + var/tier = HIVEBUFF_TIER_MINOR + /// Number of pylons required to buy the buff + var/number_of_required_pylons = 1 + ///If this buff can be used with others + var/is_combineable = TRUE + ///If this buff can be used more than once a round. + var/is_reusable = TRUE + /// Time that the buff is active for if it is a timed buff. + var/duration + /// Time that the buff is on cooldown after ending + var/cooldown_duration + /// Cost of the buff + var/cost = 1 + + /// Message to send to the user and queen if we fail for any reason during on_engage() + var/engage_failure_message + + /// Flavour message to give to the marines on buff engage + var/marine_flavourmessage + + /// Apply the buff effect to new xenomorphs who spawn or evolve. + var/apply_on_new_xeno = TRUE + + /// Special fail message + var/special_fail_message = "" + + /// Ask the buyer where to put the buff + var/must_select_pylon = FALSE + + /// _on_cease timer id + var/cease_timer_id + +/datum/hivebuff/New(datum/hive_status/xenohive) + . = ..() + if(!xenohive || !istype(xenohive)) + stack_trace("Hivebuff created without correct hive_status passed.") + return FALSE + hive = xenohive + + if(!engage_flavourmessage) + engage_flavourmessage = "The Queen has purchased [name]." + if(!cease_flavourmessage) + cease_flavourmessage = "The [name] has expired." + + return TRUE + +/datum/hivebuff/Destroy(force, ...) + LAZYREMOVE(hive.active_hivebuffs, src) + LAZYREMOVE(hive.used_hivebuffs, src) + LAZYREMOVE(hive.cooldown_hivebuffs, src) + hive = null + return ..() + +///Wrapper for on_engage(), handles checking if the buff can be actually purchased as well as adding buff to the active_hivebuffs and used_hivebuffs for the hive. +/datum/hivebuff/proc/_on_engage(mob/living/carbon/xenomorph/purchasing_mob, obj/effect/alien/resin/special/pylon/purchased_pylon) + if(!_roundtime_check()) + to_chat(purchasing_mob, SPAN_XENONOTICE("Our hive is not mature enough yet to purchase this!")) + return + + if(!_check_num_required_pylons()) + to_chat(purchasing_mob, SPAN_XENONOTICE("Our hive does not have the required number of available pylons! We require [number_of_required_pylons]")) + return FALSE + + if(!_check_danger()) + to_chat(purchasing_mob, SPAN_XENONOTICE("There is not enough danger to warrant hive buffs.")) + return FALSE + + if(!_check_can_afford_buff()) + to_chat(purchasing_mob, SPAN_XENONOTICE("Our hive cannot afford [name]! [hive.buff_points] / [cost] points.")) + return FALSE + + if(!_check_pass_active()) + to_chat(purchasing_mob, SPAN_XENONOTICE("Our hive can't benefit from [name] yet!")) + return FALSE + + if(!_check_pass_reusable()) + to_chat(purchasing_mob, SPAN_XENONOTICE("Our hive has already used [name] and cannot use it again!")) + return FALSE + + var/datum/hivebuff/cooldown_buff = locate(type) in hive.cooldown_hivebuffs + if(cooldown_buff) + to_chat(purchasing_mob, SPAN_XENONOTICE("Our hive has already used [name] recently! Wait [DisplayTimeText(timeleft(cooldown_buff._timer_id_cooldown))].")) + return FALSE + + if(!_check_pass_combineable()) + var/active_buffs = "" + for(var/buff in hive.active_hivebuffs) + active_buffs += buff + " " + active_buffs = trim_right(active_buffs) + to_chat(purchasing_mob, SPAN_XENONOTICE("[name] cannot be used with other active buffs! Wait for those to end first. Active buffs: [active_buffs]")) + return FALSE + + if(!handle_special_checks()) + to_chat(purchasing_mob, SPAN_XENONOTICE(special_fail_message)) + return FALSE + + log_admin("[key_name(purchasing_mob)] of [hive.hivenumber] is attempting to purchase a hive buff: [name].") + + if(!_seek_queen_approval(purchasing_mob)) + return FALSE + + // _seek_queen_approval() includes a 20 second timeout so we check that everything still exists that we need. + if(QDELETED(purchasing_mob) && !purchasing_mob.check_state()) + return FALSE + + // Actually process the buff and apply effects - If the buff succeeds engage_message will return TRUE, if it fails there should be an engage_failure_message set. + if(!on_engage(purchased_pylon)) + if(engage_failure_message && istext(engage_failure_message)) + to_chat(purchasing_mob, SPAN_XENONOTICE(engage_failure_message)) + to_chat(hive.living_xeno_queen, SPAN_XENONOTICE(engage_failure_message)) + return + else + stack_trace("[purchasing_mob] attempted to purchase a hive buff: [name] and failed to engage and returned an invalid failure message or no failure message.") + return + + // All checks have passed. + + // Purchase and deduct funds only after we're sure the buff has engaged + if(!_purchase_and_deduct(purchasing_mob)) + return + + for(var/mob/living/carbon/xenomorph/xeno in hive.totalXenos) + apply_buff_effects(xeno) + + if(apply_on_new_xeno) + RegisterSignal(SSdcs, COMSIG_GLOB_XENO_SPAWN, PROC_REF(_handle_xenomorph_new)) + + var/involved = purchasing_mob == hive.living_xeno_queen ? "[key_name_admin(purchasing_mob)]" : "[key_name_admin(purchasing_mob)] and [key_name_admin(hive.living_xeno_queen)]" + message_admins("[involved] of [hive.hivenumber] has purchased a hive buff: [name].") + + // Add to the relevant hive lists. + LAZYADD(hive.used_hivebuffs, src) + LAZYADD(hive.active_hivebuffs, src) + + // Announce to our hive that we've completed. + _announce_buff_engage() + + // If we need a timer to call _on_cease() we add it here and store the id, used for deleting the timer if we Destroy(). + // If we have no duration to the buff then we call _on_cease() immediately. + if(duration) + cease_timer_id = addtimer(CALLBACK(src, PROC_REF(_on_cease)), duration, TIMER_STOPPABLE|TIMER_DELETE_ME) + else + _on_cease() + return TRUE + +/// Behaviour for the buff goes in here. +/// IMPORTANT: If you buff has any kind of conditions which can fail. Set an engage_failure_message and return FALSE. +/// If your buff succeeds you must return TRUE +/datum/hivebuff/proc/on_engage(obj/effect/alien/resin/special/pylon/purchased_pylon) + return TRUE + +/// Wrapper for on_cease() +/datum/hivebuff/proc/_on_cease() + if(cease_timer_id) + deltimer(cease_timer_id) + + _announce_buff_cease() + on_cease() + LAZYREMOVE(hive.active_hivebuffs, src) + UnregisterSignal(SSdcs, COMSIG_GLOB_XENO_SPAWN) + + for(var/mob/living/carbon/xenomorph/xeno in hive.totalXenos) + remove_buff_effects(xeno) + + if(cooldown_duration) + LAZYADD(hive.cooldown_hivebuffs, src) + _timer_id_cooldown = addtimer(CALLBACK(src, PROC_REF(_on_cooldown_end)), cooldown_duration, TIMER_STOPPABLE|TIMER_DELETE_ME) + +/// Handler for the end of a cooldown +/datum/hivebuff/proc/_on_cooldown_end() + LAZYREMOVE(hive.cooldown_hivebuffs, src) + _timer_id_cooldown = TIMER_ID_NULL + +/// Checks the number of pylons required and if the hive posesses them +/datum/hivebuff/proc/_check_num_required_pylons() + return number_of_required_pylons >= hive.active_endgame_pylons + +/datum/hivebuff/proc/_roundtime_check() + if(ROUND_TIME > roundtime_to_enable) + return TRUE + return FALSE + +/datum/hivebuff/proc/_check_danger() + var/groundside_humans = 0 + for(var/mob/living/carbon/human/current_human as anything in GLOB.alive_human_list) + if(!(isspecieshuman(current_human) || isspeciessynth(current_human))) + continue + + var/turf/turf = get_turf(current_human) + if(is_ground_level(turf?.z)) + groundside_humans++ + if(groundside_humans >= 12) + return TRUE + + return FALSE + +/// Checks if the hive can afford to purchase the buff returns TRUE if they can purchase and FALSE if not. +/datum/hivebuff/proc/_check_can_afford_buff() + if(hive.buff_points < cost) + return FALSE + + return TRUE + +/// Checks if this buff is already active in the hive. Returns TRUE if passed FALSE if not. +/datum/hivebuff/proc/_check_pass_active() + // Prevent the same lineage of buff (e.g. no minor and major health allowed) + for(var/datum/hivebuff/buff as anything in hive.active_hivebuffs) + if(istype(src, buff.type)) + return FALSE + if(istype(buff, type)) + return FALSE + + return TRUE + +/// Checks if the buff is combineable if other buffs are already in use. Return TRUE if passed FALSE if not. +/datum/hivebuff/proc/_check_pass_combineable() + if(is_combineable) + return TRUE + for(var/datum/hivebuff/active_hivebuff in hive.active_hivebuffs) + if(!active_hivebuff.is_combineable) + return FALSE + return TRUE + +/// Checks if the buff is reusable and if it's already been used. Returns TRUE if passed, FALSE if not. +/datum/hivebuff/proc/_check_pass_reusable() + if(is_reusable) + return TRUE + + for(var/datum/hivebuff/buff as anything in hive.used_hivebuffs) + if(type == buff.type) + return FALSE + + return TRUE + +/// Deducts points from the hive buff points equal to the cost of the buff +/datum/hivebuff/proc/_purchase_and_deduct(mob/purchasing_mob) + if(!_check_can_afford_buff()) + to_chat(purchasing_mob, SPAN_XENONOTICE("Something went wrong, try again.")) + return FALSE + + hive.buff_points -= cost + hive.check_if_hit_larva_from_pylon_limit() + return TRUE + +/datum/hivebuff/proc/_seek_queen_approval(mob/living/purchasing_mob) + if(!hive.living_xeno_queen) + return FALSE + + var/mob/living/queen = hive.living_xeno_queen + var/queen_response = tgui_alert(queen, "You are trying to Purchase [name] at a cost of [cost] [BUFF_POINTS_NAME]. Our hive has [hive.buff_points] [BUFF_POINTS_NAME]. Are you sure you want to purchase it? Description: [desc]", "Approve Hive Buff", list("Yes", "No"), 20 SECONDS) + + return queen_response == "Yes" + +/// Any effects which need to be ended or ceased gracefully, called when a buff expires. +/datum/hivebuff/proc/on_cease() + return + +/datum/hivebuff/proc/_announce_buff_engage() + if(engage_flavourmessage) + xeno_announcement(SPAN_XENOANNOUNCE(engage_flavourmessage), hive.hivenumber, XENO_GENERAL_ANNOUNCE) + + if(marine_flavourmessage) + marine_announcement(marine_flavourmessage, COMMAND_ANNOUNCE, 'sound/AI/bioscan.ogg') + +/datum/hivebuff/proc/_announce_buff_cease() + if(!duration) + return + + for(var/mob/living/xenomorph as anything in hive.totalXenos) + if(!xenomorph.client) + continue + xenomorph.play_screen_text(cease_flavourmessage, override_color = "#740064") + to_chat(xenomorph, SPAN_XENO(cease_flavourmessage)) + +///Signal handler for new xenomorphs joining the hive +/datum/hivebuff/proc/_handle_xenomorph_new(datum/source, mob/living/carbon/xenomorph/new_xeno) + SIGNAL_HANDLER + if(!apply_on_new_xeno) + return + + if(!(src in hive.active_hivebuffs)) + return + // If we're the same hive as the buff + if(new_xeno.hive == hive) + apply_buff_effects(new_xeno) + +///The actual effects of the buff to apply +/datum/hivebuff/proc/apply_buff_effects(mob/living/carbon/xenomorph/xeno) + return + +/// Reverse the effects here, should be the opposite of apply_effects() +/datum/hivebuff/proc/remove_buff_effects(mob/living/carbon/xenomorph/xeno) + return + +/datum/hivebuff/proc/handle_special_checks() + return TRUE + + +// BUFFS // + +/datum/hivebuff/extra_larva + name = "Surge of Larva" + desc = "Provides 5 larva instantly to the hive." + radial_icon = "larba" + + engage_flavourmessage = "The Queen has purchased 5 extra larva to join the hive!" + cost = 5 + number_of_required_pylons = 1 + is_reusable = FALSE + +/datum/hivebuff/extra_larva/on_engage(obj/effect/alien/resin/special/pylon/purchased_pylon) + hive.stored_larva += 5 + return TRUE + +/datum/hivebuff/evo_buff + name = "Boon of Evolution" + desc = "Doubles evolution speed for 5 minutes." + tier = HIVEBUFF_TIER_MINOR + engage_flavourmessage = "The Queen has blessed us with faster evolution." + duration = 5 MINUTES + number_of_required_pylons = 1 + var/value_before_buff + +/datum/hivebuff/evo_buff/on_engage(obj/effect/alien/resin/special/pylon/purchased_pylon) + value_before_buff = SSxevolution.get_evolution_boost_power(hive.hivenumber) + hive.override_evilution(value_before_buff * 2, TRUE) + + return TRUE + +/datum/hivebuff/evo_buff/on_cease() + hive.override_evilution(value_before_buff, FALSE) + +/datum/hivebuff/evo_buff/major + name = "Major Boon of Evolution" + desc = "Doubles evolution speed for 10 minutes and allows evolution progress without an ovipositor." + tier = HIVEBUFF_TIER_MAJOR + + engage_flavourmessage = "The Queen has blessed us with faster evolution." + duration = 10 MINUTES + cost = 2 + number_of_required_pylons = 2 + radial_icon = "health_m" + +/datum/hivebuff/evo_buff/major/on_engage(obj/effect/alien/resin/special/pylon/purchased_pylon) + hive.allow_no_queen_evo = TRUE + + return ..() + +/datum/hivebuff/evo_buff/major/on_cease() + . = ..() + hive.allow_no_queen_evo = FALSE + +/datum/hivebuff/game_ender_caste + name = "His Grace" + desc = "A huge behemoth of a Xenomorph which can tear its way through defences and flesh alike. Requires open space to grow." + tier = HIVEBUFF_TIER_MAJOR + radial_icon = "king" + + is_reusable = TRUE + cost = 0 + special_fail_message = "Only one hatchery may exist at a time." + cooldown_duration = 15 MINUTES // This buff ceases instantly so we need to incorporation the spawning time too + number_of_required_pylons = 2 + must_select_pylon = TRUE + +/datum/hivebuff/game_ender_caste/New() + roundtime_to_enable = GLOB.king_acquisition_time + + return ..() + +/datum/hivebuff/game_ender_caste/handle_special_checks() + if(locate(/mob/living/carbon/xenomorph/king) in hive.totalXenos) + special_fail_message = "Only one King may exist at a time." + return FALSE + + return !hive.has_hatchery + +/datum/hivebuff/game_ender_caste/on_engage(obj/effect/alien/resin/special/pylon/purchased_pylon) + var/turf/spawn_turf + for(var/turf/potential_turf in orange(5, purchased_pylon)) + var/failed = FALSE + for(var/x_offset in -1 to 1) + for(var/y_offset in -1 to 1) + var/turf/turf_to_check = locate(potential_turf.x + x_offset, potential_turf.y + y_offset, potential_turf.z) + if(turf_to_check.density) + failed = TRUE + break + if(!turf_to_check.is_weedable()) + failed = TRUE + break + var/area/target_area = get_area(turf_to_check) + if(target_area.flags_area & AREA_NOTUNNEL) + failed = TRUE + break + for(var/obj/structure/struct in turf_to_check) + if(struct.density) + failed = TRUE + break + if(!failed) + spawn_turf = potential_turf + break + + if(!spawn_turf) + engage_failure_message = "Unable to find a viable spawn point for the King." + return FALSE + + for(var/obj/effect/alien/resin/special/pylon/pylon as anything in hive.active_endgame_pylons) + pylon.protection_level = TURF_PROTECTION_OB + pylon.update_icon() + + new /obj/effect/alien/resin/king_cocoon(spawn_turf, hive.hivenumber) + + return TRUE + +/datum/hivebuff/defence + name = "Boon of Defence" + desc = "Increases all xenomorph armour by 2.5 for 5 minutes" + tier = HIVEBUFF_TIER_MINOR + + engage_flavourmessage = "The Queen has imbued us with greater chitin." + duration = 5 MINUTES + number_of_required_pylons = 1 + radial_icon = "shield" + +/datum/hivebuff/defence/apply_buff_effects(mob/living/carbon/xenomorph/xeno) + xeno.armor_modifier += XENO_ARMOR_MOD_TINY + xeno.recalculate_armor() + +/datum/hivebuff/defence/remove_buff_effects(mob/living/carbon/xenomorph/xeno) + xeno.armor_modifier -= XENO_ARMOR_MOD_TINY + xeno.recalculate_armor() + +/datum/hivebuff/defence/major + name = "Major Boon of Defence" + desc = "Increases all xenomorph armour by 5 for 10 minutes" + tier = HIVEBUFF_TIER_MAJOR + + engage_flavourmessage = "The Queen has imbued us with even greater chitin." + duration = 10 MINUTES + cost = 2 + number_of_required_pylons = 2 + radial_icon = "shield_m" + +/datum/hivebuff/defence/major/apply_buff_effects(mob/living/carbon/xenomorph/xeno) + xeno.armor_modifier += XENO_ARMOR_MOD_VERY_SMALL + xeno.recalculate_armor() + +/datum/hivebuff/defence/major/remove_buff_effects(mob/living/carbon/xenomorph/xeno) + xeno.armor_modifier -= XENO_ARMOR_MOD_VERY_SMALL + xeno.recalculate_armor() + +/datum/hivebuff/attack + name = "Boon of Aggression" + desc = "Increases all xenomorph damage by 5 for 5 minutes" + tier = HIVEBUFF_TIER_MINOR + + engage_flavourmessage = "The Queen has imbued us with sharp claws." + duration = 5 MINUTES + number_of_required_pylons = 1 + radial_icon = "slash" + +/datum/hivebuff/attack/apply_buff_effects(mob/living/carbon/xenomorph/xeno) + xeno.damage_modifier += XENO_DAMAGE_MOD_VERY_SMALL + xeno.recalculate_damage() + +/datum/hivebuff/attack/remove_buff_effects(mob/living/carbon/xenomorph/xeno) + xeno.damage_modifier -= XENO_DAMAGE_MOD_VERY_SMALL + xeno.recalculate_damage() + +/datum/hivebuff/attack/major + name = "Major Boon of Aggression" + desc = "Increases all xenomorph damage by 10 for 10 minutes" + tier = HIVEBUFF_TIER_MAJOR + + engage_flavourmessage = "The Queen has imbued us with razor-sharp claws." + duration = 10 MINUTES + number_of_required_pylons = 2 + cost = 2 + radial_icon = "slash_m" + +/datum/hivebuff/attack/major/apply_buff_effects(mob/living/carbon/xenomorph/xeno) + xeno.damage_modifier += XENO_DAMAGE_MOD_SMALL + xeno.recalculate_damage() + +/datum/hivebuff/attack/major/remove_buff_effects(mob/living/carbon/xenomorph/xeno) + xeno.damage_modifier -= XENO_DAMAGE_MOD_SMALL + xeno.recalculate_damage() diff --git a/code/modules/cm_aliens/structures/egg.dm b/code/modules/cm_aliens/structures/egg.dm index 16286c7cb5bb..415f404307bd 100644 --- a/code/modules/cm_aliens/structures/egg.dm +++ b/code/modules/cm_aliens/structures/egg.dm @@ -16,6 +16,10 @@ var/on_fire = FALSE var/hivenumber = XENO_HIVE_NORMAL var/flags_embryo = NO_FLAGS + /// The weed strength that needs to be maintained in order for this egg to not decay; null disables check + var/weed_strength_required = WEED_LEVEL_HIVE + /// Whether to convert/orphan once EGG_BURSTING is complete + var/convert_on_release = FALSE /obj/effect/alien/egg/Initialize(mapload, hive) . = ..() @@ -30,6 +34,10 @@ update_icon() addtimer(CALLBACK(src, PROC_REF(Grow)), rand(EGG_MIN_GROWTH_TIME, EGG_MAX_GROWTH_TIME)) + var/turf/my_turf = get_turf(src) + if(my_turf?.weeds && !isnull(weed_strength_required)) + RegisterSignal(my_turf.weeds, COMSIG_PARENT_QDELETING, PROC_REF(on_weed_deletion)) + /obj/effect/alien/egg/proc/forsaken_handling() SIGNAL_HANDLER if(is_ground_level(z)) @@ -38,6 +46,49 @@ UnregisterSignal(SSdcs, COMSIG_GLOB_GROUNDSIDE_FORSAKEN_HANDLING) +/// SIGNAL_HANDLER for COMSIG_PARENT_QDELETING of weeds to potentially orphan this egg +/obj/effect/alien/egg/proc/on_weed_deletion() + SIGNAL_HANDLER + + if(!can_convert()) + return + + // Orphan later? + if(status == EGG_BURSTING) + convert_on_release = TRUE + return + + convert() + +/// Whether this egg meets the requirements to convert/orphan +/obj/effect/alien/egg/proc/can_convert() + if(on_fire) + return FALSE + if(status == EGG_DESTROYED) + return FALSE + + return TRUE + +/// Actually converts/orphan this egg +/obj/effect/alien/egg/proc/convert() + if(!can_convert()) + return + + var/turf/my_turf = get_turf(src) + var/obj/effect/alien/egg/carrier_egg/orphan/newegg = new(my_turf, hivenumber, weed_strength_required) + newegg.flags_embryo = flags_embryo + newegg.fingerprintshidden = fingerprintshidden + newegg.fingerprintslast = fingerprintslast + switch(status) + if(EGG_GROWN) + newegg.Grow() + if(EGG_BURSTING, EGG_BURST) + newegg.status = EGG_BURST + newegg.hide_egg_triggers() + newegg.icon_state = "Egg Opened" + + qdel(src) + /obj/effect/alien/egg/Destroy() . = ..() for(var/obj/effect/egg_trigger/trigger as anything in egg_triggers) @@ -92,15 +143,17 @@ return XENO_NONCOMBAT_ACTION /obj/effect/alien/egg/clicked(mob/user, list/mods) + if(..()) + return TRUE + if(isobserver(user) || get_dist(src, user) > 1) return + var/mob/living/carbon/xenomorph/X = user if(istype(X) && status == EGG_GROWN && mods["ctrl"] && X.caste.can_hold_facehuggers) Burst(FALSE, FALSE, X) return TRUE - return ..() - /obj/effect/alien/egg/proc/Grow() if(status == EGG_GROWING) icon_state = "Egg" @@ -135,13 +188,13 @@ status = EGG_DESTROYED icon_state = "Egg Exploded" flick("Egg Exploding", src) - playsound(src.loc, "sound/effects/alien_egg_burst.ogg", 25) + playsound(loc, "sound/effects/alien_egg_burst.ogg", 25) else if(status == EGG_GROWN || status == EGG_GROWING) status = EGG_BURSTING hide_egg_triggers() icon_state = "Egg Opened" flick("Egg Opening", src) - playsound(src.loc, "sound/effects/alien_egg_move.ogg", 25) + playsound(loc, "sound/effects/alien_egg_move.ogg", 25) addtimer(CALLBACK(src, PROC_REF(release_hugger), instant_trigger, X, is_hugger_player_controlled), 1 SECONDS) /obj/effect/alien/egg/proc/release_hugger(instant_trigger, mob/living/carbon/xenomorph/X, is_hugger_player_controlled = FALSE) @@ -150,6 +203,8 @@ status = EGG_BURST if(is_hugger_player_controlled) + if(convert_on_release) + convert() return //Don't need to spawn a hugger, a player controls it already! var/obj/item/clothing/mask/facehugger/child = new(loc, hivenumber) @@ -158,6 +213,8 @@ if(X && X.caste.can_hold_facehuggers && (!X.l_hand || !X.r_hand)) //sanity checks X.put_in_hands(child) + if(convert_on_release) + convert() return if(instant_trigger) @@ -166,6 +223,9 @@ else child.go_idle() + if(convert_on_release) + convert() + /obj/effect/alien/egg/bullet_act(obj/projectile/P) ..() var/ammo_flags = P.ammo.flags_ammo_behavior | P.projectile_override_flags @@ -322,6 +382,7 @@ SPECIAL EGG USED BY EGG CARRIER /obj/effect/alien/egg/carrier_egg name = "fragile egg" desc = "It looks like a weird, fragile egg." + weed_strength_required = null ///Owner of the fragile egg, must be a mob/living/carbon/xenomorph/carrier var/mob/living/carbon/xenomorph/carrier/owner = null ///Time that the carrier was last within refresh range of the egg (14 tiles) @@ -332,13 +393,13 @@ SPECIAL EGG USED BY EGG CARRIER /obj/effect/alien/egg/carrier_egg/Initialize(mapload, hivenumber, planter = null) . = ..() last_refreshed = world.time - if(!planter) - //If we have no owner when created... this really shouldn't happen but start decaying the egg immediately. - start_unstoppable_decay() - else + if(iscarrier(planter)) //Die after maximum lifetime life_timer = addtimer(CALLBACK(src, PROC_REF(start_unstoppable_decay)), CARRIER_EGG_MAXIMUM_LIFE, TIMER_STOPPABLE) set_owner(planter) + else if(isnull(planter)) + //If we have no owner when created... this really shouldn't happen but start decaying the egg immediately. + start_unstoppable_decay() /obj/effect/alien/egg/carrier_egg/Destroy() if(life_timer) @@ -373,5 +434,83 @@ SPECIAL EGG USED BY EGG CARRIER if(owner) var/datum/behavior_delegate/carrier_eggsac/behavior = owner.behavior_delegate behavior.remove_egg_owner(src) + if(kill && life_timer) + deltimer(life_timer) + +/obj/effect/alien/egg/carrier_egg/on_weed_deletion() + return + +/* +SPECIAL EGG USED WHEN WEEDS LOST +*/ + +#define ORPHAN_EGG_MAXIMUM_LIFE 6 MINUTES // Should be longer than HIVECORE_COOLDOWN + +/obj/effect/alien/egg/carrier_egg/orphan/Initialize(mapload, hivenumber, weed_strength_required) + src.weed_strength_required = weed_strength_required + + . = ..() + + if(isnull(weed_strength_required)) + return . + + if(hivenumber != XENO_HIVE_FORSAKEN) + life_timer = addtimer(CALLBACK(src, PROC_REF(start_unstoppable_decay)), ORPHAN_EGG_MAXIMUM_LIFE, TIMER_STOPPABLE) + + var/my_turf = get_turf(src) + if(my_turf) + RegisterSignal(my_turf, COMSIG_WEEDNODE_GROWTH, PROC_REF(on_weed_growth)) + +/// SIGNAL_HANDLER for COMSIG_WEEDNODE_GROWTH to potentially restore this orphan +/obj/effect/alien/egg/carrier_egg/orphan/proc/on_weed_growth() + SIGNAL_HANDLER + + if(!can_convert()) + return + + // Convert later? + if(status == EGG_BURSTING) + convert_on_release = TRUE + return + + convert() + +/obj/effect/alien/egg/carrier_egg/orphan/forsaken_handling() + . = ..() if(life_timer) deltimer(life_timer) + +/obj/effect/alien/egg/carrier_egg/orphan/can_convert() + if(!..()) + return FALSE + + // Check weed strength + if(isnull(weed_strength_required)) + return FALSE + var/turf/my_turf = get_turf(src) + var/obj/effect/alien/weeds/weed = my_turf?.weeds + if(!weed) + return FALSE + if(weed.weed_strength < weed_strength_required) + return FALSE + + return TRUE + +/obj/effect/alien/egg/carrier_egg/orphan/convert() + if(!can_convert()) + return + + var/turf/my_turf = get_turf(src) + var/obj/effect/alien/egg/newegg = new(my_turf, hivenumber) + newegg.flags_embryo = flags_embryo + newegg.fingerprintshidden = fingerprintshidden + newegg.fingerprintslast = fingerprintslast + switch(status) + if(EGG_GROWN) + newegg.Grow() + if(EGG_BURSTING, EGG_BURST) + newegg.status = EGG_BURST + newegg.hide_egg_triggers() + newegg.icon_state = "Egg Opened" + + qdel(src) diff --git a/code/modules/cm_aliens/structures/special/egg_morpher.dm b/code/modules/cm_aliens/structures/special/egg_morpher.dm index 9a740133b1cc..e0691b0d4d28 100644 --- a/code/modules/cm_aliens/structures/special/egg_morpher.dm +++ b/code/modules/cm_aliens/structures/special/egg_morpher.dm @@ -3,24 +3,32 @@ //Eggmorpher - Basically a big reusable egg /obj/effect/alien/resin/special/eggmorph name = XENO_STRUCTURE_EGGMORPH - desc = "A disgusting, organic processor that reeks of rotting flesh. Capable of melting even bones into something far more useful." + desc = "A disgusting biomass generator that reeks of rotting flesh. Capable of producing facehuggers on its own." icon_state = "eggmorph" health = 300 - var/last_spawned = 0 - var/spawn_cooldown = 20 SECONDS + appearance_flags = KEEP_TOGETHER + layer = FACEHUGGER_LAYER + + ///How many huggers are stored in the egg morpher currently. var/stored_huggers = 0 - var/huggers_to_grow = 0 - var/huggers_per_corpse = 6 - var/huggers_to_grow_max = 12 + ///Max amount of huggers that can be stored in the egg morpoher. + var/huggers_max_amount = 12 + ///Max amount of huggers that can grow by itself. + var/huggers_to_grow_max = 6 + ///How many huggers are reserved from observers. var/huggers_reserved = 0 - var/mob/captured_mob + ///Datum used for mob detection. var/datum/shape/range_bounds + ///How long it takes to generate one facehugger. + var/spawn_cooldown_length = 120 SECONDS + ///How long it takes to generate one facehugger if queen is on ovi. + var/spawn_cooldown_length_ovi = 60 SECONDS + COOLDOWN_DECLARE(spawn_cooldown) - appearance_flags = KEEP_TOGETHER - layer = FACEHUGGER_LAYER /obj/effect/alien/resin/special/eggmorph/Initialize(mapload, hive_ref) . = ..() + COOLDOWN_START(src, spawn_cooldown, get_egg_cooldown()) range_bounds = SQUARE(x, y, EGGMORPG_RANGE) /obj/effect/alien/resin/special/eggmorph/Destroy() @@ -34,127 +42,76 @@ F = new(loc, linked_hive.hivenumber) step_away(F,src,1) - vis_contents.Cut() - QDEL_NULL(captured_mob) range_bounds = null - . = ..() /obj/effect/alien/resin/special/eggmorph/get_examine_text(mob/user) . = ..() if(isxeno(user) || isobserver(user)) - . += "It has [stored_huggers] facehuggers within, with [huggers_to_grow] more to grow (reserved: [huggers_reserved])." - if(isxeno(user) || isobserver(user)) + . += SPAN_NOTICE("\nIt has [stored_huggers] facehuggers within, with [max(0, huggers_to_grow_max - stored_huggers)] more to grow and a total capacity of [huggers_max_amount] facehuggers (reserved: [huggers_reserved]).") + var/current_hugger_count = linked_hive.get_current_playable_facehugger_count(); - . += "There are currently [SPAN_NOTICE("[current_hugger_count]")] facehuggers in the hive. The hive can support a total of [SPAN_NOTICE("[linked_hive.playable_hugger_limit]")] facehuggers at present." - -/obj/effect/alien/resin/special/eggmorph/attackby(obj/item/I, mob/user) - if(istype(I, /obj/item/grab)) - if(!isxeno(user)) return - var/obj/item/grab/G = I - if(iscarbon(G.grabbed_thing)) - var/mob/living/carbon/M = G.grabbed_thing - if(M.buckled) - to_chat(user, SPAN_XENOWARNING("Unbuckle first!")) - return - if(ishuman(M)) - var/mob/living/carbon/human/H = M - if(H.is_revivable()) - to_chat(user, SPAN_XENOWARNING("This one is not suitable yet!")) - return - if(isxeno(M)) - return - if(M == captured_mob) - to_chat(user, SPAN_XENOWARNING("[src] is already digesting [M]!")) - return - if(huggers_to_grow + stored_huggers >= huggers_to_grow_max) - to_chat(user, SPAN_XENOWARNING("\The [src] is already full! Using this one now would be a waste...")) - return - if(!do_after(user, 10, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_GENERIC)) - return - visible_message(SPAN_DANGER("\The [src] churns as it begins digest \the [M], spitting out foul-smelling fumes!")) - playsound(src, "alien_drool", 25) - if(captured_mob) - //Get rid of what we have there, we're overwriting it - qdel(captured_mob) - captured_mob = M - captured_mob.setDir(SOUTH) - captured_mob.moveToNullspace() - var/matrix/MX = matrix() - captured_mob.apply_transform(MX) - captured_mob.pixel_x = 16 - captured_mob.pixel_y = 16 - vis_contents += captured_mob - user.stop_pulling() // Automatically remove the grab - huggers_to_grow += huggers_per_corpse - update_icon() + . += SPAN_NOTICE("There are currently [current_hugger_count] facehuggers in the hive. The hive can support a total of [linked_hive.playable_hugger_limit] facehuggers at present.") + if(stored_huggers < huggers_to_grow_max) + . += SPAN_NOTICE("It'll grow another facehugger in [COOLDOWN_SECONDSLEFT(src, spawn_cooldown)] seconds.") + if(isxeno(user)) + var/mob/living/carbon/xenomorph/xeno = user + if(xeno.caste_type == XENO_CASTE_CARRIER) + . += SPAN_NOTICE("Using our Retrieve Egg ability, we can easily transfer our eggs into [src].") + +/obj/effect/alien/resin/special/eggmorph/attackby(obj/item/item, mob/user) + if(!isxeno(user)) return - if(istype(I, /obj/item/clothing/mask/facehugger)) - var/obj/item/clothing/mask/facehugger/F = I - if(F.stat != DEAD) - if(stored_huggers >= huggers_to_grow_max) + + if(istype(item, /obj/item/clothing/mask/facehugger)) + var/obj/item/clothing/mask/facehugger/hugger = item + if(hugger.stat != DEAD) + if(stored_huggers >= huggers_max_amount) to_chat(user, SPAN_XENOWARNING("\The [src] is full of children.")) return if(user) - visible_message(SPAN_XENOWARNING("[user] slides [F] back into \the [src]."), \ + visible_message(SPAN_XENOWARNING("[user] slides [hugger] back into \the [src]."), \ SPAN_XENONOTICE("You place the child back into \the [src].")) - user.temp_drop_inv_item(F) + user.temp_drop_inv_item(hugger) else - visible_message(SPAN_XENOWARNING("[F] crawls back into \the [src]!")) - stored_huggers = min(huggers_to_grow_max, stored_huggers + 1) - qdel(F) + visible_message(SPAN_XENOWARNING("[hugger] crawls back into \the [src]!")) + stored_huggers = min(huggers_max_amount, stored_huggers + 1) + qdel(hugger) else to_chat(user, SPAN_XENOWARNING("This child is dead.")) return + //refill egg morpher from an egg - if(istype(I, /obj/item/xeno_egg)) - var/obj/item/xeno_egg/egg = I - if(stored_huggers >= huggers_to_grow_max) + if(istype(item, /obj/item/xeno_egg)) + var/obj/item/xeno_egg/egg = item + if(stored_huggers >= huggers_max_amount) to_chat(user, SPAN_XENOWARNING("\The [src] is full of children.")) return if(user) visible_message(SPAN_XENOWARNING("[user] slides a facehugger out of \the [egg] into \the [src]."), \ SPAN_XENONOTICE("You place the child from an egg into \the [src].")) user.temp_drop_inv_item(egg) - stored_huggers = min(huggers_to_grow_max, stored_huggers + 1) + stored_huggers = min(huggers_max_amount, stored_huggers + 1) playsound(src.loc, "sound/effects/alien_egg_move.ogg", 25) qdel(egg) return - return ..(I, user) + + return ..(item, user) /obj/effect/alien/resin/special/eggmorph/update_icon() ..() appearance_flags |= KEEP_TOGETHER overlays.Cut() underlays.Cut() - if(captured_mob) - var/image/J = new(icon = icon, icon_state = "[icon_state]", layer = captured_mob.layer + 0.1) - overlays += J - var/image/I = new(icon = icon, icon_state = "[icon_state]_overlay", layer = captured_mob.layer + 0.2) - overlays += I underlays += "[icon_state]_underlay" /obj/effect/alien/resin/special/eggmorph/process() check_facehugger_target() - if(!linked_hive || !captured_mob || world.time < (last_spawned + spawn_cooldown)) + if(!linked_hive || !COOLDOWN_FINISHED(src, spawn_cooldown) || stored_huggers == huggers_to_grow_max) return - last_spawned = world.time - if(huggers_to_grow > 0) - huggers_to_grow-- + COOLDOWN_START(src, spawn_cooldown, get_egg_cooldown()) + if(stored_huggers < huggers_to_grow_max) stored_huggers = min(huggers_to_grow_max, stored_huggers + 1) - if(huggers_to_grow <= 0) - visible_message(SPAN_DANGER("\The [src] groans as its contents are reduced to nothing!")) - vis_contents.Cut() - - for(var/atom/movable/A in captured_mob.contents_recursive()) // Get rid of any intel objects so we don't delete them - if(isitem(A)) - var/obj/item/item = A - if(item.is_objective && item.unacidable) - item.forceMove(get_step(loc, pick(GLOB.alldirs))) - item.mouse_opacity = initial(item.mouse_opacity) - - QDEL_NULL(captured_mob) - update_icon() /obj/effect/alien/resin/special/eggmorph/proc/check_facehugger_target() if(!range_bounds) @@ -191,6 +148,10 @@ if(!linked_hive || (M.hivenumber != linked_hive.hivenumber)) return ..(M) if(stored_huggers) + //this way another hugger doesn't immediately spawn after we pick one up + if(stored_huggers == huggers_to_grow_max) + COOLDOWN_START(src, spawn_cooldown, get_egg_cooldown()) + to_chat(M, SPAN_XENONOTICE("You retrieve a child.")) stored_huggers = max(0, stored_huggers - 1) var/obj/item/clothing/mask/facehugger/hugger = new(loc, linked_hive.hivenumber) @@ -202,6 +163,11 @@ . = ..() //Do a view printout as needed just in case the observer doesn't want to join as a Hugger but wants info join_as_facehugger_from_this(user) +/obj/effect/alien/resin/special/eggmorph/proc/get_egg_cooldown() + if(linked_hive?.living_xeno_queen?.ovipositor) + return spawn_cooldown_length_ovi + return spawn_cooldown_length + /obj/effect/alien/resin/special/eggmorph/proc/join_as_facehugger_from_this(mob/dead/observer/user) if(stored_huggers <= huggers_reserved) to_chat(user, SPAN_WARNING("\The [src] doesn't have any facehuggers to inhabit.")) @@ -228,7 +194,7 @@ to_chat(usr, SPAN_WARNING("This belongs to another Hive! Yuck!")) return - morpher.huggers_reserved = tgui_input_number(usr, "How many facehuggers would you like to keep safe from Observers wanting to join as facehuggers?", "How many to reserve?", 0, morpher.huggers_to_grow_max, morpher.huggers_reserved) + morpher.huggers_reserved = tgui_input_number(usr, "How many facehuggers would you like to keep safe from Observers wanting to join as facehuggers?", "How many to reserve?", 0, morpher.huggers_max_amount, morpher.huggers_reserved) to_chat(usr, SPAN_XENONOTICE("You reserved [morpher.huggers_reserved] facehuggers for your sisters.")) diff --git a/code/modules/cm_aliens/structures/special/pylon_core.dm b/code/modules/cm_aliens/structures/special/pylon_core.dm index 6276215cf025..327b89083147 100644 --- a/code/modules/cm_aliens/structures/special/pylon_core.dm +++ b/code/modules/cm_aliens/structures/special/pylon_core.dm @@ -28,6 +28,13 @@ plane = FLOOR_PLANE +/obj/effect/alien/resin/special/pylon/endgame/update_icon() + if(protection_level == TURF_PROTECTION_OB) + icon_state = "pylon_active" + return + + icon_state = "pylon" + /obj/effect/alien/resin/special/pylon/Initialize(mapload, hive_ref) . = ..() @@ -142,16 +149,22 @@ /obj/effect/alien/resin/special/pylon/endgame cover_range = WEED_RANGE_CORE + protection_level = TURF_PROTECTION_CAS var/activated = FALSE +/obj/effect/alien/resin/special/pylon/endgame/Initialize(mapload, mob/builder) + . = ..() + LAZYADD(linked_hive.active_endgame_pylons, src) + /obj/effect/alien/resin/special/pylon/endgame/Destroy() + LAZYREMOVE(linked_hive.active_endgame_pylons, src) if(activated) activated = FALSE if(hijack_delete) return ..() - marine_announcement("ALERT.\n\nEnergy build up around communication relay at [get_area(src)] halted.", "[MAIN_AI_SYSTEM] Biological Scanner") + marine_announcement("ALERT.\n\nEnergy build up around communication relay at [get_area_name(src)] halted.", "[MAIN_AI_SYSTEM] Biological Scanner") for(var/hivenumber in GLOB.hive_datum) var/datum/hive_status/checked_hive = GLOB.hive_datum[hivenumber] @@ -159,15 +172,15 @@ continue if(checked_hive == linked_hive) - xeno_announcement(SPAN_XENOANNOUNCE("We have lost our control of the tall's communication relay at [get_area(src)]."), hivenumber, XENO_GENERAL_ANNOUNCE) + xeno_announcement(SPAN_XENOANNOUNCE("We have lost our control of the tall's communication relay at [get_area_name(src)]."), hivenumber, XENO_GENERAL_ANNOUNCE) else - xeno_announcement(SPAN_XENOANNOUNCE("Another hive has lost control of the tall's communication relay at [get_area(src)]."), hivenumber, XENO_GENERAL_ANNOUNCE) + xeno_announcement(SPAN_XENOANNOUNCE("Another hive has lost control of the tall's communication relay at [get_area_name(src)]."), hivenumber, XENO_GENERAL_ANNOUNCE) linked_hive.hive_ui.update_pylon_status() return ..() /// Checks if all comms towers are connected and then starts end game content on all pylons if they are /obj/effect/alien/resin/special/pylon/endgame/proc/comms_relay_connection() - marine_announcement("ALERT.\n\nIrregular build up of energy around communication relays at [get_area(src)], biological hazard detected.\n\nDANGER: Hazard is generating new xenomorph entities, advise urgent termination of hazard by ground forces.", "[MAIN_AI_SYSTEM] Biological Scanner") + marine_announcement("ALERT.\n\nIrregular build up of energy around communication relays at [get_area_name(src)], biological hazard detected.\n\nDANGER: Hazard is strengthening xenomorphs, advise urgent termination of hazard by ground forces.", "[MAIN_AI_SYSTEM] Biological Scanner") for(var/hivenumber in GLOB.hive_datum) var/datum/hive_status/checked_hive = GLOB.hive_datum[hivenumber] @@ -175,28 +188,26 @@ continue if(checked_hive == linked_hive) - xeno_announcement(SPAN_XENOANNOUNCE("We have harnessed the tall's communication relay at [get_area(src)].\n\nWe will now grow our numbers from this pylon. Hold it!"), hivenumber, XENO_GENERAL_ANNOUNCE) + xeno_announcement(SPAN_XENOANNOUNCE("We have harnessed the tall's communication relay at [get_area_name(src)].\n\nWe will now grow royal resin from this pylon. Hold it!"), hivenumber, XENO_GENERAL_ANNOUNCE) else - xeno_announcement(SPAN_XENOANNOUNCE("Another hive has harnessed the tall's communication relay at [get_area(src)].[linked_hive.faction_is_ally(checked_hive.name) ? "" : " Stop them!"]"), hivenumber, XENO_GENERAL_ANNOUNCE) + xeno_announcement(SPAN_XENOANNOUNCE("Another hive has harnessed the tall's communication relay at [get_area_name(src)].[linked_hive.faction_is_ally(checked_hive.name) ? "" : " Stop them!"]"), hivenumber, XENO_GENERAL_ANNOUNCE) activated = TRUE linked_hive.check_if_hit_larva_from_pylon_limit() - addtimer(CALLBACK(src, PROC_REF(give_larva)), XENO_PYLON_ACTIVATION_COOLDOWN, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_LOOP|TIMER_DELETE_ME) + addtimer(CALLBACK(src, PROC_REF(give_royal_resin)), XENO_PYLON_ACTIVATION_COOLDOWN, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_LOOP|TIMER_DELETE_ME) /// Looped proc via timer to give larva after time -/obj/effect/alien/resin/special/pylon/endgame/proc/give_larva() +/obj/effect/alien/resin/special/pylon/endgame/proc/give_royal_resin() if(!activated) return if(!linked_hive.hive_location || !linked_hive.living_xeno_queen) return - if(linked_hive.check_if_hit_larva_from_pylon_limit()) - return + if(linked_hive.buff_points < linked_hive.max_buff_points) + linked_hive.buff_points += 1 - linked_hive.partial_larva += (linked_hive.get_real_total_xeno_count() + linked_hive.stored_larva) * LARVA_ADDITION_MULTIPLIER - linked_hive.convert_partial_larva_to_full_larva() - linked_hive.hive_ui.update_burrowed_larva() + linked_hive.check_if_hit_larva_from_pylon_limit() //Hive Core - Generates strong weeds, supports other buildings /obj/effect/alien/resin/special/pylon/core diff --git a/code/modules/cm_aliens/weeds.dm b/code/modules/cm_aliens/weeds.dm index dd19b3d992f1..32c0ba3dd809 100644 --- a/code/modules/cm_aliens/weeds.dm +++ b/code/modules/cm_aliens/weeds.dm @@ -86,6 +86,10 @@ if(hivenumber == XENO_HIVE_NORMAL) RegisterSignal(SSdcs, COMSIG_GLOB_GROUNDSIDE_FORSAKEN_HANDLING, PROC_REF(forsaken_handling)) + var/area/area = get_area(src) + if(area && area.linked_lz) + AddComponent(/datum/component/resin_cleanup) + /obj/effect/alien/weeds/proc/set_turf_weeded(datum/source, turf/T) SIGNAL_HANDLER if(weeded_turf) diff --git a/code/modules/cm_marines/Donator_Kits.dm b/code/modules/cm_marines/Donator_Kits.dm deleted file mode 100644 index b0c9ec51e946..000000000000 --- a/code/modules/cm_marines/Donator_Kits.dm +++ /dev/null @@ -1,589 +0,0 @@ -/obj/item/storage/box/donator_kit - name = "donated box" - desc = "A cardboard box stamped with a dollar sign and filled with trinkets. Appears to have been donated by a wealthy sponsor." - icon = 'icons/obj/items/storage/kits.dmi' - icon_state = "donator_kit" - item_state = "giftbag" - var/list/donor_gear = list() - var/donor_key = "GENERIC" //Key the kit is assigned to. If GENERIC, not tied to particular donor. - var/kit_variant - max_w_class = SIZE_TINY - -/obj/item/storage/box/donator_kit/New() - if(kit_variant) - name = "[name] ([kit_variant])" - ..() - -/obj/item/storage/box/donator_kit/fill_preset_inventory() - for(var/donor_item in donor_gear) - new donor_item(src) - -/obj/item/storage/box/donator_kit/open(mob/user) - if((donor_key != "GENERIC") && (donor_key != user.ckey)) - to_chat(user, SPAN_BOLDWARNING("You cannot open a donator kit you do not own!")) - return FALSE - ..() - -/obj/item/storage/box/donator_kit/verb/destroy_kit() - set name = "Destroy Kit" - set category = "Object" - set src in oview(1) - - var/mob/user = usr - - if((donor_key != "GENERIC") && (donor_key != user.ckey)) - to_chat(user, SPAN_BOLDWARNING("You cannot destroy a donator kit you do not own!")) - return FALSE - - log_admin("[key_name(user)] deleted a donator kit.") - qdel(src) - -/obj/item/storage/box/donator_kit/generic_omega //Generic set given to various donors - kit_variant = "Team Omega (G)" - donor_gear = list( - /obj/item/clothing/under/marine/fluff/standard_jumpsuit, - /obj/item/clothing/suit/storage/marine/fluff/standard_armor, - /obj/item/clothing/head/helmet/marine/fluff/standard_helmet, - ) - -//Unless specified in comments as otherwise, subtype of box/donator_kit/ is CKEY of the donator (example: /obj/item/storage/box/donator_kit/sasoperative) -/obj/item/storage/box/donator_kit/adjective - donor_key = "adjective" - donor_gear = list(/obj/item/clothing/suit/storage/marine/fluff/adjective) - -/obj/item/storage/box/donator_kit/alexwarhammer - donor_key = "alexwarhammer" - donor_gear = list(/obj/item/clothing/glasses/fluff/alexwarhammer) - -/obj/item/storage/box/donator_kit/allan1234 - donor_key = "allan1234" - donor_gear = list(/obj/item/clothing/under/marine/fluff/allan1234) - -/obj/item/storage/box/donator_kit/arachnidnexus - donor_key = "arachnidnexus" - donor_gear = list(/obj/item/clothing/under/marine/fluff/arach) - -/obj/item/storage/box/donator_kit/bibblesless - donor_key = "bibblesless" - donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/bibblesless) - -/obj/item/storage/box/donator_kit/biolock - donor_key = "biolock" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/biolock, - /obj/item/clothing/suit/storage/marine/light/fluff/biolock, - ) - -/obj/item/storage/box/donator_kit/bunny232 - donor_key = "bunny232" - donor_gear = list(/obj/item/clothing/glasses/fluff/eyepatch) - -/obj/item/storage/box/donator_kit/bwoincognito - donor_key = "bwoincognito" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/bwoincognito, - /obj/item/clothing/suit/storage/marine/fluff/bwoincognito, - /obj/item/clothing/under/marine/fluff/bwoincognito, - ) - -/obj/item/storage/box/donator_kit/chris1464 - donor_key = "chris1464" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/chris1464, - /obj/item/clothing/suit/storage/marine/fluff/chris1464, - /obj/item/clothing/under/marine/fluff/chris1464, - ) - -/obj/item/storage/box/donator_kit/commandercookies - donor_key = "commandercookies" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/commandercookies, - /obj/item/clothing/suit/storage/marine/fluff/commandercookies, - ) - -/obj/item/storage/box/donator_kit/commissar //used by both ckeys 'hycinth' and 'technokat' - donor_key = "hycinth" - kit_variant = "Commissar" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/commissar, - /obj/item/clothing/suit/storage/marine/fluff/commissar, - /obj/item/clothing/under/marine/fluff/commissar, - /obj/item/storage/belt/marine/fluff/commissar, - ) - -/obj/item/storage/box/donator_kit/commissar/technokat - donor_key = "technokat" - -/obj/item/storage/box/donator_kit/crazyh206 - donor_key = "crazyh206" - donor_gear = list(/obj/item/clothing/suit/storage/marine/fluff/crazyh206) - -/obj/item/storage/box/donator_kit/devilzhand - donor_key = "devilzhand" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/devilzhand, - /obj/item/clothing/suit/storage/marine/fluff/devilzhand, - ) - -/obj/item/storage/box/donator_kit/dingledangle - donor_key = "dingledangle" - donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/dingledangle) - -/obj/item/storage/box/donator_kit/dinobubba7 - donor_key = "dinobubba7" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/dino, - /obj/item/clothing/suit/storage/marine/fluff/dino, - ) - -/obj/item/storage/box/donator_kit/docdemo - donor_key = "docdemo" - donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/goldtrimberet) - -/obj/item/storage/box/donator_kit/dudewithatude - donor_key = "dudewithatude" - donor_gear = list(/obj/item/clothing/suit/storage/marine/fluff/dudewithatude) - -/obj/item/storage/box/donator_kit/eastgermanstasi - donor_key = "eastgermanstasi" - donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/eastgerman) - -/obj/item/storage/box/donator_kit/edgelord - donor_key = "edgelord" - donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/edgelord) - -/obj/item/storage/box/donator_kit/eonoc - donor_key = "eonoc" - donor_gear = list(/obj/item/clothing/suit/storage/marine/fluff/eonoc) - -/obj/item/storage/box/donator_kit/fairedan - donor_key = "fairedan" - donor_gear = list( - /obj/item/clothing/suit/storage/marine/fluff/fairedan, - /obj/item/clothing/under/marine/fluff/fairedan, - ) - -/obj/item/storage/box/donator_kit/feodrich - donor_key = "feodrich" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/feodrich, - /obj/item/clothing/shoes/marine/fluff/feodrich, - /obj/item/clothing/suit/storage/marine/fluff/feodrich, - /obj/item/clothing/under/marine/fluff/feodrich, - ) - -/obj/item/storage/box/donator_kit/fernkiller - donor_key = "fernkiller" - donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/fernkiller) - -/obj/item/storage/box/donator_kit/feweh - donor_key = "feweh" - donor_gear = list( - /obj/item/clothing/mask/fluff/feweh, - /obj/item/clothing/suit/storage/marine/fluff/feweh, - /obj/item/clothing/under/marine/fluff/feweh, - ) - -/obj/item/storage/box/donator_kit/fickmacher_selena //ckey fickmacher has two sets - donor_key = "fickmacher" - kit_variant = "Selena" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/fickmacher, - /obj/item/clothing/suit/storage/marine/fluff/fickmacher, - /obj/item/clothing/under/marine/fluff/fickmacher, - ) - -/obj/item/storage/box/donator_kit/fickmacher_hart - donor_key = "fickmacher" - kit_variant = "Hart" - donor_gear = list( - /obj/item/clothing/mask/fluff/fickmacher2, - /obj/item/clothing/suit/storage/marine/fluff/fickmacher2, - /obj/item/clothing/under/marine/fluff/fickmacher2, - ) - -/obj/item/storage/box/donator_kit/fridrich - donor_key = "fridrich" - donor_gear = list(/obj/item/clothing/suit/storage/marine/fluff/fridrich) - -/obj/item/storage/box/donator_kit/ghostdex - donor_key = "ghostdex" - donor_gear = list( - /obj/item/clothing/mask/cigarette/fluff/ghostdex, - /obj/item/tool/lighter/zippo/fluff/ghostdex, - ) - -/obj/item/storage/box/donator_kit/graciegrace0 - donor_key = "graciegrace0" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/medicae_helmet, - /obj/item/clothing/suit/storage/marine/fluff/medicae_armor, - /obj/item/clothing/under/marine/fluff/medicae_jumpsuit, - ) - -/obj/item/storage/box/donator_kit/gromoi - donor_key = "gromoi" - donor_gear = list( - /obj/item/clothing/suit/storage/marine/fluff/gromi, - /obj/item/clothing/under/marine/fluff/gromi, - ) - -/obj/item/storage/box/donator_kit/haveatya - donor_key = "haveatya" - donor_gear = list( - /obj/item/clothing/glasses/fluff/haveatya, - /obj/item/clothing/head/helmet/marine/fluff/haveatya, - /obj/item/clothing/under/marine/fluff/turtleneck, //generic item - ) - -/obj/item/storage/box/donator_kit/jackmcintyre - donor_key = "jackmcintyre" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/jackmcintyre, - /obj/item/clothing/suit/storage/marine/fluff/jackmcintyre, - /obj/item/clothing/under/marine/fluff/jackmcintyre, - /obj/item/clothing/under/marine/fluff/jackmcintyre_alt, - ) - -/obj/item/storage/box/donator_kit/jdobbin49 - donor_key = "jdobbin49" - donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/jdobbin49) - -/obj/item/storage/box/donator_kit/jedijasun - donor_key = "jedijasun" - donor_gear = list(/obj/item/clothing/gloves/marine/fluff/jedijas) - -/obj/item/storage/box/donator_kit/johnkilla56 - donor_key = "johnkilla56" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/john56, - /obj/item/clothing/mask/fluff/john56, - /obj/item/clothing/suit/storage/marine/fluff/john56, - /obj/item/clothing/under/marine/fluff/john56, - ) - -/obj/item/storage/box/donator_kit/juninho77 - donor_key = "juninho77" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/juniho, - /obj/item/clothing/suit/storage/marine/fluff/juninho, - /obj/item/clothing/under/marine/fluff/juninho, - ) - -/obj/item/storage/box/donator_kit/kilinger - donor_key = "kilinger" - donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/goldshieldberet) - -/obj/item/storage/box/donator_kit/kyrac - donor_key = "kyrac" - donor_gear = list( - /obj/item/clothing/under/marine/fluff/turtleneck, - /obj/item/clothing/glasses/fluff/eyepatch, - ) - -/obj/item/storage/box/donator_kit/laser243 - donor_key = "laser243" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/laser243, - /obj/item/clothing/suit/storage/marine/fluff/laser243, - ) - -/obj/item/storage/box/donator_kit/leondark16 - donor_key = "leondark16" - donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/leondark) - -/obj/item/storage/box/donator_kit/lestatanderson - donor_key = "lestatanderson" - donor_gear = list(/obj/item/clothing/suit/storage/marine/fluff/cia) - -/obj/item/storage/box/donator_kit/limodish - donor_key = "limodish" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/limo, - /obj/item/clothing/mask/fluff/limo, - /obj/item/clothing/suit/storage/marine/fluff/limo, - /obj/item/clothing/under/marine/fluff/turtleneck, //generic item - ) - -/obj/item/storage/box/donator_kit/lostmixup - donor_key = "lostmixup" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/lostmixup, - /obj/item/clothing/mask/fluff/lostmixup, - /obj/item/clothing/suit/storage/marine/fluff/lostmixup, - ) - -/obj/item/storage/box/donator_kit/markvalentine - donor_key = "markvalentine" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/valentine, - /obj/item/clothing/suit/storage/marine/fluff/valentine, - /obj/item/clothing/under/marine/fluff/valentine, - ) - -/obj/item/storage/box/donator_kit/mitii - donor_key = "mitii" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/mitii, - /obj/item/clothing/suit/storage/marine/fluff/mitii, - /obj/item/storage/backpack/marine/fluff/mitii, - ) - -/obj/item/storage/box/donator_kit/mrbark45 - donor_key = "mrbark45" - donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/bark) - -/obj/item/storage/box/donator_kit/nickiskool - donor_key = "nickiskool" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/nickiskool, - /obj/item/clothing/suit/storage/marine/fluff/nickiskool, - /obj/item/clothing/under/marine/fluff/nickiskool, - ) - -/obj/item/storage/box/donator_kit/ningajai - donor_key = "ningajai" - donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/ningajai) - -/obj/item/storage/box/donator_kit/obeystylez - donor_key = "obeystylez" - donor_gear = list( - /obj/item/clothing/gloves/black/obey, - /obj/item/clothing/mask/fluff/balaclava, //generic item - /obj/item/clothing/suit/storage/marine/fluff/obey, - /obj/item/clothing/under/marine/fluff/turtleneck, //generic item - ) - -/obj/item/storage/box/donator_kit/officialjake - donor_key = "officialjake" - donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/officialjake) - -/obj/item/storage/box/donator_kit/oneonethreeeight - donor_key = "oneonethreeeight" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/oneonethreeeight, - /obj/item/clothing/suit/storage/marine/fluff/oneonethreeeight, - /obj/item/clothing/under/marine/fluff/oneonethreeeight, - ) - -/obj/item/storage/box/donator_kit/paradox1i7 - donor_key = "paradox1i7" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/paradox, - /obj/item/clothing/suit/storage/marine/fluff/paradox, - /obj/item/clothing/under/marine/fluff/paradox, - ) - -/obj/item/storage/box/donator_kit/poops_buttly - donor_key = "poops_buttly" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/kaila, - /obj/item/clothing/suit/storage/marine/fluff/kaila, - ) - -/obj/item/storage/box/donator_kit/radicalscorpion - donor_key = "radicalscorpion" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/radical, - /obj/item/clothing/mask/fluff/balaclava, //generic item - /obj/item/clothing/suit/storage/marine/fluff/radical, - /obj/item/clothing/under/marine/fluff/radical, - ) - -/obj/item/storage/box/donator_kit/robin63 - donor_key = "robin63" - donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/robin) - -/obj/item/storage/box/donator_kit/rogue1131 - donor_key = "rogue1131" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/titus, - /obj/item/clothing/suit/storage/marine/fluff/titus, - ) - -/obj/item/storage/box/donator_kit/sadokist - donor_key = "sadokist" - donor_gear = list( - /obj/item/clothing/glasses/fluff/sadokist, - /obj/item/clothing/head/helmet/marine/fluff/sadokist, - /obj/item/clothing/suit/storage/marine/fluff/sadokist, - /obj/item/storage/backpack/marine/fluff/sadokist, - ) - -/obj/item/storage/box/donator_kit/sailordave - donor_key = "sailordave" - donor_gear = list(/obj/item/clothing/under/marine/fluff/sailordave) - -/obj/item/storage/box/donator_kit/sasoperative_elite //sasoperative has several sets - donor_key = "sasoperative" - kit_variant = "Elite" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/sas_elite, - /obj/item/clothing/mask/fluff/sas_elite, - /obj/item/clothing/suit/storage/marine/fluff/sas_elite, - /obj/item/clothing/under/marine/fluff/sas_elite, - ) - -/obj/item/storage/box/donator_kit/sasoperative_juggernaut - donor_key = "sasoperative" - kit_variant = "Juggernaut" - donor_gear = list( - /obj/item/storage/backpack/marine/satchel/fluff/sas_juggernaut, - /obj/item/clothing/head/helmet/marine/fluff/sas_juggernaut, - /obj/item/clothing/suit/storage/marine/fluff/sas_juggernaut, - ) - -/obj/item/storage/box/donator_kit/sasoperative_legion - donor_key = "sasoperative" - kit_variant = "Legion" - donor_gear = list( - /obj/item/clothing/suit/storage/marine/light/fluff/sas_legion, - /obj/item/clothing/head/helmet/marine/fluff/sas_legion, - /obj/item/storage/backpack/marine/satchel/fluff/sas_legion, - ) - -/obj/item/storage/box/donator_kit/seloc_aferah - donor_key = "seloc_aferah" - donor_gear = list(/obj/item/clothing/head/helmet/marine/fluff/deejay) - -/obj/item/storage/box/donator_kit/starscream123 - donor_key = "starscream123" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/starscream, - /obj/item/clothing/mask/fluff/starscream, - /obj/item/clothing/suit/storage/marine/fluff/starscream, - /obj/item/clothing/under/marine/fluff/starscream, - ) - -/obj/item/storage/box/donator_kit/steelpoint - donor_key = "steelpoint" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/steelpoint, - /obj/item/clothing/shoes/marine/fluff/steelpoint, - /obj/item/clothing/suit/storage/marine/fluff/steelpoint, - /obj/item/clothing/under/marine/fluff/steelpoint, - ) - -/obj/item/storage/box/donator_kit/stobarico - donor_key = "stobarico" - donor_gear = list(/obj/item/clothing/suit/storage/marine/fluff/stobarico) - -/obj/item/storage/box/donator_kit/theflagbearer - donor_key = "theflagbearer" - donor_gear = list(/obj/item/clothing/under/marine/fluff/leeeverett) - -/obj/item/storage/box/donator_kit/theultimatechimera - donor_key = "theultimatechimera" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/chimera, - /obj/item/clothing/suit/storage/marine/fluff/chimera, - ) - -/obj/item/storage/box/donator_kit/tophatpenguin_wooki //ckey tophatpenguin has two sets - donor_key = "tophatpenguin" - kit_variant = "Wooki" - donor_gear = list( - /obj/item/clothing/suit/storage/marine/fluff/penguin, - /obj/item/clothing/under/marine/fluff/wooki, - /obj/item/clothing/head/helmet/marine/fluff/penguin, - ) - -/obj/item/storage/box/donator_kit/tophatpenguin_santa - donor_key = "tophatpenguin" - kit_variant = "Santa" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/santahat, - /obj/item/clothing/suit/storage/marine/fluff/santa, - ) - -/obj/item/storage/box/donator_kit/totalanarchy - donor_key = "totalanarchy" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/totalanarchy, - /obj/item/clothing/mask/fluff/totalanarchy, - /obj/item/clothing/suit/storage/marine/fluff/totalanarchy, - /obj/item/clothing/under/marine/fluff/totalanarchy, - ) - -/obj/item/storage/box/donator_kit/tranquill - donor_key = "tranquill" - donor_gear = list(/obj/item/clothing/suit/storage/marine/fluff/tranquill) - -/obj/item/storage/box/donator_kit/trblackdragon - donor_key = "trblackdragon" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/trblackdragon, - /obj/item/clothing/suit/storage/marine/fluff/trblackdragon, - ) - -/obj/item/storage/box/donator_kit/tristan63 - donor_key = "tristan63" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/tristan, - /obj/item/clothing/suit/storage/marine/fluff/tristan, - /obj/item/clothing/under/marine/fluff/tristan, - ) - -/obj/item/storage/box/donator_kit/tyran68 - donor_key = "tyran68" - donor_gear = list(/obj/item/clothing/suit/storage/marine/fluff/tyran) - -/obj/item/storage/box/donator_kit/shotgunbill - donor_key = "shotgunbill" - donor_gear = list(/obj/item/clothing/head/collectable/petehat) - -/obj/item/storage/box/donator_kit/vintagepalmer - donor_key = "vintagepalmer" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/vintage, - /obj/item/clothing/shoes/marine/fluff/vintage, - /obj/item/clothing/suit/storage/marine/fluff/vintage, - /obj/item/clothing/under/marine/fluff/vintage, - ) - -/obj/item/storage/box/donator_kit/whiteblood17 - donor_key = "whiteblood17" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/whiteblood17, - /obj/item/clothing/under/marine/fluff/whiteblood17, - ) - -/obj/item/storage/box/donator_kit/wrightthewrong - donor_key = "wrightthewrong" - donor_gear = list( - /obj/item/clothing/glasses/fluff/wright, - /obj/item/clothing/suit/storage/marine/fluff/wright, - /obj/item/clothing/under/marine/fluff/turtleneck, //generic item - ) - -/obj/item/storage/box/donator_kit/zegara - donor_key = "zegara" - donor_gear = list(/obj/item/clothing/suit/storage/marine/fluff/zegara) - -/obj/item/storage/box/donator_kit/zynax - donor_key = "zynax" - donor_gear = list( - /obj/item/clothing/mask/fluff/balaclava, //generic item - /obj/item/clothing/suit/storage/marine/fluff/Zynax, - /obj/item/clothing/under/marine/fluff/turtleneck, //generic item - /obj/item/clothing/under/marine/fluff/Zynax, - ) - -/obj/item/storage/box/donator_kit/mileswolfe - donor_key = "mileswolfe" - donor_gear = list(/obj/item/clothing/under/marine/fluff/mileswolfe) - -/obj/item/storage/box/donator_kit/killaninja12 - donor_key = "killaninja12" - donor_gear = list( - /obj/item/clothing/head/helmet/marine/fluff/killaninja12, - /obj/item/clothing/suit/storage/marine/fluff/killaninja12, - ) - -/obj/item/storage/box/donator_kit/noize - donor_key = "noize" - donor_gear = list(/obj/item/clothing/suit/storage/marine/fluff/forwardslashn) - -/obj/item/storage/box/donator_kit/deanthelis - donor_key = "deanthelis" - donor_gear = list(/obj/item/clothing/head/beret/marine/techofficer) diff --git a/code/modules/cm_marines/custom_items.dm b/code/modules/cm_marines/custom_items.dm new file mode 100644 index 000000000000..e86cdcf8ab54 --- /dev/null +++ b/code/modules/cm_marines/custom_items.dm @@ -0,0 +1,167 @@ +GLOBAL_LIST_INIT(donator_items, generate_donor_kits(FALSE)) +GLOBAL_LIST_INIT(random_personal_possessions, generate_random_possessions()) + +/proc/generate_donor_kits(assign_to_glob = TRUE) + . = list() + + var/list/custom_items = file2list("config/custom_items.txt") + for(var/current_line in custom_items) + if(!length(current_line)) //empty line + continue + if(copytext(current_line, 1, 2) == "#") //comment line + continue + + var/donor_key + var/list/kit_gear = list() + var/kit_name = "Default" + + var/split_line = splittext(current_line, ":") + + donor_key = ckey(trim(split_line[1])) + if(length(split_line) > 2) //if someone has multiple kits, name them + kit_name = trim(split_line[2]) + + for(var/current_item in splittext(split_line[length(split_line)], ",")) + var/current_path = text2path(trim(current_item)) + if(!current_path) + stack_trace("Missing typepath in Donator Gear. [donor_key] has an invalid typepath for [current_item].") + continue + kit_gear += current_path + + if(!length(kit_gear)) //shouldnt let them get empty kits + stack_trace("Missing gear in Donator Gear. [donor_key] has an empty Donator Kit.") + continue + + if(kit_name in .[donor_key]) //multiple kits with same name + stack_trace("Duplicate kit in Donator Gear. [donor_key] has multiple [kit_name] Donator Kits.") + continue + + .[donor_key] += list("[kit_name]" = kit_gear) + + if(assign_to_glob) + GLOB.donator_items = . + + return . + +/proc/generate_random_possessions() + . = list() + + for(var/datum/gear/current_gear as anything in subtypesof(/datum/gear)) + if(!initial(current_gear.display_name)) + continue + . += initial(current_gear.path) + + return . + +/obj/structure/machinery/personal_gear_vendor + name = "personal gear vendor" + desc = "A console that allows the user to retrieve their personal possessions from the ASRS." + icon = 'icons/obj/structures/machinery/computer.dmi' + icon_state = "cellconsole" + density = TRUE + unacidable = TRUE + unslashable = TRUE + ///assoc list of ckeys to list of kits redeemed + var/static/list/ckeys_redeemed_kits = list() + +/obj/structure/machinery/personal_gear_vendor/attack_hand(mob/living/user) + if(..()) + return TRUE + + if(!ishuman(user)) + return FALSE + + var/list/possible_kits = list() + if(user.ckey in GLOB.donator_items) + possible_kits += GLOB.donator_items[user.ckey] + + if(user.ckey in ckeys_redeemed_kits) + if(length(ckeys_redeemed_kits[user.ckey]) >= length(possible_kits)) + // They are a donator but have gotten everything + to_chat(user, SPAN_NOTICE("You have already retrieved your kit(s).")) + return TRUE + + if(length(possible_kits) == 0) //if no donor kit they can get something else + var/random_item_path = pick(GLOB.random_personal_possessions) + var/random_item = new random_item_path(get_turf(src)) + user.put_in_any_hand_if_possible(random_item) + to_chat(user, SPAN_NOTICE("You take [random_item] from [src].")) + LAZYADD(ckeys_redeemed_kits[user.ckey], random_item_path) + return TRUE + + // Remove any kits already grabbed + for(var/item in ckeys_redeemed_kits[user.ckey]) + possible_kits -= item + + if(length(possible_kits) == 1) + user.put_in_any_hand_if_possible(new /obj/item/storage/box/donator_kit(get_turf(src), user.ckey, possible_kits[possible_kits[1]])) + to_chat(user, SPAN_NOTICE("You retrieve your kit from [src].")) + LAZYADD(ckeys_redeemed_kits[user.ckey], possible_kits[1]) + return TRUE + + if(length(possible_kits) >= 2) + var/kit_choice = tgui_input_list(user, "Pick a kit to take:", "Donation Kit Selection", possible_kits) + if(!kit_choice) + to_chat(user, SPAN_NOTICE("You choose not to take any kits.")) + return TRUE + if(!user.Adjacent(src)) + to_chat(user, SPAN_NOTICE("You are too far from [src].")) + return TRUE + user.put_in_any_hand_if_possible(new /obj/item/storage/box/donator_kit(get_turf(src), user.ckey, possible_kits[kit_choice])) + to_chat(user, SPAN_NOTICE("You retrieve your kit from [src].")) + LAZYADD(ckeys_redeemed_kits[user.ckey], kit_choice) + return TRUE + +/obj/structure/machinery/personal_gear_vendor/attackby(obj/item/attacking_item, mob/user) + if(!istype(attacking_item, /obj/item/storage/box/donator_kit)) + return ..() + + var/obj/item/storage/box/donator_kit/kit = attacking_item + if(!kit.allowed(user)) + to_chat(user, SPAN_WARNING("[src] denies [kit].")) + return TRUE + to_chat(user, SPAN_NOTICE("You return [kit] to [src].")) + user.drop_held_item(kit) + kit.forceMove(src) + qdel(kit) + return TRUE + +/obj/item/storage/box/donator_kit + name = "personal gear kit" + desc = "A cardboard box stamped with a dollar sign and filled with trinkets. It contains someones personal possessions.." + icon = 'icons/obj/items/storage/kits.dmi' + icon_state = "donator_kit" + item_state = "giftbag" + max_w_class = SIZE_TINY + var/linked_ckey + +/obj/item/storage/box/donator_kit/get_examine_text(mob/user) + . = ..() + if(linked_ckey && user.ckey == linked_ckey) + . += SPAN_INFO("This kit can only be opened by you.") + . += SPAN_INFO("This kit can be deleted by returning it to the personal gear vendor.") + +/obj/item/storage/box/donator_kit/Initialize(mapload, owner_ckey, list/selected_kit) + . = ..() + if(owner_ckey) + linked_ckey = owner_ckey + + for(var/current_item in selected_kit) + new current_item(src) + +/obj/item/storage/box/donator_kit/open(mob/user) + if(!allowed(user)) + to_chat(user, SPAN_NOTICE("You do not have access to [src].")) + return + return ..() + +/obj/item/storage/box/donator_kit/empty(mob/user, turf/drop_to) + if(!allowed(user)) + to_chat(user, SPAN_NOTICE("You do not have access to [src].")) + return + return ..() + +/obj/item/storage/box/donator_kit/allowed(mob/user) + if(linked_ckey && user.ckey != linked_ckey) + return FALSE + return TRUE diff --git a/code/modules/cm_marines/dropship_ammo.dm b/code/modules/cm_marines/dropship_ammo.dm index 2504cd70e06a..c552c805d76a 100644 --- a/code/modules/cm_marines/dropship_ammo.dm +++ b/code/modules/cm_marines/dropship_ammo.dm @@ -38,6 +38,7 @@ /// Mob that fired this ammunition (the pilot pressing the trigger) var/mob/source_mob var/combat_equipment = TRUE + var/faction_exclusive //if this ammo is obtainable only by certain faction /obj/structure/ship_ammo/update_icon() . = ..() diff --git a/code/modules/cm_marines/dropship_equipment.dm b/code/modules/cm_marines/dropship_equipment.dm index 4d4ac93f5f24..8cd3a37e7d5d 100644 --- a/code/modules/cm_marines/dropship_equipment.dm +++ b/code/modules/cm_marines/dropship_equipment.dm @@ -20,6 +20,7 @@ var/point_cost = 0 //how many points it costs to build this with the fabricator, set to 0 if unbuildable. var/skill_required = SKILL_PILOT_TRAINED var/combat_equipment = TRUE + var/faction_exclusive //if null all factions can print it /obj/structure/dropship_equipment/Destroy() @@ -296,6 +297,11 @@ deployed_turret.linked_cam.network = list(CAMERA_NET_NORMANDY) else if (linked_shuttle.id == DROPSHIP_SAIPAN) deployed_turret.linked_cam.network = list(CAMERA_NET_SAIPAN) + else if (linked_shuttle.id == DROPSHIP_MORANA) + deployed_turret.linked_cam.network = list(CAMERA_NET_MORANA) + else if (linked_shuttle.id == DROPSHIP_DEVANA) + deployed_turret.linked_cam.network = list(CAMERA_NET_DEVANA) + /obj/structure/dropship_equipment/sentry_holder/proc/undeploy_sentry() @@ -698,9 +704,9 @@ break msg_admin_niche("[key_name(user)] is direct-firing [SA] onto [selected_target] at ([target_turf.x],[target_turf.y],[target_turf.z]) [ADMIN_JMP(target_turf)]") - if(ammo_travelling_time) + if(ammo_travelling_time && !istype(SA, /obj/structure/ship_ammo/rocket/thermobaric)) var/total_seconds = max(floor(ammo_travelling_time/10),1) - for(var/i = 0 to total_seconds) + for(var/i in 0 to total_seconds) sleep(10) if(!selected_target || !selected_target.loc)//if laser disappeared before we reached the target, ammo_accuracy_range++ //accuracy decreases @@ -710,6 +716,14 @@ var/list/possible_turfs = RANGE_TURFS(ammo_accuracy_range, target_turf) var/turf/impact = pick(possible_turfs) + + if(ammo_travelling_time && istype(SA, /obj/structure/ship_ammo/rocket/thermobaric)) + playsound(impact, ammo_warn_sound, ammo_warn_sound_volume, 1, 15) + var/total_seconds = max(floor(ammo_travelling_time / 10), 1) + for(var/i in 0 to total_seconds) + sleep(1 SECONDS) + new /obj/effect/overlay/temp/blinking_laser (impact) //no decreased accuracy if laser dissapears, it will land where it is telegraphed to land + if(ammo_warn_sound) playsound(impact, ammo_warn_sound, ammo_warn_sound_volume, 1,15) new /obj/effect/overlay/temp/blinking_laser (impact) @@ -833,6 +847,7 @@ bound_height = 32 equip_categories = list(DROPSHIP_CREW_WEAPON) //fits inside the central spot of the dropship point_cost = 200 + fire_mission_only = FALSE shorthand = "LCH" /obj/structure/dropship_equipment/weapon/launch_bay/update_equipment() @@ -857,6 +872,11 @@ var/medevac_cooldown var/busy_winch combat_equipment = FALSE + faction_exclusive = FACTION_MARINE + +/obj/structure/dropship_equipment/medevac_system/upp + name = "\improper RMU-4M Medevac System UPP" + faction_exclusive = FACTION_UPP /obj/structure/dropship_equipment/medevac_system/Destroy() if(linked_stretcher) @@ -875,7 +895,10 @@ /obj/structure/dropship_equipment/medevac_system/proc/get_targets() . = list() + for(var/obj/structure/bed/medevac_stretcher/MS in GLOB.activated_medevac_stretchers) + if(MS.faction != faction_exclusive) + continue var/area/AR = get_area(MS) var/evaccee_name var/evaccee_triagecard_color @@ -1140,6 +1163,11 @@ var/fulton_cooldown var/busy_winch combat_equipment = FALSE + faction_exclusive = FACTION_MARINE + +/obj/structure/dropship_equipment/fulton_system/upp + name = "\improper UPP RMU-19 Fulton Recovery System" + faction_exclusive = FACTION_UPP /obj/structure/dropship_equipment/fulton_system/update_equipment() if(ship_base) @@ -1216,13 +1244,15 @@ /obj/structure/dropship_equipment/fulton_system/proc/get_targets() . = list() - for(var/obj/item/stack/fulton/F in GLOB.deployed_fultons) + for(var/obj/item/stack/fulton/fulton in GLOB.deployed_fultons) + if(faction_exclusive != fulton.faction) + continue var/recovery_object - if(F.attached_atom) - recovery_object = F.attached_atom.name + if(fulton.attached_atom) + recovery_object = fulton.attached_atom.name else recovery_object = "Empty" - .["[recovery_object]"] = F + .["[recovery_object]"] = fulton /obj/structure/dropship_equipment/fulton_system/equipment_interact(mob/user) if(!can_fulton(user)) @@ -1238,17 +1268,17 @@ if(!fulton_choice) return - var/obj/item/stack/fulton/F = possible_fultons[fulton_choice] + var/obj/item/stack/fulton/fulton = possible_fultons[fulton_choice] if(!fulton_choice) return if(!ship_base) //system was uninstalled midway return - if(is_ground_level(F.z)) //in case the fulton popped during our input() + if(is_ground_level(fulton.z)) //in case the fulton popped during our input() return - if(!F.attached_atom) + if(!fulton.attached_atom) to_chat(user, SPAN_WARNING("This balloon stretcher is empty.")) return @@ -1269,7 +1299,7 @@ to_chat(user, SPAN_NOTICE(" You move your dropship above the selected balloon's beacon.")) - activate_winch(user, F) + activate_winch(user, fulton) /obj/structure/dropship_equipment/fulton_system/proc/activate_winch(mob/user, obj/item/stack/fulton/linked_fulton) set waitfor = 0 diff --git a/code/modules/cm_marines/equipment/kit_boxes.dm b/code/modules/cm_marines/equipment/kit_boxes.dm index 7be519896097..59009bc898e4 100644 --- a/code/modules/cm_marines/equipment/kit_boxes.dm +++ b/code/modules/cm_marines/equipment/kit_boxes.dm @@ -545,6 +545,34 @@ new /obj/item/device/binoculars/range/designator/spotter(src) new /obj/item/pamphlet/skill/spotter(src) +/obj/item/storage/box/kit/k9_handler/mp + name = "\improper Police K9 handler Kit" + desc = "Contains the equipment needed for a Police K9 Handler to perform their duties." + pro_case_overlay = "k9_handler" + +/obj/item/storage/box/kit/k9_handler/mp/fill_preset_inventory() + new /obj/item/device/k9_scanner(src) + new /obj/item/storage/firstaid/synth(src) + new /obj/item/device/helmet_visor/welding_visor(src) + new /obj/item/device/binoculars(src) + new /obj/item/pamphlet/skill/k9_handler(src) + new /obj/item/storage/box/evidence(src) + new /obj/item/restraint/handcuffs(src) + new /obj/item/reagent_container/spray/pepper(src) + +/obj/item/storage/box/kit/k9_handler/corpsman + name = "\improper Medical K9 handler Kit" + desc = "Contains the equipment needed for a Medical K9 Handler to perform their duties." + pro_case_overlay = "k9_handler" + +/obj/item/storage/box/kit/k9_handler/corpsman/fill_preset_inventory() + new /obj/item/device/k9_scanner(src) + new /obj/item/storage/firstaid/synth(src) + new /obj/item/device/helmet_visor/welding_visor(src) + new /obj/item/device/binoculars(src) + new /obj/item/pamphlet/skill/k9_handler(src) + new /obj/item/storage/pouch/autoinjector/full(src) + /obj/item/storage/box/kit/engineering_supply_kit name = "\improper Engineering Supply Kit" diff --git a/code/modules/cm_marines/equipment/mortar/mortars.dm b/code/modules/cm_marines/equipment/mortar/mortars.dm index 161be4813832..47140cd20412 100644 --- a/code/modules/cm_marines/equipment/mortar/mortars.dm +++ b/code/modules/cm_marines/equipment/mortar/mortars.dm @@ -365,6 +365,8 @@ SPAN_HIGHDANGER("A SHELL IS ABOUT TO IMPACT [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_VISIBLE, \ SPAN_HIGHDANGER("YOU HEAR SOMETHING VERY CLOSE COMING DOWN [SPAN_UNDERLINE(relative_dir ? uppertext(("TO YOUR " + dir2text(relative_dir))) : uppertext("right above you"))]!"), SHOW_MESSAGE_AUDIBLE \ ) + if(SSticker.mode && MODE_HAS_TOGGLEABLE_FLAG(MODE_MORTAR_LASER_WARNING)) + new /obj/effect/overlay/temp/blinking_laser(target) sleep(2 SECONDS) // Wait out the rest of the landing time target.ceiling_debris_check(2) if(!protected_by_pylon(TURF_PROTECTION_MORTAR, target)) diff --git a/code/modules/cm_marines/marines_consoles.dm b/code/modules/cm_marines/marines_consoles.dm index 778f3f4f18bf..191e35f078c6 100644 --- a/code/modules/cm_marines/marines_consoles.dm +++ b/code/modules/cm_marines/marines_consoles.dm @@ -969,6 +969,7 @@ GLOBAL_LIST_EMPTY_TYPED(crewmonitor, /datum/crewmonitor) JOB_CARGO_TECH = 61, JOB_MESS_SERGEANT = 62, // 70-139: SQUADS (look below) + JOB_SYNTH_K9 = 71, // 140+: Civilian/other JOB_CORPORATE_LIAISON = 140, JOB_PASSENGER = 141, diff --git a/code/modules/cm_marines/overwatch.dm b/code/modules/cm_marines/overwatch.dm index 84a27622959a..f283b3496d8e 100644 --- a/code/modules/cm_marines/overwatch.dm +++ b/code/modules/cm_marines/overwatch.dm @@ -26,27 +26,32 @@ var/marine_filter = list() // individual marine hiding control - list of string references var/marine_filter_enabled = TRUE var/faction = FACTION_MARINE + var/obj/structure/orbital_cannon/current_orbital_cannon var/datum/tacmap/tacmap var/minimap_type = MINIMAP_FLAG_USCM + var/list/possible_options = list("Blue" = "crtblue", "Green" = "crtgreen", "Yellow" = "crtyellow", "Red" = "crtred") + var/list/chosen_theme = list("Blue", "Green", "Yellow", "Red") + var/command_channel_key = ":v" + ///List of saved coordinates, format of ["x", "y", "comment"] var/list/saved_coordinates = list() ///Currently selected UI theme var/ui_theme = "crtblue" - /obj/structure/machinery/computer/overwatch/Initialize() . = ..() - - if (faction == FACTION_MARINE) + if(faction == FACTION_MARINE) + current_orbital_cannon = GLOB.almayer_orbital_cannon tacmap = new /datum/tacmap/drawing(src, minimap_type) else tacmap = new(src, minimap_type) // Non-drawing version /obj/structure/machinery/computer/overwatch/Destroy() QDEL_NULL(tacmap) + current_orbital_cannon = null return ..() /obj/structure/machinery/computer/overwatch/attackby(obj/I as obj, mob/user as mob) //Can't break or disassemble. @@ -81,10 +86,12 @@ if(!ishuman(user)) return ..() if(mods["alt"]) //Changing UI theme - var/list/possible_options = list("Blue"= "crtblue", "Green" = "crtgreen", "Yellow" = "crtyellow", "Red" = "crtred") - var/chosen_theme = tgui_input_list(user, "Choose a UI theme:", "UI Theme", list("Blue", "Green", "Yellow", "Red")) - if(possible_options[chosen_theme]) - ui_theme = possible_options[chosen_theme] + var/tgui_input_theme = tgui_input_list(user, "Choose a UI theme:", "UI Theme", chosen_theme) + if(!possible_options) + return + if(!possible_options[tgui_input_theme]) + return + ui_theme = possible_options[tgui_input_theme] return TRUE . = ..() @@ -107,25 +114,7 @@ ui = new(user, src, "OverwatchConsole", "Overwatch Console") ui.open() -/obj/structure/machinery/computer/overwatch/ui_data(mob/user) - var/list/data = list() - - data["theme"] = ui_theme - - if(!current_squad) - data["squad_list"] = list() - for(var/datum/squad/current_squad in GLOB.RoleAuthority.squads) - if(current_squad.active && !current_squad.overwatch_officer && current_squad.faction == faction && current_squad.name != "Root") - data["squad_list"] += current_squad.name - return data - - data["current_squad"] = current_squad.name - - data["primary_objective"] = current_squad.primary_objective - data["secondary_objective"] = current_squad.secondary_objective - - data["marines"] = list() - +/obj/structure/machinery/computer/overwatch/proc/count_marines(list/data) var/leader_count = 0 var/ftl_count = 0 var/spec_count = 0 @@ -236,7 +225,7 @@ switch(role) - if(JOB_SQUAD_LEADER) + if(JOB_SQUAD_LEADER, JOB_UPP_LEADER) leader_count++ if(mob_state != "Dead") leaders_alive++ @@ -244,7 +233,7 @@ ftl_count++ if(mob_state != "Dead") ftl_alive++ - if(JOB_SQUAD_SPECIALIST) + if(JOB_SQUAD_SPECIALIST, JOB_UPP_SPECIALIST) spec_count++ if(marine_human) var/obj/item/card/id/card = marine_human.get_idcard() @@ -259,11 +248,11 @@ specialist_type = "UNKNOWN" if(mob_state != "Dead") spec_alive++ - if(JOB_SQUAD_MEDIC) + if(JOB_SQUAD_MEDIC, JOB_UPP_MEDIC) medic_count++ if(mob_state != "Dead") medic_alive++ - if(JOB_SQUAD_ENGI) + if(JOB_SQUAD_ENGI, JOB_UPP_ENGI) engi_count++ if(mob_state != "Dead") engi_alive++ @@ -271,7 +260,7 @@ smart_count++ if(mob_state != "Dead") smart_alive++ - if(JOB_SQUAD_MARINE) + if(JOB_SQUAD_MARINE, JOB_UPP) marine_count++ if(mob_state != "Dead") marines_alive++ @@ -299,6 +288,28 @@ data["engi_alive"] = engi_alive data["smart_alive"] = smart_alive data["specialist_type"] = specialist_type ? specialist_type : "NONE" + return data + +/obj/structure/machinery/computer/overwatch/ui_data(mob/user) + var/list/data = list() + + data["theme"] = ui_theme + + if(!current_squad) + data["squad_list"] = list() + for(var/datum/squad/current_squad in GLOB.RoleAuthority.squads) + if(current_squad.active && !current_squad.overwatch_officer && current_squad.faction == faction && current_squad.name != "Root") + data["squad_list"] += current_squad.name + return data + + data["current_squad"] = current_squad.name + + data["primary_objective"] = current_squad.primary_objective + data["secondary_objective"] = current_squad.secondary_objective + + data["marines"] = list() + + data = count_marines(data) data["z_hidden"] = z_hidden @@ -313,10 +324,10 @@ has_supply_pad = TRUE data["can_launch_crates"] = has_supply_pad data["has_crate_loaded"] = supply_crate - data["can_launch_obs"] = GLOB.almayer_orbital_cannon - if(GLOB.almayer_orbital_cannon) - data["ob_cooldown"] = COOLDOWN_TIMELEFT(GLOB.almayer_orbital_cannon, ob_firing_cooldown) - data["ob_loaded"] = GLOB.almayer_orbital_cannon.chambered_tray + data["can_launch_obs"] = current_orbital_cannon + if(current_orbital_cannon) + data["ob_cooldown"] = COOLDOWN_TIMELEFT(current_orbital_cannon, ob_firing_cooldown) + data["ob_loaded"] = current_orbital_cannon.chambered_tray data["supply_cooldown"] = COOLDOWN_TIMELEFT(current_squad, next_supplydrop) data["operator"] = operator.name @@ -454,10 +465,10 @@ return x_bomb = text2num(params["x"]) y_bomb = text2num(params["y"]) - if(GLOB.almayer_orbital_cannon.is_disabled) + if(current_orbital_cannon.is_disabled) to_chat(user, "[icon2html(src, usr)] [SPAN_WARNING("Orbital bombardment cannon disabled!")]") - else if(!COOLDOWN_FINISHED(GLOB.almayer_orbital_cannon, ob_firing_cooldown)) - to_chat(user, "[icon2html(src, usr)] [SPAN_WARNING("Orbital bombardment cannon not yet ready to fire again! Please wait [COOLDOWN_TIMELEFT(GLOB.almayer_orbital_cannon, ob_firing_cooldown)/10] seconds.")]") + else if(!COOLDOWN_FINISHED(current_orbital_cannon, ob_firing_cooldown)) + to_chat(user, "[icon2html(src, usr)] [SPAN_WARNING("Orbital bombardment cannon not yet ready to fire again! Please wait [COOLDOWN_TIMELEFT(current_orbital_cannon, ob_firing_cooldown)/10] seconds.")]") else handle_bombard(user) @@ -561,7 +572,7 @@ current_squad.send_message("Attention: A new Squad Leader has been set: [selected_sl.real_name].") visible_message("[icon2html(src, viewers(src))] [SPAN_BOLDNOTICE("[selected_sl.real_name] is the new Squad Leader of squad '[current_squad]'! Logging to enlistment file.")]") - to_chat(selected_sl, "[icon2html(src, selected_sl)] Overwatch: You've been promoted to \'[selected_sl.job == JOB_SQUAD_LEADER ? "SQUAD LEADER" : "ACTING SQUAD LEADER"]\' for [current_squad.name]. Your headset has access to the command channel (:v).") + to_chat(selected_sl, "[icon2html(src, selected_sl)] Overwatch: You've been promoted to \'[selected_sl.job == JOB_SQUAD_LEADER ? "SQUAD LEADER" : "ACTING SQUAD LEADER"]\' for [current_squad.name]. Your headset has access to the command channel ([command_channel_key]).") to_chat(user, "[icon2html(src, usr)] [selected_sl.real_name] is [current_squad]'s new leader!") if(selected_sl.assigned_fireteam) @@ -582,13 +593,23 @@ selected_sl.comm_title = "aSL" ADD_TRAIT(selected_sl, TRAIT_LEADERSHIP, TRAIT_SOURCE_SQUAD_LEADER) - var/obj/item/device/radio/headset/almayer/marine/sl_headset = selected_sl.get_type_in_ears(/obj/item/device/radio/headset/almayer/marine) + var/obj/item/device/radio/headset/sl_headset = selected_sl.get_type_in_ears(/obj/item/device/radio/headset/almayer/marine) + switch(faction) + if (FACTION_UPP) + sl_headset = selected_sl.get_type_in_ears(/obj/item/device/radio/headset/distress/UPP) + if(sl_headset) - sl_headset.keys += new /obj/item/device/encryptionkey/squadlead/acting(sl_headset) + switch(faction) + if (FACTION_UPP) + sl_headset.keys += new /obj/item/device/encryptionkey/upp/command/acting(sl_headset) + else + sl_headset.keys += new /obj/item/device/encryptionkey/squadlead/acting(sl_headset) sl_headset.recalculateChannels() var/obj/item/card/id/card = selected_sl.get_idcard() if(card) - card.access += ACCESS_MARINE_LEADER + switch(faction) + if (FACTION_MARINE) + card.access += ACCESS_MARINE_LEADER selected_sl.hud_set_squad() selected_sl.update_inv_head() //updating marine helmet leader overlays selected_sl.update_inv_wear_suit() @@ -629,7 +650,7 @@ var/area/ob_area = get_area(target) if(!ob_area) return - var/ob_type = GLOB.almayer_orbital_cannon.tray.warhead ? GLOB.almayer_orbital_cannon.tray.warhead.warhead_kind : "UNKNOWN" + var/ob_type = current_orbital_cannon.tray.warhead ? current_orbital_cannon.tray.warhead.warhead_kind : "UNKNOWN" for(var/datum/squad/S in GLOB.RoleAuthority.squads) if(!S.active) @@ -744,7 +765,7 @@ to_chat(user, "[icon2html(src, user)] [SPAN_WARNING("No squad selected!")]") return - if(!GLOB.almayer_orbital_cannon.chambered_tray) + if(!current_orbital_cannon.chambered_tray) to_chat(user, "[icon2html(src, user)] [SPAN_WARNING("The orbital cannon has no ammo chambered.")]") return @@ -794,8 +815,8 @@ if(!T) return - var/ob_name = lowertext(GLOB.almayer_orbital_cannon.tray.warhead.name) - var/mutable_appearance/warhead_appearance = mutable_appearance(GLOB.almayer_orbital_cannon.tray.warhead.icon, GLOB.almayer_orbital_cannon.tray.warhead.icon_state) + var/ob_name = lowertext(current_orbital_cannon.tray.warhead.name) + var/mutable_appearance/warhead_appearance = mutable_appearance(current_orbital_cannon.tray.warhead.icon, current_orbital_cannon.tray.warhead.icon_state) notify_ghosts(header = "Bombardment Inbound", message = "\A [ob_name] targeting [get_area(T)] has been fired!", source = T, alert_overlay = warhead_appearance, extra_large = TRUE) /// Project ARES interface log. @@ -803,7 +824,7 @@ busy = FALSE if(istype(T)) - GLOB.almayer_orbital_cannon.fire_ob_cannon(T, user, current_squad) + current_orbital_cannon.fire_ob_cannon(T, user, current_squad) user.count_niche_stat(STATISTICS_NICHE_OB) /obj/structure/machinery/computer/overwatch/proc/handle_supplydrop() @@ -878,6 +899,12 @@ faction = FACTION_CLF /obj/structure/machinery/computer/overwatch/upp faction = FACTION_UPP + minimap_type = MINIMAP_FLAG_UPP + command_channel_key = "#v" + ui_theme = "crtupp" + possible_options = list("UPP" = "crtupp", "Green" = "crtgreen", "Yellow" = "crtyellow", "Red" = "crtred") + chosen_theme = list("UPP", "Green", "Yellow", "Red") + /obj/structure/machinery/computer/overwatch/pmc faction = FACTION_PMC /obj/structure/machinery/computer/overwatch/twe @@ -904,9 +931,19 @@ /obj/structure/supply_drop/Initialize(mapload, ...) . = ..() GLOB.supply_drop_list += src + for(var/datum/squad/glob_squad in GLOB.RoleAuthority.squads) + if(squad == glob_squad.name) + if(glob_squad.drop_pad) + return + else + glob_squad.drop_pad = src + return /obj/structure/supply_drop/Destroy() GLOB.supply_drop_list -= src + for(var/datum/squad/glob_squad in GLOB.RoleAuthority.squads) + if(squad == glob_squad.name) + glob_squad.drop_pad = null return ..() /obj/structure/supply_drop/alpha @@ -929,6 +966,24 @@ icon_state = "echodrop" squad = SQUAD_MARINE_5 +//======UPP======= + +/obj/structure/supply_drop/upp1 + icon_state = "alphadrop" + squad = SQUAD_UPP_1 + +/obj/structure/supply_drop/upp2 + icon_state = "bravodrop" + squad = SQUAD_UPP_2 + +/obj/structure/supply_drop/upp3 + icon_state = "charliedrop" + squad = SQUAD_UPP_3 + +/obj/structure/supply_drop/upp4 + icon_state = "deltadrop" + squad = SQUAD_UPP_4 + #undef HIDE_ALMAYER #undef HIDE_GROUND #undef HIDE_NONE diff --git a/code/modules/cm_marines/radar.dm b/code/modules/cm_marines/radar.dm index aa332d601395..f12f0e79d81c 100644 --- a/code/modules/cm_marines/radar.dm +++ b/code/modules/cm_marines/radar.dm @@ -235,3 +235,33 @@ if(uniform.has_sensor && uniform.sensor_mode >= SENSOR_MODE_LOCATION) // Suit sensors must be on maximum return TRUE return FALSE + + +//Synthetic K9 Scent Tracking, allows K9s to track CLF, UPP, etc as well as Preds... optic camo can't hide the fact you stink! +/datum/radar/scenttracker/find_atom() + return locate(selected) in GLOB.human_mob_list + +/datum/radar/scenttracker/scan() + . = ..() + objects = list() + for(var/mob/living/carbon/human/humanoid as anything in GLOB.human_mob_list) + var/crewmember_name = "Unknown" + var/crewmember_rank = "Unknown" + if(humanoid.get_idcard()) + var/obj/item/card/id/ID = humanoid.get_idcard() + if(ID?.registered_name) + crewmember_name = ID.registered_name + if(ID?.assignment) + crewmember_rank = ID.assignment + switch(humanoid.stat) + if(CONSCIOUS) + crewmember_name = "[crewmember_name] ([crewmember_rank]) (Conscious)" + if(UNCONSCIOUS) + crewmember_name = "[crewmember_name] ([crewmember_rank]) (Unconscious)" + if(DEAD) + crewmember_name = "[crewmember_name] ([crewmember_rank]) (DEAD)" + var/list/crewinfo = list( + ref = REF(humanoid), + name = crewmember_name, + ) + objects += list(crewinfo) diff --git a/code/modules/cm_marines/vehicle_part_fabricator.dm b/code/modules/cm_marines/vehicle_part_fabricator.dm index 01e40029b79b..8049bcb411fd 100644 --- a/code/modules/cm_marines/vehicle_part_fabricator.dm +++ b/code/modules/cm_marines/vehicle_part_fabricator.dm @@ -12,6 +12,7 @@ var/generate_points = TRUE var/omnisentry_price_scale = 100 var/omnisentry_price = 300 + var/faction = FACTION_MARINE var/list/datum/build_queue_entry/build_queue = list() /datum/build_queue_entry @@ -26,7 +27,6 @@ . = ..() to_chat(user, build_queue ? "It has [length(build_queue)] items in the queue" : "the build queue is empty") - /obj/structure/machinery/part_fabricator/New() ..() start_processing() @@ -68,11 +68,11 @@ if(SSticker.current_state < GAME_STATE_PLAYING) return - process_build_queue() - if(generate_points) add_to_point_store() + process_build_queue() + update_icon() /obj/structure/machinery/part_fabricator/proc/process_build_queue() @@ -86,11 +86,23 @@ busy = TRUE var/datum/build_queue_entry/entry = build_queue[1] - if(ispath(entry.item, /obj/structure/ship_ammo/sentry)) + var/is_omnisentry = ispath(entry.item, /obj/structure/ship_ammo/sentry) + + if((is_omnisentry && get_point_store() < omnisentry_price) || get_point_store() < entry.cost) + if(!TIMER_COOLDOWN_CHECK(src, COOLDOWN_PRINTER_ERROR)) + balloon_alert_to_viewers("out of points - printing paused!") + visible_message(SPAN_WARNING("[src] flashes a warning light.")) + TIMER_COOLDOWN_START(src, COOLDOWN_PRINTER_ERROR, 20 SECONDS) + busy = FALSE + return + + if(is_omnisentry) + spend_point_store(omnisentry_price) omnisentry_price += omnisentry_price_scale + else + spend_point_store(entry.cost) visible_message(SPAN_NOTICE("[src] starts printing something.")) - spend_point_store(entry.cost) addtimer(CALLBACK(src, PROC_REF(produce_part), entry), 3 SECONDS) /obj/structure/machinery/part_fabricator/proc/build_part(part_type, cost, mob/user) @@ -128,36 +140,54 @@ var/index = params["index"] if(is_ammo == 0) - var/obj/structure/dropship_equipment/produce = (typesof(/obj/structure/dropship_equipment))[index] + var/produce_list = list() + var/possible_produce = typesof(/obj/structure/dropship_equipment) + for(var/p_produce in possible_produce) + var/obj/structure/dropship_equipment/produce = p_produce + if(produce.faction_exclusive) + if(produce.faction_exclusive != faction) + continue + produce_list += produce + var/obj/structure/dropship_equipment/produce = produce_list[index] if(SSticker.mode && MODE_HAS_TOGGLEABLE_FLAG(MODE_NO_COMBAT_CAS) && produce.combat_equipment) log_admin("Bad topic: [user] may be trying to HREF exploit [src] to bypass no combat cas") return cost = initial(produce.point_cost) build_part(produce, cost, user) - return + return TRUE else - var/obj/structure/ship_ammo/produce = (typesof(/obj/structure/ship_ammo))[index] + var/produce_list = list() + var/possible_produce = typesof(/obj/structure/ship_ammo) + for(var/p_produce in possible_produce) + var/obj/structure/dropship_equipment/produce = p_produce + if(produce.faction_exclusive) + if(produce.faction_exclusive != faction) + continue + produce_list += produce + var/obj/structure/dropship_equipment/produce = produce_list[index] if(SSticker.mode && MODE_HAS_TOGGLEABLE_FLAG(MODE_NO_COMBAT_CAS) && produce.combat_equipment) log_admin("Bad topic: [user] may be trying to HREF exploit [src] to bypass no combat cas") return cost = initial(produce.point_cost) build_part(produce, cost, user) - return + return TRUE if(action == "cancel") var/index = params["index"] if(length(build_queue)) - if(index == 1) + if(index == null || index > length(build_queue)) + return + + if(busy && index == 1) to_chat(user, SPAN_WARNING("Cannot cancel currently produced item.")) return var/datum/build_queue_entry/entry = build_queue[index] build_queue.Remove(entry) - add_to_point_store(entry.cost) - return + return TRUE else log_admin("Bad topic: [user] may be trying to HREF exploit [src]") @@ -193,6 +223,12 @@ unslashable = TRUE unacidable = TRUE + faction = FACTION_MARINE + +/obj/structure/machinery/part_fabricator/dropship/upp + name = "UPP dropship part fabricator" + faction = FACTION_UPP + req_access = list(ACCESS_UPP_FLIGHT) /obj/structure/machinery/part_fabricator/dropship/get_point_store() @@ -211,6 +247,10 @@ var/index = 1 for(var/build_type in typesof(/obj/structure/dropship_equipment)) var/obj/structure/dropship_equipment/dropship_equipment_data = build_type + if(dropship_equipment_data.faction_exclusive) + if(faction != dropship_equipment_data.faction_exclusive) + continue + if(SSticker.mode && MODE_HAS_TOGGLEABLE_FLAG(MODE_NO_COMBAT_CAS) && dropship_equipment_data.combat_equipment) index += 1 continue @@ -232,6 +272,9 @@ index = 1 for(var/build_type in typesof(/obj/structure/ship_ammo)) var/obj/structure/ship_ammo/ship_ammo_data = build_type + if(ship_ammo_data.faction_exclusive) + if(faction != ship_ammo_data.faction_exclusive) + continue if(SSticker.mode && MODE_HAS_TOGGLEABLE_FLAG(MODE_NO_COMBAT_CAS) && ship_ammo_data.combat_equipment) index = index + 1 continue diff --git a/code/modules/cm_phone/phone.dm b/code/modules/cm_phone/phone.dm index b600f9fb67cb..8d54e429ce52 100644 --- a/code/modules/cm_phone/phone.dm +++ b/code/modules/cm_phone/phone.dm @@ -605,6 +605,12 @@ GLOBAL_LIST_EMPTY_TYPED(transmitters, /obj/structure/transmitter) /obj/structure/transmitter/rotary/no_dnd do_not_disturb = PHONE_DND_FORBIDDEN +/obj/structure/transmitter/rotary/fax_responder + phone_category = "Comms Relay" + networks_receive = list("Fax Responders") + pixel_x = -6 + pixel_y = 6 + /obj/structure/transmitter/touchtone name = "touch-tone telephone" icon_state = "rotary_phone"//placeholder diff --git a/code/modules/cm_preds/yaut_actions.dm b/code/modules/cm_preds/yaut_actions.dm index 0894ea95adac..444d83097b39 100644 --- a/code/modules/cm_preds/yaut_actions.dm +++ b/code/modules/cm_preds/yaut_actions.dm @@ -15,6 +15,12 @@ ///If the action is currently on or in use var/active = FALSE +/datum/action/predator_action/remove_from(mob/user) + yautja = null + bracers = null + mask = null + . = ..() + /datum/action/predator_action/can_use_action() . = ..() if(!.) @@ -25,7 +31,7 @@ mask = null var/mob/living/carbon/human/mob = owner - if(!isyautja(mob)) + if(!ishuman(mob)) return FALSE if(mob.is_mob_incapacitated()) return FALSE @@ -90,16 +96,6 @@ . = ..() yautja.mark_panel() -/datum/action/predator_action/claim_equipment - name = "Claim Equipment" - action_icon_state = "claim_equipment" - listen_signal = COMSIG_KB_YAUTJA_PRED_BUY - active = PREDATOR_ACTION_ON_CLICK - -/datum/action/predator_action/claim_equipment/action_activate() - . = ..() - yautja.pred_buy() - //Actions that require wearing a mask /datum/action/predator_action/mask require_mask = TRUE @@ -155,13 +151,13 @@ require_bracers = TRUE /datum/action/predator_action/bracer/wristblade - name = "Toggle Wristblades" + name = "Use Bracer Attachments" action_icon_state = "wristblade" - listen_signal = COMSIG_KB_YAUTJA_WRISTBLADES + listen_signal = COMSIG_KB_YAUTJA_BRACER_ATTACHMENT /datum/action/predator_action/bracer/wristblade/action_activate() . = ..() - bracers.wristblades() + bracers.bracer_attachment() /datum/action/predator_action/bracer/chained name = "Yank Weapon" @@ -278,7 +274,7 @@ /datum/yautja_emote_panel/proc/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) - ui = new(user, src, "YautjaEmotes") + ui = new(user, src, "Emotes", "Yautja Audio Panel") ui.open() /datum/yautja_emote_panel/ui_data(mob/user) @@ -295,6 +291,7 @@ var/list/data = list() data["categories"] = yautja_categories + data["theme"] = "crtgreen" data["emotes"] = list() for(var/datum/emote/living/carbon/human/yautja/emote as anything in yautja_emotes) diff --git a/code/modules/cm_preds/yaut_bracers.dm b/code/modules/cm_preds/yaut_bracers.dm index 300c91801167..b5020894be5f 100644 --- a/code/modules/cm_preds/yaut_bracers.dm +++ b/code/modules/cm_preds/yaut_bracers.dm @@ -46,26 +46,29 @@ var/obj/item/clothing/gloves/yautja/linked_bracer //Bracer linked to this one (thrall or mentor). COOLDOWN_DECLARE(bracer_recharge) /// What minimap icon this bracer should have - var/minimap_icon = "predator" + var/minimap_icon /obj/item/clothing/gloves/yautja/equipped(mob/user, slot) . = ..() if(slot == WEAR_HANDS) START_PROCESSING(SSobj, src) - if(!owner) - owner = user + owner = user + if(isyautja(owner)) + minimap_icon = owner.assigned_equipment_preset?.minimap_icon toggle_lock_internal(user, TRUE) RegisterSignal(user, list(COMSIG_MOB_STAT_SET_ALIVE, COMSIG_MOB_DEATH), PROC_REF(update_minimap_icon)) INVOKE_NEXT_TICK(src, PROC_REF(update_minimap_icon), user) /obj/item/clothing/gloves/yautja/Destroy() STOP_PROCESSING(SSobj, src) + owner = null if(linked_bracer) linked_bracer.linked_bracer = null linked_bracer = null return ..() /obj/item/clothing/gloves/yautja/dropped(mob/user) + owner = null STOP_PROCESSING(SSobj, src) flags_item = initial(flags_item) UnregisterSignal(user, list(COMSIG_MOB_STAT_SET_ALIVE, COMSIG_MOB_DEATH)) @@ -130,9 +133,9 @@ SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, "bracer_stolen", 'icons/ui_icons/map_blips.dmi') else if(owner?.stat >= DEAD) - SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, minimap_icon, 'icons/ui_icons/map_blips.dmi', overlay_iconstates = list("undefibbable")) //defib/undefib status doesn't really matter because they're gonna explode in the end regardless + SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, human_owner.assigned_equipment_preset.minimap_icon,, 'icons/ui_icons/map_blips.dmi', overlay_iconstates = list("undefibbable")) //defib/undefib status doesn't really matter because they're gonna explode in the end regardless else - SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, minimap_icon, 'icons/ui_icons/map_blips.dmi') + SSminimaps.add_marker(owner, wearer_turf.z, MINIMAP_FLAG_YAUTJA, human_owner.assigned_equipment_preset.minimap_icon, 'icons/ui_icons/map_blips.dmi') /* *This is the main proc for checking AND draining the bracer energy. It must have human passed as an argument. *It can take a negative value in amount to restore energy. @@ -272,13 +275,20 @@ var/caster_deployed = FALSE var/obj/item/weapon/gun/energy/yautja/plasma_caster/caster - var/wristblades_deployed = FALSE - var/obj/item/weapon/wristblades/left_wristblades - var/obj/item/weapon/wristblades/right_wristblades + var/bracer_attachment_deployed = FALSE + var/obj/item/bracer_attachments/left_bracer_attachment + var/obj/item/bracer_attachments/right_bracer_attachment ///A list of all intrinsic bracer actions var/list/bracer_actions = list(/datum/action/predator_action/bracer/wristblade, /datum/action/predator_action/bracer/caster, /datum/action/predator_action/bracer/cloak, /datum/action/predator_action/bracer/thwei, /datum/action/predator_action/bracer/capsule, /datum/action/predator_action/bracer/translator, /datum/action/predator_action/bracer/self_destruct, /datum/action/predator_action/bracer/smartdisc) +/obj/item/clothing/gloves/yautja/hunter/get_examine_text(mob/user) + . = ..() + if(left_bracer_attachment) + . += SPAN_NOTICE("The left bracer attachment is [left_bracer_attachment.attached_weapon].") + if(right_bracer_attachment) + . += SPAN_NOTICE("The right bracer attachment is [right_bracer_attachment.attached_weapon].") + /obj/item/clothing/gloves/yautja/hunter/Initialize(mapload, new_translator_type, new_caster_material, new_owner_rank) . = ..() if(new_owner_rank) @@ -289,12 +299,10 @@ if(new_caster_material) caster_material = new_caster_material caster = new(src, FALSE, caster_material) - left_wristblades = new(src) - right_wristblades = new(src) /obj/item/clothing/gloves/yautja/hunter/emp_act(severity) . = ..() - charge = max(charge - (severity * 500), 0) + charge = max(charge - (1000/severity), 0) //someone made weaker emp have higer severity so we divide if(ishuman(loc)) var/mob/living/carbon/human/wearer = loc if(wearer.gloves == src) @@ -335,6 +343,8 @@ /obj/item/clothing/gloves/yautja/hunter/Destroy() QDEL_NULL(caster) QDEL_NULL(embedded_id) + QDEL_NULL(left_bracer_attachment) + QDEL_NULL(right_bracer_attachment) return ..() /obj/item/clothing/gloves/yautja/hunter/process() @@ -375,7 +385,7 @@ //we have options from 1 to 7, but we're giving the user a higher probability of being punished if they already rolled this bad switch(option) if(1) - . = wristblades_internal(caller, TRUE) + . = attachment_internal(caller, TRUE) if(2) . = track_gear_internal(caller, TRUE) if(3) @@ -388,6 +398,8 @@ . = call_disc_internal(caller, TRUE) if(7) . = translate_internal(caller, TRUE) + if(8) + . = remove_attachment_internal(caller, TRUE) else . = delimb_user(caller) @@ -407,15 +419,147 @@ playsound(user,'sound/weapons/wristblades_on.ogg', 15, 1) return TRUE -//Should put a cool menu here, like ninjas. -/obj/item/clothing/gloves/yautja/hunter/verb/wristblades() - set name = "Use Wrist Blades" - set desc = "Extend your wrist blades. They cannot be dropped, but can be retracted." +//bracer attachments +/obj/item/bracer_attachments + name = "wristblade bracer attachment" + desc = "Report this if you see this." + icon = 'icons/obj/items/hunter/pred_gear.dmi' + ///Typepath of the weapon attached to the bracer + var/obj/item/attached_weapon_type + ///Reference to the weapon attached to the bracer + var/obj/item/attached_weapon + ///Attachment deployment sound + var/deployment_sound + ///Attachment rectraction sound + var/retract_sound + +/obj/item/bracer_attachments/Initialize(mapload, ...) + . = ..() + if(attached_weapon_type) + attached_weapon = new attached_weapon_type(src) + +/obj/item/bracer_attachments/Destroy() + QDEL_NULL(attached_weapon) + . = ..() + +/obj/item/bracer_attachments/wristblades + name = "wristblade bracer attachment" + desc = "A pair of huge, serrated blades" + icon_state = "wrist" + item_state = "wristblade" + attached_weapon_type = /obj/item/weapon/bracer_attachment/wristblades + deployment_sound = 'sound/weapons/wristblades_on.ogg' + retract_sound = 'sound/weapons/wristblades_off.ogg' + +/obj/item/bracer_attachments/scimitars + name = "scimitar bracer attachment" + desc = "A pair of huge, serrated blades" + icon_state = "scim" + item_state = "scim" + attached_weapon_type = /obj/item/weapon/bracer_attachment/scimitar + deployment_sound = 'sound/weapons/scims_on.ogg' + retract_sound = 'sound/weapons/scims_off.ogg' + +/obj/item/bracer_attachments/scimitars_alt + name = "scimitar bracer attachment" + desc = "A pair of huge, serrated blades" + icon_state = "scim_alt" + item_state = "scim_alt" + attached_weapon_type = /obj/item/weapon/bracer_attachment/scimitar/alt + deployment_sound = 'sound/weapons/scims_alt_on.ogg' + retract_sound = 'sound/weapons/scims_alt_off.ogg' + +/obj/item/clothing/gloves/yautja/hunter/attackby(obj/item/attacking_item, mob/user) + if(!istype(attacking_item, /obj/item/bracer_attachments)) + return ..() + + if(!HAS_TRAIT(user, TRAIT_YAUTJA_TECH)) + to_chat(user, SPAN_WARNING("You do not know how to attach the [attacking_item] to the [src].")) + return + + var/obj/item/bracer_attachments/bracer_attachment = attacking_item + if(!bracer_attachment.attached_weapon_type) + CRASH("[key_name(user)] attempted to attach the [bracer_attachment] to the [src], with no valid attached_weapon.") + + if(left_bracer_attachment && right_bracer_attachment) + to_chat(user, SPAN_WARNING("You already have the maximum amount of bracer attachments on [src].")) + return + + var/attach_to_left = TRUE + if(!left_bracer_attachment && !right_bracer_attachment) + var/selected = tgui_alert(user, "Do you want to attach [bracer_attachment] to the left or right hand?", "[src]", list("Right", "Left"), 15 SECONDS) + if(!selected) + return + + if(selected == "Right") //its right, left because in-game itll show up as left, right + attach_to_left = FALSE + + if(attacking_item.loc != user) + to_chat(user, SPAN_WARNING("You cannot attach [attacking_item] without holding it.")) + return + + var/bracer_attached = FALSE + if(attach_to_left && !left_bracer_attachment) + left_bracer_attachment = bracer_attachment + user.drop_inv_item_to_loc(bracer_attachment, src) + bracer_attached = TRUE + if(!bracer_attached && !right_bracer_attachment) + right_bracer_attachment = bracer_attachment + user.drop_inv_item_to_loc(bracer_attachment, src) + + to_chat(user, SPAN_NOTICE("You attach [bracer_attachment] to [src].")) + playsound(loc, 'sound/weapons/pred_attach.ogg') + return ..() + +/obj/item/clothing/gloves/yautja/hunter/verb/remove_attachment() + set name = "Remove Bracer Attachment" + set desc = "Remove Bracer Attachment From Your Bracer." set category = "Yautja.Weapons" set src in usr - . = wristblades_internal(usr, FALSE) + return remove_attachment_internal(usr, TRUE) + +/obj/item/clothing/gloves/yautja/hunter/proc/remove_attachment_internal(mob/living/carbon/human/user, forced = FALSE) + if(!user.loc || user.is_mob_incapacitated() || !ishuman(user)) + return + + . = check_random_function(user, forced) + if(.) + return + + if(!left_bracer_attachment && !right_bracer_attachment) + to_chat(user, SPAN_WARNING("[src] has no attached bracers!")) + return + + if(bracer_attachment_deployed) + to_chat(user, SPAN_WARNING("Retract your attachments First!")) + return + + if(left_bracer_attachment) + if(!user.put_in_any_hand_if_possible(left_bracer_attachment)) + user.drop_inv_item_on_ground(left_bracer_attachment) + to_chat(user, SPAN_NOTICE("You remove [left_bracer_attachment] from [src].")) + playsound(src, 'sound/machines/click.ogg', 15, 1) + left_bracer_attachment = null -/obj/item/clothing/gloves/yautja/hunter/proc/wristblades_internal(mob/living/carbon/human/caller, forced = FALSE) + if(right_bracer_attachment) + if(!user.put_in_any_hand_if_possible(right_bracer_attachment)) + user.drop_inv_item_on_ground(right_bracer_attachment) + to_chat(user, SPAN_NOTICE("You remove [right_bracer_attachment] from [src].")) + playsound(src, 'sound/machines/click.ogg', 15, 1) + right_bracer_attachment = null + + playsound(src, 'sound/machines/click.ogg', 15, 1) + + return FALSE + +/obj/item/clothing/gloves/yautja/hunter/verb/bracer_attachment() + set name = "Use Bracer Attachment" + set desc = "Extend your bracer attachment. They cannot be dropped, but can be retracted." + set category = "Yautja.Weapons" + set src in usr + return attachment_internal(usr, FALSE) + +/obj/item/clothing/gloves/yautja/hunter/proc/attachment_internal(mob/living/carbon/human/caller, forced = FALSE) if(!caller.loc || caller.is_mob_incapacitated() || !ishuman(caller)) return @@ -423,49 +567,57 @@ if(.) return - if(wristblades_deployed) - if(left_wristblades.loc == caller) - caller.drop_inv_item_to_loc(left_wristblades, src, FALSE, TRUE) - if(right_wristblades.loc == caller) - caller.drop_inv_item_to_loc(right_wristblades, src, FALSE, TRUE) - wristblades_deployed = FALSE - to_chat(caller, SPAN_NOTICE("You retract your [left_wristblades.name].")) - playsound(caller, 'sound/weapons/wristblades_off.ogg', 15, TRUE) + if(bracer_attachment_deployed) + retract_bracer_attachments(caller) else - if(!drain_power(caller, 50)) - return - var/deploying_into_left_hand = caller.hand ? TRUE : FALSE - if(caller.get_active_hand()) - to_chat(caller, SPAN_WARNING("Your hand must be free to activate your wristblade!")) - return - var/obj/limb/hand = caller.get_limb(deploying_into_left_hand ? "l_hand" : "r_hand") - if(!istype(hand) || !hand.is_usable()) - to_chat(caller, SPAN_WARNING("You can't hold that!")) - return - var/is_offhand_full = FALSE - var/obj/limb/off_hand = caller.get_limb(deploying_into_left_hand ? "r_hand" : "l_hand") - if(caller.get_inactive_hand() || (!istype(off_hand) || !off_hand.is_usable())) - is_offhand_full = TRUE - if(deploying_into_left_hand) - caller.put_in_active_hand(left_wristblades) - if(!is_offhand_full) - caller.put_in_inactive_hand(right_wristblades) - else - caller.put_in_active_hand(right_wristblades) - if(!is_offhand_full) - caller.put_in_inactive_hand(left_wristblades) - wristblades_deployed = TRUE - to_chat(caller, SPAN_NOTICE("You activate your [left_wristblades.plural_name].")) - playsound(caller, 'sound/weapons/wristblades_on.ogg', 15, TRUE) + deploy_bracer_attachments(caller) var/datum/action/predator_action/bracer/wristblade/wb_action for(wb_action as anything in caller.actions) if(istypestrict(wb_action, /datum/action/predator_action/bracer/wristblade)) - wb_action.update_button_icon(wristblades_deployed) + wb_action.update_button_icon(bracer_attachment_deployed) break return TRUE +/obj/item/clothing/gloves/yautja/hunter/proc/deploy_bracer_attachments(mob/living/carbon/human/caller) //take the weapons from the attachments in the bracer, and puts them in the callers hand + if(!drain_power(caller, 50)) + return + if(!left_bracer_attachment && !right_bracer_attachment) + to_chat(caller, SPAN_WARNING("[src] has no bracer attachments!")) + return + + if(left_bracer_attachment) + var/obj/limb/left_hand = caller.get_limb("l_hand") + if(!caller.l_hand && left_hand.is_usable()) + if(caller.put_in_l_hand(left_bracer_attachment.attached_weapon)) + to_chat(caller, SPAN_NOTICE("You extend [left_bracer_attachment.attached_weapon].")) + bracer_attachment_deployed = TRUE + playsound(loc,left_bracer_attachment.deployment_sound, 25, TRUE) + + + if(right_bracer_attachment) + var/obj/limb/right_hand = caller.get_limb("r_hand") + if(!caller.r_hand && right_hand.is_usable()) + if(caller.put_in_r_hand(right_bracer_attachment.attached_weapon)) + to_chat(caller, SPAN_NOTICE("You extend [right_bracer_attachment.attached_weapon].")) + bracer_attachment_deployed = TRUE + playsound(loc,right_bracer_attachment.deployment_sound, 25, TRUE) + + +/obj/item/clothing/gloves/yautja/hunter/proc/retract_bracer_attachments(mob/living/carbon/human/caller) //if the attachments weapon is in the callers hands, retract them back into the attachments + if(left_bracer_attachment && left_bracer_attachment.attached_weapon.loc == caller) + caller.drop_inv_item_to_loc(left_bracer_attachment.attached_weapon, left_bracer_attachment, FALSE, TRUE) + to_chat(caller, SPAN_NOTICE("You retract [left_bracer_attachment.attached_weapon].")) + playsound(loc, left_bracer_attachment.retract_sound, 25, TRUE) + + if(right_bracer_attachment && right_bracer_attachment.attached_weapon.loc == caller) + caller.drop_inv_item_to_loc(right_bracer_attachment.attached_weapon, right_bracer_attachment, FALSE, TRUE) + to_chat(caller, SPAN_NOTICE("You retract [right_bracer_attachment.attached_weapon].")) + playsound(loc, right_bracer_attachment.retract_sound, 25, TRUE) + + bracer_attachment_deployed = FALSE + /obj/item/clothing/gloves/yautja/hunter/verb/track_gear() set name = "Track Yautja Gear" set desc = "Find Yauja Gear." @@ -693,7 +845,7 @@ if(!drain_power(caller, 50)) return if(caller.get_active_hand()) - to_chat(caller, SPAN_WARNING("Your hand must be free to activate your wristblade!")) + to_chat(caller, SPAN_WARNING("Your hand must be free to activate your plasma caster!")) return var/obj/limb/hand = caller.get_limb(caller.hand ? "l_hand" : "r_hand") if(!istype(hand) || !hand.is_usable()) @@ -716,14 +868,14 @@ /obj/item/clothing/gloves/yautja/hunter/proc/explode(mob/living/carbon/victim) set waitfor = 0 - if (exploding) + if(exploding) return - notify_ghosts(header = "Yautja self destruct", message = "[victim] is self destructing to protect their honor!", source = victim, action = NOTIFY_ORBIT) + notify_ghosts(header = "Yautja self destruct", message = "[victim.real_name] is self destructing to protect their honor!", source = victim, action = NOTIFY_ORBIT) exploding = 1 var/turf/T = get_turf(src) - if(explosion_type == SD_TYPE_BIG && victim.stat == CONSCIOUS && (is_ground_level(T.z) || MODE_HAS_TOGGLEABLE_FLAG(MODE_SHIPSIDE_SD))) + if(explosion_type == SD_TYPE_BIG && (is_ground_level(T.z) || MODE_HAS_TOGGLEABLE_FLAG(MODE_SHIPSIDE_SD))) playsound(src, 'sound/voice/pred_deathlaugh.ogg', 100, 0, 17, status = 0) playsound(src, 'sound/effects/pred_countdown.ogg', 100, 0, 17, status = 0) diff --git a/code/modules/cm_preds/yaut_items.dm b/code/modules/cm_preds/yaut_items.dm index 0aca94ae8202..06600ca55645 100644 --- a/code/modules/cm_preds/yaut_items.dm +++ b/code/modules/cm_preds/yaut_items.dm @@ -56,12 +56,12 @@ ) unacidable = TRUE item_state_slots = list(WEAR_JACKET = "halfarmor1") - valid_accessory_slots = list(ACCESSORY_SLOT_ARMOR_A, ACCESSORY_SLOT_ARMOR_L, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M) + valid_accessory_slots = list(ACCESSORY_SLOT_ARMOR_A, ACCESSORY_SLOT_ARMOR_L, ACCESSORY_SLOT_ARMOR_S, ACCESSORY_SLOT_ARMOR_M, ACCESSORY_SLOT_TROPHY) var/thrall = FALSE//Used to affect icon generation. fire_intensity_resistance = 10 black_market_value = 100 -/obj/item/clothing/suit/armor/yautja/Initialize(mapload, armor_number = rand(1,7), armor_material = "ebony", legacy = "None") +/obj/item/clothing/suit/armor/yautja/Initialize(mapload, armor_number = rand(1,8), armor_material = "ebony", legacy = "None") . = ..() if(thrall) return @@ -87,7 +87,7 @@ LAZYSET(item_state_slots, WEAR_JACKET, "halfarmor_elder_n") return - if(armor_number > 7) + if(armor_number > 8) armor_number = 1 if(armor_number) //Don't change full armor number icon_state = "halfarmor[armor_number]_[armor_material]" @@ -153,7 +153,6 @@ flags_equip_slot = SLOT_BACK flags_item = ITEM_PREDATOR unacidable = TRUE - var/clan_rank_required = CLAN_RANK_ELDER_INT var/councillor_override = FALSE /obj/item/clothing/yautja_cape/Initialize(mapload, new_color = "#654321") @@ -176,32 +175,26 @@ /obj/item/clothing/yautja_cape/ceremonial name = PRED_YAUTJA_CEREMONIAL_CAPE icon_state = "ceremonialcape" - clan_rank_required = CLAN_RANK_ELDER_INT /obj/item/clothing/yautja_cape/third name = PRED_YAUTJA_THIRD_CAPE icon_state = "thirdcape" - clan_rank_required = CLAN_RANK_ELDER_INT /obj/item/clothing/yautja_cape/half name = PRED_YAUTJA_HALF_CAPE icon_state = "halfcape" - clan_rank_required = CLAN_RANK_BLOODED_INT /obj/item/clothing/yautja_cape/quarter name = PRED_YAUTJA_QUARTER_CAPE icon_state = "quartercape" - clan_rank_required = CLAN_RANK_BLOODED_INT /obj/item/clothing/yautja_cape/poncho name = PRED_YAUTJA_PONCHO icon_state = "councilor_poncho" - clan_rank_required = CLAN_RANK_BLOODED_INT /obj/item/clothing/yautja_cape/damaged name = PRED_YAUTJA_DAMAGED_CAPE icon_state = "damagedcape" - clan_rank_required = CLAN_RANK_ELITE_INT /obj/item/clothing/shoes/yautja name = "ancient alien greaves" @@ -297,6 +290,7 @@ /obj/item/clothing/under/chainshirt/hunter name = "body mesh" desc = "A set of very fine chainlink in a meshwork for comfort and utility." + valid_accessory_slots = list(ACCESSORY_SLOT_TROPHY) armor_melee = CLOTHING_ARMOR_LOW armor_bullet = CLOTHING_ARMOR_MEDIUM @@ -915,10 +909,12 @@ var/obj/item/clothing/gloves/yautja/hunter/bracer = loc if(istype(bracer) && bracer.owner_rank) switch(bracer.owner_rank) + if(CLAN_RANK_ELITE_INT) + new_access = list(ACCESS_YAUTJA_SECURE, ACCESS_YAUTJA_ELITE) if(CLAN_RANK_ELDER_INT, CLAN_RANK_LEADER_INT) - new_access = list(ACCESS_YAUTJA_SECURE, ACCESS_YAUTJA_ELDER) + new_access = list(ACCESS_YAUTJA_SECURE, ACCESS_YAUTJA_ELITE, ACCESS_YAUTJA_ELDER,) if(CLAN_RANK_ADMIN_INT) - new_access = list(ACCESS_YAUTJA_SECURE, ACCESS_YAUTJA_ELDER, ACCESS_YAUTJA_ANCIENT) + new_access = list(ACCESS_YAUTJA_SECURE, ACCESS_YAUTJA_ELITE, ACCESS_YAUTJA_ELDER, ACCESS_YAUTJA_ANCIENT) access = new_access /obj/item/storage/medicomp @@ -1000,8 +996,10 @@ icon = 'icons/obj/items/skeleton.dmi' accessory_icons = list(WEAR_BODY = 'icons/mob/humans/onmob/hunter/pred_gear.dmi') icon_state = null + slot = ACCESSORY_SLOT_TROPHY ///Has it been cleaned by a polishing rag? var/polished = FALSE + /obj/item/clothing/accessory/limb/skeleton/l_arm name = "arm bone" icon_state = "l_arm" diff --git a/code/modules/cm_preds/yaut_mask.dm b/code/modules/cm_preds/yaut_mask.dm index f87c7a48c2e0..766e8c5958ad 100644 --- a/code/modules/cm_preds/yaut_mask.dm +++ b/code/modules/cm_preds/yaut_mask.dm @@ -13,6 +13,7 @@ icon_state = "pred_mask1_ebony" item_state = "helmet" item_state_slots = list(WEAR_FACE = "pred_mask1_ebony") + valid_accessory_slots = list(ACCESSORY_SLOT_MASK) armor_melee = CLOTHING_ARMOR_MEDIUM armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH @@ -46,7 +47,7 @@ ///A list of all intrinsic mask actions var/list/mask_actions = list(/datum/action/predator_action/mask/zoom, /datum/action/predator_action/mask/visor) -/obj/item/clothing/mask/gas/yautja/New(location, mask_number = rand(1,12), armor_material = "ebony", legacy = "None") +/obj/item/clothing/mask/gas/yautja/New(location, mask_number = rand(1,17), armor_material = "ebony", legacy = "None") ..() forceMove(location) if(thrall) @@ -71,7 +72,7 @@ LAZYSET(item_state_slots, WEAR_FACE, "pred_mask_elder_n") return - if(mask_number > 12) + if(mask_number > 17) mask_number = 1 icon_state = "pred_mask[mask_number]_[armor_material]" LAZYSET(item_state_slots, WEAR_FACE, "pred_mask[mask_number]_[armor_material]") @@ -308,3 +309,11 @@ /obj/item/clothing/mask/yautja_flavor/map_random map_random = TRUE + +/obj/item/clothing/accessory/mask + name = "Mask Ornament" + desc = "An ornate addition to your mask" + icon = 'icons/obj/items/hunter/pred_mask_accessories.dmi' + accessory_icons = list(WEAR_FACE = 'icons/mob/humans/onmob/hunter/pred_mask_accessories.dmi') + icon_state = null + slot = ACCESSORY_SLOT_MASK diff --git a/code/modules/cm_preds/yaut_procs.dm b/code/modules/cm_preds/yaut_procs.dm index 31910fa2adae..3fceba19bb6d 100644 --- a/code/modules/cm_preds/yaut_procs.dm +++ b/code/modules/cm_preds/yaut_procs.dm @@ -227,133 +227,3 @@ requires_power = FALSE base_lighting_alpha = 255 flags_area = AREA_YAUTJA_GROUNDS - -/mob/living/carbon/human/proc/pred_buy() - set category = "Yautja.Misc" - set name = "Claim Equipment" - set desc = "When you're on the Predator ship, claim some gear. You can only do this ONCE." - - if(hunter_data.claimed_equipment) - to_chat(src, SPAN_WARNING("You've already claimed your equipment.")) - return - - if(is_mob_incapacitated() || body_position != STANDING_UP || buckled) - to_chat(src, SPAN_WARNING("You're not able to do that right now.")) - return - - if(!isyautja(src)) - to_chat(src, SPAN_WARNING("How did you get this verb?")) - return - var/area/location = get_area(src) - if(!(location.flags_area & AREA_YAUTJA_GROUNDS)) - to_chat(src, SPAN_WARNING("Not here. Only on the ship.")) - return - - var/obj/item/clothing/gloves/yautja/hunter/bracers = gloves - if(!istype(bracers)) - to_chat(src, SPAN_WARNING("You need to be wearing your bracers to do this.")) - return - - var/sure = alert("An array of powerful weapons are displayed to you. Pick your gear carefully. If you cancel at any point, you will not claim your equipment.", "Sure?", "Begin the Hunt", "No, not now") - if(sure != "Begin the Hunt") - return - - var/list/melee = list(YAUTJA_GEAR_GLAIVE = image(icon = 'icons/obj/items/hunter/pred_gear.dmi', icon_state = "glaive"), YAUTJA_GEAR_WHIP = image(icon = 'icons/obj/items/hunter/pred_gear.dmi', icon_state = "whip"),YAUTJA_GEAR_SWORD = image(icon = 'icons/obj/items/hunter/pred_gear.dmi', icon_state = "clansword"),YAUTJA_GEAR_SCYTHE = image(icon = 'icons/obj/items/hunter/pred_gear.dmi', icon_state = "predscythe"), YAUTJA_GEAR_STICK = image(icon = 'icons/obj/items/hunter/pred_gear.dmi', icon_state = "combistick"), YAUTJA_GEAR_SCIMS = image(icon = 'icons/obj/items/hunter/pred_gear.dmi', icon_state = "scim")) - var/list/other = list(YAUTJA_GEAR_LAUNCHER = image(icon = 'icons/obj/items/hunter/pred_gear.dmi', icon_state = "spikelauncher"), YAUTJA_GEAR_PISTOL = image(icon = 'icons/obj/items/hunter/pred_gear.dmi', icon_state = "plasmapistol"), YAUTJA_GEAR_DISC = image(icon = 'icons/obj/items/hunter/pred_gear.dmi', icon_state = "disc"), YAUTJA_GEAR_FULL_ARMOR = image(icon = 'icons/obj/items/hunter/pred_gear.dmi', icon_state = "fullarmor_ebony"), YAUTJA_GEAR_SHIELD = image(icon = 'icons/obj/items/hunter/pred_gear.dmi', icon_state = "shield"), YAUTJA_GEAR_DRONE = image(icon = 'icons/obj/items/hunter/pred_gear.dmi', icon_state = "falcon_drone")) - var/list/restricted = list(YAUTJA_GEAR_LAUNCHER, YAUTJA_GEAR_PISTOL, YAUTJA_GEAR_FULL_ARMOR, YAUTJA_GEAR_SHIELD, YAUTJA_GEAR_DRONE) //Can only select them once each. - - var/list/secondaries = list() - var/total_secondaries = 2 - - var/use_radials = src.client.prefs?.no_radials_preference ? FALSE : TRUE - var/main_weapon = use_radials ? show_radial_menu(src, src, melee) : tgui_input_list(usr, "Which weapon shall you use on your hunt?:", "Melee Weapon", melee) - - if(main_weapon == YAUTJA_GEAR_SCYTHE) - var/list/scythe_variants = list(YAUTJA_GEAR_SCYTHE = image(icon = 'icons/obj/items/hunter/pred_gear.dmi', icon_state = "predscythe"), YAUTJA_GEAR_SCYTHE_ALT = image(icon = 'icons/obj/items/hunter/pred_gear.dmi', icon_state = "predscythe_alt")) - main_weapon = use_radials ? show_radial_menu(src, src, scythe_variants) : tgui_input_list(usr, "Which variant of the war scythe?:", "Melee Weapon", scythe_variants) - - if(main_weapon == YAUTJA_GEAR_GLAIVE) - var/list/glaive_variants = list(YAUTJA_GEAR_GLAIVE = image(icon = 'icons/obj/items/hunter/pred_gear.dmi', icon_state = "glaive"), YAUTJA_GEAR_GLAIVE_ALT = image(icon = 'icons/obj/items/hunter/pred_gear.dmi', icon_state = "glaive_alt")) - main_weapon = use_radials ? show_radial_menu(src, src, glaive_variants) : tgui_input_list(usr, "Which variant of the war glaive?:", "Melee Weapon", glaive_variants) - - if(main_weapon == YAUTJA_GEAR_SCIMS) - var/list/scim_variants = list(YAUTJA_GEAR_SCIMS = image(icon = 'icons/obj/items/hunter/pred_gear.dmi', icon_state = "scim"), YAUTJA_GEAR_SCIMS_ALT = image(icon = 'icons/obj/items/hunter/pred_gear.dmi', icon_state = "scim_alt")) - main_weapon = use_radials ? show_radial_menu(src, src, scim_variants) : tgui_input_list(usr, "Which variant of the scimitars?:", "Melee Weapon", scim_variants) - - - if(main_weapon == YAUTJA_GEAR_STICK) - var/list/stick_variants = list(YAUTJA_GEAR_STICK = image(icon = 'icons/obj/items/hunter/pred_gear.dmi', icon_state = "combistick"), YAUTJA_GEAR_STICK_ALT = image(icon = 'icons/obj/items/hunter/pred_gear.dmi', icon_state = "war_axe")) - main_weapon = use_radials ? show_radial_menu(src, src, stick_variants) :tgui_input_list(usr, "Which variant of the combistick?:", "Melee Weapon", stick_variants) - - if(!main_weapon) - return - for(var/i = 1 to total_secondaries) - var/secondary = use_radials ? show_radial_menu(src, src, other) : tgui_input_list(usr, "Which secondary gear shall you take?", "Item [i] (of [total_secondaries])", other) - if(!secondary) - return - secondaries += secondary - if(secondary in restricted) - other -= secondary - - bracers = gloves - if(!istype(bracers)) - to_chat(src, SPAN_WARNING("You need to be wearing your bracers to do this.")) - return - - if(hunter_data.claimed_equipment) - to_chat(src, SPAN_WARNING("You've already claimed your equipment.")) - return - - hunter_data.claimed_equipment = TRUE - - switch(main_weapon) - if(YAUTJA_GEAR_GLAIVE) - equip_to_slot_if_possible(new /obj/item/weapon/twohanded/yautja/glaive(src.loc), WEAR_J_STORE, disable_warning = TRUE) - if(YAUTJA_GEAR_GLAIVE_ALT) - equip_to_slot_if_possible(new /obj/item/weapon/twohanded/yautja/glaive/alt(src.loc), WEAR_J_STORE, disable_warning = TRUE) - if(YAUTJA_GEAR_WHIP) - equip_to_slot_if_possible(new /obj/item/weapon/yautja/chain(src.loc), WEAR_J_STORE, disable_warning = TRUE) - if(YAUTJA_GEAR_SWORD) - equip_to_slot_if_possible(new /obj/item/weapon/yautja/sword(src.loc), WEAR_J_STORE, disable_warning = TRUE) - if(YAUTJA_GEAR_SCYTHE) - equip_to_slot_if_possible(new /obj/item/weapon/yautja/scythe(src.loc), WEAR_J_STORE, disable_warning = TRUE) - if(YAUTJA_GEAR_SCYTHE_ALT) - equip_to_slot_if_possible(new /obj/item/weapon/yautja/scythe/alt(src.loc), WEAR_J_STORE, disable_warning = TRUE) - if(YAUTJA_GEAR_STICK) - equip_to_slot_if_possible(new /obj/item/weapon/yautja/chained/combistick(src.loc), WEAR_J_STORE, disable_warning = TRUE) - if(YAUTJA_GEAR_STICK_ALT) - equip_to_slot_if_possible(new /obj/item/weapon/yautja/chained/war_axe(src.loc), WEAR_J_STORE, disable_warning = TRUE) - if(YAUTJA_GEAR_SCIMS) - if(bracers.wristblades_deployed) - bracers.wristblades_internal(usr, TRUE) - qdel(bracers.left_wristblades) - qdel(bracers.right_wristblades) - bracers.left_wristblades = new /obj/item/weapon/wristblades/scimitar(bracers) - bracers.right_wristblades = new /obj/item/weapon/wristblades/scimitar(bracers) - if(YAUTJA_GEAR_SCIMS_ALT) - if(bracers.wristblades_deployed) - bracers.wristblades_internal(usr, TRUE) - qdel(bracers.left_wristblades) - qdel(bracers.right_wristblades) - bracers.left_wristblades = new /obj/item/weapon/wristblades/scimitar/alt(bracers) - bracers.right_wristblades = new /obj/item/weapon/wristblades/scimitar/alt(bracers) - - for(var/choice in secondaries) - switch(choice) - if(YAUTJA_GEAR_LAUNCHER) - equip_to_slot_if_possible(new /obj/item/weapon/gun/launcher/spike(src.loc), WEAR_IN_BELT, disable_warning = TRUE) - if(YAUTJA_GEAR_PISTOL) - equip_to_slot_if_possible(new /obj/item/weapon/gun/energy/yautja/plasmapistol(src.loc), WEAR_IN_BELT, disable_warning = TRUE) - if(YAUTJA_GEAR_DISC) - equip_to_slot_if_possible(new /obj/item/explosive/grenade/spawnergrenade/smartdisc(src.loc), WEAR_IN_BELT, disable_warning = TRUE) - if(YAUTJA_GEAR_FULL_ARMOR) - if(wear_suit) - drop_inv_item_on_ground(wear_suit) - equip_to_slot_if_possible(new /obj/item/clothing/suit/armor/yautja/hunter/full(src.loc, 0, src.client.prefs.predator_armor_material), WEAR_JACKET, disable_warning = TRUE) - if(YAUTJA_GEAR_SHIELD) - equip_to_slot_if_possible(new /obj/item/weapon/shield/riot/yautja(src.loc), WEAR_BACK, disable_warning = TRUE) - if(YAUTJA_GEAR_DRONE) - equip_to_slot_if_possible(new /obj/item/falcon_drone(src.loc), WEAR_R_EAR, disable_warning = TRUE) - - remove_verb(src, /mob/living/carbon/human/proc/pred_buy) - remove_action(src, /datum/action/predator_action/claim_equipment) diff --git a/code/modules/cm_preds/yaut_weapons.dm b/code/modules/cm_preds/yaut_weapons.dm index e08744dbd0c5..1a2ae816a01b 100644 --- a/code/modules/cm_preds/yaut_weapons.dm +++ b/code/modules/cm_preds/yaut_weapons.dm @@ -44,10 +44,10 @@ force = MELEE_FORCE_TIER_2 throwforce = MELEE_FORCE_TIER_6 -/obj/item/weapon/wristblades - name = "wrist blades" +/obj/item/weapon/bracer_attachment + name = "bracer attachment" + desc = "How did you get these?." var/plural_name = "wrist blades" - desc = "A pair of huge, serrated blades extending out from metal gauntlets." icon = 'icons/obj/items/hunter/pred_gear.dmi' icon_state = "wrist" @@ -68,18 +68,16 @@ pry_capable = IS_PRY_CAPABLE_FORCE attack_verb = list("sliced", "slashed", "jabbed", "torn", "gored") - var/has_speed_bonus = TRUE + var/speed_bonus_amount -/obj/item/weapon/wristblades/equipped(mob/user, slot) +/obj/item/weapon/bracer_attachment/equipped(mob/user, slot) . = ..() - if(has_speed_bonus && (slot == WEAR_L_HAND || slot == WEAR_R_HAND) && istype(user.get_inactive_hand(), /obj/item/weapon/wristblades)) - attack_speed = initial(attack_speed) - 2 - -/obj/item/weapon/wristblades/dropped(mob/living/carbon/human/M) - . = ..() - attack_speed = initial(attack_speed) + if(!speed_bonus_amount) + return + if(((slot == WEAR_L_HAND) && istype(user.r_hand, /obj/item/weapon/bracer_attachment)) || ((slot == WEAR_R_HAND) && istype(user.l_hand, /obj/item/weapon/bracer_attachment))) + attack_speed = initial(attack_speed) + speed_bonus_amount -/obj/item/weapon/wristblades/afterattack(atom/attacked_target, mob/user, proximity) +/obj/item/weapon/bracer_attachment/afterattack(atom/attacked_target, mob/user, proximity) if(!proximity || !user || user.action_busy) return FALSE @@ -113,32 +111,44 @@ user.visible_message(SPAN_DANGER("[user] forces [door] closed using the [name]!"), SPAN_DANGER("You force [door] closed with your [name].")) door.Close() -/obj/item/weapon/wristblades/attack_self(mob/living/carbon/human/user) +/obj/item/weapon/bracer_attachment/attack_self(mob/living/carbon/human/user) ..() if(istype(user)) var/obj/item/clothing/gloves/yautja/hunter/gloves = user.gloves - gloves.wristblades_internal(user, TRUE) // unlikely that the yaut would have gloves without blades, so if they do, runtime logs here would be handy + gloves.attachment_internal(user, TRUE) // unlikely that the yaut would have gloves without blades, so if they do, runtime logs here would be handy + + +/obj/item/weapon/bracer_attachment/wristblades + name = "wrist blade" + plural_name = "wrist blades" + desc = "A huge, serrated blade extending from metal gauntlets." + icon_state = "wrist" + item_state = "wristblade" + attack_speed = 0.5 SECONDS + attack_verb = list("sliced", "slashed", "jabbed", "torn", "gored") + force = MELEE_FORCE_TIER_4 + speed_bonus_amount = 0 SECONDS -/obj/item/weapon/wristblades/scimitar +/obj/item/weapon/bracer_attachment/scimitar name = "wrist scimitar" plural_name = "wrist scimitars" desc = "A huge, serrated blade extending from metal gauntlets." icon_state = "scim" item_state = "scim" - attack_speed = 5 + attack_speed = 1 SECONDS attack_verb = list("sliced", "slashed", "jabbed", "torn", "gored") force = MELEE_FORCE_TIER_5 - has_speed_bonus = FALSE + speed_bonus_amount = -0.4 SECONDS -/obj/item/weapon/wristblades/scimitar/alt +/obj/item/weapon/bracer_attachment/scimitar/alt name = "wrist scimitar" plural_name = "wrist scimitars" desc = "A huge, serrated blade extending from metal gauntlets." icon_state = "scim_alt" item_state = "scim_alt" - attack_speed = 5 + attack_speed = 1 SECONDS force = MELEE_FORCE_TIER_5 - has_speed_bonus = FALSE + speed_bonus_amount = -0.4 SECONDS /*######################################### ########### One Handed Weapons ############ @@ -196,6 +206,24 @@ attack_speed = 1 SECONDS unacidable = TRUE +/obj/item/weapon/yautja/sword/alt_1 + name = "rending sword" + desc = "An expertly crafted Yautja blade carried by hunters who wish to fight up close. Razor sharp and capable of cutting flesh into ribbons. Commonly carried by aggressive and lethal hunters." + icon_state = "clansword_alt" + item_state = "clansword_alt" + +/obj/item/weapon/yautja/sword/alt_2 + name = "piercing sword" + desc = "An expertly crafted Yautja blade carried by hunters who wish to fight up close. Razor sharp and capable of cutting flesh into ribbons. Commonly carried by aggressive and lethal hunters." + icon_state = "clansword_alt2" + item_state = "clansword_alt2" + +/obj/item/weapon/yautja/sword/alt_3 + name = "severing sword" + desc = "An expertly crafted Yautja blade carried by hunters who wish to fight up close. Razor sharp and capable of cutting flesh into ribbons. Commonly carried by aggressive and lethal hunters." + icon_state = "clansword_alt3" + item_state = "clansword_alt3" + /obj/item/weapon/yautja/sword/attack(mob/target, mob/living/user) . = ..() if((human_adapted || isyautja(user)) && isxeno(target)) @@ -237,7 +265,13 @@ name = "double war scythe" desc = "A huge, incredibly sharp double blade used for hunting dangerous prey. This weapon is commonly carried by Yautja who wish to disable and slice apart their foes." icon_state = "predscythe_alt" - item_state = "scythe_double" + item_state = "scythe_dual" + +/obj/item/weapon/yautja/sword/staff + name = "cruel staff" + desc = "A large staff with a sharp curve at the top. Commonly wielded by the shamans that roam the desert steppe." + icon_state = "staff" + item_state = "staff" //Combistick /obj/item/weapon/yautja/chained/combistick @@ -531,7 +565,7 @@ var/mob/living/carbon/human/victim = target if(!HAS_TRAIT(user, TRAIT_SUPER_STRONG)) - to_chat(user, SPAN_WARNING("You're not strong enough to rip an entire humanoid apart. Also, that's kind of fucked up.")) //look at this dumbass + to_chat(user, SPAN_WARNING("You're not strong enough to rip an entire humanoid apart. Also, that's kind of fucked up.")) return TRUE if(issamespecies(user, victim)) @@ -539,7 +573,7 @@ return if(isspeciessynth(victim)) - to_chat(user, SPAN_WARNING("You can't flay metal...")) //look at this dumbass + to_chat(user, SPAN_WARNING("You can't flay metal...")) return TRUE if(SEND_SIGNAL(victim, COMSIG_HUMAN_FLAY_ATTEMPT, user, src) & COMPONENT_CANCEL_ATTACK) @@ -781,9 +815,9 @@ /obj/item/weapon/twohanded/yautja/glaive name = "war glaive" - desc = "A huge, powerful blade on a metallic pole. Mysterious writing is carved into the weapon." - icon_state = "glaive" - item_state = "glaive" + desc = "Two huge, powerful blades on a metallic pole. Mysterious writing is carved into the weapon." + icon_state = "glaive_alt" + item_state = "glaive_alt" force = MELEE_FORCE_TIER_3 force_wielded = MELEE_FORCE_TIER_9 throwforce = MELEE_FORCE_TIER_3 @@ -792,6 +826,8 @@ flags_atom = FPRINT|QUICK_DRAWABLE|CONDUCT attack_verb = list("sliced", "slashed", "carved", "diced", "gored") attack_speed = 14 //Default is 7. + var/skull_attached = FALSE + /obj/item/weapon/twohanded/yautja/glaive/attack(mob/living/target, mob/living/carbon/human/user) . = ..() @@ -802,8 +838,40 @@ xenomorph.AddComponent(/datum/component/status_effect/interference, 30, 30) /obj/item/weapon/twohanded/yautja/glaive/alt - icon_state = "glaive_alt" - item_state = "glaive_alt" + name = "cleaving glaive" + desc = "A huge, powerful blade on a metallic pole. Mysterious writing is carved into the weapon." + icon_state = "glaive" + item_state = "glaive" + +/obj/item/weapon/twohanded/yautja/glaive/alt/get_examine_text(mob/user) + . = ..() + if(skull_attached) + . += SPAN_NOTICE("[src] has a human skull mounted on it.") + +/obj/item/weapon/twohanded/yautja/glaive/alt/update_icon() + if(skull_attached) + icon_state = "glaive_skull" + else + icon_state = "glaive" + +///attaching the skull +/obj/item/weapon/twohanded/yautja/glaive/alt/attackby(obj/item/attacking_item, mob/user) + if(!istype(attacking_item, /obj/item/clothing/accessory/limb/skeleton/head)) + return ..() + + var/obj/item/clothing/accessory/limb/skeleton/head/skull = attacking_item + if(skull_attached) + to_chat(user, SPAN_WARNING("You already have a [skull] mounted on [src].")) + return + + if(!HAS_TRAIT(user, TRAIT_YAUTJA_TECH)) + to_chat(user, SPAN_WARNING("Why would you want to do this!?.")) + return + user.visible_message(SPAN_NOTICE("[user] mounts the [skull] with [src]."), SPAN_NOTICE("You mount [skull] to [src].")) + user.drop_inv_item_to_loc(skull, src) + skull_attached = TRUE + update_icon() + return ..() /obj/item/weapon/twohanded/yautja/glaive/damaged name = "ancient war glaive" @@ -815,6 +883,11 @@ item_state = "glaive_alt" flags_item = NOSHIELD|TWOHANDED +/obj/item/weapon/twohanded/yautja/glaive/longaxe + name = "longaxe" + desc = "A frighteningly big axe. The blade edge is chipped and gnarled from thousands of bone-crushing blows." + icon_state = "longaxe" + item_state = "longaxe" /*######################################### ############## Ranged Weapons ############# @@ -1167,7 +1240,7 @@ force = 0 fire_delay = 3 flags_atom = FPRINT|QUICK_DRAWABLE|CONDUCT - flags_item = NOBLUDGEON|DELONDROP|IGNITING_ITEM //Can't bludgeon with this. + flags_item = NOBLUDGEON|IGNITING_ITEM //Can't bludgeon with this. flags_gun_features = GUN_UNUSUAL_DESIGN has_empty_icon = FALSE explo_proof = TRUE @@ -1291,7 +1364,6 @@ if(source) forceMove(source) source.caster_deployed = FALSE - return ..() /obj/item/weapon/gun/energy/yautja/plasma_caster/able_to_fire(mob/user) diff --git a/code/modules/customitems/item_spawning.dm b/code/modules/customitems/item_spawning.dm deleted file mode 100644 index e9733d0635ed..000000000000 --- a/code/modules/customitems/item_spawning.dm +++ /dev/null @@ -1,34 +0,0 @@ -//switch this out to use a database at some point -//list of ckey/ real_name and item paths -//gives item to specific people when they join if it can -//for multiple items just add mutliple entries, unless i change it to be a listlistlist -//yes, it has to be an item, you can't pick up nonitems - -GLOBAL_LIST_FILE_LOAD(custom_items, "config/custom_items.txt") - -/proc/EquipCustomItems(mob/living/carbon/human/M) - for(var/line in GLOB.custom_items) - // split & clean up - var/list/Entry = splittext(line, ":") - for(var/i = 1 to length(Entry)) - Entry[i] = trim(Entry[i]) - - if(length(Entry) < 2) - continue; - - if(Entry[1] == M.ckey) - var/list/Paths = splittext(Entry[2], ",") - for(var/P in Paths) - var/ok = FALSE // TRUE if the item was placed successfully - P = trim(P) - var/path = text2path(P) - if(!path) continue - - var/obj/item/Item = new path() - for(var/obj/item/storage/S in M.contents) // Try to place it in any item that can store stuff, on the mob. - if (S.handle_item_insertion(Item, TRUE)) - ok = TRUE - break - - if (ok == FALSE) // Finally, since everything else failed, place it on the ground - Item.forceMove(get_turf(M.loc)) diff --git a/code/modules/defenses/sentry.dm b/code/modules/defenses/sentry.dm index 6c9c5ad68fea..02bccde9fa37 100644 --- a/code/modules/defenses/sentry.dm +++ b/code/modules/defenses/sentry.dm @@ -313,7 +313,7 @@ new_projectile.damage *= damage_mult new_projectile.accuracy *= accuracy_mult GIVE_BULLET_TRAIT(new_projectile, /datum/element/bullet_trait_iff, faction_group) - new_projectile.fire_at(target, src, owner_mob, new_projectile.ammo.max_range, new_projectile.ammo.shell_speed, null, FALSE) + new_projectile.fire_at(target, owner_mob, src, new_projectile.ammo.max_range, new_projectile.ammo.shell_speed, null, FALSE) muzzle_flash(Get_Angle(get_turf(src), target)) ammo.current_rounds-- track_shot() diff --git a/code/modules/defenses/sentry_flamer.dm b/code/modules/defenses/sentry_flamer.dm index 2c5e9ae62677..fcdd54708609 100644 --- a/code/modules/defenses/sentry_flamer.dm +++ b/code/modules/defenses/sentry_flamer.dm @@ -28,11 +28,11 @@ accuracy_mult = 0.1 fire_delay = 0.5 -/obj/structure/machinery/defenses/sentry/flamer/actual_fire(atom/A) - var/obj/projectile/P = new(create_cause_data(initial(name), owner_mob)) - P.generate_bullet(new ammo.default_ammo) - GIVE_BULLET_TRAIT(P, /datum/element/bullet_trait_iff, faction_group) - P.fire_at(A, src, owner_mob, P.ammo.max_range, P.ammo.shell_speed, null) +/obj/structure/machinery/defenses/sentry/flamer/actual_fire(atom/target) + var/obj/projectile/new_projectile = new(src, create_cause_data(initial(name), owner_mob, src)) + new_projectile.generate_bullet(new ammo.default_ammo) + GIVE_BULLET_TRAIT(new_projectile, /datum/element/bullet_trait_iff, faction_group) + new_projectile.fire_at(target, owner_mob, src, new_projectile.ammo.max_range, new_projectile.ammo.shell_speed, null, FALSE) ammo.current_rounds-- track_shot() if(ammo.current_rounds == 0) diff --git a/code/modules/desert_dam/motion_sensor/sensortower.dm b/code/modules/desert_dam/motion_sensor/sensortower.dm index 41859167458f..75cd2d1920dd 100644 --- a/code/modules/desert_dam/motion_sensor/sensortower.dm +++ b/code/modules/desert_dam/motion_sensor/sensortower.dm @@ -26,6 +26,10 @@ /// weakrefs of xenos temporarily added to the marine minimap var/list/minimap_added = list() +/obj/structure/machinery/sensortower/Initialize(mapload, ...) + . = ..() + SSminimaps.add_marker(src, z, MINIMAP_FLAG_ALL, "sensor_tower") + /obj/structure/machinery/sensortower/update_icon() ..() diff --git a/code/modules/dropships/attach_points/templates.dm b/code/modules/dropships/attach_points/templates.dm index 9c87ab4fb72d..83b484a02346 100644 --- a/code/modules/dropships/attach_points/templates.dm +++ b/code/modules/dropships/attach_points/templates.dm @@ -121,6 +121,88 @@ transverse = 3 long = 0 +/obj/effect/attach_point/weapon/dropship_upp + ship_tag = DROPSHIP_MORANA + +/obj/effect/attach_point/weapon/dropship_upp/left_wing + name = "port wing weapon attach point" + icon_state = "equip_base_l_wing" + attach_id = 1 + dir = WEST + firing_arc_min = -3 + firing_arc_max = 3 + transverse = -3 + long = 0 + +/obj/effect/attach_point/weapon/dropship_upp/left_fore + name = "port fore weapon attach point" + attach_id = 2 + dir = NORTH + firing_arc_min = -6 + firing_arc_max = 0 + transverse = 0 + long = 0 + +/obj/effect/attach_point/weapon/dropship_upp/right_fore + name = "starboard fore weapon attach point" + attach_id = 3 + dir = NORTH + firing_arc_min = 0 + firing_arc_max = 6 + transverse = 0 + long = 0 + +/obj/effect/attach_point/weapon/dropship_upp/right_wing + name = "starboard wing weapon attach point" + icon_state = "equip_base_r_wing"; + attach_id = 4 + dir = EAST + firing_arc_min = -3 + firing_arc_max = 3 + transverse = 3 + long = 0 + +/obj/effect/attach_point/weapon/dropship_upp2 + ship_tag = DROPSHIP_DEVANA + +/obj/effect/attach_point/weapon/dropship_upp2/left_wing + name = "port wing weapon attach point" + icon_state = "equip_base_l_wing" + attach_id = 1 + dir = WEST + firing_arc_min = -3 + firing_arc_max = 3 + transverse = -3 + long = 0 + +/obj/effect/attach_point/weapon/dropship_upp2/left_fore + name = "port fore weapon attach point" + attach_id = 2 + dir = NORTH + firing_arc_min = -6 + firing_arc_max = 0 + transverse = 0 + long = 0 + +/obj/effect/attach_point/weapon/dropship_upp2/right_fore + name = "starboard fore weapon attach point" + attach_id = 3 + dir = NORTH + firing_arc_min = 0 + firing_arc_max = 6 + transverse = 0 + long = 0 + +/obj/effect/attach_point/weapon/dropship_upp2/right_wing + name = "starboard wing weapon attach point" + icon_state = "equip_base_r_wing"; + attach_id = 4 + dir = EAST + firing_arc_min = -3 + firing_arc_max = 3 + transverse = 3 + long = 0 + /obj/effect/attach_point/crew_weapon name = "crew compartment attach point" base_category = DROPSHIP_CREW_WEAPON @@ -143,6 +225,18 @@ /obj/effect/attach_point/crew_weapon/dropship3/floor plane = FLOOR_PLANE +/obj/effect/attach_point/crew_weapon/dropship_upp + ship_tag = DROPSHIP_MORANA + +/obj/effect/attach_point/crew_weapon/dropship_upp/floor + plane = FLOOR_PLANE + +/obj/effect/attach_point/crew_weapon/dropship_upp2 + ship_tag = DROPSHIP_DEVANA + +/obj/effect/attach_point/crew_weapon/dropship_upp2/floor + plane = FLOOR_PLANE + /obj/effect/attach_point/electronics name = "electronic system attach point" base_category = DROPSHIP_ELECTRONICS @@ -158,6 +252,12 @@ /obj/effect/attach_point/electronics/dropship3 ship_tag = DROPSHIP_SAIPAN +/obj/effect/attach_point/electronics/dropship_upp + ship_tag = DROPSHIP_MORANA + +/obj/effect/attach_point/electronics/dropship_upp2 + ship_tag = DROPSHIP_DEVANA + /obj/effect/attach_point/fuel name = "engine system attach point" icon = 'icons/obj/structures/props/dropship_equipment64.dmi' @@ -173,6 +273,12 @@ /obj/effect/attach_point/fuel/dropship3 ship_tag = DROPSHIP_SAIPAN +/obj/effect/attach_point/fuel/dropship_upp + ship_tag = DROPSHIP_MORANA + +/obj/effect/attach_point/fuel/dropship_upp2 + ship_tag = DROPSHIP_DEVANA + /obj/effect/attach_point/computer base_category = DROPSHIP_COMPUTER @@ -185,3 +291,6 @@ /obj/effect/attach_point/computer/dropship3 ship_tag = DROPSHIP_SAIPAN + +/obj/effect/attach_point/computer/dropship_upp + ship_tag = DROPSHIP_MORANA diff --git a/code/modules/gear_presets/_select_equipment.dm b/code/modules/gear_presets/_select_equipment.dm index def3fd4ade06..d9b389c7d899 100644 --- a/code/modules/gear_presets/_select_equipment.dm +++ b/code/modules/gear_presets/_select_equipment.dm @@ -23,7 +23,7 @@ var/origin_override var/minimap_icon = "private" - var/minimap_background = MINIMAP_ICON_BACKGROUND_USCM + var/minimap_background = "background" var/always_minimap_visible = TRUE //Uniform data @@ -286,13 +286,7 @@ character_trait.apply_trait(new_human, src) /datum/equipment_preset/proc/get_minimap_icon(mob/living/carbon/human/user) - var/image/background = mutable_appearance('icons/ui_icons/map_blips.dmi', "background") - if(user.assigned_squad) - background.color = user.assigned_squad.minimap_color - else if(minimap_background) - background.color = minimap_background - else - background.color = MINIMAP_ICON_BACKGROUND_CIVILIAN + var/image/background = mutable_appearance('icons/ui_icons/map_blips.dmi', user.assigned_squad?.background_icon ? user.assigned_squad.background_icon : minimap_background) if(islist(minimap_icon)) for(var/icons in minimap_icon) @@ -839,9 +833,8 @@ GLOBAL_LIST_INIT(rebel_rifles, list( new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/revolver/small(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/small(new_human), WEAR_IN_BACK) - -/datum/equipment_preset/proc/add_pmc_survivor_weapon(mob/living/carbon/human/new_human) // Random Weapons a WY PMC may have during a deployment on a colony. They are not equiped with the elite weapons than their space station counterparts but they do bear some of the better weapons the outer rim has to offer. - var/random_weapon = rand(0,6) +/datum/equipment_preset/proc/add_merc_survivor_weapon(mob/living/carbon/human/new_human) // Random Weapons an unaffiliated mercenary may have. + var/random_weapon = rand(0,5) switch(random_weapon) if(0) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/mp5(new_human), WEAR_L_HAND) @@ -853,17 +846,39 @@ GLOBAL_LIST_INIT(rebel_rifles, list( new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb(new_human), WEAR_L_HAND) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/shotgun_ammo, WEAR_WAIST) if(3) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/nsg23/no_lock/stripped(new_human), WEAR_L_HAND) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/nsg23(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m16(new_human), WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/m16(new_human), WEAR_WAIST) if(4) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/mar40/carbine(new_human), WEAR_L_HAND) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/mar40(new_human), WEAR_WAIST) if(5) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/merc(new_human), WEAR_L_HAND) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/shotgun_ammo, WEAR_WAIST) - if(6) + +/datum/equipment_preset/proc/add_pmc_survivor_weapon(mob/living/carbon/human/new_human) // Random Weapons a WY PMC may have during a deployment on a colony. They are not equiped with the elite weapons than their space station counterparts but they do bear some of the better weapons the outer rim has to offer. + var/random_weapon = rand(0,19) + switch(random_weapon) + if(0 to 4) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a/corporate/no_lock(new_human), WEAR_L_HAND) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/m41a(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(new_human), WEAR_IN_BACK) + if(5 to 9) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/nsg23/no_lock/stripped(new_human), WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/nsg23(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/nsg23(new_human), WEAR_IN_BACK) + if(10 to 13) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/m39/corporate/no_lock, WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39(new_human), WEAR_IN_BACK) + if(14 to 17) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/fp9000/pmc(new_human), WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/fp9000(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/fp9000(new_human), WEAR_IN_BACK) + if(18,19) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/combat(new_human), WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot(new_human), WEAR_IN_BACK) /** * Randomizes the primary weapon a survivor might find at the start of the outbreak in a gun cabinet. diff --git a/code/modules/gear_presets/clf.dm b/code/modules/gear_presets/clf.dm index e9570bbbab9f..e8d1e0cb746a 100644 --- a/code/modules/gear_presets/clf.dm +++ b/code/modules/gear_presets/clf.dm @@ -6,6 +6,7 @@ paygrades = list(PAY_SHORT_REB = JOB_PLAYTIME_TIER_0) faction = FACTION_CLF origin_override = ORIGIN_CIVILIAN + minimap_background = "background_clf" idtype = /obj/item/card/id/data /datum/equipment_preset/clf/New() @@ -54,6 +55,8 @@ rank = JOB_CLF role_comm_title = "GRL" + minimap_icon = "clf_mil" + skills = /datum/skills/clf /datum/equipment_preset/clf/soldier/load_gear(mob/living/carbon/human/new_human) @@ -159,6 +162,8 @@ rank = JOB_CLF_ENGI role_comm_title = "TECH" + minimap_icon = "clf_engi" + skills = /datum/skills/clf/combat_engineer /datum/equipment_preset/clf/engineer/load_gear(mob/living/carbon/human/new_human) @@ -283,6 +288,7 @@ assignment = JOB_CLF_MEDIC rank = JOB_CLF_MEDIC role_comm_title = "MED" + minimap_icon = "clf_med" paygrades = list(PAY_SHORT_CDOC = JOB_PLAYTIME_TIER_0) skills = /datum/skills/clf/combat_medic @@ -441,6 +447,9 @@ assignment = JOB_CLF_SPECIALIST rank = JOB_CLF_SPECIALIST role_comm_title = "SPC" + + minimap_icon = "clf_spec" + skills = /datum/skills/clf/specialist /datum/equipment_preset/clf/specialist/New() @@ -565,6 +574,9 @@ assignment = JOB_CLF_LEADER rank = JOB_CLF_LEADER role_comm_title = "LDR" + + minimap_icon = "clf_sl" + skills = /datum/skills/clf/leader /datum/equipment_preset/clf/leader/New() @@ -718,6 +730,8 @@ paygrades = list(PAY_SHORT_SYN = JOB_PLAYTIME_TIER_0) role_comm_title = "Syn" + minimap_icon = "clf_synth" + /datum/equipment_preset/clf/synth/New() . = ..() access = get_access(ACCESS_LIST_CLF_ALL) @@ -961,6 +975,9 @@ rank = JOB_CLF_COMMANDER paygrades = list(PAY_SHORT_REBC = JOB_PLAYTIME_TIER_0) role_comm_title = "CMDR" + + minimap_icon = "deputy" + skills = /datum/skills/clf/commander /datum/equipment_preset/clf/commander/New() diff --git a/code/modules/gear_presets/cmb.dm b/code/modules/gear_presets/cmb.dm index c5ae3998a0aa..cd1c4f5f0a80 100644 --- a/code/modules/gear_presets/cmb.dm +++ b/code/modules/gear_presets/cmb.dm @@ -5,6 +5,7 @@ rank = JOB_CMB idtype = /obj/item/card/id/deputy languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) + minimap_background = "background_cmb" var/human_versus_human = FALSE var/headset_type = /obj/item/device/radio/headset/distress/CMB @@ -62,6 +63,9 @@ flags = EQUIPMENT_PRESET_EXTRA assignment = "CMB Deputy" rank = JOB_CMB + + minimap_icon = "deputy" + skills = /datum/skills/cmb /datum/equipment_preset/cmb/standard/load_gear(mob/living/carbon/human/new_human) @@ -145,6 +149,8 @@ role_comm_title = "CMB MAR" flags = EQUIPMENT_PRESET_EXTRA + minimap_icon = "xo" + assignment = "CMB Marshal" rank = JOB_CMB_TL skills = /datum/skills/cmb/leader @@ -199,6 +205,8 @@ role_comm_title = "CMB Syn" flags = EQUIPMENT_PRESET_EXTRA + minimap_icon = "cmb_syn" + assignment = "CMB Investigative Synthetic" rank = JOB_CMB_SYN languages = ALL_SYNTH_LANGUAGES @@ -301,6 +309,8 @@ role_comm_title = "ICC Rep." flags = EQUIPMENT_PRESET_EXTRA + minimap_icon = "icc" + assignment = "Interstellar Commerce Commission Corporate Liaison" rank = JOB_CMB_ICC skills = /datum/skills/civilian/survivor @@ -360,6 +370,8 @@ role_comm_title = "OBS" flags = EQUIPMENT_PRESET_EXTRA + minimap_icon = "obs" + assignment = "Interstellar Human Rights Observer" rank = JOB_CMB_OBS skills = /datum/skills/civilian/survivor/doctor @@ -415,6 +427,8 @@ skills = /datum/skills/pfc/crafty faction = FACTION_MARSHAL faction_group = list(FACTION_MARSHAL, FACTION_MARINE) + minimap_icon = "private" + minimap_background = "background_cmb" /datum/equipment_preset/uscm/cmb/New() . = ..() @@ -465,6 +479,7 @@ role_comm_title = "A-TL" minimum_age = 25 skills = /datum/skills/SL + minimap_icon = "leader" /datum/equipment_preset/uscm/cmb/leader/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine, WEAR_BODY) @@ -506,6 +521,7 @@ paygrades = list(PAY_SHORT_ME4 = JOB_PLAYTIME_TIER_0) role_comm_title = "A-TS" skills = /datum/skills/tl + minimap_icon = "tl" /datum/equipment_preset/uscm/cmb/rto/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/rto, WEAR_BODY) @@ -548,6 +564,7 @@ paygrades = list(PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_0) role_comm_title = "A-HM" skills = /datum/skills/combat_medic + minimap_icon = "medic" utility_under = list(/obj/item/clothing/under/marine/medic) @@ -606,6 +623,7 @@ paygrades = list(PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_0) role_comm_title = "A-SG" skills = /datum/skills/smartgunner + minimap_icon = "smartgunner" /datum/equipment_preset/uscm/cmb/smartgunner/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine, WEAR_BODY) diff --git a/code/modules/gear_presets/colonist.dm b/code/modules/gear_presets/colonist.dm index 59b508f078af..5e42cb9aee5d 100644 --- a/code/modules/gear_presets/colonist.dm +++ b/code/modules/gear_presets/colonist.dm @@ -11,7 +11,6 @@ idtype = /obj/item/card/id/lanyard minimap_icon = "surv" - minimap_background = MINIMAP_ICON_BACKGROUND_CIVILIAN /datum/equipment_preset/colonist/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) diff --git a/code/modules/gear_presets/contractor.dm b/code/modules/gear_presets/contractor.dm index c0c2e7a79a03..97e70db0b472 100644 --- a/code/modules/gear_presets/contractor.dm +++ b/code/modules/gear_presets/contractor.dm @@ -87,10 +87,8 @@ new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/m15, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/m15, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/smoke, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE,WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/box/attachments(new_human), WEAR_IN_BACK) switch(choice) if(1 to 3) // 30% @@ -105,18 +103,23 @@ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40, WEAR_IN_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40, WEAR_IN_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/smoke, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/attachments, WEAR_IN_BACK) if(4 to 5) // 20% new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/l42a/abr40/tactical, WEAR_J_STORE) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/webbing, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/l42a/abr40/holo_target, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/l42a/abr40/holo_target, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/l42a/abr40/holo_target, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/l42a/ap, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/l42a/ap, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/l42a/ap, WEAR_IN_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large, WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/l42a/ap, WEAR_IN_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/l42a/ap, WEAR_IN_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/l42a/extended, WEAR_IN_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/l42a/extended, WEAR_IN_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/l42a/extended, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/l42a/extended, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/l42a/ap, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/attachments, WEAR_IN_BACK) if(6 to 8) // 20% new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a/tactical, WEAR_J_STORE) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/webbing, WEAR_ACCESSORY) @@ -129,7 +132,9 @@ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, WEAR_IN_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, WEAR_IN_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/extended, WEAR_IN_BACK) - if(8 to 9) // 20% + new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/smoke, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/attachments, WEAR_IN_BACK) + if(9) // 10% new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/combat/covert, WEAR_J_STORE) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/black_vest, WEAR_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) @@ -139,6 +144,8 @@ new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/large/buckshot, WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/smoke, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/attachments, WEAR_IN_BACK) if(10) // 10% new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1/tactical, WEAR_J_STORE) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/black_vest, WEAR_ACCESSORY) @@ -153,6 +160,8 @@ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1, WEAR_IN_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1, WEAR_IN_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/smoke, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/attachments, WEAR_IN_BACK) //*****************************************************************************************************/ @@ -501,6 +510,8 @@ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40, WEAR_IN_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40, WEAR_IN_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/smoke, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/attachments, WEAR_IN_BACK) if(4 to 5) // 20% new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/l42a/abr40/tactical, WEAR_J_STORE) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/webbing, WEAR_ACCESSORY) @@ -525,7 +536,9 @@ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, WEAR_IN_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, WEAR_IN_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/extended, WEAR_IN_BACK) - if(8 to 9) // 20% + new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/smoke, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/attachments, WEAR_IN_BACK) + if(9) // 10% new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/combat/covert, WEAR_J_STORE) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/black_vest, WEAR_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) @@ -535,6 +548,8 @@ new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/large/buckshot, WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/smoke, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/attachments, WEAR_IN_BACK) if(10) // 10% new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1/tactical, WEAR_J_STORE) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/black_vest, WEAR_ACCESSORY) @@ -549,6 +564,8 @@ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1, WEAR_IN_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1, WEAR_IN_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/smoke, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/attachments, WEAR_IN_BACK) //*****************************************************************************************************/ diff --git a/code/modules/gear_presets/corpses.dm b/code/modules/gear_presets/corpses.dm index d84cf766c4fc..b33e564985d0 100644 --- a/code/modules/gear_presets/corpses.dm +++ b/code/modules/gear_presets/corpses.dm @@ -602,7 +602,7 @@ new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(new_human), WEAR_R_STORE) add_random_survivor_equipment(new_human) - add_pmc_survivor_weapon(new_human) + add_survivor_weapon_security(new_human) add_survivor_weapon_pistol(new_human) /datum/equipment_preset/corpse/clf/burst diff --git a/code/modules/gear_presets/fax_responders.dm b/code/modules/gear_presets/fax_responders.dm new file mode 100644 index 000000000000..80212547d67b --- /dev/null +++ b/code/modules/gear_presets/fax_responders.dm @@ -0,0 +1,207 @@ +/datum/equipment_preset/fax_responder + name = "Fax Responder" + assignment = "Fax Responder" + rank = "Fax Responder" + + role_comm_title = "Resp." + + flags = EQUIPMENT_PRESET_EXTRA + faction = FACTION_FAX + + access = list(ACCESS_CIVILIAN_PUBLIC) + skills = /datum/skills/civilian/fax_responder + idtype = /obj/item/card/id/lanyard + + paygrades = list(PAY_SHORT_CIV = JOB_PLAYTIME_TIER_0) + + var/obj/item/device/radio/headset/headset_type = /obj/item/device/radio/headset + +/datum/equipment_preset/fax_responder/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new headset_type(new_human), WEAR_L_EAR) + + +/datum/equipment_preset/fax_responder/load_id(mob/living/carbon/human/new_human, client/mob_client) + var/obj/item/clothing/under/uniform = new_human.w_uniform + if(istype(uniform)) + uniform.has_sensor = UNIFORM_HAS_SENSORS + return ..() + +//*****************************************************************************************************/ + +/datum/equipment_preset/fax_responder/uscm + name = "Fax Responder - USCM HC" + assignment = JOB_FAX_RESPONDER_USCM_HC + rank = JOB_FAX_RESPONDER_USCM_HC + + paygrades = list(PAY_SHORT_MO2 = JOB_PLAYTIME_TIER_0, PAY_SHORT_MO3 = JOB_PLAYTIME_TIER_1, PAY_SHORT_MO4 = JOB_PLAYTIME_TIER_3) + idtype = /obj/item/card/id/gold + skills = /datum/skills/XO + access = list(ACCESS_MARINE_COMMAND, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_DATABASE, ACCESS_MARINE_MEDBAY, ACCESS_MARINE_BRIG, ACCESS_MARINE_AI) + headset_type = /obj/item/device/radio/headset/almayer/highcom + idtype = /obj/item/card/id/gold + +/datum/equipment_preset/fax_responder/uscm/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/marine/dress_cover/officer(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/dress/blues/senior(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/dress(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/dress(new_human), WEAR_HANDS) + + new_human.equip_to_slot_or_del(new /obj/item/notepad/blue(new_human), WEAR_R_STORE) + . = ..() + +/datum/equipment_preset/fax_responder/uscm/provost + name = "Fax Responder - USCM Provost" + assignment = JOB_FAX_RESPONDER_USCM_PVST + rank = JOB_FAX_RESPONDER_USCM_PVST + idtype = /obj/item/card/id/provost + +/datum/equipment_preset/fax_responder/uscm/provost/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/mp/provost/chief(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/provost/chief(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/mp/provost/chief(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud, WEAR_EYES) + + new_human.equip_to_slot_or_del(new /obj/item/notepad/red(new_human), WEAR_R_STORE) + . = ..() + +//*****************************************************************************************************/ + +/datum/equipment_preset/fax_responder/wey_yu + name = "Fax Responder - WY" + assignment = JOB_FAX_RESPONDER_WY + rank = JOB_FAX_RESPONDER_WY + paygrades = list(PAY_SHORT_WYC5 = JOB_PLAYTIME_TIER_0, PAY_SHORT_WYC6 = JOB_PLAYTIME_TIER_1, PAY_SHORT_WYC7 = JOB_PLAYTIME_TIER_3) + access = list(ACCESS_MARINE_COMMAND, ACCESS_WY_COLONIAL, ACCESS_WY_EXEC, ACCESS_WY_GENERAL, ACCESS_WY_LEADERSHIP) + headset_type = /obj/item/device/radio/headset/distress/pmc/command + idtype = /obj/item/card/id/pmc + +/datum/equipment_preset/fax_responder/wey_yu/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/blue(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/corporate/blue(new_human), WEAR_JACKET) + + new_human.equip_to_slot_or_del(new /obj/item/notepad/black(new_human), WEAR_R_STORE) + + ..() + +//*****************************************************************************************************/ + +/datum/equipment_preset/fax_responder/upp + name = "Fax Responder - UPP" + assignment = JOB_FAX_RESPONDER_UPP + rank = JOB_FAX_RESPONDER_UPP + paygrades = list(PAY_SHORT_UO2 = JOB_PLAYTIME_TIER_0, PAY_SHORT_UO3 = JOB_PLAYTIME_TIER_1, PAY_SHORT_UO4 = JOB_PLAYTIME_TIER_3) + skills = /datum/skills/upp/kapitan + headset_type = /obj/item/device/radio/headset/distress/UPP/kdo/command + idtype = /obj/item/card/id/gold + +/datum/equipment_preset/fax_responder/upp/New() + . = ..() + access = get_access(ACCESS_LIST_UPP_ALL) + +/datum/equipment_preset/fax_responder/upp/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP/officer(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/kapitan, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp/naval, WEAR_ACCESSORY) + + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) + + new_human.equip_to_slot_or_del(new /obj/item/notepad/green(new_human), WEAR_R_STORE) + + ..() + + +//*****************************************************************************************************/ + +/datum/equipment_preset/fax_responder/twe + name = "Fax Responder - TWE" + assignment = JOB_FAX_RESPONDER_TWE + rank = JOB_FAX_RESPONDER_TWE + headset_type = /obj/item/device/radio/headset/distress/royal_marine + idtype = /obj/item/card/id/gold + paygrades = list(PAY_SHORT_RNO2 = JOB_PLAYTIME_TIER_0, PAY_SHORT_RNO3 = JOB_PLAYTIME_TIER_1, PAY_SHORT_RNO4 = JOB_PLAYTIME_TIER_3) + +/datum/equipment_preset/fax_responder/twe/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/twe_suit(new_human), WEAR_BODY) + + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/white(new_human), WEAR_HANDS) + + new_human.equip_to_slot_or_del(new /obj/item/notepad/blue(new_human), WEAR_R_STORE) + + ..() + +//*****************************************************************************************************/ + +/datum/equipment_preset/fax_responder/clf + name = "Fax Responder - CLF" + assignment = JOB_FAX_RESPONDER_CLF + rank = JOB_FAX_RESPONDER_CLF + headset_type = /obj/item/device/radio/headset/distress/CLF/command + paygrades = list(PAY_SHORT_REBC = JOB_PLAYTIME_TIER_0) + +/datum/equipment_preset/fax_responder/clf/New() + . = ..() + access = get_access(ACCESS_LIST_CLF_ALL) + +/datum/equipment_preset/fax_responder/clf/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/clf(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp(new_human), WEAR_FEET) + + ..() + +//*****************************************************************************************************/ + +/datum/equipment_preset/fax_responder/cmb + name = "Fax Responder - CMB" + assignment = JOB_FAX_RESPONDER_CMB + rank = JOB_FAX_RESPONDER_CMB + headset_type = /obj/item/device/radio/headset/distress/CMB + idtype = /obj/item/card/id/marshal + paygrades = list(PAY_SHORT_CMBM = JOB_PLAYTIME_TIER_0) + +/datum/equipment_preset/fax_responder/cmb/New() + . = ..() + access = get_access(ACCESS_LIST_EMERGENCY_RESPONSE) + +/datum/equipment_preset/fax_responder/cmb/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/CM_uniform, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/holobadge/cord, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB/marshal, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/CMB, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud, WEAR_EYES) + + ..() + +//*****************************************************************************************************/ + +/datum/equipment_preset/fax_responder/press + name = "Fax Responder - Press" + assignment = JOB_FAX_RESPONDER_PRESS + rank = JOB_FAX_RESPONDER_PRESS + headset_type = /obj/item/device/radio/headset/almayer/reporter + idtype = /obj/item/card/id/silver/cl + paygrades = list(PAY_SHORT_CIV = JOB_PLAYTIME_TIER_0) + +/datum/equipment_preset/fax_responder/press/New() + . = ..() + access = get_access(ACCESS_LIST_EMERGENCY_RESPONSE) + +/datum/equipment_preset/fax_responder/press/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/reporter(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/reporter(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_L_STORE) + + ..() diff --git a/code/modules/gear_presets/fun.dm b/code/modules/gear_presets/fun.dm index f9b6970015c8..40316e57ab3b 100644 --- a/code/modules/gear_presets/fun.dm +++ b/code/modules/gear_presets/fun.dm @@ -85,6 +85,8 @@ paygrades = list("Ser" = JOB_PLAYTIME_TIER_0) role_comm_title = "OHEFA" + minimap_icon = "hefa" + skills = /datum/skills/specialist /datum/equipment_preset/fun/hefa/load_skills(mob/living/carbon/human/new_human) diff --git a/code/modules/gear_presets/other.dm b/code/modules/gear_presets/other.dm index 73f8c5dc4df0..fc2ebe3d0e63 100644 --- a/code/modules/gear_presets/other.dm +++ b/code/modules/gear_presets/other.dm @@ -744,6 +744,9 @@ assignment = "Cultist" rank = "Cultist" + minimap_icon = "cultist" + minimap_background = "background_cultist" + /datum/equipment_preset/other/xeno_cultist/New() . = ..() access = get_access(ACCESS_LIST_COLONIAL_ALL) @@ -805,6 +808,8 @@ assignment = "Cultist Leader" rank = "Cultist Leader" + minimap_icon = "cult_leader" + /datum/equipment_preset/other/xeno_cultist/leader/load_gear(mob/living/carbon/human/new_human) . = ..() new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/cultist(new_human), WEAR_EYES) diff --git a/code/modules/gear_presets/pmc.dm b/code/modules/gear_presets/pmc.dm index e280060cae34..519e9380ce8d 100644 --- a/code/modules/gear_presets/pmc.dm +++ b/code/modules/gear_presets/pmc.dm @@ -7,6 +7,7 @@ faction = FACTION_PMC faction_group = FACTION_LIST_WY languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) + minimap_background = "background_pmc" var/human_versus_human = FALSE var/headset_type = /obj/item/device/radio/headset/distress/pmc @@ -331,7 +332,9 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), assignment = JOB_PMC_MEDIC rank = JOB_PMC_MEDIC + minimap_icon = "pmc_md" paygrades = list(PAY_SHORT_PMC_MS = JOB_PLAYTIME_TIER_0) + role_comm_title = "CM" skills = /datum/skills/pmc/medic headset_type = /obj/item/device/radio/headset/distress/pmc/medic @@ -507,6 +510,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), assignment = JOB_PMC_INVESTIGATOR rank = JOB_PMC_INVESTIGATOR + minimap_icon = "pmc_td" paygrades = list(PAY_SHORT_PMC_MS = JOB_PLAYTIME_TIER_0) skills = /datum/skills/pmc/medic/chem headset_type = /obj/item/device/radio/headset/distress/pmc/medic @@ -689,6 +693,9 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), rank = JOB_PMC_LEADER paygrades = list(PAY_SHORT_PMC_TL = JOB_PLAYTIME_TIER_0) role_comm_title = "SL" + + minimap_icon = "pmc_ld" + skills = /datum/skills/pmc/SL headset_type = /obj/item/device/radio/headset/distress/pmc/command @@ -988,6 +995,9 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), rank = JOB_PMC_GUNNER paygrades = list(PAY_SHORT_PMC_SS = JOB_PLAYTIME_TIER_0) role_comm_title = "SG" + + minimap_icon = "pmc_sg" + skills = /datum/skills/pmc/smartgunner /datum/equipment_preset/pmc/pmc_gunner/load_gear(mob/living/carbon/human/new_human) @@ -1489,6 +1499,9 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), rank = JOB_PMC_DOCTOR paygrades = list(PAY_SHORT_PMC_DOC = JOB_PLAYTIME_TIER_0) role_comm_title = "SGN" + + minimap_icon = "pmc_ld" + skills = /datum/skills/pmc/doctor headset_type = /obj/item/device/radio/headset/distress/pmc/medic @@ -1664,6 +1677,9 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), rank = JOB_PMC_ENGINEER paygrades = list(PAY_SHORT_PMC_TEC = JOB_PLAYTIME_TIER_0) role_comm_title = "TEC" + + minimap_icon = "engi" + skills = /datum/skills/pmc/engineer headset_type = /obj/item/device/radio/headset/distress/pmc/cct @@ -1814,6 +1830,9 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), paygrades = list(PAY_SHORT_PMC_DIR = JOB_PLAYTIME_TIER_0) role_comm_title = "DIR" skills = /datum/skills/pmc/director + + minimap_icon = "pmc_sd" + headset_type = /obj/item/device/radio/headset/distress/pmc/command/director /datum/equipment_preset/pmc/director/load_gear(mob/living/carbon/human/new_human) @@ -1850,6 +1869,7 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), idtype = /obj/item/card/id/pmc assignment = JOB_PMC_SYNTH rank = JOB_PMC_SYNTH + minimap_icon = "pmc_syn" paygrades = list(PAY_SHORT_SYN = JOB_PLAYTIME_TIER_0) role_comm_title = "WY Syn" headset_type = /obj/item/device/radio/headset/distress/pmc/command @@ -1893,10 +1913,9 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/nailgun, WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/nailgun, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/leader, WEAR_HEAD) new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/experimental_mesons, WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc, WEAR_FACE) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) @@ -1907,9 +1926,10 @@ list("POUCHES (CHOOSE 2)", 0, null, null, null), new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator/upgraded, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/tool/crew_monitor, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/nailgun/compact, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full/dutch, WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/nailgun/compact, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/maintenance_jack, WEAR_J_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tactical, WEAR_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/tool/screwdriver/tactical, WEAR_IN_L_STORE) diff --git a/code/modules/gear_presets/royal_marines.dm b/code/modules/gear_presets/royal_marines.dm index f59ade2eb75b..b648e0fb31b8 100644 --- a/code/modules/gear_presets/royal_marines.dm +++ b/code/modules/gear_presets/royal_marines.dm @@ -3,6 +3,7 @@ faction = FACTION_TWE faction_group = list(FACTION_TWE, FACTION_MARINE) languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) + minimap_background = "background_twe" /datum/equipment_preset/twe/royal_marine/load_name(mob/living/carbon/human/new_human, randomise) new_human.gender = pick_weight(list(MALE = 80, FEMALE = 20,)) @@ -63,6 +64,9 @@ flags = EQUIPMENT_PRESET_EXTRA assignment = "Royal Marines Rifleman" rank = JOB_TWE_RMC_RIFLEMAN + + minimap_icon = "rmc_rifleman" + skills = /datum/skills/rmc /datum/equipment_preset/twe/royal_marine/standard/load_gear(mob/living/carbon/human/new_human) @@ -118,6 +122,7 @@ name = "TWE Royal Marine Commando (Marksman)" assignment = "Royal Marines Marksman" rank = JOB_TWE_RMC_MARKSMAN + minimap_icon = "rmc_marksman" /datum/equipment_preset/twe/royal_marine/spec/marksman/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) @@ -159,6 +164,7 @@ name = "TWE Royal Marine Commando (Breacher)" assignment = "Royal Marines Breacher" rank = JOB_TWE_RMC_BREACHER + minimap_icon = "rmc_breacher" /datum/equipment_preset/twe/royal_marine/spec/breacher/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) @@ -203,6 +209,9 @@ role_comm_title = "RMC SG" assignment = "Royal Marines Smartgunner" rank = JOB_TWE_RMC_SMARTGUNNER + + minimap_icon = "rmc_sg" + skills = /datum/skills/rmc/smartgun /datum/equipment_preset/twe/royal_marine/spec/machinegun/load_gear(mob/living/carbon/human/new_human) @@ -247,6 +256,9 @@ flags = EQUIPMENT_PRESET_EXTRA assignment = "Royal Marines Team Leader" rank = JOB_TWE_RMC_TEAMLEADER + + minimap_icon = "rmc_teamleader" + skills = /datum/skills/rmc/leader /datum/equipment_preset/twe/royal_marine/team_leader/load_gear(mob/living/carbon/human/new_human) @@ -296,6 +308,9 @@ flags = EQUIPMENT_PRESET_EXTRA assignment = "Royal Marines Team Commander" rank = JOB_TWE_RMC_LIEUTENANT + + minimap_icon = "rmc_lieutenant" + skills = /datum/skills/rmc/leader /datum/equipment_preset/twe/royal_marine/lieuteant/load_gear(mob/living/carbon/human/new_human) diff --git a/code/modules/gear_presets/survivors/fiorina_sciannex/preset_fiorina_sciannex.dm b/code/modules/gear_presets/survivors/fiorina_sciannex/preset_fiorina_sciannex.dm index 873ade0aefc8..1f19848253a1 100644 --- a/code/modules/gear_presets/survivors/fiorina_sciannex/preset_fiorina_sciannex.dm +++ b/code/modules/gear_presets/survivors/fiorina_sciannex/preset_fiorina_sciannex.dm @@ -12,6 +12,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/science(new_human), WEAR_EYES) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/tox(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY(new_human), WEAR_L_EAR) ..() @@ -22,6 +23,7 @@ /datum/equipment_preset/survivor/doctor/fiorina/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/lightblue(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY(new_human), WEAR_L_EAR) ..() /datum/equipment_preset/survivor/security/fiorina @@ -33,6 +35,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/holobadge(new_human), WEAR_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/security(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY(new_human), WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/soft/sec/corp(new_human), WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran(new_human), WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) @@ -41,6 +44,8 @@ /datum/equipment_preset/survivor/colonial_marshal/fiorina name = "Survivor - United Americas Riot Officer" assignment = "United Americas Riot Officer" + minimap_icon = "mp" + minimap_background = "background_ua" /datum/equipment_preset/survivor/colonial_marshal/fiorina/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/ua_riot(new_human), WEAR_BODY) @@ -64,3 +69,14 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/orange(new_human), WEAR_HEAD) ..() + +/datum/equipment_preset/survivor/corporate/fiorina + name = "Survivor - Fiorina Corporate Liaison" + assignment = "Fiorina Corporate Liaison" + +/datum/equipment_preset/survivor/corporate/fiorina/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/regular/hipster(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/security, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup/brown(new_human), WEAR_FEET) + ..() diff --git a/code/modules/gear_presets/survivors/fiorina_sciannex/riot_in_progress_insert_fiorina_nightmare.dm b/code/modules/gear_presets/survivors/fiorina_sciannex/riot_in_progress_insert_fiorina_nightmare.dm index 27d39348e7d0..42c1ca369076 100644 --- a/code/modules/gear_presets/survivors/fiorina_sciannex/riot_in_progress_insert_fiorina_nightmare.dm +++ b/code/modules/gear_presets/survivors/fiorina_sciannex/riot_in_progress_insert_fiorina_nightmare.dm @@ -6,6 +6,7 @@ faction_group = list(FACTION_MARSHAL, FACTION_MARINE, FACTION_SURVIVOR) languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) var/human_versus_human = FALSE + minimap_background = "background_cmb" access = list( ACCESS_LIST_UA, ) @@ -20,6 +21,7 @@ assignment = "CMB Deputy" rank = JOB_CMB skills = /datum/skills/cmb + minimap_icon = "deputy" /datum/equipment_preset/survivor/cmb/standard/load_gear(mob/living/carbon/human/new_human) @@ -97,6 +99,8 @@ rank = JOB_CMB_SYN languages = ALL_SYNTH_LANGUAGES skills = /datum/skills/synthetic/cmb + minimap_icon = "cmb_syn" + minimap_background = "background_cmb" /datum/equipment_preset/synth/survivor/cmb/synth/load_race(mob/living/carbon/human/new_human) new_human.set_species(SYNTH_COLONY) @@ -155,6 +159,8 @@ flags = EQUIPMENT_PRESET_EXTRA assignment = "United Americas Police Officer" skills = /datum/skills/civilian/survivor/marshal + minimap_icon = "mp" + minimap_background = "background_ua" idtype = /obj/item/card/id/silver /datum/equipment_preset/survivor/cmb/ua/load_gear(mob/living/carbon/human/new_human) @@ -235,6 +241,8 @@ assignment = "UA Police Synthetic" languages = ALL_SYNTH_LANGUAGES skills = /datum/skills/colonial_synthetic + minimap_icon = "synth" + minimap_background = "background_ua" idtype = /obj/item/card/id/silver /datum/equipment_preset/synth/survivor/cmb/ua_synth/load_race(mob/living/carbon/human/new_human) diff --git a/code/modules/gear_presets/survivors/kutjevo/preset_kutjevo.dm b/code/modules/gear_presets/survivors/kutjevo/preset_kutjevo.dm index 6db2882ddf82..610f73e0f1ab 100644 --- a/code/modules/gear_presets/survivors/kutjevo/preset_kutjevo.dm +++ b/code/modules/gear_presets/survivors/kutjevo/preset_kutjevo.dm @@ -73,3 +73,17 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(new_human), WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) ..() + +/datum/equipment_preset/survivor/corporate/kutjevo + name = "Survivor - Kutjevo Corporate Liaison" + assignment = "Kutjevo Corporate Liaison" + +/datum/equipment_preset/survivor/corporate/kutjevo/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/orange(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/kutjevo(new_human), WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/kutjevo (new_human), WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/kutjevo(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate(new_human), WEAR_FEET) + ..() diff --git a/code/modules/gear_presets/survivors/lv_522/forcon_survivors.dm b/code/modules/gear_presets/survivors/lv_522/forcon_survivors.dm index c27fa213592f..1a81ddd30cb5 100644 --- a/code/modules/gear_presets/survivors/lv_522/forcon_survivors.dm +++ b/code/modules/gear_presets/survivors/lv_522/forcon_survivors.dm @@ -4,6 +4,7 @@ paygrades = list(PAY_SHORT_ME5 = JOB_PLAYTIME_TIER_0) idtype = /obj/item/card/id/dogtag role_comm_title = "FORECON" + minimap_background = "background_forecon" rank = JOB_SURVIVOR faction_group = list(FACTION_MARINE, FACTION_SURVIVOR) flags = EQUIPMENT_PRESET_START_OF_ROUND @@ -71,10 +72,7 @@ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/m1911(new_human), WEAR_IN_BELT) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/m1911(new_human), WEAR_IN_BELT) if(3 , 4) - new_human.equip_to_slot_or_del(new /obj/item/storage/large_holster/m39, WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/m39(new_human), WEAR_IN_BELT) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/extended(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/extended(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m39/full/extended, WEAR_WAIST) if(5) new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector(new_human),WEAR_WAIST) @@ -110,6 +108,7 @@ name = "Survivor - USCM Reconnaissance Marine" assignment = JOB_FORECON_RIFLEMAN skills = /datum/skills/military/survivor/forecon_standard + minimap_icon = "private" /datum/equipment_preset/survivor/forecon/standard/load_gear(mob/living/carbon/human/new_human) ..() @@ -124,6 +123,7 @@ name = "Survivor - USCM Reconnaissance Support Technician" assignment = JOB_FORECON_SUPPORT skills = /datum/skills/military/survivor/forecon_techician + minimap_icon = "engi" /datum/equipment_preset/survivor/forecon/tech/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel/big(new_human), WEAR_BACK) @@ -146,6 +146,7 @@ name = "Survivor - USCM Reconnaissance Designated Marksman" assignment = JOB_FORECON_MARKSMAN skills = /datum/skills/military/survivor/forecon_marksman + minimap_icon = "spec" /datum/equipment_preset/survivor/forecon/marksman/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m4ra_custom(new_human), WEAR_L_HAND) @@ -162,6 +163,7 @@ name = "Survivor - USCM Reconnaissance Smartgunner" assignment = JOB_FORECON_SMARTGUNNER skills = /datum/skills/military/survivor/forecon_smartgunner + minimap_icon = "smartgunner" /datum/equipment_preset/survivor/forecon/smartgunner/load_gear(mob/living/carbon/human/new_human) ..() @@ -180,6 +182,7 @@ name = "Survivor - USCM Reconnaissance Sniper" assignment = JOB_FORECON_SNIPER skills = /datum/skills/military/survivor/forecon_sniper + minimap_icon = "spec" /datum/equipment_preset/survivor/forecon/sniper/load_gear(mob/living/carbon/human/new_human) var/obj/item/clothing/under/marine/reconnaissance/uniform = new() @@ -215,6 +218,7 @@ assignment = JOB_FORECON_SL skills = /datum/skills/military/survivor/forecon_squad_leader paygrades = list(PAY_SHORT_MO1 = JOB_PLAYTIME_TIER_0) + minimap_icon = "leader" dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior) dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer) @@ -247,6 +251,8 @@ paygrades = list(PAY_SHORT_MO4 = JOB_PLAYTIME_TIER_0) idtype = /obj/item/card/id/gold role_comm_title = "FORECON CO" + minimap_icon = "co" + minimap_background = "background_command" dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior) dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer) diff --git a/code/modules/gear_presets/survivors/lv_624/clfship_insert_lv624.dm b/code/modules/gear_presets/survivors/lv_624/clfship_insert_lv624.dm index 1bfeaaad9c43..d199e19e452b 100644 --- a/code/modules/gear_presets/survivors/lv_624/clfship_insert_lv624.dm +++ b/code/modules/gear_presets/survivors/lv_624/clfship_insert_lv624.dm @@ -7,6 +7,8 @@ languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) faction = FACTION_CLF faction_group = list(FACTION_CLF, FACTION_SURVIVOR) + minimap_background = "background_clf" + minimap_icon = "clf_mil" access = list(ACCESS_CIVILIAN_PUBLIC) survivor_variant = HOSTILE_SURVIVOR diff --git a/code/modules/gear_presets/survivors/misc.dm b/code/modules/gear_presets/survivors/misc.dm index 1a24ca5d58b9..7d02b5084a66 100644 --- a/code/modules/gear_presets/survivors/misc.dm +++ b/code/modules/gear_presets/survivors/misc.dm @@ -141,7 +141,7 @@ Everything below isn't used or out of place. new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran(new_human), WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large(new_human), WEAR_R_STORE) - add_pmc_survivor_weapon(new_human) + add_merc_survivor_weapon(new_human) add_ice_colony_survivor_equipment(new_human) ..() @@ -181,6 +181,8 @@ Everything below isn't used or out of place. skills = /datum/skills/civilian/survivor/goon languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_COMMAND, ACCESS_CIVILIAN_BRIG, ACCESS_WY_COLONIAL) + minimap_icon = "goon_standard" + minimap_background = "background_goon" survivor_variant = SECURITY_SURVIVOR @@ -224,9 +226,15 @@ Everything below isn't used or out of place. new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/mercenary/miner, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/mercenary/miner, WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(new_human), WEAR_R_STORE) - add_pmc_survivor_weapon(new_human) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/dutch, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/full(new_human), WEAR_L_STORE) + add_merc_survivor_weapon(new_human) + add_random_survivor_equipment(new_human) + new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/med_small_stack(new_human), WEAR_IN_BACK) - ..() // after double check pmc/freelancer isn't being used anywhere. /datum/equipment_preset/survivor/pmc/freelancer @@ -246,9 +254,10 @@ Everything below isn't used or out of place. new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/dutch, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(new_human), WEAR_R_STORE) - add_pmc_survivor_weapon(new_human) - - ..() + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/full(new_human), WEAR_L_STORE) + add_merc_survivor_weapon(new_human) + add_random_survivor_equipment(new_human) + new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/med_small_stack(new_human), WEAR_IN_BACK) // New Varadero CO Survivor. /datum/equipment_preset/survivor/new_varadero/commander @@ -256,6 +265,8 @@ Everything below isn't used or out of place. assignment = "USASF Commander" skills = /datum/skills/commander paygrades = list(PAY_SHORT_NO5 = JOB_PLAYTIME_TIER_0) + minimap_icon = "xo" + minimap_background = "background_shipside" idtype = /obj/item/card/id/gold role_comm_title = "USASF CDR" flags = EQUIPMENT_PRESET_START_OF_ROUND diff --git a/code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm b/code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm index a23b405ef019..bed04eac198a 100644 --- a/code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm +++ b/code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm @@ -4,13 +4,17 @@ /datum/equipment_preset/survivor/pmc name = "Survivor - PMC" flags = EQUIPMENT_PRESET_START_OF_ROUND - assignment = "Weyland-Yutani PMC" - faction = FACTION_SURVIVOR - faction_group = list(FACTION_WY, FACTION_SURVIVOR) + assignment = JOB_PMC_STANDARD + rank = JOB_PMC_STANDARD + faction = FACTION_PMC + faction_group = list(FACTION_WY, FACTION_SURVIVOR, FACTION_PMC) paygrades = list(PAY_SHORT_PMC_OP = JOB_PLAYTIME_TIER_0) idtype = /obj/item/card/id/pmc skills = /datum/skills/civilian/survivor/pmc languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) + minimap_icon = "private" + minimap_background = "background_pmc" + access = list( ACCESS_WY_GENERAL, ACCESS_WY_COLONIAL, @@ -30,25 +34,31 @@ /datum/equipment_preset/survivor/pmc/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/pmc/hvh, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK) add_pmc_survivor_weapon(new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc, WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf, WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/med_small_stack(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88_near_empty, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/full(new_human), WEAR_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(new_human), WEAR_R_STORE) - ..() // /obj/effect/landmark/survivor_spawner/bigred_crashed_pmc_medic /datum/equipment_preset/survivor/pmc/medic name = "Survivor - PMC Medic" assignment = JOB_PMC_MEDIC + rank = JOB_PMC_MEDIC paygrades = list(PAY_SHORT_PMC_MS = JOB_PLAYTIME_TIER_0) + role_comm_title = "CM" skills = /datum/skills/civilian/survivor/pmc/medic + minimap_icon = "pmc_md" /datum/equipment_preset/survivor/pmc/medic/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/pmc/medic/hvh, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv(new_human), WEAR_IN_BACK) @@ -57,6 +67,7 @@ else new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(new_human), WEAR_EYES) new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_R_HAND) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/pmc/medic/hvh, WEAR_L_EAR) ..() // /obj/effect/landmark/survivor_spawner/bigred_crashed_pmc_engineer @@ -64,14 +75,39 @@ /datum/equipment_preset/survivor/pmc/engineer name = "Survivor - PMC Engineer" assignment = JOB_PMC_ENGINEER + rank = JOB_PMC_ENGINEER paygrades = list(PAY_SHORT_PMC_TEC = JOB_PLAYTIME_TIER_0) + role_comm_title = "TEC" skills = /datum/skills/civilian/survivor/pmc/engineer + minimap_icon = "engi" /datum/equipment_preset/survivor/pmc/engineer/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/pmc/cct/hvh, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding/superior, WEAR_EYES) new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/med_small_stack(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_R_HAND) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/pmc/cct/hvh, WEAR_L_EAR) + + ..() +// /obj/effect/landmark/survivor_spawner/bigred_crashed_pmc_leader + +/datum/equipment_preset/survivor/pmc/pmc_leader + name = "Survivor - PMC Leader" + assignment = JOB_PMC_LEADER + rank = JOB_PMC_LEADER + paygrades = list(PAY_SHORT_PMC_TL = JOB_PLAYTIME_TIER_0) + role_comm_title = "SL" + skills = /datum/skills/civilian/survivor/pmc/lead + minimap_icon = "pmc_ld" + +/datum/equipment_preset/survivor/pmc/pmc_leader/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/pmc/command/hvh, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc/leader, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/leader, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/leader, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) ..() @@ -83,9 +119,11 @@ paygrades = list(PAY_SHORT_WYC6 = JOB_PLAYTIME_TIER_0) skills = /datum/skills/civilian/survivor/manager assignment = "Colony Supervisor" + rank = JOB_EXECUTIVE_SUPERVISOR role_comm_title = "Supervisor" idtype = /obj/item/card/id/silver/clearance_badge/manager - faction_group = list(FACTION_WY, FACTION_SURVIVOR) + faction = FACTION_WY + faction_group = list(FACTION_WY, FACTION_SURVIVOR, FACTION_PMC) access = list( ACCESS_WY_GENERAL, ACCESS_WY_COLONIAL, @@ -112,6 +150,7 @@ if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) add_ice_colony_survivor_equipment(new_human) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/lockable/liaison, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/pmc/command/hvh, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/reagent_container/glass/beaker/vial/random/good(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/paper/research_notes/grant, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/manager(new_human), WEAR_JACKET) @@ -120,15 +159,15 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/head/manager(new_human), WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/reagent_container/glass/beaker/vial/random/good(new_human), WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/full(new_human), WEAR_L_STORE) add_pmc_survivor_weapon(new_human) add_random_cl_survivor_loot(new_human) - ..() // only used on the spawner of all of those above... /datum/equipment_preset/synth/survivor/pmc name = "Survivor - Synthetic - PMC Support Synth" - faction = FACTION_SURVIVOR - faction_group = list(FACTION_WY, FACTION_SURVIVOR) + faction = FACTION_PMC + faction_group = list(FACTION_WY, FACTION_SURVIVOR, FACTION_PMC) access = list( ACCESS_WY_GENERAL, ACCESS_WY_COLONIAL, @@ -144,14 +183,22 @@ ACCESS_CIVILIAN_MEDBAY, ACCESS_CIVILIAN_COMMAND, ) + skills = /datum/skills/synthetic idtype = /obj/item/card/id/pmc assignment = JOB_PMC_SYNTH rank = JOB_PMC_SYNTH role_comm_title = "WY Syn" + skills = /datum/skills/synthetic + minimap_icon = "pmc_syn" + minimap_background = "background_pmc" /datum/equipment_preset/synth/survivor/pmc/load_race(mob/living/carbon/human/new_human) new_human.set_species(SYNTH_GEN_THREE) +/datum/equipment_preset/synth/survivor/pmc/load_skills(mob/living/carbon/human/new_human) + new_human.set_skills(/datum/skills/synthetic) + new_human.allow_gun_usage = FALSE + /datum/equipment_preset/synth/survivor/pmc/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc, WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/droppouch, WEAR_ACCESSORY) @@ -160,24 +207,22 @@ new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs/zip, WEAR_IN_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/synth, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/weapon/telebaton, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/nailgun, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/leader, WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/pmc/command/hvh, WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc, WEAR_FACE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses, WEAR_EYES) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/smartpack/white, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/smartpack/white/drained, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/roller/surgical, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator/upgraded, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/tool/crew_monitor, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full/dutch, WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/nailgun/compact, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/dutch/partial, WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tactical, WEAR_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/tool/screwdriver/tactical, WEAR_IN_L_STORE) diff --git a/code/modules/gear_presets/survivors/solaris/preset_solaris.dm b/code/modules/gear_presets/survivors/solaris/preset_solaris.dm index 65cf3e7f0132..92e92576cd27 100644 --- a/code/modules/gear_presets/survivors/solaris/preset_solaris.dm +++ b/code/modules/gear_presets/survivors/solaris/preset_solaris.dm @@ -68,6 +68,8 @@ /datum/equipment_preset/survivor/security/solaris name = "Survivor - Solaris United Americas Peacekeepers" assignment = "United Americas Peacekeeper" + minimap_icon = "peacekeeper" + minimap_background = "background_ua" /datum/equipment_preset/survivor/security/solaris/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/ua_riot(new_human), WEAR_BODY) @@ -82,6 +84,8 @@ name = "Survivor - Solaris United States Colonial Marine Corps Recruiter" assignment = "USCM Recruiter" paygrades = list(PAY_SHORT_ME5 = JOB_PLAYTIME_TIER_0) + minimap_icon = "recruiter" + minimap_background = "background_medical" /datum/equipment_preset/survivor/uscm/solaris/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/bridge(new_human), WEAR_BODY) diff --git a/code/modules/gear_presets/survivors/sorokyne_strata/preset_sorokyne_strata.dm b/code/modules/gear_presets/survivors/sorokyne_strata/preset_sorokyne_strata.dm index f285a9635bde..793363557cab 100644 --- a/code/modules/gear_presets/survivors/sorokyne_strata/preset_sorokyne_strata.dm +++ b/code/modules/gear_presets/survivors/sorokyne_strata/preset_sorokyne_strata.dm @@ -1,6 +1,8 @@ /datum/equipment_preset/survivor/engineer/soro name = "Survivor - Sorokyne Strata State Contractor" assignment = "Sorokyne Strata State Contractor" + minimap_icon = "upp_cont" + minimap_background = "background_upp" /datum/equipment_preset/survivor/engineer/soro/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP(new_human), WEAR_BODY) @@ -14,6 +16,8 @@ /datum/equipment_preset/survivor/security/soro name = "Survivor - Sorokyne Strata Security" assignment = "Sorokyne Strata Security" + minimap_icon = "upp_sec" + minimap_background = "background_upp" /datum/equipment_preset/survivor/security/soro/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/veteran/soviet_uniform_01(new_human), WEAR_BODY) @@ -28,6 +32,8 @@ /datum/equipment_preset/survivor/doctor/soro name = "Survivor - Sorokyne Strata Doctor" assignment = "Sorokyne Strata Doctor" + minimap_icon = "upp_doc" + minimap_background = "background_upp" /datum/equipment_preset/survivor/doctor/soro/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/veteran/soviet_uniform_01(new_human), WEAR_BODY) @@ -38,6 +44,8 @@ /datum/equipment_preset/survivor/scientist/soro name = "Survivor - Sorokyne Strata Researcher" assignment = "Sorokyne Strata Researcher" + minimap_icon = "upp_sci" + minimap_background = "background_upp" /datum/equipment_preset/survivor/scientist/soro/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/blue(new_human), WEAR_BODY) diff --git a/code/modules/gear_presets/survivors/survivors.dm b/code/modules/gear_presets/survivors/survivors.dm index bdfd47dd20ca..27e50bf9be41 100644 --- a/code/modules/gear_presets/survivors/survivors.dm +++ b/code/modules/gear_presets/survivors/survivors.dm @@ -14,7 +14,7 @@ access = list(ACCESS_CIVILIAN_PUBLIC) minimap_icon = "surv" - minimap_background = MINIMAP_ICON_BACKGROUND_CIVILIAN + minimap_background = "background_civillian" var/survivor_variant = CIVILIAN_SURVIVOR @@ -263,6 +263,8 @@ Standart Survivors : /datum/equipment_preset/survivor/scientist, assignment = "CMB Deputy" paygrades = list(PAY_SHORT_CMBD = JOB_PLAYTIME_TIER_0) skills = /datum/skills/civilian/survivor/marshal + minimap_icon = "deputy" + minimap_background = "background_cmb" flags = EQUIPMENT_PRESET_START_OF_ROUND idtype = /obj/item/card/id/deputy role_comm_title = "CMB DEP" @@ -375,6 +377,8 @@ Everything bellow is a parent used as a base for one or multiple maps. ) languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) survivor_variant = CORPORATE_SURVIVOR + minimap_icon = "cl" + minimap_background = "background_civillian" /datum/equipment_preset/survivor/corporate/load_rank(mob/living/carbon/human/new_human, client/mob_client) if(paygrades.len == 1) @@ -468,6 +472,8 @@ Everything bellow is a parent used as a base for one or multiple maps. skills = /datum/skills/civilian/survivor flags = EQUIPMENT_PRESET_START_OF_ROUND access = list(ACCESS_CIVILIAN_PUBLIC,ACCESS_CIVILIAN_COMMAND) + minimap_icon = "obs" + minimap_background = "background_cmb" /datum/equipment_preset/survivor/interstellar_human_rights_observer/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/brown(new_human), WEAR_BODY) @@ -494,6 +500,8 @@ Everything bellow is a parent used as a base for one or multiple maps. faction_group = FACTION_LIST_SURVIVOR_WY idtype = /obj/item/card/id/silver/cl role_comm_title = "ICC Rep." + minimap_icon = "icc" + minimap_background = "background_cmb" survivor_variant = CORPORATE_SURVIVOR diff --git a/code/modules/gear_presets/survivors/trijent/crashlanding_upp_bar_insert_trijent.dm b/code/modules/gear_presets/survivors/trijent/crashlanding_upp_bar_insert_trijent.dm index 25136c172b6d..d098f242ed82 100644 --- a/code/modules/gear_presets/survivors/trijent/crashlanding_upp_bar_insert_trijent.dm +++ b/code/modules/gear_presets/survivors/trijent/crashlanding_upp_bar_insert_trijent.dm @@ -9,6 +9,8 @@ languages = list(LANGUAGE_RUSSIAN, LANGUAGE_GERMAN, LANGUAGE_CHINESE) faction = FACTION_UPP faction_group = list(FACTION_UPP, FACTION_SURVIVOR) + minimap_icon = "upp_pvt" + minimap_background = "background_upp" role_comm_title = "173/RECON" idtype = /obj/item/card/id/dogtag flags = EQUIPMENT_PRESET_EXTRA @@ -69,6 +71,9 @@ paygrades = list(PAY_SHORT_UE3 = JOB_PLAYTIME_TIER_0) assignment = JOB_UPP_ENGI rank = JOB_UPP_ENGI + + minimap_icon = "upp_sapper" + skills = /datum/skills/military/survivor/upp_sapper /datum/equipment_preset/survivor/upp/sapper/load_gear(mob/living/carbon/human/new_human) @@ -97,6 +102,9 @@ paygrades = list(PAY_SHORT_UE3 = JOB_PLAYTIME_TIER_0) assignment = JOB_UPP_MEDIC rank = JOB_UPP_MEDIC + + minimap_icon = "upp_med" + skills = /datum/skills/military/survivor/upp_medic /datum/equipment_preset/survivor/upp/medic/load_gear(mob/living/carbon/human/new_human) @@ -126,6 +134,7 @@ name = "Survivor - UPP Specialist" assignment = JOB_UPP_SPECIALIST rank = JOB_UPP_SPECIALIST + minimap_icon = "upp_spec" paygrades = list(PAY_SHORT_UE4 = JOB_PLAYTIME_TIER_0) skills = /datum/skills/military/survivor/upp_spec @@ -150,6 +159,9 @@ rank = JOB_UPP_LEADER languages = list(LANGUAGE_RUSSIAN, LANGUAGE_ENGLISH, LANGUAGE_GERMAN, LANGUAGE_CHINESE) role_comm_title = "173/RECON SL" + + minimap_icon = "upp_sl" + skills = /datum/skills/military/survivor/upp_sl /datum/equipment_preset/survivor/upp/squad_leader/load_gear(mob/living/carbon/human/new_human) @@ -176,6 +188,8 @@ paygrades = list(PAY_SHORT_SYN = JOB_PLAYTIME_TIER_0) idtype = /obj/item/card/id/dogtag role_comm_title = "173/RECON Syn" + minimap_background = "background_upp" + minimap_icon = "upp_synth" /datum/equipment_preset/synth/survivor/upp/load_gear(mob/living/carbon/human/new_human) var/obj/item/clothing/under/marine/veteran/UPP/medic/uniform = new() diff --git a/code/modules/gear_presets/synth_k9.dm b/code/modules/gear_presets/synth_k9.dm new file mode 100644 index 000000000000..2059990655db --- /dev/null +++ b/code/modules/gear_presets/synth_k9.dm @@ -0,0 +1,38 @@ +/datum/equipment_preset/synth_k9 + name = "K9 Synthetic" + uses_special_name = TRUE + languages = ALL_SYNTH_LANGUAGES + skills = /datum/skills/synth_k9 + minimap_icon = "synth_k9" + flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE + faction = FACTION_MARINE + idtype = /obj/item/card/id/gold + assignment = JOB_SYNTH_K9 + rank = "Synthetic K9" + paygrades = list(PAY_SHORT_SYN_K9 = JOB_PLAYTIME_TIER_0) + role_comm_title = "K9" + +/datum/equipment_preset/synth_k9/New() + . = ..() + access = get_access(ACCESS_LIST_GLOBAL) + +/datum/equipment_preset/synth_k9/load_race(mob/living/carbon/human/new_human) + . = ..() + new_human.h_style = "Bald" + new_human.f_style = "Shaved" + if(new_human.client?.prefs?.synthetic_type) + new_human.set_species(new_human.client.prefs.synthetic_type) + return + new_human.set_species(SYNTH_K9) + +/datum/equipment_preset/synth_k9/load_name(mob/living/carbon/human/new_human, randomise) + var/final_name = "Rex" + if(new_human.client?.prefs) + final_name = new_human.client.prefs.synthetic_name + if(!final_name || final_name == "Undefined") + final_name = "Rex" + new_human.change_real_name(new_human, final_name) + +/datum/equipment_preset/synth_k9/load_skills(mob/living/carbon/human/new_human) + . = ..() + new_human.allow_gun_usage = FALSE diff --git a/code/modules/gear_presets/synths.dm b/code/modules/gear_presets/synths.dm index e28ef2e81f49..56ceb261dd5c 100644 --- a/code/modules/gear_presets/synths.dm +++ b/code/modules/gear_presets/synths.dm @@ -2,7 +2,6 @@ name = "Synth" uses_special_name = TRUE languages = ALL_SYNTH_LANGUAGES - skills = /datum/skills/synthetic paygrades = list(PAY_SHORT_SYN = JOB_PLAYTIME_TIER_0) minimap_icon = "synth" @@ -12,10 +11,18 @@ access = get_access(ACCESS_LIST_GLOBAL) /datum/equipment_preset/synth/load_race(mob/living/carbon/human/new_human) + var/generation_selection = SYNTH_GEN_THREE if(new_human.client?.prefs?.synthetic_type) - new_human.set_species(new_human.client.prefs.synthetic_type) - return - new_human.set_species(SYNTH_GEN_THREE) + generation_selection = new_human.client.prefs.synthetic_type + switch(generation_selection) + if(SYNTH_GEN_THREE) + new_human.set_species(SYNTH_GEN_THREE) + if(SYNTH_GEN_TWO) + new_human.set_species(SYNTH_COLONY_GEN_TWO) + if(SYNTH_GEN_ONE) + new_human.set_species(SYNTH_COLONY_GEN_ONE) + else + new_human.set_species(SYNTH_GEN_THREE) /datum/equipment_preset/synth/load_name(mob/living/carbon/human/new_human, randomise) var/final_name = "David" @@ -32,6 +39,22 @@ new_human.allow_gun_usage = FALSE +/datum/equipment_preset/synth/load_skills(mob/living/carbon/human/new_human, client/mob_client) + new_human.allow_gun_usage = FALSE + + if(iscolonysynthetic(new_human) && !isworkingjoe(new_human)) + new_human.set_skills(/datum/skills/colonial_synthetic) + return + + if(!mob_client) + new_human.set_skills(/datum/skills/synthetic) + return + + switch(mob_client.prefs.synthetic_type) + if(SYNTH_GEN_ONE, SYNTH_GEN_TWO) + new_human.set_skills(/datum/skills/colonial_synthetic) + else + new_human.set_skills(/datum/skills/synthetic) //*****************************************************************************************************/ /datum/equipment_preset/synth/uscm @@ -43,6 +66,8 @@ rank = "Synthetic" role_comm_title = "Syn" + minimap_icon = "synth" + /datum/equipment_preset/synth/uscm/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) @@ -129,13 +154,13 @@ generation_selection = new_human.client.prefs.synthetic_type switch(generation_selection) if(SYNTH_GEN_THREE) - new_human.set_species(SYNTH_COLONY) + new_human.set_species(SYNTH_GEN_THREE) if(SYNTH_GEN_TWO) new_human.set_species(SYNTH_COLONY_GEN_TWO) if(SYNTH_GEN_ONE) new_human.set_species(SYNTH_COLONY_GEN_ONE) else - new_human.set_species(SYNTH_COLONY) + new_human.set_species(SYNTH_GEN_THREE) /datum/equipment_preset/synth/survivor/New() . = ..() @@ -434,6 +459,7 @@ name = "Survivor - Synthetic - CMB Synth" idtype = /obj/item/card/id/deputy role_comm_title = "CMB Syn" + minimap_background = "background_cmb" equipment_to_spawn = list( WEAR_HEAD = /obj/item/clothing/head/CMB, WEAR_L_EAR = /obj/item/device/radio/headset/distress/CMB/limited, @@ -458,6 +484,7 @@ name = "Survivor - Synthetic - Corporate Security Synth" idtype = /obj/item/card/id/silver/cl role_comm_title = "WY Syn" + minimap_background = "background_pmc" equipment_to_spawn = list( WEAR_HEAD = /obj/item/clothing/head/soft/sec/corp, WEAR_L_EAR = /obj/item/device/radio/headset/distress/WY, @@ -482,6 +509,8 @@ name = "Survivor - Synthetic - Corporate Protection Synth" idtype = /obj/item/card/id/pmc role_comm_title = "WY Syn" + minimap_icon = "pmc_syn" + minimap_background = "background_pmc" equipment_to_spawn = list( WEAR_HEAD = /obj/item/clothing/head/helmet/marine/veteran/pmc, WEAR_L_EAR = /obj/item/device/radio/headset/distress/pmc/hvh, @@ -528,6 +557,7 @@ name = "Survivor - Synthetic - Interstellar Commerce Commission Synthetic" idtype = /obj/item/card/id/silver/cl role_comm_title = "ICC Syn" + minimap_background = "background_cmb" equipment_to_spawn = list( WEAR_L_EAR = /obj/item/device/radio/headset/distress/CMB/limited, WEAR_R_EAR = /obj/item/tool/pen/clicky, @@ -573,6 +603,9 @@ faction_group = list(FACTION_MARINE) assignment = JOB_WORKING_JOE rank = JOB_WORKING_JOE + + minimap_icon = "joe" + skills = /datum/skills/working_joe languages = list(LANGUAGE_ENGLISH, LANGUAGE_APOLLO, LANGUAGE_RUSSIAN, LANGUAGE_JAPANESE, LANGUAGE_GERMAN, LANGUAGE_SCANDINAVIAN, LANGUAGE_SPANISH, LANGUAGE_CHINESE) /// Used to set species when loading race @@ -687,6 +720,8 @@ /datum/equipment_preset/synth/survivor/cultist_synth name = "Cultist - Xeno Cultist Synthetic" faction = FACTION_XENOMORPH + minimap_icon = "cult_synth" + minimap_background = "background_cultist" /datum/equipment_preset/synth/survivor/cultist_synth/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel/medic diff --git a/code/modules/gear_presets/upp.dm b/code/modules/gear_presets/upp.dm index 616515c59ac2..9a2fde507a53 100644 --- a/code/modules/gear_presets/upp.dm +++ b/code/modules/gear_presets/upp.dm @@ -1,13 +1,43 @@ +/obj/effect/landmark/start/upp + name = "UPP start join" + job_list = UPP_JOB_LIST + +/obj/effect/landmark/late_join/upp + name = "UPP late join" + job_list = UPP_JOB_LIST + +/datum/job/antag/upp + allow_additional = TRUE + title = FACTION_UPP + selection_class = "job_synth" //setup colour + total_positions = 1 + spawn_positions = 1 + allow_additional = TRUE + late_joinable = TRUE + scaled = FALSE + faction_menu = FACTION_UPP + minimum_playtime_as_job = 0 + + gear_preset = /datum/equipment_preset/upp/soldier + /datum/equipment_preset/upp name = FACTION_UPP languages = list(LANGUAGE_RUSSIAN, LANGUAGE_ENGLISH, LANGUAGE_CHINESE) faction = FACTION_UPP idtype = /obj/item/card/id/dogtag + minimap_background = "background_upp" origin_override = ORIGIN_UPP + paygrades = list(PAY_SHORT_UE1 = JOB_PLAYTIME_TIER_0, PAY_SHORT_UE2 = JOB_PLAYTIME_TIER_1) /datum/equipment_preset/upp/New() . = ..() access = get_access(ACCESS_LIST_UPP_ALL) //ACCESS_COME_BACK_TO_ME +/datum/equipment_preset/upp + flags = EQUIPMENT_PRESET_START_OF_ROUND + +/datum/equipment_preset/upp/load_gear(mob/living/carbon/human/new_human) + .=..() + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp, WEAR_BACK) /datum/equipment_preset/upp/load_name(mob/living/carbon/human/new_human, randomise) new_human.gender = pick(60;MALE,40;FEMALE) @@ -55,22 +85,31 @@ idtype = /obj/item/card/id/dogtag //*****************************************************************************************************/ - //=====================// // Frontline Roles // //=================// - /datum/equipment_preset/upp/soldier - name = "UPP Soldier" - flags = EQUIPMENT_PRESET_EXTRA + name = "UPP Soldier (Cryo)" + flags = EQUIPMENT_PRESET_START_OF_ROUND - skills = /datum/skills/upp + skills = /datum/skills/pfc assignment = JOB_UPP rank = JOB_UPP role_comm_title = "Sol" + minimap_icon = "upp_pvt" paygrades = list(PAY_SHORT_UE1 = JOB_PLAYTIME_TIER_0, PAY_SHORT_UE2 = JOB_PLAYTIME_TIER_1) -/datum/equipment_preset/upp/soldier/load_gear(mob/living/carbon/human/new_human) +/datum/job/antag/upp/rifleman + title = JOB_UPP + flags_startup_parameters = ROLE_ADD_TO_SQUAD + gear_preset = /datum/equipment_preset/upp/soldier + +/datum/equipment_preset/upp/soldier/dressed + name = "UPP Soldier" + flags = EQUIPMENT_PRESET_EXTRA + skills = /datum/skills/upp + +/datum/equipment_preset/upp/soldier/dressed/load_gear(mob/living/carbon/human/new_human) //face new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR) //head @@ -156,14 +195,26 @@ list("Gloves", 0, /obj/item/clothing/gloves/marine/veteran/upp, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY), list("Headset", 0, /obj/item/device/radio/headset/distress/UPP, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), list("Ration", 0, /obj/item/reagent_container/food/snacks/upp, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), + list("Map", 0, /obj/item/map/current_map, MARINE_CAN_BUY_KIT, VENDOR_ITEM_MANDATORY), list("Combat Pack", 0, /obj/item/storage/backpack/lightpack/upp, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), + list("Binoculars", 0, /obj/item/device/binoculars, null, VENDOR_ITEM_MANDATORY), - list("HELMET", 0, null, null, null), + list("ARMOR", 0, null, null, null), + list("UM5 Personal Armor", 0, /obj/item/clothing/suit/storage/marine/faction/UPP, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), + + list("HELMET (CHOOSE 1)", 0, null, null, null), list("UM4 Helmet", 0, /obj/item/clothing/head/helmet/marine/veteran/UPP, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY), + list("Ushanka", 0, /obj/item/clothing/head/uppcap/ushanka, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), + + list("HELMET OPTICS", 0, null, null, null), + list("Medical Helmet Optic", 15, /obj/item/device/helmet_visor/medical, null, VENDOR_ITEM_REGULAR), + list("Welding Visor", 5, /obj/item/device/helmet_visor/welding_visor, null, VENDOR_ITEM_REGULAR), list("BELT (CHOOSE 1)", 0, null, null, null), list("Type 41 Ammo Load Rig", 0, /obj/item/storage/belt/marine/upp, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), list("Type 41 Pistol Holster Rig", 0, /obj/item/storage/belt/gun/m4a3, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), + list("NPZ92 Pistol Holster Rig", 0, /obj/item/storage/belt/gun/type47/np92/suppressed, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), + list("Toolbelt Rig (Full)", 0, /obj/item/storage/belt/utility/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), @@ -177,29 +228,41 @@ list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("MASK (CHOOSE 1)", 0, null, null, null), + list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), - list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR) + + list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), + list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), ) /datum/equipment_preset/upp/soldier/get_antag_gear_equipment() return list( list("ENGINEERING SUPPLIES", 0, null, null, null), - list("Entrenching Tool", 2, /obj/item/tool/shovel/etool, null, VENDOR_ITEM_RECOMMENDED), - list("Sandbags x25", 5, /obj/item/stack/sandbags_empty/half, null, VENDOR_ITEM_RECOMMENDED), + list("E-Tool", 5, /obj/item/tool/shovel/etool/folded, null, VENDOR_ITEM_REGULAR), + list("Sandbags", 20, /obj/item/stack/sandbags_empty/half, null, VENDOR_ITEM_REGULAR), + list("ES-11 Mobile Fuel Canister", 5, /obj/item/tool/weldpack/minitank, null, VENDOR_ITEM_REGULAR), + list("ME3 Hand Welder", 5, /obj/item/tool/weldingtool/simple, null, VENDOR_ITEM_REGULAR), list("SPECIAL AMMUNITION", 0, null, null, null), list("Type 71 AP Magazine (5.45x39mm)", 10, /obj/item/ammo_magazine/rifle/type71/ap , null, VENDOR_ITEM_REGULAR), + list("EXPLOSIVES", 0, null, null, null), + list("Smoke Grenade", 5, /obj/item/explosive/grenade/smokebomb, null, VENDOR_ITEM_REGULAR), + list("Type 6 Shrapnel Grenade", 15, /obj/item/explosive/grenade/high_explosive/upp, null, VENDOR_ITEM_REGULAR), + list("Type 8 WP Grenade", 20, /obj/item/explosive/grenade/phosphorus/upp, null, VENDOR_ITEM_REGULAR), + + list("UTILITIES", 0, null, null, null), + list("Roller Bed", 5, /obj/item/roller, null, VENDOR_ITEM_REGULAR), + list("Fulton Device Stack", 5, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR), + list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), + list("Large General Pouch", 15, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), + + list("ATTACHMENTS", 0, null, null, null), list("Angled Grip", 10, /obj/item/attachable/angledgrip, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), @@ -209,35 +272,45 @@ list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), list("Vertical Grip", 10, /obj/item/attachable/verticalgrip, null, VENDOR_ITEM_REGULAR), - list("EXPLOSIVES", 0, null, null, null), - list("Smoke Grenade", 5, /obj/item/explosive/grenade/smokebomb, null, VENDOR_ITEM_REGULAR), - list("Type 6 Shrapnel Grenade", 15, /obj/item/explosive/grenade/high_explosive/upp, null, VENDOR_ITEM_REGULAR), - list("Type 8 WP Grenade", 20, /obj/item/explosive/grenade/phosphorus/upp, null, VENDOR_ITEM_REGULAR), + list("HELMET OPTICS", 0, null, null, null), + list("Welding Visor", 5, /obj/item/device/helmet_visor/welding_visor, null, VENDOR_ITEM_REGULAR), - list("UTILITIES", 0, null, null, null), - list("Brown Webbing Vest", 10, /obj/item/clothing/accessory/storage/black_vest/brown_vest, null, VENDOR_ITEM_RECOMMENDED), - list("Black Webbing Vest", 10, /obj/item/clothing/accessory/storage/black_vest, null, VENDOR_ITEM_RECOMMENDED), - list("Entrenching Tool", 2, /obj/item/tool/shovel/etool, null, VENDOR_ITEM_REGULAR), - list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), - list("Large General Pouch", 10, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), - list("Shoulder Holster", 10, /obj/item/clothing/accessory/storage/holster, null, VENDOR_ITEM_REGULAR), - list("Webbing", 10, /obj/item/clothing/accessory/storage/webbing, null, VENDOR_ITEM_REGULAR), - list("Drop Pouch", 10, /obj/item/clothing/accessory/storage/droppouch, null, VENDOR_ITEM_REGULAR), + list("BINOCULARS", 0, null, null, null), + list("Binoculars", 5, /obj/item/device/binoculars, null, VENDOR_ITEM_REGULAR), + list("Range Finder", 10, /obj/item/device/binoculars/range, null, VENDOR_ITEM_REGULAR), + list("Laser Designator", 15, /obj/item/device/binoculars/range/designator, null, VENDOR_ITEM_REGULAR), + + list("PAMPHLETS", 0, null, null, null), + list("JTAC Pamphlet", 15, /obj/item/pamphlet/skill/jtac, null, VENDOR_ITEM_REGULAR), + list("Engineering Pamphlet", 15, /obj/item/pamphlet/skill/engineer, null, VENDOR_ITEM_REGULAR), ) //*****************************************************************************************************/ + +/datum/job/antag/upp/cryo/medic + title = JOB_UPP_MEDIC + gear_preset = /datum/equipment_preset/upp/medic + flags_startup_parameters = ROLE_ADD_TO_SQUAD + + /datum/equipment_preset/upp/medic - name = "UPP Medic" - flags = EQUIPMENT_PRESET_EXTRA + name = "UPP Medic (Cryo)" - skills = /datum/skills/upp/combat_medic + skills = /datum/skills/combat_medic assignment = JOB_UPP_MEDIC rank = JOB_UPP_MEDIC role_comm_title = "Med" + minimap_icon = "upp_med" paygrades = list(PAY_SHORT_UE3 = JOB_PLAYTIME_TIER_0) -/datum/equipment_preset/upp/medic/load_gear(mob/living/carbon/human/new_human) +/datum/equipment_preset/upp/medic/dressed + name = "UPP Medic" + + skills = /datum/skills/upp/combat_medic + flags = EQUIPMENT_PRESET_EXTRA + +/datum/equipment_preset/upp/medic/dressed/load_gear(mob/living/carbon/human/new_human) //back new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator/compact, WEAR_IN_BACK) //1 @@ -287,12 +360,18 @@ list("Gloves", 0, /obj/item/clothing/gloves/marine/veteran/upp, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY), list("Headset", 0, /obj/item/device/radio/headset/distress/UPP/medic, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), list("Ration", 0, /obj/item/reagent_container/food/snacks/upp, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), - list("Combat Pack", 0, /obj/item/storage/backpack/lightpack, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), + list("Map", 0, /obj/item/map/current_map, MARINE_CAN_BUY_KIT, VENDOR_ITEM_MANDATORY), + list("Combat Pack", 0, /obj/item/storage/backpack/lightpack/upp, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), list("HealthMate HUD", 0, /obj/item/clothing/glasses/hud/health, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_MANDATORY), + list("Binoculars", 0, /obj/item/device/binoculars, null, VENDOR_ITEM_MANDATORY), + + list("ARMOR", 0, null, null, null), + list("UL6 Personal Armor", 0, /obj/item/clothing/suit/storage/marine/faction/UPP/support, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), list("HELMET (CHOOSE 1)", 0, null, null, null), list("Armored Cap", 0, /obj/item/clothing/head/uppcap, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), list("UM4 Helmet", 0, /obj/item/clothing/head/helmet/marine/veteran/UPP, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), + list("Ushanka", 0, /obj/item/clothing/head/uppcap/ushanka, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), list("BELT", 0, null, null, null), list("Type 41 Lifesaver Bag", 0, /obj/item/storage/belt/medical/lifesaver/upp/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_MANDATORY), @@ -312,18 +391,24 @@ list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("MASK (CHOOSE 1)", 0, null, null, null), + list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), - list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR) + + list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), + list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + + list("HELMET OPTICS", 0, null, null, null), + list("Welding Visor", 5, /obj/item/device/helmet_visor/welding_visor, null, VENDOR_ITEM_REGULAR), + + list("PAMPHLETS", 0, null, null, null), + list("JTAC Pamphlet", 15, /obj/item/pamphlet/skill/jtac, null, VENDOR_ITEM_REGULAR), + list("Engineering Pamphlet", 15, /obj/item/pamphlet/skill/engineer, null, VENDOR_ITEM_REGULAR), + ) /datum/equipment_preset/upp/medic/get_antag_gear_equipment() @@ -386,29 +471,43 @@ list("Type 6 Shrapnel Grenade", 15, /obj/item/explosive/grenade/high_explosive/upp, null, VENDOR_ITEM_REGULAR), list("Type 8 WP Grenade", 20, /obj/item/explosive/grenade/phosphorus/upp, null, VENDOR_ITEM_REGULAR), + list("BINOCULARS", 0, null, null, null), + list("Binoculars", 5, /obj/item/device/binoculars, null, VENDOR_ITEM_REGULAR), + list("Range Finder", 10, /obj/item/device/binoculars/range, null, VENDOR_ITEM_REGULAR), + list("Laser Designator", 15, /obj/item/device/binoculars/range/designator, null, VENDOR_ITEM_REGULAR), + list("UTILITIES", 0, null, null, null), - list("Brown Webbing Vest", 10, /obj/item/clothing/accessory/storage/black_vest/brown_vest, null, VENDOR_ITEM_RECOMMENDED), - list("Black Webbing Vest", 10, /obj/item/clothing/accessory/storage/black_vest, null, VENDOR_ITEM_RECOMMENDED), - list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), - list("Large General Pouch", 10, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), - list("Shoulder Holster", 10, /obj/item/clothing/accessory/storage/holster, null, VENDOR_ITEM_REGULAR), - list("Webbing", 10, /obj/item/clothing/accessory/storage/webbing, null, VENDOR_ITEM_REGULAR), - list("Drop Pouch", 10, /obj/item/clothing/accessory/storage/droppouch, null, VENDOR_ITEM_REGULAR), + list("Roller Bed", 5, /obj/item/roller, null, VENDOR_ITEM_REGULAR), + list("Fulton Device Stack", 5, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR), + list("Fire Extinguisher (Portable)", 3, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), + list("Motion Detector", 15, /obj/item/device/motiondetector/hacked, null, VENDOR_ITEM_REGULAR), + list("Whistle", 3, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Large General Pouch", 15, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), ) //*****************************************************************************************************/ +/datum/job/antag/upp/sapper + title = JOB_UPP_ENGI + gear_preset = /datum/equipment_preset/upp/sapper + flags_startup_parameters = ROLE_ADD_TO_SQUAD /datum/equipment_preset/upp/sapper - name = "UPP Sapper" - flags = EQUIPMENT_PRESET_EXTRA + name = "UPP Sapper (Cryo)" - skills = /datum/skills/upp/combat_engineer + skills = /datum/skills/combat_engineer assignment = JOB_UPP_ENGI rank = JOB_UPP_ENGI role_comm_title = "Sap" + minimap_icon = "upp_sapper" paygrades = list(PAY_SHORT_UE3 = JOB_PLAYTIME_TIER_0) -/datum/equipment_preset/upp/sapper/load_gear(mob/living/carbon/human/new_human) +/datum/equipment_preset/upp/sapper/dressed + name = "UPP Sapper" + + skills = /datum/skills/upp/combat_engineer + flags = EQUIPMENT_PRESET_EXTRA + +/datum/equipment_preset/upp/sapper/dressed/load_gear(mob/living/carbon/human/new_human) //Sappers should have lots of gear and whatnot that helps them attack or siege marines //But that'll need a lot of effort so for now they are just soldiers with a toolbox. //back @@ -446,23 +545,30 @@ /datum/equipment_preset/upp/sapper/get_antag_clothing_equipment() return list( list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), - list("Boots", 0, /obj/item/clothing/shoes/marine/upp/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY), - list("Fatigues", 0, /obj/item/clothing/under/marine/veteran/UPP, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), - list("UM5 Personal Armor", 0, /obj/item/clothing/suit/storage/marine/faction/UPP, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), - list("Gloves", 0, /obj/item/clothing/gloves/marine/veteran/upp, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY), - list("Headset", 0, /obj/item/device/radio/headset/distress/UPP/cct, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), - list("Welding Goggles", 0, /obj/item/clothing/glasses/welding, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_MANDATORY), + list("Standard Apparel", 0, list(/obj/item/clothing/under/marine/veteran/UPP, /obj/item/clothing/shoes/marine/upp/knife, /obj/item/clothing/gloves/yellow, /obj/item/device/radio/headset/distress/UPP/cct), MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), + list("Map", 0, /obj/item/map/current_map, MARINE_CAN_BUY_KIT, VENDOR_ITEM_MANDATORY), list("Ration", 0, /obj/item/reagent_container/food/snacks/upp, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), list("Welderpack", 0, /obj/item/storage/backpack/marine/engineerpack/upp, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), + list("Binoculars", 0, /obj/item/device/binoculars, null, VENDOR_ITEM_MANDATORY), + + list("WELDING PROTECTION (CHOOSE 1)", 0, null, null, null), + list("Welding Goggles", 0, /obj/item/clothing/glasses/welding, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR), + list("Welding Helmet", 0, /obj/item/clothing/head/welding, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR), + + list("ARMOR", 0, null, null, null), + list("UM5 Personal Armor", 0, /obj/item/clothing/suit/storage/marine/faction/UPP, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), list("HELMET (CHOOSE 1)", 0, null, null, null), list("Armored Cap", 0, /obj/item/clothing/head/uppcap, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), list("UM4 Helmet", 0, /obj/item/clothing/head/helmet/marine/veteran/UPP, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), + list("Ushanka", 0, /obj/item/clothing/head/uppcap/ushanka, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), list("BELT (Choose 1)", 0, null, null, null), list("Type 41 Ammo Load Rig", 0, /obj/item/storage/belt/marine/upp, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("Type 41 Pistol Holster Rig", 0, /obj/item/storage/belt/gun/m4a3, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("Toolbelt Rig (Full)", 0, /obj/item/storage/belt/utility/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), + list("M277 Pattern Construction Rig", 0, /obj/item/storage/belt/utility/construction, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), + list("NPZ92 Pistol Holster Rig", 0, /obj/item/storage/belt/gun/type47/np92/suppressed, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (Choose 2)", 0, null, null, null), list("Construction Pouch", 0, /obj/item/storage/pouch/construction, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), @@ -479,8 +585,15 @@ list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), + list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), - list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR) + + list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), + list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), ) /datum/equipment_preset/upp/sapper/get_antag_gear_equipment() @@ -517,34 +630,45 @@ list("Vertical Grip", 10, /obj/item/attachable/verticalgrip, null, VENDOR_ITEM_REGULAR), list("EXPLOSIVES", 0, null, null, null), - list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), + list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_RECOMMENDED), + list("Breaching Charge", 10, /obj/item/explosive/plastic/breaching_charge, null, VENDOR_ITEM_RECOMMENDED), list("Smoke Grenade", 5, /obj/item/explosive/grenade/smokebomb, null, VENDOR_ITEM_REGULAR), list("Type 6 Shrapnel Grenade", 15, /obj/item/explosive/grenade/high_explosive/upp, null, VENDOR_ITEM_REGULAR), list("Type 8 WP Grenade", 20, /obj/item/explosive/grenade/phosphorus/upp, null, VENDOR_ITEM_REGULAR), + list("BINOCULARS", 0, null, null, null), + list("Binoculars", 5, /obj/item/device/binoculars, null, VENDOR_ITEM_REGULAR), + list("Range Finder", 10, /obj/item/device/binoculars/range, null, VENDOR_ITEM_REGULAR), + list("Laser Designator", 15, /obj/item/device/binoculars/range/designator, null, VENDOR_ITEM_REGULAR), + list("UTILITIES", 0, null, null, null), - list("Brown Webbing Vest", 10, /obj/item/clothing/accessory/storage/black_vest/brown_vest, null, VENDOR_ITEM_RECOMMENDED), - list("Black Webbing Vest", 10, /obj/item/clothing/accessory/storage/black_vest, null, VENDOR_ITEM_RECOMMENDED), - list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), - list("Large General Pouch", 10, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), - list("Shoulder Holster", 10, /obj/item/clothing/accessory/storage/holster, null, VENDOR_ITEM_REGULAR), - list("Webbing", 10, /obj/item/clothing/accessory/storage/webbing, null, VENDOR_ITEM_REGULAR), - list("Drop Pouch", 10, /obj/item/clothing/accessory/storage/droppouch, null, VENDOR_ITEM_REGULAR), + list("Roller Bed", 5, /obj/item/roller, null, VENDOR_ITEM_REGULAR), + list("Fulton Device Stack", 5, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR), + list("Fire Extinguisher (Portable)", 3, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), + list("Large General Pouch", 15, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), + + list("PAMPHLETS", 0, null, null, null), + list("JTAC Pamphlet", 15, /obj/item/pamphlet/skill/jtac, null, VENDOR_ITEM_REGULAR), ) //*****************************************************************************************************/ /datum/equipment_preset/upp/specialist - name = "UPP Specialist" - flags = EQUIPMENT_PRESET_EXTRA + name = "UPP Specialist minigun (Cryo)" skills = /datum/skills/upp/specialist assignment = JOB_UPP_SPECIALIST rank = JOB_UPP_SPECIALIST role_comm_title = "Spc" + minimap_icon = "upp_spec" paygrades = list(PAY_SHORT_UE5 = JOB_PLAYTIME_TIER_0) -/datum/equipment_preset/upp/specialist/load_gear(mob/living/carbon/human/new_human) +/datum/equipment_preset/upp/specialist/dressed + name = "UPP Specialist" + flags = EQUIPMENT_PRESET_EXTRA + + +/datum/equipment_preset/upp/specialist/dressed/load_gear(mob/living/carbon/human/new_human) //back new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher, WEAR_IN_BACK) //1 @@ -594,13 +718,18 @@ list("Headset", 0, /obj/item/device/radio/headset/distress/UPP, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), list("Ration", 0, /obj/item/reagent_container/food/snacks/upp, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), list("Combat Pack", 0, /obj/item/storage/backpack/lightpack, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), + list("Binoculars", 0, /obj/item/device/binoculars, null, VENDOR_ITEM_MANDATORY), - list("HELMET", 0, null, null, null), + list("ARMOR", 0, null, null, null), + list("UH7 Heavy Plated Armor", 0, /obj/item/clothing/suit/storage/marine/faction/UPP/heavy, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), + + list("HELMET (CHOOSE 1)", 0, null, null, null), list("UM7 Helmet", 0, /obj/item/clothing/head/helmet/marine/veteran/UPP/heavy, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY), + list("Ushanka", 0, /obj/item/clothing/head/uppcap/ushanka, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), list("BELT (CHOOSE 1)", 0, null, null, null), list("Type 41 Ammo Load Rig", 0, /obj/item/storage/belt/marine/upp, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), - list("Type 41 Pistol Holster Rig", 0, /obj/item/storage/belt/gun/type47, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), + list("Type 41 Pistol Holster Rig", 0, /obj/item/storage/belt/gun/m4a3, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("POUCHES (CHOOSE 2)", 0, null, null, null), list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), @@ -614,18 +743,16 @@ list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("MASK (CHOOSE 1)", 0, null, null, null), - list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), - list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR) + list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + list("Rebreather", 0, /obj/item/clothing/mask/rebreather, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + + list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), + list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), ) /datum/equipment_preset/upp/specialist/get_antag_gear_equipment() @@ -634,9 +761,9 @@ list("Essential Heavy Set", 0, /obj/effect/essentials_set/upp_heavy, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), list("SPECIAL AMMUNITION", 0, null, null, null), - list("QYJ-72 Box Magazine(7.62x54mmR)", 15, /obj/item/ammo_magazine/pkp , null, VENDOR_ITEM_RECOMMENDED), + list("Rotating ammo drum (7.62x51mm)", 15, /obj/item/ammo_magazine/minigun, null, VENDOR_ITEM_RECOMMENDED), - list("ATTACHMENTS (NONE FIT QYJ-72)", 0, null, null, null), + list("ATTACHMENTS", 0, null, null, null), list("Angled Grip", 10, /obj/item/attachable/angledgrip, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), list("Laser Sight", 10, /obj/item/attachable/lasersight, null, VENDOR_ITEM_REGULAR), @@ -647,33 +774,51 @@ list("EXPLOSIVES", 0, null, null, null), list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), + list("Breaching Charge", 10, /obj/item/explosive/plastic/breaching_charge, null, VENDOR_ITEM_RECOMMENDED), list("Smoke Grenade", 5, /obj/item/explosive/grenade/smokebomb, null, VENDOR_ITEM_REGULAR), list("Type 6 Shrapnel Grenade", 15, /obj/item/explosive/grenade/high_explosive/upp, null, VENDOR_ITEM_REGULAR), list("Type 8 WP Grenade", 20, /obj/item/explosive/grenade/phosphorus/upp, null, VENDOR_ITEM_REGULAR), + list("BINOCULARS", 0, null, null, null), + list("Binoculars", 5, /obj/item/device/binoculars, null, VENDOR_ITEM_REGULAR), + list("Range Finder", 10, /obj/item/device/binoculars/range, null, VENDOR_ITEM_REGULAR), + list("Laser Designator", 15, /obj/item/device/binoculars/range/designator, null, VENDOR_ITEM_REGULAR), + list("UTILITIES", 0, null, null, null), - list("Brown Webbing Vest", 10, /obj/item/clothing/accessory/storage/black_vest/brown_vest, null, VENDOR_ITEM_RECOMMENDED), - list("Black Webbing Vest", 10, /obj/item/clothing/accessory/storage/black_vest, null, VENDOR_ITEM_RECOMMENDED), - list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), + list("Roller Bed", 5, /obj/item/roller, null, VENDOR_ITEM_REGULAR), + list("Fulton Device Stack", 5, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR), + list("Fire Extinguisher (Portable)", 3, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), + list("Whistle", 3, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Motion Detector", 15, /obj/item/device/motiondetector/hacked, null, VENDOR_ITEM_REGULAR), list("Large General Pouch", 10, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), - list("Shoulder Holster", 10, /obj/item/clothing/accessory/storage/holster, null, VENDOR_ITEM_REGULAR), - list("Webbing", 10, /obj/item/clothing/accessory/storage/webbing, null, VENDOR_ITEM_REGULAR), - list("Drop Pouch", 10, /obj/item/clothing/accessory/storage/droppouch, null, VENDOR_ITEM_REGULAR), + + list("PAMPHLETS", 0, null, null, null), + list("JTAC Pamphlet", 15, /obj/item/pamphlet/skill/jtac, null, VENDOR_ITEM_REGULAR), + list("Engineering Pamphlet", 15, /obj/item/pamphlet/skill/engineer, null, VENDOR_ITEM_REGULAR), ) //*****************************************************************************************************/ +/datum/job/antag/upp/machinegunner + title = JOB_UPP_SPECIALIST + gear_preset = /datum/equipment_preset/upp/machinegunner + flags_startup_parameters = ROLE_ADD_TO_SQUAD /datum/equipment_preset/upp/machinegunner - name = "UPP Machinegunner" - flags = EQUIPMENT_PRESET_EXTRA + name = "UPP Machinegunner (Cryo)" skills = /datum/skills/upp/specialist assignment = JOB_UPP_SPECIALIST rank = JOB_UPP_SPECIALIST role_comm_title = "Spc" + minimap_icon = "upp_spec" paygrades = list(PAY_SHORT_UE5 = JOB_PLAYTIME_TIER_0) -/datum/equipment_preset/upp/machinegunner/load_gear(mob/living/carbon/human/new_human) +/datum/equipment_preset/upp/machinegunner/dressed + name = "UPP Machinegunner" + flags = EQUIPMENT_PRESET_EXTRA + + +/datum/equipment_preset/upp/machinegunner/dressed/load_gear(mob/living/carbon/human/new_human) //back new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher, WEAR_IN_BACK) //1 @@ -719,11 +864,17 @@ list("UH7 Heavy Plated Armor", 0, /obj/item/clothing/suit/storage/marine/faction/UPP/heavy, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), list("Gloves", 0, /obj/item/clothing/gloves/marine/veteran/upp, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY), list("Headset", 0, /obj/item/device/radio/headset/distress/UPP, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), + list("Ration", 0, /obj/item/reagent_container/food/snacks/upp, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), list("Combat Pack", 0, /obj/item/storage/backpack/lightpack, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), + list("Binoculars", 0, /obj/item/device/binoculars, null, VENDOR_ITEM_MANDATORY), - list("HELMET", 0, null, null, null), + list("ARMOR", 0, null, null, null), + list("UH7 Heavy Plated Armor", 0, /obj/item/clothing/suit/storage/marine/faction/UPP/heavy, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), + + list("HELMET (CHOOSE 1)", 0, null, null, null), list("UM7 Helmet", 0, /obj/item/clothing/head/helmet/marine/veteran/UPP/heavy, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY), + list("Ushanka", 0, /obj/item/clothing/head/uppcap/ushanka, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), list("BELT (CHOOSE 1)", 0, null, null, null), list("Type 41 Ammo Load Rig", 0, /obj/item/storage/belt/marine/upp, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), @@ -741,29 +892,27 @@ list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("MASK (CHOOSE 1)", 0, null, null, null), - list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), - list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR) + list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + list("Rebreather", 0, /obj/item/clothing/mask/rebreather, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + + list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), + list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), ) /datum/equipment_preset/upp/machinegunner/get_antag_gear_equipment() return list( list("HEAVY SET (MANDATORY)", 0, null, null, null), - list("Essential Heavy Set", 0, /obj/effect/essentials_set/upp_heavy, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), + list("Essential Heavy Set QYJ-72", 0, /obj/effect/essentials_set/upp_heavy_pkp, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), list("SPECIAL AMMUNITION", 0, null, null, null), list("QYJ-72 Box Magazine (7.62x54mmR)", 15, /obj/item/ammo_magazine/pkp , null, VENDOR_ITEM_RECOMMENDED), - list("ATTACHMENTS (NONE FIT QYJ-72)", 0, null, null, null), + list("ATTACHMENTS", 0, null, null, null), list("Angled Grip", 10, /obj/item/attachable/angledgrip, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), list("Laser Sight", 10, /obj/item/attachable/lasersight, null, VENDOR_ITEM_REGULAR), @@ -774,33 +923,48 @@ list("EXPLOSIVES", 0, null, null, null), list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), + list("Breaching Charge", 10, /obj/item/explosive/plastic/breaching_charge, null, VENDOR_ITEM_REGULAR), list("Smoke Grenade", 5, /obj/item/explosive/grenade/smokebomb, null, VENDOR_ITEM_REGULAR), list("Type 6 Shrapnel Grenade", 15, /obj/item/explosive/grenade/high_explosive/upp, null, VENDOR_ITEM_REGULAR), list("Type 8 WP Grenade", 20, /obj/item/explosive/grenade/phosphorus/upp, null, VENDOR_ITEM_REGULAR), list("UTILITIES", 0, null, null, null), - list("Brown Webbing Vest", 10, /obj/item/clothing/accessory/storage/black_vest/brown_vest, null, VENDOR_ITEM_RECOMMENDED), - list("Black Webbing Vest", 10, /obj/item/clothing/accessory/storage/black_vest, null, VENDOR_ITEM_RECOMMENDED), - list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), + list("Roller Bed", 5, /obj/item/roller, null, VENDOR_ITEM_REGULAR), + list("Fulton Device Stack", 5, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR), + list("Fire Extinguisher (Portable)", 3, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), + list("Motion Detector", 8, /obj/item/device/motiondetector/hacked, null, VENDOR_ITEM_REGULAR), + list("Whistle", 3, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), list("Large General Pouch", 10, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), - list("Shoulder Holster", 10, /obj/item/clothing/accessory/storage/holster, null, VENDOR_ITEM_REGULAR), - list("Webbing", 10, /obj/item/clothing/accessory/storage/webbing, null, VENDOR_ITEM_REGULAR), - list("Drop Pouch", 10, /obj/item/clothing/accessory/storage/droppouch, null, VENDOR_ITEM_REGULAR), + + list("BINOCULARS", 0, null, null, null), + list("Binoculars", 5, /obj/item/device/binoculars, null, VENDOR_ITEM_REGULAR), + list("Range Finder", 10, /obj/item/device/binoculars/range, null, VENDOR_ITEM_REGULAR), + list("Laser Designator", 15, /obj/item/device/binoculars/range/designator, null, VENDOR_ITEM_REGULAR), ) //*****************************************************************************************************/ +/datum/job/antag/upp/leader + title = JOB_UPP_LEADER + gear_preset = /datum/equipment_preset/upp/leader + flags_startup_parameters = ROLE_ADD_TO_SQUAD /datum/equipment_preset/upp/leader - name = "UPP Squad Leader" - flags = EQUIPMENT_PRESET_EXTRA + name = "UPP Squad Leader (Cryo)" - skills = /datum/skills/upp/SL + skills = /datum/skills/SL assignment = JOB_UPP_LEADER rank = JOB_UPP_LEADER role_comm_title = "SL" + minimap_icon = "upp_sl" paygrades = list(PAY_SHORT_UE6 = JOB_PLAYTIME_TIER_0) -/datum/equipment_preset/upp/leader/load_gear(mob/living/carbon/human/new_human) +/datum/equipment_preset/upp/leader/dressed + name = "UPP Squad Leader" + + skills = /datum/skills/upp/SL + flags = EQUIPMENT_PRESET_EXTRA + +/datum/equipment_preset/upp/leader/dressed/load_gear(mob/living/carbon/human/new_human) var/UPPleadsidearm = rand(1,4) //back new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp, WEAR_BACK) @@ -852,7 +1016,7 @@ /datum/equipment_preset/upp/leader/get_antag_clothing_equipment() return list( list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), - list("Boots", 0, /obj/item/clothing/shoes/marine/upp/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY), + list("Boots", 0, /obj/item/clothing/shoes/marine/upp/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY), list("Fatigues", 0, /obj/item/clothing/under/marine/veteran/UPP, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), list("UH7 Heavy Plated Armor", 0, /obj/item/clothing/suit/storage/marine/faction/UPP/heavy, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), list("Gloves", 0, /obj/item/clothing/gloves/marine/veteran/upp, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY), @@ -860,9 +1024,13 @@ list("Ration", 0, /obj/item/reagent_container/food/snacks/upp, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), list("Combat Pack", 0, /obj/item/storage/backpack/lightpack/upp, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), + list("ARMOR", 0, null, null, null), + list("UH7 Heavy Plated Armor", 0, /obj/item/clothing/suit/storage/marine/faction/UPP/heavy, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), + list("HELMET (CHOOSE 1)", 0, null, null, null), list("Armored Beret", 0, /obj/item/clothing/head/uppcap/beret, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), list("UM4 Helmet", 0, /obj/item/clothing/head/helmet/marine/veteran/UPP, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), + list("Ushanka", 0, /obj/item/clothing/head/uppcap/ushanka, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), list("BELT (CHOOSE 1)", 0, null, null, null), list("Type 41 Ammo Load Rig", 0, /obj/item/storage/belt/marine/upp, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), @@ -878,23 +1046,22 @@ list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Medical Kit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("MASK (CHOOSE 1)", 0, null, null, null), - list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), - list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR) - ) + list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + list("Rebreather", 0, /obj/item/clothing/mask/rebreather, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + + list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), + list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + ) /datum/equipment_preset/upp/leader/get_antag_gear_equipment() return list( @@ -944,37 +1111,62 @@ list("EXPLOSIVES", 0, null, null, null), list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), + list("Breaching Charge", 10, /obj/item/explosive/plastic/breaching_charge, null, VENDOR_ITEM_REGULAR), list("Smoke Grenade", 5, /obj/item/explosive/grenade/smokebomb, null, VENDOR_ITEM_REGULAR), list("Type 6 Shrapnel Grenade", 15, /obj/item/explosive/grenade/high_explosive/upp, null, VENDOR_ITEM_REGULAR), list("Type 8 WP Grenade", 20, /obj/item/explosive/grenade/phosphorus/upp, null, VENDOR_ITEM_REGULAR), list("UTILITIES", 0, null, null, null), - list("Brown Webbing Vest", 10, /obj/item/clothing/accessory/storage/black_vest/brown_vest, null, VENDOR_ITEM_RECOMMENDED), - list("Black Webbing Vest", 10, /obj/item/clothing/accessory/storage/black_vest, null, VENDOR_ITEM_RECOMMENDED), + list("Roller Bed", 5, /obj/item/roller, null, VENDOR_ITEM_REGULAR), + list("Fulton Device Stack", 5, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR), list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), + list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Zip cuffs", 1, /obj/item/storage/box/zipcuffs, null, VENDOR_ITEM_REGULAR), + list("Motion Detector", 15, /obj/item/device/motiondetector/hacked, null, VENDOR_ITEM_REGULAR), list("Large General Pouch", 10, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), - list("Shoulder Holster", 10, /obj/item/clothing/accessory/storage/holster, null, VENDOR_ITEM_REGULAR), - list("Webbing", 10, /obj/item/clothing/accessory/storage/webbing, null, VENDOR_ITEM_REGULAR), - list("Drop Pouch", 10, /obj/item/clothing/accessory/storage/droppouch, null, VENDOR_ITEM_REGULAR), + + list("BINOCULARS", 0, null, null, null), + list("Binoculars", 5, /obj/item/device/binoculars, null, VENDOR_ITEM_REGULAR), + list("Range Finder", 10, /obj/item/device/binoculars/range, null, VENDOR_ITEM_REGULAR), + list("Laser Designator", 15, /obj/item/device/binoculars/range/designator, null, VENDOR_ITEM_REGULAR), ) //*****************************************************************************************************/ - //=====================// // Support Roles // //=================// /datum/equipment_preset/upp/military_police - name = "UPP Military Police" - flags = EQUIPMENT_PRESET_EXTRA + name = "UPP Military Police (Cryo)" skills = /datum/skills/upp/military_police assignment = JOB_UPP_POLICE rank = JOB_UPP_POLICE role_comm_title = "MP" + minimap_icon = "upp_mp" paygrades = list(PAY_SHORT_UE6 = JOB_PLAYTIME_TIER_0) +/datum/job/antag/upp/military_police + title = JOB_UPP_POLICE + gear_preset = /datum/equipment_preset/upp/military_police + selection_class = "job_mp" + /datum/equipment_preset/upp/military_police/load_gear(mob/living/carbon/human/new_human) + . = ..() + //uniform + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP/mp, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp/naval, WEAR_ACCESSORY) + //ear + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR) + //limbs + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp/knife, WEAR_FEET) + +/datum/equipment_preset/upp/military_police/dressed + name = "UPP Military Police" + flags = EQUIPMENT_PRESET_EXTRA + +/datum/equipment_preset/upp/military_police/dressed/load_gear(mob/living/carbon/human/new_human) //back new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) @@ -1012,10 +1204,12 @@ list("Headset", 0, /obj/item/device/radio/headset/distress/UPP, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), list("Ration", 0, /obj/item/reagent_container/food/snacks/upp, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), list("Combat Pack", 0, /obj/item/storage/backpack/lightpack/upp, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), + list("Binoculars", 0, /obj/item/device/binoculars, null, VENDOR_ITEM_MANDATORY), list("HELMET (CHOOSE 1)", 0, null, null, null), list("Armored Beret", 0, /obj/item/clothing/head/uppcap/beret, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), list("UM4 Helmet", 0, /obj/item/clothing/head/helmet/marine/veteran/UPP, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_RECOMMENDED), + list("Ushanka", 0, /obj/item/clothing/head/uppcap/ushanka, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), list("ARMOR (CHOOSE 1)", 0, null, null, null), list("UL4 camouflaged jacket", 0, /obj/item/clothing/suit/storage/marine/faction/UPP/mp, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), @@ -1040,24 +1234,22 @@ list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas/pmc/upp, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), - list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR) + list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + + list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), + list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), ) /datum/equipment_preset/upp/military_police/get_antag_gear_equipment() return list( list("SQUAD LEADER SET (MANDATORY)", 0, null, null, null), - list("Essential SL Set", 0, /obj/effect/essentials_set/leader/upp, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), + list("Essential MP Set", 0, /obj/effect/essentials_set/leader/upp, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), list("GENERAL SUPPLIES", 0, null, null, null), list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), @@ -1102,25 +1294,33 @@ list("EXPLOSIVES", 0, null, null, null), list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), + list("Breaching Charge", 10, /obj/item/explosive/plastic/breaching_charge, null, VENDOR_ITEM_REGULAR), list("Smoke Grenade", 5, /obj/item/explosive/grenade/smokebomb, null, VENDOR_ITEM_REGULAR), list("Type 6 Shrapnel Grenade", 15, /obj/item/explosive/grenade/high_explosive/upp, null, VENDOR_ITEM_REGULAR), list("Type 8 WP Grenade", 20, /obj/item/explosive/grenade/phosphorus/upp, null, VENDOR_ITEM_REGULAR), list("UTILITIES", 0, null, null, null), - list("Brown Webbing Vest", 10, /obj/item/clothing/accessory/storage/black_vest/brown_vest, null, VENDOR_ITEM_RECOMMENDED), - list("Black Webbing Vest", 10, /obj/item/clothing/accessory/storage/black_vest, null, VENDOR_ITEM_RECOMMENDED), + list("Roller Bed", 5, /obj/item/roller, null, VENDOR_ITEM_REGULAR), + list("Fulton Device Stack", 5, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR), list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), + list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Zip cuffs", 1, /obj/item/storage/box/zipcuffs, null, VENDOR_ITEM_REGULAR), + list("Motion Detector", 15, /obj/item/device/motiondetector/hacked, null, VENDOR_ITEM_REGULAR), list("Large General Pouch", 10, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), - list("Shoulder Holster", 10, /obj/item/clothing/accessory/storage/holster, null, VENDOR_ITEM_REGULAR), - list("Webbing", 10, /obj/item/clothing/accessory/storage/webbing, null, VENDOR_ITEM_REGULAR), - list("Drop Pouch", 10, /obj/item/clothing/accessory/storage/droppouch, null, VENDOR_ITEM_REGULAR), - ) -//*****************************************************************************************************/ + list("BINOCULARS", 0, null, null, null), + list("Binoculars", 5, /obj/item/device/binoculars, null, VENDOR_ITEM_REGULAR), + list("Range Finder", 10, /obj/item/device/binoculars/range, null, VENDOR_ITEM_REGULAR), + list("Laser Designator", 15, /obj/item/device/binoculars/range/designator, null, VENDOR_ITEM_REGULAR), + ) +/datum/job/antag/upp/doctor + title = JOB_UPP_LT_DOKTOR + selection_class = "job_cmo" + gear_preset = /datum/equipment_preset/upp/doctor /datum/equipment_preset/upp/doctor - name = "UPP Doctor" + name = "UPP Doktor (Cryo)" flags = EQUIPMENT_PRESET_EXTRA skills = /datum/skills/upp/combat_medic @@ -1130,6 +1330,26 @@ paygrades = list(PAY_SHORT_UO1 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/upp/doctor/load_gear(mob/living/carbon/human/new_human) + . = ..() + //face + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR) + if(new_human.disabilities & NEARSIGHTED) + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription(new_human), WEAR_EYES) + else + new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(new_human), WEAR_EYES) + //body + var/obj/item/clothing/under/marine/veteran/UPP/medic/UPP = new() + var/obj/item/clothing/accessory/storage/surg_vest/equipped/W = new() + UPP.attach_accessory(new_human, W) + new_human.equip_to_slot_or_del(UPP, WEAR_BODY) + //limbs + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp/knife, WEAR_FEET) + +/datum/equipment_preset/upp/doctor/dressed + name = "UPP Doctor" + flags = EQUIPMENT_PRESET_EXTRA + +/datum/equipment_preset/upp/doctor/dressed/load_gear(mob/living/carbon/human/new_human) //back new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator, WEAR_IN_BACK) @@ -1184,6 +1404,7 @@ list("Ration", 0, /obj/item/reagent_container/food/snacks/upp, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), list("Combat Pack", 0, /obj/item/storage/backpack/lightpack, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), list("HealthMate HUD", 0, /obj/item/clothing/glasses/hud/health, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_MANDATORY), + list("Binoculars", 0, /obj/item/device/binoculars, null, VENDOR_ITEM_MANDATORY), list("HELMET (CHOOSE 1)", 0, null, null, null), list("Ushanka", 0, /obj/item/clothing/head/uppcap/ushanka, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), @@ -1263,17 +1484,42 @@ //*****************************************************************************************************/ +/datum/job/antag/upp/supply + title = JOB_UPP_SUPPLY + selection_class = "job_ct" + gear_preset = /datum/equipment_preset/upp/supply + + /datum/equipment_preset/upp/supply - name = "UPP Logistics Technician" + name = "UPP Logistics Technician (Cryo)" flags = EQUIPMENT_PRESET_EXTRA skills = /datum/skills/upp/logistics_technician assignment = JOB_UPP_SUPPLY rank = JOB_UPP_SUPPLY role_comm_title = "Log." + minimap_icon = "upp_cargo" paygrades = list(PAY_SHORT_UE3 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/upp/supply/load_gear(mob/living/carbon/human/new_human) + //face + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/cct, WEAR_L_EAR) + //head + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap(new_human), WEAR_HEAD) + //body + var/obj/item/clothing/under/marine/veteran/UPP/UPP = new() + new_human.equip_to_slot_or_del(UPP, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp/naval, WEAR_ACCESSORY) + //limb + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/insulated(new_human), WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp/knife, WEAR_FEET) + +/datum/equipment_preset/upp/supply/dressed + name = "UPP Logistics Technician" + flags = EQUIPMENT_PRESET_EXTRA + +/datum/equipment_preset/upp/supply/dressed/load_gear(mob/living/carbon/human/new_human) //back new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/engineerpack/upp, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/snacks/upp, WEAR_IN_BACK) @@ -1309,6 +1555,7 @@ list("Welding Goggles", 0, /obj/item/clothing/glasses/welding, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_MANDATORY), list("Ration", 0, /obj/item/reagent_container/food/snacks/upp, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), list("Welderpack", 0, /obj/item/storage/backpack/marine/engineerpack/upp, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), + list("Binoculars", 0, /obj/item/device/binoculars, null, VENDOR_ITEM_MANDATORY), list("HELMET (CHOOSE 1)", 0, null, null, null), list("Armored Cap", 0, /obj/item/clothing/head/uppcap, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), @@ -1339,24 +1586,47 @@ ) + //*****************************************************************************************************/ //====================// // Field Officers // //================// - /datum/equipment_preset/upp/officer - name = "UPP Lieutenant" + name = "UPP Mladshiy Leytenant (Cryo)" flags = EQUIPMENT_PRESET_EXTRA skills = /datum/skills/upp/officer assignment = JOB_UPP_LT_OFFICER rank = JOB_UPP_LT_OFFICER role_comm_title = "Lt." + minimap_icon = "upp_lt" paygrades = list(PAY_SHORT_UO1 = JOB_PLAYTIME_TIER_0) + +/datum/job/antag/upp/officer //this is placeholder for stuff that is supposed to be the same for all officers + title = JOB_UPP_SRLT_OFFICER + selection_class = "job_command" + /datum/equipment_preset/upp/officer/load_gear(mob/living/carbon/human/new_human) + . = ..() + //face + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/command, WEAR_L_EAR) + //uniform + var/obj/item/clothing/under/marine/veteran/UPP/officer/M = new() + var/obj/item/clothing/accessory/storage/webbing/W = new() + M.attach_accessory(new_human, W) + new_human.equip_to_slot_or_del(M, WEAR_BODY) + //limbs + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp/knife, WEAR_FEET) + +/datum/equipment_preset/upp/officer/dressed + name = "UPP Lieutenant" + flags = EQUIPMENT_PRESET_EXTRA + + +/datum/equipment_preset/upp/officer/dressed/load_gear(mob/living/carbon/human/new_human) //back new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher, WEAR_IN_BACK) @@ -1403,13 +1673,13 @@ list("Boots", 0, /obj/item/clothing/shoes/marine/upp/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY), list("Fatigues", 0, /obj/item/clothing/under/marine/veteran/UPP/officer, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), list("Gloves", 0, /obj/item/clothing/gloves/marine/veteran/upp, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY), - list("Headset", 0, /obj/item/device/radio/headset/distress/UPP/command, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), - list("Ration", 0, /obj/item/reagent_container/food/snacks/upp, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), + list("Headset", 0, /obj/item/device/radio/headset/distress/UPP/command, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), list("Ration", 0, /obj/item/reagent_container/food/snacks/upp, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), list("Combat Pack", 0, /obj/item/storage/backpack/lightpack/upp, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), list("HELMET (CHOOSE 1)", 0, null, null, null), list("Armored Beret", 0, /obj/item/clothing/head/uppcap/beret, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), list("UM4 Helmet", 0, /obj/item/clothing/head/helmet/marine/veteran/UPP, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_RECOMMENDED), + list("Ushanka", 0, /obj/item/clothing/head/uppcap/ushanka, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), list("ARMOR (CHOOSE 1)", 0, null, null, null), list("UL4 officer jacket", 0, /obj/item/clothing/suit/storage/marine/faction/UPP/officer, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), @@ -1433,18 +1703,17 @@ list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("MASK (CHOOSE 1)", 0, null, null, null), - list("Gas Mask", 0, /obj/item/clothing/mask/gas/pmc/upp, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), - list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR) + list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + list("Rebreather", 0, /obj/item/clothing/mask/rebreather, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + + list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), + list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), ) /datum/equipment_preset/upp/officer/get_antag_gear_equipment() @@ -1481,6 +1750,13 @@ list("Health Analyzer", 4, /obj/item/device/healthanalyzer, null, VENDOR_ITEM_REGULAR), list("Medical HUD Glasses", 4, /obj/item/clothing/glasses/hud/health, null, VENDOR_ITEM_MANDATORY), + list("EXPLOSIVES", 0, null, null, null), + list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), + list("Breaching Charge", 10, /obj/item/explosive/plastic/breaching_charge, null, VENDOR_ITEM_REGULAR), + list("Smoke Grenade", 5, /obj/item/explosive/grenade/smokebomb, null, VENDOR_ITEM_REGULAR), + list("Type 6 Shrapnel Grenade", 15, /obj/item/explosive/grenade/high_explosive/upp, null, VENDOR_ITEM_REGULAR), + list("Type 8 WP Grenade", 20, /obj/item/explosive/grenade/phosphorus/upp, null, VENDOR_ITEM_REGULAR), + list("ATTACHMENTS", 0, null, null, null), list("Angled Grip", 10, /obj/item/attachable/angledgrip, null, VENDOR_ITEM_REGULAR), list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), @@ -1490,32 +1766,38 @@ list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), list("Vertical Grip", 10, /obj/item/attachable/verticalgrip, null, VENDOR_ITEM_REGULAR), - list("EXPLOSIVES", 0, null, null, null), - list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), - list("Smoke Grenade", 5, /obj/item/explosive/grenade/smokebomb, null, VENDOR_ITEM_REGULAR), - list("Type 6 Shrapnel Grenade", 15, /obj/item/explosive/grenade/high_explosive/upp, null, VENDOR_ITEM_REGULAR), - list("Type 8 WP Grenade", 20, /obj/item/explosive/grenade/phosphorus/upp, null, VENDOR_ITEM_REGULAR), - list("UTILITIES", 0, null, null, null), - list("Brown Webbing Vest", 10, /obj/item/clothing/accessory/storage/black_vest/brown_vest, null, VENDOR_ITEM_RECOMMENDED), - list("Black Webbing Vest", 10, /obj/item/clothing/accessory/storage/black_vest, null, VENDOR_ITEM_RECOMMENDED), + list("Roller Bed", 5, /obj/item/roller, null, VENDOR_ITEM_REGULAR), + list("Fulton Device Stack", 5, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR), list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), + list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Zip cuffs", 1, /obj/item/storage/box/zipcuffs, null, VENDOR_ITEM_REGULAR), + list("Motion Detector", 15, /obj/item/device/motiondetector/hacked, null, VENDOR_ITEM_REGULAR), list("Large General Pouch", 10, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), - list("Shoulder Holster", 10, /obj/item/clothing/accessory/storage/holster, null, VENDOR_ITEM_REGULAR), - list("Webbing", 10, /obj/item/clothing/accessory/storage/webbing, null, VENDOR_ITEM_REGULAR), - list("Drop Pouch", 10, /obj/item/clothing/accessory/storage/droppouch, null, VENDOR_ITEM_REGULAR), + + list("BINOCULARS", 0, null, null, null), + list("Binoculars", 5, /obj/item/device/binoculars, null, VENDOR_ITEM_REGULAR), + list("Range Finder", 10, /obj/item/device/binoculars/range, null, VENDOR_ITEM_REGULAR), + list("Laser Designator", 15, /obj/item/device/binoculars/range/designator, null, VENDOR_ITEM_REGULAR), ) //*****************************************************************************************************/ +/datum/job/antag/upp/officer/senior + title = JOB_UPP_SRLT_OFFICER + gear_preset = /datum/equipment_preset/upp/officer/senior /datum/equipment_preset/upp/officer/senior - name = "UPP Senior Lieutenant" + name = "UPP Starshiy Leytenant (Cryo)" assignment = JOB_UPP_SRLT_OFFICER rank = JOB_UPP_SRLT_OFFICER role_comm_title = "Sr-Lt." + minimap_icon = "upp_slt" paygrades = list(PAY_SHORT_UO2 = JOB_PLAYTIME_TIER_0) -/datum/equipment_preset/upp/officer/senior/load_gear(mob/living/carbon/human/new_human) +/datum/equipment_preset/upp/officer/senior/dressed + name = "UPP Senior Lieutenant" + +/datum/equipment_preset/upp/officer/senior/dressed/load_gear(mob/living/carbon/human/new_human) //back new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher, WEAR_IN_BACK) @@ -1562,13 +1844,13 @@ list("Boots", 0, /obj/item/clothing/shoes/marine/upp/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY), list("Fatigues", 0, /obj/item/clothing/under/marine/veteran/UPP/officer, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), list("Gloves", 0, /obj/item/clothing/gloves/marine/veteran/upp, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY), - list("Headset", 0, /obj/item/device/radio/headset/distress/UPP/command, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), - list("Ration", 0, /obj/item/reagent_container/food/snacks/upp, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), + list("Headset", 0, /obj/item/device/radio/headset/distress/UPP/command, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), list("Ration", 0, /obj/item/reagent_container/food/snacks/upp, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), list("Combat Pack", 0, /obj/item/storage/backpack/lightpack/upp, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), list("HELMET (CHOOSE 1)", 0, null, null, null), list("Armored Beret", 0, /obj/item/clothing/head/uppcap/beret, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), list("UM4 Helmet", 0, /obj/item/clothing/head/helmet/marine/veteran/UPP, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_RECOMMENDED), + list("Ushanka", 0, /obj/item/clothing/head/uppcap/ushanka, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), list("ARMOR (CHOOSE 1)", 0, null, null, null), list("UL4 officer jacket", 0, /obj/item/clothing/suit/storage/marine/faction/UPP/officer, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), @@ -1592,18 +1874,16 @@ list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas/pmc/upp, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), - list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR) + list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + + list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), + list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), ) /datum/equipment_preset/upp/officer/senior/get_antag_gear_equipment() @@ -1611,9 +1891,6 @@ list("SQUAD LEADER SET (MANDATORY)", 0, null, null, null), list("Essential SL Set", 0, /obj/effect/essentials_set/leader/upp, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), - list("GENERAL SUPPLIES", 0, null, null, null), - list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), - list("ENGINEERING SUPPLIES", 0, null, null, null), list("Entrenching Tool", 2, /obj/item/tool/shovel/etool, null, VENDOR_ITEM_REGULAR), list("Insulated Gloves", 3, /obj/item/clothing/gloves/yellow, null, VENDOR_ITEM_REGULAR), @@ -1640,41 +1917,46 @@ list("Health Analyzer", 4, /obj/item/device/healthanalyzer, null, VENDOR_ITEM_REGULAR), list("Medical HUD Glasses", 4, /obj/item/clothing/glasses/hud/health, null, VENDOR_ITEM_MANDATORY), - list("ATTACHMENTS", 0, null, null, null), - list("Angled Grip", 10, /obj/item/attachable/angledgrip, null, VENDOR_ITEM_REGULAR), - list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), - list("Laser Sight", 10, /obj/item/attachable/lasersight, null, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 10, /obj/item/attachable/reddot, null, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 10, /obj/item/attachable/reflex, null, VENDOR_ITEM_REGULAR), - list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 10, /obj/item/attachable/verticalgrip, null, VENDOR_ITEM_REGULAR), - list("EXPLOSIVES", 0, null, null, null), list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), + list("Breaching Charge", 10, /obj/item/explosive/plastic/breaching_charge, null, VENDOR_ITEM_REGULAR), list("Smoke Grenade", 5, /obj/item/explosive/grenade/smokebomb, null, VENDOR_ITEM_REGULAR), list("Type 6 Shrapnel Grenade", 15, /obj/item/explosive/grenade/high_explosive/upp, null, VENDOR_ITEM_REGULAR), list("Type 8 WP Grenade", 20, /obj/item/explosive/grenade/phosphorus/upp, null, VENDOR_ITEM_REGULAR), list("UTILITIES", 0, null, null, null), - list("Brown Webbing Vest", 10, /obj/item/clothing/accessory/storage/black_vest/brown_vest, null, VENDOR_ITEM_RECOMMENDED), - list("Black Webbing Vest", 10, /obj/item/clothing/accessory/storage/black_vest, null, VENDOR_ITEM_RECOMMENDED), + list("Roller Bed", 5, /obj/item/roller, null, VENDOR_ITEM_REGULAR), + list("Fulton Device Stack", 5, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR), list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), + list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Zip cuffs", 1, /obj/item/storage/box/zipcuffs, null, VENDOR_ITEM_REGULAR), + list("Motion Detector", 8, /obj/item/device/motiondetector/hacked, null, VENDOR_ITEM_REGULAR), list("Large General Pouch", 10, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), - list("Shoulder Holster", 10, /obj/item/clothing/accessory/storage/holster, null, VENDOR_ITEM_REGULAR), - list("Webbing", 10, /obj/item/clothing/accessory/storage/webbing, null, VENDOR_ITEM_REGULAR), - list("Drop Pouch", 10, /obj/item/clothing/accessory/storage/droppouch, null, VENDOR_ITEM_REGULAR), + + list("BINOCULARS", 0, null, null, null), + list("Binoculars", 5, /obj/item/device/binoculars, null, VENDOR_ITEM_REGULAR), + list("Range Finder", 10, /obj/item/device/binoculars/range, null, VENDOR_ITEM_REGULAR), + list("Laser Designator", 15, /obj/item/device/binoculars/range/designator, null, VENDOR_ITEM_REGULAR), ) //*****************************************************************************************************/ +/datum/job/antag/upp/officer/kapitan + title = JOB_UPP_KPT_OFFICER + gear_preset = /datum/equipment_preset/upp/officer/kapitan /datum/equipment_preset/upp/officer/kapitan - name = "UPP Kapitan" + name = "UPP Kapitan (Cryo)" assignment = JOB_UPP_KPT_OFFICER rank = JOB_UPP_KPT_OFFICER role_comm_title = "May." + minimap_icon = "upp_xo" paygrades = list(PAY_SHORT_UO3 = JOB_PLAYTIME_TIER_0) skills = /datum/skills/upp/kapitan + +/datum/equipment_preset/upp/officer/kapitan/dressed + name = "UPP Kapitan" + /datum/equipment_preset/upp/officer/kapitan/load_gear(mob/living/carbon/human/new_human) //back new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp, WEAR_BACK) @@ -1725,10 +2007,12 @@ list("Headset", 0, /obj/item/device/radio/headset/distress/UPP/command, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), list("Ration", 0, /obj/item/reagent_container/food/snacks/upp, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), list("Combat Pack", 0, /obj/item/storage/backpack/lightpack/upp, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), + list("Binoculars", 0, /obj/item/device/binoculars/range, null, VENDOR_ITEM_MANDATORY), list("HELMET (CHOOSE 1)", 0, null, null, null), list("Beret", 0, /obj/item/clothing/head/uppcap/beret, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), list("UM4 Helmet", 0, /obj/item/clothing/head/helmet/marine/veteran/UPP, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_RECOMMENDED), + list("Ushanka", 0, /obj/item/clothing/head/uppcap/ushanka, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), list("ARMOR (CHOOSE 1)", 0, null, null, null), list("UL4 senior officer jacket", 0, /obj/item/clothing/suit/storage/marine/faction/UPP/kapitan, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), @@ -1752,18 +2036,16 @@ list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas/pmc/upp, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), - list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR) + list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + + list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), + list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), ) /datum/equipment_preset/upp/officer/kapitan/get_antag_gear_equipment() @@ -1811,31 +2093,45 @@ list("EXPLOSIVES", 0, null, null, null), list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), + list("Breaching Charge", 10, /obj/item/explosive/plastic/breaching_charge, null, VENDOR_ITEM_REGULAR), list("Smoke Grenade", 5, /obj/item/explosive/grenade/smokebomb, null, VENDOR_ITEM_REGULAR), list("Type 6 Shrapnel Grenade", 15, /obj/item/explosive/grenade/high_explosive/upp, null, VENDOR_ITEM_REGULAR), list("Type 8 WP Grenade", 20, /obj/item/explosive/grenade/phosphorus/upp, null, VENDOR_ITEM_REGULAR), list("UTILITIES", 0, null, null, null), - list("Brown Webbing Vest", 10, /obj/item/clothing/accessory/storage/black_vest/brown_vest, null, VENDOR_ITEM_RECOMMENDED), - list("Black Webbing Vest", 10, /obj/item/clothing/accessory/storage/black_vest, null, VENDOR_ITEM_RECOMMENDED), + list("Roller Bed", 5, /obj/item/roller, null, VENDOR_ITEM_REGULAR), + list("Fulton Device Stack", 5, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR), list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), + list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Zip cuffs", 1, /obj/item/storage/box/zipcuffs, null, VENDOR_ITEM_REGULAR), + list("Motion Detector", 8, /obj/item/device/motiondetector/hacked, null, VENDOR_ITEM_REGULAR), list("Large General Pouch", 10, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), - list("Shoulder Holster", 10, /obj/item/clothing/accessory/storage/holster, null, VENDOR_ITEM_REGULAR), - list("Webbing", 10, /obj/item/clothing/accessory/storage/webbing, null, VENDOR_ITEM_REGULAR), - list("Drop Pouch", 10, /obj/item/clothing/accessory/storage/droppouch, null, VENDOR_ITEM_REGULAR), + + list("BINOCULARS", 0, null, null, null), + list("Binoculars", 5, /obj/item/device/binoculars, null, VENDOR_ITEM_REGULAR), + list("Range Finder", 10, /obj/item/device/binoculars/range, null, VENDOR_ITEM_REGULAR), + list("Laser Designator", 15, /obj/item/device/binoculars/range/designator, null, VENDOR_ITEM_REGULAR), ) //*****************************************************************************************************/ +/datum/job/antag/upp/officer/major + flags_whitelist = WHITELIST_COMMANDER + title = JOB_UPP_MAY_OFFICER + gear_preset = /datum/equipment_preset/upp/officer/major /datum/equipment_preset/upp/officer/major - name = "UPP Major" + name = "UPP Mayjor (Cryo)" assignment = JOB_UPP_MAY_OFFICER rank = JOB_UPP_MAY_OFFICER role_comm_title = "May." + minimap_icon = "upp_co" paygrades = list(PAY_SHORT_UO4 = JOB_PLAYTIME_TIER_0) skills = /datum/skills/upp/commander -/datum/equipment_preset/upp/officer/major/load_gear(mob/living/carbon/human/new_human) +/datum/equipment_preset/upp/officer/major/dressed + name = "UPP Major" + +/datum/equipment_preset/upp/officer/major/dressed/load_gear(mob/living/carbon/human/new_human) //back new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher, WEAR_IN_BACK) @@ -1885,12 +2181,15 @@ list("Fatigues", 0, /obj/item/clothing/under/marine/veteran/UPP/officer, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), list("Gloves", 0, /obj/item/clothing/gloves/marine/veteran/upp, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY), list("Headset", 0, /obj/item/device/radio/headset/distress/UPP/command, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), + list("Binoculars", 0, /obj/item/device/binoculars/range, null, VENDOR_ITEM_MANDATORY), + list("Ration", 0, /obj/item/reagent_container/food/snacks/upp, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), list("Combat Pack", 0, /obj/item/storage/backpack/lightpack/upp, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), list("HELMET (CHOOSE 1)", 0, null, null, null), list("Peaked Cap", 0, /obj/item/clothing/head/uppcap/peaked, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), list("UM4 Helmet", 0, /obj/item/clothing/head/helmet/marine/veteran/UPP, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_RECOMMENDED), + list("Ushanka", 0, /obj/item/clothing/head/uppcap/ushanka, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), list("ARMOR (CHOOSE 1)", 0, null, null, null), list("UL4 senior officer jacket", 0, /obj/item/clothing/suit/storage/marine/faction/UPP/kapitan, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), @@ -1914,18 +2213,16 @@ list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas/pmc/upp, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), - list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR) + list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + + list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), + list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), ) /datum/equipment_preset/upp/officer/major/get_antag_gear_equipment() @@ -1973,31 +2270,46 @@ list("EXPLOSIVES", 0, null, null, null), list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), + list("Breaching Charge", 10, /obj/item/explosive/plastic/breaching_charge, null, VENDOR_ITEM_REGULAR), list("Smoke Grenade", 5, /obj/item/explosive/grenade/smokebomb, null, VENDOR_ITEM_REGULAR), list("Type 6 Shrapnel Grenade", 15, /obj/item/explosive/grenade/high_explosive/upp, null, VENDOR_ITEM_REGULAR), list("Type 8 WP Grenade", 20, /obj/item/explosive/grenade/phosphorus/upp, null, VENDOR_ITEM_REGULAR), list("UTILITIES", 0, null, null, null), - list("Brown Webbing Vest", 10, /obj/item/clothing/accessory/storage/black_vest/brown_vest, null, VENDOR_ITEM_RECOMMENDED), - list("Black Webbing Vest", 10, /obj/item/clothing/accessory/storage/black_vest, null, VENDOR_ITEM_RECOMMENDED), + list("Roller Bed", 5, /obj/item/roller, null, VENDOR_ITEM_REGULAR), + list("Fulton Device Stack", 5, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR), list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), + list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Zip cuffs", 1, /obj/item/storage/box/zipcuffs, null, VENDOR_ITEM_REGULAR), + list("Motion Detector", 8, /obj/item/device/motiondetector/hacked, null, VENDOR_ITEM_REGULAR), list("Large General Pouch", 10, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), - list("Shoulder Holster", 10, /obj/item/clothing/accessory/storage/holster, null, VENDOR_ITEM_REGULAR), - list("Webbing", 10, /obj/item/clothing/accessory/storage/webbing, null, VENDOR_ITEM_REGULAR), - list("Drop Pouch", 10, /obj/item/clothing/accessory/storage/droppouch, null, VENDOR_ITEM_REGULAR), + + list("BINOCULARS", 0, null, null, null), + list("Binoculars", 5, /obj/item/device/binoculars, null, VENDOR_ITEM_REGULAR), + list("Range Finder", 10, /obj/item/device/binoculars/range, null, VENDOR_ITEM_REGULAR), + list("Laser Designator", 15, /obj/item/device/binoculars/range/designator, null, VENDOR_ITEM_REGULAR), ) //*****************************************************************************************************/ +/datum/job/antag/upp/officer/podpolkovnik + flags_whitelist = WHITELIST_COMMANDER_COUNCIL + title = JOB_UPP_LTKOL_OFFICER + gear_preset = /datum/equipment_preset/upp/officer/podpolkovnik -/datum/equipment_preset/upp/officer/lt_kolonel - name = "UPP Leytenant Kolonel" + +/datum/equipment_preset/upp/officer/podpolkovnik + name = "UPP Podpolkovnik (Cryo)" assignment = JOB_UPP_LTKOL_OFFICER rank = JOB_UPP_LTKOL_OFFICER role_comm_title = "Lt. Kol." + minimap_icon = "upp_co" paygrades = list(PAY_SHORT_UO5 = JOB_PLAYTIME_TIER_0) skills = /datum/skills/upp/commander -/datum/equipment_preset/upp/officer/lt_kolonel/load_gear(mob/living/carbon/human/new_human) +/datum/equipment_preset/upp/officer/podpolkovnik/dressed + name = "UPP Leytenant Kolonel" + +/datum/equipment_preset/upp/officer/podpolkovnik/dressed/load_gear(mob/living/carbon/human/new_human) //back new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher, WEAR_IN_BACK) @@ -2039,19 +2351,18 @@ if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf/tacticalmask/green, WEAR_FACE) -/datum/equipment_preset/upp/officer/lt_kolonel/get_antag_clothing_equipment() +/datum/equipment_preset/upp/officer/podpolkovnik/get_antag_clothing_equipment() return list( list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), - list("Boots", 0, /obj/item/clothing/shoes/marine/upp/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY), - list("Fatigues", 0, /obj/item/clothing/under/marine/veteran/UPP/officer, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), - list("Gloves", 0, /obj/item/clothing/gloves/marine/veteran, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY), - list("Headset", 0, /obj/item/device/radio/headset/distress/UPP/command, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), + list("Standard Apparel", 0, list(/obj/item/clothing/under/marine/veteran/UPP/officer, /obj/item/clothing/shoes/marine/upp/knife, /obj/item/clothing/gloves/marine/veteran, /obj/item/device/radio/headset/distress/UPP/command), MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), list("Ration", 0, /obj/item/reagent_container/food/snacks/upp, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), list("Combat Pack", 0, /obj/item/storage/backpack/lightpack/upp, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), + list("Binoculars", 0, /obj/item/device/binoculars, null, VENDOR_ITEM_MANDATORY), list("HELMET (CHOOSE 1)", 0, null, null, null), list("Peaked Cap", 0, /obj/item/clothing/head/uppcap/peaked, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), list("UM4 Helmet", 0, /obj/item/clothing/head/helmet/marine/veteran/UPP, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_RECOMMENDED), + list("Ushanka", 0, /obj/item/clothing/head/uppcap/ushanka, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), list("ARMOR (CHOOSE 1)", 0, null, null, null), list("UL4 senior officer jacket", 0, /obj/item/clothing/suit/storage/marine/faction/UPP/kapitan, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), @@ -2086,10 +2397,17 @@ list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas/pmc/upp, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), - list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR) + list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + + list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), + list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), ) -/datum/equipment_preset/upp/officer/lt_kolonel/get_antag_gear_equipment() +/datum/equipment_preset/upp/officer/podpolkovnik/get_antag_gear_equipment() return list( list("SQUAD LEADER SET (MANDATORY)", 0, null, null, null), list("Essential SL Set", 0, /obj/effect/essentials_set/leader/upp, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), @@ -2134,31 +2452,46 @@ list("EXPLOSIVES", 0, null, null, null), list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), + list("Breaching Charge", 10, /obj/item/explosive/plastic/breaching_charge, null, VENDOR_ITEM_REGULAR), list("Smoke Grenade", 5, /obj/item/explosive/grenade/smokebomb, null, VENDOR_ITEM_REGULAR), list("Type 6 Shrapnel Grenade", 15, /obj/item/explosive/grenade/high_explosive/upp, null, VENDOR_ITEM_REGULAR), list("Type 8 WP Grenade", 20, /obj/item/explosive/grenade/phosphorus/upp, null, VENDOR_ITEM_REGULAR), list("UTILITIES", 0, null, null, null), - list("Brown Webbing Vest", 10, /obj/item/clothing/accessory/storage/black_vest/brown_vest, null, VENDOR_ITEM_RECOMMENDED), - list("Black Webbing Vest", 10, /obj/item/clothing/accessory/storage/black_vest, null, VENDOR_ITEM_RECOMMENDED), + list("Roller Bed", 5, /obj/item/roller, null, VENDOR_ITEM_REGULAR), + list("Fulton Device Stack", 5, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR), list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), + list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Zip cuffs", 1, /obj/item/storage/box/zipcuffs, null, VENDOR_ITEM_REGULAR), + list("Motion Detector", 8, /obj/item/device/motiondetector/hacked, null, VENDOR_ITEM_REGULAR), list("Large General Pouch", 10, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), - list("Shoulder Holster", 10, /obj/item/clothing/accessory/storage/holster, null, VENDOR_ITEM_REGULAR), - list("Webbing", 10, /obj/item/clothing/accessory/storage/webbing, null, VENDOR_ITEM_REGULAR), - list("Drop Pouch", 10, /obj/item/clothing/accessory/storage/droppouch, null, VENDOR_ITEM_REGULAR), + + list("BINOCULARS", 0, null, null, null), + list("Binoculars", 5, /obj/item/device/binoculars, null, VENDOR_ITEM_REGULAR), + list("Range Finder", 10, /obj/item/device/binoculars/range, null, VENDOR_ITEM_REGULAR), + list("Laser Designator", 15, /obj/item/device/binoculars/range/designator, null, VENDOR_ITEM_REGULAR), ) //*****************************************************************************************************/ - -/datum/equipment_preset/upp/officer/kolonel - name = "UPP Kolonel" - assignment = JOB_UPP_KOL_OFFICER - rank = JOB_UPP_KOL_OFFICER +/datum/job/antag/upp/officer/kolonel + flags_whitelist = WHITELIST_COMMANDER_COLONEL + title = JOB_UPP_KOL_OFFICER + gear_preset = /datum/equipment_preset/upp/officer/podpolkovnik + +/datum/equipment_preset/upp/officer/polkovnik + name = "UPP General Mayjor (Cryo)" + assignment = JOB_UPP_BRIG_GENERAL + rank = JOB_UPP_BRIG_GENERAL role_comm_title = "Kol." - paygrades = list(PAY_SHORT_UO6 = JOB_PLAYTIME_TIER_0) + minimap_icon = "upp_co" + paygrades = list(PAY_SHORT_UO7 = JOB_PLAYTIME_TIER_0) skills = /datum/skills/upp/commander -/datum/equipment_preset/upp/officer/kolonel/load_gear(mob/living/carbon/human/new_human) + +/datum/equipment_preset/upp/officer/polkovnik/dressed + name = "UPP Kolonel" + +/datum/equipment_preset/upp/officer/polkovnik/dressed/load_gear(mob/living/carbon/human/new_human) //back new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher, WEAR_IN_BACK) @@ -2200,7 +2533,7 @@ if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf/tacticalmask/green, WEAR_FACE) -/datum/equipment_preset/upp/officer/kolonel/get_antag_clothing_equipment() +/datum/equipment_preset/upp/officer/polkovnik/get_antag_clothing_equipment() return list( list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), list("Boots", 0, /obj/item/clothing/shoes/marine/upp/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY), @@ -2209,10 +2542,12 @@ list("Headset", 0, /obj/item/device/radio/headset/distress/UPP/command, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), list("Ration", 0, /obj/item/reagent_container/food/snacks/upp, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), list("Combat Pack", 0, /obj/item/storage/backpack/lightpack/upp, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), + list("Binoculars", 0, /obj/item/device/binoculars, null, VENDOR_ITEM_MANDATORY), list("HELMET (CHOOSE 1)", 0, null, null, null), list("Peaked Cap", 0, /obj/item/clothing/head/uppcap/peaked, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), list("UM4 Helmet", 0, /obj/item/clothing/head/helmet/marine/veteran/UPP, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_RECOMMENDED), + list("Ushanka", 0, /obj/item/clothing/head/uppcap/ushanka, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), list("ARMOR (CHOOSE 1)", 0, null, null, null), list("UL4 senior officer jacket", 0, /obj/item/clothing/suit/storage/marine/faction/UPP/kapitan, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), @@ -2236,21 +2571,19 @@ list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas/pmc/upp, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), - list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR) + list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + + list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), + list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), ) -/datum/equipment_preset/upp/officer/kolonel/get_antag_gear_equipment() +/datum/equipment_preset/upp/officer/polkovnik/get_antag_gear_equipment() return list( list("SQUAD LEADER SET (MANDATORY)", 0, null, null, null), list("Essential SL Set", 0, /obj/effect/essentials_set/leader/upp, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), @@ -2295,18 +2628,23 @@ list("EXPLOSIVES", 0, null, null, null), list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), + list("Breaching Charge", 10, /obj/item/explosive/plastic/breaching_charge, null, VENDOR_ITEM_REGULAR), list("Smoke Grenade", 5, /obj/item/explosive/grenade/smokebomb, null, VENDOR_ITEM_REGULAR), list("Type 6 Shrapnel Grenade", 15, /obj/item/explosive/grenade/high_explosive/upp, null, VENDOR_ITEM_REGULAR), list("Type 8 WP Grenade", 20, /obj/item/explosive/grenade/phosphorus/upp, null, VENDOR_ITEM_REGULAR), list("UTILITIES", 0, null, null, null), - list("Brown Webbing Vest", 10, /obj/item/clothing/accessory/storage/black_vest/brown_vest, null, VENDOR_ITEM_RECOMMENDED), - list("Black Webbing Vest", 10, /obj/item/clothing/accessory/storage/black_vest, null, VENDOR_ITEM_RECOMMENDED), + list("Roller Bed", 5, /obj/item/roller, null, VENDOR_ITEM_REGULAR), + list("Fulton Device Stack", 5, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR), list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), + list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Motion Detector", 8, /obj/item/device/motiondetector/hacked, null, VENDOR_ITEM_REGULAR), list("Large General Pouch", 10, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), - list("Shoulder Holster", 10, /obj/item/clothing/accessory/storage/holster, null, VENDOR_ITEM_REGULAR), - list("Webbing", 10, /obj/item/clothing/accessory/storage/webbing, null, VENDOR_ITEM_REGULAR), - list("Drop Pouch", 10, /obj/item/clothing/accessory/storage/droppouch, null, VENDOR_ITEM_REGULAR), + + list("BINOCULARS", 0, null, null, null), + list("Binoculars", 5, /obj/item/device/binoculars, null, VENDOR_ITEM_REGULAR), + list("Range Finder", 10, /obj/item/device/binoculars/range, null, VENDOR_ITEM_REGULAR), + list("Laser Designator", 15, /obj/item/device/binoculars/range/designator, null, VENDOR_ITEM_REGULAR), ) //*****************************************************************************************************/ @@ -2314,16 +2652,19 @@ //===================// // Flag Officers // //===============// - /datum/equipment_preset/upp/officer/may_gen - name = "UPP Mayjor General" - assignment = JOB_UPP_KOL_OFFICER - rank = JOB_UPP_KOL_OFFICER + name = "UPP General Leytenant (Cryo)" + assignment = JOB_UPP_MAY_GENERAL + rank = JOB_UPP_MAY_GENERAL role_comm_title = "May. Gen." + minimap_icon = "upp_co" paygrades = list(PAY_SHORT_UO7 = JOB_PLAYTIME_TIER_0) skills = /datum/skills/upp/commander -/datum/equipment_preset/upp/officer/may_gen/load_gear(mob/living/carbon/human/new_human) +/datum/equipment_preset/upp/officer/may_gen/dressed + name = "UPP Mayjor General" + +/datum/equipment_preset/upp/officer/may_gen/dressed/load_gear(mob/living/carbon/human/new_human) //back new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher, WEAR_IN_BACK) @@ -2372,12 +2713,15 @@ list("Fatigues", 0, /obj/item/clothing/under/marine/veteran/UPP/officer, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), list("Gloves", 0, /obj/item/clothing/gloves/marine/veteran, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY), list("Headset", 0, /obj/item/device/radio/headset/distress/UPP/command, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), + list("Binoculars", 0, /obj/item/device/binoculars, null, VENDOR_ITEM_MANDATORY), + list("Ration", 0, /obj/item/reagent_container/food/snacks/upp, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), list("Combat Pack", 0, /obj/item/storage/backpack/lightpack/upp, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), list("HELMET (CHOOSE 1)", 0, null, null, null), list("Peaked Cap", 0, /obj/item/clothing/head/uppcap/peaked, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), list("UM4 Helmet", 0, /obj/item/clothing/head/helmet/marine/veteran/UPP, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_RECOMMENDED), + list("Ushanka", 0, /obj/item/clothing/head/uppcap/ushanka, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), list("ARMOR (CHOOSE 1)", 0, null, null, null), list("UL4 senior officer jacket", 0, /obj/item/clothing/suit/storage/marine/faction/UPP/kapitan, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), @@ -2401,18 +2745,16 @@ list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas/pmc/upp, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), - list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR) + list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + + list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), + list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), ) /datum/equipment_preset/upp/officer/may_gen/get_antag_gear_equipment() @@ -2460,31 +2802,45 @@ list("EXPLOSIVES", 0, null, null, null), list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), + list("Breaching Charge", 10, /obj/item/explosive/plastic/breaching_charge, null, VENDOR_ITEM_REGULAR), list("Smoke Grenade", 5, /obj/item/explosive/grenade/smokebomb, null, VENDOR_ITEM_REGULAR), list("Type 6 Shrapnel Grenade", 15, /obj/item/explosive/grenade/high_explosive/upp, null, VENDOR_ITEM_REGULAR), list("Type 8 WP Grenade", 20, /obj/item/explosive/grenade/phosphorus/upp, null, VENDOR_ITEM_REGULAR), list("UTILITIES", 0, null, null, null), - list("Brown Webbing Vest", 10, /obj/item/clothing/accessory/storage/black_vest/brown_vest, null, VENDOR_ITEM_RECOMMENDED), - list("Black Webbing Vest", 10, /obj/item/clothing/accessory/storage/black_vest, null, VENDOR_ITEM_RECOMMENDED), + list("Roller Bed", 5, /obj/item/roller, null, VENDOR_ITEM_REGULAR), + list("Fulton Device Stack", 5, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR), list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), + list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Motion Detector", 8, /obj/item/device/motiondetector/hacked, null, VENDOR_ITEM_REGULAR), list("Large General Pouch", 10, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), - list("Shoulder Holster", 10, /obj/item/clothing/accessory/storage/holster, null, VENDOR_ITEM_REGULAR), - list("Webbing", 10, /obj/item/clothing/accessory/storage/webbing, null, VENDOR_ITEM_REGULAR), - list("Drop Pouch", 10, /obj/item/clothing/accessory/storage/droppouch, null, VENDOR_ITEM_REGULAR), + + list("BINOCULARS", 0, null, null, null), + list("Binoculars", 5, /obj/item/device/binoculars, null, VENDOR_ITEM_REGULAR), + list("Range Finder", 10, /obj/item/device/binoculars/range, null, VENDOR_ITEM_REGULAR), + list("Laser Designator", 15, /obj/item/device/binoculars/range/designator, null, VENDOR_ITEM_REGULAR), ) //*****************************************************************************************************/ +/datum/job/antag/upp/officer/ley_gen + title = JOB_UPP_LT_GENERAL + gear_preset = /datum/equipment_preset/upp/officer/ley_gen + + flags_whitelist = WHITELIST_COMMANDER /datum/equipment_preset/upp/officer/ley_gen - name = "UPP Leytenant General" - assignment = JOB_UPP_KOL_OFFICER - rank = JOB_UPP_KOL_OFFICER + name = "UPP General Polkovnik (Cryo)" + assignment = JOB_UPP_LT_GENERAL + rank = JOB_UPP_LT_GENERAL role_comm_title = "Lt. Gen." + minimap_icon = "upp_co" paygrades = list(PAY_SHORT_UO8 = JOB_PLAYTIME_TIER_0) skills = /datum/skills/upp/commander -/datum/equipment_preset/upp/officer/ley_gen/load_gear(mob/living/carbon/human/new_human) +/datum/equipment_preset/upp/officer/ley_gen/dressed + name = "UPP Leytenant General" + +/datum/equipment_preset/upp/officer/ley_gen/dressed/load_gear(mob/living/carbon/human/new_human) //back new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher, WEAR_IN_BACK) @@ -2535,10 +2891,12 @@ list("Headset", 0, /obj/item/device/radio/headset/distress/UPP/command, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), list("Ration", 0, /obj/item/reagent_container/food/snacks/upp, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), list("Combat Pack", 0, /obj/item/storage/backpack/lightpack/upp, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), + list("Binoculars", 0, /obj/item/device/binoculars, null, VENDOR_ITEM_MANDATORY), list("HELMET (CHOOSE 1)", 0, null, null, null), list("Peaked Cap", 0, /obj/item/clothing/head/uppcap/peaked, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), list("UM4 Helmet", 0, /obj/item/clothing/head/helmet/marine/veteran/UPP, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_RECOMMENDED), + list("Ushanka", 0, /obj/item/clothing/head/uppcap/ushanka, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), list("ARMOR (CHOOSE 1)", 0, null, null, null), list("UL4 senior officer jacket", 0, /obj/item/clothing/suit/storage/marine/faction/UPP/kapitan, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), @@ -2562,18 +2920,16 @@ list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas/pmc/upp, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), - list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR) + list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + + list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), + list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), ) /datum/equipment_preset/upp/officer/ley_gen/get_antag_gear_equipment() @@ -2621,31 +2977,43 @@ list("EXPLOSIVES", 0, null, null, null), list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), + list("Breaching Charge", 10, /obj/item/explosive/plastic/breaching_charge, null, VENDOR_ITEM_REGULAR), list("Smoke Grenade", 5, /obj/item/explosive/grenade/smokebomb, null, VENDOR_ITEM_REGULAR), list("Type 6 Shrapnel Grenade", 15, /obj/item/explosive/grenade/high_explosive/upp, null, VENDOR_ITEM_REGULAR), list("Type 8 WP Grenade", 20, /obj/item/explosive/grenade/phosphorus/upp, null, VENDOR_ITEM_REGULAR), list("UTILITIES", 0, null, null, null), - list("Brown Webbing Vest", 10, /obj/item/clothing/accessory/storage/black_vest/brown_vest, null, VENDOR_ITEM_RECOMMENDED), - list("Black Webbing Vest", 10, /obj/item/clothing/accessory/storage/black_vest, null, VENDOR_ITEM_RECOMMENDED), + list("Roller Bed", 5, /obj/item/roller, null, VENDOR_ITEM_REGULAR), + list("Fulton Device Stack", 5, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR), list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), + list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Motion Detector", 8, /obj/item/device/motiondetector/hacked, null, VENDOR_ITEM_REGULAR), list("Large General Pouch", 10, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), - list("Shoulder Holster", 10, /obj/item/clothing/accessory/storage/holster, null, VENDOR_ITEM_REGULAR), - list("Webbing", 10, /obj/item/clothing/accessory/storage/webbing, null, VENDOR_ITEM_REGULAR), - list("Drop Pouch", 10, /obj/item/clothing/accessory/storage/droppouch, null, VENDOR_ITEM_REGULAR), + + list("BINOCULARS", 0, null, null, null), + list("Binoculars", 5, /obj/item/device/binoculars, null, VENDOR_ITEM_REGULAR), + list("Range Finder", 10, /obj/item/device/binoculars/range, null, VENDOR_ITEM_REGULAR), + list("Laser Designator", 15, /obj/item/device/binoculars/range/designator, null, VENDOR_ITEM_REGULAR), ) //*****************************************************************************************************/ +/datum/job/antag/upp/officer/gen + title = JOB_UPP_GENERAL + gear_preset = /datum/equipment_preset/upp/officer/gen /datum/equipment_preset/upp/officer/gen - name = "UPP Army General" - assignment = JOB_UPP_KOL_OFFICER - rank = JOB_UPP_KOL_OFFICER + name = "UPP General Armii (Cryo)" + assignment = JOB_UPP_GENERAL + rank = JOB_UPP_GENERAL role_comm_title = "Gen." + minimap_icon = "upp_co" paygrades = list(PAY_SHORT_UO9 = JOB_PLAYTIME_TIER_0) skills = /datum/skills/upp/commander -/datum/equipment_preset/upp/officer/gen/load_gear(mob/living/carbon/human/new_human) +/datum/equipment_preset/upp/officer/gen/dressed + name = "UPP Army General" + +/datum/equipment_preset/upp/officer/gen/dressed/load_gear(mob/living/carbon/human/new_human) //back new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher, WEAR_IN_BACK) @@ -2696,10 +3064,12 @@ list("Headset", 0, /obj/item/device/radio/headset/distress/UPP/command, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), list("Ration", 0, /obj/item/reagent_container/food/snacks/upp, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), list("Combat Pack", 0, /obj/item/storage/backpack/lightpack/upp, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), + list("Binoculars", 0, /obj/item/device/binoculars, null, VENDOR_ITEM_MANDATORY), list("HELMET (CHOOSE 1)", 0, null, null, null), list("Peaked Cap", 0, /obj/item/clothing/head/uppcap/peaked, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), list("UM4 Helmet", 0, /obj/item/clothing/head/helmet/marine/veteran/UPP, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_RECOMMENDED), + list("Ushanka", 0, /obj/item/clothing/head/uppcap/ushanka, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), list("ARMOR (CHOOSE 1)", 0, null, null, null), list("UL4 senior officer jacket", 0, /obj/item/clothing/suit/storage/marine/faction/UPP/kapitan, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), @@ -2723,18 +3093,16 @@ list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("MASK (CHOOSE 1)", 0, null, null, null), list("Gas Mask", 0, /obj/item/clothing/mask/gas/pmc/upp, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), - list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR) + list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + + list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), + list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), ) /datum/equipment_preset/upp/officer/gen/get_antag_gear_equipment() @@ -2782,18 +3150,23 @@ list("EXPLOSIVES", 0, null, null, null), list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), + list("Breaching Charge", 10, /obj/item/explosive/plastic/breaching_charge, null, VENDOR_ITEM_REGULAR), list("Smoke Grenade", 5, /obj/item/explosive/grenade/smokebomb, null, VENDOR_ITEM_REGULAR), list("Type 6 Shrapnel Grenade", 15, /obj/item/explosive/grenade/high_explosive/upp, null, VENDOR_ITEM_REGULAR), list("Type 8 WP Grenade", 20, /obj/item/explosive/grenade/phosphorus/upp, null, VENDOR_ITEM_REGULAR), list("UTILITIES", 0, null, null, null), - list("Brown Webbing Vest", 10, /obj/item/clothing/accessory/storage/black_vest/brown_vest, null, VENDOR_ITEM_RECOMMENDED), - list("Black Webbing Vest", 10, /obj/item/clothing/accessory/storage/black_vest, null, VENDOR_ITEM_RECOMMENDED), + list("Roller Bed", 5, /obj/item/roller, null, VENDOR_ITEM_REGULAR), + list("Fulton Device Stack", 5, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR), list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), + list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Motion Detector", 8, /obj/item/device/motiondetector/hacked, null, VENDOR_ITEM_REGULAR), list("Large General Pouch", 10, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), - list("Shoulder Holster", 10, /obj/item/clothing/accessory/storage/holster, null, VENDOR_ITEM_REGULAR), - list("Webbing", 10, /obj/item/clothing/accessory/storage/webbing, null, VENDOR_ITEM_REGULAR), - list("Drop Pouch", 10, /obj/item/clothing/accessory/storage/droppouch, null, VENDOR_ITEM_REGULAR), + + list("BINOCULARS", 0, null, null, null), + list("Binoculars", 5, /obj/item/device/binoculars, null, VENDOR_ITEM_REGULAR), + list("Range Finder", 10, /obj/item/device/binoculars/range, null, VENDOR_ITEM_REGULAR), + list("Laser Designator", 15, /obj/item/device/binoculars/range/designator, null, VENDOR_ITEM_REGULAR), ) //*****************************************************************************************************/ @@ -2834,23 +3207,44 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive/C4, WEAR_R_STORE) //*****************************************************************************************************/ - //===================// // UPP Synthetics // //================// +/datum/job/antag/upp/synth + title = JOB_UPP_SUPPORT_SYNTH + gear_preset = /datum/equipment_preset/upp/synth + + flags_whitelist = WHITELIST_SYNTHETIC + /datum/equipment_preset/upp/synth - name = "UPP Synthetic" - flags = EQUIPMENT_PRESET_EXTRA + name = "UPP Synthetic (Cryo)" languages = ALL_SYNTH_LANGUAGES_UPP skills = /datum/skills/synthetic assignment = JOB_UPP_SUPPORT_SYNTH rank = JOB_UPP_SUPPORT_SYNTH + minimap_icon = "upp_synth" paygrades = list(PAY_SHORT_SYN = JOB_PLAYTIME_TIER_0) idtype = /obj/item/card/id/dogtag + +/datum/equipment_preset/upp/synth/dressed + name = "UPP Synthetic" + +/datum/equipment_preset/upp/synth/load_gear(mob/living/carbon/human/new_human) + . = ..() + //face + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/command, WEAR_L_EAR) + //body + var/obj/item/clothing/under/marine/veteran/UPP/medic/UPP = new() + var/obj/item/clothing/accessory/storage/surg_vest/drop_green/upp/webbing = new() + UPP.attach_accessory(new_human, webbing) + new_human.equip_to_slot_or_del(UPP, WEAR_BODY) + //limbs + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp/knife, WEAR_FEET) + /datum/equipment_preset/upp/synth/load_name(mob/living/carbon/human/new_human, randomise) new_human.gender = pick(50;MALE,50;FEMALE) var/datum/preferences/A = new() @@ -2891,7 +3285,7 @@ . = ..() new_human.allow_gun_usage = FALSE -/datum/equipment_preset/upp/synth/load_gear(mob/living/carbon/human/new_human) +/datum/equipment_preset/upp/synth/dressed/load_gear(mob/living/carbon/human/new_human) //back new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator/compact, WEAR_IN_BACK) @@ -2941,6 +3335,9 @@ list("RADIO (TAKE ALL)", 0, null, null, null), list("Headset", 0, /obj/item/device/radio/headset/distress/UPP/command, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), + list("HELMET (CHOOSE 1)", 0, null, null, null), + list("Ushanka", 0, /obj/item/clothing/head/uppcap/ushanka, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), + list("WEBBING (CHOOSE 1)", 0, null, null, null), list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), @@ -2967,7 +3364,7 @@ list("BELT (CHOOSE 1)", 0, null, null, null), list("G8-A General Utility Pouch", 0, /obj/item/storage/backpack/general_belt, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), - list("M276 Lifesaver Bag", 0, /obj/item/storage/belt/medical/lifesaver/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), + list("M276 Lifesaver Bag", 0, /obj/item/storage/belt/medical/lifesaver/upp/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("M276 Medical Storage Belt", 0, /obj/item/storage/belt/medical/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("M276 Toolbelt Rig (Full)", 0, /obj/item/storage/belt/utility/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), @@ -3047,24 +3444,31 @@ list("Laser Designator", 12, /obj/item/device/binoculars/range/designator, null, VENDOR_ITEM_RECOMMENDED), list("Flashlight", 1, /obj/item/device/flashlight, null, VENDOR_ITEM_RECOMMENDED), list("Fulton Recovery Device", 5, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR), - list("Motion Detector", 5, /obj/item/device/motiondetector, null, VENDOR_ITEM_REGULAR), + list("Motion Detector", 5, /obj/item/device/motiondetector/hacked, null, VENDOR_ITEM_REGULAR), list("Space Cleaner", 2, /obj/item/reagent_container/spray/cleaner, null, VENDOR_ITEM_REGULAR), list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), ) - +/datum/job/antag/upp/synth/combat + title = JOB_UPP_COMBAT_SYNTH + selection_class = "job_antag" + gear_preset = /datum/equipment_preset/upp/synth/combat /datum/equipment_preset/upp/synth/combat - name = "UPP Combat Synthetic" - flags = EQUIPMENT_PRESET_EXTRA + name = "UPP Combat Synthetic (Cryo)" assignment = JOB_UPP_COMBAT_SYNTH rank = JOB_UPP_COMBAT_SYNTH +/datum/equipment_preset/upp/synth/combat/dressed + name = "UPP Combat Synthetic" + flags = EQUIPMENT_PRESET_EXTRA + + /datum/equipment_preset/upp/synth/combat/load_skills(mob/living/carbon/human/new_human) . = ..() new_human.allow_gun_usage = TRUE -/datum/equipment_preset/upp/synth/combat/load_gear(mob/living/carbon/human/new_human) +/datum/equipment_preset/upp/synth/combat/dressed/load_gear(mob/living/carbon/human/new_human) //back new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line, WEAR_IN_BACK) @@ -3110,13 +3514,8 @@ //*****************************************************************************************************/ -//=================// -// UPP SpecFor // -//=============// - /datum/equipment_preset/upp/commando - name = "UPP Commando (!DEATHSQUAD!)" - flags = EQUIPMENT_PRESET_EXTRA + name = "UPP Commando (!DEATHSQUAD! , Cryo)" skills = /datum/skills/commando assignment = JOB_UPP_COMMANDO @@ -3124,13 +3523,20 @@ role_comm_title = "JKdo" paygrades = list(PAY_SHORT_UC1 = JOB_PLAYTIME_TIER_0) idtype = /obj/item/card/id/data + + minimap_icon = "upp_com" + languages = list(LANGUAGE_RUSSIAN, LANGUAGE_ENGLISH, LANGUAGE_TSL, LANGUAGE_SPANISH, LANGUAGE_CHINESE) -/datum/equipment_preset/upp/commando/New() +/datum/equipment_preset/upp/commando/dressed + name = "UPP Commando (!DEATHSQUAD!)" + flags = EQUIPMENT_PRESET_EXTRA + +/datum/equipment_preset/upp/commando/dressed/New() . = ..() access = get_access(ACCESS_LIST_GLOBAL) -/datum/equipment_preset/upp/commando/load_gear(mob/living/carbon/human/new_human) +/datum/equipment_preset/upp/commando/dressed/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/kdo, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP, WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp, WEAR_ACCESSORY) @@ -3171,10 +3577,12 @@ list("UM5CU Personal Armor", 0, /obj/item/clothing/suit/storage/marine/faction/UPP/commando, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), list("UPP Cloak", 0, /obj/item/storage/backpack/marine/satchel/scout_cloak/upp, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), list("UPP Balaclava", 0, /obj/item/clothing/mask/gas/pmc/upp, MARINE_CAN_BUY_MASK, VENDOR_ITEM_MANDATORY), + list("Binoculars", 0, /obj/item/device/binoculars/range, null, VENDOR_ITEM_MANDATORY), list("HELMET (CHOOSE 1)", 0, null, null, null), list("Armored Cap", 0, /obj/item/clothing/head/uppcap, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), list("UM4 Helmet", 0, /obj/item/clothing/head/helmet/marine/veteran/UPP, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), + list("Ushanka", 0, /obj/item/clothing/head/uppcap/ushanka, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), list("BELT (CHOOSE 1)", 0, null, null, null), list("Type 41 Ammo Load Rig", 0, /obj/item/storage/belt/marine/upp, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), @@ -3194,18 +3602,16 @@ list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("MASK (CHOOSE 1)", 0, null, null, null), - list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), - list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR) + list("Gas Mask", 0, /obj/item/clothing/mask/gas/pmc/upp, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + + list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), + list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), ) /datum/equipment_preset/upp/commando/get_antag_gear_equipment() @@ -3229,29 +3635,35 @@ list("Type 8 WP Grenade", 20, /obj/item/explosive/grenade/phosphorus/upp, null, VENDOR_ITEM_REGULAR), list("UTILITIES", 0, null, null, null), - list("Brown Webbing Vest", 10, /obj/item/clothing/accessory/storage/black_vest/brown_vest, null, VENDOR_ITEM_RECOMMENDED), - list("Black Webbing Vest", 10, /obj/item/clothing/accessory/storage/black_vest, null, VENDOR_ITEM_RECOMMENDED), - list("Entrenching Tool", 2, /obj/item/tool/shovel/etool, null, VENDOR_ITEM_REGULAR), + list("Roller Bed", 5, /obj/item/roller, null, VENDOR_ITEM_REGULAR), + list("Fulton Device Stack", 5, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR), list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), - list("Large General Pouch", 10, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), - list("Shoulder Holster", 10, /obj/item/clothing/accessory/storage/holster, null, VENDOR_ITEM_REGULAR), - list("Webbing", 10, /obj/item/clothing/accessory/storage/webbing, null, VENDOR_ITEM_REGULAR), - list("Drop Pouch", 10, /obj/item/clothing/accessory/storage/droppouch, null, VENDOR_ITEM_REGULAR), + list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Motion Detector", 15, /obj/item/device/motiondetector/hacked, null, VENDOR_ITEM_REGULAR), + list("Large General Pouch", 15, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), ) //*****************************************************************************************************/ +/datum/job/antag/upp/commando/medic + title = JOB_UPP_COMMANDO_MEDIC + selection_class = "job_antag" + gear_preset = /datum/equipment_preset/upp/commando/medic /datum/equipment_preset/upp/commando/medic - name = "UPP Commando Medic (!DEATHSQUAD!)" - flags = EQUIPMENT_PRESET_EXTRA + name = "UPP Commando Medic (!DEATHSQUAD!, Cryo)" skills = /datum/skills/commando/medic assignment = JOB_UPP_COMMANDO_MEDIC rank = JOB_UPP_COMMANDO_MEDIC role_comm_title = "2ndKdo" + minimap_icon = "upp_commed" paygrades = list(PAY_SHORT_UC2 = JOB_PLAYTIME_TIER_0) -/datum/equipment_preset/upp/commando/medic/load_gear(mob/living/carbon/human/new_human) +/datum/equipment_preset/upp/commando/medic/dressed + name = "UPP Commando Medic (!DEATHSQUAD!)" + flags = EQUIPMENT_PRESET_EXTRA + +/datum/equipment_preset/upp/commando/medic/dressed/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/kdo/medic, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP/medic, WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp, WEAR_ACCESSORY) @@ -3291,20 +3703,19 @@ /datum/equipment_preset/upp/commando/medic/get_antag_clothing_equipment() return list( list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), - list("Boots", 0, /obj/item/clothing/shoes/marine/upp/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY), - list("Fatigues Medic", 0, /obj/item/clothing/under/marine/veteran/UPP/medic, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), - list("Gloves", 0, /obj/item/clothing/gloves/marine/veteran/upp, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY), - list("Headset", 0, /obj/item/device/radio/headset/distress/UPP/kdo/medic, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), + list("Standard Apparel", 0, list(/obj/item/clothing/under/marine/veteran/UPP/medic, /obj/item/clothing/shoes/marine/upp/knife, /obj/item/clothing/gloves/marine/veteran/upp, /obj/item/device/radio/headset/distress/UPP/kdo/medic), MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), list("HealthMate HUD", 0, /obj/item/clothing/glasses/hud/health, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_MANDATORY), list("Night Vision Goggles", 0, /obj/item/clothing/glasses/night/m42_night_goggles/upp, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_MANDATORY), list("Ration", 0, /obj/item/reagent_container/food/snacks/upp, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), list("UM5CU Personal Armor", 0, /obj/item/clothing/suit/storage/marine/faction/UPP/commando, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), list("UPP Cloak", 0, /obj/item/storage/backpack/marine/satchel/scout_cloak/upp, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), list("UPP Balaclava", 0, /obj/item/clothing/mask/gas/pmc/upp, MARINE_CAN_BUY_MASK, VENDOR_ITEM_MANDATORY), + list("Binoculars", 0, /obj/item/device/binoculars/range, null, VENDOR_ITEM_MANDATORY), list("HELMET (CHOOSE 1)", 0, null, null, null), list("Armored Cap", 0, /obj/item/clothing/head/uppcap, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), list("UM4 Helmet", 0, /obj/item/clothing/head/helmet/marine/veteran/UPP, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), + list("Ushanka", 0, /obj/item/clothing/head/uppcap/ushanka, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), list("BELT", 0, null, null, null), list("Type 41 Lifesaver Bag", 0, /obj/item/storage/belt/medical/lifesaver/upp/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_MANDATORY), @@ -3325,18 +3736,16 @@ list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("MASK (CHOOSE 1)", 0, null, null, null), - list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), - list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR) + list("Gas Mask", 0, /obj/item/clothing/mask/gas/pmc/upp, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + + list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), + list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), ) /datum/equipment_preset/upp/commando/medic/get_antag_gear_equipment() @@ -3397,29 +3806,36 @@ list("Type 8 WP Grenade", 20, /obj/item/explosive/grenade/phosphorus/upp, null, VENDOR_ITEM_REGULAR), list("UTILITIES", 0, null, null, null), - list("Brown Webbing Vest", 10, /obj/item/clothing/accessory/storage/black_vest/brown_vest, null, VENDOR_ITEM_RECOMMENDED), - list("Black Webbing Vest", 10, /obj/item/clothing/accessory/storage/black_vest, null, VENDOR_ITEM_RECOMMENDED), + list("Fulton Device Stack", 5, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR), list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), - list("Large General Pouch", 10, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), - list("Shoulder Holster", 10, /obj/item/clothing/accessory/storage/holster, null, VENDOR_ITEM_REGULAR), - list("Webbing", 10, /obj/item/clothing/accessory/storage/webbing, null, VENDOR_ITEM_REGULAR), - list("Drop Pouch", 10, /obj/item/clothing/accessory/storage/droppouch, null, VENDOR_ITEM_REGULAR), + list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Motion Detector", 15, /obj/item/device/motiondetector/hacked, null, VENDOR_ITEM_REGULAR), + list("Large General Pouch", 15, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), ) //*****************************************************************************************************/ +/datum/job/antag/upp/commando/leader + title = JOB_UPP_COMMANDO_LEADER + selection_class = "job_antag" + gear_preset = /datum/equipment_preset/upp/commando/leader /datum/equipment_preset/upp/commando/leader - name = "UPP Commando Leader (!DEATHSQUAD!)" - flags = EQUIPMENT_PRESET_EXTRA + name = "UPP Commando Leader (!DEATHSQUAD!, cryo)" skills = /datum/skills/commando/leader assignment = JOB_UPP_COMMANDO_LEADER rank = JOB_UPP_COMMANDO_LEADER role_comm_title = "1stKdo" + minimap_icon = "upp_comsl" paygrades = list(PAY_SHORT_UC3 = JOB_PLAYTIME_TIER_0) idtype = /obj/item/card/id/silver -/datum/equipment_preset/upp/commando/leader/load_gear(mob/living/carbon/human/new_human) +/datum/equipment_preset/upp/commando/leader/dressed + name = "UPP Commando Leader (!DEATHSQUAD!)" + flags = EQUIPMENT_PRESET_EXTRA + + +/datum/equipment_preset/upp/commando/leader/dressed/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/kdo/command, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP, WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp, WEAR_ACCESSORY) @@ -3453,19 +3869,18 @@ /datum/equipment_preset/upp/commando/leader/get_antag_clothing_equipment() return list( list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), - list("Boots", 0, /obj/item/clothing/shoes/marine/upp/knife, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY), - list("Fatigues", 0, /obj/item/clothing/suit/storage/marine/faction/UPP/commando, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), - list("Gloves", 0, /obj/item/clothing/gloves/marine/veteran/upp, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY), - list("Headset", 0, /obj/item/device/radio/headset/distress/UPP/kdo/command, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), + list("Standard Apparel", 0, list(/obj/item/clothing/suit/storage/marine/faction/UPP/commando, /obj/item/clothing/shoes/marine/upp/knife, /obj/item/clothing/gloves/marine/veteran/upp, /obj/item/device/radio/headset/distress/UPP/kdo/command), MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), list("Night Vision Goggles", 0, /obj/item/clothing/glasses/night/m42_night_goggles/upp, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_MANDATORY), list("Ration", 0, /obj/item/reagent_container/food/snacks/upp, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), list("UM5CU Personal Armor", 0, /obj/item/clothing/suit/storage/marine/faction/UPP/commando, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), list("UPP Cloak", 0, /obj/item/storage/backpack/marine/satchel/scout_cloak/upp, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), list("UPP Balaclava", 0, /obj/item/clothing/mask/gas/pmc/upp, MARINE_CAN_BUY_MASK, VENDOR_ITEM_MANDATORY), + list("Binoculars", 0, /obj/item/device/binoculars/range, null, VENDOR_ITEM_MANDATORY), list("HELMET (CHOOSE 1)", 0, null, null, null), list("Armored Cap", 0, /obj/item/clothing/head/uppcap, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), list("UM4 Helmet", 0, /obj/item/clothing/head/helmet/marine/veteran/UPP, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), + list("Ushanka", 0, /obj/item/clothing/head/uppcap/ushanka, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), list("BELT (CHOOSE 1)", 0, null, null, null), list("Type 41 Ammo Load Rig", 0, /obj/item/storage/belt/marine/upp, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), @@ -3481,22 +3896,21 @@ list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Medical Kit Pouch", 0, /obj/item/storage/pouch/medkit, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("ATTACHMENT (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("MASK (CHOOSE 1)", 0, null, null, null), - list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), - list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR) + list("Gas Mask", 0, /obj/item/clothing/mask/gas/pmc/upp, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + + list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), + list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), ) /datum/equipment_preset/upp/commando/leader/get_antag_gear_equipment() @@ -3544,18 +3958,23 @@ list("EXPLOSIVES", 0, null, null, null), list("Plastic Explosive", 5, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), + list("Breaching Charge", 10, /obj/item/explosive/plastic/breaching_charge, null, VENDOR_ITEM_REGULAR), list("Smoke Grenade", 5, /obj/item/explosive/grenade/smokebomb, null, VENDOR_ITEM_REGULAR), list("Type 6 Shrapnel Grenade", 15, /obj/item/explosive/grenade/high_explosive/upp, null, VENDOR_ITEM_REGULAR), list("Type 8 WP Grenade", 20, /obj/item/explosive/grenade/phosphorus/upp, null, VENDOR_ITEM_REGULAR), list("UTILITIES", 0, null, null, null), - list("Brown Webbing Vest", 10, /obj/item/clothing/accessory/storage/black_vest/brown_vest, null, VENDOR_ITEM_RECOMMENDED), - list("Black Webbing Vest", 10, /obj/item/clothing/accessory/storage/black_vest, null, VENDOR_ITEM_RECOMMENDED), + list("Roller Bed", 5, /obj/item/roller, null, VENDOR_ITEM_REGULAR), + list("Fulton Device Stack", 5, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR), list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), + list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Motion Detector", 15, /obj/item/device/motiondetector/hacked, null, VENDOR_ITEM_REGULAR), list("Large General Pouch", 10, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), - list("Shoulder Holster", 10, /obj/item/clothing/accessory/storage/holster, null, VENDOR_ITEM_REGULAR), - list("Webbing", 10, /obj/item/clothing/accessory/storage/webbing, null, VENDOR_ITEM_REGULAR), - list("Drop Pouch", 10, /obj/item/clothing/accessory/storage/droppouch, null, VENDOR_ITEM_REGULAR), + + list("BINOCULARS", 0, null, null, null), + list("Binoculars", 5, /obj/item/device/binoculars, null, VENDOR_ITEM_REGULAR), + list("Range Finder", 10, /obj/item/device/binoculars/range, null, VENDOR_ITEM_REGULAR), + list("Laser Designator", 15, /obj/item/device/binoculars/range/designator, null, VENDOR_ITEM_REGULAR), ) /datum/equipment_preset/upp/commando/low_threat @@ -3669,17 +4088,24 @@ //========// /datum/equipment_preset/upp/tank - name = "UPP Vehicle Crewman (TANK)" + name = "UPP Vehicle Crewman (TANK, cryo)" flags = EQUIPMENT_PRESET_EXTRA assignment = JOB_UPP_CREWMAN rank = JOB_UPP_CREWMAN paygrades = list(PAY_SHORT_UE5 = JOB_PLAYTIME_TIER_0) role_comm_title = "TANK" + + minimap_icon = "upp_vc" + minimum_age = 30 skills = /datum/skills/tank_crew -/datum/equipment_preset/upp/tank/load_gear(mob/living/carbon/human/new_human) +/datum/equipment_preset/upp/tank/dressed + name = "UPP Vehicle Crewman (TANK)" + + +/datum/equipment_preset/upp/tank/dressed/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp, WEAR_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp/naval, WEAR_ACCESSORY) @@ -3707,6 +4133,7 @@ list("UM4-V Helmet", 0, /obj/item/clothing/head/helmet/marine/veteran/UPP/engi, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY), list("Welding Kit", 0, /obj/item/tool/weldpack, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), + list("Binoculars", 0, /obj/item/device/binoculars, null, VENDOR_ITEM_MANDATORY), list("PERSONAL SIDEARM (CHOOSE 1)", 0, null, null, null), list("Type 73 Pistol", 0, /obj/item/weapon/gun/pistol/t73, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_RECOMMENDED), @@ -3731,42 +4158,20 @@ list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Tools Pouch (Full)", 0, /obj/item/storage/pouch/tools/tank, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), - list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), - list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), - list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), - list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), - list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), - list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), - list("WELDING PROTECTION (CHOOSE 1)", 0, null, null, null), list("Welding Goggles", 0, /obj/item/clothing/glasses/welding, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR), list("Welding Helmet", 0, /obj/item/clothing/head/welding, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR), list("MASK (CHOOSE 1)", 0, null, null, null), - list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + list("Gas Mask", 0, /obj/item/clothing/mask/gas/pmc/upp, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), - list("ATTACHMENTS", 0, null, null, null), - list("Angled Grip", 10, /obj/item/attachable/angledgrip, null, VENDOR_ITEM_REGULAR), - list("Extended Barrel", 10, /obj/item/attachable/extended_barrel, null, VENDOR_ITEM_REGULAR), - list("Gyroscopic Stabilizer", 10, /obj/item/attachable/gyro, null, VENDOR_ITEM_REGULAR), - list("Laser Sight", 10, /obj/item/attachable/lasersight, null, VENDOR_ITEM_REGULAR), - list("Masterkey Shotgun", 10, /obj/item/attachable/attached_gun/shotgun, null, VENDOR_ITEM_REGULAR), - list("M37 Wooden Stock", 10, /obj/item/attachable/stock/shotgun, null, VENDOR_ITEM_REGULAR), - list("M39 Stock", 10, /obj/item/attachable/stock/smg, null, VENDOR_ITEM_REGULAR), - list("M41A Solid Stock", 10, /obj/item/attachable/stock/rifle, null, VENDOR_ITEM_REGULAR), - list("Recoil Compensator", 10, /obj/item/attachable/compensator, null, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 10, /obj/item/attachable/reddot, null, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 10, /obj/item/attachable/reflex, null, VENDOR_ITEM_REGULAR), - list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 10, /obj/item/attachable/verticalgrip, null, VENDOR_ITEM_REGULAR), - - list("UTILITIES", 0, null, null, null), - list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), - list("Fuel Tank Strap Pouch", 5, /obj/item/storage/pouch/flamertank, null, VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 15, /obj/item/storage/pouch/magazine/large, null, VENDOR_ITEM_REGULAR), - list("Motion Detector", 15, /obj/item/device/motiondetector, null, VENDOR_ITEM_REGULAR), - list("Plastic Explosive", 10, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), + list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), + list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), ) /datum/equipment_preset/upp/tank/get_antag_gear_equipment() @@ -3778,13 +4183,132 @@ list("Type 8 WP Grenade", 20, /obj/item/explosive/grenade/phosphorus/upp, null, VENDOR_ITEM_REGULAR), list("UTILITIES", 0, null, null, null), - list("Brown Webbing Vest", 10, /obj/item/clothing/accessory/storage/black_vest/brown_vest, null, VENDOR_ITEM_RECOMMENDED), - list("Black Webbing Vest", 10, /obj/item/clothing/accessory/storage/black_vest, null, VENDOR_ITEM_RECOMMENDED), - list("Webbing", 10, /obj/item/clothing/accessory/storage/webbing, null, VENDOR_ITEM_REGULAR), - list("Drop Pouch", 10, /obj/item/clothing/accessory/storage/droppouch, null, VENDOR_ITEM_REGULAR) + list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), + list("Fuel Tank Strap Pouch", 5, /obj/item/storage/pouch/flamertank, null, VENDOR_ITEM_REGULAR), + list("Large Magazine Pouch", 15, /obj/item/storage/pouch/magazine/large, null, VENDOR_ITEM_REGULAR), + list("Motion Detector", 15, /obj/item/device/motiondetector/hacked, null, VENDOR_ITEM_REGULAR), + list("Plastic Explosive", 10, /obj/item/explosive/plastic, null, VENDOR_ITEM_REGULAR), + list("Large General Pouch", 15, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), ) //*****************************************************************************************************/ +/datum/job/antag/upp/commisar + title = JOB_UPP_COMMISSAR + selection_class = "job_cl" + gear_preset = /datum/equipment_preset/upp/commissar + +/datum/equipment_preset/upp/commissar + name = "UPP Political Commissar (Cryo)" + + assignment = JOB_UPP_COMMISSAR + rank = JOB_UPP_COMMISSAR + paygrades = list(PAY_SHORT_UO4P = JOB_PLAYTIME_TIER_0) + role_comm_title = "Commissar" + minimum_age = 30 + skills = /datum/skills/upp/commissar + +/datum/equipment_preset/upp/commissar/dressed + name = "UPP Political Commissar" + flags = EQUIPMENT_PRESET_EXTRA + +/datum/equipment_preset/upp/commissar/load_gear(mob/living/carbon/human/new_human) + . = ..() + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp/naval, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/command(new_human), WEAR_L_EAR) + +/datum/equipment_preset/upp/commissar/dressed/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp/naval, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/command(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/type47/revolver(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/gimmick/jason(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret(new_human), WEAR_HEAD) + +/datum/equipment_preset/upp/commissar/load_status() + return + +/datum/equipment_preset/upp/commissar/get_antag_clothing_equipment() + return list( + list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), + list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), + + list("HELMET (CHOOSE 1)", 0, null, null, null), + list("UL2 Cap", 0, /obj/item/clothing/head/uppcap, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), + list("UL3 Beret", 0, /obj/item/clothing/head/uppcap/beret, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), + list("UL8 Ushanka", 0, /obj/item/clothing/head/uppcap/beret, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), + list("UM4 Helmet", 0, /obj/item/clothing/head/helmet/marine/veteran/UPP, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), + list("Binoculars", 0, /obj/item/device/binoculars, null, VENDOR_ITEM_MANDATORY), + + list("POUCHES (CHOOSE 2)", 0, null, null, null), + list("First-Aid Pouch (Full)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), + list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Magazine Pouch", 0, /obj/item/storage/pouch/magazine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + + list("MASK (CHOOSE 1)", 0, null, null, null), + list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR) + ) + +/datum/equipment_preset/upp/commissar/get_antag_gear_equipment() + return list( + list("SQUAD LEADER SET (MANDATORY)", 0, null, null, null), + list("Essential SL Set", 0, /obj/effect/essentials_set/leader/upp, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), + + list("GENERAL SUPPLIES", 0, null, null, null), + list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + + list("ENGINEERING SUPPLIES", 0, null, null, null), + list("Entrenching Tool", 2, /obj/item/tool/shovel/etool, null, VENDOR_ITEM_REGULAR), + list("Insulated Gloves", 3, /obj/item/clothing/gloves/yellow, null, VENDOR_ITEM_REGULAR), + list("Tools Pouch (Full)", 5, /obj/item/storage/pouch/tools/full, null, VENDOR_ITEM_REGULAR), + list("Welding Goggles", 5, /obj/item/clothing/glasses/welding, null, VENDOR_ITEM_REGULAR), + + list("MEDICAL SUPPLIES", 0, null, null, null), + list("Burn Kit", 2, /obj/item/stack/medical/advanced/ointment, null, VENDOR_ITEM_REGULAR), + list("Trauma Kit", 2, /obj/item/stack/medical/advanced/bruise_pack, null, VENDOR_ITEM_REGULAR), + list("Advanced Firstaid Kit", 12, /obj/item/storage/firstaid/adv, null, VENDOR_ITEM_REGULAR), + list("Medical Splints", 1, /obj/item/stack/medical/splint, null, VENDOR_ITEM_REGULAR), + + list("Injector (Bicaridine)", 1, /obj/item/reagent_container/hypospray/autoinjector/bicaridine, null, VENDOR_ITEM_REGULAR), + list("Injector (Dexalin+)", 1, /obj/item/reagent_container/hypospray/autoinjector/dexalinp, null, VENDOR_ITEM_REGULAR), + list("Injector (Inaprovaline)", 1, /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, null, VENDOR_ITEM_REGULAR), + list("Injector (Kelotane)", 1, /obj/item/reagent_container/hypospray/autoinjector/kelotane, null, VENDOR_ITEM_REGULAR), + list("Injector (Oxycodone)", 2, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), + list("Injector (Tramadol)", 1, /obj/item/reagent_container/hypospray/autoinjector/tramadol, null, VENDOR_ITEM_REGULAR), + list("Injector (Tricord)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), + + list("Health Analyzer", 4, /obj/item/device/healthanalyzer, null, VENDOR_ITEM_REGULAR), + list("Medical HUD Glasses", 4, /obj/item/clothing/glasses/hud/health, null, VENDOR_ITEM_MANDATORY), + + list("UTILITIES", 0, null, null, null), + list("Fulton Device Stack", 5, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR), + list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), + list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Motion Detector", 15, /obj/item/device/motiondetector/hacked, null, VENDOR_ITEM_REGULAR), + list("Large General Pouch", 10, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), + + list("BINOCULARS", 0, null, null, null), + list("Binoculars", 5, /obj/item/device/binoculars, null, VENDOR_ITEM_REGULAR), + list("Range Finder", 10, /obj/item/device/binoculars/range, null, VENDOR_ITEM_REGULAR), + list("Laser Designator", 15, /obj/item/device/binoculars/range/designator, null, VENDOR_ITEM_REGULAR), + ) + +//*****************************************************************************************************/ +/datum/job/antag/upp/conscript + title = JOB_UPP_CONSCRIPT + selection_class = "job_antag" + gear_preset = /datum/equipment_preset/upp/conscript + flags_startup_parameters = ROLE_ADD_TO_SQUAD /datum/equipment_preset/upp/conscript //meme role @@ -3795,6 +4319,7 @@ assignment = JOB_UPP_CONSCRIPT rank = JOB_UPP_CONSCRIPT role_comm_title = "Cons" + minimap_icon = "upp_pvt" paygrades = list(PAY_SHORT_UE1 = JOB_PLAYTIME_TIER_0) /datum/equipment_preset/upp/conscript/load_gear(mob/living/carbon/human/new_human) @@ -3858,6 +4383,7 @@ list("Fatigues", 0, /obj/item/clothing/under/marine/veteran/UPP, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), list("Headset", 0, /obj/item/device/radio/headset/distress/UPP, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), list("Ration", 0, /obj/item/reagent_container/food/snacks/upp, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), + list("Binoculars", 0, /obj/item/device/binoculars, null, VENDOR_ITEM_MANDATORY), list("HELMET", 0, null, null, null), list("Armored Cap", 0, /obj/item/clothing/head/uppcap, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY), @@ -3894,94 +4420,3 @@ list("Drop Pouch", 10, /obj/item/clothing/accessory/storage/droppouch, null, VENDOR_ITEM_REGULAR) ) - -/datum/equipment_preset/upp/commissar - name = "UPP Political Commissar" - flags = EQUIPMENT_PRESET_EXTRA - - assignment = JOB_UPP_COMMISSAR - rank = JOB_UPP_COMMISSAR - paygrades = list(PAY_SHORT_UO4P = JOB_PLAYTIME_TIER_0) - role_comm_title = "Commissar" - minimum_age = 30 - skills = /datum/skills/upp/commissar - -/datum/equipment_preset/upp/commissar/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp/naval, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/command(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/type47/revolver(new_human), WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/gimmick/jason(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret(new_human), WEAR_HEAD) - -/datum/equipment_preset/upp/commissar/load_status() - return - -/datum/equipment_preset/upp/commissar/get_antag_clothing_equipment() - return list( - list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), - list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), - - list("HELMET (CHOOSE 1)", 0, null, null, null), - list("UL2 Cap", 0, /obj/item/clothing/head/uppcap, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), - list("UL3 Beret", 0, /obj/item/clothing/head/uppcap/beret, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), - list("UL8 Ushanka", 0, /obj/item/clothing/head/uppcap/beret, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), - list("UM4 Helmet", 0, /obj/item/clothing/head/helmet/marine/veteran/UPP, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), - - list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("First-Aid Pouch (Full)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Large General Pouch", 0, /obj/item/storage/pouch/general/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Magazine Pouch", 0, /obj/item/storage/pouch/magazine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - - list("MASK (CHOOSE 1)", 0, null, null, null), - list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), - list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), - ) - -/datum/equipment_preset/upp/commissar/get_antag_gear_equipment() - return list( - list("SQUAD LEADER SET (MANDATORY)", 0, null, null, null), - list("Essential SL Set", 0, /obj/effect/essentials_set/leader/upp, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), - - list("GENERAL SUPPLIES", 0, null, null, null), - list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), - - list("ENGINEERING SUPPLIES", 0, null, null, null), - list("Entrenching Tool", 2, /obj/item/tool/shovel/etool, null, VENDOR_ITEM_REGULAR), - list("Insulated Gloves", 3, /obj/item/clothing/gloves/yellow, null, VENDOR_ITEM_REGULAR), - list("Tools Pouch (Full)", 5, /obj/item/storage/pouch/tools/full, null, VENDOR_ITEM_REGULAR), - list("Welding Goggles", 5, /obj/item/clothing/glasses/welding, null, VENDOR_ITEM_REGULAR), - - list("MEDICAL SUPPLIES", 0, null, null, null), - list("Burn Kit", 2, /obj/item/stack/medical/advanced/ointment, null, VENDOR_ITEM_REGULAR), - list("Trauma Kit", 2, /obj/item/stack/medical/advanced/bruise_pack, null, VENDOR_ITEM_REGULAR), - list("Advanced Firstaid Kit", 12, /obj/item/storage/firstaid/adv, null, VENDOR_ITEM_REGULAR), - list("Medical Splints", 1, /obj/item/stack/medical/splint, null, VENDOR_ITEM_REGULAR), - - list("Injector (Bicaridine)", 1, /obj/item/reagent_container/hypospray/autoinjector/bicaridine, null, VENDOR_ITEM_REGULAR), - list("Injector (Dexalin+)", 1, /obj/item/reagent_container/hypospray/autoinjector/dexalinp, null, VENDOR_ITEM_REGULAR), - list("Injector (Inaprovaline)", 1, /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, null, VENDOR_ITEM_REGULAR), - list("Injector (Kelotane)", 1, /obj/item/reagent_container/hypospray/autoinjector/kelotane, null, VENDOR_ITEM_REGULAR), - list("Injector (Oxycodone)", 2, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), - list("Injector (Tramadol)", 1, /obj/item/reagent_container/hypospray/autoinjector/tramadol, null, VENDOR_ITEM_REGULAR), - list("Injector (Tricord)", 1, /obj/item/reagent_container/hypospray/autoinjector/tricord, null, VENDOR_ITEM_REGULAR), - - list("Health Analyzer", 4, /obj/item/device/healthanalyzer, null, VENDOR_ITEM_REGULAR), - list("Medical HUD Glasses", 4, /obj/item/clothing/glasses/hud/health, null, VENDOR_ITEM_MANDATORY), - - list("UTILITIES", 0, null, null, null), - list("Brown Webbing Vest", 10, /obj/item/clothing/accessory/storage/black_vest/brown_vest, null, VENDOR_ITEM_RECOMMENDED), - list("Black Webbing Vest", 10, /obj/item/clothing/accessory/storage/black_vest, null, VENDOR_ITEM_RECOMMENDED), - list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), - list("Large General Pouch", 10, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), - list("Shoulder Holster", 10, /obj/item/clothing/accessory/storage/holster, null, VENDOR_ITEM_REGULAR), - list("Webbing", 10, /obj/item/clothing/accessory/storage/webbing, null, VENDOR_ITEM_REGULAR), - list("Drop Pouch", 10, /obj/item/clothing/accessory/storage/droppouch, null, VENDOR_ITEM_REGULAR), - ) diff --git a/code/modules/gear_presets/uscm.dm b/code/modules/gear_presets/uscm.dm index 855ed07f7976..093ff4c28da5 100644 --- a/code/modules/gear_presets/uscm.dm +++ b/code/modules/gear_presets/uscm.dm @@ -163,6 +163,7 @@ skills = /datum/skills/tank_crew minimap_icon = "vc" + minimap_background = "background_intel" /datum/equipment_preset/uscm/tank/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel @@ -223,6 +224,8 @@ paygrades = list(PAY_SHORT_MO1 = JOB_PLAYTIME_TIER_0) role_comm_title = "IO" skills = /datum/skills/intel + minimap_icon = "io" + minimap_background = "background_intel" utility_under = list(/obj/item/clothing/under/marine/officer/intel) @@ -805,13 +808,13 @@ assignment = "Marine Raider" rank = JOB_MARINE_RAIDER role_comm_title = "Op." - languages = list(LANGUAGE_ENGLISH, LANGUAGE_TSL) + languages = list(LANGUAGE_TSL, LANGUAGE_ENGLISH) skills = /datum/skills/commando/deathsquad auto_squad_name = SQUAD_SOF ert_squad = TRUE paygrades = list(PAY_SHORT_ME6 = JOB_PLAYTIME_TIER_0, PAY_SHORT_ME7 = JOB_PLAYTIME_TIER_3) - minimap_icon = "private" + minimap_icon = "sof_sg" /datum/equipment_preset/uscm/marsoc/load_status(mob/living/carbon/human/new_human) new_human.nutrition = NUTRITION_NORMAL @@ -863,6 +866,7 @@ /datum/equipment_preset/uscm/marsoc/covert name = "Marine Raider (!DEATHSQUAD! Covert)" uses_special_name = TRUE + /datum/equipment_preset/uscm/marsoc/covert/load_name(mob/living/carbon/human/new_human, randomise) new_human.gender = MALE new_human.change_real_name(new_human, "[pick(GLOB.nato_phonetic_alphabet)]") @@ -880,7 +884,7 @@ paygrades = list(PAY_SHORT_MO1 = JOB_PLAYTIME_TIER_0, PAY_SHORT_MO2 = JOB_PLAYTIME_TIER_3) skills = /datum/skills/commando/deathsquad/leader - minimap_icon = "leader" + minimap_icon = "sof_sl" dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior) dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer) dress_hat = list(/obj/item/clothing/head/marine/dress_cover/officer) @@ -890,6 +894,7 @@ /datum/equipment_preset/uscm/marsoc/sl/covert name = "Marine Raider Team Leader (!DEATHSQUAD! Covert)" uses_special_name = TRUE + /datum/equipment_preset/uscm/marsoc/sl/covert/load_name(mob/living/carbon/human/new_human, randomise) new_human.gender = MALE new_human.change_real_name(new_human, "[pick(GLOB.nato_phonetic_alphabet)]") @@ -904,6 +909,7 @@ assignment = JOB_MARINE_RAIDER_CMD rank = JOB_MARINE_RAIDER_CMD role_comm_title = "CMD." + minimap_icon = "sof_officer" paygrades = list(PAY_SHORT_MO3 = JOB_PLAYTIME_TIER_0, PAY_SHORT_MO4 = JOB_PLAYTIME_TIER_3) skills = /datum/skills/commando/deathsquad/officer dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior) diff --git a/code/modules/gear_presets/uscm_event.dm b/code/modules/gear_presets/uscm_event.dm index 94f03f0d7e7f..0d457036ce9d 100644 --- a/code/modules/gear_presets/uscm_event.dm +++ b/code/modules/gear_presets/uscm_event.dm @@ -64,8 +64,10 @@ paygrades = list(PAY_SHORT_MO7 = JOB_PLAYTIME_TIER_0) role_comm_title = "GEN" minimum_age = 50 + minimap_icon = "deputy" + minimap_background = "background_command" skills = /datum/skills/general - languages = ALL_HUMAN_LANGUAGES //Know your enemy. + languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE, LANGUAGE_CHINESE, LANGUAGE_RUSSIAN, LANGUAGE_GERMAN, LANGUAGE_SCANDINAVIAN, LANGUAGE_SPANISH, LANGUAGE_TSL) //Know your enemy. service_under = list(/obj/item/clothing/under/marine/officer/general, /obj/item/clothing/under/marine/officer/bridge) service_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/general, /obj/item/clothing/suit/storage/jacket/marine/service, /obj/item/clothing/suit/storage/jacket/marine/service/mp) @@ -190,6 +192,7 @@ idtype = /obj/item/card/id/provost skills = /datum/skills/provost + minimap_background = "background_mp" /datum/equipment_preset/uscm_event/provost/New() . = ..() @@ -202,6 +205,7 @@ paygrades = list(PAY_SHORT_ME5 = JOB_PLAYTIME_TIER_0, PAY_SHORT_ME6 = JOB_PLAYTIME_TIER_1, PAY_SHORT_ME7 = JOB_PLAYTIME_TIER_3) role_comm_title = "PvE" flags = EQUIPMENT_PRESET_EXTRA + minimap_icon = "pve" dress_under = list(/obj/item/clothing/under/marine/dress/blues) dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues) @@ -247,6 +251,7 @@ paygrades = list(PAY_SHORT_ME8 = JOB_PLAYTIME_TIER_0, PAY_SHORT_ME9 = JOB_PLAYTIME_TIER_3) role_comm_title = "PvTML" flags = EQUIPMENT_PRESET_EXTRA + minimap_icon = "pve_leader" dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior) dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/nco) @@ -292,6 +297,7 @@ paygrades = list(PAY_SHORT_PVI = JOB_PLAYTIME_TIER_0) role_comm_title = "PvI" flags = EQUIPMENT_PRESET_EXTRA + minimap_icon = "pve_inspector" dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior) dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer) @@ -332,6 +338,7 @@ paygrades = list(PAY_SHORT_PVCI = JOB_PLAYTIME_TIER_0) role_comm_title = "PvCI" flags = EQUIPMENT_PRESET_EXTRA + minimap_icon = "pve_chief_inspector" dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior) dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer) @@ -371,6 +378,7 @@ paygrades = list(PAY_SHORT_ME8E = JOB_PLAYTIME_TIER_0, PAY_SHORT_ME9E = JOB_PLAYTIME_TIER_3) role_comm_title = "PvA" flags = EQUIPMENT_PRESET_EXTRA + minimap_icon = "pve_advisor" /datum/equipment_preset/uscm_event/provost/marshal/deputy name = "Provost Deputy Marshal (MO6)" @@ -382,6 +390,7 @@ paygrades = list(PAY_SHORT_PVDM = JOB_PLAYTIME_TIER_0) role_comm_title = PAY_SHORT_PVDM flags = EQUIPMENT_PRESET_EXTRA + minimap_icon = "deputy" /datum/equipment_preset/uscm_event/provost/marshal name = "Provost Marshal (MO7)" @@ -393,6 +402,7 @@ paygrades = list(PAY_SHORT_PVM = JOB_PLAYTIME_TIER_0) role_comm_title = PAY_SHORT_PVM flags = EQUIPMENT_PRESET_EXTRA + minimap_icon = "deputy" dress_under = list(/obj/item/clothing/under/marine/dress/blues/general) dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer) @@ -441,6 +451,9 @@ /*****************************************************************************************************/ +/datum/equipment_preset/uscm_event/uaac + minimap_background = "background_ua" + /datum/equipment_preset/uscm_event/uaac/tis name = "UAAC-TIS" @@ -460,6 +473,7 @@ rank = "UAAC-TIS Intelligence Officer" paygrades = list(PAY_SHORT_NO2 = JOB_PLAYTIME_TIER_0) role_comm_title = "TIS-IO" + minimap_icon = "cmb_syn" flags = EQUIPMENT_PRESET_EXTRA /datum/equipment_preset/uscm_event/uaac/tis/io/load_gear(mob/living/carbon/human/new_human) @@ -487,6 +501,7 @@ rank = "UAAC-TIS Special Agent" paygrades = list(PAY_SHORT_NO5 = JOB_PLAYTIME_TIER_0) role_comm_title = "TIS-SA" + minimap_icon = "tissa" flags = EQUIPMENT_PRESET_EXTRA /datum/equipment_preset/uscm_event/uaac/tis/sa/load_gear(mob/living/carbon/human/new_human) diff --git a/code/modules/gear_presets/uscm_forecon.dm b/code/modules/gear_presets/uscm_forecon.dm index 3c1db85291ea..09ab64c75f18 100644 --- a/code/modules/gear_presets/uscm_forecon.dm +++ b/code/modules/gear_presets/uscm_forecon.dm @@ -73,10 +73,7 @@ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/m1911(new_human), WEAR_IN_BELT) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/m1911(new_human), WEAR_IN_BELT) if(3 , 4) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m39, WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/m39(new_human), WEAR_IN_BELT) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/extended(new_human), WEAR_IN_BELT) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/extended(new_human), WEAR_IN_BELT) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m39/full/extended, WEAR_WAIST) if(5) new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector(new_human),WEAR_WAIST) diff --git a/code/modules/gear_presets/uscm_medical.dm b/code/modules/gear_presets/uscm_medical.dm index 6e727381b6ff..ad72cb3a1178 100644 --- a/code/modules/gear_presets/uscm_medical.dm +++ b/code/modules/gear_presets/uscm_medical.dm @@ -40,8 +40,8 @@ role_comm_title = "CMO" skills = /datum/skills/CMO - minimap_icon = list("medic" = MINIMAP_ICON_COLOR_HEAD) - minimap_background = MINIMAP_ICON_BACKGROUND_CIC + minimap_icon = list("doctor") + minimap_background = "background_command" utility_under = list(/obj/item/clothing/under/rank/chief_medical_officer) utility_hat = list() @@ -70,7 +70,8 @@ role_comm_title = "Doc" skills = /datum/skills/doctor - minimap_icon = list("medic" = MINIMAP_ICON_COLOR_DOCTOR) + minimap_icon = list("doctor") + minimap_background = "background_medical" /datum/equipment_preset/uscm_ship/uscm_medical/doctor/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel @@ -108,7 +109,8 @@ role_comm_title = "Nurse" skills = /datum/skills/nurse - minimap_icon = list("medic") + minimap_icon = list("nurse") + minimap_background = "background_shipside" dress_under = list(/obj/item/clothing/under/marine/dress/blues/senior) dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/nco) @@ -138,6 +140,7 @@ skills = /datum/skills/researcher minimap_icon = "researcher" + minimap_background = "background_medical" utility_under = list(/obj/item/clothing/under/marine/officer/researcher) utility_hat = list() diff --git a/code/modules/gear_presets/uscm_police.dm b/code/modules/gear_presets/uscm_police.dm index dcb926e804d7..8322b4e808c0 100644 --- a/code/modules/gear_presets/uscm_police.dm +++ b/code/modules/gear_presets/uscm_police.dm @@ -1,6 +1,7 @@ /datum/equipment_preset/uscm_ship/uscm_police name = "USCM (police roles)" faction = FACTION_MARINE + minimap_background = "background_mp" minimum_age = 27 //*****************************************************************************************************/ @@ -150,8 +151,7 @@ role_comm_title = "CMP" skills = /datum/skills/CMP - minimap_icon = list("mp" = MINIMAP_ICON_COLOR_HEAD) - minimap_background = MINIMAP_ICON_BACKGROUND_CIC + minimap_icon = list("cmp") utility_under = list(/obj/item/clothing/under/marine/officer/warrant) utility_hat = list(/obj/item/clothing/head/beret/marine/mp/cmp) @@ -194,6 +194,8 @@ role_comm_title = "RMP" skills = /datum/skills/CMP + minimap_icon = list("rmp") + utility_under = list(/obj/item/clothing/under/marine/officer/warrant) utility_hat = list(/obj/item/clothing/head/beret/marine/mp/cmp) utility_extra = list(/obj/item/clothing/head/cmcap, /obj/item/clothing/head/beret/cm, /obj/item/clothing/head/beret/cm/tan) @@ -236,6 +238,8 @@ name = "USCM Riot Chief MP (RCMP)" flags = EQUIPMENT_PRESET_EXTRA + minimap_icon = list("crmp") + assignment = JOB_RIOT_CHIEF rank = JOB_RIOT_CHIEF paygrades = list(PAY_SHORT_MO1 = JOB_PLAYTIME_TIER_0) diff --git a/code/modules/gear_presets/uscm_ship.dm b/code/modules/gear_presets/uscm_ship.dm index 6832900e752b..9f62ab3c1742 100644 --- a/code/modules/gear_presets/uscm_ship.dm +++ b/code/modules/gear_presets/uscm_ship.dm @@ -51,7 +51,7 @@ skills = /datum/skills/civilian minimap_icon = "cl" - minimap_background = MINIMAP_ICON_BACKGROUND_CIVILIAN + minimap_background = "background_civillian" dress_under = list( /obj/item/clothing/under/liaison_suit/black, @@ -167,8 +167,7 @@ idtype = /obj/item/card/id/silver/cl minimap_icon = "correspondent" - minimap_background = MINIMAP_ICON_BACKGROUND_CIVILIAN - + minimap_background = "background_civillian" dress_under = list() dress_over = list() dress_hat = list() @@ -202,7 +201,7 @@ idtype = /obj/item/card/id/dogtag minimap_icon = "correspondent" - minimap_background = MINIMAP_ICON_BACKGROUND_CIC + minimap_background = "background_civillian" dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/nco) dress_hat = list(/obj/item/clothing/head/marine/dress_cover) @@ -252,8 +251,8 @@ minimum_age = 27 skills = /datum/skills/CE - minimap_icon = list("engi" = MINIMAP_ICON_COLOR_HEAD) - minimap_background = MINIMAP_ICON_BACKGROUND_CIC + minimap_icon = "ce" + minimap_background = "background_command" utility_under = list(/obj/item/clothing/under/marine/officer/ce) @@ -287,7 +286,8 @@ role_comm_title = "MT" skills = /datum/skills/MT - minimap_icon = "engi" + minimap_icon = "mt" + minimap_background = "background_shipside" utility_under = list(/obj/item/clothing/under/marine/officer/engi) dress_under = list(/obj/item/clothing/under/marine/dress/blues) @@ -323,6 +323,7 @@ skills = /datum/skills/OT minimap_icon = "ot" + minimap_background = "background_shipside" utility_under = list(/obj/item/clothing/under/marine/officer/engi) dress_under = list(/obj/item/clothing/under/marine/dress/blues) @@ -367,8 +368,8 @@ minimum_age = 27 skills = /datum/skills/RO - minimap_background = MINIMAP_ICON_BACKGROUND_CIC - minimap_icon = list("ct" = MINIMAP_ICON_COLOR_HEAD) + minimap_icon = "cargo" + minimap_background = "background_command" utility_under = list(/obj/item/clothing/under/rank/qm_suit) dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/nco) @@ -401,7 +402,8 @@ role_comm_title = "CT" skills = /datum/skills/CT - minimap_icon = "ct" + minimap_icon = "cargo" + minimap_background = "background_shipside" utility_under = list(/obj/item/clothing/under/rank/cargotech) dress_under = list(/obj/item/clothing/under/marine/dress/blues) @@ -436,8 +438,9 @@ minimum_age = 30 skills = /datum/skills/commander - minimap_icon = list("cic" = MINIMAP_ICON_COLOR_COMMANDER) - minimap_background = MINIMAP_ICON_BACKGROUND_CIC + minimap_icon = "co" + minimap_background = "background_command" + utility_under = list(/obj/item/clothing/under/marine, /obj/item/clothing/under/marine/officer/command, /obj/item/clothing/under/marine/officer/boiler) utility_hat = list(/obj/item/clothing/head/cmcap,/obj/item/clothing/head/beret/cm/tan) @@ -551,8 +554,8 @@ minimum_age = 35 skills = /datum/skills/XO - minimap_icon = list("cic" = MINIMAP_ICON_COLOR_HEAD) - minimap_background = MINIMAP_ICON_BACKGROUND_CIC + minimap_icon = "xo" + minimap_background = "background_command" dress_extra = list(/obj/item/storage/large_holster/ceremonial_sword/full) @@ -590,8 +593,8 @@ minimum_age = 25 skills = /datum/skills/SO - minimap_icon = list("cic" = MINIMAP_ICON_COLOR_BRONZE) - minimap_background = MINIMAP_ICON_BACKGROUND_CIC + minimap_icon = "so" + minimap_background = "background_command" /datum/equipment_preset/uscm_ship/so/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel @@ -622,6 +625,7 @@ skills = /datum/skills/SEA minimap_icon = "sea" + minimap_background = "background_command" service_hat = list(/obj/item/clothing/head/cmcap, /obj/item/clothing/head/drillhat) dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/nco) @@ -668,8 +672,8 @@ minimum_age = 27 skills = /datum/skills/auxiliary_officer - minimap_icon = list("cic" = COLOR_SILVER) - minimap_background = MINIMAP_ICON_BACKGROUND_CIC + minimap_icon = "aso" + minimap_background = "background_command" /datum/equipment_preset/uscm_ship/auxiliary_officer/New() . = ..() @@ -703,7 +707,7 @@ if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/alt(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/cdrcom(new_human), WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/bridge(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/service/aso(new_human), WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(new_human), WEAR_FEET) @@ -726,7 +730,8 @@ role_comm_title = "GP" skills = /datum/skills/pilot - minimap_icon = "pilot" + minimap_icon = "gp" + minimap_background = "background_command" /datum/equipment_preset/uscm_ship/gp/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel @@ -777,6 +782,7 @@ skills = /datum/skills/pilot minimap_icon = "pilot" + minimap_background = "background_command" /datum/equipment_preset/uscm_ship/dp/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel @@ -827,6 +833,7 @@ skills = /datum/skills/crew_chief minimap_icon = "dcc" + minimap_background = "background_shipside" dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/nco) dress_hat = list(/obj/item/clothing/head/marine/dress_cover) @@ -918,6 +925,7 @@ skills = /datum/skills/mess_technician minimap_icon = "mst" + minimap_background = "background_shipside" utility_under = list(/obj/item/clothing/under/marine/chef) dress_under = list(/obj/item/clothing/under/marine/dress/blues) diff --git a/code/modules/gear_presets/whiteout.dm b/code/modules/gear_presets/whiteout.dm index 3d9ef47a0e17..3382f145f04e 100644 --- a/code/modules/gear_presets/whiteout.dm +++ b/code/modules/gear_presets/whiteout.dm @@ -8,6 +8,7 @@ rank = FACTION_WY_DEATHSQUAD languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE, LANGUAGE_CHINESE, LANGUAGE_RUSSIAN, LANGUAGE_GERMAN, LANGUAGE_SCANDINAVIAN, LANGUAGE_SPANISH, LANGUAGE_YAUTJA, LANGUAGE_XENOMORPH, LANGUAGE_TSL) //Synths after all. skills = /datum/skills/everything //They are Synths, programmed for Everything. + minimap_icon = "whiteout" idtype = /obj/item/card/id/pmc/ds paygrades = list(PAY_SHORT_CDNM = JOB_PLAYTIME_TIER_0) diff --git a/code/modules/gear_presets/wo.dm b/code/modules/gear_presets/wo.dm index 17138b208a58..f77341ed5549 100644 --- a/code/modules/gear_presets/wo.dm +++ b/code/modules/gear_presets/wo.dm @@ -22,7 +22,8 @@ skills = /datum/skills/commander idtype = /obj/item/card/id/gold - minimap_icon = "co" + minimap_icon = "co_wo" + minimap_background = "background_command" utility_under = list(/obj/item/clothing/under/marine,/obj/item/clothing/under/marine/officer/command) utility_hat = list(/obj/item/clothing/head/cmcap,/obj/item/clothing/head/beret/cm/tan) @@ -101,7 +102,8 @@ skills = /datum/skills/XO idtype = /obj/item/card/id/silver - minimap_icon = "xo" + minimap_icon = "xo_wo" + minimap_background = "background_command" dress_extra = list(/obj/item/storage/large_holster/ceremonial_sword/full) @@ -145,7 +147,8 @@ skills = /datum/skills/honor_guard/lead idtype = /obj/item/card/id/silver - minimap_icon = "cmp" + minimap_icon = "hgsl" + minimap_background = "background_mp" /datum/equipment_preset/wo/cmp/load_gear(mob/living/carbon/human/new_human) @@ -181,7 +184,8 @@ skills = /datum/skills/honor_guard/vet idtype = /obj/item/card/id/silver - minimap_icon = "so" + minimap_icon = "vhg" + minimap_background = "background_mp" /datum/equipment_preset/wo/vhg/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel/sec @@ -223,7 +227,8 @@ skills = /datum/skills/honor_guard/spec idtype = /obj/item/card/id/gold - minimap_icon = "spec" + minimap_icon = "hgspec" + minimap_background = "background_mp" /datum/equipment_preset/wo/hgs/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel/sec @@ -262,7 +267,8 @@ role_comm_title = "HG" skills = /datum/skills/honor_guard - minimap_icon = "mp" + minimap_icon = "hg" + minimap_background = "background_mp" /datum/equipment_preset/wo/hg/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/satchel/sec @@ -296,7 +302,8 @@ role_comm_title = "MC" skills = /datum/skills/mortar_crew - minimap_icon = "vc" + minimap_icon = "wo_mcrew" + minimap_background = "background_shipside" /datum/equipment_preset/wo/mortar_crew/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel @@ -332,7 +339,8 @@ skills = /datum/skills/RO idtype = /obj/item/card/id/silver - minimap_icon = "ro" + minimap_icon = "cargo" + minimap_background = "background_medical" /datum/equipment_preset/wo/quartermaster/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel/tech @@ -362,6 +370,9 @@ skills = /datum/skills/CE idtype = /obj/item/card/id + minimap_icon = "cargo" + minimap_background = "background_shipside" + /datum/equipment_preset/wo/cargo/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel/tech if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) @@ -394,7 +405,8 @@ skills = /datum/skills/CMO idtype = /obj/item/card/id/silver - minimap_icon = "cmo" + minimap_icon = "cmo_wo" + minimap_background = "background_medical_WO" /datum/equipment_preset/wo/head_surgeon/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel/medic @@ -437,7 +449,8 @@ skills = /datum/skills/doctor idtype = /obj/item/card/id - minimap_icon = "doctor" + minimap_icon = "medic" + minimap_background = "background_medical_WO" /datum/equipment_preset/wo/doctor/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel/medic @@ -477,7 +490,8 @@ skills = /datum/skills/researcher idtype = /obj/item/card/id - minimap_icon = "researcher" + minimap_icon = "chemist_wo" + minimap_background = "background_medical_WO" /datum/equipment_preset/wo/chemist/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel/medic @@ -518,6 +532,7 @@ idtype = /obj/item/card/id/silver minimap_icon = "ce" + minimap_background = "background_medical" /datum/equipment_preset/wo/bcm/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel/tech @@ -552,6 +567,7 @@ idtype = /obj/item/card/id minimap_icon = "mt" + minimap_background = "background_shipside" /datum/equipment_preset/wo/bc/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel/tech @@ -584,8 +600,8 @@ skills = /datum/skills/civilian idtype = /obj/item/card/id/silver/cl - minimap_icon = "surv" - minimap_background = MINIMAP_ICON_BACKGROUND_CIVILIAN + minimap_icon = "correspondent" + minimap_background = "background_civillian" /datum/equipment_preset/wo/reporter/New() . = ..() @@ -613,6 +629,7 @@ /datum/equipment_preset/wo/marine name = "WO Dust Raider" //Stub other Marine equipment stems from flags = EQUIPMENT_PRESET_STUB + minimap_background = "background_intel" //*****************************************************************************************************/ @@ -626,6 +643,7 @@ paygrades = list(PAY_SHORT_ME5 = JOB_PLAYTIME_TIER_0) role_comm_title = "SL" skills = /datum/skills/SL + minimap_icon = "leader" /datum/equipment_preset/wo/marine/sl/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel @@ -661,6 +679,7 @@ paygrades = list(PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_0) role_comm_title = "Spc" skills = /datum/skills/specialist + minimap_icon = "spec" /datum/equipment_preset/wo/marine/spec/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel @@ -696,6 +715,7 @@ paygrades = list(PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_0) role_comm_title = "SG" skills = /datum/skills/smartgunner + minimap_icon = "smartgunner" /datum/equipment_preset/wo/marine/sg/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine(new_human), WEAR_BODY) @@ -720,6 +740,7 @@ paygrades = list(PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_0) role_comm_title = "ComTech" skills = /datum/skills/combat_engineer + minimap_icon = "engi" /datum/equipment_preset/wo/marine/engineer/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel/tech @@ -754,6 +775,7 @@ paygrades = list(PAY_SHORT_ME3 = JOB_PLAYTIME_TIER_0) role_comm_title = "HM" skills = /datum/skills/combat_medic + minimap_icon = "medic" /datum/equipment_preset/wo/marine/medic/load_gear(mob/living/carbon/human/new_human) var/back_item = /obj/item/storage/backpack/marine/satchel/medic diff --git a/code/modules/gear_presets/wy.dm b/code/modules/gear_presets/wy.dm index 24dc8bae0916..7e4d698e36d0 100644 --- a/code/modules/gear_presets/wy.dm +++ b/code/modules/gear_presets/wy.dm @@ -10,6 +10,9 @@ languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) var/headset_type = /obj/item/device/radio/headset/distress/WY + minimap_icon = "cl" + minimap_background = "background_civillian" + dress_under = list( /obj/item/clothing/under/liaison_suit/black, /obj/item/clothing/under/liaison_suit/blue, diff --git a/code/modules/gear_presets/wy_goons.dm b/code/modules/gear_presets/wy_goons.dm index eb91be64c91e..0d5717dfcf73 100644 --- a/code/modules/gear_presets/wy_goons.dm +++ b/code/modules/gear_presets/wy_goons.dm @@ -6,6 +6,7 @@ faction = FACTION_WY faction_group = list(FACTION_WY) languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) + minimap_background = "background_goon" /datum/equipment_preset/goon/New() . = ..() @@ -62,6 +63,7 @@ rank = JOB_WY_GOON paygrades = list(PAY_SHORT_CPO = JOB_PLAYTIME_TIER_0) skills = /datum/skills/wy_goon + minimap_icon = "goon_standard" /datum/equipment_preset/goon/standard/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) @@ -95,6 +97,7 @@ rank = JOB_WY_GOON_TECH paygrades = list(PAY_SHORT_CPO = JOB_PLAYTIME_TIER_0) skills = /datum/skills/wy_goon_tech + minimap_icon = "goon_engi" /datum/equipment_preset/goon/engineer/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) @@ -129,6 +132,7 @@ rank = JOB_WY_GOON_LEAD paygrades = list(PAY_SHORT_CSPO = JOB_PLAYTIME_TIER_0) skills = /datum/skills/wy_goon_lead + minimap_icon = "goon_leader" /datum/equipment_preset/goon/lead/New() . = ..() @@ -165,6 +169,7 @@ rank = JOB_WY_GOON_RESEARCHER paygrades = list(PAY_SHORT_CCMO = JOB_PLAYTIME_TIER_0) skills = /datum/skills/researcher + minimap_icon = "goon_sci" dress_under = list( /obj/item/clothing/under/liaison_suit/black, diff --git a/code/modules/gear_presets/yautja.dm b/code/modules/gear_presets/yautja.dm index 9b8e64948c62..44113938cd3c 100644 --- a/code/modules/gear_presets/yautja.dm +++ b/code/modules/gear_presets/yautja.dm @@ -8,6 +8,8 @@ uses_special_name = TRUE skills = /datum/skills/yautja/warrior + minimap_icon = "predator" + var/default_cape_type = "None" var/clan_rank @@ -30,51 +32,19 @@ return //No vanity items for Yautja! /datum/equipment_preset/yautja/load_gear(mob/living/carbon/human/new_human, client/mob_client) - var/using_legacy = "None" - var/armor_number = 1 - var/boot_number = 1 - var/mask_number = 1 - var/armor_material = "ebony" - var/greave_material = "ebony" var/caster_material = "ebony" - var/mask_material = "ebony" var/translator_type = "Modern" - var/cape_type = default_cape_type - var/cape_color = "#654321" if(!mob_client) mob_client = new_human.client if(mob_client?.prefs) - using_legacy = mob_client.prefs.predator_use_legacy - armor_number = mob_client.prefs.predator_armor_type - boot_number = mob_client.prefs.predator_boot_type - mask_number = mob_client.prefs.predator_mask_type - armor_material = mob_client.prefs.predator_armor_material - greave_material = mob_client.prefs.predator_greave_material - mask_material = mob_client.prefs.predator_mask_material caster_material = mob_client.prefs.predator_caster_material translator_type = mob_client.prefs.predator_translator_type - cape_type = mob_client.prefs.predator_cape_type - cape_color = mob_client.prefs.predator_cape_color - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/chainshirt/hunter(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yautja/hunter(new_human, translator_type, caster_material, clan_rank), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/yautja(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/device/flashlight/lantern(new_human), WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/device/yautja_teleporter(new_human), WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/yautja(new_human), WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/storage/medicomp/full(new_human), WEAR_IN_BELT) - - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/yautja/hunter/knife(new_human, boot_number, greave_material), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/yautja/hunter(new_human, armor_number, armor_material, using_legacy), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/yautja/hunter(new_human, mask_number, mask_material, using_legacy), WEAR_FACE) - - var/cape_path = GLOB.all_yautja_capes[cape_type] - if(ispath(cape_path)) - new_human.equip_to_slot_or_del(new cape_path(new_human, cape_color), WEAR_BACK) /datum/equipment_preset/yautja/load_name(mob/living/carbon/human/new_human, randomise) - var/final_name = "Le'pro" + var/final_name = capitalize(pick(GLOB.pred_names)) + " " + capitalize(pick(GLOB.pred_last_names)) new_human.gender = MALE new_human.age = 100 new_human.flavor_text = "" @@ -87,12 +57,13 @@ new_human.flavor_text = new_human.client.prefs.predator_flavor_text new_human.flavor_texts["general"] = new_human.flavor_text if(!final_name || final_name == "Undefined") //In case they don't have a name set or no prefs, there's a name. - final_name = "Le'pro" + final_name = capitalize(pick(GLOB.pred_names)) + " " + capitalize(pick(GLOB.pred_last_names)) new_human.change_real_name(new_human, final_name) // YOUNG BLOOD /datum/equipment_preset/yautja/youngblood name = "Yautja Young" + minimap_icon = "predator_young" flags = EQUIPMENT_PRESET_START_OF_ROUND clan_rank = CLAN_RANK_UNBLOODED_INT @@ -108,13 +79,23 @@ default_cape_type = PRED_YAUTJA_QUARTER_CAPE clan_rank = CLAN_RANK_BLOODED_INT +/datum/equipment_preset/yautja/blooded/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/yautja(new_human), WEAR_L_EAR) + return ..() + + // ELITE /datum/equipment_preset/yautja/elite name = "Yautja Elite" + minimap_icon = "predator_elite" flags = EQUIPMENT_PRESET_START_OF_ROUND default_cape_type = PRED_YAUTJA_HALF_CAPE clan_rank = CLAN_RANK_ELITE_INT +/datum/equipment_preset/yautja/elite/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/yautja(new_human), WEAR_L_EAR) + return ..() + /datum/equipment_preset/yautja/elite/load_name(mob/living/carbon/human/new_human, randomise) . = ..() var/new_name = "Elite [new_human.real_name]" @@ -123,6 +104,7 @@ // ELDER /datum/equipment_preset/yautja/elder name = "Yautja Elder" + minimap_icon = "predator_elder" flags = EQUIPMENT_PRESET_START_OF_ROUND default_cape_type = PRED_YAUTJA_THIRD_CAPE clan_rank = CLAN_RANK_ELDER_INT @@ -139,6 +121,7 @@ // CLAN LEADER /datum/equipment_preset/yautja/leader name = "Yautja Leader" + minimap_icon = "predator_leader" flags = EQUIPMENT_PRESET_START_OF_ROUND default_cape_type = PRED_YAUTJA_CAPE clan_rank = CLAN_RANK_LEADER_INT @@ -155,6 +138,7 @@ // ANCIENT /datum/equipment_preset/yautja/ancient name = "Yautja Ancient" + minimap_icon = "predator_ancient" flags = EQUIPMENT_PRESET_START_OF_ROUND default_cape_type = PRED_YAUTJA_PONCHO clan_rank = CLAN_RANK_ADMIN_INT diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm new file mode 100644 index 000000000000..6fa4a47d5bbf --- /dev/null +++ b/code/modules/mapping/mapping_helpers.dm @@ -0,0 +1,162 @@ +/// Generic system for processing events after a certain time on multiple turfs, and +/// announcing them together. +/obj/effect/timed_event + icon = 'icons/landmarks.dmi' + icon_state = "o_red" + + var/static/list/notification_areas = list() + + /// How long to wait until the event should occur + var/time + +/obj/effect/timed_event/Initialize(mapload, ...) + . = ..() + + icon = null + + if(isnull(time)) + log_mapping("[type] (x: [x], y: [y], z: [z]) was created without a time.") + return INITIALIZE_HINT_QDEL + + SSticker.OnRoundstart(CALLBACK(src, PROC_REF(handle_round_start))) + +/obj/effect/timed_event/proc/handle_round_start() + var/actual_time = time MINUTES + + if(!check_valid_type()) + return + + addtimer(generate_callback(), actual_time) + + if(notification_areas[type]?["[actual_time]"]) + LAZYORASSOCLIST(notification_areas[type], "[actual_time]", get_area(src)) + qdel(src) + else + addtimer(CALLBACK(src, PROC_REF(announce_event), actual_time), actual_time) + LAZYORASSOCLIST(notification_areas[type], "[actual_time]", get_area(src)) + +/// Checks that the type this is acting on is valid, to prevent errors when adding the timer +/obj/effect/timed_event/proc/check_valid_type() + return TRUE + +/// To be overridden to generate the callback that should be inserted into the timer +/obj/effect/timed_event/proc/generate_callback() + return + +/// When the timer is completed, what global announcement of the event should occur +/obj/effect/timed_event/proc/announce_event(time_to_grab) + return + +/// Mapping helper placed on turfs to remove the turf after a specified duration. +/obj/effect/timed_event/scrapeaway + icon_state = "o_blue" + +/obj/effect/timed_event/scrapeaway/generate_callback() + return CALLBACK(get_turf(src), TYPE_PROC_REF(/turf, ScrapeAway)) + +/obj/effect/timed_event/scrapeaway/announce_event(time_to_grab) + var/announcement_areas = english_list(notification_areas[type]["[time_to_grab]"]) + + var/marine_announcement_text = SSmapping.configs[GROUND_MAP].environment_traits[ZTRAIT_IN_SPACE] \ + ? "Structural collapse detected in [announcement_areas]. Be advised that new routes may be accessible." \ + : "Geological shifts detected in [announcement_areas]. Be advised that new routes may be accessible." + + marine_announcement(marine_announcement_text, "Priority Announcement") + + var/xeno_announcement_text = SSmapping.configs[GROUND_MAP].environment_traits[ZTRAIT_IN_SPACE] \ + ? "The shattered metal of this place has collapsed, providing new routes in [announcement_areas]." \ + : "The ground of this world trembles, and new routes are accessible in [announcement_areas]." + + xeno_announcement(SPAN_XENOANNOUNCE(xeno_announcement_text), "everything", XENO_GENERAL_ANNOUNCE) + + qdel(src) + +/// Mapping helper placed on turfs that toggles the destructiblity of the turf after a specified duration. +/obj/effect/timed_event/destructible + +/obj/effect/timed_event/destructible/check_valid_type() + if(istype(get_turf(src), /turf/closed/wall)) + return TRUE + + return FALSE + +/obj/effect/timed_event/destructible/generate_callback() + var/turf/closed/wall/wall = get_turf(src) // ensured by check_valid_type() + return VARSET_CALLBACK(wall, hull, FALSE) + +/obj/effect/timed_event/destructible/announce_event(time_to_grab) + var/announcement_areas = english_list(notification_areas[type]["[time_to_grab]"]) + + var/marine_announcement_text = SSmapping.configs[GROUND_MAP].environment_traits[ZTRAIT_IN_SPACE] \ + ? "Structural collapse detected in [announcement_areas], allowing dismantlement. Be advised that new routes may be created." \ + : "Geological shifts detected in [announcement_areas], allowing excavation. Be advised that new routes may be created." + + marine_announcement(marine_announcement_text, "Priority Announcement") + + var/xeno_announcement_text = SSmapping.configs[GROUND_MAP].environment_traits[ZTRAIT_IN_SPACE] \ + ? "The shattered metal of this place has collapsed, and we can create routes through [announcement_areas]." \ + : "The ground of this world trembles, and new routes may be created through [announcement_areas]." + + xeno_announcement(SPAN_XENOANNOUNCE(xeno_announcement_text), "everything", XENO_GENERAL_ANNOUNCE) + + qdel(src) + +GLOBAL_LIST_INIT_TYPED(sentry_spawns, /obj/effect/sentry_landmark, list()) + +/// Allows a mapper to override the location of turrets on specific LZs, in specific placements. If multiple +/// are placed, it picks randomly. +/obj/effect/sentry_landmark + icon = 'icons/landmarks.dmi' + icon_state = "x3" + + var/abstract_type = /obj/effect/sentry_landmark + + /// Which landing zone this landmark should be connected to + var/landing_zone + + /// Which position this sentry should spawn at + var/position + + +/obj/effect/sentry_landmark/Initialize(mapload, ...) + . = ..() + + if(type == abstract_type) + log_mapping("A [type] was created that should not have been! Use a subtype instead.") + return INITIALIZE_HINT_QDEL + + LAZYADDASSOCLIST(GLOB.sentry_spawns[landing_zone], position, get_turf(src)) + + return INITIALIZE_HINT_QDEL + +/obj/effect/sentry_landmark/lz_1 + abstract_type = /obj/effect/sentry_landmark/lz_1 + landing_zone = /obj/docking_port/stationary/marine_dropship/lz1 + +/obj/effect/sentry_landmark/lz_1/top_left + position = SENTRY_TOP_LEFT + +/obj/effect/sentry_landmark/lz_1/top_right + position = SENTRY_TOP_RIGHT + +/obj/effect/sentry_landmark/lz_1/bottom_left + position = SENTRY_BOTTOM_LEFT + +/obj/effect/sentry_landmark/lz_1/bottom_right + position = SENTRY_BOTTOM_RIGHT + +/obj/effect/sentry_landmark/lz_2 + abstract_type = /obj/effect/sentry_landmark/lz_2 + landing_zone = /obj/docking_port/stationary/marine_dropship/lz2 + +/obj/effect/sentry_landmark/lz_2/top_left + position = SENTRY_TOP_LEFT + +/obj/effect/sentry_landmark/lz_2/top_right + position = SENTRY_TOP_RIGHT + +/obj/effect/sentry_landmark/lz_2/bottom_left + position = SENTRY_BOTTOM_LEFT + +/obj/effect/sentry_landmark/lz_2/bottom_right + position = SENTRY_BOTTOM_RIGHT diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 65e3e6fb2e39..eae5af870b27 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -554,7 +554,13 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp // if they died as facehugger or lesser drone, bypass typical TOD checks ghost.bypass_time_of_death_checks = (isfacehugger(src) || islesserdrone(src)) - ghost.client?.player_details.larva_queue_time = max(ghost.client.player_details.larva_queue_time, new_tod) + if(ghost.client) + ghost.client.player_details.larva_queue_time = max(ghost.client.player_details.larva_queue_time, new_tod) + else if(persistent_ckey) + var/datum/player_details/details = GLOB.player_details[persistent_ckey] + if(details) + details.larva_queue_time = max(details.larva_queue_time, new_tod) + if(is_nested && nest && !QDELETED(nest)) ghost.can_reenter_corpse = FALSE nest.ghost_of_buckled_mob = ghost @@ -1133,6 +1139,20 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(SSticker.mode.check_joe_late_join(src)) SSticker.mode.attempt_to_join_as_joe(src) +/mob/dead/verb/join_as_responder() + set category = "Ghost.Join" + set name = "Join as a Fax Responder" + set desc = "If you are whitelisted, you'll be able to join in." + + if (!client) + return + + if(SSticker.current_state < GAME_STATE_PLAYING || !SSticker.mode) + to_chat(src, SPAN_WARNING("The game hasn't started yet!")) + return + + if(SSticker.mode.check_fax_responder_late_join(src)) + SSticker.mode.attempt_to_join_as_fax_responder(src) /mob/dead/verb/drop_vote() set category = "Ghost" diff --git a/code/modules/mob/dead/observer/orbit.dm b/code/modules/mob/dead/observer/orbit.dm index 871bae54b8fd..166bd76c9837 100644 --- a/code/modules/mob/dead/observer/orbit.dm +++ b/code/modules/mob/dead/observer/orbit.dm @@ -49,6 +49,7 @@ var/list/data = list() var/list/humans = list() + var/list/responders = list() var/list/marines = list() var/list/survivors = list() var/list/xenos = list() @@ -119,6 +120,7 @@ var/datum/caste_datum/caste = xeno.caste serialized["caste"] = caste.caste_type serialized["icon"] = caste.minimap_icon + serialized["background_icon"] = caste.minimap_background serialized["hivenumber"] = xeno.hivenumber serialized["area_name"] = get_area_name(xeno) xenos += list(serialized) @@ -142,9 +144,9 @@ serialized["icon"] = icon ? icon : "private" if(human.assigned_squad) - serialized["background_color"] = human.assigned_squad.equipment_color ? human.assigned_squad.equipment_color : human.assigned_squad.minimap_color + serialized["background_icon"] = human.assigned_squad.background_icon else - serialized["background_color"] = human.assigned_equipment_preset?.minimap_background + serialized["background_icon"] = human.assigned_equipment_preset?.minimap_background if(istype(get_area(human), /area/tdome)) in_thunderdome += list(serialized) @@ -178,6 +180,8 @@ marines += list(serialized) else if(issurvivorjob(human.job)) survivors += list(serialized) + else if(human.job in FAX_RESPONDER_JOB_LIST) + responders += list(serialized) else humans += list(serialized) continue @@ -193,6 +197,7 @@ data["clf"] = clf data["wy"] = wy data["twe"] = twe + data["responders"] = responders data["freelancer"] = freelancer data["contractor"] = contractor data["mercenary"] = mercenary diff --git a/code/modules/mob/death.dm b/code/modules/mob/death.dm index ba74c06fcaf1..b3548b69c310 100644 --- a/code/modules/mob/death.dm +++ b/code/modules/mob/death.dm @@ -83,10 +83,20 @@ timeofdeath = world.time life_time_total = world.time - life_time_start - if(mind) mind.store_memory("Time of death: [worldtime2text()]", 0) + if(mind) + mind.store_memory("Time of death: [worldtime2text()]", 0) GLOB.alive_mob_list -= src GLOB.dead_mob_list += src + // Larva queue: We use the larger of their existing queue time or the new timeofdeath except for facehuggers or lesser drone + var/new_tod = (should_block_game_interaction(src) || isfacehugger(src) || islesserdrone(src)) ? 1 : timeofdeath + if(client) + client.player_details.larva_queue_time = max(client.player_details.larva_queue_time, new_tod) + else if(persistent_ckey) + var/datum/player_details/details = GLOB.player_details[persistent_ckey] + if(details) + details.larva_queue_time = max(details.larva_queue_time, new_tod) + if(client && client.player_data) record_playtime(client.player_data, job, type) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 993042a14a2b..e76522ba8eaf 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -430,28 +430,6 @@ observer.client.add_to_screen(action.button) -//generates realistic-ish pulse output based on preset levels -/mob/living/carbon/proc/get_pulse(method) //method 0 is for hands, 1 is for machines, more accurate - var/temp = 0 //see setup.dm:694 - switch(src.pulse) - if(PULSE_NONE) - return "0" - if(PULSE_SLOW) - temp = rand(40, 60) - return num2text(method ? temp : temp + rand(-10, 10)) - if(PULSE_NORM) - temp = rand(60, 90) - return num2text(method ? temp : temp + rand(-10, 10)) - if(PULSE_FAST) - temp = rand(90, 120) - return num2text(method ? temp : temp + rand(-10, 10)) - if(PULSE_2FAST) - temp = rand(120, 160) - return num2text(method ? temp : temp + rand(-10, 10)) - if(PULSE_THREADY) - return method ? ">250" : "extremely weak and fast, patient's artery feels like a thread" -// output for machines^ ^^^^^^^output for people^^^^^^^^^ - /mob/living/carbon/verb/mob_sleep() set name = "Sleep" set category = "IC" diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index 34582a6612d4..1b9e3fa1a3aa 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -1,5 +1,6 @@ /mob/living/carbon/human/gib(datum/cause_data/cause = create_cause_data("gibbing", src)) var/is_a_synth = issynth(src) + ghostize() for(var/obj/limb/E in limbs) if(istype(E, /obj/limb/chest)) continue @@ -96,7 +97,7 @@ if(last_living_human && shipside_humans_count <= 1 && (GLOB.last_qm_callout + 2 MINUTES) < world.time) GLOB.last_qm_callout = world.time // Tell the xenos where the human is. - xeno_announcement("I sense the last tallhost hiding in [get_area(last_living_human)].", XENO_HIVE_NORMAL, SPAN_ANNOUNCEMENT_HEADER_BLUE("[QUEEN_MOTHER_ANNOUNCE]")) + xeno_announcement("I sense the last tallhost hiding in [get_area_name(last_living_human)].", XENO_HIVE_NORMAL, SPAN_ANNOUNCEMENT_HEADER_BLUE("[QUEEN_MOTHER_ANNOUNCE]")) // Tell the human he is the last guy. if(last_living_human.client) to_chat(last_living_human, SPAN_ANNOUNCEMENT_HEADER_BLUE("Panic creeps up your spine. You realize that you are the last survivor.")) @@ -131,5 +132,5 @@ else if(death_data?.cause_name == "existing") // Corpses spawn as gibbed true to avoid sfx, even though they aren't actually gibbed... AddComponent(/datum/component/weed_food) - + update_execute_hud() diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 7da0376bbef1..9319f55a5f0d 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -5,7 +5,7 @@ /// Species that can use this emote. var/list/species_type_allowed_typecache = list(/datum/species/human, /datum/species/synthetic, /datum/species/yautja) /// Species that can't use this emote. - var/list/species_type_blacklist_typecache = list(/datum/species/monkey) + var/list/species_type_blacklist_typecache = list(/datum/species/monkey, /datum/species/synthetic/synth_k9) /datum/emote/living/carbon/human/New() . = ..() @@ -219,6 +219,7 @@ var/pain_message = pick("OW!!", "AGH!!", "ARGH!!", "OUCH!!", "ACK!!", "OUF!") user.langchat_speech(pain_message, group, GLOB.all_languages, skip_language_check = TRUE, animation_style = LANGCHAT_FAST_POP, additional_styles = list("langchat_yell")) + /datum/emote/living/carbon/human/salute key = "salute" key_third_person = "salutes" @@ -382,3 +383,24 @@ return user.show_speech_bubble("scream") + +/datum/emote/living/carbon/human/burstscream + key = "burstscream" + message = "screams in agony!" + emote_type = EMOTE_FORCED_AUDIO|EMOTE_AUDIBLE|EMOTE_VISIBLE + stat_allowed = UNCONSCIOUS + +/datum/emote/living/carbon/human/burstscream/get_sound(mob/living/carbon/human/user) + if(!user.species) + return + if(user.species.burstscreams[user.gender]) + return user.species.burstscreams[user.gender] + if(user.species.burstscreams[NEUTER]) + return user.species.burstscreams[NEUTER] + +/datum/emote/living/carbon/human/burstscream/run_emote(mob/living/user, params, type_override, intentional) + . = ..() + if(!.) + return FALSE + + user.show_speech_bubble("pain") diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index c8820ec3b97d..0622943e9461 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -215,6 +215,7 @@ user.visible_message("[user] checks [src]'s pulse.", "You check [src]'s pulse.", null, 4) spawn(15) if(user && src && distance <= 1) + get_pulse(GETPULSE_HAND) // to update it if(pulse == PULSE_NONE || status_flags & FAKEDEATH) to_chat(user, SPAN_DEADSAY("[t_He] has no pulse[client ? "" : " and [t_his] soul has departed"]...")) else @@ -497,6 +498,12 @@ if(assigned_squad == H.assigned_squad) //same squad msg += "\[Manage Fireteams.\]\n" + if(user.Adjacent(src) && ishuman(user)) + var/mob/living/carbon/human/human_user = user + var/temp_msg = "\[Check Status\]" + if(skillcheck(user, SKILL_MEDICAL, SKILL_MEDICAL_MEDIC) && locate(/obj/item/clothing/accessory/stethoscope) in human_user.w_uniform) + temp_msg += " \[Use Stethoscope\]" + msg += "\nMedical actions: [temp_msg]\n" if(print_flavor_text()) msg += "[print_flavor_text()]\n" diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 0a6a42d09ba5..0b95e15b4482 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -54,6 +54,7 @@ /mob/living/carbon/human/Destroy() SSround_recording.recorder.stop_tracking(src) remove_from_all_mob_huds() + despawn_fax_responder() assigned_equipment_preset = null GLOB.human_mob_list -= src GLOB.alive_human_list -= src @@ -408,6 +409,7 @@ DT.dogtag_taken = TRUE DT.icon_state = "dogtag_taken" var/obj/item/dogtag/D = new(loc) + D.fallen_references = list(DT.registered_ref) D.fallen_names = list(DT.registered_name) D.fallen_assgns = list(DT.assignment) D.fallen_blood_types = list(DT.blood_type) @@ -771,6 +773,21 @@ if(R.fields["last_scan_time"] && R.fields["last_scan_result"]) tgui_interact(usr) break + + if(href_list["check_status"]) + if(!usr.Adjacent(src)) + return + var/mob/living/carbon/human/user = usr + user.check_status(src) + + if(href_list["use_stethoscope"]) + var/mob/living/carbon/human/user = usr + var/obj/item/clothing/accessory/stethoscope/stethoscope = locate() in user.w_uniform + if(!stethoscope || !user.Adjacent(src)) + return + + stethoscope.attack(src, user) + ..() return @@ -989,45 +1006,44 @@ if(prob(30)) // Spam chat less to_chat(src, SPAN_HIGHDANGER("Your movement jostles [W] in your [organ.display_name] painfully.")) -/mob/living/carbon/human/verb/check_status() - set category = "Object" - set name = "Check Status" - set src in view(1) - var/self = (usr == src) - var/msg = "" - - - if(usr.stat > 0 || usr.is_mob_restrained() || !ishuman(usr)) return +/mob/living/carbon/human/proc/check_status(mob/living/carbon/human/target) + if(is_dead() || is_mob_restrained()) + return + ///Final message detailing injuries on the target. + var/msg + ///Is the target the user or somebody else? + var/self = (target == src) + to_chat(usr,SPAN_NOTICE("You [self ? "take a moment to analyze yourself." : "start analyzing [src]."]")) if(self) - var/list/L = get_broken_limbs() - list("chest","head","groin") - if(length(L) > 0) - msg += "Your [english_list(L)] [length(L) > 1 ? "are" : "is"] broken\n" - to_chat(usr,SPAN_NOTICE("You [self ? "take a moment to analyze yourself":"start analyzing [src]"]")) - if(toxloss > 20) - msg += "[self ? "Your" : "Their"] skin is slightly green\n" - if(is_bleeding()) - msg += "[self ? "You" : "They"] have bleeding wounds on [self ? "your" : "their"] body\n" + var/list/broken_limbs = target.get_broken_limbs() - list("chest","head","groin") + if(length(broken_limbs)) + msg += "Your [english_list(broken_limbs)] [length(broken_limbs) > 1 ? "are" : "is"] broken.\n" + if(target.toxloss > 20) + msg += "[self ? "Your" : "Their"] skin is slightly green.\n" + + if(target.is_bleeding()) + msg += "[self ? "You" : "They"] have bleeding wounds on [self ? "your" : "their"] body.\n" if(!self && skillcheck(usr, SKILL_SURGERY, SKILL_SURGERY_NOVICE)) - for(var/datum/effects/bleeding/internal/internal_bleed in effects_list) - msg += "They have bloating and discoloration on their [internal_bleed.limb.display_name]\n" - - if(stat == UNCONSCIOUS) - msg += "They seem to be unconscious\n" - else if(stat == DEAD) - if(src.check_tod() && is_revivable()) - msg += "They're not breathing" - else - if(has_limb("head")) - msg += "Their eyes have gone blank, there are no signs of life" - else - msg += "They are definitely dead" - else - msg += "[self ? "You're":"They're"] alive and breathing" + for(var/datum/effects/bleeding/internal/internal_bleed in target.effects_list) + msg += "They have bloating and discoloration on their [internal_bleed.limb.display_name].\n" + switch(target.stat) + if(DEAD) + if(target.check_tod() && target.is_revivable()) + msg += "They're not breathing." + else + if(has_limb("head")) + msg += "Their eyes have gone blank, there are no signs of life." + else + msg += "They are definitely dead." + if(UNCONSCIOUS) + msg += "They seem to be unconscious.\n" + if(CONSCIOUS) + msg += "[self ? "You're" : "They're"] alive and breathing." - to_chat(usr,SPAN_WARNING(msg)) + to_chat(src, SPAN_WARNING(msg)) /mob/living/carbon/human/verb/view_manifest() @@ -1349,11 +1365,14 @@ if(wear_mask && wear_mask.vision_impair) tint_level += wear_mask.vision_impair - if(tint_level > VISION_IMPAIR_STRONG) - tint_level = VISION_IMPAIR_STRONG + if(tint_level > VISION_IMPAIR_MAX) + tint_level = VISION_IMPAIR_MAX if(tint_level) - overlay_fullscreen("tint", /atom/movable/screen/fullscreen/impaired, tint_level) + if(tint_level == VISION_IMPAIR_MAX) + overlay_fullscreen("tint", /atom/movable/screen/fullscreen/blind) + else + overlay_fullscreen("tint", /atom/movable/screen/fullscreen/impaired, tint_level) return TRUE else clear_fullscreen("tint", 0) @@ -1397,7 +1416,8 @@ if(user.get_limb(cur_hand).status & LIMB_DESTROYED) to_chat(user, SPAN_WARNING("You cannot remove splints without a hand.")) return - for(var/bodypart in list("l_leg","r_leg","l_arm","r_arm","r_hand","l_hand","r_foot","l_foot","chest","head","groin")) + var/is_splint = FALSE + for(var/bodypart in list("l_leg","r_leg","l_arm","r_arm","r_hand","l_hand","r_foot","l_foot","chest","head","groin")) //check for any splints before do_after var/obj/limb/l = target.get_limb(bodypart) if(l && (l.status & LIMB_SPLINTED)) if(user == target) @@ -1407,13 +1427,31 @@ if((bodypart in list("r_arm", "r_hand")) && (cur_hand == "r_hand")) same_arm_side = TRUE continue - to_splint.Add(l) + is_splint = TRUE + break var/msg = "" // Have to use this because there are issues with the to_chat macros and text macros and quotation marks - if(length(to_splint)) + if(is_splint) if(do_after(user, HUMAN_STRIP_DELAY * user.get_skill_duration_multiplier(SKILL_MEDICAL), INTERRUPT_ALL, BUSY_ICON_GENERIC, target, INTERRUPT_MOVED, BUSY_ICON_GENERIC)) var/can_reach_splints = TRUE var/amount_removed = 0 + for(var/bodypart in list("l_leg","r_leg","l_arm","r_arm","r_hand","l_hand","r_foot","l_foot","chest","head","groin")) // make sure the splints still exist before removing + var/obj/limb/target_limb = target.get_limb(bodypart) + if(target_limb && (target_limb.status & LIMB_SPLINTED)) + if(user == target) + if((bodypart in list("l_arm", "l_hand")) && (cur_hand == "l_hand")) + same_arm_side = TRUE + continue + if((bodypart in list("r_arm", "r_hand")) && (cur_hand == "r_hand")) + same_arm_side = TRUE + continue + to_splint += target_limb + if(!length(to_splint)) + if(same_arm_side) + to_chat(user, SPAN_WARNING("You need to use the opposite hand to remove the splints on your arm and hand!")) + else + to_chat(user, SPAN_WARNING("There are no splints to remove.")) + return if(wear_suit && istype(wear_suit,/obj/item/clothing/suit/space)) var/obj/item/clothing/suit/space/suit = target.wear_suit if(LAZYLEN(suit.supporting_limbs)) @@ -1489,6 +1527,8 @@ /mob/living/carbon/human/synthetic/second/Initialize(mapload) . = ..(mapload, SYNTH_GEN_TWO) +/mob/living/carbon/human/synthetic/synth_k9/Initialize(mapload) + . = ..(mapload, SYNTH_K9) /mob/living/carbon/human/resist_fire() if(isyautja(src)) @@ -1725,3 +1765,38 @@ return . +/// generates realistic-ish pulse output based on preset levels. +/// method == GETPULSE_HAND is for hands, GETPULSE_TOOL is for machines, more accurate +/mob/living/carbon/human/proc/get_pulse(method) + var/temp = 0 //see setup.dm:694 + + if(species && species.flags & NO_BLOOD) + pulse = PULSE_NONE //No blood, no pulse. + + else if(stat == DEAD || status_flags & FAKEDEATH) + pulse = PULSE_NONE //That's it, you're dead, nothing can influence your pulse + + else if(floor(blood_volume) <= BLOOD_VOLUME_BAD) //How much blood do we have + pulse = PULSE_THREADY //not enough :( + + else + pulse = PULSE_NORM + + switch(pulse) + if(PULSE_NONE) + return "0" + if(PULSE_SLOW) + temp = rand(40, 60) + return num2text(method ? temp : temp + rand(-10, 10)) + if(PULSE_NORM) + temp = rand(60, 90) + return num2text(method ? temp : temp + rand(-10, 10)) + if(PULSE_FAST) + temp = rand(90, 120) + return num2text(method ? temp : temp + rand(-10, 10)) + if(PULSE_FASTER) + temp = rand(120, 160) + return num2text(method ? temp : temp + rand(-10, 10)) + if(PULSE_THREADY) + return method ? ">250" : "extremely weak and fast, patient's artery feels like a thread" +// output for machines^ ^^^^^^^output for people^^^^^^^^^ diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 60bd986b8393..26569bfed6b3 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -154,20 +154,6 @@ Contains most of the procs that are called when a mob is attacked by something return TRUE return FALSE -/mob/living/carbon/human/emp_act(severity) - . = ..() - for(var/obj/O in src) - if(!O) - continue - O.emp_act(severity) - for(var/obj/limb/O in limbs) - if(O.status & LIMB_DESTROYED) - continue - O.emp_act(severity) - for(var/datum/internal_organ/I in O.internal_organs) - if(I.robotic == FALSE) - continue - I.emp_act(severity) //Returns 1 if the attack hit, 0 if it missed. diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index 37533e9c1a57..431086faabc5 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -172,6 +172,9 @@ /// Stored image references associated with focus-fire. var/image/focused_fire_marker + // Are we currently using inherent zoom vision? + var/is_zoomed = FALSE + /client/var/cached_human_playtime /client/proc/get_total_human_playtime(skip_cache = FALSE) diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index cb6ba8137a00..60275f03e95d 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -323,13 +323,13 @@ g_eyes = 255 b_eyes = 0 if(INTENT_DISARM) //Blue - r_eyes = 0 - g_eyes = 0 - b_eyes = 255 + r_eyes = 90 + g_eyes = 90 + b_eyes = 253 if(INTENT_GRAB) //Orange, since yellow doesn't show at all! - r_eyes = 248 - g_eyes = 243 - b_eyes = 43 + r_eyes = 239 + g_eyes = 167 + b_eyes = 0 if(INTENT_HARM) //RED! r_eyes = 255 g_eyes = 0 diff --git a/code/modules/mob/living/carbon/human/human_stripping.dm b/code/modules/mob/living/carbon/human/human_stripping.dm index 210e5f266fe0..9fc916fc4288 100644 --- a/code/modules/mob/living/carbon/human/human_stripping.dm +++ b/code/modules/mob/living/carbon/human/human_stripping.dm @@ -239,6 +239,7 @@ GLOBAL_LIST_INIT(strippable_human_items, create_strippable_list(list( tag.dogtag_taken = TRUE tag.icon_state = "dogtag_taken" var/obj/item/dogtag/newtag = new(sourcemob.loc) + newtag.fallen_references = list(tag.registered_ref) newtag.fallen_names = list(tag.registered_name) newtag.fallen_assgns = list(tag.assignment) newtag.fallen_blood_types = list(tag.blood_type) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 1a43138421e4..0877cb499cf3 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -84,8 +84,6 @@ handle_regular_hud_updates() - pulse = handle_pulse() - if(!client && !mind && species) species.handle_npc(src) diff --git a/code/modules/mob/living/carbon/human/life/handle_pulse.dm b/code/modules/mob/living/carbon/human/life/handle_pulse.dm deleted file mode 100644 index 11c07e253fdd..000000000000 --- a/code/modules/mob/living/carbon/human/life/handle_pulse.dm +++ /dev/null @@ -1,14 +0,0 @@ -//Refer to life.dm for caller - -/mob/living/carbon/human/proc/handle_pulse() - - if(species && species.flags & NO_BLOOD) - return PULSE_NONE //No blood, no pulse. - - if(stat == DEAD || status_flags & FAKEDEATH) - return PULSE_NONE //That's it, you're dead, nothing can influence your pulse - - if(floor(blood_volume) <= BLOOD_VOLUME_BAD) //How much blood do we have - return PULSE_THREADY //not enough :( - - return PULSE_NORM diff --git a/code/modules/mob/living/carbon/human/login.dm b/code/modules/mob/living/carbon/human/login.dm index af46cdfc4e1d..f698b541579a 100644 --- a/code/modules/mob/living/carbon/human/login.dm +++ b/code/modules/mob/living/carbon/human/login.dm @@ -4,3 +4,16 @@ species.handle_login_special(src) if(selected_ability) set_selected_ability(null) + + +/mob/living/carbon/human/proc/add_fax_responder() + if(SSticker.mode) + SSticker.mode.fax_responders += src + return TRUE + return FALSE + +/mob/living/carbon/human/proc/despawn_fax_responder() + if(SSticker.mode) + SSticker.mode.fax_responders -= src + return TRUE + return FALSE diff --git a/code/modules/mob/living/carbon/human/powers/human_powers.dm b/code/modules/mob/living/carbon/human/powers/human_powers.dm index 8cb617397cf5..ad8a5fa1d524 100644 --- a/code/modules/mob/living/carbon/human/powers/human_powers.dm +++ b/code/modules/mob/living/carbon/human/powers/human_powers.dm @@ -333,3 +333,70 @@ inherent_huds_toggled[chosen_HUD] = TRUE the_hud.add_hud_to(src, src) to_chat(src, SPAN_INFO("[hud_choice] Enabled")) + +/mob/living/carbon/human/synthetic/synth_k9/proc/toggle_scent_tracking() + set category = "Synthetic" + set name = "Track Scent" + set desc = "Activates the K9's keen sense of smell." + + if(usr.is_mob_incapacitated()) + return + + if(!isk9synth(usr)) + return + + var/datum/species/synthetic/synth_k9/speciesk9 = species + + speciesk9.radar.tgui_interact(src) + +/mob/living/carbon/human/synthetic/synth_k9/proc/toggle_binocular_vision(mob/user) + set category = "Synthetic" + set name = "Binocular Vision" + set desc = "Activates the K9's keen sense of sight." + + if(usr.is_mob_incapacitated()) + return + + if(!is_zoomed) + enable_zoom() + user.visible_message(SPAN_NOTICE("[user] starts looking off into the distance."), \ + SPAN_NOTICE("You start focusing your sight to look off into the distance."), null, 5) + return + + if(is_zoomed) + disable_zoom() + return + +/mob/living/carbon/human/proc/enable_zoom() + var/viewsize = 12 + var/tileoffset = 11 + + if(is_zoomed || !client) + return + is_zoomed = TRUE + RegisterSignal(src, COMSIG_MOB_MOVE_OR_LOOK, PROC_REF(disable_zoom)) + client.change_view(viewsize) + var/viewoffset = 32 * tileoffset + switch(dir) + if(NORTH) + client.pixel_x = 0 + client.pixel_y = viewoffset + if(SOUTH) + client.pixel_x = 0 + client.pixel_y = -viewoffset + if(EAST) + client.pixel_x = viewoffset + client.pixel_y = 0 + if(WEST) + client.pixel_x = -viewoffset + client.pixel_y = 0 + +/mob/living/carbon/human/proc/disable_zoom() + SIGNAL_HANDLER + if(!client) + return + UnregisterSignal(src, COMSIG_MOB_MOVE_OR_LOOK) + client.change_view(GLOB.world_view_size) + client.pixel_x = 0 + client.pixel_y = 0 + is_zoomed = FALSE diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index 79a178b9c99c..261844474da4 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -119,6 +119,9 @@ if (istype(wear_mask, /obj/item/clothing/mask/muzzle)) return + if (istype(wear_mask, /obj/item/clothing/mask/facehugger)) + return + message = capitalize(trim(message)) message = process_chat_markup(message, list("~", "_")) diff --git a/code/modules/mob/living/carbon/human/species/emote-monkey.dm b/code/modules/mob/living/carbon/human/species/emote-monkey.dm index 52b6d31c4fe0..c05d2fe58b83 100644 --- a/code/modules/mob/living/carbon/human/species/emote-monkey.dm +++ b/code/modules/mob/living/carbon/human/species/emote-monkey.dm @@ -1,7 +1,11 @@ /datum/emote/living/carbon/human/primate species_type_allowed_typecache = list(/datum/species/monkey) + species_type_blacklist_typecache = list() keybind = FALSE +/datum/emote/living/carbon/human/primate/New() //Monkey's are blacklisted from human emotes on emote.dm, we need to not block the new emotes below + . = ..() + /datum/emote/living/carbon/human/primate/jump key = "jump" key_third_person = "jumps" diff --git a/code/modules/mob/living/carbon/human/species/emote-synth_k9.dm b/code/modules/mob/living/carbon/human/species/emote-synth_k9.dm new file mode 100644 index 000000000000..376449f6d688 --- /dev/null +++ b/code/modules/mob/living/carbon/human/species/emote-synth_k9.dm @@ -0,0 +1,31 @@ +/datum/emote/living/carbon/human/synthetic/synth_k9/New() //K9's are blacklisted from human emotes on emote.dm, we need to not block the new emotes below + . = ..() + +//Synth K9 Emotes +/datum/emote/living/carbon/human/synthetic/synth_k9 + species_type_allowed_typecache = list(/datum/species/synthetic/synth_k9) + species_type_blacklist_typecache = list() + keybind_category = CATEGORY_SYNTH_EMOTE + volume = 75 + +//Standard Bark +/datum/emote/living/carbon/human/synthetic/synth_k9/bark + key = "bark" + key_third_person = "barks" + message = "barks." + audio_cooldown = 3 SECONDS + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/synth_k9/bark/get_sound(mob/living/user) + return pick('sound/voice/barkstrong1.ogg','sound/voice/barkstrong2.ogg','sound/voice/barkstrong3.ogg') + +//Threatening Growl +/datum/emote/living/carbon/human/synthetic/synth_k9/growl + key = "growl" + key_third_person = "growls" + message = "growls." + audio_cooldown = 3 SECONDS + emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE + +/datum/emote/living/carbon/human/synthetic/synth_k9/growl/get_sound(mob/living/user) + return pick('sound/voice/growl1.ogg','sound/voice/growl2.ogg','sound/voice/growl3.ogg','sound/voice/growl4.ogg') diff --git a/code/modules/mob/living/carbon/human/species/human.dm b/code/modules/mob/living/carbon/human/species/human.dm index 320aa9504826..ef768dca4648 100644 --- a/code/modules/mob/living/carbon/human/species/human.dm +++ b/code/modules/mob/living/carbon/human/species/human.dm @@ -90,6 +90,10 @@ mob_flags = KNOWS_TECHNOLOGY uses_skin_color = TRUE special_body_types = TRUE + fire_sprite_prefix = "Standing" + fire_sprite_sheet = 'icons/mob/humans/onmob/OnFire.dmi' + + burstscreams = list(MALE = "male_preburst", FEMALE = "female_preburst") /datum/species/human/handle_on_fire(humanoidmob) . = ..() diff --git a/code/modules/mob/living/carbon/human/species/monkey.dm b/code/modules/mob/living/carbon/human/species/monkey.dm index 2973e4b6a556..935ac247bac4 100644 --- a/code/modules/mob/living/carbon/human/species/monkey.dm +++ b/code/modules/mob/living/carbon/human/species/monkey.dm @@ -21,6 +21,8 @@ /mob/living/proc/ventcrawl, /mob/living/proc/hide, ) + fire_sprite_prefix = "monkey" + fire_sprite_sheet = 'icons/mob/humans/onmob/OnFire.dmi' /datum/species/monkey/New() equip_adjust = list( @@ -43,39 +45,55 @@ /datum/species/monkey/get_bodytype(mob/living/carbon/human/H) return SPECIES_MONKEY -/datum/species/monkey/handle_npc(mob/living/carbon/human/H) - if(H.stat != CONSCIOUS) +/datum/species/monkey/handle_npc(mob/living/carbon/human/monkey) + if(monkey.stat != CONSCIOUS) return - if(prob(33) && isturf(H.loc) && !H.pulledby && (H.mobility_flags & MOBILITY_MOVE) && !H.is_mob_restrained()) //won't move if being pulled - step(H, pick(GLOB.cardinals)) - var/obj/held = H.get_active_hand() + var/is_on_turf = isturf(monkey.loc) + var/monkey_turf = get_turf(monkey) + + if(prob(33) && is_on_turf && !monkey.pulledby && (monkey.mobility_flags & MOBILITY_MOVE) && !monkey.is_mob_restrained()) //won't move if being pulled + step(monkey, pick(GLOB.cardinals)) + + var/obj/held = monkey.get_active_hand() if(held && prob(1)) - var/turf/T = get_random_turf_in_range(H, 7, 2) - if(T) + var/turf/turf = get_random_turf_in_range(monkey, 7, 2) + if(turf) if(isgun(held) && prob(80)) - var/obj/item/weapon/gun/G = held - G.Fire(T, H) - else if(prob(80) && H.equip_to_appropriate_slot(held, 0)) - if(H.hand) - H.update_inv_l_hand(0) + var/obj/item/weapon/gun/firearm = held + firearm.Fire(turf, monkey) + else if(prob(80) && monkey.equip_to_appropriate_slot(held, 0)) + if(monkey.hand) + monkey.update_inv_l_hand(0) else - H.update_inv_r_hand(0) + monkey.update_inv_r_hand(0) else - H.throw_item(T) + monkey.throw_item(turf) else - H.drop_held_item() - if(!held && !H.buckled && prob(5)) + monkey.drop_held_item() + if(!held && !monkey.buckled && prob(5)) var/list/touchables = list() - for(var/obj/O in range(1,get_turf(H))) - if(O.Adjacent(H)) - touchables += O + for(var/obj/thing in range(1, monkey_turf)) + if(thing.Adjacent(monkey)) + touchables += thing if(length(touchables)) var/obj/touchy = pick(touchables) - touchy.attack_hand(H) - - if(prob(1)) - H.emote(pick("chimper","scratch","jump","roll","tail")) + touchy.attack_hand(monkey) + + var/prob_cry = is_on_turf ? 1 : 5 + if(prob(prob_cry)) + monkey.emote(pick("chimper","scratch","jump","roll","tail")) + if(!is_on_turf && isobj(monkey.loc)) + var/obj/container = monkey.loc + if(prob(50)) + var/list/heard = get_mobs_in_view(GLOB.world_view_size, container) + var/message = pick("rocks about.", "creaks.", "chimpers.") + container.langchat_speech(message, heard, GLOB.all_languages, skip_language_check = TRUE, animation_style = LANGCHAT_FAST_POP, additional_styles = list("langchat_small", "emote")) + container.visible_message("[container] [message]") + else + container.attack_hand(monkey) + if(prob(50)) + playsound(monkey_turf, pick('sound/voice/monkey_chimper1.ogg', 'sound/voice/monkey_chimper2.ogg'), 25) /datum/species/monkey/handle_on_fire(humanoidmob) . = ..() diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index cc2849e57274..30418f3c8b63 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -119,6 +119,12 @@ var/has_species_tab_items = FALSE + ///Species specific emote sound lists + var/list/burstscreams = list() + + var/fire_sprite_prefix = "Standing" + var/fire_sprite_sheet = 'icons/mob/humans/onmob/OnFire.dmi' + /datum/species/New() if(unarmed_type) unarmed = new unarmed_type() diff --git a/code/modules/mob/living/carbon/human/species/synth_k9.dm b/code/modules/mob/living/carbon/human/species/synth_k9.dm new file mode 100644 index 000000000000..fa067d87e5ef --- /dev/null +++ b/code/modules/mob/living/carbon/human/species/synth_k9.dm @@ -0,0 +1,41 @@ +//woof! +/datum/species/synthetic/synth_k9 + name = SPECIES_SYNTHETIC_K9 + uses_skin_color = FALSE + + slowdown = -1.75 //Faster than Human run, slower than rooney run + + icobase = 'icons/mob/humans/species/synth_k9/r_k9.dmi' + deform = 'icons/mob/humans/species/synth_k9/r_k9.dmi' + eyes = "blank_eyes_s" + blood_mask = 'icons/mob/humans/species/synth_k9/r_k9.dmi' + unarmed_type = /datum/unarmed_attack/bite/synthetic + secondary_unarmed_type = /datum/unarmed_attack + death_message = "lets out a faint whimper as it collapses and stops moving..." + flags = IS_WHITELISTED|NO_BREATHE|NO_CLONE_LOSS|NO_BLOOD|NO_POISON|IS_SYNTHETIC|NO_CHEM_METABOLIZATION|NO_NEURO|NO_OVERLAYS + + mob_inherent_traits = list(TRAIT_SUPER_STRONG, TRAIT_IRON_TEETH, TRAIT_EMOTE_CD_EXEMPT) + + fire_sprite_prefix = "k9" + fire_sprite_sheet = 'icons/mob/humans/onmob/OnFire.dmi' + + inherent_verbs = list( + /mob/living/carbon/human/synthetic/proc/toggle_HUD, + /mob/living/carbon/human/proc/toggle_inherent_nightvison, + /mob/living/carbon/human/synthetic/synth_k9/proc/toggle_scent_tracking, + /mob/living/carbon/human/synthetic/synth_k9/proc/toggle_binocular_vision, + ) + + //Scent tracking + var/datum/radar/scenttracker/radar + var/faction = FACTION_MARINE + +//Lets have a place for radar data to live +/datum/species/synthetic/synth_k9/handle_post_spawn(mob/living/carbon/human/spawned_k9) + . = ..() + radar = new /datum/radar/scenttracker(spawned_k9, faction) + +/datum/species/synthetic/synth_k9/Destroy() + . = ..() + qdel(radar) + faction = null diff --git a/code/modules/mob/living/carbon/human/species/synthetic.dm b/code/modules/mob/living/carbon/human/species/synthetic.dm index 741d9ba40324..3e03290467c9 100644 --- a/code/modules/mob/living/carbon/human/species/synthetic.dm +++ b/code/modules/mob/living/carbon/human/species/synthetic.dm @@ -72,8 +72,9 @@ /datum/species/synthetic/gen_two name = SYNTH_GEN_TWO - uses_skin_color = FALSE //2nd gen uses generic human look - special_body_types = FALSE + uses_skin_color = TRUE + special_body_types = TRUE + /datum/species/synthetic/colonial name = SYNTH_COLONY @@ -96,8 +97,8 @@ /datum/species/synthetic/colonial/colonial_gen_two name = SYNTH_COLONY_GEN_TWO - uses_skin_color = FALSE //2nd gen uses generic human look - special_body_types = FALSE + uses_skin_color = TRUE + special_body_types = TRUE /datum/species/synthetic/colonial/colonial_gen_one name = SYNTH_COLONY_GEN_ONE diff --git a/code/modules/mob/living/carbon/human/species/working_joe/_species.dm b/code/modules/mob/living/carbon/human/species/working_joe/_species.dm index 0273fe6b903f..64da16df062c 100644 --- a/code/modules/mob/living/carbon/human/species/working_joe/_species.dm +++ b/code/modules/mob/living/carbon/human/species/working_joe/_species.dm @@ -65,7 +65,7 @@ /datum/joe_emote_panel/proc/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) if(!ui) - ui = new(user, src, "JoeEmotes") + ui = new(user, src, "Emotes", "Working Joe Voice Synthesizer") ui.open() @@ -84,6 +84,7 @@ /datum/joe_emote_panel/ui_static_data(mob/user) var/list/data = list() + data["theme"] = "crtblue" data["categories"] = GLOB.wj_categories data["emotes"] = list() diff --git a/code/modules/mob/living/carbon/human/species/yautja/_species.dm b/code/modules/mob/living/carbon/human/species/yautja/_species.dm index 920f25a80a54..dc5ae3b77547 100644 --- a/code/modules/mob/living/carbon/human/species/yautja/_species.dm +++ b/code/modules/mob/living/carbon/human/species/yautja/_species.dm @@ -35,12 +35,13 @@ bloodsplatter_type = /obj/effect/bloodsplatter/yautjasplatter + burstscreams = list(MALE = "pred_preburst", FEMALE = "pred_preburst") + heat_level_1 = 500 heat_level_2 = 700 heat_level_3 = 1000 inherent_verbs = list( - /mob/living/carbon/human/proc/pred_buy, /mob/living/carbon/human/proc/butcher, /mob/living/carbon/human/proc/mark_for_hunt, /mob/living/carbon/human/proc/remove_from_hunt, @@ -213,7 +214,6 @@ limb.time_to_knit = 600 // 1 minute to self heal bone break, time is in tenths of a second hunter.set_languages(list(LANGUAGE_YAUTJA)) - give_action(hunter, /datum/action/predator_action/claim_equipment) give_action(hunter, /datum/action/yautja_emote_panel) give_action(hunter, /datum/action/predator_action/mark_for_hunt) give_action(hunter, /datum/action/predator_action/mark_panel) diff --git a/code/modules/mob/living/carbon/human/unarmed_attacks.dm b/code/modules/mob/living/carbon/human/unarmed_attacks.dm index f933e853207a..8d4ca1df6d8d 100644 --- a/code/modules/mob/living/carbon/human/unarmed_attacks.dm +++ b/code/modules/mob/living/carbon/human/unarmed_attacks.dm @@ -23,6 +23,14 @@ sharp = TRUE edge = TRUE +/datum/unarmed_attack/bite/synthetic + attack_verb = list("gnash", "chew", "munch", "crunch") + attack_sound = 'sound/weapons/alien_bite1.ogg' + shredding = FALSE + damage = 35 + sharp = TRUE + edge = TRUE + /datum/unarmed_attack/bite/is_usable(mob/living/carbon/human/user) if(!user.melee_allowed) return FALSE diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 6b2739780288..91ed3dad21d1 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -328,6 +328,9 @@ Applied by gun suicide and high impact bullet executions, removed by rejuvenate, client.add_to_screen(w_uniform) w_uniform.screen_loc = hud_used.ui_datum.hud_slot_offset(w_uniform, hud_used.ui_datum.ui_iclothing) + if(species.flags & NO_OVERLAYS && !w_uniform.force_overlays_on) + return + if(!(wear_suit && wear_suit.flags_inv_hide & HIDEJUMPSUIT)) var/image/I = w_uniform.get_mob_overlay(src, WEAR_BODY) I.layer = -UNIFORM_LAYER @@ -348,6 +351,8 @@ Applied by gun suicide and high impact bullet executions, removed by rejuvenate, var/obj/item/card/id/card = get_idcard() if(!card) return + if(species.flags & NO_OVERLAYS && !wear_id.force_overlays_on) + return if(!card.pinned_on_uniform || (w_uniform && w_uniform.displays_id && !(w_uniform.flags_jumpsuit & UNIFORM_JACKET_REMOVED))) var/image/id_overlay = card.get_mob_overlay(src, WEAR_ID) id_overlay.layer = -ID_LAYER @@ -362,6 +367,9 @@ Applied by gun suicide and high impact bullet executions, removed by rejuvenate, client.add_to_screen(gloves) gloves.screen_loc = hud_used.ui_datum.hud_slot_offset(gloves, hud_used.ui_datum.ui_gloves) + if(species.flags & NO_OVERLAYS && !gloves.force_overlays_on) + return + if(!(wear_suit && wear_suit.flags_inv_hide & HIDEGLOVES)) I = gloves.get_mob_overlay(src, WEAR_HANDS) @@ -381,6 +389,9 @@ Applied by gun suicide and high impact bullet executions, removed by rejuvenate, client.add_to_screen(glasses) glasses.screen_loc = hud_used.ui_datum.hud_slot_offset(glasses, hud_used.ui_datum.ui_glasses) + if(species.flags & NO_OVERLAYS && !glasses.force_overlays_on) + return + var/image/I = glasses.get_mob_overlay(src, WEAR_EYES) I.layer = -GLASSES_LAYER overlays_standing[GLASSES_LAYER] = I @@ -399,6 +410,9 @@ Applied by gun suicide and high impact bullet executions, removed by rejuvenate, wear_l_ear?.screen_loc = hud_used.ui_datum.hud_slot_offset(wear_l_ear, hud_used.ui_datum.ui_wear_l_ear) wear_r_ear?.screen_loc = hud_used.ui_datum.hud_slot_offset(wear_r_ear, hud_used.ui_datum.ui_wear_r_ear) + if(species.flags & NO_OVERLAYS) + return + var/image/standing_image = image('icons/mob/humans/onmob/med_human.dmi', icon_state = "blank", layer = -EARS_LAYER) standing_image.overlays += wear_l_ear?.get_mob_overlay(src, WEAR_L_EAR) @@ -417,6 +431,9 @@ Applied by gun suicide and high impact bullet executions, removed by rejuvenate, client.add_to_screen(shoes) shoes.screen_loc = hud_used.ui_datum.hud_slot_offset(shoes, hud_used.ui_datum.ui_shoes) + if(species.flags & NO_OVERLAYS && !shoes.force_overlays_on) + return + if(!((wear_suit && wear_suit.flags_inv_hide & HIDESHOES) || (w_uniform && w_uniform.flags_inv_hide & HIDESHOES))) I = shoes.get_mob_overlay(src, WEAR_FEET) @@ -436,6 +453,9 @@ Applied by gun suicide and high impact bullet executions, removed by rejuvenate, client.add_to_screen(s_store) s_store.screen_loc = hud_used.ui_datum.hud_slot_offset(s_store, hud_used.ui_datum.ui_sstore1) + if(species.flags & NO_OVERLAYS && !s_store.force_overlays_on) + return + var/image/I = s_store.get_mob_overlay(src, WEAR_J_STORE) I.layer = -SUIT_STORE_LAYER overlays_standing[SUIT_STORE_LAYER] = I @@ -456,6 +476,9 @@ Applied by gun suicide and high impact bullet executions, removed by rejuvenate, client.add_to_screen(head) head.screen_loc = hud_used.ui_datum.hud_slot_offset(head, hud_used.ui_datum.ui_head) + if(species.flags & NO_OVERLAYS && !head.force_overlays_on) + return + var/image/I = head.get_mob_overlay(src, WEAR_HEAD) I.layer = -HEAD_LAYER overlays_standing[HEAD_LAYER] = I @@ -501,6 +524,9 @@ Applied by gun suicide and high impact bullet executions, removed by rejuvenate, client.add_to_screen(belt) belt.screen_loc = hud_used.ui_datum.hud_slot_offset(belt, hud_used.ui_datum.ui_belt) + if(species.flags & NO_OVERLAYS && !belt.force_overlays_on) + return + var/image/I = belt.get_mob_overlay(src, WEAR_WAIST) I.layer = -BELT_LAYER overlays_standing[BELT_LAYER] = I @@ -518,6 +544,9 @@ Applied by gun suicide and high impact bullet executions, removed by rejuvenate, client.add_to_screen(wear_suit) wear_suit.screen_loc = hud_used.ui_datum.hud_slot_offset(wear_suit, hud_used.ui_datum.ui_oclothing) + if(species.flags & NO_OVERLAYS && !wear_suit.force_overlays_on) + return + var/image/I = wear_suit.get_mob_overlay(src, WEAR_JACKET) I.layer = -SUIT_LAYER overlays_standing[SUIT_LAYER] = I @@ -566,6 +595,9 @@ Applied by gun suicide and high impact bullet executions, removed by rejuvenate, if(!(client && hud_used && hud_used.hud_shown && hud_used.ui_datum)) return + if(species.flags & NO_OVERLAYS) + return + if(l_store) client.add_to_screen(l_store) l_store.screen_loc = hud_used.ui_datum.hud_slot_offset(l_store, hud_used.ui_datum.ui_storage1) @@ -582,6 +614,9 @@ Applied by gun suicide and high impact bullet executions, removed by rejuvenate, client.add_to_screen(wear_mask) wear_mask.screen_loc = hud_used.ui_datum.hud_slot_offset(wear_mask, hud_used.ui_datum.ui_mask) + if(species.flags & NO_OVERLAYS && !wear_mask.force_overlays_on) + return + if(!(head && head.flags_inv_hide & HIDEMASK)) var/image/I = wear_mask.get_mob_overlay(src, WEAR_FACE) I.layer = -FACEMASK_LAYER @@ -596,6 +631,9 @@ Applied by gun suicide and high impact bullet executions, removed by rejuvenate, client.add_to_screen(back) back.screen_loc = hud_used.ui_datum.hud_slot_offset(back, hud_used.ui_datum.ui_back) + if(species.flags & NO_OVERLAYS && !back.force_overlays_on) + return + var/image/I = back.get_mob_overlay(src, WEAR_BACK) I.layer = -BACK_LAYER @@ -694,11 +732,14 @@ Applied by gun suicide and high impact bullet executions, removed by rejuvenate, /mob/living/carbon/human/update_burst() remove_overlay(BURST_LAYER) var/image/standing + var/bursting_icon = "stand" + if(isyautja(src)) + bursting_icon = "yautja_stand" switch(chestburst) if(1) - standing = image("icon" = 'icons/mob/xenos/effects.dmi',"icon_state" = "burst_stand", "layer" = -BURST_LAYER) + standing = image("icon" = 'icons/mob/xenos/effects.dmi',"icon_state" = "burst_[bursting_icon]", "layer" = -BURST_LAYER) if(2) - standing = image("icon" = 'icons/mob/xenos/effects.dmi',"icon_state" = "bursted_stand", "layer" = -BURST_LAYER) + standing = image("icon" = 'icons/mob/xenos/effects.dmi',"icon_state" = "bursted_[bursting_icon]", "layer" = -BURST_LAYER) else return overlays_standing[BURST_LAYER] = standing @@ -710,13 +751,17 @@ Applied by gun suicide and high impact bullet executions, removed by rejuvenate, if(!on_fire) set_light_on(FALSE) return + + var/fire_sprite_sheet = species.fire_sprite_sheet + var/fire_sprite_prefix = species.fire_sprite_prefix + var/image/I switch(fire_stacks) if(1 to 14) - I = image("icon"='icons/mob/humans/onmob/OnFire.dmi', "icon_state"="Standing_weak", "layer"= -FIRE_LAYER) + I = image(icon = fire_sprite_sheet, icon_state = "[fire_sprite_prefix]_weak", layer = -FIRE_LAYER) set_light_range(2) if(15 to INFINITY) - I = image("icon"='icons/mob/humans/onmob/OnFire.dmi', "icon_state"="Standing_medium", "layer"= -FIRE_LAYER) + I = image(icon = fire_sprite_sheet, icon_state = "[fire_sprite_prefix]_medium", layer = -FIRE_LAYER) set_light_range(3) else return diff --git a/code/modules/mob/living/carbon/human/whisper.dm b/code/modules/mob/living/carbon/human/whisper.dm index cd4a08aefef7..23951e0c54d0 100644 --- a/code/modules/mob/living/carbon/human/whisper.dm +++ b/code/modules/mob/living/carbon/human/whisper.dm @@ -58,6 +58,9 @@ if (istype(src.wear_mask, /obj/item/clothing/mask/muzzle)) return + if (istype(src.wear_mask, /obj/item/clothing/mask/facehugger)) + return + //TODO: handle_speech_problems if (src.stuttering) message = stutter(message, stuttering) diff --git a/code/modules/mob/living/carbon/xenomorph/Abilities.dm b/code/modules/mob/living/carbon/xenomorph/Abilities.dm index bb2a5ec65aeb..cc28c8779b19 100644 --- a/code/modules/mob/living/carbon/xenomorph/Abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/Abilities.dm @@ -55,7 +55,7 @@ var/area/AR = get_area(T) if(isnull(AR) || !(AR.is_resin_allowed)) - if(AR.flags_area & AREA_UNWEEDABLE) + if(!AR || AR.flags_area & AREA_UNWEEDABLE) to_chat(X, SPAN_XENOWARNING("This area is unsuited to host the hive!")) return to_chat(X, SPAN_XENOWARNING("It's too early to spread the hive this far.")) @@ -105,7 +105,6 @@ /datum/action/xeno_action/onclick/screech name = "Screech (250)" action_icon_state = "screech" - ability_name = "screech" macro_path = /datum/action/xeno_action/verb/verb_screech action_type = XENO_ACTION_CLICK xeno_cooldown = 50 SECONDS @@ -168,7 +167,6 @@ /datum/action/xeno_action/activable/gut name = "Gut (200)" action_icon_state = "gut" - ability_name = "gut" macro_path = /datum/action/xeno_action/verb/verb_gut action_type = XENO_ACTION_CLICK xeno_cooldown = 15 MINUTES @@ -282,7 +280,6 @@ /datum/action/xeno_action/activable/queen_give_plasma name = "Give Plasma (400)" action_icon_state = "queen_give_plasma" - ability_name = "give plasma" plasma_cost = 400 macro_path = /datum/action/xeno_action/verb/verb_plasma_xeno action_type = XENO_ACTION_CLICK diff --git a/code/modules/mob/living/carbon/xenomorph/Embryo.dm b/code/modules/mob/living/carbon/xenomorph/Embryo.dm index b328fc13b8c9..4f71d8c43ce1 100644 --- a/code/modules/mob/living/carbon/xenomorph/Embryo.dm +++ b/code/modules/mob/living/carbon/xenomorph/Embryo.dm @@ -307,20 +307,18 @@ if(loc != victim) victim.chestburst = 0 return + if(ishuman(victim) || isyautja(victim)) + victim.emote("burstscream") + sleep(25) //Sound delay victim.update_burst() - sleep(6) //Sprite delay + sleep(10) //Sprite delay if(!victim || !victim.loc) return if(loc != victim) - victim.chestburst = 0 //if a doc removes the larva during the sleep(6), we must remove the 'bursting' overlay on the human + victim.chestburst = 0 //if a doc removes the larva during the sleep(10), we must remove the 'bursting' overlay on the human victim.update_burst() return - if(isyautja(victim)) - victim.emote("roar") - else - victim.emote("scream") - var/burstcount = 0 victim.spawn_gibs() diff --git a/code/modules/mob/living/carbon/xenomorph/Evolution.dm b/code/modules/mob/living/carbon/xenomorph/Evolution.dm index e0f0844bfa13..33924c8a1963 100644 --- a/code/modules/mob/living/carbon/xenomorph/Evolution.dm +++ b/code/modules/mob/living/carbon/xenomorph/Evolution.dm @@ -38,6 +38,9 @@ if(!castepick) //Changed my mind return + if(SEND_SIGNAL(src, COMSIG_XENO_TRY_EVOLVE, castepick) & COMPONENT_OVERRIDE_EVOLVE) + return // Message will be handled by component + var/datum/caste_datum/caste_datum = GLOB.xeno_datum_list[castepick] if(caste_datum && caste_datum.minimum_evolve_time > ROUND_TIME) to_chat(src, SPAN_WARNING("The Hive cannot support this caste yet! ([floor((caste_datum.minimum_evolve_time - ROUND_TIME) / 10)] seconds remaining)")) @@ -196,6 +199,8 @@ GLOB.round_statistics.track_new_participant(new_xeno.faction, -1) //so an evolved xeno doesn't count as two. SSround_recording.recorder.track_player(new_xeno) + SEND_SIGNAL(src, COMSIG_XENO_EVOLVE_TO_NEW_CASTE, new_xeno) + /mob/living/carbon/xenomorph/proc/evolve_checks() if(!check_state(TRUE)) return FALSE @@ -248,7 +253,7 @@ return TRUE -// The queen de-evo, but on yourself. Only usable once +// The queen de-evo, but on yourself. /mob/living/carbon/xenomorph/verb/Deevolve() set name = "De-Evolve" set desc = "De-evolve into a lesser form." @@ -256,23 +261,18 @@ if(!check_state()) return - if(is_ventcrawling) to_chat(src, SPAN_XENOWARNING("You can't deevolve here.")) return - if(!isturf(loc)) to_chat(src, SPAN_XENOWARNING("You can't deevolve here.")) return - if(health < maxHealth) to_chat(src, SPAN_XENOWARNING("We are too weak to deevolve, we must regain our health first.")) return - if(length(caste.deevolves_to) < 1) to_chat(src, SPAN_XENOWARNING("We can't deevolve any further.")) return - if(lock_evolve) if(banished) to_chat(src, SPAN_WARNING("We are banished and cannot reach the hivemind.")) @@ -282,7 +282,6 @@ var/newcaste - if(length(caste.deevolves_to) == 1) newcaste = caste.deevolves_to[1] else if(length(caste.deevolves_to) > 1) @@ -291,55 +290,33 @@ if(!newcaste) return - var/confirm = tgui_alert(src, "Are you sure you want to de-evolve from [caste.caste_type] to [newcaste]?", "Deevolution", list("Yes", "No")) + var/confirm = tgui_alert(src, "Are you sure you want to de-evolve from [caste.caste_type] to [newcaste]? You won't be able to return to it for a time.", "Deevolution", list("Yes", "No")) if(confirm != "Yes") return if(!check_state()) return - if(is_ventcrawling) return - if(!isturf(loc)) return - if(health <= 0) return - if(lock_evolve) to_chat(src, SPAN_WARNING("You are banished and cannot reach the hivemind.")) - return FALSE + return + + + SEND_SIGNAL(src, COMSIG_XENO_DEEVOLVE) - var/xeno_type - var/level_to_switch_to = get_vision_level() - switch(newcaste) - if("Larva") - xeno_type = /mob/living/carbon/xenomorph/larva - if(XENO_CASTE_RUNNER) - xeno_type = /mob/living/carbon/xenomorph/runner - if(XENO_CASTE_DRONE) - xeno_type = /mob/living/carbon/xenomorph/drone - if(XENO_CASTE_SENTINEL) - xeno_type = /mob/living/carbon/xenomorph/sentinel - if(XENO_CASTE_SPITTER) - xeno_type = /mob/living/carbon/xenomorph/spitter - if(XENO_CASTE_LURKER) - xeno_type = /mob/living/carbon/xenomorph/lurker - if(XENO_CASTE_WARRIOR) - xeno_type = /mob/living/carbon/xenomorph/warrior - if(XENO_CASTE_DEFENDER) - xeno_type = /mob/living/carbon/xenomorph/defender - if(XENO_CASTE_BURROWER) - xeno_type = /mob/living/carbon/xenomorph/burrower var/obj/item/organ/xeno/organ = locate() in src if(!isnull(organ)) qdel(organ) - var/mob/living/carbon/xenomorph/new_xeno = new xeno_type(get_turf(src), src) - new_xeno.built_structures = built_structures.Copy() + var/level_to_switch_to = get_vision_level() + var/xeno_type = GLOB.RoleAuthority.get_caste_by_text(newcaste) - built_structures = null + var/mob/living/carbon/xenomorph/new_xeno = new xeno_type(get_turf(src), src) if(!istype(new_xeno)) //Something went horribly wrong! @@ -348,7 +325,11 @@ qdel(new_xeno) return + new_xeno.built_structures = built_structures.Copy() + built_structures = null + log_game("EVOLVE: [key_name(src)] de-evolved into [new_xeno].") + if(mind) mind.transfer_to(new_xeno) else @@ -359,19 +340,30 @@ new_xeno.client.pixel_y = 0 //Regenerate the new mob's name now that our player is inside + if(newcaste == XENO_CASTE_LARVA) + var/mob/living/carbon/xenomorph/larva/new_larva = new_xeno + new_larva.larva_state = LARVA_STATE_NORMAL + new_larva.update_icons() new_xeno.generate_name() if(new_xeno.client) new_xeno.set_lighting_alpha(level_to_switch_to) + + // If the player has lost the Deevolve verb before, don't allow them to do it again + if(!(/mob/living/carbon/xenomorph/verb/Deevolve in verbs)) + remove_verb(new_xeno, /mob/living/carbon/xenomorph/verb/Deevolve) + new_xeno.visible_message(SPAN_XENODANGER("A [new_xeno.caste.caste_type] emerges from the husk of \the [src]."), \ SPAN_XENODANGER("We regress into our previous form.")) + transfer_observers_to(new_xeno) + if(GLOB.round_statistics && !new_xeno.statistic_exempt) GLOB.round_statistics.track_new_participant(faction, -1) //so an evolved xeno doesn't count as two. + SSround_recording.recorder.stop_tracking(src) SSround_recording.recorder.track_player(new_xeno) - src.transfer_observers_to(new_xeno) - qdel(src) + return /mob/living/carbon/xenomorph/proc/can_evolve(castepick, potential_queens) var/selected_caste = GLOB.xeno_datum_list[castepick]?.type diff --git a/code/modules/mob/living/carbon/xenomorph/Facehuggers.dm b/code/modules/mob/living/carbon/xenomorph/Facehuggers.dm index 9a87f10d74a3..2535917d3d61 100644 --- a/code/modules/mob/living/carbon/xenomorph/Facehuggers.dm +++ b/code/modules/mob/living/carbon/xenomorph/Facehuggers.dm @@ -16,6 +16,7 @@ flags_atom = NO_FLAGS flags_item = NOBLUDGEON throw_range = 1 + vision_impair = VISION_IMPAIR_MAX layer = FACEHUGGER_LAYER black_market_value = 20 @@ -293,7 +294,7 @@ human.disable_lights() human.disable_special_items() if(ishuman_strict(human)) - playsound(loc, human.gender == "male" ? 'sound/misc/facehugged_male.ogg' : 'sound/misc/facehugged_female.ogg' , 25, 0) + playsound(loc, human.gender == "male" ? "male_hugged" : "female_hugged" , 25, 0) else if(isyautja(human)) playsound(loc, 'sound/voice/pred_facehugged.ogg', 65, FALSE) if(!sterile) @@ -408,7 +409,7 @@ qdel(src) return var/obj/effect/alien/resin/special/eggmorph/M = locate() in loc - if(istype(M) && M.stored_huggers < M.huggers_to_grow_max) + if(istype(M) && M.stored_huggers < M.huggers_max_amount) visible_message(SPAN_XENOWARNING("[src] crawls back into [M]!")) M.stored_huggers++ qdel(src) diff --git a/code/modules/mob/living/carbon/xenomorph/Powers.dm b/code/modules/mob/living/carbon/xenomorph/Powers.dm index 87a6db3c0816..da91b76dab86 100644 --- a/code/modules/mob/living/carbon/xenomorph/Powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/Powers.dm @@ -142,6 +142,10 @@ new_resin.add_hiddenprint(src) //so admins know who placed it + var/area/resin_area = get_area(new_resin) + if(resin_area && resin_area.linked_lz) + new_resin.AddComponent(/datum/component/resin_cleanup) + if(istype(new_resin, /turf/closed)) for(var/mob/living/carbon/human/enclosed_human in new_resin.contents) if(enclosed_human.stat == DEAD) diff --git a/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm b/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm index baf69a54e16e..f9646a93eef9 100644 --- a/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm +++ b/code/modules/mob/living/carbon/xenomorph/XenoProcs.dm @@ -310,7 +310,7 @@ return - visible_message(SPAN_DANGER("[src] [pounceAction.ability_name] onto [M]!"), SPAN_XENODANGER("We [pounceAction.ability_name] onto [M]!"), null, 5) + visible_message(SPAN_DANGER("[src] [pounceAction.action_text] onto [M]!"), SPAN_XENODANGER("We [pounceAction.action_text] onto [M]!"), null, 5) if (pounceAction.knockdown) M.KnockDown(pounceAction.knockdown_duration) @@ -616,8 +616,10 @@ return "Moderate" if(3 to 3.9) return "Strong" - if(4 to INFINITY) + if(4 to 4.9) return "Very Strong" + if(4.9 to INFINITY) + return "Overwhelming" /mob/living/carbon/xenomorph/proc/start_tracking_resin_mark(obj/effect/alien/resin/marker/target) if(!target) diff --git a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm index 1a10d6c70ddc..236ca482a1d2 100644 --- a/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm +++ b/code/modules/mob/living/carbon/xenomorph/Xenomorph.dm @@ -347,11 +347,11 @@ var/cannot_slash = FALSE /mob/living/carbon/xenomorph/Initialize(mapload, mob/living/carbon/xenomorph/old_xeno, hivenumber) - if(old_xeno && old_xeno.hivenumber) src.hivenumber = old_xeno.hivenumber else if(hivenumber) src.hivenumber = hivenumber + //putting the organ in for research if(organ_value != 0) var/obj/item/organ/xeno/organ = new() //give @@ -360,17 +360,17 @@ organ.caste_origin = caste_type organ.icon_state = get_organ_icon() - var/datum/hive_status/hive = GLOB.hive_datum[src.hivenumber] + set_languages(list(LANGUAGE_XENOMORPH, LANGUAGE_HIVEMIND)) // The hive may alter this list + var/datum/hive_status/hive = GLOB.hive_datum[src.hivenumber] if(hive) hive.add_xeno(src) wound_icon_holder = new(null, src) vis_contents += wound_icon_holder - set_languages(list(LANGUAGE_XENOMORPH, LANGUAGE_HIVEMIND)) - ///Handle transferring things from the old Xeno if we have one in the case of evolve, devolve etc. + AddComponent(/datum/component/deevolve_cooldown, old_xeno) if(old_xeno) src.nicknumber = old_xeno.nicknumber src.life_kills_total = old_xeno.life_kills_total diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/ability_macro_framework.dm b/code/modules/mob/living/carbon/xenomorph/abilities/ability_macro_framework.dm index 3c162662d028..9a9f5cb50d0a 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/ability_macro_framework.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/ability_macro_framework.dm @@ -20,8 +20,8 @@ handle_xeno_macro_actionqueue(xeno, action) else - log_debug("Xeno action [action.ability_name] is misconfigured. Code: XENO_ACTION_MACRO_1") - log_admin("Xeno action [action.ability_name] is misconfigured. Tell the devs. Code: XENO_ACTION_MACRO_1") + log_debug("Xeno action [action.name] is misconfigured. Code: XENO_ACTION_MACRO_1") + log_admin("Xeno action [action.name] is misconfigured. Tell the devs. Code: XENO_ACTION_MACRO_1") /proc/handle_xeno_macro_click(mob/living/carbon/xenomorph/xeno, datum/action/xeno_action/action) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/boiler/boiler_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/boiler/boiler_abilities.dm index e7f72e7e013e..a44cc478330c 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/boiler/boiler_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/boiler/boiler_abilities.dm @@ -7,7 +7,6 @@ /datum/action/xeno_action/activable/acid_lance name = "Acid Lance" - ability_name = "acid lance" action_icon_state = "acid_lance" plasma_cost = 50 macro_path = /datum/action/xeno_action/verb/verb_acid_lance @@ -50,7 +49,6 @@ /datum/action/xeno_action/activable/xeno_spit/bombard name = "Bombard" - ability_name = "Bombard" action_icon_state = "bombard" cooldown_message = "Our belly fills with another gas glob. We are ready to bombard again." sound_to_play = 'sound/effects/blobattack.ogg' @@ -65,7 +63,6 @@ /datum/action/xeno_action/onclick/acid_shroud // acid dump alternative name = "Acid Shroud" - ability_name = "Acid Shroud" action_icon_state = "acid_shroud" action_type = XENO_ACTION_ACTIVATE ability_primacy = XENO_PRIMARY_ACTION_5 @@ -90,7 +87,6 @@ /datum/action/xeno_action/activable/boiler_trap name = "Deploy Trap" - ability_name = "deploy trap" action_icon_state = "resin_pit" plasma_cost = 60 macro_path = /datum/action/xeno_action/verb/verb_boiler_trap @@ -106,7 +102,6 @@ /datum/action/xeno_action/activable/acid_mine name = "Acid Mine" - ability_name = "acid mine" action_icon_state = "acid_mine" plasma_cost = 40 macro_path = /datum/action/xeno_action/verb/verb_acid_mine @@ -121,7 +116,6 @@ /datum/action/xeno_action/activable/acid_shotgun name = "Acid Shotgun" - ability_name = "acid shotgun" action_icon_state = "acid_shotgun" plasma_cost = 60 macro_path = /datum/action/xeno_action/verb/verb_acid_shotgun diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_abilities.dm index 09c6006536b0..d8ee01d2d067 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_abilities.dm @@ -4,7 +4,6 @@ /datum/action/xeno_action/activable/burrow name = "Burrow" action_icon_state = "agility_on" - ability_name = "burrow" macro_path = /datum/action/xeno_action/verb/verb_burrow action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_3 @@ -25,12 +24,8 @@ /datum/action/xeno_action/onclick/tremor name = "Tremor (100)" action_icon_state = "stomp" - ability_name = "tremor" macro_path = /datum/action/xeno_action/verb/verb_tremor action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_4 - -/datum/action/xeno_action/onclick/tremor/use_ability() - var/mob/living/carbon/xenomorph/X = owner - X.tremor() - return ..() + xeno_cooldown = 45 SECONDS + plasma_cost = 100 diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_powers.dm index 8117eade469a..62d8b60d1200 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/burrower/burrower_powers.dm @@ -187,44 +187,40 @@ T.tunnel_desc = "[new_name]" return -/datum/action/xeno_action/onclick/tremor/action_cooldown_check() - var/mob/living/carbon/xenomorph/xeno = owner - return !xeno.used_tremor -/mob/living/carbon/xenomorph/proc/tremor() //More support focused version of crusher earthquakes. - if(HAS_TRAIT(src, TRAIT_ABILITY_BURROWED) || is_ventcrawling) - to_chat(src, SPAN_XENOWARNING("We must be above ground to do this.")) +/datum/action/xeno_action/onclick/tremor/use_ability(atom/target) + var/mob/living/carbon/xenomorph/burrower_tremor = owner + + if (HAS_TRAIT(burrower_tremor, TRAIT_ABILITY_BURROWED)) + to_chat(burrower_tremor, SPAN_XENOWARNING("We must be above ground to do this.")) return - if(!check_state()) + if (burrower_tremor.is_ventcrawling) + to_chat(burrower_tremor, SPAN_XENOWARNING("We must be above ground to do this.")) return - if(used_tremor) - to_chat(src, SPAN_XENOWARNING("We aren't ready to cause more tremors yet!")) + if (!action_cooldown_check()) + return + + if (!burrower_tremor.check_state()) + return + if (!check_and_use_plasma_owner()) return - if(!check_plasma(100)) return + playsound(burrower_tremor, 'sound/effects/alien_footstep_charge3.ogg', 75, 0) + to_chat(burrower_tremor, SPAN_XENOWARNING("We dig ourselves into the ground and cause tremors.")) + burrower_tremor.create_stomp() - use_plasma(100) - playsound(loc, 'sound/effects/alien_footstep_charge3.ogg', 75, 0) - visible_message(SPAN_XENODANGER("[src] digs itself into the ground and shakes the earth itself, causing violent tremors!"), \ - SPAN_XENODANGER("We dig into the ground and shake it around, causing violent tremors!")) - create_stomp() //Adds the visual effect. Wom wom wom - used_tremor = 1 - for(var/mob/living/carbon/carbon_target in range(7, loc)) + for(var/mob/living/carbon/carbon_target in range(7, burrower_tremor)) to_chat(carbon_target, SPAN_WARNING("You struggle to remain on your feet as the ground shakes beneath your feet!")) shake_camera(carbon_target, 2, 3) - if(get_dist(loc, carbon_target) <= 3 && !src.can_not_harm(carbon_target)) + if(get_dist(burrower_tremor, carbon_target) <= 3 && !burrower_tremor.can_not_harm(carbon_target)) if(carbon_target.mob_size >= MOB_SIZE_BIG) carbon_target.apply_effect(1, SLOW) else carbon_target.apply_effect(1, WEAKEN) to_chat(carbon_target, SPAN_WARNING("The violent tremors make you lose your footing!")) - spawn(caste.tremor_cooldown) - used_tremor = 0 - to_chat(src, SPAN_NOTICE("We gather enough strength to cause tremors again.")) - for(var/X in actions) - var/datum/action/act = X - act.update_button_icon() + apply_cooldown() + return ..() diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/carrier/carrier_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/carrier/carrier_abilities.dm index 566fe0eaead8..ca721a6e22c8 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/carrier/carrier_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/carrier/carrier_abilities.dm @@ -1,7 +1,6 @@ /datum/action/xeno_action/activable/throw_hugger name = "Use/Throw Facehugger" action_icon_state = "throw_hugger" - ability_name = "throw facehugger" macro_path = /datum/action/xeno_action/verb/verb_throw_facehugger action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_3 @@ -15,7 +14,6 @@ /datum/action/xeno_action/activable/retrieve_egg name = "Retrieve Egg" action_icon_state = "retrieve_egg" - ability_name = "retrieve egg" macro_path = /datum/action/xeno_action/verb/verb_retrieve_egg action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_4 diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/crusher/crusher_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/crusher/crusher_abilities.dm index 4691d70321c3..c0d2dc5dab37 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/crusher/crusher_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/crusher/crusher_abilities.dm @@ -1,7 +1,7 @@ /datum/action/xeno_action/activable/pounce/crusher_charge name = "Charge" action_icon_state = "ready_charge" - ability_name = "charge" + action_text = "charge" macro_path = /datum/action/xeno_action/verb/verb_crusher_charge action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_1 @@ -35,7 +35,6 @@ /datum/action/xeno_action/onclick/crusher_stomp name = "Stomp" action_icon_state = "stomp" - ability_name = "stomp" macro_path = /datum/action/xeno_action/verb/verb_crusher_stomp action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_2 @@ -63,7 +62,6 @@ /datum/action/xeno_action/onclick/crusher_shield name = "Defensive Shield" action_icon_state = "empower" - ability_name = "defensive shield" macro_path = /datum/action/xeno_action/verb/verb_crusher_charge action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_3 @@ -74,7 +72,6 @@ /datum/action/xeno_action/activable/fling/charger name = "Headbutt" action_icon_state = "ram" - ability_name = "Headbutt" macro_path = /datum/action/xeno_action/verb/verb_fling action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_4 @@ -253,7 +250,6 @@ /datum/action/xeno_action/activable/tumble name = "Tumble" - ability_name = "tumble" action_icon_state = "tumble" macro_path = /datum/action/xeno_action/verb/verb_crusher_tumble action_type = XENO_ACTION_CLICK diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/defender/defender_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/defender/defender_abilities.dm index 3d940c502267..1b40dedd4e7d 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/defender/defender_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/defender/defender_abilities.dm @@ -1,7 +1,6 @@ /datum/action/xeno_action/onclick/toggle_crest name = "Toggle Crest Defense" action_icon_state = "crest_defense" - ability_name = "toggle crest defense" macro_path = /datum/action/xeno_action/verb/verb_toggle_crest action_type = XENO_ACTION_ACTIVATE xeno_cooldown = 1.5 SECONDS @@ -14,7 +13,6 @@ /datum/action/xeno_action/activable/headbutt name = "Headbutt" action_icon_state = "headbutt" - ability_name = "headbutt" macro_path = /datum/action/xeno_action/verb/verb_headbutt action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_2 @@ -30,7 +28,6 @@ /datum/action/xeno_action/onclick/tail_sweep name = "Tail Sweep" action_icon_state = "tail_sweep" - ability_name = "tail sweep" macro_path = /datum/action/xeno_action/verb/verb_tail_sweep action_type = XENO_ACTION_ACTIVATE ability_primacy = XENO_PRIMARY_ACTION_3 @@ -40,7 +37,6 @@ /datum/action/xeno_action/activable/fortify name = "Fortify" action_icon_state = "fortify" - ability_name = "fortify" macro_path = /datum/action/xeno_action/verb/verb_fortify action_type = XENO_ACTION_ACTIVATE ability_primacy = XENO_PRIMARY_ACTION_4 @@ -54,13 +50,11 @@ /datum/action/xeno_action/activable/tail_stab/slam name = "Tail Slam" - ability_name = "tail slam" blunt_stab = TRUE /datum/action/xeno_action/onclick/soak name = "Soak" action_icon_state = "soak" - ability_name = "soak" macro_path = /datum/action/xeno_action/verb/verb_soak action_type = XENO_ACTION_ACTIVATE ability_primacy = XENO_PRIMARY_ACTION_3 diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/facehugger/facehugger_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/facehugger/facehugger_abilities.dm index d60d292cba25..d5ce19d4a532 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/facehugger/facehugger_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/facehugger/facehugger_abilities.dm @@ -1,7 +1,7 @@ /datum/action/xeno_action/activable/pounce/facehugger name = "Leap" action_icon_state = "pounce" - ability_name = "leap" + action_text = "leap" macro_path = /datum/action/xeno_action/verb/verb_pounce action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_1 diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm index 5505ec9c83d7..4d65b0303704 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/general_abilities.dm @@ -18,7 +18,6 @@ /datum/action/xeno_action/onclick/plant_weeds name = "Plant Weeds (75)" - ability_name = "Plant Weeds" action_icon_state = "plant_weeds" plasma_cost = 75 macro_path = /datum/action/xeno_action/verb/verb_plant_weeds @@ -84,7 +83,6 @@ /datum/action/xeno_action/activable/secrete_resin name = "Secrete Resin" action_icon_state = "secrete_resin" - ability_name = "secrete resin" var/thick = FALSE var/make_message = TRUE macro_path = /datum/action/xeno_action/verb/verb_secrete_resin @@ -117,7 +115,6 @@ /datum/action/xeno_action/activable/info_marker name = "Mark Resin" action_icon_state = "mark" - ability_name = "mark resin" macro_path = /datum/action/xeno_action/verb/verb_mark_resin action_type = XENO_ACTION_CLICK ability_primacy = XENO_NOT_PRIMARY_ACTION @@ -138,7 +135,6 @@ /datum/action/xeno_action/activable/corrosive_acid name = "Corrosive Acid (100)" action_icon_state = "corrosive_acid" - ability_name = "corrosive acid" var/acid_plasma_cost = 100 var/level = 2 //level of the acid strength var/acid_type = /obj/effect/xenomorph/acid @@ -194,7 +190,7 @@ /datum/action/xeno_action/activable/pounce name = "Pounce" action_icon_state = "pounce" - ability_name = "pounce" + var/action_text = "pounce" macro_path = /datum/action/xeno_action/verb/verb_pounce action_type = XENO_ACTION_CLICK xeno_cooldown = 40 @@ -357,7 +353,7 @@ /datum/action/xeno_action/activable/spray_acid name = "Spray Acid" action_icon_state = "spray_acid" - ability_name = "spray acid" + var/action_text = "spray acid" macro_path = /datum/action/xeno_action/verb/verb_spray_acid action_type = XENO_ACTION_CLICK @@ -378,7 +374,6 @@ /datum/action/xeno_action/activable/transfer_plasma name = "Transfer Plasma" action_icon_state = "transfer_plasma" - ability_name = "transfer plasma" var/plasma_transfer_amount = 50 var/transfer_delay = 20 var/max_range = 2 @@ -433,7 +428,6 @@ /datum/action/xeno_action/activable/place_construction name = "Order Construction (400)" action_icon_state = "morph_resin" - ability_name = "order construction" macro_path = /datum/action/xeno_action/verb/place_construction action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_5 @@ -444,7 +438,6 @@ /datum/action/xeno_action/activable/xeno_spit name = "Xeno Spit" action_icon_state = "xeno_spit" - ability_name = "xeno spit" macro_path = /datum/action/xeno_action/verb/verb_xeno_spit action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_1 @@ -461,7 +454,6 @@ /datum/action/xeno_action/activable/bombard name = "Bombard" - ability_name = "bombard" action_icon_state = "bombard" plasma_cost = 75 macro_path = /datum/action/xeno_action/verb/verb_bombard @@ -479,7 +471,6 @@ /datum/action/xeno_action/activable/tail_stab name = "Tail Stab" action_icon_state = "tail_attack" - ability_name = "tail stab" action_type = XENO_ACTION_CLICK charge_time = 1 SECONDS xeno_cooldown = 10 SECONDS @@ -510,7 +501,6 @@ /datum/action/xeno_action/onclick/tacmap name = "View Tactical Map" action_icon_state = "toggle_queen_zoom" - ability_name = "view tacmap" var/mob/living/carbon/xenomorph/queen/tracked_queen var/hivenumber diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm index eb7ac8bde612..e8a2753cb628 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/general_powers.dm @@ -52,7 +52,7 @@ var/area/area = get_area(turf) if(isnull(area) || !(area.is_resin_allowed)) - if(area.flags_area & AREA_UNWEEDABLE) + if(!area || area.flags_area & AREA_UNWEEDABLE) to_chat(xeno, SPAN_XENOWARNING("This area is unsuited to host the hive!")) return to_chat(xeno, SPAN_XENOWARNING("It's too early to spread the hive this far.")) @@ -241,7 +241,7 @@ switch(X.build_resin(A, thick, make_message, plasma_cost != 0, build_speed_mod)) if(SECRETE_RESIN_INTERRUPT) if(xeno_cooldown) - apply_cooldown_override(xeno_cooldown * 2) + apply_cooldown_override(xeno_cooldown * 3) return FALSE if(SECRETE_RESIN_FAIL) if(xeno_cooldown) @@ -384,14 +384,14 @@ return if(!isturf(X.loc)) - to_chat(X, SPAN_XENOWARNING("We can't [ability_name] from here!")) + to_chat(X, SPAN_XENOWARNING("We can't [action_text] from here!")) return if(!X.check_state()) return if(X.legcuffed) - to_chat(X, SPAN_XENODANGER("We can't [ability_name] with that thing on our leg!")) + to_chat(X, SPAN_XENODANGER("We can't [action_text] with that thing on our leg!")) return if(!check_and_use_plasma_owner()) @@ -418,7 +418,7 @@ pre_windup_effects() if (!do_after(X, windup_duration, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE)) - to_chat(X, SPAN_XENODANGER("We cancel our [ability_name]!")) + to_chat(X, SPAN_XENODANGER("We cancel our [action_text]!")) if (!windup_interruptable) REMOVE_TRAIT(X, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Pounce")) X.anchored = FALSE @@ -430,7 +430,7 @@ X.anchored = FALSE post_windup_effects() - X.visible_message(SPAN_XENOWARNING("\The [X] [ability_name][findtext(ability_name, "e", -1) || findtext(ability_name, "p", -1) ? "s" : "es"] at [A]!"), SPAN_XENOWARNING("We [ability_name] at [A]!")) + X.visible_message(SPAN_XENOWARNING("\The [X] [action_text][findtext(action_text, "e", -1) || findtext(action_text, "p", -1) ? "s" : "es"] at [A]!"), SPAN_XENOWARNING("We [action_text] at [A]!")) pre_pounce_effects() @@ -456,7 +456,7 @@ return if(!isturf(X.loc)) - to_chat(X, SPAN_XENOWARNING("We can't [ability_name] from here!")) + to_chat(X, SPAN_XENOWARNING("We can't [action_text] from here!")) return if(!X.check_state() || X.action_busy) @@ -614,7 +614,7 @@ var/area/AR = get_area(T) if(isnull(AR) || !(AR.is_resin_allowed)) - if(AR.flags_area & AREA_UNWEEDABLE) + if(!AR || AR.flags_area & AREA_UNWEEDABLE) to_chat(X, SPAN_XENOWARNING("This area is unsuited to host the hive!")) return to_chat(X, SPAN_XENOWARNING("It's too early to spread the hive this far.")) @@ -652,19 +652,33 @@ var/datum/construction_template/xenomorph/structure_template = new structure_type() if(!spacecheck(X, T, structure_template)) + // spacecheck already cleans up the template + return FALSE + + if((choice == XENO_STRUCTURE_EGGMORPH) && locate(/obj/structure/flora/grass/tallgrass) in T) + to_chat(X, SPAN_WARNING("The tallgrass is preventing us from building the egg morpher!")) + qdel(structure_template) return FALSE if(!do_after(X, XENO_STRUCTURE_BUILD_TIME, INTERRUPT_NO_NEEDHAND|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) return FALSE if(!spacecheck(X, T, structure_template)) //doublechecking + // spacecheck already cleans up the template + return FALSE + + if(choice == XENO_STRUCTURE_CORE && AR.unoviable_timer) + to_chat(X, SPAN_WARNING("This area does not feel right for you to build this in.")) + qdel(structure_template) return FALSE if((choice == XENO_STRUCTURE_CORE) && isqueen(X) && X.hive.has_structure(XENO_STRUCTURE_CORE)) if(X.hive.hive_location.hardcore || world.time > XENOMORPH_PRE_SETUP_CUTOFF) to_chat(X, SPAN_WARNING("We can't rebuild this structure!")) + qdel(structure_template) return FALSE if(alert(X, "Are we sure that we want to move the hive and destroy the old hive core?", , "Yes", "No") != "Yes") + qdel(structure_template) return FALSE qdel(X.hive.hive_location) else if(!X.hive.can_build_structure(choice)) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/king/king_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/king/king_abilities.dm new file mode 100644 index 000000000000..d6008778b27a --- /dev/null +++ b/code/modules/mob/living/carbon/xenomorph/abilities/king/king_abilities.dm @@ -0,0 +1,52 @@ + +/// 3 x 3 damage centred on the xenomorph +/datum/action/xeno_action/onclick/rend + name = "Rend" + action_icon_state = "rav_eviscerate" + macro_path = /datum/action_xeno_action/verb/verb_rend + xeno_cooldown = 2.5 SECONDS + plasma_cost = 50 + ability_primacy = XENO_PRIMARY_ACTION_1 + + var/damage = 25 + + var/slash_sounds = list('sound/weapons/alien_claw_flesh1.ogg', 'sound/weapons/alien_claw_flesh2.ogg', 'sound/weapons/alien_claw_flesh3.ogg', 'sound/weapons/alien_claw_flesh4.ogg', 'sound/weapons/alien_claw_flesh5.ogg', 'sound/weapons/alien_claw_flesh6.ogg') + +/// Screech which puts out lights in a 7 tile radius, slows and dazes. +/datum/action/xeno_action/activable/doom + name = "Doom" + action_icon_state = "screech" + macro_path = /datum/action_xeno_action/verb/verb_doom + xeno_cooldown = 45 SECONDS + plasma_cost = 50 + ability_primacy = XENO_PRIMARY_ACTION_2 + + var/daze_length_seconds = 1 + var/slow_length_seconds = 4 + +/// Leap ability, crashing down dealing major damage to mobs and structures in the area. +/datum/action/xeno_action/activable/destroy + name = "Destroy" + action_icon_state = "charge" + macro_path = /datum/action/xeno_action/verb/verb_destroy + action_type = XENO_ACTION_ACTIVATE + xeno_cooldown = 60 SECONDS + plasma_cost = 0 + ability_primacy = XENO_PRIMARY_ACTION_3 + + var/range = 7 + var/leaping = FALSE + +/// Shield ability, limits the amount of damage from a single instance of damage to 10% of the xenomorph's max health. +/datum/action/xeno_action/onclick/king_shield + name = "Bulwark of the Hive" + action_icon_state = "soak" + macro_path = /datum/action_xeno_action/verb/king_shield + action_type = XENO_ACTION_ACTIVATE + xeno_cooldown = 60 SECONDS + plasma_cost = 0 + ability_primacy = XENO_PRIMARY_ACTION_4 + + var/shield_duration = 10 SECONDS + var/area_of_effect = 6 + var/shield_amount = 200 diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/king/king_macros.dm b/code/modules/mob/living/carbon/xenomorph/abilities/king/king_macros.dm new file mode 100644 index 000000000000..2df965861efc --- /dev/null +++ b/code/modules/mob/living/carbon/xenomorph/abilities/king/king_macros.dm @@ -0,0 +1,27 @@ +/datum/action_xeno_action/verb/verb_rend() + set category = "Alien" + set name = "Rend" + set hidden = TRUE + var/action_name = "Rend" + handle_xeno_macro(src, action_name) + +/datum/action/xeno_action/verb/verb_destroy() + set category = "Alien" + set name = "Destroy" + set hidden = TRUE + var/action_name = "Destroy" + handle_xeno_macro(src, action_name) + +/datum/action_xeno_action/verb/verb_doom() + set category = "Alien" + set name = "Doom" + set hidden = TRUE + var/action_name = "Doom" + handle_xeno_macro(src, action_name) + +/datum/action_xeno_action/verb/king_shield() + set category = "Alien" + set name = "Bulwark" + set hidden = TRUE + var/action_name = "Bulwark" + handle_xeno_macro(src, action_name) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/king/king_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/king/king_powers.dm new file mode 100644 index 000000000000..0e4459989ff4 --- /dev/null +++ b/code/modules/mob/living/carbon/xenomorph/abilities/king/king_powers.dm @@ -0,0 +1,303 @@ +/* + REND ABILITY + 3x3 aoe damage centred on the King. Basic ability, spammable, low damage. +*/ + +/datum/action/xeno_action/onclick/rend/use_ability() + var/mob/living/carbon/xenomorph/xeno = owner + XENO_ACTION_CHECK_USE_PLASMA(xeno) + + xeno.spin_circle() + xeno.emote("hiss") + for(var/mob/living/carbon/carbon in orange(1, xeno) - xeno) + + if(carbon.stat == DEAD) + continue + if(xeno.can_not_harm(carbon)) + continue + carbon.apply_armoured_damage(damage) + carbon.last_damage_data = create_cause_data(initial(xeno.name), xeno) + xeno.flick_attack_overlay(carbon, "slash") + to_chat(carbon, SPAN_DANGER("[xeno] slices into you with its razor sharp talons.")) + log_attack("[key_name(xeno)] hit [key_name(carbon)] with [name]") + playsound(carbon, pick(slash_sounds), 30, TRUE) + + xeno.visible_message(SPAN_DANGER("[xeno] slices around itself!"), SPAN_NOTICE("We slice around ourself!")) + apply_cooldown() + ..() + + + +/* + DOOM ABILITY + King channels for a while shrieks which turns off all lights in the vicinity and applies a mild daze + Medium cooldown soft CC +*/ + +/datum/action/xeno_action/activable/doom/use_ability(atom/target) + var/mob/living/carbon/xenomorph/xeno = owner + XENO_ACTION_CHECK_USE_PLASMA(xeno) + + playsound(xeno, 'sound/voice/deep_alien_screech2.ogg', 75, 0, status = 0) + xeno.visible_message(SPAN_XENOHIGHDANGER("[xeno] emits an raspy guttural roar!")) + xeno.create_shriekwave() + + var/datum/effect_system/smoke_spread/king_doom/smoke_gas = new() + smoke_gas.set_up(7, 0, get_turf(xeno), null, 6) + smoke_gas.start() + + for(var/atom/current_atom as anything in view(owner)) + if(istype(current_atom, /obj/item/device)) + var/obj/item/device/potential_lightsource = current_atom + + var/time_to_extinguish = get_dist(owner, potential_lightsource) DECISECONDS + + //Flares + if(istype(potential_lightsource, /obj/item/device/flashlight/flare)) + var/obj/item/device/flashlight/flare/flare = potential_lightsource + addtimer(CALLBACK(flare, TYPE_PROC_REF(/obj/item/device/flashlight/flare/, burn_out)), time_to_extinguish) + + //Flashlights + if(istype(potential_lightsource, /obj/item/device/flashlight)) + var/obj/item/device/flashlight/flashlight = potential_lightsource + addtimer(CALLBACK(flashlight, TYPE_PROC_REF(/obj/item/device/flashlight, turn_off_light)), time_to_extinguish) + + else if(iscarbon(current_atom)) + // "Confuse" and slow humans in the area and turn off their armour lights. + var/mob/living/carbon/carbon = current_atom + if(xeno.can_not_harm(carbon)) + continue + + carbon.EyeBlur(daze_length_seconds) + carbon.Daze(daze_length_seconds) + carbon.Superslow(slow_length_seconds) + carbon.add_client_color_matrix("doom", 99, color_matrix_multiply(color_matrix_saturation(0), color_matrix_from_string("#eeeeee"))) + carbon.overlay_fullscreen("doom", /atom/movable/screen/fullscreen/flash/noise/nvg) + addtimer(CALLBACK(carbon, TYPE_PROC_REF(/mob, remove_client_color_matrix), "doom", 1 SECONDS), 5 SECONDS) + addtimer(CALLBACK(carbon, TYPE_PROC_REF(/mob, clear_fullscreen), "doom", 0.5 SECONDS), 5 SECONDS) + + to_chat(carbon, SPAN_HIGHDANGER("[xeno]'s roar overwhelms your entire being!")) + shake_camera(carbon, 6, 1) + + if(ishuman(current_atom)) + var/mob/living/carbon/human/human = carbon + var/time_to_extinguish = get_dist(owner, human) DECISECONDS + var/obj/item/clothing/suit/suit = human.get_item_by_slot(WEAR_JACKET) + if(istype(suit, /obj/item/clothing/suit/storage/marine)) + var/obj/item/clothing/suit/storage/marine/armour = suit + addtimer(CALLBACK(armour, TYPE_PROC_REF(/atom, turn_light), null, FALSE), time_to_extinguish) + for(var/datum/reagent/x in human.reagents.reagent_list) + human.reagents.remove_reagent(x.id, 100) + + + if(!istype(current_atom, /mob/dead)) + var/power = current_atom.light_power + var/range = current_atom.light_range + if(power > 0 && range > 0) + if(current_atom.light_system != MOVABLE_LIGHT) + current_atom.set_light(l_range=0) + addtimer(CALLBACK(current_atom, TYPE_PROC_REF(/atom, set_light), range, power), 10 SECONDS) + else + current_atom.set_light_range(0) + addtimer(CALLBACK(current_atom, TYPE_PROC_REF(/atom, set_light_range), range), 10 SECONDS) + + + apply_cooldown() + ..() + +/* + BULWARK ABILITY - AoE shield + Long cooldown defensive ability, provides a shield which caps damage taken to 10% of the xeno's max health per individual source of damage. +*/ + +/datum/action/xeno_action/onclick/king_shield/use_ability() + var/mob/living/carbon/xenomorph/xeno = owner + + XENO_ACTION_CHECK_USE_PLASMA(xeno) + + + playsound(xeno.loc, 'sound/voice/deep_alien_screech.ogg', 50, 0, status = 0) + // Add our shield + start_shield(xeno) + + // Add other xeno's shields in AoE range + for(var/mob/living/carbon/xenomorph/xeno_in_aoe in range(area_of_effect, xeno)) + if(xeno_in_aoe == xeno) + continue + if(xeno_in_aoe.stat == DEAD) + continue + if(xeno_in_aoe.hivenumber != xeno.hivenumber) + continue + start_shield(xeno_in_aoe) + xeno.beam(xeno_in_aoe, "purple_lightning", time = 4 SECONDS) + + apply_cooldown() + return ..() + +/datum/action/xeno_action/onclick/king_shield/proc/start_shield(mob/living/carbon/xenomorph/xeno) + var/datum/xeno_shield/shield = xeno.add_xeno_shield(shield_amount, XENO_SHIELD_SOURCE_KING_BULWARKSPELL, /datum/xeno_shield/king_shield) + if(shield) + xeno.create_shield(shield_duration, "purple_animated_shield_full") + + +/* + DESTROY ABILITY + King leaps into the air and crashes down damaging cades and mobs in a 3x3 area centred on him. + Long cooldown high damage ability, massive damage against cades, highly telegraphed. +*/ + +#define LEAP_DIRECTION_CHANGE_RANGE 5 //the range our x has to be within to not change the direction we slam from + +/datum/action/xeno_action/activable/destroy/use_ability(atom/target) + var/mob/living/carbon/xenomorph/xeno = owner + XENO_ACTION_CHECK(xeno) + + if(get_dist(owner, target) > range) + to_chat(xeno, SPAN_XENONOTICE("We cannot leap that far!")) + return + + var/turf/target_turf = get_turf(target) + + if(!target_turf || target_turf.density) + to_chat(xeno, SPAN_XENONOTICE("We cannot leap to that!")) + return + + if(istype(target_turf, /turf/open/space)) + to_chat(xeno, SPAN_XENONOTICE("It would not be wise to try to leap there...")) + return + + if(istype(target, /obj/vehicle/multitile)) + to_chat(xeno, SPAN_XENONOTICE("It would not be wise to try to leap there...")) + return + + var/area/target_area = get_area(target_turf) + if(target_area.flags_area & AREA_NOTUNNEL) + to_chat(xeno, SPAN_XENONOTICE("We cannot leap to that area!")) + + var/list/leap_line = get_line(xeno, target) + for(var/turf/jump_turf in leap_line) + if(jump_turf.density) + to_chat(xeno, SPAN_XENONOTICE("We don't have a clear path to leap to that location!")) + return + + for(var/obj/structure/possible_blocker in jump_turf) + if(possible_blocker.density && !possible_blocker.throwpass) + to_chat(xeno, SPAN_XENONOTICE("There's something blocking us from leaping.")) + return + + if(!check_and_use_plasma_owner()) + to_chat(xeno, SPAN_XENONOTICE("We don't have enough plasma to use [name].")) + return + + var/turf/template_turf = get_step(target_turf, SOUTHWEST) + + to_chat(xeno, SPAN_XENONOTICE("Our muscles tense as we prepare ourself for a giant leap.")) + xeno.make_jittery(2 SECONDS) + if(!do_after(xeno, 2 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE)) + to_chat(xeno, SPAN_XENONOTICE("We relax our muslces and end our leap.")) + return + if(leaping || !target) + return + // stop target movement + leaping = TRUE + ADD_TRAIT(owner, TRAIT_UNDENSE, "Destroy") + ADD_TRAIT(owner, TRAIT_IMMOBILIZED, "Destroy") + owner.visible_message(SPAN_WARNING("[owner] takes a giant leap into the air!")) + + var/negative + var/initial_x = owner.x + if(target.x < initial_x) //if the target's x is lower than ours, go to the left + negative = TRUE + else if(target.x > initial_x) + negative = FALSE + else if(target.x == initial_x) //if their x is the same, pick a direction + negative = prob(50) + + owner.face_atom(target) + owner.emote("roar") + + //Initial visual + var/obj/effect/king_leap/leap_visual = new(owner.loc, negative, owner.dir) + new /obj/effect/xenomorph/xeno_telegraph/king_attack_template(template_turf, 20) + + negative = !negative //invert it for the descent later + + var/oldtransform = owner.transform + owner.alpha = 255 + animate(owner, alpha = 0, transform = matrix()*0.9, time = 3, easing = BOUNCE_EASING) + for(var/i in 1 to 3) + sleep(1 DECISECONDS) + if(QDELETED(owner) || owner.stat == DEAD) //we got hit and died, rip us + + //Initial effect + qdel(leap_visual) + + if(owner.stat == DEAD) + leaping = FALSE + animate(owner, alpha = 255, transform = oldtransform, time = 0, flags = ANIMATION_END_NOW) //reset immediately + return + + owner.mouse_opacity = MOUSE_OPACITY_TRANSPARENT + SLEEP_CHECK_DEATH(7, owner) + + while(target_turf && owner.loc != target_turf) + owner.forceMove(get_step(owner, get_dir(owner, target_turf))) + SLEEP_CHECK_DEATH(0.5, owner) + + animate(owner, alpha = 100, transform = matrix()*0.7, time = 7) + var/descentTime = 5 + + if(negative) + if(ISINRANGE(owner.x, initial_x + 1, initial_x + LEAP_DIRECTION_CHANGE_RANGE)) + negative = FALSE + else + if(ISINRANGE(owner.x, initial_x - LEAP_DIRECTION_CHANGE_RANGE, initial_x - 1)) + negative = TRUE + + new /obj/effect/king_leap/end(owner.loc, negative, owner.dir) + + SLEEP_CHECK_DEATH(descentTime, owner) + animate(owner, alpha = 255, transform = oldtransform, descentTime) + owner.mouse_opacity = initial(owner.mouse_opacity) + playsound(owner.loc, 'sound/effects/meteorimpact.ogg', 200, TRUE) + + /// Effects for landing + new /obj/effect/heavy_impact(owner.loc) + for(var/step in CARDINAL_ALL_DIRS) + new /obj/effect/heavy_impact(get_step(owner.loc, step)) + + // Actual Damaging Effects - Add stuff for cades - NEED TELEGRAPHS NEED EFFECTS + + // Mobs first high damage and knockback away from centre + for(var/mob/living/carbon/carbon in orange(1, owner) - owner) + if(xeno.can_not_harm(carbon)) + continue + + log_attack("[key_name(xeno)] hit [key_name(carbon)] with [name]") + carbon.gib() + + // Any items get thrown away + for(var/obj/item/item in orange(1, owner)) + if(!QDELETED(item)) + var/throw_dir = get_dir(owner, item) + if(item.loc == owner.loc) + throw_dir = pick(GLOB.alldirs) + var/throwtarget = get_edge_target_turf(owner, throw_dir) + item.throw_atom(throwtarget, 2, SPEED_REALLY_FAST, owner, TRUE) + + for(var/obj/structure/structure in orange(1, owner)) + structure.ex_act(1000, get_dir(owner, structure)) + + for(var/mob/living in range(7, owner)) + shake_camera(living, 15, 1) + + REMOVE_TRAIT(owner, TRAIT_UNDENSE, "Destroy") + REMOVE_TRAIT(owner, TRAIT_IMMOBILIZED, "Destroy") + + SLEEP_CHECK_DEATH(1, owner) + leaping = FALSE + apply_cooldown() + ..() + +/datum/action/xeno_action/activable/destroy/proc/second_template(turf/template_turf) + new /obj/effect/xenomorph/xeno_telegraph/king_attack_template(template_turf, 10) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_abilities.dm index 17677c8427af..d4fb390f14f9 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/lurker/lurker_abilities.dm @@ -14,7 +14,6 @@ /datum/action/xeno_action/onclick/lurker_invisibility name = "Turn Invisible" action_icon_state = "lurker_invisibility" - ability_name = "turn invisible" macro_path = /datum/action/xeno_action/verb/verb_lurker_invisibility ability_primacy = XENO_PRIMARY_ACTION_2 action_type = XENO_ACTION_CLICK @@ -29,7 +28,6 @@ /datum/action/xeno_action/onclick/lurker_assassinate name = "Crippling Strike" action_icon_state = "lurker_inject_neuro" - ability_name = "crippling strike" macro_path = /datum/action/xeno_action/verb/verb_crippling_strike ability_primacy = XENO_PRIMARY_ACTION_3 action_type = XENO_ACTION_ACTIVATE @@ -43,7 +41,7 @@ /datum/action/xeno_action/activable/pounce/rush name = "Rush" action_icon_state = "pounce" - ability_name = "rush" + action_text = "rush" macro_path = /datum/action/xeno_action/verb/verb_rush ability_primacy = XENO_PRIMARY_ACTION_1 action_type = XENO_ACTION_CLICK @@ -58,7 +56,6 @@ /datum/action/xeno_action/activable/flurry name = "Flurry" action_icon_state = "rav_spike" - ability_name = "flurry" macro_path = /datum/action/xeno_action/verb/verb_flurry ability_primacy = XENO_PRIMARY_ACTION_2 action_type = XENO_ACTION_CLICK @@ -67,7 +64,6 @@ /datum/action/xeno_action/activable/tail_jab name = "Tail Jab" action_icon_state = "prae_pierce" - ability_name = "tail jab" macro_path = /datum/action/xeno_action/verb/verb_tail_jab ability_primacy = XENO_PRIMARY_ACTION_3 action_type = XENO_ACTION_CLICK @@ -76,7 +72,6 @@ /datum/action/xeno_action/activable/headbite name = "Headbite" action_icon_state = "headbite" - ability_name = "headbite" macro_path = /datum/action/xeno_action/verb/verb_headbite ability_primacy = XENO_PRIMARY_ACTION_4 action_type = XENO_ACTION_CLICK diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_abilities.dm index 4fe0e9107995..9b84355407ef 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_abilities.dm @@ -6,7 +6,6 @@ /datum/action/xeno_action/activable/pierce name = "Pierce" action_icon_state = "prae_pierce" - ability_name = "pierce" macro_path = /datum/action/xeno_action/verb/verb_pierce action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_1 @@ -21,7 +20,7 @@ /datum/action/xeno_action/activable/pounce/prae_dash name = "Dash" action_icon_state = "prae_dash" - ability_name = "dash" + action_text = "dash" macro_path = /datum/action/xeno_action/verb/verb_dash action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_2 @@ -47,7 +46,6 @@ /datum/action/xeno_action/activable/cleave name = "Cleave" action_icon_state = "prae_cleave_action" - ability_name = "cleave" macro_path = /datum/action/xeno_action/verb/verb_cleave ability_primacy = XENO_PRIMARY_ACTION_3 action_type = XENO_ACTION_CLICK @@ -111,7 +109,6 @@ /datum/action/xeno_action/activable/tail_stab/tail_seize //no verbmacrohotkey, its just tail stab. name = "Tail Seize" action_icon_state = "tail_seize" - ability_name = "tail seize" action_type = XENO_ACTION_CLICK charge_time = 0.5 SECONDS xeno_cooldown = 15 SECONDS @@ -120,7 +117,6 @@ /datum/action/xeno_action/activable/prae_abduct name = "Abduct" action_icon_state = "abduct" - ability_name = "abduct" macro_path = /datum/action/xeno_action/verb/verb_prae_abduct ability_primacy = XENO_PRIMARY_ACTION_1 action_type = XENO_ACTION_CLICK @@ -134,7 +130,6 @@ /datum/action/xeno_action/activable/oppressor_punch name = "Dislocate" action_icon_state = "punch" - ability_name = "dislocate" macro_path = /datum/action/xeno_action/verb/verb_oppressor_punch action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_2 @@ -150,7 +145,7 @@ /*datum/action/xeno_action/onclick/crush name = "Crush" action_icon_state = "prae_crush" - ability_name = "crush" + action_text = "crush" macro_path = /datum/action/xeno_action/verb/verb_crush action_type = XENO_ACTION_ACTIVATE xeno_cooldown = 100 @@ -160,7 +155,6 @@ /datum/action/xeno_action/activable/tail_lash name = "Tail Lash" action_icon_state = "prae_tail_lash" - ability_name = "tail lash" macro_path = /datum/action/xeno_action/verb/verb_crush ability_primacy = XENO_PRIMARY_ACTION_3 action_type = XENO_ACTION_CLICK @@ -176,7 +170,6 @@ /datum/action/xeno_action/activable/prae_impale name = "Impale" action_icon_state = "prae_impale" - ability_name = "impale" macro_path = /datum/action/xeno_action/verb/verb_prae_impale ability_primacy = XENO_PRIMARY_ACTION_1 action_type = XENO_ACTION_CLICK @@ -186,7 +179,6 @@ /datum/action/xeno_action/onclick/prae_dodge name = "Dodge" action_icon_state = "prae_dodge" - ability_name = "dodge" macro_path = /datum/action/xeno_action/verb/verb_prae_dodge ability_primacy = XENO_PRIMARY_ACTION_2 action_type = XENO_ACTION_CLICK @@ -200,7 +192,6 @@ /datum/action/xeno_action/activable/prae_tail_trip name = "Tail Trip" action_icon_state = "prae_tail_trip" - ability_name = "tail trip" macro_path = /datum/action/xeno_action/verb/verb_prae_tail_trip ability_primacy = XENO_PRIMARY_ACTION_3 action_type = XENO_ACTION_CLICK @@ -220,7 +211,7 @@ /datum/action/xeno_action/activable/pounce/base_prae_dash name = "Dash" action_icon_state = "prae_dash" - ability_name = "dash" + action_text = "dash" macro_path = /datum/action/xeno_action/verb/verb_dash action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_2 @@ -236,7 +227,6 @@ /datum/action/xeno_action/activable/prae_acid_ball name = "Acid Ball" action_icon_state = "prae_acid_ball" - ability_name = "acid ball" macro_path = /datum/action/xeno_action/verb/verb_acid_ball action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_3 @@ -249,7 +239,6 @@ /datum/action/xeno_action/activable/spray_acid/base_prae_spray_acid name = "Spray Acid" action_icon_state = "spray_acid" - ability_name = "spray acid" macro_path = /datum/action/xeno_action/verb/verb_spray_acid action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_4 @@ -284,7 +273,6 @@ /datum/action/xeno_action/activable/warden_heal name = "Aid Xenomorph" action_icon_state = "prae_aid" - ability_name = "aid" // todo: macro action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_3 @@ -349,7 +337,6 @@ /datum/action/xeno_action/activable/prae_retrieve name = "Retrieve" action_icon_state = "retrieve" - ability_name = "retrieve" macro_path = /datum/action/xeno_action/verb/verb_prae_retrieve ability_primacy = XENO_PRIMARY_ACTION_4 action_type = XENO_ACTION_CLICK diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm index 3cbf0769514f..c1883008f7a9 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/praetorian/praetorian_powers.dm @@ -1,19 +1,19 @@ /datum/action/xeno_action/activable/pierce/use_ability(atom/targetted_atom) - var/mob/living/carbon/xenomorph/source_xeno = owner + var/mob/living/carbon/xenomorph/pierce_user = owner if (!action_cooldown_check()) return - if (!source_xeno.check_state()) + if (!pierce_user.check_state()) return - if(!targetted_atom || targetted_atom.layer >= FLY_LAYER || !isturf(source_xeno.loc)) + if(!targetted_atom || targetted_atom.layer >= FLY_LAYER || !isturf(pierce_user.loc)) return if (!check_and_use_plasma_owner()) return //X = xeno user, A = target atom - var/list/turf/target_turfs = get_line(source_xeno, targetted_atom, include_start_atom = FALSE) + var/list/turf/target_turfs = get_line(pierce_user, targetted_atom, include_start_atom = FALSE) var/length_of_line = LAZYLEN(target_turfs) if(length_of_line > 3) target_turfs = target_turfs.Copy(1, 4) @@ -46,20 +46,20 @@ //Check for mobs and add them to our target list for damage if(iscarbon(path_content)) var/mob/living/carbon/mob_to_act = path_content - if(!isxeno_human(mob_to_act) || source_xeno.can_not_harm(mob_to_act)) + if(!isxeno_human(mob_to_act) || pierce_user.can_not_harm(mob_to_act)) continue if(!(mob_to_act in target_mobs)) target_mobs += mob_to_act - source_xeno.visible_message(SPAN_XENODANGER("[source_xeno] slashes its claws through the area in front of it!"), SPAN_XENODANGER("We slash our claws through the area in front of us!")) - source_xeno.animation_attack_on(targetted_atom, 15) + pierce_user.visible_message(SPAN_XENODANGER("[pierce_user] slashes its claws through the area in front of it!"), SPAN_XENODANGER("We slash our claws through the area in front of us!")) + pierce_user.animation_attack_on(targetted_atom, 15) - source_xeno.emote("roar") + pierce_user.emote("roar") // Loop through our mob list, finding any humans there and dealing damage to them for (var/mob/living/carbon/current_mob in target_mobs) - if (!isxeno_human(current_mob) || source_xeno.can_not_harm(current_mob)) + if (!isxeno_human(current_mob) || pierce_user.can_not_harm(current_mob)) continue if (current_mob.stat == DEAD) @@ -70,7 +70,7 @@ playsound(current_mob, 'sound/weapons/alien_tail_attack.ogg', 30, TRUE) if (length(target_mobs) >= shield_regen_threshold) - var/datum/behavior_delegate/praetorian_vanguard/behavior = source_xeno.behavior_delegate + var/datum/behavior_delegate/praetorian_vanguard/behavior = pierce_user.behavior_delegate if (istype(behavior)) behavior.regen_shield() @@ -101,78 +101,78 @@ return /datum/action/xeno_action/activable/pounce/prae_dash/proc/damage_nearby_targets() - var/mob/living/carbon/xenomorph/X = owner + var/mob/living/carbon/xenomorph/dash_user = owner - if (QDELETED(X) || !X.check_state()) + if (QDELETED(dash_user) || !dash_user.check_state()) return activated_once = FALSE - button.icon_state = X.selected_ability == src ? "template_on" : "template" + button.icon_state = dash_user.selected_ability == src ? "template_on" : "template" var/list/target_mobs = list() - var/list/L = orange(1, X) + var/list/L = orange(1, dash_user) for (var/mob/living/carbon/H in L) - if (!isxeno_human(H) || X.can_not_harm(H)) + if (!isxeno_human(H) || dash_user.can_not_harm(H)) continue if (!(H in target_mobs)) target_mobs += H - X.visible_message(SPAN_XENODANGER("[X] slashes its claws through the area around it!"), SPAN_XENODANGER("We slash our claws through the area around us!")) - X.spin_circle() + dash_user.visible_message(SPAN_XENODANGER("[dash_user] slashes its claws through the area around it!"), SPAN_XENODANGER("We slash our claws through the area around us!")) + dash_user.spin_circle() for (var/mob/living/carbon/H in target_mobs) if (H.stat) continue - if (!isxeno_human(H) || X.can_not_harm(H)) + if (!isxeno_human(H) || dash_user.can_not_harm(H)) continue - X.flick_attack_overlay(H, "slash") + dash_user.flick_attack_overlay(H, "slash") H.apply_armoured_damage(get_xeno_damage_slash(H, damage), ARMOR_MELEE, BRUTE) playsound(get_turf(H), "alien_claw_flesh", 30, 1) if (length(target_mobs) >= shield_regen_threshold) - var/datum/behavior_delegate/praetorian_vanguard/behavior = X.behavior_delegate + var/datum/behavior_delegate/praetorian_vanguard/behavior = dash_user.behavior_delegate if (istype(behavior)) behavior.regen_shield() /datum/action/xeno_action/activable/cleave/use_ability(atom/target_atom) - var/mob/living/carbon/xenomorph/vanguard_user = owner + var/mob/living/carbon/xenomorph/cleave_user = owner if (!action_cooldown_check()) return - if (!vanguard_user.check_state()) + if (!cleave_user.check_state()) return if (!check_and_use_plasma_owner()) return - if (!isxeno_human(target_atom) || vanguard_user.can_not_harm(target_atom)) - to_chat(vanguard_user, SPAN_XENODANGER("We must target a hostile!")) + if (!isxeno_human(target_atom) || cleave_user.can_not_harm(target_atom)) + to_chat(cleave_user, SPAN_XENODANGER("We must target a hostile!")) return var/mob/living/carbon/target_carbon = target_atom - if (!vanguard_user.Adjacent(target_carbon)) - to_chat(vanguard_user, SPAN_XENOWARNING("We must be adjacent to our target!")) + if (!cleave_user.Adjacent(target_carbon)) + to_chat(cleave_user, SPAN_XENOWARNING("We must be adjacent to our target!")) return if (target_carbon.stat == DEAD) - to_chat(vanguard_user, SPAN_XENODANGER("[target_carbon] is dead, why would we want to touch it?")) + to_chat(cleave_user, SPAN_XENODANGER("[target_carbon] is dead, why would we want to touch it?")) return // Flick overlay and play sound - vanguard_user.face_atom(target_carbon) - vanguard_user.animation_attack_on(target_atom, 10) + cleave_user.face_atom(target_carbon) + cleave_user.animation_attack_on(target_atom, 10) var/hitsound = pick('sound/weapons/punch1.ogg','sound/weapons/punch2.ogg','sound/weapons/punch3.ogg','sound/weapons/punch4.ogg') playsound(target_carbon,hitsound, 50, 1) if (root_toggle) var/root_duration = buffed ? root_duration_buffed : root_duration_unbuffed - vanguard_user.visible_message(SPAN_XENODANGER("[vanguard_user] slams [target_atom] into the ground!"), SPAN_XENOHIGHDANGER("We slam [target_atom] into the ground!")) + cleave_user.visible_message(SPAN_XENODANGER("[cleave_user] slams [target_atom] into the ground!"), SPAN_XENOHIGHDANGER("We slam [target_atom] into the ground!")) ADD_TRAIT(target_carbon, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Cleave")) if (ishuman(target_carbon)) @@ -180,17 +180,17 @@ Hu.update_xeno_hostile_hud() addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(unroot_human), target_carbon, TRAIT_SOURCE_ABILITY("Cleave")), get_xeno_stun_duration(target_carbon, root_duration)) - to_chat(target_carbon, SPAN_XENOHIGHDANGER("[vanguard_user] has pinned you to the ground! You cannot move!")) - vanguard_user.flick_attack_overlay(target_carbon, "punch") + to_chat(target_carbon, SPAN_XENOHIGHDANGER("[cleave_user] has pinned you to the ground! You cannot move!")) + cleave_user.flick_attack_overlay(target_carbon, "punch") else var/fling_distance = buffed ? fling_dist_buffed : fling_dist_unbuffed if(target_carbon.mob_size >= MOB_SIZE_BIG) fling_distance *= 0.1 - vanguard_user.visible_message(SPAN_XENODANGER("[vanguard_user] deals [target_atom] a massive blow, sending them flying!"), SPAN_XENOHIGHDANGER("We deal [target_atom] a massive blow, sending them flying!")) - vanguard_user.flick_attack_overlay(target_carbon, "slam") - vanguard_user.throw_carbon(target_atom, null, fling_distance) + cleave_user.visible_message(SPAN_XENODANGER("[cleave_user] deals [target_atom] a massive blow, sending them flying!"), SPAN_XENOHIGHDANGER("We deal [target_atom] a massive blow, sending them flying!")) + cleave_user.flick_attack_overlay(target_carbon, "slam") + cleave_user.throw_carbon(target_atom, null, fling_distance) apply_cooldown() return ..() @@ -232,15 +232,15 @@ return ..() /datum/action/xeno_action/activable/prae_abduct/use_ability(atom/atom) - var/mob/living/carbon/xenomorph/xeno = owner + var/mob/living/carbon/xenomorph/abduct_user = owner - if(!atom || atom.layer >= FLY_LAYER || !isturf(xeno.loc)) + if(!atom || atom.layer >= FLY_LAYER || !isturf(abduct_user.loc)) return - if(!action_cooldown_check() || xeno.action_busy) + if(!action_cooldown_check() || abduct_user.action_busy) return - if(!xeno.check_state()) + if(!abduct_user.check_state()) return if(!check_plasma_owner()) @@ -249,9 +249,9 @@ // Build our turflist var/list/turf/turflist = list() var/list/telegraph_atom_list = list() - var/facing = get_dir(xeno, atom) - var/turf/turf = xeno.loc - var/turf/temp = xeno.loc + var/facing = get_dir(abduct_user, atom) + var/turf/turf = abduct_user.loc + var/turf/temp = abduct_user.loc for(var/distance in 0 to max_distance) temp = get_step(turf, facing) if(facing in GLOB.diagonals) // check if it goes through corners @@ -281,58 +281,58 @@ telegraph_atom_list += new /obj/effect/xenomorph/xeno_telegraph/abduct_hook(turf, windup) if(!length(turflist)) - to_chat(xeno, SPAN_XENOWARNING("We don't have any room to do our abduction!")) + to_chat(abduct_user, SPAN_XENOWARNING("We don't have any room to do our abduction!")) return - xeno.visible_message(SPAN_XENODANGER("\The [xeno]'s segmented tail starts coiling..."), SPAN_XENODANGER("We begin coiling our tail, aiming towards \the [atom]...")) - xeno.emote("roar") + abduct_user.visible_message(SPAN_XENODANGER("\The [abduct_user]'s segmented tail starts coiling..."), SPAN_XENODANGER("We begin coiling our tail, aiming towards \the [atom]...")) + abduct_user.emote("roar") - var/throw_target_turf = get_step(xeno.loc, facing) + var/throw_target_turf = get_step(abduct_user.loc, facing) - ADD_TRAIT(xeno, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Abduct")) - if(!do_after(xeno, windup, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE, numticks = 1)) - to_chat(xeno, SPAN_XENOWARNING("You relax your tail.")) + ADD_TRAIT(abduct_user, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Abduct")) + if(!do_after(abduct_user, windup, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE, numticks = 1)) + to_chat(abduct_user, SPAN_XENOWARNING("You relax your tail.")) apply_cooldown() for (var/obj/effect/xenomorph/xeno_telegraph/xenotelegraph in telegraph_atom_list) telegraph_atom_list -= xenotelegraph qdel(xenotelegraph) - REMOVE_TRAIT(xeno, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Abduct")) + REMOVE_TRAIT(abduct_user, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Abduct")) return if(!check_and_use_plasma_owner()) return - REMOVE_TRAIT(xeno, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Abduct")) + REMOVE_TRAIT(abduct_user, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Abduct")) - playsound(get_turf(xeno), 'sound/effects/bang.ogg', 25, 0) - xeno.visible_message(SPAN_XENODANGER("\The [xeno] suddenly uncoils its tail, firing it towards [atom]!"), SPAN_XENODANGER("We uncoil our tail, sending it out towards \the [atom]!")) + playsound(get_turf(abduct_user), 'sound/effects/bang.ogg', 25, 0) + abduct_user.visible_message(SPAN_XENODANGER("\The [abduct_user] suddenly uncoils its tail, firing it towards [atom]!"), SPAN_XENODANGER("We uncoil our tail, sending it out towards \the [atom]!")) var/list/targets = list() for (var/turf/target_turf in turflist) for (var/mob/living/carbon/target in target_turf) - if(!isxeno_human(target) || xeno.can_not_harm(target) || target.is_dead() || target.is_mob_incapacitated(TRUE) || target.mob_size >= MOB_SIZE_BIG) + if(!isxeno_human(target) || abduct_user.can_not_harm(target) || target.is_dead() || target.is_mob_incapacitated(TRUE) || target.mob_size >= MOB_SIZE_BIG) continue targets += target if (LAZYLEN(targets) == 1) - xeno.balloon_alert(xeno, "our tail catches and slows one target!", text_color = "#51a16c") + abduct_user.balloon_alert(abduct_user, "our tail catches and slows one target!", text_color = "#51a16c") else if (LAZYLEN(targets) == 2) - xeno.balloon_alert(xeno, "our tail catches and roots two targets!", text_color = "#51a16c") + abduct_user.balloon_alert(abduct_user, "our tail catches and roots two targets!", text_color = "#51a16c") else if (LAZYLEN(targets) >= 3) - xeno.balloon_alert(xeno, "our tail catches and stuns [LAZYLEN(targets)] targets!", text_color = "#51a16c") + abduct_user.balloon_alert(abduct_user, "our tail catches and stuns [LAZYLEN(targets)] targets!", text_color = "#51a16c") apply_cooldown() for (var/mob/living/carbon/target in targets) - xeno.visible_message(SPAN_XENODANGER("\The [xeno]'s hooked tail coils itself around [target]!"), SPAN_XENODANGER("Our hooked tail coils itself around [target]!")) + abduct_user.visible_message(SPAN_XENODANGER("\The [abduct_user]'s hooked tail coils itself around [target]!"), SPAN_XENODANGER("Our hooked tail coils itself around [target]!")) target.apply_effect(0.2, WEAKEN) if (LAZYLEN(targets) == 1) - new /datum/effects/xeno_slow(target, xeno, , ,25) + new /datum/effects/xeno_slow(target, abduct_user, , ,25) target.apply_effect(1, SLOW) else if (LAZYLEN(targets) == 2) ADD_TRAIT(target, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Abduct")) @@ -340,17 +340,17 @@ var/mob/living/carbon/human/target_human = target target_human.update_xeno_hostile_hud() addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(unroot_human), target, TRAIT_SOURCE_ABILITY("Abduct")), get_xeno_stun_duration(target, 25)) - to_chat(target, SPAN_XENOHIGHDANGER("[xeno] has pinned you to the ground! You cannot move!")) + to_chat(target, SPAN_XENOHIGHDANGER("[abduct_user] has pinned you to the ground! You cannot move!")) target.set_effect(2, DAZE) else if (LAZYLEN(targets) >= 3) target.apply_effect(get_xeno_stun_duration(target, 1.3), WEAKEN) - to_chat(target, SPAN_XENOHIGHDANGER("You are slammed into the other victims of [xeno]!")) + to_chat(target, SPAN_XENOHIGHDANGER("You are slammed into the other victims of [abduct_user]!")) shake_camera(target, 10, 1) - var/obj/effect/beam/tail_beam = xeno.beam(target, "oppressor_tail", 'icons/effects/beam.dmi', 0.5 SECONDS, 8) + var/obj/effect/beam/tail_beam = abduct_user.beam(target, "oppressor_tail", 'icons/effects/beam.dmi', 0.5 SECONDS, 8) var/image/tail_image = image('icons/effects/status_effects.dmi', "hooked") target.overlays += tail_image @@ -429,12 +429,12 @@ return ..() /datum/action/xeno_action/activable/tail_lash/use_ability(atom/A) - var/mob/living/carbon/xenomorph/X = owner + var/mob/living/carbon/xenomorph/lash_user = owner - if (!istype(X) || !X.check_state() || !action_cooldown_check()) + if (!istype(lash_user) || !lash_user.check_state() || !action_cooldown_check()) return - if(!A || A.layer >= FLY_LAYER || !isturf(X.loc)) + if(!A || A.layer >= FLY_LAYER || !isturf(lash_user.loc)) return if (!check_plasma_owner()) @@ -446,8 +446,8 @@ var/list/telegraph_atom_list = list() // Code to get a 2x3 area of turfs - var/turf/root = get_turf(X) - var/facing = Get_Compass_Dir(X, A) + var/turf/root = get_turf(lash_user) + var/facing = Get_Compass_Dir(lash_user, A) var/turf/infront = get_step(root, facing) var/turf/left = get_step(root, turn(facing, 90)) var/turf/right = get_step(root, turn(facing, -90)) @@ -477,11 +477,11 @@ telegraph_atom_list += new /obj/effect/xenomorph/xeno_telegraph/lash(next_turf, windup) if(!length(target_turfs)) - to_chat(X, SPAN_XENOWARNING("We don't have any room to do our tail lash!")) + to_chat(lash_user, SPAN_XENOWARNING("We don't have any room to do our tail lash!")) return - if(!do_after(X, windup, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE)) - to_chat(X, SPAN_XENOWARNING("We cancel our tail lash.")) + if(!do_after(lash_user, windup, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE)) + to_chat(lash_user, SPAN_XENOWARNING("We cancel our tail lash.")) for(var/obj/effect/xenomorph/xeno_telegraph/XT in telegraph_atom_list) telegraph_atom_list -= XT @@ -493,25 +493,25 @@ apply_cooldown() - X.visible_message(SPAN_XENODANGER("[X] lashes its tail furiously, hitting everything in front of it!"), SPAN_XENODANGER("We lash our tail furiously, hitting everything in front of us!")) - X.spin_circle() - X.emote("tail") + lash_user.visible_message(SPAN_XENODANGER("[lash_user] lashes its tail furiously, hitting everything in front of it!"), SPAN_XENODANGER("We lash our tail furiously, hitting everything in front of us!")) + lash_user.spin_circle() + lash_user.emote("tail") for (var/turf/T in target_turfs) for (var/mob/living/carbon/H in T) if (H.stat == DEAD) continue - if(!isxeno_human(H) || X.can_not_harm(H)) + if(!isxeno_human(H) || lash_user.can_not_harm(H)) continue if(H.mob_size >= MOB_SIZE_BIG) continue - X.throw_carbon(H, facing, fling_dist) + lash_user.throw_carbon(H, facing, fling_dist) H.apply_effect(get_xeno_stun_duration(H, 0.5), WEAKEN) - new /datum/effects/xeno_slow(H, X, ttl = get_xeno_stun_duration(H, 25)) + new /datum/effects/xeno_slow(H, lash_user, ttl = get_xeno_stun_duration(H, 25)) return ..() @@ -584,27 +584,27 @@ return ..() /datum/action/xeno_action/onclick/prae_dodge/use_ability(atom/target) - var/mob/living/carbon/xenomorph/xeno = owner + var/mob/living/carbon/xenomorph/dodge_user = owner if (!action_cooldown_check()) return - if (!istype(xeno) || !xeno.check_state()) + if (!istype(dodge_user) || !dodge_user.check_state()) return if (!check_and_use_plasma_owner()) return - var/datum/behavior_delegate/praetorian_dancer/behavior = xeno.behavior_delegate + var/datum/behavior_delegate/praetorian_dancer/behavior = dodge_user.behavior_delegate if (!istype(behavior)) return behavior.dodge_activated = TRUE button.icon_state = "template_active" - to_chat(xeno, SPAN_XENOHIGHDANGER("We can now dodge through mobs!")) - xeno.speed_modifier -= speed_buff_amount - xeno.add_temp_pass_flags(PASS_MOB_THRU) - xeno.recalculate_speed() + to_chat(dodge_user, SPAN_XENOHIGHDANGER("We can now dodge through mobs!")) + dodge_user.speed_modifier -= speed_buff_amount + dodge_user.add_temp_pass_flags(PASS_MOB_THRU) + dodge_user.recalculate_speed() addtimer(CALLBACK(src, PROC_REF(remove_effects)), duration) @@ -612,22 +612,22 @@ return ..() /datum/action/xeno_action/onclick/prae_dodge/proc/remove_effects() - var/mob/living/carbon/xenomorph/xeno = owner + var/mob/living/carbon/xenomorph/dodge_remove = owner - if (!istype(xeno)) + if (!istype(dodge_remove)) return - var/datum/behavior_delegate/praetorian_dancer/behavior = xeno.behavior_delegate + var/datum/behavior_delegate/praetorian_dancer/behavior = dodge_remove.behavior_delegate if (!istype(behavior)) return if (behavior.dodge_activated) behavior.dodge_activated = FALSE button.icon_state = "template" - xeno.speed_modifier += speed_buff_amount - xeno.remove_temp_pass_flags(PASS_MOB_THRU) - xeno.recalculate_speed() - to_chat(xeno, SPAN_XENOHIGHDANGER("We can no longer dodge through mobs!")) + dodge_remove.speed_modifier += speed_buff_amount + dodge_remove.remove_temp_pass_flags(PASS_MOB_THRU) + dodge_remove.recalculate_speed() + to_chat(dodge_remove, SPAN_XENOHIGHDANGER("We can no longer dodge through mobs!")) /datum/action/xeno_action/activable/prae_tail_trip/use_ability(atom/target_atom) var/mob/living/carbon/xenomorph/dancer_user = owner @@ -722,8 +722,8 @@ return ..() /datum/action/xeno_action/activable/prae_acid_ball/use_ability(atom/A) - var/mob/living/carbon/xenomorph/X = owner - if (!X.check_state() || X.action_busy) + var/mob/living/carbon/xenomorph/acidball_user = owner + if (!acidball_user.check_state() || acidball_user.action_busy) return if (!action_cooldown_check()) @@ -731,55 +731,55 @@ if (!check_and_use_plasma_owner()) return - var/turf/current_turf = get_turf(X) + var/turf/current_turf = get_turf(acidball_user) if (!current_turf) return - if (!do_after(X, activation_delay, INTERRUPT_ALL | BEHAVIOR_IMMOBILE, BUSY_ICON_HOSTILE)) - to_chat(X, SPAN_XENODANGER("We cancel our acid ball.")) + if (!do_after(acidball_user, activation_delay, INTERRUPT_ALL | BEHAVIOR_IMMOBILE, BUSY_ICON_HOSTILE)) + to_chat(acidball_user, SPAN_XENODANGER("We cancel our acid ball.")) return apply_cooldown() - to_chat(X, SPAN_XENOWARNING("We lob a compressed ball of acid into the air!")) + to_chat(acidball_user, SPAN_XENOWARNING("We lob a compressed ball of acid into the air!")) var/obj/item/explosive/grenade/xeno_acid_grenade/grenade = new /obj/item/explosive/grenade/xeno_acid_grenade - grenade.cause_data = create_cause_data(initial(X.caste_type), X) - grenade.forceMove(get_turf(X)) - grenade.throw_atom(A, 5, SPEED_SLOW, X, TRUE) + grenade.cause_data = create_cause_data(initial(acidball_user.caste_type), acidball_user) + grenade.forceMove(get_turf(acidball_user)) + grenade.throw_atom(A, 5, SPEED_SLOW, acidball_user, TRUE) addtimer(CALLBACK(grenade, TYPE_PROC_REF(/obj/item/explosive, prime)), prime_delay) return ..() /datum/action/xeno_action/activable/warden_heal/use_ability(atom/A) - var/mob/living/carbon/xenomorph/X = owner - if (!istype(X)) + var/mob/living/carbon/xenomorph/wardenbuff_user = owner + if (!istype(wardenbuff_user)) return if (!action_cooldown_check()) return - if(!A || A.layer >= FLY_LAYER || !isturf(X.loc) || !X.check_state(TRUE)) + if(!A || A.layer >= FLY_LAYER || !isturf(wardenbuff_user.loc) || !wardenbuff_user.check_state(TRUE)) return - if (!isxeno(A) || !X.can_not_harm(A)) - to_chat(X, SPAN_XENODANGER("We must target one of our sisters!")) + if (!isxeno(A) || !wardenbuff_user.can_not_harm(A)) + to_chat(wardenbuff_user, SPAN_XENODANGER("We must target one of our sisters!")) return - if (A == X) - to_chat(X, SPAN_XENODANGER("We cannot heal ourself!")) + if (A == wardenbuff_user) + to_chat(wardenbuff_user, SPAN_XENODANGER("We cannot heal ourself!")) return - if (A.z != X.z) - to_chat(X, SPAN_XENODANGER("That Sister is too far away!")) + if (A.z != wardenbuff_user.z) + to_chat(wardenbuff_user, SPAN_XENODANGER("That Sister is too far away!")) return var/mob/living/carbon/xenomorph/targetXeno = A if(targetXeno.stat == DEAD) - to_chat(X, SPAN_WARNING("[targetXeno] is already dead!")) + to_chat(wardenbuff_user, SPAN_WARNING("[targetXeno] is already dead!")) return if (!check_plasma_owner()) @@ -789,12 +789,12 @@ if (curr_effect_type == WARDEN_HEAL_SHIELD) if (SEND_SIGNAL(targetXeno, COMSIG_XENO_PRE_HEAL) & COMPONENT_CANCEL_XENO_HEAL) - to_chat(X, SPAN_XENOWARNING("We cannot bolster the defenses of this xeno!")) + to_chat(wardenbuff_user, SPAN_XENOWARNING("We cannot bolster the defenses of this xeno!")) return var/bonus_shield = 0 - var/datum/behavior_delegate/praetorian_warden/behavior = X.behavior_delegate + var/datum/behavior_delegate/praetorian_warden/behavior = wardenbuff_user.behavior_delegate if (!istype(behavior)) return @@ -807,33 +807,33 @@ var/total_shield_amount = shield_amount + bonus_shield - if (X.observed_xeno != null) - to_chat(X, SPAN_XENOHIGHDANGER("We cannot shield [targetXeno] as effectively over distance!")) + if (wardenbuff_user.observed_xeno != null) + to_chat(wardenbuff_user, SPAN_XENOHIGHDANGER("We cannot shield [targetXeno] as effectively over distance!")) total_shield_amount = total_shield_amount/4 targetXeno.visible_message(SPAN_BOLDNOTICE("[targetXeno]'s exoskeleton shimmers for a fraction of a second."))//marines probably should know if a xeno gets healed else //so both visible messages don't appear at the same time - targetXeno.visible_message(SPAN_BOLDNOTICE("[X] points at [targetXeno], and it shudders as its exoskeleton shimmers for a second!")) //this one is a bit less important than healing and rejuvenating - to_chat(X, SPAN_XENODANGER("We bolster the defenses of [targetXeno]!")) //but i imagine it'll be useful for predators, survivors and for battle flavor - to_chat(targetXeno, SPAN_XENOHIGHDANGER("We feel our defenses bolstered by [X]!")) + targetXeno.visible_message(SPAN_BOLDNOTICE("[wardenbuff_user] points at [targetXeno], and it shudders as its exoskeleton shimmers for a second!")) //this one is a bit less important than healing and rejuvenating + to_chat(wardenbuff_user, SPAN_XENODANGER("We bolster the defenses of [targetXeno]!")) //but i imagine it'll be useful for predators, survivors and for battle flavor + to_chat(targetXeno, SPAN_XENOHIGHDANGER("We feel our defenses bolstered by [wardenbuff_user]!")) targetXeno.add_xeno_shield(total_shield_amount, XENO_SHIELD_SOURCE_WARDEN_PRAE, duration = shield_duration, decay_amount_per_second = shield_decay) targetXeno.xeno_jitter(1 SECONDS) targetXeno.flick_heal_overlay(3 SECONDS, "#FFA800") //D9F500 - X.add_xeno_shield(total_shield_amount*0.5, XENO_SHIELD_SOURCE_WARDEN_PRAE, duration = shield_duration, decay_amount_per_second = shield_decay) // X is the prae itself - X.xeno_jitter(1 SECONDS) - X.flick_heal_overlay(3 SECONDS, "#FFA800") //D9F500 + wardenbuff_user.add_xeno_shield(total_shield_amount*0.5, XENO_SHIELD_SOURCE_WARDEN_PRAE, duration = shield_duration, decay_amount_per_second = shield_decay) // X is the prae itself + wardenbuff_user.xeno_jitter(1 SECONDS) + wardenbuff_user.flick_heal_overlay(3 SECONDS, "#FFA800") //D9F500 use_plasma = TRUE else if (curr_effect_type == WARDEN_HEAL_HP) - if (!X.Adjacent(A)) - to_chat(X, SPAN_XENODANGER("We must be within touching distance of [targetXeno]!")) + if (!wardenbuff_user.Adjacent(A)) + to_chat(wardenbuff_user, SPAN_XENODANGER("We must be within touching distance of [targetXeno]!")) return if (SEND_SIGNAL(targetXeno, COMSIG_XENO_PRE_HEAL) & COMPONENT_CANCEL_XENO_HEAL) - to_chat(X, SPAN_XENOWARNING("We cannot heal this xeno!")) + to_chat(wardenbuff_user, SPAN_XENOWARNING("We cannot heal this xeno!")) return var/bonus_heal = 0 - var/datum/behavior_delegate/praetorian_warden/behavior = X.behavior_delegate + var/datum/behavior_delegate/praetorian_warden/behavior = wardenbuff_user.behavior_delegate if (!istype(behavior)) return @@ -844,39 +844,39 @@ if (!behavior.use_internal_hp_ability(bonus_heal)) bonus_heal = 0 - to_chat(X, SPAN_XENOHIGHDANGER("We heal [targetXeno]!")) - to_chat(targetXeno, SPAN_XENOHIGHDANGER("We are healed by [X]!")) + to_chat(wardenbuff_user, SPAN_XENOHIGHDANGER("We heal [targetXeno]!")) + to_chat(targetXeno, SPAN_XENOHIGHDANGER("We are healed by [wardenbuff_user]!")) //Amount to heal in this cast of the ability var/quantity_healed = heal_amount if(istype(targetXeno.strain, /datum/xeno_strain/warden)) - // Half the healing if warden - quantity_healed = quantity_healed / 2 + quantity_healed = quantity_healed / 2 // Half the healing if warden + else quantity_healed = quantity_healed + bonus_heal targetXeno.gain_health(quantity_healed) - targetXeno.visible_message(SPAN_BOLDNOTICE("[X] places its claws on [targetXeno], and its wounds are quickly sealed!")) //marines probably should know if a xeno gets healed - X.gain_health(heal_amount*0.5 + bonus_heal*0.5) - X.flick_heal_overlay(3 SECONDS, "#00B800") + targetXeno.visible_message(SPAN_BOLDNOTICE("[wardenbuff_user] places its claws on [targetXeno], and its wounds are quickly sealed!")) //marines probably should know if a xeno gets healed + wardenbuff_user.gain_health(heal_amount*0.5 + bonus_heal*0.5) + wardenbuff_user.flick_heal_overlay(3 SECONDS, "#00B800") behavior.transferred_healing += quantity_healed use_plasma = TRUE //it's already hard enough to gauge health without hp showing on the mob targetXeno.flick_heal_overlay(3 SECONDS, "#00B800")//so the visible_message and recovery overlay will warn marines and possibly predators that the xenomorph has been healed! else if (curr_effect_type == WARDEN_HEAL_DEBUFFS) - if (X.observed_xeno != null) - to_chat(X, SPAN_XENOHIGHDANGER("We cannot rejuvenate targets through overwatch!")) + if (wardenbuff_user.observed_xeno != null) + to_chat(wardenbuff_user, SPAN_XENOHIGHDANGER("We cannot rejuvenate targets through overwatch!")) return - var/datum/behavior_delegate/praetorian_warden/behavior = X.behavior_delegate + var/datum/behavior_delegate/praetorian_warden/behavior = wardenbuff_user.behavior_delegate if (!istype(behavior)) return if (!behavior.use_internal_hp_ability(debuff_cost)) return - to_chat(X, SPAN_XENOHIGHDANGER("We rejuvenate [targetXeno]!")) - to_chat(targetXeno, SPAN_XENOHIGHDANGER("We are rejuvenated by [X]!")) - targetXeno.visible_message(SPAN_BOLDNOTICE("[X] points at [targetXeno], and it spasms as it recuperates unnaturally quickly!")) //marines probably should know if a xeno gets rejuvenated + to_chat(wardenbuff_user, SPAN_XENOHIGHDANGER("We rejuvenate [targetXeno]!")) + to_chat(targetXeno, SPAN_XENOHIGHDANGER("We are rejuvenated by [wardenbuff_user]!")) + targetXeno.visible_message(SPAN_BOLDNOTICE("[wardenbuff_user] points at [targetXeno], and it spasms as it recuperates unnaturally quickly!")) //marines probably should know if a xeno gets rejuvenated targetXeno.xeno_jitter(1 SECONDS) //it might confuse them as to why the queen got up half a second after being AT rocketed, and give them feedback on the Praetorian rejuvenating targetXeno.flick_heal_overlay(3 SECONDS, "#F5007A") //therefore making the Praetorian a priority target targetXeno.clear_debuffs() @@ -888,49 +888,49 @@ return ..() /datum/action/xeno_action/activable/prae_retrieve/use_ability(atom/A) - var/mob/living/carbon/xenomorph/X = owner - if(!istype(X)) + var/mob/living/carbon/xenomorph/warden = owner + if(!istype(warden)) return - var/datum/behavior_delegate/praetorian_warden/behavior = X.behavior_delegate + var/datum/behavior_delegate/praetorian_warden/behavior = warden.behavior_delegate if(!istype(behavior)) return - if(X.observed_xeno != null) - to_chat(X, SPAN_XENOHIGHDANGER("We cannot retrieve sisters through overwatch!")) + if(warden.observed_xeno != null) + to_chat(warden, SPAN_XENOHIGHDANGER("We cannot retrieve sisters through overwatch!")) return - if(!isxeno(A) || !X.can_not_harm(A)) - to_chat(X, SPAN_XENODANGER("We must target one of our sisters!")) + if(!isxeno(A) || !warden.can_not_harm(A)) + to_chat(warden, SPAN_XENODANGER("We must target one of our sisters!")) return - if(A == X) - to_chat(X, SPAN_XENODANGER("We cannot retrieve ourself!")) + if(A == warden) + to_chat(warden, SPAN_XENODANGER("We cannot retrieve ourself!")) return - if(!(A in view(7, X))) - to_chat(X, SPAN_XENODANGER("That sister is too far away!")) + if(!(A in view(7, warden))) + to_chat(warden, SPAN_XENODANGER("That sister is too far away!")) return var/mob/living/carbon/xenomorph/targetXeno = A if(targetXeno.anchored) - to_chat(X, SPAN_XENODANGER("That sister cannot move!")) + to_chat(warden, SPAN_XENODANGER("That sister cannot move!")) return if(!(targetXeno.resting || targetXeno.stat == UNCONSCIOUS)) if(targetXeno.mob_size > MOB_SIZE_BIG) - to_chat(X, SPAN_WARNING("[targetXeno] is too big to retrieve while standing up!")) + to_chat(warden, SPAN_WARNING("[targetXeno] is too big to retrieve while standing up!")) return if(targetXeno.stat == DEAD) - to_chat(X, SPAN_WARNING("[targetXeno] is already dead!")) + to_chat(warden, SPAN_WARNING("[targetXeno] is already dead!")) return - if(!action_cooldown_check() || X.action_busy) + if(!action_cooldown_check() || warden.action_busy) return - if(!X.check_state()) + if(!warden.check_state()) return if(!check_plasma_owner()) @@ -945,10 +945,10 @@ // Build our turflist var/list/turf/turflist = list() var/list/telegraph_atom_list = list() - var/facing = get_dir(X, A) - var/reversefacing = get_dir(A, X) - var/turf/T = X.loc - var/turf/temp = X.loc + var/facing = get_dir(warden, A) + var/reversefacing = get_dir(A, warden) + var/turf/T = warden.loc + var/turf/temp = warden.loc for(var/x in 0 to max_distance) temp = get_step(T, facing) if(facing in GLOB.diagonals) // check if it goes through corners @@ -966,7 +966,7 @@ blocked = TRUE break if(blocked) - to_chat(X, SPAN_XENOWARNING("We can't reach [targetXeno] with our resin retrieval hook!")) + to_chat(warden, SPAN_XENOWARNING("We can't reach [targetXeno] with our resin retrieval hook!")) return T = temp @@ -979,34 +979,34 @@ telegraph_atom_list += new /obj/effect/xenomorph/xeno_telegraph/green(T, windup) if(!length(turflist)) - to_chat(X, SPAN_XENOWARNING("We don't have any room to do our retrieve!")) + to_chat(warden, SPAN_XENOWARNING("We don't have any room to do our retrieve!")) return - X.visible_message(SPAN_XENODANGER("[X] prepares to fire its resin retrieval hook at [A]!"), SPAN_XENODANGER("We prepare to fire our resin retrieval hook at [A]!")) - X.emote("roar") + warden.visible_message(SPAN_XENODANGER("[warden] prepares to fire its resin retrieval hook at [A]!"), SPAN_XENODANGER("We prepare to fire our resin retrieval hook at [A]!")) + warden.emote("roar") - var/throw_target_turf = get_step(X.loc, facing) - var/turf/behind_turf = get_step(X.loc, reversefacing) + var/throw_target_turf = get_step(warden.loc, facing) + var/turf/behind_turf = get_step(warden.loc, reversefacing) if(!(behind_turf.density)) throw_target_turf = behind_turf - ADD_TRAIT(X, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Praetorian Retrieve")) + ADD_TRAIT(warden, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Praetorian Retrieve")) if(windup) - if(!do_after(X, windup, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE, numticks = 1)) - to_chat(X, SPAN_XENOWARNING("We cancel our retrieve.")) + if(!do_after(warden, windup, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE, numticks = 1)) + to_chat(warden, SPAN_XENOWARNING("We cancel our retrieve.")) apply_cooldown() for (var/obj/effect/xenomorph/xeno_telegraph/XT in telegraph_atom_list) telegraph_atom_list -= XT qdel(XT) - REMOVE_TRAIT(X, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Praetorian Retrieve")) + REMOVE_TRAIT(warden, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Praetorian Retrieve")) return - REMOVE_TRAIT(X, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Praetorian Retrieve")) + REMOVE_TRAIT(warden, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Praetorian Retrieve")) - playsound(get_turf(X), 'sound/effects/bang.ogg', 25, 0) + playsound(get_turf(warden), 'sound/effects/bang.ogg', 25, 0) var/successful_retrieve = FALSE for(var/turf/target_turf in turflist) @@ -1015,18 +1015,18 @@ break if(!successful_retrieve) - to_chat(X, SPAN_XENOWARNING("We can't reach [targetXeno] with our resin retrieval hook!")) + to_chat(warden, SPAN_XENOWARNING("We can't reach [targetXeno] with our resin retrieval hook!")) return - to_chat(targetXeno, SPAN_XENOBOLDNOTICE("We are pulled toward [X]!")) + to_chat(targetXeno, SPAN_XENOBOLDNOTICE("We are pulled toward [warden]!")) shake_camera(targetXeno, 10, 1) var/throw_dist = get_dist(throw_target_turf, targetXeno)-1 if(throw_target_turf == behind_turf) throw_dist++ - to_chat(X, SPAN_XENOBOLDNOTICE("We fling [targetXeno] over our head with our resin hook, and they land behind us!")) + to_chat(warden, SPAN_XENOBOLDNOTICE("We fling [targetXeno] over our head with our resin hook, and they land behind us!")) else - to_chat(X, SPAN_XENOBOLDNOTICE("We fling [targetXeno] towards us with our resin hook, and they land in front of us!")) + to_chat(warden, SPAN_XENOBOLDNOTICE("We fling [targetXeno] towards us with our resin hook, and they land in front of us!")) targetXeno.throw_atom(throw_target_turf, throw_dist, SPEED_VERY_FAST, pass_flags = PASS_MOB_THRU) apply_cooldown() return ..() diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/predalien/predalien_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/predalien/predalien_abilities.dm index cc89a86d38e0..a3eaf70437ea 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/predalien/predalien_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/predalien/predalien_abilities.dm @@ -2,7 +2,6 @@ /datum/action/xeno_action/onclick/feralrush name = "Feral Rush" action_icon_state = "charge_spit" - ability_name = "toughen up" macro_path = /datum/action/xeno_action/verb/verb_feralrush ability_primacy = XENO_PRIMARY_ACTION_1 action_type = XENO_ACTION_ACTIVATE @@ -21,7 +20,6 @@ /datum/action/xeno_action/onclick/predalien_roar name = "Roar" action_icon_state = "screech" - ability_name = "roar" action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_2 macro_path = /datum/action/xeno_action/verb/verb_predalien_roar @@ -32,7 +30,6 @@ /datum/action/xeno_action/activable/feral_smash name = "Feral Smash" - ability_name = "Feral Smash" action_icon_state = "lunge" action_type = XENO_ACTION_CLICK macro_path = /datum/action/xeno_action/verb/feral_smash @@ -49,7 +46,6 @@ /datum/action/xeno_action/activable/feralfrenzy name = "Feral Frenzy" action_icon_state = "rav_eviscerate" - ability_name = "Feral Frenzy" action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_4 macro_path = /datum/action/xeno_action/verb/verb_feralfrenzy diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_abilities.dm index ebcd29ded29d..e68e353eee19 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_abilities.dm @@ -20,7 +20,6 @@ /datum/action/xeno_action/activable/queen_heal name = "Heal Xenomorph (600)" action_icon_state = "heal_xeno" - ability_name = "xenomorph heal" plasma_cost = 600 macro_path = /datum/action/xeno_action/verb/verb_heal_xeno ability_primacy = XENO_PRIMARY_ACTION_1 @@ -30,7 +29,6 @@ /datum/action/xeno_action/activable/expand_weeds name = "Expand Weeds (50)" action_icon_state = "plant_weeds" - ability_name = "weed expansion" plasma_cost = 50 ability_primacy = XENO_PRIMARY_ACTION_3 action_type = XENO_ACTION_CLICK @@ -48,16 +46,27 @@ /datum/action/xeno_action/activable/secrete_resin/remote/queen name = "Projected Resin (100)" action_icon_state = "secrete_resin" - ability_name = "projected resin" plasma_cost = 100 - xeno_cooldown = 2 SECONDS + xeno_cooldown = 4 SECONDS ability_primacy = XENO_PRIMARY_ACTION_5 care_about_adjacency = FALSE - build_speed_mod = 1 + build_speed_mod = 1.5 var/boosted = FALSE +/datum/action/xeno_action/activable/secrete_resin/remote/queen/use_ability(atom/target_atom, mods) + if(boosted) + var/area/target_area = get_area(target_atom) + if(!target_area) + return + + if(target_area.linked_lz && istype(SSticker.mode, /datum/game_mode/colonialmarines)) + to_chat(owner, SPAN_XENONOTICE("It's too early to spread the hive this far.")) + return + + return ..() + /datum/action/xeno_action/activable/secrete_resin/remote/queen/give_to(mob/L) . = ..() SSticker.OnRoundstart(CALLBACK(src, PROC_REF(apply_queen_build_boost))) @@ -75,11 +84,12 @@ boosted = TRUE xeno_cooldown = 0 plasma_cost = 0 + build_speed_mod = 1 RegisterSignal(owner, COMSIG_XENO_THICK_RESIN_BYPASS, PROC_REF(override_secrete_thick_resin)) addtimer(CALLBACK(src, PROC_REF(disable_boost)), boost_duration) /datum/action/xeno_action/activable/secrete_resin/remote/queen/proc/disable_boost() - xeno_cooldown = 2 SECONDS + xeno_cooldown = 4 SECONDS plasma_cost = 100 boosted = FALSE UnregisterSignal(owner, COMSIG_XENO_THICK_RESIN_BYPASS) @@ -128,7 +138,6 @@ /datum/action/xeno_action/activable/place_queen_beacon name = "Place Queen Beacon" action_icon_state = "place_queen_beacon" - ability_name = "place queen beacon" plasma_cost = 0 action_type = XENO_ACTION_CLICK @@ -165,7 +174,6 @@ /datum/action/xeno_action/activable/blockade name = "Place Blockade" action_icon_state = "place_blockade" - ability_name = "place blockade" plasma_cost = 300 action_type = XENO_ACTION_CLICK diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_powers.dm index 6ef111aed66f..c73a1d7e66cb 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/queen/queen_powers.dm @@ -15,30 +15,24 @@ if(target_xeno.hivenumber != user_xeno.hivenumber) to_chat(user_xeno, SPAN_XENOWARNING("[target_xeno] doesn't belong to your hive!")) return - if(target_xeno.is_ventcrawling) to_chat(user_xeno, SPAN_XENOWARNING("[target_xeno] can't be deevolved here.")) return - if(!isturf(target_xeno.loc)) to_chat(user_xeno, SPAN_XENOWARNING("[target_xeno] can't be deevolved here.")) return - if(target_xeno.health <= 0) to_chat(user_xeno, SPAN_XENOWARNING("[target_xeno] is too weak to be deevolved.")) return - if(length(target_xeno.caste.deevolves_to) < 1) to_chat(user_xeno, SPAN_XENOWARNING("[target_xeno] can't be deevolved.")) return - if(target_xeno.banished) to_chat(user_xeno, SPAN_XENOWARNING("[target_xeno] is banished and can't be deevolved.")) return var/newcaste - if(length(target_xeno.caste.deevolves_to) == 1) newcaste = target_xeno.caste.deevolves_to[1] else if(length(target_xeno.caste.deevolves_to) > 1) @@ -46,12 +40,10 @@ if(!newcaste) return - - if(newcaste == "Larva") + if(newcaste == XENO_CASTE_LARVA) to_chat(user_xeno, SPAN_XENOWARNING("You cannot deevolve xenomorphs to larva.")) return - - if (user_xeno.observed_xeno != target_xeno) + if(user_xeno.observed_xeno != target_xeno) return var/confirm = tgui_alert(user_xeno, "Are you sure you want to deevolve [target_xeno] from [target_xeno.caste.caste_type] to [newcaste]?", "Deevolution", list("Yes", "No")) @@ -63,33 +55,21 @@ to_chat(user_xeno, SPAN_XENOWARNING("You must provide a reason for deevolving [target_xeno].")) return - if (!check_and_use_plasma_owner(plasma_cost)) + if(!check_and_use_plasma_owner(plasma_cost)) return + to_chat(target_xeno, SPAN_XENOWARNING("The queen is deevolving you for the following reason: [reason]")) - var/xeno_type - var/level_to_switch_to = target_xeno.get_vision_level() - switch(newcaste) - if(XENO_CASTE_RUNNER) - xeno_type = /mob/living/carbon/xenomorph/runner - if(XENO_CASTE_DRONE) - xeno_type = /mob/living/carbon/xenomorph/drone - if(XENO_CASTE_SENTINEL) - xeno_type = /mob/living/carbon/xenomorph/sentinel - if(XENO_CASTE_SPITTER) - xeno_type = /mob/living/carbon/xenomorph/spitter - if(XENO_CASTE_LURKER) - xeno_type = /mob/living/carbon/xenomorph/lurker - if(XENO_CASTE_WARRIOR) - xeno_type = /mob/living/carbon/xenomorph/warrior - if(XENO_CASTE_DEFENDER) - xeno_type = /mob/living/carbon/xenomorph/defender - if(XENO_CASTE_BURROWER) - xeno_type = /mob/living/carbon/xenomorph/burrower - var/obj/item/organ/xeno/organ = locate() in src + SEND_SIGNAL(target_xeno, COMSIG_XENO_DEEVOLVE) + + var/obj/item/organ/xeno/organ = locate() in target_xeno if(!isnull(organ)) qdel(organ) + + var/level_to_switch_to = target_xeno.get_vision_level() + var/xeno_type = GLOB.RoleAuthority.get_caste_by_text(newcaste) + //From there, the new xeno exists, hopefully var/mob/living/carbon/xenomorph/new_xeno = new xeno_type(get_turf(target_xeno), target_xeno) @@ -100,6 +80,9 @@ qdel(new_xeno) return + new_xeno.built_structures = target_xeno.built_structures.Copy() + target_xeno.built_structures = null + if(target_xeno.mind) target_xeno.mind.transfer_to(new_xeno) else @@ -113,7 +96,8 @@ new_xeno.generate_name() if(new_xeno.client) new_xeno.set_lighting_alpha(level_to_switch_to) - // If the player has self-deevolved before, don't allow them to do it again + + // If the player has lost the Deevolve verb before, don't allow them to do it again if(!(/mob/living/carbon/xenomorph/verb/Deevolve in target_xeno.verbs)) remove_verb(new_xeno, /mob/living/carbon/xenomorph/verb/Deevolve) @@ -132,6 +116,7 @@ GLOB.round_statistics.track_new_participant(target_xeno.faction, -1) //so an evolved xeno doesn't count as two. SSround_recording.recorder.stop_tracking(target_xeno) SSround_recording.recorder.track_player(new_xeno) + qdel(target_xeno) return @@ -185,6 +170,11 @@ to_chat(xeno, SPAN_XENOWARNING("These weeds don't belong to your hive! You can't grow an ovipositor here.")) return + var/area/current_area = get_area(xeno) + if(current_area.unoviable_timer) + to_chat(xeno, SPAN_XENOWARNING("This area is not right for you to grow an ovipositor in.")) + return + if(!xeno.check_alien_construction(current_turf)) return @@ -375,7 +365,7 @@ /datum/action/xeno_action/onclick/manage_hive/use_ability(atom/Atom) var/mob/living/carbon/xenomorph/queen/queen_manager = owner plasma_cost = 0 - var/list/options = list("Banish (500)", "Re-Admit (100)", "De-evolve (500)", "Reward Jelly (500)", "Exchange larva for evolution (100)",) + var/list/options = list("Banish (500)", "Re-Admit (100)", "De-evolve (500)", "Reward Jelly (500)", "Exchange larva for evolution (100)", "Purchase Buffs") if(queen_manager.hive.hivenumber == XENO_HIVE_CORRUPTED) var/datum/hive_status/corrupted/hive = queen_manager.hive options += "Add Personal Ally" @@ -401,8 +391,76 @@ remove_personal_ally() if("Clear Personal Allies") clear_personal_allies() + if("Purchase Buffs") + purchase_buffs() return ..() +/datum/action/xeno_action/onclick/manage_hive/proc/purchase_buffs() + var/mob/living/carbon/xenomorph/queen/xeno = owner + + var/list/datum/hivebuff/buffs = list() + var/list/names = list() + var/list/radial_images = list() + var/major_available = FALSE + for(var/datum/hivebuff/buff as anything in xeno.hive.get_available_hivebuffs()) + var/buffname = initial(buff.name) + names += buffname + buffs[buffname] = buff + if(!major_available) + if(initial(buff.tier) == HIVEBUFF_TIER_MAJOR) + major_available = TRUE + + if(!length(buffs)) + to_chat(xeno, SPAN_XENONOTICE("No boons are available to us!")) + return + + var/selection + var/list/radial_images_tiers = list(HIVEBUFF_TIER_MINOR = image('icons/ui_icons/hivebuff_radial.dmi', "minor"), HIVEBUFF_TIER_MAJOR = image('icons/ui_icons/hivebuff_radial.dmi', "major")) + + if(xeno.client?.prefs?.no_radials_preference) + selection = tgui_input_list(xeno, "Pick a buff.", "Select Buff", names) + else + var/tier = HIVEBUFF_TIER_MINOR + if(major_available) + tier = show_radial_menu(xeno, xeno?.client?.eye, radial_images_tiers) + + if(tier == HIVEBUFF_TIER_MAJOR) + for(var/filtered_buffname as anything in buffs) + var/datum/hivebuff/filtered_buff = buffs[filtered_buffname] + if(initial(filtered_buff.tier) == HIVEBUFF_TIER_MAJOR) + radial_images[initial(filtered_buff.name)] += image(initial(filtered_buff.hivebuff_radial_dmi), initial(filtered_buff.radial_icon)) + else + for(var/filtered_buffname as anything in buffs) + var/datum/hivebuff/filtered_buff = buffs[filtered_buffname] + if(initial(filtered_buff.tier) == HIVEBUFF_TIER_MINOR) + radial_images[initial(filtered_buff.name)] += image(initial(filtered_buff.hivebuff_radial_dmi), initial(filtered_buff.radial_icon)) + + selection = show_radial_menu(xeno, xeno?.client?.eye, radial_images, radius = 72, tooltips = TRUE) + + if(!selection) + return FALSE + + if(!buffs[selection]) + to_chat(xeno, "This selection is impossible!") + return FALSE + + if(buffs[selection].must_select_pylon) + var/list/pylon_to_area_dictionary = list() + for(var/obj/effect/alien/resin/special/pylon/endgame/pylon as anything in xeno.hive.active_endgame_pylons) + pylon_to_area_dictionary[get_area_name(pylon.loc)] = pylon + + var/choice = tgui_input_list(xeno, "Select a pylon for the buff:", "Choice", pylon_to_area_dictionary, 1 MINUTES) + + if(!choice) + to_chat(xeno, "You must choose a pylon.") + return FALSE + + xeno.hive.attempt_apply_hivebuff(buffs[selection], xeno, pylon_to_area_dictionary[choice]) + return TRUE + + xeno.hive.attempt_apply_hivebuff(buffs[selection], xeno, pick(xeno.hive.active_endgame_pylons)) + return TRUE + /datum/action/xeno_action/onclick/manage_hive/proc/add_personal_ally() var/mob/living/carbon/xenomorph/queen/user_xeno = owner if(user_xeno.hive.hivenumber != XENO_HIVE_CORRUPTED) @@ -667,8 +725,8 @@ return var/area/AR = get_area(T) - if(!AR.is_resin_allowed) - if(AR.flags_area & AREA_UNWEEDABLE) + if(isnull(AR) || !AR.is_resin_allowed) + if(!AR || AR.flags_area & AREA_UNWEEDABLE) to_chat(X, SPAN_XENOWARNING("This area is unsuited to host the hive!")) return to_chat(X, SPAN_XENOWARNING("It's too early to spread the hive this far.")) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/ravager/ravager_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/ravager/ravager_abilities.dm index 53ad3b377aec..c676fff61826 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/ravager/ravager_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/ravager/ravager_abilities.dm @@ -3,7 +3,7 @@ /datum/action/xeno_action/activable/pounce/charge name = "Charge" action_icon_state = "charge" - ability_name = "charge" + action_text = "charge" macro_path = /datum/action/xeno_action/verb/verb_charge_rav action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_1 @@ -21,7 +21,6 @@ /datum/action/xeno_action/onclick/empower name = "Empower" action_icon_state = "empower" - ability_name = "empower" macro_path = /datum/action/xeno_action/verb/verb_empower action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_2 @@ -42,7 +41,6 @@ // Rav "Scissor Cut" /datum/action/xeno_action/activable/scissor_cut name = "Scissor Cut" - ability_name = "scissor cut" action_icon_state = "rav_scissor_cut" macro_path = /datum/action/xeno_action/verb/verb_scissorcut action_type = XENO_ACTION_CLICK @@ -60,7 +58,6 @@ /datum/action/xeno_action/onclick/apprehend name = "Apprehend" action_icon_state = "rav_enrage" - ability_name = "apprehend" macro_path = /datum/action/xeno_action/verb/verb_apprehend action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_1 @@ -75,7 +72,6 @@ /datum/action/xeno_action/activable/clothesline name = "Clothesline" action_icon_state = "rav_clothesline" - ability_name = "clothesline" macro_path = /datum/action/xeno_action/verb/verb_clothesline action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_2 @@ -92,7 +88,6 @@ /datum/action/xeno_action/activable/eviscerate name = "Eviscerate" action_icon_state = "rav_eviscerate" - ability_name = "eviscerate" macro_path = /datum/action/xeno_action/verb/verb_eviscerate action_type = XENO_ACTION_ACTIVATE ability_primacy = XENO_PRIMARY_ACTION_3 @@ -113,7 +108,6 @@ /datum/action/xeno_action/onclick/spike_shield name = "Spike Shield (150 shards)" action_icon_state = "rav_shard_shield" - ability_name = "spike shield" macro_path = /datum/action/xeno_action/verb/verb_spike_shield action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_1 @@ -131,7 +125,6 @@ /datum/action/xeno_action/activable/rav_spikes name = "Fire Spikes (75 shards)" action_icon_state = "rav_spike" - ability_name = "fire spikes" macro_path = /datum/action/xeno_action/verb/verb_fire_spikes action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_2 @@ -145,7 +138,6 @@ /datum/action/xeno_action/onclick/spike_shed name = "Spike Shed (50 shards)" action_icon_state = "rav_shard_shed" - ability_name = "spike shed" macro_path = /datum/action/xeno_action/verb/verb_shed_spikes action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_3 diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/ravager/ravager_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/ravager/ravager_powers.dm index 69fd4292323f..74f9f236e7d1 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/ravager/ravager_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/ravager/ravager_powers.dm @@ -448,7 +448,7 @@ shield.shrapnel_amount = shield_shrapnel_amount xeno.overlay_shields() - xeno.create_shield(shield_duration) + xeno.create_shield(shield_duration, "shield2") shield_active = TRUE button.icon_state = "template_active" addtimer(CALLBACK(src, PROC_REF(remove_shield)), shield_duration) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/runner/runner_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/runner/runner_abilities.dm index 2880dd15eb5a..528dc9767a13 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/runner/runner_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/runner/runner_abilities.dm @@ -1,7 +1,6 @@ /datum/action/xeno_action/activable/pounce/runner name = "Pounce" action_icon_state = "pounce" - ability_name = "pounce" macro_path = /datum/action/xeno_action/verb/verb_pounce action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_1 @@ -24,7 +23,6 @@ /datum/action/xeno_action/activable/runner_skillshot name = "Bone Spur" action_icon_state = "runner_bonespur" - ability_name = "bone spur" macro_path = /datum/action/xeno_action/verb/verb_runner_bonespurs action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_2 @@ -36,7 +34,6 @@ /datum/action/xeno_action/activable/acider_acid name = "Corrosive Acid" action_icon_state = "corrosive_acid" - ability_name = "acider acid" var/acid_type = /obj/effect/xenomorph/acid/strong macro_path = /datum/action/xeno_action/verb/verb_acider_acid ability_primacy = XENO_PRIMARY_ACTION_1 @@ -46,7 +43,6 @@ /datum/action/xeno_action/activable/acider_for_the_hive name = "For the Hive!" action_icon_state = "screech" - ability_name = "for the hive" macro_path = /datum/action/xeno_action/verb/verb_acider_sacrifice action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_2 diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/sentinel/sentinel_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/sentinel/sentinel_abilities.dm index fdd1164c1479..00b20e4f64f7 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/sentinel/sentinel_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/sentinel/sentinel_abilities.dm @@ -2,29 +2,26 @@ /datum/action/xeno_action/activable/slowing_spit name = "Slowing Spit" action_icon_state = "xeno_spit" - ability_name = "slowing spit" macro_path = /datum/action/xeno_action/verb/verb_slowing_spit action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_1 - xeno_cooldown = 1.5 SECONDS + xeno_cooldown = 2 SECONDS plasma_cost = 20 // Scatterspit /datum/action/xeno_action/activable/scattered_spit name = "Scattered Spit" action_icon_state = "acid_shotgun" - ability_name = "scattered spit" macro_path = /datum/action/xeno_action/verb/verb_scattered_spit action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_2 - xeno_cooldown = 8 SECONDS + xeno_cooldown = 6 SECONDS plasma_cost = 30 // Paralyzing slash /datum/action/xeno_action/onclick/paralyzing_slash name = "Paralyzing Slash" action_icon_state = "lurker_inject_neuro" - ability_name = "paralyzing slash" macro_path = /datum/action/xeno_action/verb/verb_paralyzing_slash action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_3 diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/sentinel/sentinel_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/sentinel/sentinel_powers.dm index 1ed8863c231a..82be70d02231 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/sentinel/sentinel_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/sentinel/sentinel_powers.dm @@ -1,13 +1,13 @@ /datum/action/xeno_action/activable/slowing_spit/use_ability(atom/target) - var/mob/living/carbon/xenomorph/xeno = owner - if(!xeno.check_state()) + var/mob/living/carbon/xenomorph/slowspit_user = owner + if(!slowspit_user.check_state()) return if(!action_cooldown_check()) to_chat(src, SPAN_WARNING("We must wait for our spit glands to refill.")) return - var/turf/current_turf = get_turf(xeno) + var/turf/current_turf = get_turf(slowspit_user) if(!current_turf) return @@ -15,31 +15,31 @@ if (!check_and_use_plasma_owner()) return - xeno.visible_message(SPAN_XENOWARNING("[xeno] spits at [target]!"), \ + slowspit_user.visible_message(SPAN_XENOWARNING("[slowspit_user] spits at [target]!"), \ SPAN_XENOWARNING("You spit at [target]!") ) var/sound_to_play = pick(1, 2) == 1 ? 'sound/voice/alien_spitacid.ogg' : 'sound/voice/alien_spitacid2.ogg' - playsound(xeno.loc, sound_to_play, 25, 1) + playsound(slowspit_user.loc, sound_to_play, 25, 1) - xeno.ammo = GLOB.ammo_list[/datum/ammo/xeno/toxin] - var/obj/projectile/projectile = new /obj/projectile(current_turf, create_cause_data(initial(xeno.caste_type), xeno)) - projectile.generate_bullet(xeno.ammo) - projectile.permutated += xeno - projectile.def_zone = xeno.get_limbzone_target() - projectile.fire_at(target, xeno, xeno, xeno.ammo.max_range, xeno.ammo.shell_speed) + slowspit_user.ammo = GLOB.ammo_list[/datum/ammo/xeno/toxin] + var/obj/projectile/projectile = new /obj/projectile(current_turf, create_cause_data(initial(slowspit_user.caste_type), slowspit_user)) + projectile.generate_bullet(slowspit_user.ammo) + projectile.permutated += slowspit_user + projectile.def_zone = slowspit_user.get_limbzone_target() + projectile.fire_at(target, slowspit_user, slowspit_user, slowspit_user.ammo.max_range, slowspit_user.ammo.shell_speed) apply_cooldown() return ..() /datum/action/xeno_action/activable/scattered_spit/use_ability(atom/target) - var/mob/living/carbon/xenomorph/xeno = owner - if(!xeno.check_state()) + var/mob/living/carbon/xenomorph/scatterspit_user = owner + if(!scatterspit_user.check_state()) return if(!action_cooldown_check()) to_chat(src, SPAN_WARNING("We must wait for your spit glands to refill.")) return - var/turf/current_turf = get_turf(xeno) + var/turf/current_turf = get_turf(scatterspit_user) if(!current_turf) return @@ -47,25 +47,25 @@ if (!check_and_use_plasma_owner()) return - xeno.visible_message(SPAN_XENOWARNING("[xeno] spits at [target]!"), \ + scatterspit_user.visible_message(SPAN_XENOWARNING("[scatterspit_user] spits at [target]!"), \ SPAN_XENOWARNING("You spit at [target]!") ) var/sound_to_play = pick(1, 2) == 1 ? 'sound/voice/alien_spitacid.ogg' : 'sound/voice/alien_spitacid2.ogg' - playsound(xeno.loc, sound_to_play, 25, 1) + playsound(scatterspit_user.loc, sound_to_play, 25, 1) - xeno.ammo = GLOB.ammo_list[/datum/ammo/xeno/toxin/shotgun] - var/obj/projectile/projectile = new /obj/projectile(current_turf, create_cause_data(initial(xeno.caste_type), xeno)) - projectile.generate_bullet(xeno.ammo) - projectile.permutated += xeno - projectile.def_zone = xeno.get_limbzone_target() - projectile.fire_at(target, xeno, xeno, xeno.ammo.max_range, xeno.ammo.shell_speed) + scatterspit_user.ammo = GLOB.ammo_list[/datum/ammo/xeno/toxin/shotgun] + var/obj/projectile/projectile = new /obj/projectile(current_turf, create_cause_data(initial(scatterspit_user.caste_type), scatterspit_user)) + projectile.generate_bullet(scatterspit_user.ammo) + projectile.permutated += scatterspit_user + projectile.def_zone = scatterspit_user.get_limbzone_target() + projectile.fire_at(target, scatterspit_user, scatterspit_user, scatterspit_user.ammo.max_range, scatterspit_user.ammo.shell_speed) apply_cooldown() return ..() /datum/action/xeno_action/onclick/paralyzing_slash/use_ability(atom/target) - var/mob/living/carbon/xenomorph/xeno = owner + var/mob/living/carbon/xenomorph/paraslash_user = owner - if (!istype(xeno)) + if (!istype(paraslash_user)) return if (!action_cooldown_check()) @@ -74,11 +74,11 @@ if (!check_and_use_plasma_owner()) return - var/datum/behavior_delegate/sentinel_base/behavior = xeno.behavior_delegate + var/datum/behavior_delegate/sentinel_base/behavior = paraslash_user.behavior_delegate if (istype(behavior)) behavior.next_slash_buffed = TRUE - to_chat(xeno, SPAN_XENOHIGHDANGER("Our next slash will apply neurotoxin!")) + to_chat(paraslash_user, SPAN_XENOHIGHDANGER("Our next slash will apply neurotoxin!")) button.icon_state = "template_active" addtimer(CALLBACK(src, PROC_REF(unbuff_slash)), buff_duration) @@ -87,15 +87,15 @@ return ..() /datum/action/xeno_action/onclick/paralyzing_slash/proc/unbuff_slash() - var/mob/living/carbon/xenomorph/xeno = owner - if (!istype(xeno)) + var/mob/living/carbon/xenomorph/unbuffslash_user = owner + if (!istype(unbuffslash_user)) return - var/datum/behavior_delegate/sentinel_base/behavior = xeno.behavior_delegate + var/datum/behavior_delegate/sentinel_base/behavior = unbuffslash_user.behavior_delegate if (istype(behavior)) // In case slash has already landed if (!behavior.next_slash_buffed) return behavior.next_slash_buffed = FALSE - to_chat(xeno, SPAN_XENODANGER("We have waited too long, our slash will no longer apply neurotoxin!")) + to_chat(unbuffslash_user, SPAN_XENODANGER("We have waited too long, our slash will no longer apply neurotoxin!")) button.icon_state = "template" diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/spitter/spitter_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/spitter/spitter_abilities.dm index 20febc22c4a4..82ce8c160c0d 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/spitter/spitter_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/spitter/spitter_abilities.dm @@ -4,7 +4,6 @@ /datum/action/xeno_action/activable/xeno_spit/spitter name = "Spit Acid" action_icon_state = "xeno_spit" - ability_name = "spit acid" macro_path = /datum/action/xeno_action/verb/verb_xeno_spit action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_1 @@ -14,7 +13,6 @@ /datum/action/xeno_action/onclick/charge_spit name = "Charge Spit" action_icon_state = "charge_spit" - ability_name = "charge spit" macro_path = /datum/action/xeno_action/verb/verb_charge_spit ability_primacy = XENO_PRIMARY_ACTION_2 action_type = XENO_ACTION_ACTIVATE diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/warrior/warrior_abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities/warrior/warrior_abilities.dm index 4f40e1914540..2e175bbc2482 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/warrior/warrior_abilities.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/warrior/warrior_abilities.dm @@ -2,7 +2,6 @@ /datum/action/xeno_action/activable/fling name = "Fling" action_icon_state = "fling" - ability_name = "Fling" macro_path = /datum/action/xeno_action/verb/verb_fling action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_3 @@ -18,7 +17,6 @@ /datum/action/xeno_action/activable/lunge name = "Lunge" action_icon_state = "lunge" - ability_name = "lunge" macro_path = /datum/action/xeno_action/verb/verb_lunge action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_2 @@ -32,7 +30,6 @@ /datum/action/xeno_action/activable/warrior_punch name = "Punch" action_icon_state = "punch" - ability_name = "punch" macro_path = /datum/action/xeno_action/verb/verb_punch action_type = XENO_ACTION_CLICK ability_primacy = XENO_PRIMARY_ACTION_1 diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/warrior/warrior_powers.dm b/code/modules/mob/living/carbon/xenomorph/abilities/warrior/warrior_powers.dm index bbb4a584e2a5..e77c26e18ee7 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/warrior/warrior_powers.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/warrior/warrior_powers.dm @@ -1,23 +1,23 @@ /datum/action/xeno_action/activable/lunge/use_ability(atom/affected_atom) - var/mob/living/carbon/xenomorph/xeno = owner + var/mob/living/carbon/xenomorph/lunge_user = owner if (!action_cooldown_check()) if(twitch_message_cooldown < world.time ) - xeno.visible_message(SPAN_XENOWARNING("[xeno]'s claws twitch."), SPAN_XENOWARNING("Our claws twitch as we try to lunge but lack the strength. Wait a moment to try again.")) + lunge_user.visible_message(SPAN_XENOWARNING("[lunge_user]'s claws twitch."), SPAN_XENOWARNING("Our claws twitch as we try to lunge but lack the strength. Wait a moment to try again.")) twitch_message_cooldown = world.time + 5 SECONDS return //this gives a little feedback on why your lunge didn't hit other than the lunge button going grey. Plus, it might spook marines that almost got lunged if they know why the message appeared, and extra spookiness is always good. if (!affected_atom) return - if (!isturf(xeno.loc)) - to_chat(xeno, SPAN_XENOWARNING("We can't lunge from here!")) + if (!isturf(lunge_user.loc)) + to_chat(lunge_user, SPAN_XENOWARNING("We can't lunge from here!")) return - if (!xeno.check_state() || xeno.agility) + if (!lunge_user.check_state() || lunge_user.agility) return - if(xeno.can_not_harm(affected_atom) || !ismob(affected_atom)) + if(lunge_user.can_not_harm(affected_atom) || !ismob(affected_atom)) apply_cooldown_override(click_miss_cooldown) return @@ -31,32 +31,32 @@ apply_cooldown() ..() - xeno.visible_message(SPAN_XENOWARNING("[xeno] lunges towards [carbon]!"), SPAN_XENOWARNING("We lunge at [carbon]!")) + lunge_user.visible_message(SPAN_XENOWARNING("[lunge_user] lunges towards [carbon]!"), SPAN_XENOWARNING("We lunge at [carbon]!")) - xeno.throw_atom(get_step_towards(affected_atom, xeno), grab_range, SPEED_FAST, xeno) + lunge_user.throw_atom(get_step_towards(affected_atom, lunge_user), grab_range, SPEED_FAST, lunge_user) - if (xeno.Adjacent(carbon)) - xeno.start_pulling(carbon,1) + if (lunge_user.Adjacent(carbon)) + lunge_user.start_pulling(carbon,1) if(ishuman(carbon)) INVOKE_ASYNC(carbon, TYPE_PROC_REF(/mob, emote), "scream") else - xeno.visible_message(SPAN_XENOWARNING("[xeno]'s claws twitch."), SPAN_XENOWARNING("Our claws twitch as we lunge but are unable to grab onto our target. Wait a moment to try again.")) + lunge_user.visible_message(SPAN_XENOWARNING("[lunge_user]'s claws twitch."), SPAN_XENOWARNING("Our claws twitch as we lunge but are unable to grab onto our target. Wait a moment to try again.")) return TRUE /datum/action/xeno_action/activable/fling/use_ability(atom/affected_atom) - var/mob/living/carbon/xenomorph/xeno = owner + var/mob/living/carbon/xenomorph/fling_user = owner if (!action_cooldown_check()) return - if (!isxeno_human(affected_atom) || xeno.can_not_harm(affected_atom)) + if (!isxeno_human(affected_atom) || fling_user.can_not_harm(affected_atom)) return - if (!xeno.check_state() || xeno.agility) + if (!fling_user.check_state() || fling_user.agility) return - if (!xeno.Adjacent(affected_atom)) + if (!fling_user.Adjacent(affected_atom)) return var/mob/living/carbon/carbon = affected_atom @@ -66,17 +66,17 @@ if(HAS_TRAIT(carbon, TRAIT_NESTED)) return - if(carbon == xeno.pulling) - xeno.stop_pulling() + if(carbon == fling_user.pulling) + fling_user.stop_pulling() if(carbon.mob_size >= MOB_SIZE_BIG) - to_chat(xeno, SPAN_XENOWARNING("[carbon] is too big for us to fling!")) + to_chat(fling_user, SPAN_XENOWARNING("[carbon] is too big for us to fling!")) return if (!check_and_use_plasma_owner()) return - xeno.visible_message(SPAN_XENOWARNING("[xeno] effortlessly flings [carbon] to the side!"), SPAN_XENOWARNING("We effortlessly fling [carbon] to the side!")) + fling_user.visible_message(SPAN_XENOWARNING("[fling_user] effortlessly flings [carbon] to the side!"), SPAN_XENOWARNING("We effortlessly fling [carbon] to the side!")) playsound(carbon,'sound/weapons/alien_claw_block.ogg', 75, 1) if(stun_power) carbon.Stun(get_xeno_stun_duration(carbon, stun_power)) @@ -85,39 +85,39 @@ if(slowdown) if(carbon.slowed < slowdown) carbon.apply_effect(slowdown, SLOW) - carbon.last_damage_data = create_cause_data(initial(xeno.caste_type), xeno) + carbon.last_damage_data = create_cause_data(initial(fling_user.caste_type), fling_user) - var/facing = get_dir(xeno, carbon) + var/facing = get_dir(fling_user, carbon) // Hmm today I will kill a marine while looking away from them - xeno.face_atom(carbon) - xeno.animation_attack_on(carbon) - xeno.flick_attack_overlay(carbon, "disarm") - xeno.throw_carbon(carbon, facing, fling_distance, SPEED_VERY_FAST, shake_camera = TRUE, immobilize = TRUE) + fling_user.face_atom(carbon) + fling_user.animation_attack_on(carbon) + fling_user.flick_attack_overlay(carbon, "disarm") + fling_user.throw_carbon(carbon, facing, fling_distance, SPEED_VERY_FAST, shake_camera = TRUE, immobilize = TRUE) apply_cooldown() return ..() /datum/action/xeno_action/activable/warrior_punch/use_ability(atom/affected_atom) - var/mob/living/carbon/xenomorph/xeno = owner + var/mob/living/carbon/xenomorph/punch_user = owner if (!action_cooldown_check()) return - if (!isxeno_human(affected_atom) || xeno.can_not_harm(affected_atom)) + if (!isxeno_human(affected_atom) || punch_user.can_not_harm(affected_atom)) return - if (!xeno.check_state() || xeno.agility) + if (!punch_user.check_state() || punch_user.agility) return - var/distance = get_dist(xeno, affected_atom) + var/distance = get_dist(punch_user, affected_atom) if (distance > 2) return var/mob/living/carbon/carbon = affected_atom - if (!xeno.Adjacent(carbon)) + if (!punch_user.Adjacent(carbon)) return if(carbon.stat == DEAD) @@ -125,7 +125,7 @@ if(HAS_TRAIT(carbon, TRAIT_NESTED)) return - var/obj/limb/target_limb = carbon.get_limb(check_zone(xeno.zone_selected)) + var/obj/limb/target_limb = carbon.get_limb(check_zone(punch_user.zone_selected)) if (ishuman(carbon) && (!target_limb || (target_limb.status & LIMB_DESTROYED))) target_limb = carbon.get_limb("chest") @@ -133,9 +133,9 @@ if (!check_and_use_plasma_owner()) return - carbon.last_damage_data = create_cause_data(initial(xeno.caste_type), xeno) + carbon.last_damage_data = create_cause_data(initial(punch_user.caste_type), punch_user) - xeno.visible_message(SPAN_XENOWARNING("[xeno] hits [carbon] in the [target_limb ? target_limb.display_name : "chest"] with a devastatingly powerful punch!"), \ + punch_user.visible_message(SPAN_XENOWARNING("[punch_user] hits [carbon] in the [target_limb ? target_limb.display_name : "chest"] with a devastatingly powerful punch!"), \ SPAN_XENOWARNING("We hit [carbon] in the [target_limb ? target_limb.display_name : "chest"] with a devastatingly powerful punch!")) var/sound = pick('sound/weapons/punch1.ogg','sound/weapons/punch2.ogg','sound/weapons/punch3.ogg','sound/weapons/punch4.ogg') playsound(carbon, sound, 50, 1) @@ -144,7 +144,7 @@ return ..() /datum/action/xeno_action/activable/warrior_punch/proc/do_base_warrior_punch(mob/living/carbon/carbon, obj/limb/target_limb) - var/mob/living/carbon/xenomorph/xeno = owner + var/mob/living/carbon/xenomorph/warrior = owner var/damage = rand(base_damage, base_damage + damage_variance) if(ishuman(carbon)) @@ -166,8 +166,8 @@ carbon.apply_armoured_damage(get_xeno_damage_slash(carbon, damage), ARMOR_MELEE, BRUTE, target_limb ? target_limb.name : "chest") // Hmm today I will kill a marine while looking away from them - xeno.face_atom(carbon) - xeno.animation_attack_on(carbon) - xeno.flick_attack_overlay(carbon, "punch") + warrior.face_atom(carbon) + warrior.animation_attack_on(carbon) + warrior.flick_attack_overlay(carbon, "punch") shake_camera(carbon, 2, 1) - step_away(carbon, xeno, 2) + step_away(carbon, warrior, 2) diff --git a/code/modules/mob/living/carbon/xenomorph/abilities/xeno_action.dm b/code/modules/mob/living/carbon/xenomorph/abilities/xeno_action.dm index 3371e1298233..4aed319a4029 100644 --- a/code/modules/mob/living/carbon/xenomorph/abilities/xeno_action.dm +++ b/code/modules/mob/living/carbon/xenomorph/abilities/xeno_action.dm @@ -1,7 +1,5 @@ /datum/action/xeno_action icon_file = 'icons/mob/hud/actions_xeno.dmi' - var/ability_name // Our name - var/plasma_cost = 0 var/macro_path var/action_type = XENO_ACTION_CLICK // Determines how macros interact with this action. Defines are in xeno.dm in the defines folder. @@ -63,10 +61,10 @@ /datum/action/xeno_action/proc/track_xeno_ability_stats() if(!owner) return - var/mob/living/carbon/xenomorph/X = owner - if (ability_name && GLOB.round_statistics) - GLOB.round_statistics.track_ability_usage(ability_name) - X.track_ability_usage(ability_name, X.caste_type) + var/mob/living/carbon/xenomorph/xeno = owner + if (name && GLOB.round_statistics) + GLOB.round_statistics.track_ability_usage(name) + xeno.track_ability_usage(name, xeno.caste_type) /datum/action/xeno_action/can_use_action() if(!owner) @@ -169,13 +167,13 @@ return // We clicked the same ability in a very short time if(xeno.client && xeno.client.prefs && xeno.client.prefs.toggle_prefs & TOGGLE_ABILITY_DEACTIVATION_OFF) return - to_chat(xeno, "You will no longer use [ability_name] with [xeno.get_ability_mouse_name()].") + to_chat(xeno, "You will no longer use [name] with [xeno.get_ability_mouse_name()].") button.icon_state = "template" xeno.set_selected_ability(null) if(charge_time) stop_charging_ability() else - to_chat(xeno, "You will now use [ability_name] with [xeno.get_ability_mouse_name()].") + to_chat(xeno, "You will now use [name] with [xeno.get_ability_mouse_name()].") if(xeno.selected_ability) xeno.selected_ability.action_deselect() if(xeno.selected_ability.charge_time) @@ -452,3 +450,6 @@ track_xeno_ability_stats() if(action_start_message) to_chat(owner, SPAN_NOTICE(action_start_message)) + +#define XENO_ACTION_CHECK(X) if(!X.check_state() || !action_cooldown_check() || !check_plasma_owner(src.plasma_cost)) return +#define XENO_ACTION_CHECK_USE_PLASMA(X) if(!X.check_state() || !action_cooldown_check() || !check_and_use_plasma_owner(src.plasma_cost)) return diff --git a/code/modules/mob/living/carbon/xenomorph/attack_alien.dm b/code/modules/mob/living/carbon/xenomorph/attack_alien.dm index 2c69f984d884..41345aef0597 100644 --- a/code/modules/mob/living/carbon/xenomorph/attack_alien.dm +++ b/code/modules/mob/living/carbon/xenomorph/attack_alien.dm @@ -802,6 +802,11 @@ ship_id = "sh_dropship2" if(shuttle_tag == DROPSHIP_SAIPAN) ship_id = "sh_dropship3" + if(shuttle_tag == DROPSHIP_MORANA) + ship_id = "sh_dropship4" + if(shuttle_tag == DROPSHIP_DEVANA) + ship_id = "sh_dropship5" + for(var/obj/structure/machinery/door/airlock/dropship_hatch/D in GLOB.machines) if(D.id == ship_id) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Burrower.dm b/code/modules/mob/living/carbon/xenomorph/castes/Burrower.dm index 106dcdcacb62..c691a68659fb 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Burrower.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Burrower.dm @@ -31,7 +31,7 @@ burrow_cooldown = 20 tunnel_cooldown = 70 widen_cooldown = 70 - tremor_cooldown = 450 + minimum_evolve_time = 7 MINUTES diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Carrier.dm b/code/modules/mob/living/carbon/xenomorph/castes/Carrier.dm index d46bfce6bf71..a2a1a29db2c2 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Carrier.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Carrier.dm @@ -215,7 +215,7 @@ if(huggers_max > 0 && huggers_cur < huggers_max) if(F.stat != DEAD && !F.sterile) huggers_cur++ - to_chat(src, SPAN_NOTICE("We store the facehugger and carry it for safekeeping. Now sheltering: [huggers_cur] / [huggers_max].")) + to_chat(src, SPAN_NOTICE("We take a facehugger and carry it for safekeeping. Now sheltering: [huggers_cur] / [huggers_max].")) update_icons() qdel(F) else @@ -237,9 +237,9 @@ huggers_cur += huggers_to_transfer morpher.stored_huggers -= huggers_to_transfer if(huggers_to_transfer == 1) - to_chat(src, SPAN_NOTICE("We store one facehugger and carry it for safekeeping. Now sheltering: [huggers_cur] / [huggers_max].")) + to_chat(src, SPAN_NOTICE("We take one facehugger and carry it for safekeeping. Now sheltering: [huggers_cur] / [huggers_max].")) else - to_chat(src, SPAN_NOTICE("We store [huggers_to_transfer] facehuggers and carry them for safekeeping. Now sheltering: [huggers_cur] / [huggers_max].")) + to_chat(src, SPAN_NOTICE("We take [huggers_to_transfer] facehuggers and carry them for safekeeping. Now sheltering: [huggers_cur] / [huggers_max].")) update_icons() else to_chat(src, SPAN_WARNING("We can't carry more facehuggers on you.")) @@ -350,11 +350,15 @@ store_egg(E) return + if(istype(T, /obj/effect/alien/resin/special/eggmorph)) + store_eggs_into_egg_morpher(T) + return + var/obj/item/xeno_egg/E = get_active_hand() if(!E) //empty active hand //if no hugger in active hand, we take one from our storage if(eggs_cur <= 0) - to_chat(src, SPAN_WARNING("We don't have any egg to use!")) + to_chat(src, SPAN_WARNING("We don't have any eggs to use!")) return E = new(src, hivenumber) eggs_cur-- @@ -367,6 +371,42 @@ to_chat(src, SPAN_WARNING("We need an empty hand to grab one of our stored eggs!")) return +/mob/living/carbon/xenomorph/carrier/proc/store_eggs_into_egg_morpher(obj/effect/alien/resin/special/eggmorph/morpher) + if(action_busy) + return FALSE + + if(!morpher_safety_checks(morpher)) + return + + visible_message(SPAN_XENOWARNING("[src] starts placing facehuggers into [morpher] from their eggs..."), SPAN_XENONOTICE("We start placing children into [morpher] from our eggs...")) + while(eggs_cur > 0) + if(!morpher_safety_checks(morpher)) + return + + if(!do_after(src, 0.75 SECONDS, INTERRUPT_ALL, BUSY_ICON_GENERIC)) + to_chat(src, SPAN_WARNING("We stop filling [morpher] with our children.")) + return + + playsound(src.loc, "sound/effects/alien_egg_move.ogg", 20, TRUE) + morpher.stored_huggers = min(morpher.huggers_max_amount, morpher.stored_huggers + 1) + eggs_cur-- + to_chat(src, SPAN_XENONOTICE("We slide one of the children out of an egg and place them into [morpher]. Now sheltering: [eggs_cur] / [eggs_max].")) + +/mob/living/carbon/xenomorph/carrier/proc/morpher_safety_checks(obj/effect/alien/resin/special/eggmorph/morpher) + if(morpher.linked_hive && (morpher.linked_hive.hivenumber != hivenumber)) + to_chat(src, SPAN_WARNING("That egg morpher is tainted!")) + return FALSE + + if(morpher.stored_huggers == morpher.huggers_max_amount) + to_chat(src, SPAN_WARNING("[morpher] is full of children!")) + return FALSE + + if(eggs_cur < 1) + to_chat(src, SPAN_WARNING("We don't have any eggs left!")) + return FALSE + + return TRUE + /mob/living/carbon/xenomorph/carrier/attack_ghost(mob/dead/observer/user) . = ..() //Do a view printout as needed just in case the observer doesn't want to join as a Hugger but wants info join_as_facehugger_from_this(user) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Defender.dm b/code/modules/mob/living/carbon/xenomorph/castes/Defender.dm index 548b0389e683..5f16874878ad 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Defender.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Defender.dm @@ -15,7 +15,7 @@ speed = XENO_SPEED_TIER_6 evolves_to = list(XENO_CASTE_WARRIOR) - deevolves_to = list("Larva") + deevolves_to = list(XENO_CASTE_LARVA) can_vent_crawl = 0 available_strains = list(/datum/xeno_strain/steel_crest) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Drone.dm b/code/modules/mob/living/carbon/xenomorph/castes/Drone.dm index 12d94f0d5ec2..007897888edb 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Drone.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Drone.dm @@ -21,7 +21,7 @@ caste_desc = "A builder of hives. Only drones may evolve into Queens." evolves_to = list(XENO_CASTE_QUEEN, XENO_CASTE_BURROWER, XENO_CASTE_CARRIER, XENO_CASTE_HIVELORD) //Add more here separated by commas - deevolves_to = list("Larva") + deevolves_to = list(XENO_CASTE_LARVA) can_hold_facehuggers = 1 can_hold_eggs = CAN_HOLD_TWO_HANDS acid_level = 1 diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm b/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm index 17ec90a96bda..43c5b78514af 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Facehugger.dm @@ -124,7 +124,7 @@ if(morpher.linked_hive.hivenumber != hivenumber) to_chat(src, SPAN_XENOWARNING("This isn't your hive's eggmorpher!")) return - if(morpher.stored_huggers >= morpher.huggers_to_grow_max) + if(morpher.stored_huggers >= morpher.huggers_max_amount) to_chat(src, SPAN_XENOWARNING("\The [morpher] is already full of children.")) return visible_message(SPAN_WARNING("\The [src] climbs back into \the [morpher]."), SPAN_XENONOTICE("You climb into \the [morpher].")) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/King.dm b/code/modules/mob/living/carbon/xenomorph/castes/King.dm new file mode 100644 index 000000000000..a2c3a746b24e --- /dev/null +++ b/code/modules/mob/living/carbon/xenomorph/castes/King.dm @@ -0,0 +1,114 @@ +/datum/caste_datum/king + caste_type = XENO_CASTE_KING + caste_desc = "The end of the line." + tier = 4 + + melee_damage_lower = XENO_DAMAGE_TIER_6 + melee_damage_upper = XENO_DAMAGE_TIER_8 + melee_vehicle_damage = XENO_DAMAGE_TIER_5 + max_health = XENO_HEALTH_KING + plasma_gain = XENO_PLASMA_GAIN_TIER_3 + plasma_max = XENO_PLASMA_TIER_10 + xeno_explosion_resistance = XENO_EXPLOSIVE_ARMOR_TIER_7 + armor_deflection = XENO_ARMOR_FACTOR_TIER_5 + speed = XENO_SPEED_TIER_1 + + evolves_to = null + deevolves_to = null + evolution_allowed = FALSE + can_vent_crawl = FALSE + + behavior_delegate_type = /datum/behavior_delegate/king_base + + tackle_min = 6 + tackle_max = 10 + + minimap_icon = "xenoqueen" + + fire_immunity = FIRE_IMMUNITY_NO_DAMAGE + +/mob/living/carbon/xenomorph/king + caste_type = XENO_CASTE_KING + name = XENO_CASTE_KING + desc = "A massive alien covered in spines and armoured plates." + icon = 'icons/mob/xenos/king.dmi' + icon_size = 64 + icon_state = "King Walking" + plasma_types = list(PLASMA_CHITIN) + pixel_x = -16 + old_x = -16 + mob_size = MOB_SIZE_IMMOBILE + tier = 4 + small_explosives_stun = FALSE + counts_for_slots = FALSE + organ_value = 50000 + + claw_type = CLAW_TYPE_VERY_SHARP + age = -1 + aura_strength = 6 + + base_actions = list( + /datum/action/xeno_action/onclick/xeno_resting, + /datum/action/xeno_action/onclick/regurgitate, + /datum/action/xeno_action/watch_xeno, + /datum/action/xeno_action/activable/tail_stab, + /datum/action/xeno_action/onclick/rend, + /datum/action/xeno_action/activable/doom, + /datum/action/xeno_action/activable/destroy, + /datum/action/xeno_action/onclick/king_shield, + /datum/action/xeno_action/onclick/emit_pheromones, + ) + + icon_xeno = 'icons/mob/xenos/king.dmi' + weed_food_states = list() + weed_food_states_flipped = list() + + bubble_icon = "alienroyal" + +/mob/living/carbon/xenomorph/king/get_organ_icon() + return "heart_t3" + +/mob/living/carbon/xenomorph/king/Destroy() + UnregisterSignal(src, COMSIG_MOVABLE_PRE_MOVE) + + return ..() + +/mob/living/carbon/xenomorph/king/Initialize() + . = ..() + AddComponent(/datum/component/footstep, 2 , 35, 11, 4, "alien_footstep_large") + RegisterSignal(src, COMSIG_MOVABLE_PRE_MOVE, PROC_REF(check_block)) + +/mob/living/carbon/xenomorph/king/proc/check_block(mob/king, turf/new_loc) + SIGNAL_HANDLER + for(var/mob/living/carbon/carbon in new_loc.contents) + if(isxeno(carbon)) + var/mob/living/carbon/xenomorph/xeno = carbon + if(xeno.hivenumber == src.hivenumber) + xeno.KnockDown((5 DECISECONDS) / GLOBAL_STATUS_MULTIPLIER) + else + xeno.KnockDown((1 SECONDS) / GLOBAL_STATUS_MULTIPLIER) + else + if(carbon.stat != DEAD) + carbon.apply_armoured_damage(20) + carbon.KnockDown((1 SECONDS) / GLOBAL_STATUS_MULTIPLIER) + + playsound(src, 'sound/weapons/alien_knockdown.ogg', 25, 1) + +/mob/living/carbon/xenomorph/king/gib(datum/cause_data/cause = create_cause_data("gibbing", src)) + death(cause, 1) + +/datum/behavior_delegate/king_base + name = "Base King Behavior Delegate" + +/mob/living/carbon/xenomorph/king/rogue + icon_xeno = 'icons/mob/xenos/rogueking.dmi' + icon = 'icons/mob/xenos/rogueking.dmi' + +/atom/movable/vis_obj/xeno_wounds/rogue + icon = 'icons/mob/xenos/roguedamage.dmi' + +/mob/living/carbon/xenomorph/king/rogue/Initialize(mapload, mob/living/carbon/xenomorph/old_xeno, hivenumber) + . = ..() + vis_contents -= wound_icon_holder + wound_icon_holder = new /atom/movable/vis_obj/xeno_wounds/rogue(null, src) + vis_contents += wound_icon_holder diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm b/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm index 3f873f3635c3..ea5986184f02 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Larva.dm @@ -27,7 +27,7 @@ /mob/living/carbon/xenomorph/larva AUTOWIKI_SKIP(TRUE) - name = XENO_CASTE_LARVA + name = "Bloody Larva" caste_type = XENO_CASTE_LARVA speak_emote = list("hisses") icon_state = "Bloody Larva" @@ -52,15 +52,20 @@ var/burrowable = TRUE //Can it be safely burrowed if it has no player? var/state_override - var/is_bloody = TRUE //We're still "bloody" + /// Whether we're bloody, normal, or mature + var/larva_state = LARVA_STATE_BLOODY icon_xeno = 'icons/mob/xenos/larva.dmi' icon_xenonid = 'icons/mob/xenonids/larva.dmi' /mob/living/carbon/xenomorph/larva/Life() - if(is_bloody && (evolution_stored >= evolution_threshold / 2)) //We're no longer bloody so update our name... + // Check if no longer bloody or mature + if(larva_state == LARVA_STATE_BLOODY && evolution_stored >= evolution_threshold / 2) + larva_state = LARVA_STATE_NORMAL + generate_name() + else if(larva_state == LARVA_STATE_NORMAL && evolution_stored >= evolution_threshold) + larva_state = LARVA_STATE_MATURE generate_name() - is_bloody = FALSE return ..() /mob/living/carbon/xenomorph/larva/initialize_pass_flags(datum/pass_flags_container/pass_flags) @@ -126,7 +131,7 @@ /mob/living/carbon/xenomorph/larva/update_icons() var/state = "" //Icon convention, two different sprite sets - if(evolution_stored < evolution_threshold / 2) //We're still bloody + if(larva_state == LARVA_STATE_BLOODY) state = "Bloody " if(stat == DEAD) @@ -213,9 +218,9 @@ Also handles the "Mature / Bloody naming convention. Call this to update the nam name_prefix = hive.prefix color = hive.color - if(evolution_stored >= evolution_threshold) + if(larva_state == LARVA_STATE_MATURE) progress = "Mature " - else if(evolution_stored < evolution_threshold / 2) //We're still bloody + else if(larva_state == LARVA_STATE_BLOODY) progress = "Bloody " name = "[name_prefix][progress]Larva ([nicknumber])" diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm b/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm index 58a493903d75..6a964b470f19 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Queen.dm @@ -47,6 +47,8 @@ minimap_icon = "xenoqueen" + minimap_background = "xeno_ruler" + royal_caste = TRUE /proc/update_living_queens() // needed to update when you change a queen to a different hive @@ -445,7 +447,7 @@ for(var/mob/living/carbon/xenomorph/xeno in new_loc.contents) if(xeno.pass_flags.flags_pass & (PASS_MOB_THRU_XENO|PASS_MOB_THRU) && !(xeno.flags_pass_temp & PASS_MOB_THRU)) continue - if(xeno.hivenumber == hivenumber) + if(xeno.hivenumber == hivenumber && !(queen.client?.prefs?.toggle_prefs & TOGGLE_AUTO_SHOVE_OFF)) xeno.KnockDown((5 DECISECONDS) / GLOBAL_STATUS_MULTIPLIER) playsound(src, 'sound/weapons/alien_knockdown.ogg', 25, 1) @@ -577,6 +579,7 @@ . += "Pooled Larvae: [stored_larvae]" . += "Leaders: [xeno_leader_num] / [hive?.queen_leader_limit]" + . += "Royal Resin: [hive?.buff_points]" if(!queen_aged && queen_age_timer_id != TIMER_ID_NULL) . += "Maturity: [time2text(timeleft(queen_age_timer_id), "mm:ss")] remaining" @@ -818,6 +821,7 @@ /mob/living/carbon/xenomorph/queen/death(cause, gibbed) if(src == hive?.living_xeno_queen) + UnregisterSignal(src, COMSIG_MOVABLE_PRE_MOVE) hive.xeno_queen_timer = world.time + XENO_QUEEN_DEATH_DELAY // Reset the banished ckey list diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Ravager.dm b/code/modules/mob/living/carbon/xenomorph/castes/Ravager.dm index 90614e338071..eefbc74b03b1 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Ravager.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Ravager.dm @@ -74,7 +74,7 @@ /datum/behavior_delegate/ravager_base var/shield_decay_time = 15 SECONDS // Time in deciseconds before our shield decays var/slash_charge_cdr = 3 SECONDS // Amount to reduce charge cooldown by per slash - var/knockdown_amount = 1.3 + var/knockdown_amount = 1.6 var/fling_distance = 3 var/empower_targets = 0 var/super_empower_threshold = 3 diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Runner.dm b/code/modules/mob/living/carbon/xenomorph/castes/Runner.dm index 12fdb8d02843..3e43262c41cd 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Runner.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Runner.dm @@ -17,7 +17,7 @@ available_strains = list(/datum/xeno_strain/acider) behavior_delegate_type = /datum/behavior_delegate/runner_base evolves_to = list(XENO_CASTE_LURKER) - deevolves_to = list("Larva") + deevolves_to = list(XENO_CASTE_LARVA) tackle_min = 4 tackle_max = 5 diff --git a/code/modules/mob/living/carbon/xenomorph/castes/Sentinel.dm b/code/modules/mob/living/carbon/xenomorph/castes/Sentinel.dm index 3e7416f39fc5..8dd692980dca 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/Sentinel.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/Sentinel.dm @@ -15,7 +15,7 @@ caste_desc = "A weak ranged combat alien." evolves_to = list(XENO_CASTE_SPITTER) - deevolves_to = list("Larva") + deevolves_to = list(XENO_CASTE_LARVA) acid_level = 1 tackle_min = 4 @@ -68,7 +68,7 @@ // State var/next_slash_buffed = FALSE -#define NEURO_TOUCH_DELAY 4 SECONDS +#define NEURO_TOUCH_DELAY 3 SECONDS /datum/behavior_delegate/sentinel_base/melee_attack_modify_damage(original_damage, mob/living/carbon/carbon_target) if (!next_slash_buffed) @@ -102,7 +102,16 @@ #undef NEURO_TOUCH_DELAY +/datum/behavior_delegate/sentinel_base/override_intent(mob/living/carbon/target_carbon) + . = ..() + + if(!isxeno_human(target_carbon)) + return + + if(next_slash_buffed) + return INTENT_HARM + /datum/behavior_delegate/sentinel_base/proc/paralyzing_slash(mob/living/carbon/human/human_target) - human_target.KnockDown(2) - human_target.Stun(2) + human_target.KnockDown(2.5) + human_target.Stun(2.5) to_chat(human_target, SPAN_XENOHIGHDANGER("You fall over, paralyzed by the toxin!")) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/caste_datum.dm b/code/modules/mob/living/carbon/xenomorph/castes/caste_datum.dm index feee2edecb67..995f4985487a 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/caste_datum.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/caste_datum.dm @@ -132,6 +132,7 @@ var/minimum_evolve_time = 1 MINUTES /// Iconstate for the xeno on the minimap var/minimap_icon = "xeno" + var/minimap_background = "background_xeno" ///The iconstate for leadered xenos on the minimap, added as overlay var/minimap_leadered_overlay = "xenoleader" @@ -175,8 +176,7 @@ return minimum_xeno_playtime - client.get_total_xeno_playtime() /datum/caste_datum/proc/get_minimap_icon() - var/image/background = mutable_appearance('icons/ui_icons/map_blips.dmi', "background") - background.color = MINIMAP_ICON_BACKGROUND_XENO + var/image/background = mutable_appearance('icons/ui_icons/map_blips.dmi', minimap_background) var/iconstate = minimap_icon ? minimap_icon : "unknown" var/mutable_appearance/icon = image('icons/ui_icons/map_blips.dmi', icon_state = iconstate) diff --git a/code/modules/mob/living/carbon/xenomorph/egg_item.dm b/code/modules/mob/living/carbon/xenomorph/egg_item.dm index a9d00519b691..846fb0cc4c05 100644 --- a/code/modules/mob/living/carbon/xenomorph/egg_item.dm +++ b/code/modules/mob/living/carbon/xenomorph/egg_item.dm @@ -12,6 +12,8 @@ black_market_value = 35 var/hivenumber = XENO_HIVE_NORMAL var/flags_embryo = NO_FLAGS + ///The objects in this list will be skipped when checking for obstrucing objects. + var/static/list/object_whitelist = list(/obj/structure/machinery/light, /obj/structure/machinery/light_construct) /obj/item/xeno_egg/Initialize(mapload, hive) pixel_x = rand(-3,3) @@ -90,7 +92,7 @@ if(!user.hive) to_chat(user, SPAN_XENOWARNING("Your hive cannot procreate.")) return - if(!user.check_alien_construction(T)) + if(!user.check_alien_construction(T, ignore_nest = TRUE)) return if(!user.check_plasma(30)) return @@ -121,6 +123,8 @@ return for(var/obj/object in T.contents) + if(is_type_in_list(object, object_whitelist)) + continue var/obj/effect/alien/egg/xeno_egg = /obj/effect/alien/egg if(object.layer > initial(xeno_egg.layer)) to_chat(user, SPAN_XENOWARNING("[src] cannot be planted below objects that would obscure it.")) @@ -131,11 +135,12 @@ var/plant_time = 35 if(isdrone(user)) plant_time = 25 - if(iscarrier(user)) + else if(iscarrier(user)) plant_time = 10 + if(!do_after(user, plant_time, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD)) return - if(!user.check_alien_construction(T)) + if(!user.check_alien_construction(T, ignore_nest = TRUE)) return if(!user.check_plasma(30)) return diff --git a/code/modules/mob/living/carbon/xenomorph/hive_status.dm b/code/modules/mob/living/carbon/xenomorph/hive_status.dm index 131859d0d129..d7aaf7ca30b3 100644 --- a/code/modules/mob/living/carbon/xenomorph/hive_status.dm +++ b/code/modules/mob/living/carbon/xenomorph/hive_status.dm @@ -133,6 +133,21 @@ var/list/available_nicknumbers = list() + + /// Hive buffs + var/buff_points = HIVE_STARTING_BUFFPOINTS + var/max_buff_points = HIVE_MAX_BUFFPOINTS + + /// List of references to the currently active hivebuffs + var/list/active_hivebuffs + /// List of references to used hivebuffs + var/list/used_hivebuffs + /// List of references to used hivebuffs currently on cooldown + var/list/cooldown_hivebuffs + + /// List of references to hive pylons active in the game world + var/list/active_endgame_pylons + /*Stores the image()'s for the xeno evolution radial menu To add an image for your caste - add an icon to icons/mob/xenos/radial_xenos.dmi Icon size should be 32x32, to make them fit within the radial menu border size your icon 22x22 and leave 10px transparent border. @@ -140,6 +155,9 @@ */ var/static/list/evolution_menu_images + /// Has a King hatchery + var/has_hatchery = FALSE + /datum/hive_status/New() hive_ui = new(src) mark_ui = new(src) @@ -150,6 +168,10 @@ internal_faction = name for(var/number in 1 to 999) available_nicknumbers += number + LAZYINITLIST(active_hivebuffs) + LAZYINITLIST(used_hivebuffs) + LAZYINITLIST(active_endgame_pylons) + if(hivenumber != XENO_HIVE_NORMAL) return @@ -730,6 +752,10 @@ hivecore_cooldown = FALSE xeno_message(SPAN_XENOBOLDNOTICE("The weeds have recovered! A new hive core can be built!"),3,hivenumber) + // No buffs in hijack + for(var/datum/hivebuff/buff in active_hivebuffs) + buff._on_cease() + /datum/hive_status/proc/free_respawn(client/C) stored_larva++ if(!hive_location || !hive_location.spawn_burrowed_larva(C.mob)) @@ -1372,6 +1398,65 @@ if(!length(personal_allies)) return clear_personal_allies(TRUE) +/// Hive buffs + +/// Get a list of hivebuffs which can be bought now. +/datum/hive_status/proc/get_available_hivebuffs() + var/list/potential_hivebuffs = subtypesof(/datum/hivebuff) + + // First check if we any pylons which are capable of supporting hivebuffs + if(!LAZYLEN(active_endgame_pylons)) + return + + for(var/datum/hivebuff/possible_hivebuff as anything in potential_hivebuffs) + // Round isn't old enough yet + if(ROUND_TIME < initial(possible_hivebuff.roundtime_to_enable)) + potential_hivebuffs -= possible_hivebuff + continue + + if(initial(possible_hivebuff.number_of_required_pylons) > LAZYLEN(active_endgame_pylons)) + potential_hivebuffs -= possible_hivebuff + continue + + // Prevent the same lineage of buff in active hivebuffs (e.g. no minor and major health allowed) + var/already_active = FALSE + for(var/datum/hivebuff/buff as anything in active_hivebuffs) + if(istype(buff, possible_hivebuff)) + already_active = TRUE + break + if(ispath(possible_hivebuff, buff.type)) + already_active = TRUE + break + if(already_active) + potential_hivebuffs -= possible_hivebuff + continue + + //If this buff isn't combineable, check if any other active hivebuffs aren't combineable + if(!initial(possible_hivebuff.is_combineable)) + var/found_conflict = FALSE + for(var/datum/hivebuff/active_hivebuff in active_hivebuffs) + if(!active_hivebuff.is_combineable) + found_conflict = TRUE + break + if(found_conflict) + potential_hivebuffs -= possible_hivebuff + continue + + // If the buff is not reusable check against used hivebuffs. + if(!initial(possible_hivebuff.is_reusable)) + if(locate(possible_hivebuff) in used_hivebuffs) + potential_hivebuffs -= possible_hivebuff + continue + + return potential_hivebuffs + +/datum/hive_status/proc/attempt_apply_hivebuff(datum/hivebuff/hivebuff, mob/living/purchasing_player, obj/effect/alien/resin/special/pylon/endgame/purchased_pylon) + var/datum/hivebuff/new_buff = new hivebuff(src) + if(!new_buff._on_engage(purchasing_player, purchased_pylon)) + qdel(new_buff) + return FALSE + return TRUE + //Xeno Resin Mark Shit, the very best place for it too :0) //Defines at the bottom of this list here will show up at the top in the mark menu @@ -1433,3 +1518,4 @@ name = "Attack" desc = "Attack the enemy here!" icon_state = "attack" + diff --git a/code/modules/mob/living/carbon/xenomorph/hive_status_ui.dm b/code/modules/mob/living/carbon/xenomorph/hive_status_ui.dm index eca88761ad9b..4d031941052b 100644 --- a/code/modules/mob/living/carbon/xenomorph/hive_status_ui.dm +++ b/code/modules/mob/living/carbon/xenomorph/hive_status_ui.dm @@ -121,10 +121,10 @@ /datum/hive_status_ui/proc/update_pylon_status(send_update = TRUE) if(assoc_hive.get_structure_count(XENO_STRUCTURE_PYLON) < 1) pylon_status = "" - else if(assoc_hive.hit_larva_pylon_limit) - pylon_status = "The hive's power has surpassed what the pylons can provide." + else if(assoc_hive.buff_points >= assoc_hive.max_buff_points) + pylon_status = "Royal resin has reached its maximum capacity of [assoc_hive.max_buff_points], spend it!" else - pylon_status = "Pylons are strengthening our numbers!" + pylon_status = "Pylons are providing us with royal resin! Current royal resin: [assoc_hive.buff_points]." if(send_update) SStgui.update_uis(src) diff --git a/code/modules/mob/living/carbon/xenomorph/life.dm b/code/modules/mob/living/carbon/xenomorph/life.dm index d7d86ebfbb4c..eb00dbaa8ac2 100644 --- a/code/modules/mob/living/carbon/xenomorph/life.dm +++ b/code/modules/mob/living/carbon/xenomorph/life.dm @@ -514,6 +514,16 @@ Make sure their actual health updates immediately.*/ set_stat(UNCONSCIOUS) SEND_SIGNAL(src, COMSIG_XENO_ENTER_CRIT) +/mob/living/carbon/xenomorph/adjustBruteLoss(amount) + if(status_flags & GODMODE) + return //godmode + bruteloss = max(bruteloss + amount, 0) + +/mob/living/carbon/xenomorph/adjustFireLoss(amount) + if(status_flags & GODMODE) + return //godmode + fireloss = max(fireloss + amount, 0) + /mob/living/carbon/xenomorph/set_stat(new_stat) . = ..() // Temporarily force triggering HUD updates so they apply immediately rather than on Life tick. diff --git a/code/modules/mob/living/carbon/xenomorph/resin_constructions.dm b/code/modules/mob/living/carbon/xenomorph/resin_constructions.dm index 9c94be96a65a..29ef996b6e87 100644 --- a/code/modules/mob/living/carbon/xenomorph/resin_constructions.dm +++ b/code/modules/mob/living/carbon/xenomorph/resin_constructions.dm @@ -31,7 +31,7 @@ GLOBAL_VAR_INIT(resin_lz_allowed, FALSE) var/area/AR = get_area(T) if(isnull(AR) || !(AR.is_resin_allowed)) - if(AR.flags_area & AREA_UNWEEDABLE) + if(!AR || AR.flags_area & AREA_UNWEEDABLE) to_chat(X, SPAN_XENOWARNING("This area is unsuited to host the hive!")) return to_chat(X, SPAN_XENOWARNING("It's too early to spread the hive this far.")) diff --git a/code/modules/mob/living/carbon/xenomorph/say.dm b/code/modules/mob/living/carbon/xenomorph/say.dm index 9f99cdb45455..650351c14fd2 100644 --- a/code/modules/mob/living/carbon/xenomorph/say.dm +++ b/code/modules/mob/living/carbon/xenomorph/say.dm @@ -107,6 +107,9 @@ to_chat(src, SPAN_WARNING("There is no Queen. You are alone.")) return + if(!filter_message(src, message)) + return + log_hivemind("[key_name(src)] : [message]") var/track = "" diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/carrier/eggsac.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/carrier/eggsac.dm index 61c03803841b..4c0331541937 100644 --- a/code/modules/mob/living/carbon/xenomorph/strains/castes/carrier/eggsac.dm +++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/carrier/eggsac.dm @@ -91,7 +91,6 @@ /datum/action/xeno_action/active_toggle/generate_egg name = "Generate Eggs (50)" action_icon_state = "lay_egg" - ability_name = "generate egg" action_type = XENO_ACTION_CLICK plasma_cost = 50 plasma_use_per_tick = 15 diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/drone/gardener.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/drone/gardener.dm index d54d268f12d9..da331f0f6568 100644 --- a/code/modules/mob/living/carbon/xenomorph/strains/castes/drone/gardener.dm +++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/drone/gardener.dm @@ -40,7 +40,6 @@ /datum/action/xeno_action/onclick/plant_resin_fruit name = "Plant Resin Fruit (50)" action_icon_state = "gardener_plant" - ability_name = "plant resin fruit" plasma_cost = 50 macro_path = /datum/action/xeno_action/verb/plant_resin_fruit action_type = XENO_ACTION_CLICK @@ -123,7 +122,6 @@ /datum/action/xeno_action/onclick/change_fruit name = "Change Fruit" action_icon_state = "blank" - ability_name = "change fruit" plasma_cost = 0 xeno_cooldown = 0 macro_path = /datum/action/xeno_action/verb/verb_resin_surge @@ -224,7 +222,6 @@ /datum/action/xeno_action/activable/resin_surge name = "Resin Surge (75)" action_icon_state = "gardener_resin_surge" - ability_name = "resin surge" plasma_cost = 75 xeno_cooldown = 10 SECONDS macro_path = /datum/action/xeno_action/verb/verb_resin_surge @@ -338,7 +335,6 @@ /datum/action/xeno_action/onclick/plant_weeds/gardener name = "Plant Hardy Weeds (125)" - ability_name = "Plant Hardy Weeds" action_icon_state = "plant_gardener_weeds" plasma_cost = 125 macro_path = /datum/action/xeno_action/verb/verb_plant_gardening_weeds diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/drone/healer.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/drone/healer.dm index 1914b2c24b2b..20006eaacbca 100644 --- a/code/modules/mob/living/carbon/xenomorph/strains/castes/drone/healer.dm +++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/drone/healer.dm @@ -51,7 +51,6 @@ /datum/action/xeno_action/activable/apply_salve name = "Apply Resin Salve" action_icon_state = "apply_salve" - ability_name = "Apply Resin Salve" var/health_transfer_amount = 100 var/max_range = 1 var/damage_taken_mod = 0.75 @@ -207,7 +206,6 @@ /datum/action/xeno_action/activable/healer_sacrifice name = "Sacrifice" action_icon_state = "screech" - ability_name = "sacrifice" var/max_range = 1 var/transfer_mod = 0.75 // only transfers 75% of current healer's health macro_path = /datum/action/xeno_action/verb/verb_healer_sacrifice diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/hivelord/resin_whisperer.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/hivelord/resin_whisperer.dm index 2d3429df4050..69e9144737fc 100644 --- a/code/modules/mob/living/carbon/xenomorph/strains/castes/hivelord/resin_whisperer.dm +++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/hivelord/resin_whisperer.dm @@ -43,14 +43,13 @@ /datum/action/xeno_action/activable/secrete_resin/remote name = "Coerce Resin (100)" action_icon_state = "secrete_resin" - ability_name = "coerce resin" - xeno_cooldown = 1 SECONDS + xeno_cooldown = 2.5 SECONDS thick = FALSE make_message = FALSE no_cooldown_msg = TRUE - build_speed_mod = 2 // the actual building part takes twice as long + build_speed_mod = 2.5 // the actual building part takes twice as long macro_path = /datum/action/xeno_action/verb/verb_coerce_resin action_type = XENO_ACTION_CLICK @@ -91,8 +90,10 @@ if(care_about_adjacency) if(owner.Adjacent(target_turf)) build_speed_mod = 1 + xeno_cooldown = 1 SECONDS else build_speed_mod = initial(build_speed_mod) + xeno_cooldown = initial(xeno_cooldown) var/mob/living/carbon/xenomorph/hivelord = owner if(!..()) diff --git a/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/berserker.dm b/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/berserker.dm index 5b8981157bda..84509d059cdb 100644 --- a/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/berserker.dm +++ b/code/modules/mob/living/carbon/xenomorph/strains/castes/ravager/berserker.dm @@ -73,7 +73,8 @@ to_chat(bound_xeno, SPAN_XENOHIGHDANGER("We feel a euphoric rush as we reach max rage! We are LOCKED at max Rage!")) // HP vamp - bound_xeno.gain_health((0.05*rage + hp_vamp_ratio)*((bound_xeno.melee_damage_upper - bound_xeno.melee_damage_lower)/2 + bound_xeno.melee_damage_lower)) + if(!bound_xeno.on_fire) + bound_xeno.gain_health((0.05*rage + hp_vamp_ratio)*((bound_xeno.melee_damage_upper - bound_xeno.melee_damage_lower)/2 + bound_xeno.melee_damage_lower)) /datum/behavior_delegate/ravager_berserker/append_to_stat() . = list() diff --git a/code/modules/mob/living/carbon/xenomorph/update_icons.dm b/code/modules/mob/living/carbon/xenomorph/update_icons.dm index 64f9949e94cd..7724c4f66a86 100644 --- a/code/modules/mob/living/carbon/xenomorph/update_icons.dm +++ b/code/modules/mob/living/carbon/xenomorph/update_icons.dm @@ -276,10 +276,10 @@ apply_overlay(X_SUIT_LAYER) addtimer(CALLBACK(src, PROC_REF(remove_overlay), X_SUIT_LAYER), 2 SECONDS) -/mob/living/carbon/xenomorph/proc/create_shield(duration = 10) +/mob/living/carbon/xenomorph/proc/create_shield(duration = 10, iconstate) remove_suit_layer() - overlays_standing[X_SUIT_LAYER] = image("icon"='icons/mob/xenos/overlay_effects64x64.dmi', "icon_state" = "shield2") + overlays_standing[X_SUIT_LAYER] = image("icon"='icons/mob/xenos/overlay_effects64x64.dmi', "icon_state" = iconstate) apply_overlay(X_SUIT_LAYER) addtimer(CALLBACK(src, PROC_REF(remove_overlay), X_SUIT_LAYER), duration) diff --git a/code/modules/mob/living/carbon/xenomorph/xeno_verbs.dm b/code/modules/mob/living/carbon/xenomorph/xeno_verbs.dm index a4e7d5f65d2f..b8b6d7895b00 100644 --- a/code/modules/mob/living/carbon/xenomorph/xeno_verbs.dm +++ b/code/modules/mob/living/carbon/xenomorph/xeno_verbs.dm @@ -102,6 +102,23 @@ xeno_hostile_hud = !xeno_hostile_hud +/mob/living/carbon/xenomorph/verb/toggle_auto_shove() + set name = "Toggle Automatic Shove" + set desc = "Toggles whethever you will automatically shove people as the Queen" + set category = "Alien" + + + if (!client || !client.prefs) + return + + client.prefs.toggle_prefs ^= TOGGLE_AUTO_SHOVE_OFF + client.prefs.save_preferences() + if (client.prefs.toggle_prefs & TOGGLE_AUTO_SHOVE_OFF) + to_chat(src, SPAN_NOTICE("You will no longer automatically shove people in the way as the Queen.")) + else + to_chat(src, SPAN_NOTICE("You will now automatically shove people in the way as the Queen.")) + + /mob/living/carbon/xenomorph/verb/ability_deactivation_toggle() set name = "Toggle Ability Deactivation" set desc = "Toggles whether you can deactivate your currently active ability when re-selecting it." diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index c7454ca940ac..47093ba603d9 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -635,6 +635,7 @@ return . = body_position body_position = new_value + body_position_changed = world.time SEND_SIGNAL(src, COMSIG_LIVING_SET_BODY_POSITION, new_value, .) if(new_value == LYING_DOWN) // From standing to lying down. on_lying_down() diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm index 88bd8e09c386..0d22616e5f84 100644 --- a/code/modules/mob/living/living_defines.dm +++ b/code/modules/mob/living/living_defines.dm @@ -123,6 +123,8 @@ /// Variable to track the body position of a mob, regardgless of the actual angle of rotation (usually matching it, but not necessarily). var/body_position = STANDING_UP + /// For knowing when was the body position changed + var/body_position_changed = 0 /// Number of degrees of rotation of a mob. 0 means no rotation, up-side facing NORTH. 90 means up-side rotated to face EAST, and so on. VAR_PROTECTED/lying_angle = 0 /// Value of lying lying_angle before last change. TODO: Remove the need for this. diff --git a/code/modules/mob/living/living_healthscan.dm b/code/modules/mob/living/living_healthscan.dm index d11a32c8382e..f450a6a20e4a 100644 --- a/code/modules/mob/living/living_healthscan.dm +++ b/code/modules/mob/living/living_healthscan.dm @@ -693,7 +693,8 @@ GLOBAL_LIST_INIT(known_implants, subtypesof(/obj/item/implant)) else dat += "\tBlood Level normal: [blood_percent]% [blood_volume]cl. Type: [blood_type]\n" // Show pulse - dat += "\tPulse: [H.get_pulse(GETPULSE_TOOL)] bpm.\n" + var/target_pulse = H.get_pulse(GETPULSE_TOOL) + dat += "\tPulse: [target_pulse] bpm.\n" if((H.stat == DEAD && !H.client)) unrevivable = 1 if(!unrevivable) diff --git a/code/modules/mob/living/living_verbs.dm b/code/modules/mob/living/living_verbs.dm index 777aa66fe29d..62c15d12f7f0 100644 --- a/code/modules/mob/living/living_verbs.dm +++ b/code/modules/mob/living/living_verbs.dm @@ -24,6 +24,10 @@ to_chat(src, SPAN_WARNING("You can't resist in your current state.")) return + if(pulledby && isxeno(pulledby)) + to_chat(src, SPAN_WARNING("You can't resist while a xeno is grabbing you.")) + return + resisting = TRUE next_move = world.time + 20 diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index d198f7818eda..712bef37afad 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -905,7 +905,7 @@ note dizziness decrements automatically in the mob's Life() proc. conga_line += S.buckled while(!end_of_conga) var/atom/movable/A = S.pulling - if(A in conga_line || A.anchored) //No loops, nor moving anchored things. + if((A in conga_line) || A.anchored) //No loops, nor moving anchored things. end_of_conga = TRUE break conga_line += A diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index 06e7fe401e16..a675d8bc3e3c 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -148,6 +148,10 @@ return if(living_mob.body_position == LYING_DOWN && !living_mob.can_crawl) return + if(living_mob.body_position == LYING_DOWN && isxeno(mob.pulledby)) + next_movement = world.time + 20 //Good Idea + to_chat(src, SPAN_NOTICE("You cannot crawl while a xeno is grabbing you.")) + return //Check if you are being grabbed and if so attemps to break it if(mob.pulledby) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 954c5d61d784..68ead812dd8f 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -59,9 +59,12 @@ output += "View the Crew Manifest

" output += "View Hive Leaders

" output += "

Join the USCM!

" + if(GLOB.master_mode == /datum/game_mode/extended/faction_clash/cm_vs_upp::name) + output += "

Join the UPP!

" output += "

Join the Hive!

" if(SSticker.mode.flags_round_type & MODE_PREDATOR) - if(SSticker.mode.check_predator_late_join(src,0)) output += "

Join the Hunt!

" + if(SSticker.mode.check_predator_late_join(src, FALSE)) output += "

Join the Hunt!

" + if(SSticker.mode.check_fax_responder_late_join(src, FALSE)) output += "

Respond to Faxes

" output += "

Observe

" @@ -138,7 +141,23 @@ tutorial_menu() return - LateChoices() + late_choices() + + if("late_join_upp") + if(SSticker.current_state != GAME_STATE_PLAYING || !SSticker.mode) + to_chat(src, SPAN_WARNING("The round is either not ready, or has already finished...")) + return + + if(SSticker.mode.flags_round_type & MODE_NO_LATEJOIN) + to_chat(src, SPAN_WARNING("Sorry, you cannot late join during [SSticker.mode.name]. You have to start at the beginning of the round. You may observe or try to join as an alien, if possible.")) + return + + if(client.player_data?.playtime_loaded && (client.get_total_human_playtime() < CONFIG_GET(number/notify_new_player_age)) && !length(client.prefs.completed_tutorials)) + if(tgui_alert(src, "You have little playtime and haven't completed any tutorials. Would you like to go to the tutorial menu?", "Tutorial", list("Yes", "No")) == "Yes") + tutorial_menu() + return + + late_choices_upp() if("late_join_xeno") if(SSticker.current_state != GAME_STATE_PLAYING || !SSticker.mode) @@ -168,13 +187,27 @@ return if(tgui_alert(src, "Are you sure you want to attempt joining as a predator?", "Confirmation", list("Yes", "No")) == "Yes") - if(SSticker.mode.check_predator_late_join(src,0)) + if(SSticker.mode.check_predator_late_join(src, FALSE)) close_spawn_windows() SSticker.mode.attempt_to_join_as_predator(src) else to_chat(src, SPAN_WARNING("You are no longer able to join as predator.")) new_player_panel() + if("late_join_faxes") + if(SSticker.current_state != GAME_STATE_PLAYING || !SSticker.mode) + to_chat(src, SPAN_WARNING("The round is either not ready, or has already finished...")) + return + + if(alert(src,"Are you sure you want to attempt joining as a Fax Responder?","Confirmation","Yes","No") == "Yes" ) + if(SSticker.mode.check_fax_responder_late_join(src, FALSE)) + close_spawn_windows() + SSticker.mode.attempt_to_join_as_fax_responder(src, TRUE) + else + to_chat(src, SPAN_WARNING("You are no longer able to join as a Fax Responder.")) + new_player_panel() + + if("manifest") ViewManifest() @@ -263,16 +296,18 @@ if(!GLOB.enter_allowed) to_chat(usr, SPAN_WARNING("There is an administrative lock on entering the game! (The dropship likely crashed into the Almayer. This should take at most 20 minutes.)")) return - if(!GLOB.RoleAuthority.assign_role(src, player_rank, 1)) + if(!GLOB.RoleAuthority.assign_role(src, player_rank, latejoin = TRUE)) to_chat(src, SPAN_WARNING("[rank] is not available. Please try another.")) return + spawning = TRUE close_spawn_windows() var/mob/living/carbon/human/character = create_character(TRUE) //creates the human and transfers vars and mind GLOB.RoleAuthority.equip_role(character, player_rank, late_join = TRUE) - EquipCustomItems(character) + if(character.ckey in GLOB.donator_items) + to_chat(character, SPAN_BOLDNOTICE("You have gear available in the personal gear vendor near Requisitions.")) if((GLOB.security_level > SEC_LEVEL_BLUE || SShijack.hijack_status) && player_rank.gets_emergency_kit) to_chat(character, SPAN_HIGHDANGER("As you stagger out of hypersleep, the sleep bay blares: '[SShijack.evac_status ? "VESSEL UNDERGOING EVACUATION PROCEDURES, SELF DEFENSE KIT PROVIDED" : "VESSEL IN HEIGHTENED ALERT STATUS, SELF DEFENSE KIT PROVIDED"]'.")) @@ -283,10 +318,10 @@ SSticker.mode.latejoin_update(player_rank) SSticker.mode.update_gear_scale() - for(var/datum/squad/sq in GLOB.RoleAuthority.squads) - if(sq) - sq.max_engineers = engi_slot_formula(length(GLOB.clients)) - sq.max_medics = medic_slot_formula(length(GLOB.clients)) + for(var/datum/squad/target_squad in GLOB.RoleAuthority.squads) + if(target_squad) + target_squad.roles_cap[JOB_SQUAD_ENGI] = engi_slot_formula(length(GLOB.clients)) + target_squad.roles_cap[JOB_SQUAD_MEDIC] = medic_slot_formula(length(GLOB.clients)) var/latejoin_larva_drop = SSticker.mode.latejoin_larva_drop @@ -318,7 +353,7 @@ qdel(src) -/mob/new_player/proc/LateChoices() +/mob/new_player/proc/late_choices() var/mills = world.time // 1/10 of a second, not real milliseconds but whatever //var/secs = ((mills % 36000) % 600) / 10 //Not really needed, but I'll leave it here for refrence... or something var/mins = (mills % 36000) / 600 @@ -337,7 +372,7 @@ for(var/i in GLOB.RoleAuthority.roles_for_mode) var/datum/job/J = GLOB.RoleAuthority.roles_for_mode[i] - if(!GLOB.RoleAuthority.check_role_entry(src, J, TRUE)) + if(!GLOB.RoleAuthority.check_role_entry(src, J, latejoin = TRUE, faction = FACTION_NEUTRAL)) continue var/active = 0 // Only players with the job assigned and AFK for less than 10 minutes count as active @@ -376,7 +411,70 @@ dat += "
Marines:
" roles_show ^= FLAG_SHOW_MARINES - dat += "[J.disp_title] ([J.current_positions]) (Active: [active])
" + dat += "[J.disp_title] ([J.current_positions]) (Active: [active])
" + + dat += "" + show_browser(src, dat, "Late Join", "latechoices", "size=420x700") + +/mob/new_player/proc/late_choices_upp() + var/mills = world.time // 1/10 of a second, not real milliseconds but whatever + //var/secs = ((mills % 36000) % 600) / 10 //Not really needed, but I'll leave it here for refrence... or something + var/mins = (mills % 36000) / 600 + var/hours = mills / 36000 + + var/dat = "
" + dat += "Round Duration: [floor(hours)]h [floor(mins)]m
" + + if(SShijack) + switch(SShijack.evac_status) + if(EVACUATION_STATUS_INITIATED) + dat += "The [MAIN_SHIP_NAME] is being evacuated.
" + + dat += "Choose from the following open positions:
" + var/roles_show = FLAG_SHOW_ALL_JOBS + + for(var/i in GLOB.RoleAuthority.roles_for_mode) + var/datum/job/J = GLOB.RoleAuthority.roles_for_mode[i] + if(!GLOB.RoleAuthority.check_role_entry(src, J, latejoin = TRUE, faction = FACTION_UPP)) + continue + var/active = 0 + // Only players with the job assigned and AFK for less than 10 minutes count as active + for(var/mob/M in GLOB.player_list) + if(M.client && M.job == J.title) + active++ + if(roles_show & FLAG_SHOW_CIC && GLOB.ROLES_CIC_ANTAG.Find(J.title)) + dat += "Command:
" + roles_show ^= FLAG_SHOW_CIC + + else if(roles_show & FLAG_SHOW_AUXIL_SUPPORT && GLOB.ROLES_AUXIL_SUPPORT_ANTAG.Find(J.title)) + dat += "
Auxiliary Combat Support:
" + roles_show ^= FLAG_SHOW_AUXIL_SUPPORT + + else if(roles_show & FLAG_SHOW_MISC && GLOB.ROLES_MISC_ANTAG.Find(J.title)) + dat += "
Other:
" + roles_show ^= FLAG_SHOW_MISC + + else if(roles_show & FLAG_SHOW_POLICE && GLOB.ROLES_POLICE_ANTAG.Find(J.title)) + dat += "
Military Police:
" + roles_show ^= FLAG_SHOW_POLICE + + else if(roles_show & FLAG_SHOW_ENGINEERING && GLOB.ROLES_ENGINEERING_ANTAG.Find(J.title)) + dat += "
Engineering:
" + roles_show ^= FLAG_SHOW_ENGINEERING + + else if(roles_show & FLAG_SHOW_REQUISITION && GLOB.ROLES_REQUISITION_ANTAG.Find(J.title)) + dat += "
Requisitions:
" + roles_show ^= FLAG_SHOW_REQUISITION + + else if(roles_show & FLAG_SHOW_MEDICAL && GLOB.ROLES_MEDICAL_ANTAG.Find(J.title)) + dat += "
Medbay:
" + roles_show ^= FLAG_SHOW_MEDICAL + + else if(roles_show & FLAG_SHOW_MARINES && GLOB.ROLES_MARINES_ANTAG.Find(J.title)) + dat += "
Marines:
" + roles_show ^= FLAG_SHOW_MARINES + + dat += "[J.disp_title] ([J.current_positions]) (Active: [active])
" dat += "
" show_browser(src, dat, "Late Join", "latechoices", "size=420x700") diff --git a/code/modules/mob/new_player/skin_color.dm b/code/modules/mob/new_player/skin_color.dm index f3158613c38c..166cb22eb302 100644 --- a/code/modules/mob/new_player/skin_color.dm +++ b/code/modules/mob/new_player/skin_color.dm @@ -2,6 +2,14 @@ var/name var/icon_name + var/color + +/datum/skin_color/New() + . = ..() + + var/icon/icon_to_use = icon(/datum/species::icobase, "[icon_name]_torso_[/datum/body_size/thin::icon_name]_[/datum/body_type/twig::icon_name]") + color = icon_to_use.GetPixel(icon_to_use.Width() / 2, icon_to_use.Height() / 2) + /datum/skin_color/cmplayer name = "Extra Pale" icon_name = "cmp1" diff --git a/code/modules/mob/new_player/sprite_accessories/hair.dm b/code/modules/mob/new_player/sprite_accessories/hair.dm index 558884f26ff0..078a2b221794 100644 --- a/code/modules/mob/new_player/sprite_accessories/hair.dm +++ b/code/modules/mob/new_player/sprite_accessories/hair.dm @@ -27,18 +27,10 @@ name = "Shoulder-length Hair" icon_state = "hair_long_shoulder" -/datum/sprite_accessory/hair/longalt - name = "Shoulder-length Hair Alt" - icon_state = "hair_longfringe" - /datum/sprite_accessory/hair/longer name = "Long Hair" icon_state = "hair_vlong" -/datum/sprite_accessory/hair/longeralt - name = "Long Hair Alt" - icon_state = "hair_vlongfringe" - /datum/sprite_accessory/hair/longest name = "Very Long Hair" icon_state = "hair_longest" @@ -760,3 +752,71 @@ name = "Gentle Braid" icon_state = "hair_braid3" gender = FEMALE + +/datum/sprite_accessory/hair/close_cut + name = "Closecut" + icon_state = "hair_close_cut" + gender = MALE + +/datum/sprite_accessory/hair/shortbangs2 + name = "Short Bangs 2" + icon_state = "hair_short_bangs" + +/datum/sprite_accessory/hair/bangs + name = "Long Bangs" + icon_state = "hair_bangs" + +/datum/sprite_accessory/hair/bangsreversed + name = "Long Bangs (Reversed)" + icon_state = "hair_reversed_bangs" + +/datum/sprite_accessory/hair/flowey + name = "Flowey Sides" + icon_state = "hair_flowey_sides" + +/datum/sprite_accessory/hair/twirly + name = "Twirly Hair" + icon_state = "hair_twirly" + +/datum/sprite_accessory/hair/ponytail9 + name = "Ponytail 9" + icon_state = "hair_ponytail_9" + gender = FEMALE + +/datum/sprite_accessory/hair/ponytail10 + name = "Ponytail 10" + icon_state = "hair_top_ponytail" + gender = FEMALE + +/datum/sprite_accessory/hair/firecracker + name = "Firecracker" + icon_state = "hair_firecracker" + +/datum/sprite_accessory/hair/slimtop + name = "Slim Top" + icon_state = "hair_slim_top" + gender = MALE + +/datum/sprite_accessory/hair/bun3 + name = "Double Bun" + icon_state = "hair_space_buns" + +/datum/sprite_accessory/hair/diagonalbangs + name = "Diagonal Bangs" + icon_state = "hair_diagonal_bangs" + gender = FEMALE + +/datum/sprite_accessory/hair/bobcutovereye + name = "Bobcut Overeye" + icon_state = "hair_bobcut_overeye" + gender = FEMALE + +/datum/sprite_accessory/hair/shorthime + name = "Hime Cut Short" + icon_state = "hair_short_hime" + gender = FEMALE + +/datum/sprite_accessory/hair/emofringe + name = "Emo Fringe" + icon_state = "hair_emo_fringe" + gender = FEMALE diff --git a/code/modules/objectives/mob_objectives.dm b/code/modules/objectives/mob_objectives.dm index 244da2c6af74..b6c3e8422d7b 100644 --- a/code/modules/objectives/mob_objectives.dm +++ b/code/modules/objectives/mob_objectives.dm @@ -8,7 +8,8 @@ controller = TREE_MARINE /// List of list of active corpses per tech-faction ownership var/list/corpses = list() - var/list/scored_corpses = list() + var/list/scored_other_corpses = list() + var/list/scored_humansynth_corpses = list() /datum/cm_objective/recover_corpses/New() . = ..() @@ -54,7 +55,7 @@ return // This mob has already been scored before - if(LAZYISIN(scored_corpses, dead_mob)) + if(LAZYISIN(scored_other_corpses, dead_mob) || LAZYISIN(scored_humansynth_corpses, dead_mob)) return LAZYDISTINCTADD(corpses, dead_mob) @@ -117,7 +118,7 @@ if(isqueen(X)) //Queen is Tier 0 for some reason... value = OBJECTIVE_ABSOLUTE_VALUE - else if(ishumansynth_strict(target)) + else if(ishumansynth_strict(target) && length(scored_humansynth_corpses) <= 49) // Limit human corpse recovery to 5 total points (.1 each) return OBJECTIVE_LOW_VALUE return value @@ -141,7 +142,10 @@ award_points(corpse_val) corpses -= target - scored_corpses += target + if(ishumansynth_strict(target)) + scored_humansynth_corpses += target + else + scored_other_corpses += target if (isxeno(target)) UnregisterSignal(target, COMSIG_XENO_REVIVED) diff --git a/code/modules/organs/limbs.dm b/code/modules/organs/limbs.dm index 879aeaf89634..8e9a755a2ea0 100644 --- a/code/modules/organs/limbs.dm +++ b/code/modules/organs/limbs.dm @@ -182,11 +182,18 @@ if(severity == 2) probability = 1 damage = 3 - if(prob(probability)) + if(can_emp_delimb() && prob(probability)) droplimb(0, 0, "EMP") else take_damage(damage, 0, 1, 1, used_weapon = "EMP") + for(var/datum/internal_organ/internal_organ in internal_organs) + if(internal_organ.robotic == FALSE) + continue + internal_organ.emp_act(severity) +/// If this limb can be dropped as a result of an EMP +/obj/limb/proc/can_emp_delimb() + return TRUE /obj/limb/proc/take_damage_organ_damage(brute, sharp) if(!owner) @@ -277,6 +284,7 @@ var/previous_brute = brute_dam var/previous_burn = burn_dam + var/previous_bonebreak = (status & LIMB_BROKEN) var/is_ff = FALSE if(istype(attack_source) && attack_source.faction == owner.faction) @@ -370,7 +378,7 @@ var/no_perma_damage = owner.status_flags & NO_PERMANENT_DAMAGE var/no_bone_break = owner.chem_effect_flags & CHEM_EFFECT_RESIST_FRACTURE if(previous_brute > 0 && !is_ff && body_part != BODY_FLAG_CHEST && body_part != BODY_FLAG_GROIN && !no_limb_loss && !no_perma_damage && !no_bone_break) - if(CONFIG_GET(flag/limbs_can_break) && brute_dam >= max_damage * CONFIG_GET(number/organ_health_multiplier) && (status & LIMB_BROKEN)) + if(CONFIG_GET(flag/limbs_can_break) && brute_dam >= max_damage * CONFIG_GET(number/organ_health_multiplier) && previous_bonebreak) //delimbable only if broken before this hit var/cut_prob = brute/max_damage * 5 if(prob(cut_prob)) limb_delimb(damage_source) @@ -531,6 +539,9 @@ This function completely restores a damaged organ to perfect condition. if(internal && !can_bleed_internally) internal = FALSE + if(internal && SSticker.mode && MODE_HAS_TOGGLEABLE_FLAG(MODE_NO_INTERNAL_BLEEDING)) + internal = FALSE + if(length(bleeding_effects_list)) if(!internal) @@ -1309,6 +1320,12 @@ treat_grafted var tells it to apply to grafted but unsalved wounds, for burn kit splint_icon_amount = 1 bandage_icon_amount = 2 +/obj/limb/groin/can_emp_delimb() + if(status & (LIMB_ROBOT | LIMB_SYNTHSKIN)) + return FALSE + + return TRUE + /obj/limb/leg name = "leg" display_name = "leg" @@ -1447,6 +1464,9 @@ treat_grafted var tells it to apply to grafted but unsalved wounds, for burn kit eyes.color = list(null, null, null, null, rgb(owner.r_eyes, owner.g_eyes, owner.b_eyes)) . += eyes + if(HAS_TRAIT(owner, TRAIT_INTENT_EYES)) + . += emissive_appearance(icon = 'icons/mob/humans/onmob/human_face.dmi', icon_state = species.eyes) + if(lip_style && (species && species.flags & HAS_LIPS)) var/image/lips = image('icons/mob/humans/onmob/human_face.dmi', "paint_[lip_style]", layer = -BODYPARTS_LAYER) . += lips diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index e1610fb3401a..1fcb0c477279 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -56,22 +56,28 @@ updateinfolinks() /obj/item/paper/update_icon() - if(icon_state == "paper_talisman" || icon_state == "paper_wy_words" || icon_state == "paper_uscm" || icon_state == "fortune" || icon_state == "paper_flag") + switch(icon_state) + if("paper_talisman", "paper_wy_words", "paper_uscm_words", "paper_flag_words", "fortune") + return + + if(!info) + icon_state = "paper" return - if(info) - if(icon_state == "paper_wy") + + switch(icon_state) + if("paper_wy") icon_state = "paper_wy_words" return - if(icon_state == "paper_uscm") + if("paper_uscm") icon_state = "paper_uscm_words" return - if(icon_state == "paper_flag") + if("paper_flag") icon_state = "paper_flag_words" item_state = "paper_flag" return - icon_state = "paper_words" - return - icon_state = "paper" + else + icon_state = "paper_words" + return /obj/item/paper/get_examine_text(mob/user) . = ..() @@ -913,3 +919,20 @@ . = ..() info = "
" update_icon() + +/obj/item/paper/liaison_brief + name = "Liaison Colony Briefing" + desc = "A brief from the Company about the colony the ship is responding to." + icon_state = "paper_wy_words" + + var/placeholder = "maps/map_briefings/cl_brief_placeholder.html" + +/obj/item/paper/liaison_brief/Initialize(mapload, ...) + . = ..() + if(SSmapping.configs[GROUND_MAP].liaison_briefing) + info = file2text(SSmapping.configs[GROUND_MAP].liaison_briefing) + else + info = file2text(placeholder) + + var/datum/asset/asset = get_asset_datum(/datum/asset/simple/paper) + info = replacetext(info, "%%WYLOGO%%", asset.get_url_mappings()["wylogo.png"]) diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index d05b34e62b2c..babd3b3a0b32 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -39,6 +39,7 @@ var/building_terminal = 0 //Suggestions about how to avoid clickspam building several terminals accepted! var/should_be_mapped = 0 // If this is set to 0 it will send out warning on New() power_machine = TRUE + var/explosion_proof = TRUE /obj/structure/machinery/power/smes/Initialize() . = ..() @@ -62,6 +63,12 @@ return INITIALIZE_HINT_ROUNDSTART +/obj/structure/machinery/power/smes/ex_act(severity) + if(explosion_proof) + return + else + .=..() + /obj/structure/machinery/power/smes/LateInitialize() . = ..() diff --git a/code/modules/projectiles/ammo_boxes/ammo_boxes.dm b/code/modules/projectiles/ammo_boxes/ammo_boxes.dm index c0139c97f66f..cee4140ef13f 100644 --- a/code/modules/projectiles/ammo_boxes/ammo_boxes.dm +++ b/code/modules/projectiles/ammo_boxes/ammo_boxes.dm @@ -167,6 +167,13 @@ to_chat(user, SPAN_WARNING("You can't cram any more boxes in here!")) return + // Make sure a platform wouldn't block it + if(box_on_tile * 2 >= limit_per_tile) // Allow 2 if limit is 4 + var/obj/structure/platform/platform = locate() in T + if(platform?.dir == NORTH) + to_chat(user, SPAN_WARNING("You can't cram any more boxes in here!")) + return + var/obj/structure/magazine_box/M = new /obj/structure/magazine_box(T) M.icon_state = icon_state_deployed ? icon_state_deployed : icon_state M.name = name diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 0e2035f48330..e23f5ab9b20e 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -893,18 +893,23 @@ User can be passed as null, (a gun reloading itself for instance), so we need to if(!in_chamber) return var/found_handful + var/ammo_type = get_ammo_type_chambered(user) for(var/obj/item/ammo_magazine/handful/H in user.loc) - if(H.default_ammo == in_chamber.ammo.type && H.caliber == caliber && H.current_rounds < H.max_rounds) + if(H.default_ammo == ammo_type && H.caliber == caliber && H.current_rounds < H.max_rounds) found_handful = TRUE H.current_rounds++ H.update_icon() break if(!found_handful) var/obj/item/ammo_magazine/handful/new_handful = new(get_turf(src)) - new_handful.generate_handful(in_chamber.ammo.type, caliber, 8, 1, type) + new_handful.generate_handful(ammo_type, caliber, 8, 1, type) QDEL_NULL(in_chamber) +//Funny fix for smatrgun +/obj/item/weapon/gun/proc/get_ammo_type_chambered(mob/user) + return in_chamber.ammo.type + //Manually cock the gun //This only works on weapons NOT marked with UNUSUAL_DESIGN or INTERNAL_MAG /obj/item/weapon/gun/proc/cock(mob/user) diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm index 757ccd10394b..2847021c4775 100644 --- a/code/modules/projectiles/gun_attachables.dm +++ b/code/modules/projectiles/gun_attachables.dm @@ -2989,24 +2989,37 @@ Defined in conflicts.dm of the #defines folder. /obj/item/attachable/attached_gun/flamer/handle_pre_break_attachment_description(base_description_text as text) return base_description_text + " It is on [intense_mode ? "intense" : "normal"] mode." -/obj/item/attachable/attached_gun/flamer/reload_attachment(obj/item/ammo_magazine/flamer_tank/FT, mob/user) - if(istype(FT)) - if(current_rounds >= max_rounds) +/obj/item/attachable/attached_gun/flamer/reload_attachment(obj/item/ammo_magazine/flamer_tank/fuel_holder, mob/user) + if(istype(fuel_holder)) + var/amt_to_refill = max_rounds - current_rounds + if(!amt_to_refill) to_chat(user, SPAN_WARNING("[src] is full.")) - else if(FT.current_rounds <= 0) - to_chat(user, SPAN_WARNING("[FT] is empty!")) - else - playsound(user, 'sound/effects/refill.ogg', 25, 1, 3) - to_chat(user, SPAN_NOTICE("You refill [src] with [FT].")) - var/transfered_rounds = min(max_rounds - current_rounds, FT.current_rounds) - current_rounds += transfered_rounds - FT.current_rounds -= transfered_rounds - - var/amount_of_reagents = length(FT.reagents.reagent_list) - var/amount_removed_per_reagent = transfered_rounds / amount_of_reagents - for(var/datum/reagent/R in FT.reagents.reagent_list) - R.volume -= amount_removed_per_reagent - FT.update_icon() + return + + if(!fuel_holder.reagents || length(fuel_holder.reagents.reagent_list) < 1) + to_chat(user, SPAN_WARNING("[fuel_holder] is empty!")) + return + + var/datum/reagent/to_remove = fuel_holder.reagents.reagent_list[1] + + var/flamer_chem = "utnapthal" + if(!istype(to_remove) || flamer_chem != to_remove.id || length(fuel_holder.reagents.reagent_list) > 1) + to_chat(user, SPAN_WARNING("You can't mix fuel mixtures!")) + return + + var/fuel_amt + if(to_remove) + fuel_amt = to_remove.volume < amt_to_refill ? to_remove.volume : amt_to_refill + + if(!fuel_amt) + to_chat(user, SPAN_WARNING("[fuel_holder] is empty!")) + return + + playsound(user, 'sound/effects/refill.ogg', 25, 1, 3) + to_chat(user, SPAN_NOTICE("You refill [src] with [fuel_holder].")) + current_rounds += fuel_amt + fuel_holder.reagents.remove_reagent(to_remove.id, fuel_amt) + fuel_holder.update_icon() else to_chat(user, SPAN_WARNING("[src] can only be refilled with an incinerator tank.")) diff --git a/code/modules/projectiles/guns/flare_gun.dm b/code/modules/projectiles/guns/flare_gun.dm index 407ecdf00066..7a2d0f0ddfb7 100644 --- a/code/modules/projectiles/guns/flare_gun.dm +++ b/code/modules/projectiles/guns/flare_gun.dm @@ -126,6 +126,9 @@ fired_flare.visible_message(SPAN_WARNING("\A [fired_flare] bursts into brilliant light in the sky!")) fired_flare.invisibility = INVISIBILITY_MAXIMUM fired_flare.mouse_opacity = FALSE + fired_flare.fuel = 3 MINUTES + fired_flare.light_range = 6 + fired_flare.light_power = 3 playsound(user.loc, fire_sound, 50, 1) var/obj/effect/flare_light/light_effect = new (fired_flare, fired_flare.light_range, fired_flare.light_power, fired_flare.light_color) @@ -146,7 +149,7 @@ desc = "You are not supposed to see this. Please report it." icon_state = "" //No sprite invisibility = INVISIBILITY_MAXIMUM - light_system = STATIC_LIGHT + light_system = MOVABLE_LIGHT /obj/effect/flare_light/Initialize(mapload, light_range, light_power, light_color) . = ..() diff --git a/code/modules/projectiles/guns/rifles.dm b/code/modules/projectiles/guns/rifles.dm index d2e9d6a30a5a..3192244d1e20 100644 --- a/code/modules/projectiles/guns/rifles.dm +++ b/code/modules/projectiles/guns/rifles.dm @@ -1664,7 +1664,7 @@ /obj/item/weapon/gun/rifle/l42a/abr40 name = "\improper ABR-40 hunting rifle" - desc = "The civilian version of the L42A battle rifle. Almost identical and even cross-compatible with L42 magazines, just don't take the stock off.." + desc = "The civilian version of the L42A battle rifle. Almost identical and even cross-compatible with L42 magazines, just don't take the stock off." desc_lore = "The ABR-40 was created along-side the L42A as a hunting rifle for civilians. Sporting faux wooden furniture and a legally-mandated 12 round magazine, it's still highly accurate and deadly, a favored pick of experienced hunters and retired Marines. However, it's very limited in attachment selection, only being able to fit rail attachments, and the differences in design from the L42 force an awkward pose when attempting to hold it one-handed. Removing the stock is not recommended." icon = 'icons/obj/items/weapons/guns/guns_by_faction/colony.dmi' icon_state = "abr40" @@ -1714,32 +1714,35 @@ /obj/item/attachable/bayonet, /obj/item/attachable/bayonet/upp, /obj/item/attachable/bayonet/co2, - //Rail, - /obj/item/attachable/reddot, - /obj/item/attachable/reflex, - /obj/item/attachable/flashlight, - /obj/item/attachable/magnetic_harness, - /obj/item/attachable/scope, - /obj/item/attachable/scope/mini, - /obj/item/attachable/scope/mini/hunting, //Under, /obj/item/attachable/flashlight/grip, //Stock, - /obj/item/attachable/stock/carbine, /obj/item/attachable/stock/carbine/wood, /obj/item/attachable/stock/carbine/wood/tactical, ) starting_attachment_types = list(/obj/item/attachable/stock/carbine/wood/tactical, /obj/item/attachable/suppressor) - random_spawn_chance = 100 - random_spawn_rail = list( - /obj/item/attachable/reflex, - /obj/item/attachable/magnetic_harness, - /obj/item/attachable/scope, - /obj/item/attachable/scope/mini/hunting, - ) - random_under_chance = 50 + random_under_chance = 100 random_spawn_under = list(/obj/item/attachable/flashlight/grip) +/obj/item/weapon/gun/rifle/l42a/abr40/tactical/handle_starting_attachment() + ..() + var/obj/item/attachable/magnetic_harness/integrated = new(src) + integrated.flags_attach_features &= ~ATTACH_REMOVABLE + integrated.hidden = TRUE + integrated.Attach(src) + update_attachable(integrated.slot) + +/obj/item/weapon/gun/rifle/l42a/abr40/tactical/set_gun_config_values() + ..() + set_fire_delay(FIRE_DELAY_TIER_10) + set_burst_amount(0) + accuracy_mult = BASE_ACCURACY_MULT + HIT_ACCURACY_MULT_TIER_5 + accuracy_mult_unwielded = BASE_ACCURACY_MULT - HIT_ACCURACY_MULT_TIER_4 + damage_mult = BASE_BULLET_DAMAGE_MULT + BULLET_DAMAGE_MULT_TIER_7 + recoil_unwielded = RECOIL_AMOUNT_TIER_4 + damage_falloff_mult = 0 + scatter = SCATTER_AMOUNT_TIER_8 + //=ROYAL MARINES=\\ /obj/item/weapon/gun/rifle/rmc_f90 diff --git a/code/modules/projectiles/guns/shotguns.dm b/code/modules/projectiles/guns/shotguns.dm index 3c125acc7914..f568f2657dc8 100644 --- a/code/modules/projectiles/guns/shotguns.dm +++ b/code/modules/projectiles/guns/shotguns.dm @@ -71,10 +71,10 @@ can cause issues with ammo types getting mixed up during the burst. to_chat(user, SPAN_DANGER("[current_mag.current_rounds][chambered ? "+1" : ""] / [current_mag.max_rounds] ROUNDS REMAINING")) return TRUE -/obj/item/weapon/gun/shotgun/proc/empty_chamber(mob/user) +/obj/item/weapon/gun/shotgun/proc/empty_chamber(mob/user, silent = FALSE, only_chamber = FALSE) if(!current_mag) return - if(current_mag.current_rounds <= 0) + if(only_chamber || current_mag.current_rounds <= 0) if(in_chamber) in_chamber = null var/obj/item/ammo_magazine/handful/new_handful = retrieve_shell(ammo.type) @@ -82,9 +82,10 @@ can cause issues with ammo types getting mixed up during the burst. new_handful.forceMove(get_turf(src)) if(flags_gun_features & GUN_AMMO_COUNTER && user) var/chambered = in_chamber ? TRUE : FALSE //useless, but for consistency - to_chat(user, SPAN_DANGER("[current_mag.current_rounds][chambered ? "+1" : ""] / [current_mag.max_rounds] ROUNDS REMAINING")) + if(!silent) + to_chat(user, SPAN_DANGER("[current_mag.current_rounds][chambered ? "+1" : ""] / [current_mag.max_rounds] ROUNDS REMAINING")) else - if(user) + if(user && !silent) to_chat(user, SPAN_WARNING("[src] is already empty.")) return @@ -1195,14 +1196,31 @@ can cause issues with ammo types getting mixed up during the burst. current_mag = /obj/item/ammo_magazine/internal/shotgun var/obj/item/ammo_magazine/internal/shotgun/primary_tube var/obj/item/ammo_magazine/internal/shotgun/secondary_tube + var/chamber_swap = FALSE /obj/item/weapon/gun/shotgun/pump/dual_tube/Initialize(mapload, spawn_empty) + LAZYADD(actions_types, /datum/action/item_action/dual_tube/toggle_chamber_swap) . = ..() primary_tube = current_mag secondary_tube = new current_mag.type(src, spawn_empty ? TRUE : FALSE) current_mag = secondary_tube replace_tube(current_mag.current_rounds) +/obj/item/weapon/gun/shotgun/pump/dual_tube/get_examine_text(mob/user) + . = ..() + var/has_chamber_swap = locate(/datum/action/item_action/dual_tube/toggle_chamber_swap) in actions + if(has_chamber_swap) + . += SPAN_NOTICE("Use toggle firemode to toggle chamber-swapping.") + +/obj/item/weapon/gun/shotgun/pump/dual_tube/do_toggle_firemode(datum/source, datum/keybinding, new_firemode) + var/datum/action/item_action/dual_tube/toggle_chamber_swap/chamber_swap_ability = locate() in actions + if(chamber_swap_ability) + //do_toggle_firemode is a signal handler. needs async to stop sleep override warnings + INVOKE_ASYNC(chamber_swap_ability, TYPE_PROC_REF(/datum/action/item_action/dual_tube/toggle_chamber_swap, action_activate)) + return + + . = ..() + /obj/item/weapon/gun/shotgun/pump/dual_tube/Destroy() QDEL_NULL(primary_tube) QDEL_NULL(secondary_tube) @@ -1217,10 +1235,32 @@ can cause issues with ammo types getting mixed up during the burst. return if(!current_mag) return + + ///The currently chambered shell in the gun before the tube gets swapped. + var/obj/item/ammo_magazine/chambered_shell + if(chamber_swap && in_chamber) + if(current_mag.current_rounds == current_mag.max_rounds) + to_chat(user, SPAN_WARNING("The current tube is overloaded! [src] spits out the chambered shell!")) + empty_chamber(user, TRUE, TRUE) + else + chambered_shell = retrieve_shell(ammo.type) + in_chamber = null + + if(chambered_shell) + add_to_tube(user, chambered_shell.default_ammo) + current_mag.current_rounds++ + if(current_mag == primary_tube) current_mag = secondary_tube else current_mag = primary_tube + + //Chamber swaps require the gun to be pumped afterwards. We'll force the gun to be pumped as it would be pretty annoying otherwise. + if(!in_chamber && chamber_swap) + ready_shotgun_tube() + if(in_chamber) + pumped = TRUE + to_chat(user, SPAN_NOTICE("[icon2html(src, user)] You switch \the [src]'s active magazine to the [(current_mag == primary_tube) ? "first" : "second"] magazine.")) playsound(src, 'sound/machines/switch.ogg', 15, TRUE) return TRUE @@ -1235,6 +1275,32 @@ can cause issues with ammo types getting mixed up during the burst. if(shotgun == src) swap_tube(usr) +//item action for handling switching chambered shells when swapping tubes. +/datum/action/item_action/dual_tube/toggle_chamber_swap/New(Target, obj/item/holder) + . = ..() + name = "Toggle Chamber Swap" + action_icon_state = "chamber_swap" + button.name = name + button.overlays.Cut() + button.overlays += image('icons/mob/hud/actions.dmi', button, action_icon_state) + +/datum/action/item_action/dual_tube/toggle_chamber_swap/action_activate() + . = ..() + var/obj/item/weapon/gun/shotgun/pump/dual_tube/holder_gun = holder_item + holder_gun.chamber_swap = !holder_gun.chamber_swap + + playsound(owner, 'sound/weapons/handling/gun_burst_toggle.ogg', 15, 1) + + if(holder_gun.chamber_swap) + to_chat(owner, SPAN_NOTICE("[icon2html(holder_gun, owner)] You will start swapping the chambered shell with the other tube. Your current tube must be underloaded or it will forcefully eject the shell out of the chamber.")) + button.icon_state = "template_on" + else + to_chat(owner, SPAN_NOTICE("[icon2html(holder_gun, owner)] You will stop swapping the chambered shell with the other tube.")) + button.icon_state = "template" + + button.overlays.Cut() + button.overlays += image('icons/mob/hud/actions.dmi', button, action_icon_state) + //SHOTGUN FROM ISOLATION /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb @@ -1264,7 +1330,6 @@ can cause issues with ammo types getting mixed up during the burst. /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb/set_gun_attachment_offsets() attachable_offset = list("muzzle_x" = 31, "muzzle_y" = 17,"rail_x" = 8, "rail_y" = 21, "under_x" = 22, "under_y" = 15, "stock_x" = 24, "stock_y" = 10) - /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb/set_gun_config_values() ..() set_fire_delay(1.6 SECONDS) diff --git a/code/modules/projectiles/guns/smartgun.dm b/code/modules/projectiles/guns/smartgun.dm index a47480a6b257..6cf6eeead45b 100644 --- a/code/modules/projectiles/guns/smartgun.dm +++ b/code/modules/projectiles/guns/smartgun.dm @@ -168,6 +168,9 @@ return . = ..() +/obj/item/weapon/gun/smartgun/get_ammo_type_chambered(mob/user) + return ammo_primary + /obj/item/weapon/gun/smartgun/update_icon() . = ..() if(cover_open) diff --git a/code/modules/projectiles/guns/smgs.dm b/code/modules/projectiles/guns/smgs.dm index 6be0f979c7ad..4cc0100f1b41 100644 --- a/code/modules/projectiles/guns/smgs.dm +++ b/code/modules/projectiles/guns/smgs.dm @@ -136,6 +136,23 @@ scatter_unwielded = SCATTER_AMOUNT_TIER_6 damage_mult = BASE_BULLET_DAMAGE_MULT + BULLET_DAMAGE_MULT_TIER_7 +/obj/item/weapon/gun/smg/m39/corporate + desc = "A Weyland-Yutani creation, this M-39 comes equipped in corporate white. Uses 10x20mm caseless ammunition." + icon = 'icons/obj/items/weapons/guns/guns_by_map/snow/guns_obj.dmi' + item_icons = list( + WEAR_L_HAND = 'icons/obj/items/weapons/guns/guns_by_map/snow/guns_lefthand.dmi', + WEAR_R_HAND = 'icons/obj/items/weapons/guns/guns_by_map/snow/guns_righthand.dmi', + WEAR_BACK = 'icons/obj/items/weapons/guns/guns_by_map/snow/back.dmi', + WEAR_J_STORE = 'icons/obj/items/weapons/guns/guns_by_map/snow/suit_slot.dmi' + ) + flags_gun_features = GUN_AUTO_EJECTOR|GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER|GUN_WY_RESTRICTED + map_specific_decoration = FALSE + starting_attachment_types = list(/obj/item/attachable/stock/smg/collapsible) + +/obj/item/weapon/gun/smg/m39/corporate/no_lock //for PMC nightmares. + desc = "A Weyland-Yutani creation, this M-39 comes equipped in corporate white. Uses 10x20mm caseless ammunition. This one had its IFF electronics removed." + flags_gun_features = GUN_AUTO_EJECTOR|GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER + /obj/item/weapon/gun/smg/m39/elite/whiteout//attachies + heap mag for whiteout. starting_attachment_types = list(/obj/item/attachable/stock/smg, /obj/item/attachable/suppressor, /obj/item/attachable/angledgrip, /obj/item/attachable/magnetic_harness) current_mag = /obj/item/ammo_magazine/smg/m39/heap diff --git a/code/modules/projectiles/guns/specialist/launcher/grenade_launcher.dm b/code/modules/projectiles/guns/specialist/launcher/grenade_launcher.dm index 9830dc0f15f7..c313d37b626c 100644 --- a/code/modules/projectiles/guns/specialist/launcher/grenade_launcher.dm +++ b/code/modules/projectiles/guns/specialist/launcher/grenade_launcher.dm @@ -363,7 +363,7 @@ update_attachable(S.slot) /obj/item/weapon/gun/launcher/grenade/m81/m79/set_gun_attachment_offsets() - attachable_offset = list("muzzle_x" = 33, "muzzle_y" = 18,"rail_x" = 9, "rail_y" = 22, "under_x" = 19, "under_y" = 14, "stock_x" = 14, "stock_y" = 14) + attachable_offset = list("muzzle_x" = 33, "muzzle_y" = 18, "rail_x" = 11, "rail_y" = 21, "under_x" = 19, "under_y" = 14, "stock_x" = 14, "stock_y" = 14) /obj/item/weapon/gun/launcher/grenade/m81/m79/set_bullet_traits() LAZYADD(traits_to_give, list( diff --git a/code/modules/projectiles/guns/specialist/launcher/rocket_launcher.dm b/code/modules/projectiles/guns/specialist/launcher/rocket_launcher.dm index 8a752d4d9094..79b990476c45 100644 --- a/code/modules/projectiles/guns/specialist/launcher/rocket_launcher.dm +++ b/code/modules/projectiles/guns/specialist/launcher/rocket_launcher.dm @@ -40,7 +40,7 @@ /obj/item/weapon/gun/launcher/rocket/set_gun_attachment_offsets() - attachable_offset = list("muzzle_x" = 33, "muzzle_y" = 18,"rail_x" = 6, "rail_y" = 19, "under_x" = 19, "under_y" = 14, "stock_x" = 19, "stock_y" = 14) + attachable_offset = list("muzzle_x" = 33, "muzzle_y" = 18,"rail_x" = 8, "rail_y" = 21, "under_x" = 19, "under_y" = 14, "stock_x" = 19, "stock_y" = 14) /obj/item/weapon/gun/launcher/rocket/set_gun_config_values() diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index cdc23da1a940..3dd50b590127 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -187,7 +187,7 @@ return damage // Target, firer, shot from (i.e. the gun), projectile range, projectile speed, original target (who was aimed at, not where projectile is going towards) -/obj/projectile/proc/fire_at(atom/target, atom/F, atom/S, range = 30, speed = 1, atom/original_override) +/obj/projectile/proc/fire_at(atom/target, atom/F, atom/S, range = 30, speed = 1, atom/original_override, randomize_speed = TRUE) SHOULD_NOT_SLEEP(TRUE) original = original || original_override || target if(!loc) @@ -230,6 +230,7 @@ //If we have the right kind of ammo, we can fire several projectiles at once. if(ammo.bonus_projectiles_amount && ammo.bonus_projectiles_type) + randomize_speed = FALSE ammo.fire_bonus_projectiles(src) bonus_projectile_check = 1 //Mark this projectile as having spawned a set of bonus projectiles. @@ -241,8 +242,11 @@ src.speed = speed // Randomize speed by a small factor to help bullet animations look okay // Otherwise you get a s t r e a m of warping bullets in same positions - src.speed *= (1 + (rand()-0.5) * 0.30) // 15.0% variance either way - src.speed = clamp(src.speed, 0.1, 100) // Safety to avoid loop hazards + if (randomize_speed) + src.speed *= (1 + (rand()-0.5) * 0.30) // 15.0% variance either way + + // Safety to avoid loop hazards + src.speed = clamp(src.speed, 0.1, 100) // Also give it some headstart, flying it now ahead of tick var/delta_time = world.tick_lag * rand() * 0.4 @@ -835,8 +839,10 @@ //mobs use get_projectile_hit_chance instead of get_projectile_hit_boolean /mob/living/proc/get_projectile_hit_chance(obj/projectile/P) - if((body_position == LYING_DOWN || HAS_TRAIT(src, TRAIT_NO_STRAY)) && src != P.original) + if(HAS_TRAIT(src, TRAIT_NO_STRAY) && src != P.original) return FALSE + if(body_position == LYING_DOWN && src != P.original && world.time - body_position_changed > 0.1 SECONDS) + return FALSE // Fixes for buckshot projectiles not hitting stunned targets var/ammo_flags = P.ammo.flags_ammo_behavior | P.projectile_override_flags if(ammo_flags & AMMO_XENO) if((status_flags & XENO_HOST) && HAS_TRAIT(src, TRAIT_NESTED)) @@ -1199,7 +1205,7 @@ /obj/item/bullet_act(obj/projectile/P) bullet_ping(P) - if(P.ammo.damage_type == BRUTE) + if(P.ammo.damage_type == BRUTE && !(P.ammo.flags_ammo_behavior & AMMO_XENO)) explosion_throw(P.damage/2, P.dir, 4) return TRUE diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index de365de8e2a6..2d1e666aef9e 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -222,90 +222,80 @@ return amount /datum/reagents/proc/metabolize(mob/M, alien, delta_time) - for(var/datum/reagent/R in reagent_list) - if(M && R && !QDELETED(R)) - R.on_mob_life(M, alien, delta_time) + for(var/datum/reagent/reagent in reagent_list) + if(M && reagent && !QDELETED(reagent)) + reagent.on_mob_life(M, alien, delta_time) update_total() /datum/reagents/proc/handle_reactions() - if(!my_atom) return - if(my_atom.flags_atom & NOREACT) return //Yup, no reactions here. No siree. + if(!my_atom) + return + if(my_atom.flags_atom & NOREACT) + return //Yup, no reactions here. No siree. - var/reaction_occurred = 0 + var/reaction_occurred = FALSE do - reaction_occurred = 0 - for(var/datum/reagent/R in reagent_list) // Usually a small list - if(R.original_id) //Prevent synthesised chem variants from being mixed - for(var/datum/reagent/O in reagent_list) - if(O.id == R.id) + reaction_occurred = FALSE + for(var/datum/reagent/reagent in reagent_list) // Usually a small list + if(reagent.original_id) //Prevent synthesised chem variants from being mixed + for(var/datum/reagent/current in reagent_list) + if(current.id == reagent.id) continue - else if(O.original_id == R.original_id || O.id == R.original_id) + else if(current.original_id == reagent.original_id || current.id == reagent.original_id) //Merge into the original - reagent_list -= R - O.volume += R.volume - qdel(R) + reagent_list -= reagent + current.volume += reagent.volume + qdel(reagent) break - for(var/reaction in GLOB.chemical_reactions_filtered_list[R.id]) // Was a big list but now it should be smaller since we filtered it with our reagent id - - if(!reaction) - continue - - var/datum/chemical_reaction/C = reaction - - var/total_required_reagents = length(C.required_reagents) + for(var/datum/chemical_reaction/reaction in GLOB.chemical_reactions_filtered_list[reagent.id]) // Was a big list but now it should be smaller since we filtered it with our reagent id + var/total_required_reagents = length(reaction.required_reagents) var/total_matching_reagents = 0 var/total_required_catalysts = 0 - if(C.required_catalysts) - total_required_catalysts = length(C.required_catalysts) + if(reaction.required_catalysts) + total_required_catalysts = length(reaction.required_catalysts) var/total_matching_catalysts= 0 - var/matching_container = 0 - var/matching_other = 0 + var/matching_container = FALSE var/list/multipliers = new/list() - for(var/B in C.required_reagents) - if(!has_reagent(B, C.required_reagents[B])) + for(var/required_reagent in reaction.required_reagents) + if(!has_reagent(required_reagent, reaction.required_reagents[required_reagent])) break total_matching_reagents++ - multipliers += floor(get_reagent_amount(B) / C.required_reagents[B]) - for(var/B in C.required_catalysts) - if(B == "silver" && istype(my_atom, /obj/item/reagent_container/glass/beaker/silver)) + multipliers += floor(get_reagent_amount(required_reagent) / reaction.required_reagents[required_reagent]) + for(var/catalyst in reaction.required_catalysts) + if(catalyst == "silver" && istype(my_atom, /obj/item/reagent_container/glass/beaker/silver)) total_matching_catalysts++ continue - if(!has_reagent(B, C.required_catalysts[B])) + if(!has_reagent(catalyst, reaction.required_catalysts[catalyst])) break total_matching_catalysts++ - if(isliving(my_atom) && !C.mob_react) //Makes it so some chemical reactions don't occur in mobs + if(isliving(my_atom) && !reaction.mob_react) //Makes it so some chemical reactions don't occur in mobs continue - if(!C.required_container) - matching_container = 1 - - else - if(my_atom.type == C.required_container) - matching_container = 1 - - if(!C.required_other) - matching_other = 1 + if(!reaction.required_container) + matching_container = TRUE + else if(ispath(my_atom.type, reaction.required_container)) + matching_container = TRUE - if(total_matching_reagents == total_required_reagents && total_matching_catalysts == total_required_catalysts && matching_container && matching_other) + if(total_matching_reagents == total_required_reagents && total_matching_catalysts == total_required_catalysts && matching_container) var/multiplier = min(multipliers) var/preserved_data = null - for(var/B in C.required_reagents) + for(var/required_reagent in reaction.required_reagents) if(!preserved_data) - preserved_data = get_data(B) - remove_reagent(B, (multiplier * C.required_reagents[B]), safety = 1) + preserved_data = get_data(required_reagent) + remove_reagent(required_reagent, (multiplier * reaction.required_reagents[required_reagent]), safety = TRUE) - var/created_volume = C.result_amount*multiplier - if(C.result) + var/created_volume = reaction.result_amount*multiplier + if(reaction.result) multiplier = max(multiplier, 1) //this shouldnt happen ... - add_reagent(C.result, C.result_amount*multiplier) - set_data(C.result, preserved_data) + add_reagent(reaction.result, reaction.result_amount*multiplier) + set_data(reaction.result, preserved_data) //add secondary products - for(var/S in C.secondary_results) - add_reagent(S, C.result_amount * C.secondary_results[S] * multiplier) + for(var/secondary_result in reaction.secondary_results) + add_reagent(secondary_result, reaction.result_amount * reaction.secondary_results[secondary_result] * multiplier) var/list/seen = viewers(4, get_turf(my_atom)) for(var/mob/M in seen) @@ -313,8 +303,8 @@ playsound(get_turf(my_atom), 'sound/effects/bubbles.ogg', 15, 1) - C.on_reaction(src, created_volume) - reaction_occurred = 1 + reaction.on_reaction(src, created_volume) + reaction_occurred = TRUE break while(reaction_occurred) diff --git a/code/modules/reagents/Chemistry-Reactions.dm b/code/modules/reagents/Chemistry-Reactions.dm index 7a8f0b21158a..5e3c7e15d58a 100644 --- a/code/modules/reagents/Chemistry-Reactions.dm +++ b/code/modules/reagents/Chemistry-Reactions.dm @@ -6,15 +6,17 @@ var/list/required_reagents = new/list() var/list/required_catalysts = new/list() - var/mob_react = TRUE //Determines if a chemical reaction can occur inside a mob + /// Determines if a chemical reaction can occur inside a mob + var/mob_react = TRUE + /// The container path required for the reaction to happen + var/required_container = null - // both vars below are currently unused - var/atom/required_container = null // the container required for the reaction to happen - var/required_other = 0 // an integer required for the reaction to happen - - var/result_amount = 0 //I recommend you set the result amount to the total volume of all components. - var/secondary = 0 // set to nonzero if secondary reaction - var/list/secondary_results = list() //additional reagents produced by the reaction + /// The resulting amount: Recommended to be set to the total volume of all components + var/result_amount = 0 + /// set to nonzero if secondary reaction + var/secondary = 0 + /// additional reagents produced by the reaction + var/list/secondary_results = list() var/requires_heating = 0 /datum/chemical_reaction/proc/on_reaction(datum/reagents/holder, created_volume) diff --git a/code/modules/reagents/chemistry_machinery/chem_dispenser.dm b/code/modules/reagents/chemistry_machinery/chem_dispenser.dm index f0a3faeb75ce..5c885d59e8f7 100644 --- a/code/modules/reagents/chemistry_machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry_machinery/chem_dispenser.dm @@ -20,6 +20,7 @@ var/network = "Ground" var/amount = 30 var/accept_beaker_only = TRUE + var/pressurized_only = FALSE var/obj/item/reagent_container/beaker = null var/ui_check = 0 var/static/list/possible_transfer_amounts = list(5,10,20,30,40) @@ -89,6 +90,14 @@ if(!inoperable()) overlays += "+onlight" +/obj/structure/machinery/chem_dispenser/corpsman/update_icon() + if(stat & BROKEN) + icon_state = (beaker ? "mixer1_b" : "mixer0_b") + else if(stat & NOPOWER) + icon_state = (beaker ? "[base_state]1_nopower" : "[base_state]0_nopower") + else + icon_state = (beaker ? "[base_state]1" : "[base_state]0") + /obj/structure/machinery/chem_dispenser/on_stored_atom_del(atom/movable/AM) if(AM == beaker) beaker = null @@ -204,6 +213,10 @@ if(istype(attacking_object, /obj/item/reagent_container/glass) || istype(attacking_object, /obj/item/reagent_container/food)) if(accept_beaker_only && istype(attacking_object,/obj/item/reagent_container/food)) to_chat(user, SPAN_NOTICE("This machine only accepts beakers")) + return + if(pressurized_only && !istype(attacking_object, /obj/item/reagent_container/glass/pressurized_canister)) + to_chat(user, SPAN_NOTICE("This machine only accepts pressurized canisters")) + return if(user.drop_inv_item_to_loc(attacking_object, src)) var/obj/item/old_beaker = beaker beaker = attacking_object @@ -259,6 +272,28 @@ return tgui_interact(user) +/obj/structure/machinery/chem_dispenser/corpsman + name = "pressurized chemical dispenser" + desc = "A more basic chemical dispenser, designed for use with pressurized reagent canisters. A Wey-Yu product." + icon_state = "mixer0" + ui_title = "Chem Dispenser 4000" + req_skill_level = SKILL_MEDICAL_MEDIC + accept_beaker_only = FALSE + pressurized_only = TRUE + dispensable_reagents = list( + "bicaridine", + "kelotane", + "anti_toxin", + "dexalin", + "inaprovaline", + "adrenaline", + "peridaxon", + "tramadol", + "tricordrazine", + ) + + var/base_state = "mixer" + /obj/structure/machinery/chem_dispenser/soda icon_state = "soda_dispenser" name = "soda fountain" diff --git a/code/modules/reagents/chemistry_machinery/chem_master.dm b/code/modules/reagents/chemistry_machinery/chem_master.dm index 9ab8d81066e0..77f79bee4c58 100644 --- a/code/modules/reagents/chemistry_machinery/chem_master.dm +++ b/code/modules/reagents/chemistry_machinery/chem_master.dm @@ -27,7 +27,7 @@ /obj/structure/machinery/chem_master/Initialize() . = ..() - create_reagents(300) + create_reagents(500) connect_smartfridge() /obj/structure/machinery/chem_master/Destroy() @@ -76,7 +76,7 @@ user.put_in_hands(old_beaker) else to_chat(user, SPAN_NOTICE("You add the beaker to the machine!")) - updateUsrDialog() + SStgui.update_uis(src) update_icon() else if(istype(B, /obj/item/storage/pill_bottle) && pill_maker) @@ -87,7 +87,7 @@ loaded_pill_bottle = B user.drop_inv_item_to_loc(B, src) to_chat(user, SPAN_NOTICE("You add the pill bottle into the dispenser slot!")) - updateUsrDialog() + SStgui.update_uis(src) return /obj/structure/machinery/chem_master/proc/transfer_chemicals(obj/dest, obj/source, amount, reagent_id) @@ -98,240 +98,292 @@ else if(dest.reagents) source.reagents.trans_id_to(dest, reagent_id, amount) -/obj/structure/machinery/chem_master/Topic(href, href_list) +/obj/structure/machinery/chem_master/tgui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "ChemMaster", name) + ui.open() + +/obj/structure/machinery/chem_master/ui_data(mob/user) . = ..() - if(.) - return + + .["is_connected"] = !!connected + .["mode"] = mode + .["pillsprite"] = pillsprite + .["bottlesprite"] = bottlesprite + + .["pill_bottle"] = null + if(loaded_pill_bottle) + var/datum/component/label/label = loaded_pill_bottle.GetComponent(/datum/component/label) + .["pill_bottle"] = list( + "size" = length(loaded_pill_bottle.contents), + "max_size" = loaded_pill_bottle.max_storage_space, + "label" = label ? label.label_name : null, + "icon_state" = loaded_pill_bottle.icon_state + ) + + .["beaker"] = null + if(beaker) + .["beaker"] = list( + "reagents_volume" = beaker.reagents.total_volume + ) + + for(var/datum/reagent/contained_reagent in beaker.reagents.reagent_list) + LAZYADD(.["beaker"]["reagents"], list(list( + "name" = contained_reagent.name, + "volume" = contained_reagent.volume, + "id" = contained_reagent.id, + ))) + + .["buffer"] = null + if(reagents.total_volume) + .["buffer"] = list() + for(var/datum/reagent/contained_reagent in reagents.reagent_list) + .["buffer"] += list(list( + "name" = contained_reagent.name, + "volume" = contained_reagent.volume, + "id" = contained_reagent.id + )) + + .["internal_reagent_name"] = reagents.get_master_reagent_name() + +/obj/structure/machinery/chem_master/ui_static_data(mob/user) + . = ..() + + .["pill_or_bottle_icon"] = "['icons/obj/items/chemistry.dmi']" + .["pill_icon_choices"] = PILL_ICON_CHOICES + .["bottle_icon_choices"] = BOTTLE_ICON_CHOICES + + .["color_pill"] = list( + "icon" = "[/obj/item/storage/pill_bottle::icon]", + "colors" = /obj/item/storage/pill_bottle::possible_colors, + "base" = /obj/item/storage/pill_bottle::base_icon + ) + + .["is_pillmaker"] = pill_maker + .["is_condiment"] = condi + .["is_vialmaker"] = vial_maker + +/obj/structure/machinery/chem_master/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + . = ..() + if(inoperable()) return - if(!ishuman(usr)) - return - var/mob/living/carbon/human/user = usr - if(user.stat || user.is_mob_restrained()) - return - if(!in_range(src, user)) - return - add_fingerprint(user) - user.set_interaction(src) + var/mob/user = ui.user + if(!Adjacent(user) || !ishuman(user) || user.stat || user.is_mob_restrained()) + return - if(href_list["ejectp"]) - if(!loaded_pill_bottle) - return + switch(action) + if("eject_pill") + if(!loaded_pill_bottle) + return - if(!Adjacent(usr) || !usr.put_in_hands(loaded_pill_bottle)) - loaded_pill_bottle.forceMove(loc) + if(!user.put_in_hands(loaded_pill_bottle)) + loaded_pill_bottle.forceMove(loc) - loaded_pill_bottle = null + loaded_pill_bottle = null - // Adding a name to the currently stored pill bottle - if(href_list["addlabelp"]) + return TRUE - // Checking for state changes - if(!loaded_pill_bottle) - return + if("label_pill") + if(!loaded_pill_bottle) + return - if(!Adjacent(usr)) - return + var/label = copytext(reject_bad_text(params["text"]), 1, MAX_NAME_LEN) + if(!label) + return - var/label = copytext(reject_bad_text(input(user,"Label text?", "Set label", "")), 1, MAX_NAME_LEN) - if(label) loaded_pill_bottle.AddComponent(/datum/component/label, label) if(length(label) < 3) loaded_pill_bottle.maptext_label = label loaded_pill_bottle.update_icon() - else if(href_list["setcolor"]) - // Checking for state changes - if(!loaded_pill_bottle) - return - if(!Adjacent(usr)) - return + return TRUE - loaded_pill_bottle.choose_color() + if("color_pill") + if(!loaded_pill_bottle) + return - else if(href_list["close"]) - close_browser(user, "chemmaster") - user.unset_interaction() - return + var/picked_color = params["color"] + if(picked_color && (picked_color in loaded_pill_bottle.possible_colors)) + loaded_pill_bottle.icon_state = loaded_pill_bottle.base_icon + loaded_pill_bottle.possible_colors[picked_color] + return - if(beaker) - if(href_list["add"]) - if(href_list["amount"]) - var/id = href_list["add"] - var/amount = text2num(href_list["amount"]) - transfer_chemicals(src, beaker, amount, id) - - else if(href_list["addcustom"]) - var/id = href_list["addcustom"] - useramount = tgui_input_number(usr, "Select the amount to transfer.", "Transfer amount", useramount) - transfer_chemicals(src, beaker, useramount, id) - - else if(href_list["addall"]) - for(var/datum/reagent/R in beaker.reagents.reagent_list) - var/amount = beaker.volume - transfer_chemicals(src, beaker, amount, R.id) - - else if(href_list["remove"]) - if(href_list["amount"]) - var/id = href_list["remove"] - var/amount = text2num(href_list["amount"]) - if(mode) - transfer_chemicals(beaker, src, amount, id) - else - transfer_chemicals(null, src, amount, id) + loaded_pill_bottle.choose_color(user) + + if("add") + var/amount = params["amount"] + var/id = params["id"] + if(!isnum(amount) || !id) + return + + transfer_chemicals(src, beaker, amount, id) + return TRUE + + if("add_all") + for(var/datum/reagent/beaker_reagent in beaker.reagents.reagent_list) + transfer_chemicals(src, beaker, beaker.volume, beaker_reagent.id) + return TRUE + + if("remove") + var/amount = params["amount"] + var/id = params["id"] + if(!isnum(amount) || !id) + return - else if(href_list["removecustom"]) - var/id = href_list["removecustom"] - useramount = tgui_input_number(usr, "Select the amount to transfer.", "Transfer amount", useramount) if(mode) - transfer_chemicals(beaker, src, useramount, id) - else - transfer_chemicals(null, src, useramount, id) + transfer_chemicals(beaker, src, amount, id) + return TRUE - else if(href_list["removeall"]) - for(var/datum/reagent/R in src.reagents.reagent_list) - var/amount = src.reagents.total_volume + transfer_chemicals(null, src, amount, id) + return TRUE + + if("remove_all") + for(var/datum/reagent/contained_reagent in reagents.reagent_list) + var/amount = reagents.total_volume if(mode) - transfer_chemicals(beaker, src, amount, R.id) + transfer_chemicals(beaker, src, amount, contained_reagent.id) else - transfer_chemicals(null, src, amount, R.id) + transfer_chemicals(null, src, amount, contained_reagent.id) + + return TRUE - else if(href_list["toggle"]) + if("toggle") mode = !mode + return TRUE - else if(href_list["main"]) - attack_hand(user) - return - else if(href_list["eject"]) + if("eject") if(!beaker) return - if(!Adjacent(usr) || !usr.put_in_hands(beaker)) + if(!user.put_in_hands(beaker)) beaker.forceMove(loc) beaker = null reagents.clear_reagents() update_icon() + return TRUE - else if (href_list["createpill"] || href_list["createpill_multiple"]) - var/count = 1 + if("create_pill") + if(!pill_maker) + return - if(reagents.total_volume/count < 1) //Sanity checking. + var/param_num = params["number"] + if(!isnum(param_num)) return - if(href_list["createpill_multiple"]) - count = clamp(tgui_input_number(user, "Select the number of pills to make. (max: [max_pill_count])", "Pills to make", pillamount, max_pill_count, 1), 0, max_pill_count) - if(!count) - return + var/to_create = floor(clamp(param_num, 1, max_pill_count)) - if(reagents.total_volume/count < 1) //Sanity checking. + if(reagents.total_volume / to_create < 1) return - for(var/datum/reagent/R in reagents.reagent_list) - if(R.flags & REAGENT_NOT_INGESTIBLE) - to_chat(user, SPAN_WARNING("[R.name] must be administered intravenously and cannot be made into a pill.")) + var/list/reagents_in_pill = list() + for(var/datum/reagent/contained_reagent in reagents.reagent_list) + if(contained_reagent.flags & REAGENT_NOT_INGESTIBLE) + to_chat(user, SPAN_WARNING("[contained_reagent.name] must be administered intravenously, and cannot be made into a pill.")) return - var/amount_per_pill = reagents.total_volume/count - if(amount_per_pill > 60) amount_per_pill = 60 + reagents_in_pill += contained_reagent.name + + var/amount_per_pill = clamp(reagents.total_volume / to_create, 0, 60) + + msg_admin_niche("[key_name(user)] created one or more pills (total pills to synthesize: [to_create]) (REAGENTS: [english_list(reagents_in_pill)]) in [get_area(user)] ([user.loc.x],[user.loc.y],[user.loc.z]).", user.loc.x, user.loc.y, user.loc.z) + for(var/iterator in 1 to to_create) + var/obj/item/reagent_container/pill/creating_pill = new(loc) + creating_pill.pill_desc = "A custom pill." + creating_pill.icon_state = "pill[pillsprite]" + + reagents.trans_to(creating_pill, amount_per_pill) + if(loaded_pill_bottle && length(loaded_pill_bottle.contents) < loaded_pill_bottle.max_storage_space) + loaded_pill_bottle.handle_item_insertion(creating_pill, TRUE) + + return TRUE + + if("create_glass") + if(condi) + var/obj/item/reagent_container/food/condiment/new_condiment = new() + reagents.trans_to(new_condiment, 50) + + if(!user.put_in_hands(new_condiment)) + new_condiment.forceMove(loc) + + return TRUE - if(reagents.total_volume/count < 1) //Sanity checking. + var/name = reject_bad_text(params["label"] || reagents.get_master_reagent_name()) + if(!name) return - var/was_logged = FALSE - - while (count--) - var/obj/item/reagent_container/pill/P = new/obj/item/reagent_container/pill(loc) - P.pill_desc = "A custom pill." - P.icon_state = "pill"+pillsprite - reagents.trans_to(P,amount_per_pill) - if(loaded_pill_bottle) - if(length(loaded_pill_bottle.contents) < loaded_pill_bottle.max_storage_space) - loaded_pill_bottle.handle_item_insertion(P, TRUE) - updateUsrDialog() - - if(!was_logged) - var/list/reagents_in_pill = list() - for(var/datum/reagent/R in P.reagents.reagent_list) - reagents_in_pill += R.name - var/contained = english_list(reagents_in_pill) - msg_admin_niche("[key_name(usr)] created one or more pills (total pills to synthesize: [count+1]) (REAGENTS: [contained]) in [get_area(user)] ([user.loc.x],[user.loc.y],[user.loc.z]).", user.loc.x, user.loc.y, user.loc.z) - was_logged = TRUE - - else if(href_list["createglass"]) - if(!condi) - var/name = reject_bad_text(input(user,"Label:","Enter label!", reagents.get_master_reagent_name()) as text|null) - if(!name) - return - var/obj/item/reagent_container/glass/P - if(href_list["createbottle"]) - P = new/obj/item/reagent_container/glass/bottle() - P.name = "[name] bottle" - P.icon_state = "bottle-"+bottlesprite - reagents.trans_to(P, 60) - else if(href_list["createvial"]) - P = new/obj/item/reagent_container/glass/beaker/vial() - P.name = "[name] vial" - reagents.trans_to(P, 30) - - P.update_icon() - - if(href_list["store"]) - connected.add_local_item(P) - else if(!Adjacent(usr) || !usr.put_in_hands(P)) - P.forceMove(loc) - - else - var/obj/item/reagent_container/food/condiment/P = new/obj/item/reagent_container/food/condiment() - reagents.trans_to(P, 50) - - if(!Adjacent(usr) || !usr.put_in_hands(P)) - P.forceMove(loc) - else if(href_list["change_pill"]) - var/dat = "" - for(var/i = 1 to PILL_ICON_CHOICES) - dat += "" - dat += "
" - show_browser(user, dat, "Change Pill Type", "chem_master") - return - else if(href_list["change_bottle"]) - var/dat = "" - for(var/i = 1 to BOTTLE_ICON_CHOICES) - dat += "" - dat += "
" - show_browser(user, dat, "Change Bottle Type", "chem_master") - return - else if(href_list["pill_sprite"]) - pillsprite = href_list["pill_sprite"] - else if(href_list["bottle_sprite"]) - bottlesprite = href_list["bottle_sprite"] + var/obj/item/reagent_container/glass/new_container + switch(params["type"]) + if("glass") + new_container = new /obj/item/reagent_container/glass/bottle() + new_container.name = "[name] Bottle" + new_container.icon_state = "bottle-[bottlesprite]" + reagents.trans_to(new_container, 60) + if("vial") + if(!vial_maker) + return + + new_container = new /obj/item/reagent_container/glass/beaker/vial() + new_container.name = "[name] Vial" + reagents.trans_to(new_container, 30) + + if(!new_container) + return - if(href_list["transferp"]) - if(!loaded_pill_bottle) - return + new_container.update_icon() - if(QDELETED(connected)) - to_chat(user, SPAN_WARNING("Connect a smartfridge first.")) - return + if(params["store"] && connected) + connected.add_local_item(new_container) + return TRUE - if(src.z != connected.z || get_dist(src, connected) > tether_range) - to_chat(user, SPAN_WARNING("Smartfridge is out of range. Connection severed.")) - cleanup() - attack_hand(user) - return + if(!user.put_in_hands(new_container)) + new_container.forceMove(loc) + + return TRUE + + if("change_pill") + var/pill = params["picked"] + if(!isnum(pill) || pill > PILL_ICON_CHOICES) + return + + pillsprite = pill + return TRUE + + if("change_bottle") + var/bottle = params["picked"] + if(!isnum(bottle) || bottle > BOTTLE_ICON_CHOICES) + return + + bottlesprite = bottle + return TRUE - connected.add_local_item(loaded_pill_bottle) - loaded_pill_bottle = null - // Connecting a smartfridge - if(href_list["connect"]) - connect_smartfridge() + if("transfer_pill") + if(!loaded_pill_bottle) + return + + if(QDELETED(connected)) + to_chat(user, SPAN_WARNING("Connect a smartfridge first.")) + return + + if(src.z != connected.z || get_dist(src, connected) > tether_range) + to_chat(user, SPAN_WARNING("Smartfridge is out of range. Connection severed.")) + cleanup() + attack_hand(user) + return + + connected.add_local_item(loaded_pill_bottle) + loaded_pill_bottle = null + return TRUE + + if("connect") + connect_smartfridge() + return TRUE - //src.updateUsrDialog() - attack_hand(user) /obj/structure/machinery/chem_master/attack_hand(mob/living/user) if(stat & BROKEN) @@ -339,82 +391,9 @@ if(req_skill && !skillcheck(user, req_skill, req_skill_level)) to_chat(user, SPAN_WARNING("You don't have the training to use this.")) return + + tgui_interact(usr) user.set_interaction(src) - if(!(user.client in has_sprites)) - spawn() - has_sprites += user.client - for(var/i = 1 to PILL_ICON_CHOICES) - user << browse_rsc(icon('icons/obj/items/chemistry.dmi', "pill" + num2text(i)), "pill[i].png") - for(var/i = 1 to BOTTLE_ICON_CHOICES) - user << browse_rsc(icon('icons/obj/items/chemistry.dmi', "bottle-" + num2text(i)), "bottle-[i].png") - var/dat = "" - if(!beaker) - dat = "Please insert beaker.
" - if(pill_maker) - if(loaded_pill_bottle) - dat += "Eject Pill Bottle \[[length(loaded_pill_bottle.contents)]/[loaded_pill_bottle.max_storage_space]\]

" - else - dat += "No pill bottle inserted.

" - dat += "Close" - else - dat += "Eject beaker and Clear Buffer

" - if(pill_maker) - if(loaded_pill_bottle) - dat += "Eject [loaded_pill_bottle] \[[length(loaded_pill_bottle.contents)]/[loaded_pill_bottle.max_storage_space]\]
" - dat += "Add label to [loaded_pill_bottle] \[[length(loaded_pill_bottle.contents)]/[loaded_pill_bottle.max_storage_space]\]
" - dat += "Set color to [loaded_pill_bottle] \[[length(loaded_pill_bottle.contents)]/[loaded_pill_bottle.max_storage_space]\]

" - dat += "Transfer [loaded_pill_bottle] \[[length(loaded_pill_bottle.contents)]/[loaded_pill_bottle.max_storage_space]\] to the smartfridge

" - else - dat += "No pill bottle inserted.

" - if(!connected && pill_maker) - dat += "Connect Smartfridge

" - if(!beaker.reagents.total_volume) - dat += "Beaker is empty." - else - dat += "Add to buffer:
" - for(var/datum/reagent/G in beaker.reagents.reagent_list) - dat += "[G.name] , [G.volume] Units - " - dat += "1 " - dat += "5 " - dat += "10 " - dat += "30 " - dat += "60 " - dat += "All " - dat += "Custom
" - dat += "All reagents
" - - dat += "
Transfer to [(!mode ? "disposal" : "beaker")]:
" - if(reagents.total_volume) - for(var/datum/reagent/N in reagents.reagent_list) - dat += "[N.name] , [N.volume] Units - " - dat += "1 " - dat += "5 " - dat += "10 " - dat += "30 " - dat += "60 " - dat += "All " - dat += "Custom
" - dat += "All reagents
" - else - dat += "Empty
" - if(!condi) - if(pill_maker) - dat += "

Create pill (60 units max)
" - dat += "Create multiple pills
" - dat += "Create bottle (60 units max)" - if(connected) - dat += "
Store bottle in smartfridge (60 units max)" - if(vial_maker) - dat += "

Create vial (30 units max)" - if(connected) - dat += "
Store vial in smartfridge (30 units max)" - else - dat += "Create bottle (50 units max)" - if(!condi) - show_browser(user, "[name] menu:

[dat]", name, "chem_master", "size=460x520") - else - show_browser(user, "Condimaster menu:

[dat]", name, "chem_master") - return /obj/structure/machinery/chem_master/proc/cleanup() SIGNAL_HANDLER diff --git a/code/modules/reagents/chemistry_reactions/other.dm b/code/modules/reagents/chemistry_reactions/other.dm index 08402e82ed7f..927cd0a4c487 100644 --- a/code/modules/reagents/chemistry_reactions/other.dm +++ b/code/modules/reagents/chemistry_reactions/other.dm @@ -33,6 +33,7 @@ result = null required_reagents = list("uranium" = 1, "iron" = 1) // Yes, laugh, it's the best recipe I could think of that makes a little bit of sense result_amount = 2 + mob_react = FALSE /datum/chemical_reaction/emp_pulse/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) @@ -155,13 +156,27 @@ result = null required_reagents = list("aluminum" = 1, "potassium" = 1, "sulfur" = 1 ) result_amount = 3 + mob_react = FALSE /datum/chemical_reaction/flash_powder/on_reaction(datum/reagents/holder, created_volume) - var/location = get_turf(holder.my_atom) - var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread - s.set_up(2, 1, location) - s.start() - new /obj/item/device/flashlight/flare/on/illumination/chemical(location, created_volume) + var/turf/location = get_turf(holder.my_atom) + var/datum/effect_system/spark_spread/sparker = new + sparker.set_up(2, 1, location) + sparker.start() + var/obj/item/device/flashlight/flare/on/illumination/chemical/light = new(holder.my_atom, created_volume) + + //Admin messaging + var/area/area = get_area(location) + var/where = "[area.name]|[location.x], [location.y]" + var/whereLink = "[where]" + var/data = " [created_volume] volume -> fuel: [light.fuel] range: [light.light_range] power: [light.light_power]" + + if(holder.my_atom.fingerprintslast) + msg_admin_niche("[src] reaction has taken place in ([whereLink])[data]. Last associated key is [holder.my_atom.fingerprintslast].") + log_game("[src] reaction has taken place in ([where])[data]. Last associated key is [holder.my_atom.fingerprintslast].") + else + msg_admin_niche("[src] reaction has taken place in ([whereLink])[data]. No associated key.") + log_game("[src] reaction has taken place in ([where])[data]. No associated key.") /datum/chemical_reaction/chemfire name = "Napalm" @@ -373,6 +388,7 @@ result = null required_reagents = list("fluorosurfactant" = 1, "water" = 1) result_amount = 2 + mob_react = FALSE /datum/chemical_reaction/foam/on_reaction(datum/reagents/holder, created_volume) var/location = get_turf(holder.my_atom) diff --git a/code/modules/reagents/chemistry_reagents/medical.dm b/code/modules/reagents/chemistry_reagents/medical.dm index ce6c03aee171..a30fcfe28f98 100644 --- a/code/modules/reagents/chemistry_reagents/medical.dm +++ b/code/modules/reagents/chemistry_reagents/medical.dm @@ -174,6 +174,8 @@ PROPERTY_ANTIHALLUCINOGENIC = 2, PROPERTY_FOCUSING = 6, PROPERTY_CURING = 4, + PROPERTY_OCULOPEUTIC = 2, + PROPERTY_NEUROPEUTIC = 2, ) flags = REAGENT_TYPE_MEDICAL diff --git a/code/modules/shuttle/computers/dropship_computer.dm b/code/modules/shuttle/computers/dropship_computer.dm index eb56ab328052..1e2ef69a9172 100644 --- a/code/modules/shuttle/computers/dropship_computer.dm +++ b/code/modules/shuttle/computers/dropship_computer.dm @@ -29,6 +29,15 @@ var/linked_lz var/can_change_shuttle = FALSE + var/faction = FACTION_MARINE + + /// If this computer should respect the faction variable of destination LZ + var/use_factions = TRUE + +/obj/structure/machinery/computer/shuttle/dropship/flight/upp + icon_state = "console_upp" + req_one_access = list(ACCESS_UPP_FLIGHT) + faction = FACTION_UPP /obj/structure/machinery/computer/shuttle/dropship/flight/Initialize(mapload, ...) . = ..() @@ -41,6 +50,8 @@ /obj/structure/machinery/computer/shuttle/dropship/flight/proc/get_landing_zones() . = list() for(var/obj/docking_port/stationary/marine_dropship/dock in SSshuttle.stationary) + if(use_factions && dock.faction != faction) + continue if(istype(dock, /obj/docking_port/stationary/marine_dropship/crash_site)) continue . += list(dock) diff --git a/code/modules/shuttle/dropship.dm b/code/modules/shuttle/dropship.dm index 95db7a975253..fd6b83c610bf 100644 --- a/code/modules/shuttle/dropship.dm +++ b/code/modules/shuttle/dropship.dm @@ -320,3 +320,215 @@ /obj/structure/shuttle/part/dropship3/transparent/right_outer_bottom_wing icon_state = "6" + +/obj/structure/shuttle/part/dropshipupp + name = "\improper Morana" + icon = 'icons/turf/upp_dropship.dmi' + icon_state = "1" + opacity = TRUE + +/obj/structure/shuttle/part/dropshipupp/ex_act(severity, direction) + return FALSE + +/obj/structure/shuttle/part/dropshipupp/transparent + opacity = FALSE + +/obj/structure/shuttle/part/dropshipupp/transparent/nose_top_right + icon_state = "102" + +/obj/structure/shuttle/part/dropshipupp/transparent/nose_center + icon_state = "101" + +/obj/structure/shuttle/part/dropshipupp/transparent/nose_top_left + icon_state = "100" + +/obj/structure/shuttle/part/dropshipupp/nose_front_left + icon_state = "95" + +/obj/structure/shuttle/part/dropshipupp/nose_front_right + icon_state = "99" + +/obj/structure/shuttle/part/dropshipupp/transparent/inner_right_weapons + icon_state = "90" + +/obj/structure/shuttle/part/dropshipupp/transparent/outer_right_weapons + icon_state = "91" + +/obj/structure/shuttle/part/dropshipupp/transparent/inner_left_weapons + icon_state = "85" + +/obj/structure/shuttle/part/dropshipupp/transparent/outer_left_weapons + icon_state = "84" + +/obj/structure/shuttle/part/dropshipupp/transparent/upper_right_wing + icon_state = "74" + +/obj/structure/shuttle/part/dropshipupp/transparent/middle_right_wing + icon_state = "70" + +/obj/structure/shuttle/part/dropshipupp/transparent/lower_right_wing + icon_state = "65" + +/obj/structure/shuttle/part/dropshipupp/transparent/upper_left_wing + icon_state = "71" + +/obj/structure/shuttle/part/dropshipupp/transparent/middle_left_wing + icon_state = "66" + +/obj/structure/shuttle/part/dropshipupp/transparent/lower_left_wing + icon_state = "61" + +/obj/structure/shuttle/part/dropshipupp/lower_left_wall + icon_state = "46" + +/obj/structure/shuttle/part/dropshipupp/lower_right_wall + icon_state = "49" + +/obj/structure/shuttle/part/dropshipupp/transparent/engine_left_cap + icon_state = "40" + +/obj/structure/shuttle/part/dropshipupp/transparent/engine_right_cap + icon_state = "41" + +/obj/structure/shuttle/part/dropshipupp/transparent/engine_left_exhaust + icon_state = "16" + +/obj/structure/shuttle/part/dropshipupp/transparent/engine_right_exhaust + icon_state = "17" + +/obj/structure/shuttle/part/dropshipupp/bottom_left_wall + icon_state = "9" + +/obj/structure/shuttle/part/dropshipupp/bottom_right_wall + icon_state = "15" + +/obj/structure/shuttle/part/dropshipupp/left_inner_wing_connector + icon_state = "7" + +/obj/structure/shuttle/part/dropshipupp/right_inner_wing_connector + icon_state = "8" + +/obj/structure/shuttle/part/dropshipupp/left_outer_wing_connector + icon_state = "3" + +/obj/structure/shuttle/part/dropshipupp/right_outer_wing_connector + icon_state = "4" + +/obj/structure/shuttle/part/dropshipupp/transparent/left_outer_bottom_wing + icon_state = "1" + +/obj/structure/shuttle/part/dropshipupp/transparent/left_outer_inner_wing + icon_state = "2" + +/obj/structure/shuttle/part/dropshipupp/transparent/right_inner_bottom_wing + icon_state = "5" + +/obj/structure/shuttle/part/dropshipupp/transparent/right_outer_bottom_wing + icon_state = "6" + +/// + +/obj/structure/shuttle/part/dropshipupp2 + name = "\improper Devana" + icon = 'icons/turf/upp_dropship.dmi' + icon_state = "1" + opacity = TRUE + +/obj/structure/shuttle/part/dropshipupp2/ex_act(severity, direction) + return FALSE + +/obj/structure/shuttle/part/dropshipupp2/transparent + opacity = FALSE + +/obj/structure/shuttle/part/dropshipupp2/transparent/nose_top_right + icon_state = "102" + +/obj/structure/shuttle/part/dropshipupp2/transparent/nose_center + icon_state = "101" + +/obj/structure/shuttle/part/dropshipupp2/transparent/nose_top_left + icon_state = "100" + +/obj/structure/shuttle/part/dropshipupp2/nose_front_left + icon_state = "95" + +/obj/structure/shuttle/part/dropshipupp2/nose_front_right + icon_state = "99" + +/obj/structure/shuttle/part/dropshipupp2/transparent/inner_right_weapons + icon_state = "90" + +/obj/structure/shuttle/part/dropshipupp2/transparent/outer_right_weapons + icon_state = "91" + +/obj/structure/shuttle/part/dropshipupp2/transparent/inner_left_weapons + icon_state = "85" + +/obj/structure/shuttle/part/dropshipupp2/transparent/outer_left_weapons + icon_state = "84" + +/obj/structure/shuttle/part/dropshipupp2/transparent/upper_right_wing + icon_state = "74" + +/obj/structure/shuttle/part/dropshipupp2/transparent/middle_right_wing + icon_state = "70" + +/obj/structure/shuttle/part/dropshipupp2/transparent/lower_right_wing + icon_state = "65" + +/obj/structure/shuttle/part/dropshipupp2/transparent/upper_left_wing + icon_state = "71" + +/obj/structure/shuttle/part/dropshipupp2/transparent/middle_left_wing + icon_state = "66" + +/obj/structure/shuttle/part/dropshipupp2/transparent/lower_left_wing + icon_state = "61" + +/obj/structure/shuttle/part/dropshipupp2/lower_left_wall + icon_state = "46" + +/obj/structure/shuttle/part/dropshipupp2/lower_right_wall + icon_state = "49" + +/obj/structure/shuttle/part/dropshipupp2/transparent/engine_left_cap + icon_state = "40" + +/obj/structure/shuttle/part/dropshipupp2/transparent/engine_right_cap + icon_state = "41" + +/obj/structure/shuttle/part/dropshipupp2/transparent/engine_left_exhaust + icon_state = "16" + +/obj/structure/shuttle/part/dropshipupp2/transparent/engine_right_exhaust + icon_state = "17" + +/obj/structure/shuttle/part/dropshipupp2/bottom_left_wall + icon_state = "9" + +/obj/structure/shuttle/part/dropshipupp2/bottom_right_wall + icon_state = "15" + +/obj/structure/shuttle/part/dropshipupp2/left_inner_wing_connector + icon_state = "7" + +/obj/structure/shuttle/part/dropshipupp2/right_inner_wing_connector + icon_state = "8" + +/obj/structure/shuttle/part/dropshipupp2/left_outer_wing_connector + icon_state = "3" + +/obj/structure/shuttle/part/dropshipupp2/right_outer_wing_connector + icon_state = "4" + +/obj/structure/shuttle/part/dropshipupp2/transparent/left_outer_bottom_wing + icon_state = "1" + +/obj/structure/shuttle/part/dropshipupp2/transparent/left_outer_inner_wing + icon_state = "2" + +/obj/structure/shuttle/part/dropshipupp2/transparent/right_inner_bottom_wing + icon_state = "5" + +/obj/structure/shuttle/part/dropshipupp2/transparent/right_outer_bottom_wing + icon_state = "6" diff --git a/code/modules/shuttle/shuttles/dropship.dm b/code/modules/shuttle/shuttles/dropship.dm index 857968b56904..4f4aef6ab0d9 100644 --- a/code/modules/shuttle/shuttles/dropship.dm +++ b/code/modules/shuttle/shuttles/dropship.dm @@ -115,7 +115,7 @@ for(var/area/checked_area in shuttle_areas) for(var/mob/living/carbon/xenomorph/checked_xeno in checked_area) - if(checked_xeno.stat == DEAD || (FACTION_MARINE in checked_xeno?.iff_tag.faction_groups)) + if(checked_xeno.stat == DEAD || (FACTION_MARINE in checked_xeno.iff_tag?.faction_groups)) continue var/name = "Unidentified Lifesigns" var/input = "Unidentified lifesigns detected onboard. Recommendation: lockdown of exterior access ports, including ducting and ventilation." @@ -153,6 +153,23 @@ /obj/docking_port/mobile/marine_dropship/saipan/get_transit_path_type() return /turf/open/space/transit/dropship/saipan +/obj/docking_port/mobile/marine_dropship/morana + name = "Morana" + id = DROPSHIP_MORANA + preferred_direction = SOUTH // If you are changing this, please update the dir of the path below as well + +/obj/docking_port/mobile/marine_dropship/morana/get_transit_path_type() + return /turf/open/space/transit/dropship/morana + +/obj/docking_port/mobile/marine_dropship/devana + name = "Devana" + id = DROPSHIP_DEVANA + preferred_direction = SOUTH // If you are changing this, please update the dir of the path below as well + +/obj/docking_port/mobile/marine_dropship/devana/get_transit_path_type() + return /turf/open/space/transit/dropship/devana + + /obj/docking_port/mobile/marine_dropship/check() . = ..() @@ -209,6 +226,7 @@ var/auto_open = FALSE var/landing_lights_on = FALSE var/xeno_announce = FALSE + var/faction = FACTION_MARINE /obj/docking_port/stationary/marine_dropship/Initialize(mapload) . = ..() @@ -305,6 +323,12 @@ auto_open = TRUE roundstart_template = /datum/map_template/shuttle/normandy +/obj/docking_port/stationary/marine_dropship/upp_hangar_1 + name = "UPP Hangar bay 1" + id = UPP_DROPSHIP_LZ2 + auto_open = TRUE + roundstart_template = /datum/map_template/shuttle/morana + /obj/docking_port/stationary/marine_dropship/crash_site auto_open = TRUE @@ -331,6 +355,9 @@ SEND_GLOBAL_SIGNAL(COMSIG_GLOB_GROUNDSIDE_FORSAKEN_HANDLING) SEND_GLOBAL_SIGNAL(COMSIG_GLOB_HIJACK_LANDED) +/obj/docking_port/stationary/marine_dropship/upp + faction = FACTION_UPP + /datum/map_template/shuttle/alamo name = "Alamo" shuttle_id = DROPSHIP_ALAMO @@ -342,3 +369,13 @@ /datum/map_template/shuttle/saipan name = "Saipan" shuttle_id = DROPSHIP_SAIPAN + +/datum/map_template/shuttle/morana + name = "Morana" + shuttle_id = DROPSHIP_MORANA + +/datum/map_template/shuttle/devana + name = "Devana" + shuttle_id = DROPSHIP_DEVANA + + diff --git a/code/modules/shuttle/shuttles/ert.dm b/code/modules/shuttle/shuttles/ert.dm index 161382d09faf..74ecdbabefb2 100644 --- a/code/modules/shuttle/shuttles/ert.dm +++ b/code/modules/shuttle/shuttles/ert.dm @@ -333,6 +333,12 @@ height = 29 roundstart_template = /datum/map_template/shuttle/twe_ert +/obj/docking_port/stationary/emergency_response/chinook_port + name = "Chinook Station Landing Pad 1" + dir = NORTH + id = ADMIN_LANDING_PAD_6 + roundstart_template = /datum/map_template/shuttle/response_ert + /datum/map_template/shuttle/response_ert name = "Response Shuttle" shuttle_id = MOBILE_SHUTTLE_ID_ERT1 diff --git a/code/modules/shuttles/marine_ferry.dm b/code/modules/shuttles/marine_ferry.dm index 7b610d23141b..917edaa8a678 100644 --- a/code/modules/shuttles/marine_ferry.dm +++ b/code/modules/shuttles/marine_ferry.dm @@ -219,7 +219,7 @@ if(!queen_locked) for(var/turf/T in turfs_src) var/mob/living/carbon/xenomorph/xeno = locate(/mob/living/carbon/xenomorph) in T - if((xeno && xeno.stat != DEAD) && !(FACTION_MARINE in xeno?.iff_tag.faction_groups)) + if((xeno && xeno.stat != DEAD) && !(FACTION_MARINE in xeno.iff_tag?.faction_groups)) var/name = "Unidentified Lifesigns" var/input = "Unidentified lifesigns detected onboard. Recommendation: lockdown of exterior access ports, including ducting and ventilation." shipwide_ai_announcement(input, name, 'sound/AI/unidentified_lifesigns.ogg', ares_logging = ARES_LOG_SECURITY) diff --git a/code/modules/shuttles/shuttle_console.dm b/code/modules/shuttles/shuttle_console.dm index d256b272db6f..447f4a1bf386 100644 --- a/code/modules/shuttles/shuttle_console.dm +++ b/code/modules/shuttles/shuttle_console.dm @@ -420,6 +420,54 @@ GLOBAL_LIST_EMPTY(shuttle_controls) onboard = 1 density = TRUE +/obj/structure/machinery/computer/shuttle_control/dropship_upp + name = "\improper 'Morana' dropship console" + desc = "The remote controls for the 'Morana' Dropship. Named after the slavic goddess of death and rebirth." + icon = 'icons/obj/structures/machinery/computer.dmi' + icon_state = "shuttle" + + shuttle_type = SHUTTLE_DROPSHIP + unslashable = TRUE + unacidable = TRUE + explo_proof = TRUE + req_one_access = list(ACCESS_UPP_FLIGHT, ACCESS_UPP_LEADERSHIP) + +/obj/structure/machinery/computer/shuttle_control/dropship_upp/Initialize() + . = ..() + shuttle_tag = DROPSHIP_MORANA + +/obj/structure/machinery/computer/shuttle_control/dropship_upp/onboard + name = "\improper 'Morana' flight controls" + desc = "The flight controls for the 'Morana' Dropship. Named after the slavic goddess of death and rebirth." + icon = 'icons/obj/structures/machinery/shuttle-parts.dmi' + icon_state = "console_upp" + onboard = 1 + density = TRUE + +/obj/structure/machinery/computer/shuttle_control/dropship_upp2 + name = "\improper 'Devana' dropship console" + desc = "The remote controls for the 'Devana' Dropship. Named after the slavic goddess of nature, hunting and the moon." + icon = 'icons/obj/structures/machinery/computer.dmi' + icon_state = "shuttle" + + shuttle_type = SHUTTLE_DROPSHIP + unslashable = TRUE + unacidable = TRUE + explo_proof = TRUE + req_one_access = list(ACCESS_UPP_FLIGHT, ACCESS_UPP_LEADERSHIP) + +/obj/structure/machinery/computer/shuttle_control/dropship_upp2/Initialize() + . = ..() + shuttle_tag = DROPSHIP_DEVANA + +/obj/structure/machinery/computer/shuttle_control/dropship_upp2/onboard + name = "\improper 'Devana' flight controls" + desc = "The flight controls for the 'Devana' Dropship. Named after the slavic goddess of nature, hunting and the moon." + icon = 'icons/obj/structures/machinery/shuttle-parts.dmi' + icon_state = "console_upp" + onboard = 1 + density = TRUE + //Elevator control console /obj/structure/machinery/computer/shuttle_control/ice_colony diff --git a/code/modules/surgery/mcomp_tendwounds.dm b/code/modules/surgery/mcomp_tendwounds.dm index 3a876a8b5730..fa3346a66fa5 100644 --- a/code/modules/surgery/mcomp_tendwounds.dm +++ b/code/modules/surgery/mcomp_tendwounds.dm @@ -166,7 +166,7 @@ SPAN_NOTICE("[user] begns to clamp the treated wounds on [target]'s body with [tool].")) /datum/surgery_step/cauterize/mclamp_wound/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, tool_type, datum/surgery/surgery) - target.heal_overall_damage(65,65) //makes sure that all damage is healed + target.heal_overall_damage(125,125) //makes sure that all damage is healed if(user == target) user.visible_message(SPAN_NOTICE("[user] finshes closing the treated wounds on their body with [tool]."), diff --git a/code/modules/surgery/surgery_procedure.dm b/code/modules/surgery/surgery_procedure.dm index 1ec72ae77673..ceaedebc65f8 100644 --- a/code/modules/surgery/surgery_procedure.dm +++ b/code/modules/surgery/surgery_procedure.dm @@ -94,6 +94,13 @@ if(lying_required && target.body_position != LYING_DOWN) to_chat(user, SPAN_WARNING("[user == target ? "You need" : "[target] needs"] to be lying down for this operation!")) return FALSE + + for(var/mob/living/potential_blocker in get_turf(target)) + if(potential_blocker == user || potential_blocker == target) + continue + to_chat(user, SPAN_WARNING("You can't operate when you don't have enough space! Remove everybody else.")) + return FALSE + if(user == target) if(!self_operable) to_chat(user, SPAN_WARNING("You can't perform this operation on yourself!")) diff --git a/code/modules/tgui/tgui.dm b/code/modules/tgui/tgui.dm index 96c96a45a75c..c30c0b1d984f 100644 --- a/code/modules/tgui/tgui.dm +++ b/code/modules/tgui/tgui.dm @@ -107,6 +107,8 @@ /datum/asset/simple/namespaced/fontawesome)) flush_queue |= window.send_asset(get_asset_datum( /datum/asset/simple/namespaced/tgfont)) + flush_queue |= window.send_asset(get_asset_datum( + /datum/asset/json/icon_ref_map)) for(var/datum/asset/asset in src_object.ui_assets(user)) flush_queue |= window.send_asset(asset) if (flush_queue) diff --git a/code/modules/tgui_input/color.dm b/code/modules/tgui_input/color.dm new file mode 100644 index 000000000000..780eba4654c6 --- /dev/null +++ b/code/modules/tgui_input/color.dm @@ -0,0 +1,219 @@ +/** + * Creates a TGUI color picker window and returns the user's response. + * + * This proc should be used to create a color picker that the caller will wait for a response from. + * Arguments: + * * user - The user to show the picker to. + * * title - The of the picker modal, shown on the top of the TGUI window. + * * timeout - The timeout of the picker, after which the modal will close and qdel itself. Set to zero for no timeout. + * * autofocus - The bool that controls if this picker should grab window focus. + */ +/proc/tgui_color_picker(mob/user, message, title, default = "#000000", timeout = 0, autofocus = TRUE) + if (!user) + user = usr + if (!istype(user)) + if (istype(user, /client)) + var/client/client = user + user = client.mob + else + return + + var/datum/tgui_color_picker/picker = new(user, message, title, default, timeout, autofocus) + picker.tgui_interact(user) + picker.wait() + if (picker) + . = picker.choice + qdel(picker) + +/** + * Creates an asynchronous TGUI color picker window with an associated callback. + * + * This proc should be used to create a color picker that invokes a callback with the user's chosen option. + * Arguments: + * * user - The user to show the picker to. + * * title - The of the picker modal, shown on the top of the TGUI window. + * * callback - The callback to be invoked when a choice is made. + * * timeout - The timeout of the picker, after which the modal will close and qdel itself. Set to zero for no timeout. + * * autofocus - The bool that controls if this picker should grab window focus. + */ +/proc/tgui_color_picker_async(mob/user, message, title, default = "#000000", datum/callback/callback, timeout = 0, autofocus = TRUE) + if (!user) + user = usr + if (!istype(user)) + if (istype(user, /client)) + var/client/client = user + user = client.mob + else + return + + var/datum/tgui_color_picker/async/picker = new(user, message, title, default, callback, timeout, autofocus) + picker.tgui_interact(user) + +/** + * # tgui_color_picker + * + * Datum used for instantiating and using a TGUI-controlled color picker. + */ +/datum/tgui_color_picker + /// The title of the TGUI window + var/title + /// The message to show the user + var/message + /// The default choice, used if there is an existing value + var/default + /// The color the user selected, null if no selection has been made + var/choice + /// The time at which the tgui_color_picker was created, for displaying timeout progress. + var/start_time + /// The lifespan of the tgui_color_picker, after which the window will close and delete itself. + var/timeout + /// The bool that controls if this modal should grab window focus + var/autofocus + /// Boolean field describing if the tgui_color_picker was closed by the user. + var/closed + +/datum/tgui_color_picker/New(mob/user, message, title, default, timeout, autofocus) + src.autofocus = autofocus + src.title = title + src.default = default + src.message = message + if (timeout) + src.timeout = timeout + start_time = world.time + QDEL_IN(src, timeout) + +/datum/tgui_color_picker/Destroy(force, ...) + SStgui.close_uis(src) + . = ..() + +/** + * Waits for a user's response to the tgui_color_picker's prompt before returning. Returns early if + * the window was closed by the user. + */ +/datum/tgui_color_picker/proc/wait() + while (!choice && !closed && !QDELETED(src)) + stoplag(1) + +/datum/tgui_color_picker/tgui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "ColorPickerModal") + ui.open() + ui.set_autoupdate(timeout > 0) + +/datum/tgui_color_picker/ui_close(mob/user) + . = ..() + closed = TRUE + +/datum/tgui_color_picker/ui_state(mob/user) + return GLOB.always_state + +/datum/tgui_color_picker/ui_static_data(mob/user) + . = list() + .["autofocus"] = autofocus + .["title"] = title + .["default_color"] = default + .["message"] = message + .["large_buttons"] = TRUE + +/datum/tgui_color_picker/ui_data(mob/user) + . = list() + if(timeout) + .["timeout"] = clamp((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS), 0, 1) + +/datum/tgui_color_picker/ui_act(action, list/params) + . = ..() + if (.) + return + switch(action) + if("submit") + var/raw_data = lowertext(params["entry"]) + var/hex = sanitize_hexcolor(raw_data, desired_format = 6, include_crunch = TRUE) + if (!hex) + return + set_choice(hex) + closed = TRUE + SStgui.close_uis(src) + return TRUE + if("cancel") + closed = TRUE + SStgui.close_uis(src) + return TRUE + +/datum/tgui_color_picker/proc/set_choice(choice) + src.choice = choice + +/// Return `color` if it is a valid hex color, otherwise `default` +/datum/tgui_color_picker/proc/sanitize_hexcolor(color, desired_format = 3, include_crunch = FALSE, default) + var/crunch = include_crunch ? "#" : "" + if(!istext(color)) + color = "" + + var/start = 1 + (text2ascii(color, 1) == 35) + var/len = length(color) + var/char = "" + // Used for conversion between RGBA hex formats. + var/format_input_ratio = "[desired_format]:[length_char(color)-(start-1)]" + + . = "" + var/i = start + while(i <= len) + char = color[i] + i += length(char) + switch(text2ascii(char)) + if(48 to 57) //numbers 0 to 9 + . += char + if(97 to 102) //letters a to f + . += char + if(65 to 70) //letters A to F + char = lowertext(char) + . += char + else + break + switch(format_input_ratio) + if("3:8", "4:8", "3:6", "4:6") //skip next one. RRGGBB(AA) -> RGB(A) + i += length(color[i]) + if("6:4", "6:3", "8:4", "8:3") //add current char again. RGB(A) -> RRGGBB(AA) + . += char + + if(length_char(.) == desired_format) + return crunch + . + switch(format_input_ratio) //add or remove alpha channel depending on desired format. + if("3:8", "3:4", "6:4") + return crunch + copytext(., 1, desired_format+1) + if("4:6", "4:3", "8:3") + return crunch + . + ((desired_format == 4) ? "f" : "ff") + else //not a supported hex color format. + return default ? default : crunch + repeat_string(desired_format, "0") + +/// Returns `string` repeated `times` times +/datum/tgui_color_picker/proc/repeat_string(times, string="") + . = "" + for(var/i in 1 to times) + . += string + + +/** + * # async tgui_color_picker + * + * An asynchronous version of tgui_color_picker to be used with callbacks instead of waiting on user responses. + */ +/datum/tgui_color_picker/async + /// The callback to be invoked by the tgui_color_picker upon having a choice made. + var/datum/callback/callback + +/datum/tgui_color_picker/async/New(mob/user, message, title, default, callback, timeout, autofocus) + ..(user, message, title, default, timeout, autofocus) + src.callback = callback + +/datum/tgui_color_picker/async/Destroy(force, ...) + QDEL_NULL(callback) + . = ..() + +/datum/tgui_color_picker/async/set_choice(choice) + . = ..() + if(!isnull(src.choice)) + callback?.InvokeAsync(src.choice) + +/datum/tgui_color_picker/async/wait() + return diff --git a/code/modules/tgui_panel/telemetry.dm b/code/modules/tgui_panel/telemetry.dm index bd49596aa19a..951a82736b58 100644 --- a/code/modules/tgui_panel/telemetry.dm +++ b/code/modules/tgui_panel/telemetry.dm @@ -65,16 +65,9 @@ if (!ckey) return -/* - var/list/all_known_alts = GLOB.known_alts.load_known_alts() - var/list/our_known_alts = list() - - for (var/known_alt in all_known_alts) - if (known_alt[1] == ckey) - our_known_alts += known_alt[2] - else if (known_alt[2] == ckey) - our_known_alts += known_alt[1] -*/ + var/list/known_alts = list() + for(var/datum/view_record/known_alt/alts in DB_VIEW(/datum/view_record/known_alt, DB_COMP("player_ckey", DB_EQUALS, ckey))) + known_alts += alts.ckey var/list/found @@ -98,10 +91,11 @@ "address" = row["address"], "computer_id" = row["computer_id"], )) + */ - if (row["ckey"] in our_known_alts) + if (row["ckey"] in known_alts) continue - */ + if (world.IsBanned(row["ckey"], row["address"], row["computer_id"], real_bans_only = TRUE, is_telemetry = TRUE)) found = row diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm index 6f2b63e5b9e8..866217a5eb66 100644 --- a/code/modules/unit_tests/_unit_tests.dm +++ b/code/modules/unit_tests/_unit_tests.dm @@ -78,6 +78,7 @@ #include "autowiki.dm" #include "check_runtimes.dm" #include "create_and_destroy.dm" +#include "duplicate_sprite_accessories.dm" #include "emote_panels.dm" #include "missing_icons.dm" #include "resist.dm" diff --git a/code/modules/unit_tests/create_and_destroy.dm b/code/modules/unit_tests/create_and_destroy.dm index 7c829ad13e42..65dd310bdf21 100644 --- a/code/modules/unit_tests/create_and_destroy.dm +++ b/code/modules/unit_tests/create_and_destroy.dm @@ -33,6 +33,7 @@ GLOBAL_VAR_INIT(running_create_and_destroy, FALSE) ignore += typesof(/obj/effect/vehicle_spawner) // Always ought to have an associated escape menu. Any references it could possibly hold would need one regardless. ignore += subtypesof(/atom/movable/screen/escape_menu) + ignore += typesof(/obj/effect/timed_event) var/list/cached_contents = spawn_at.contents.Copy() var/original_turf_type = spawn_at.type diff --git a/code/modules/unit_tests/duplicate_sprite_accessories.dm b/code/modules/unit_tests/duplicate_sprite_accessories.dm new file mode 100644 index 000000000000..a0bb3b7162f6 --- /dev/null +++ b/code/modules/unit_tests/duplicate_sprite_accessories.dm @@ -0,0 +1,13 @@ +/datum/unit_test/duplicate_sprite_accessories/Run() + var/list/unique_icons_and_states = list() + + for(var/datum/sprite_accessory/accessory as anything in subtypesof(/datum/sprite_accessory)) + if(!length(accessory::icon_state)) + continue + + var/icon_and_state = "[accessory::icon]_[accessory::icon_state]" + + if(icon_and_state in unique_icons_and_states) + TEST_FAIL("Duplicate sprite accessory [accessory] - icon '[accessory::icon]' and icon_state '[accessory::icon_state]' already in use.") + + unique_icons_and_states += icon_and_state diff --git a/code/modules/vehicles/hardpoints/armor/snowplow.dm b/code/modules/vehicles/hardpoints/armor/snowplow.dm index e7823854cff3..2d00c81b3f8a 100644 --- a/code/modules/vehicles/hardpoints/armor/snowplow.dm +++ b/code/modules/vehicles/hardpoints/armor/snowplow.dm @@ -1,6 +1,6 @@ /obj/item/hardpoint/armor/snowplow name = "\improper Snowplow" - desc = "Clears a path in the snow for friendlies" + desc = "Clears a path in the snow for friendlies. It doesn't seem to have much use beyond that." icon_state = "snowplow" disp_icon = "tank" diff --git a/code/modules/vehicles/hardpoints/hardpoint_ammo/autocannon_ammo.dm b/code/modules/vehicles/hardpoints/hardpoint_ammo/autocannon_ammo.dm index e3cb6bc466f6..28fc4872cf26 100644 --- a/code/modules/vehicles/hardpoints/hardpoint_ammo/autocannon_ammo.dm +++ b/code/modules/vehicles/hardpoints/hardpoint_ammo/autocannon_ammo.dm @@ -1,6 +1,6 @@ /obj/item/ammo_magazine/hardpoint/ace_autocannon - name = "Tank Autocannon Magazine" - desc = "A primary armament autocannon magazine" + name = "AC3-E Autocannon Magazine" + desc = "A 40 round magazine holding 20mm shells for the AC3-E autocannon." caliber = "20mm" icon_state = "ace_autocannon" w_class = SIZE_LARGE diff --git a/code/modules/vehicles/hardpoints/hardpoint_ammo/cupola_ammo.dm b/code/modules/vehicles/hardpoints/hardpoint_ammo/cupola_ammo.dm index 7eecc7d04511..0f06db75ce02 100644 --- a/code/modules/vehicles/hardpoints/hardpoint_ammo/cupola_ammo.dm +++ b/code/modules/vehicles/hardpoints/hardpoint_ammo/cupola_ammo.dm @@ -1,6 +1,6 @@ /obj/item/ammo_magazine/hardpoint/m56_cupola name = "M56 Cupola Magazine" - desc = "A secondary armament MG magazine" + desc = "A box of 500, 10x28mm caseless tungsten rounds for the M56D heavy machine gun system." caliber = "10x28mm" //Correlates to smartguns icon = 'icons/obj/items/weapons/guns/ammo_by_faction/uscm.dmi' icon_state = "cupola_1" diff --git a/code/modules/vehicles/hardpoints/hardpoint_ammo/gl_ammo.dm b/code/modules/vehicles/hardpoints/hardpoint_ammo/gl_ammo.dm index bce002de1e36..fbdced5a657e 100644 --- a/code/modules/vehicles/hardpoints/hardpoint_ammo/gl_ammo.dm +++ b/code/modules/vehicles/hardpoints/hardpoint_ammo/gl_ammo.dm @@ -1,6 +1,6 @@ /obj/item/ammo_magazine/hardpoint/tank_glauncher name = "M92T Grenade Launcher Magazine" - desc = "A secondary armament grenade magazine." + desc = "A magazine loaded with M40 grenades. Used to reload the magazine fed M92T Grenade launcher." caliber = "grenade" icon_state = "glauncher_2" w_class = SIZE_LARGE diff --git a/code/modules/vehicles/hardpoints/hardpoint_ammo/minigun_ammo.dm b/code/modules/vehicles/hardpoints/hardpoint_ammo/minigun_ammo.dm index b3f31d824ebf..1b49cd04b155 100644 --- a/code/modules/vehicles/hardpoints/hardpoint_ammo/minigun_ammo.dm +++ b/code/modules/vehicles/hardpoints/hardpoint_ammo/minigun_ammo.dm @@ -1,9 +1,9 @@ /obj/item/ammo_magazine/hardpoint/ltaaap_minigun name = "LTAA-AP Minigun Magazine" - icon = 'icons/obj/items/weapons/guns/ammo_by_faction/event.dmi' - desc = "A primary armament minigun magazine." + icon = 'icons/obj/items/weapons/guns/ammo_by_faction/uscm.dmi' + desc = "A magazine of 7.62x51mm AP ammo for a heavy minigun. Filled to the brim with highly precise armor-penetrating rounds." caliber = "7.62x51mm" //Correlates to miniguns - icon_state = "painless" + icon_state = "ltaa" w_class = SIZE_LARGE //Primary weapon ammo should probably all be the same w_class default_ammo = /datum/ammo/bullet/tank/minigun max_rounds = 500 diff --git a/code/modules/vehicles/hardpoints/hardpoint_ammo/primary_flamer_ammo.dm b/code/modules/vehicles/hardpoints/hardpoint_ammo/primary_flamer_ammo.dm index a164b38383b8..d70edf1e29dd 100644 --- a/code/modules/vehicles/hardpoints/hardpoint_ammo/primary_flamer_ammo.dm +++ b/code/modules/vehicles/hardpoints/hardpoint_ammo/primary_flamer_ammo.dm @@ -1,6 +1,6 @@ /obj/item/ammo_magazine/hardpoint/primary_flamer name = "DRG-N Offensive Flamer Unit Fuel Tank" - desc = "A primary armament flamethrower magazine." + desc = "Fuel tanks for the DRG-N Offensive Flamer. It contains a high-combustion napalm, capabale of burning through nearly anything." caliber = "High-Combustion Napalm" //correlates to flamer mags icon_state = "drgn_flametank" w_class = SIZE_LARGE diff --git a/code/modules/vehicles/hardpoints/hardpoint_ammo/secondary_flamer_ammo.dm b/code/modules/vehicles/hardpoints/hardpoint_ammo/secondary_flamer_ammo.dm index 8b40e209a147..ef75285a0cb9 100644 --- a/code/modules/vehicles/hardpoints/hardpoint_ammo/secondary_flamer_ammo.dm +++ b/code/modules/vehicles/hardpoints/hardpoint_ammo/secondary_flamer_ammo.dm @@ -1,6 +1,6 @@ /obj/item/ammo_magazine/hardpoint/secondary_flamer name = "LZR-N Flamer Unit Fuel Tank" - desc = "A secondary armament flamethrower magazine." + desc = "A napalm tank fitted to be accepted by the LZR-N Flamer." caliber = "UT-Napthal Fuel" //correlates to flamer mags icon_state = "flametank_large" w_class = SIZE_LARGE diff --git a/code/modules/vehicles/hardpoints/primary/autocannon.dm b/code/modules/vehicles/hardpoints/primary/autocannon.dm index 3e12f52be097..8148e5357dd8 100644 --- a/code/modules/vehicles/hardpoints/primary/autocannon.dm +++ b/code/modules/vehicles/hardpoints/primary/autocannon.dm @@ -1,6 +1,6 @@ /obj/item/hardpoint/primary/autocannon name = "\improper AC3-E Autocannon" - desc = "A primary autocannon for tanks that shoots explosive flak rounds" + desc = "A primary autocannon for tanks that shoots explosive flak rounds." icon_state = "ace_autocannon" disp_icon = "tank" diff --git a/code/modules/vehicles/hardpoints/primary/minigun.dm b/code/modules/vehicles/hardpoints/primary/minigun.dm index be44b86e2435..3ffe84d109b2 100644 --- a/code/modules/vehicles/hardpoints/primary/minigun.dm +++ b/code/modules/vehicles/hardpoints/primary/minigun.dm @@ -1,6 +1,6 @@ /obj/item/hardpoint/primary/minigun name = "\improper LTAA-AP Minigun" - desc = "A primary weapon for tanks that spews bullets" + desc = "A primary LTAA Minigun utelizing AP ammo for tanks. Its six barrels are heavy and take a bit to fully spin up." icon_state = "ltaaap_minigun" disp_icon = "tank" @@ -26,7 +26,7 @@ "8" = list(-77, 0) ) - scatter = 18 + scatter = 18 //base scatter, modified by stake_delay_mult gun_firemode = GUN_FIREMODE_AUTOMATIC gun_firemode_list = list( GUN_FIREMODE_AUTOMATIC, diff --git a/code/modules/vehicles/hardpoints/secondary/cupola.dm b/code/modules/vehicles/hardpoints/secondary/cupola.dm index 70b9f9a4889f..29e591f4cbc3 100644 --- a/code/modules/vehicles/hardpoints/secondary/cupola.dm +++ b/code/modules/vehicles/hardpoints/secondary/cupola.dm @@ -1,6 +1,6 @@ /obj/item/hardpoint/secondary/m56cupola name = "\improper M56 Cupola" - desc = "A secondary weapon for tanks that shoots bullets" + desc = "A secondary weapon for tanks. It's a M56D that was adjusted to be permanently fixed to its mount. You swear you can still see some weld tacks." icon_state = "m56_cupola" disp_icon = "tank" diff --git a/code/modules/vehicles/hardpoints/secondary/grenade_launcher.dm b/code/modules/vehicles/hardpoints/secondary/grenade_launcher.dm index 060f1f7ae9ef..ee06e7405e07 100644 --- a/code/modules/vehicles/hardpoints/secondary/grenade_launcher.dm +++ b/code/modules/vehicles/hardpoints/secondary/grenade_launcher.dm @@ -1,6 +1,6 @@ /obj/item/hardpoint/secondary/grenade_launcher name = "\improper M92T Grenade Launcher" - desc = "A secondary weapon for tanks that shoots grenades." + desc = "A magazine fed secondary grenade launcher for tanks that shoots M40 grenades." icon_state = "glauncher" disp_icon = "tank" diff --git a/code/modules/vehicles/hardpoints/secondary/tow.dm b/code/modules/vehicles/hardpoints/secondary/tow.dm index 7b0e0ea90a27..c15f8aa1ef63 100644 --- a/code/modules/vehicles/hardpoints/secondary/tow.dm +++ b/code/modules/vehicles/hardpoints/secondary/tow.dm @@ -1,6 +1,6 @@ /obj/item/hardpoint/secondary/towlauncher name = "\improper TOW Launcher" - desc = "A secondary weapon for tanks that shoots rockets" + desc = "A secondary weapon for tanks that shoots rockets. It loads multiple rockets at once." icon_state = "tow_launcher" disp_icon = "tank" diff --git a/code/modules/vehicles/hardpoints/wheels/treads.dm b/code/modules/vehicles/hardpoints/wheels/treads.dm index 31dccab7bdb8..e4bb68552b47 100644 --- a/code/modules/vehicles/hardpoints/wheels/treads.dm +++ b/code/modules/vehicles/hardpoints/wheels/treads.dm @@ -1,6 +1,6 @@ /obj/item/hardpoint/locomotion/treads name = "\improper Treads" - desc = "Integral to the movement of the vehicle." + desc = "Integral to the movement of the vehicle. Steel reinforced rubber tracks, they allow the tank to move faster but in turn need repairs more often." icon_state = "treads" disp_icon = "tank" @@ -18,7 +18,7 @@ /obj/item/hardpoint/locomotion/treads/robust name = "\improper Reinforced Treads" - desc = "These treads are made of a tougher material and are more durable. However, the extra weight slows the tank down." + desc = "These treads are made of solid steel plates and are more durable. However, the extra weight slows the tank down." health = 500 acid_resistant = TRUE diff --git a/code/modules/vehicles/multitile/multitile.dm b/code/modules/vehicles/multitile/multitile.dm index bcd48c3633be..398983035837 100644 --- a/code/modules/vehicles/multitile/multitile.dm +++ b/code/modules/vehicles/multitile/multitile.dm @@ -384,6 +384,9 @@ //vehicle is dead, no more lights if(health <= 0 && lighting_holder.light_range) lighting_holder.set_light_on(FALSE) + else + if(!lighting_holder.light) + lighting_holder.set_light_on(TRUE) update_icon() /* diff --git a/code/modules/vehicles/multitile/multitile_interaction.dm b/code/modules/vehicles/multitile/multitile_interaction.dm index 84b1d4de0efc..d7ecdf7ba543 100644 --- a/code/modules/vehicles/multitile/multitile_interaction.dm +++ b/code/modules/vehicles/multitile/multitile_interaction.dm @@ -196,6 +196,8 @@ return health = min(health + max_hp/100 * (5 / amount_fixed_adjustment), max_hp) + if(!lighting_holder.light) + lighting_holder.set_light_on(TRUE) if(WT) WT.remove_fuel(1, user) diff --git a/colonialmarines.dme b/colonialmarines.dme index ecdf2322e42d..bc711ca6b555 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -131,6 +131,7 @@ #include "code\__DEFINES\dcs\signals\signals_datum.dm" #include "code\__DEFINES\dcs\signals\signals_global.dm" #include "code\__DEFINES\dcs\signals\signals_subsystem.dm" +#include "code\__DEFINES\dcs\signals\atom\signals_area.dm" #include "code\__DEFINES\dcs\signals\atom\signals_atom.dm" #include "code\__DEFINES\dcs\signals\atom\signals_cell.dm" #include "code\__DEFINES\dcs\signals\atom\signals_item.dm" @@ -349,6 +350,7 @@ #include "code\datums\fluff_emails.dm" #include "code\datums\global_variables.dm" #include "code\datums\http.dm" +#include "code\datums\internet_media.dm" #include "code\datums\lazy_template.dm" #include "code\datums\map_config.dm" #include "code\datums\matrix_editor.dm" @@ -409,6 +411,7 @@ #include "code\datums\components\cluster_stack.dm" #include "code\datums\components\connect_mob_behalf.dm" #include "code\datums\components\crate_tag.dm" +#include "code\datums\components\deevolve_cooldown.dm" #include "code\datums\components\disk_reader.dm" #include "code\datums\components\footstep.dm" #include "code\datums\components\healing_reduction.dm" @@ -417,6 +420,7 @@ #include "code\datums\components\orbiter.dm" #include "code\datums\components\overlay_lighting.dm" #include "code\datums\components\rename.dm" +#include "code\datums\components\resin_cleanup.dm" #include "code\datums\components\speed_modifier.dm" #include "code\datums\components\status_effect_component.dm" #include "code\datums\components\temporary_mute.dm" @@ -726,6 +730,7 @@ #include "code\datums\xeno_shields\xeno_shield.dm" #include "code\datums\xeno_shields\shield_types\crusher_shield.dm" #include "code\datums\xeno_shields\shield_types\hedgehog_shield.dm" +#include "code\datums\xeno_shields\shield_types\king_shield.dm" #include "code\datums\xeno_shields\shield_types\vanguard_shield.dm" #include "code\defines\procs\admin.dm" #include "code\defines\procs\announcement.dm" @@ -786,6 +791,7 @@ #include "code\game\gamemodes\colonialmarines\whiskey_outpost\skills.dm" #include "code\game\gamemodes\colonialmarines\whiskey_outpost\whiskey_output_waves.dm" #include "code\game\gamemodes\events\power_failure.dm" +#include "code\game\gamemodes\extended\cm_vs_upp.dm" #include "code\game\gamemodes\extended\extended.dm" #include "code\game\gamemodes\extended\extended_clash.dm" #include "code\game\gamemodes\extended\extended_nospawn.dm" @@ -842,6 +848,7 @@ #include "code\game\jobs\job\marine\squad\tl.dm" #include "code\game\jobs\job\special\cmb.dm" #include "code\game\jobs\job\special\provost.dm" +#include "code\game\jobs\job\special\responders.dm" #include "code\game\jobs\job\special\uaac.dm" #include "code\game\jobs\job\special\uscm.dm" #include "code\game\jobs\job\special\weyland_yutani.dm" @@ -1002,10 +1009,12 @@ #include "code\game\machinery\vending\vendor_types\antag\antag_gear.dm" #include "code\game\machinery\vending\vendor_types\antag\antag_guns_snowflake.dm" #include "code\game\machinery\vending\vendor_types\antag\antag_guns_sorted.dm" +#include "code\game\machinery\vending\vendor_types\antag\antag_predator.dm" #include "code\game\machinery\vending\vendor_types\crew\combat_correspondent.dm" #include "code\game\machinery\vending\vendor_types\crew\commanding_officer.dm" #include "code\game\machinery\vending\vendor_types\crew\corporate_liaison.dm" #include "code\game\machinery\vending\vendor_types\crew\engineering.dm" +#include "code\game\machinery\vending\vendor_types\crew\k9_synth.dm" #include "code\game\machinery\vending\vendor_types\crew\medical.dm" #include "code\game\machinery\vending\vendor_types\crew\mp.dm" #include "code\game\machinery\vending\vendor_types\crew\pilot_officer.dm" @@ -1035,9 +1044,12 @@ #include "code\game\objects\effects\afterimage.dm" #include "code\game\objects\effects\aliens.dm" #include "code\game\objects\effects\bloodsplatter.dm" +#include "code\game\objects\effects\client_image_holder.dm" #include "code\game\objects\effects\effect.dm" #include "code\game\objects\effects\elevator.dm" #include "code\game\objects\effects\glowshroom.dm" +#include "code\game\objects\effects\heavy_impact.dm" +#include "code\game\objects\effects\king_leap.dm" #include "code\game\objects\effects\manifest.dm" #include "code\game\objects\effects\misc.dm" #include "code\game\objects\effects\overlays.dm" @@ -1500,6 +1512,7 @@ #include "code\modules\admin\view_variables\view_variables.dm" #include "code\modules\almayer\machinery.dm" #include "code\modules\almayer\shakeship.dm" +#include "code\modules\almayer\ship_memorial.dm" #include "code\modules\almayer\weaponhits.dm" #include "code\modules\animations\animation_library.dm" #include "code\modules\assembly\assembly.dm" @@ -1517,6 +1530,7 @@ #include "code\modules\asset_cache\asset_list.dm" #include "code\modules\asset_cache\asset_list_items.dm" #include "code\modules\asset_cache\assets\fontawesome.dm" +#include "code\modules\asset_cache\assets\icon_ref_map.dm" #include "code\modules\asset_cache\assets\medals.dm" #include "code\modules\asset_cache\assets\tgfont.dm" #include "code\modules\asset_cache\assets\tgui.dm" @@ -1526,6 +1540,7 @@ #include "code\modules\autowiki\autowiki.dm" #include "code\modules\autowiki\pages\_page.dm" #include "code\modules\autowiki\pages\guns.dm" +#include "code\modules\autowiki\pages\supply_packs.dm" #include "code\modules\autowiki\pages\xeno_stats.dm" #include "code\modules\buildmode\bm-mode.dm" #include "code\modules\buildmode\buildmode.dm" @@ -1552,7 +1567,10 @@ #include "code\modules\clans\ship.dm" #include "code\modules\client\client_defines.dm" #include "code\modules\client\client_procs.dm" +#include "code\modules\client\color_picker.dm" #include "code\modules\client\country_flags.dm" +#include "code\modules\client\hair_picker.dm" +#include "code\modules\client\loadout_picker.dm" #include "code\modules\client\player_details.dm" #include "code\modules\client\preferences.dm" #include "code\modules\client\preferences_factions.dm" @@ -1561,6 +1579,7 @@ #include "code\modules\client\preferences_toggles.dm" #include "code\modules\client\statbrowser_options.dm" #include "code\modules\client\tgui_macro.dm" +#include "code\modules\client\traits_picker.dm" #include "code\modules\clothing\clothing.dm" #include "code\modules\clothing\clothing_accessories.dm" #include "code\modules\clothing\clothing_helpers.dm" @@ -1623,6 +1642,7 @@ #include "code\modules\cm_aliens\Ovipositor.dm" #include "code\modules\cm_aliens\weeds.dm" #include "code\modules\cm_aliens\XenoStructures.dm" +#include "code\modules\cm_aliens\hivebuffs\hivebuff.dm" #include "code\modules\cm_aliens\structures\construction_node.dm" #include "code\modules\cm_aliens\structures\egg.dm" #include "code\modules\cm_aliens\structures\fruit.dm" @@ -1638,8 +1658,8 @@ #include "code\modules\cm_marines\altitude_control_console.dm" #include "code\modules\cm_marines\anti_air.dm" #include "code\modules\cm_marines\codebook.dm" +#include "code\modules\cm_marines\custom_items.dm" #include "code\modules\cm_marines\Donator_Items.dm" -#include "code\modules\cm_marines\Donator_Kits.dm" #include "code\modules\cm_marines\dropship_ammo.dm" #include "code\modules\cm_marines\dropship_equipment.dm" #include "code\modules\cm_marines\m2c.dm" @@ -1712,7 +1732,6 @@ #include "code\modules\cm_tech\techs\marine\tier3\cryorine.dm" #include "code\modules\cm_tech\techs\marine\tier4\nuke.dm" #include "code\modules\cm_tech\trees\marine.dm" -#include "code\modules\customitems\item_spawning.dm" #include "code\modules\decorators\admin_runtime_decorator.dm" #include "code\modules\decorators\cassette_decorator.dm" #include "code\modules\decorators\christmas.dm" @@ -1778,10 +1797,12 @@ #include "code\modules\gear_presets\corpses.dm" #include "code\modules\gear_presets\dust_raider.dm" #include "code\modules\gear_presets\dutch.dm" +#include "code\modules\gear_presets\fax_responders.dm" #include "code\modules\gear_presets\fun.dm" #include "code\modules\gear_presets\other.dm" #include "code\modules\gear_presets\pmc.dm" #include "code\modules\gear_presets\royal_marines.dm" +#include "code\modules\gear_presets\synth_k9.dm" #include "code\modules\gear_presets\synths.dm" #include "code\modules\gear_presets\upp.dm" #include "code\modules\gear_presets\uscm.dm" @@ -1857,6 +1878,7 @@ #include "code\modules\logging\log_category.dm" #include "code\modules\logging\log_holder.dm" #include "code\modules\mapping\map_template.dm" +#include "code\modules\mapping\mapping_helpers.dm" #include "code\modules\mapping\merge_conflicts.dm" #include "code\modules\mapping\preloader.dm" #include "code\modules\mapping\reader.dm" @@ -1955,7 +1977,6 @@ #include "code\modules\mob\living\carbon\human\life\handle_fire.dm" #include "code\modules\mob\living\carbon\human\life\handle_grabbed.dm" #include "code\modules\mob\living\carbon\human\life\handle_organs.dm" -#include "code\modules\mob\living\carbon\human\life\handle_pulse.dm" #include "code\modules\mob\living\carbon\human\life\handle_regular_hud_updates.dm" #include "code\modules\mob\living\carbon\human\life\handle_regular_status_updates.dm" #include "code\modules\mob\living\carbon\human\life\handle_stasis_bag.dm" @@ -1964,9 +1985,11 @@ #include "code\modules\mob\living\carbon\human\powers\human_powers.dm" #include "code\modules\mob\living\carbon\human\powers\issue_order.dm" #include "code\modules\mob\living\carbon\human\species\emote-monkey.dm" +#include "code\modules\mob\living\carbon\human\species\emote-synth_k9.dm" #include "code\modules\mob\living\carbon\human\species\human.dm" #include "code\modules\mob\living\carbon\human\species\monkey.dm" #include "code\modules\mob\living\carbon\human\species\species.dm" +#include "code\modules\mob\living\carbon\human\species\synth_k9.dm" #include "code\modules\mob\living\carbon\human\species\synthetic.dm" #include "code\modules\mob\living\carbon\human\species\zombie.dm" #include "code\modules\mob\living\carbon\human\species\working_joe\_emote.dm" @@ -2038,6 +2061,9 @@ #include "code\modules\mob\living\carbon\xenomorph\abilities\facehugger\facehugger_powers.dm" #include "code\modules\mob\living\carbon\xenomorph\abilities\hivelord\hivelord_abilities.dm" #include "code\modules\mob\living\carbon\xenomorph\abilities\hivelord\hivelord_powers.dm" +#include "code\modules\mob\living\carbon\xenomorph\abilities\king\king_abilities.dm" +#include "code\modules\mob\living\carbon\xenomorph\abilities\king\king_macros.dm" +#include "code\modules\mob\living\carbon\xenomorph\abilities\king\king_powers.dm" #include "code\modules\mob\living\carbon\xenomorph\abilities\lesser_drone\lesser_drone_abilities.dm" #include "code\modules\mob\living\carbon\xenomorph\abilities\lesser_drone\lesser_drone_macros.dm" #include "code\modules\mob\living\carbon\xenomorph\abilities\lesser_drone\lesser_drone_powers.dm" @@ -2078,6 +2104,7 @@ #include "code\modules\mob\living\carbon\xenomorph\castes\Facehugger.dm" #include "code\modules\mob\living\carbon\xenomorph\castes\Hellhound.dm" #include "code\modules\mob\living\carbon\xenomorph\castes\Hivelord.dm" +#include "code\modules\mob\living\carbon\xenomorph\castes\King.dm" #include "code\modules\mob\living\carbon\xenomorph\castes\Larva.dm" #include "code\modules\mob\living\carbon\xenomorph\castes\lesser_drone.dm" #include "code\modules\mob\living\carbon\xenomorph\castes\Lurker.dm" @@ -2400,6 +2427,7 @@ #include "code\modules\tgui\tgui-say\speech.dm" #include "code\modules\tgui\tgui-say\typing.dm" #include "code\modules\tgui_input\checkboxes.dm" +#include "code\modules\tgui_input\color.dm" #include "code\modules\tgui_input\text.dm" #include "code\modules\tgui_panel\audio.dm" #include "code\modules\tgui_panel\external.dm" diff --git a/config/example/config.txt b/config/example/config.txt index 07dfe6f1b839..604f0d4f6559 100644 --- a/config/example/config.txt +++ b/config/example/config.txt @@ -236,6 +236,11 @@ AUTOOOCMUTE ## The default value assumes youtube-dl is in your system PATH # INVOKE_YOUTUBEDL youtube-dl +## cobalt.tools is an alternative player used by Play Internet Sound, if +## both INVOKE_YOUTUBEDL and COBALT_BASE_API are specified. If only +## COBALT_BASE_API is specified, it will exclusively cobalt.tools. +# COBALT_BASE_API https://api.cobalt.tools/ + ## Default gamemode to auto-switch back to after a round has concluded GAMEMODE_DEFAULT Extended diff --git a/config/example/custom_items.txt b/config/example/custom_items.txt index f4bb1a7028b7..01ae043c23c8 100644 --- a/config/example/custom_items.txt +++ b/config/example/custom_items.txt @@ -1 +1,9 @@ -ckey: name: /path/to/obj +# Ckey: Variant: Typepath, Typepath, ... +# Variant is used if there are multiple kits for one ckey +# Multiple typepaths can be used to make a kit with multiple items + +# For example... +# CKEY: /obj/item/toy/plush/random_plushie +# CKEY2: /obj/item/toy/plush/farwa, /obj/item/toy/plush/shark +# CKEY3: Kit1: /obj/item/toy/plush/moth +# CKEY3: Kit2: /obj/item/toy/plush/therapy/red, /obj/item/reagent_container/food/drinks/cans/waterbottle diff --git a/html/changelogs/AutoChangeLog-pr-7308.yml b/html/changelogs/AutoChangeLog-pr-7308.yml deleted file mode 100644 index 1afcf7ba7912..000000000000 --- a/html/changelogs/AutoChangeLog-pr-7308.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "SpartanBobby" -delete-after: True -changes: - - maptweak: "Reshuffles tables in squad hypersleep bay adds some new decals" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-7312.yml b/html/changelogs/AutoChangeLog-pr-7312.yml deleted file mode 100644 index e47f6100df07..000000000000 --- a/html/changelogs/AutoChangeLog-pr-7312.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "BeagleGaming1" -delete-after: True -changes: - - rscadd: "Tutorials can be locked until a prerequisite tutorial is completed" - - code_imp: "Tutorials are saved in preferences instead of per character slot" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-7317.yml b/html/changelogs/AutoChangeLog-pr-7317.yml deleted file mode 100644 index b874ec308398..000000000000 --- a/html/changelogs/AutoChangeLog-pr-7317.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "BlackCrystalic" -delete-after: True -changes: - - bugfix: "Code writing of CMB New() proc and setting initial values" \ No newline at end of file diff --git a/html/changelogs/archive/2024-10.yml b/html/changelogs/archive/2024-10.yml index a163d6c63c17..c159768eaf68 100644 --- a/html/changelogs/archive/2024-10.yml +++ b/html/changelogs/archive/2024-10.yml @@ -156,3 +156,294 @@ - rscadd: Added a varient of combistick that has no block chance. private-tristan: - rscadd: Req line tutorial NPCs have a bigger list of items to ask for. +2024-10-17: + BeagleGaming1: + - rscadd: Tutorials can be locked until a prerequisite tutorial is completed + - code_imp: Tutorials are saved in preferences instead of per character slot + BlackCrystalic: + - bugfix: Code writing of CMB New() proc and setting initial values + SpartanBobby: + - maptweak: Reshuffles tables in squad hypersleep bay adds some new decals + private-tristan: + - balance: Increased the starting amount of mk2 and m39 mags in prep vendors + realforest2001: + - rscadd: Added a giant message to end of ERT spawns so they know if they're hostile + or not. + - rscadd: CLF armor now protects from cold weather so hostile survivors are not + penalized. +2024-10-18: + blackdragonTOW: + - rscadd: Added Synthetic K9 Rescue Teams + - bugfix: Monkeys no longer have access to marine emotes AND now have access to + their own emotes but were blocked from. + - code_imp: Added a NO_OVERLAYS flag for species should we ever want a species to + not use onmob overlays. + - refactor: Altered emote whitelisting and blacklisting so that species that were + blacklisted out of the basic emotes will able to be whitelisted for other emotes + - soundadd: added dog sounds for Synthetic K9 Rescue Teams + - imageadd: added icons for Synthetic K9 Rescue Teams +2024-10-19: + harryob: + - bugfix: pilots can no longer take out enormous loans to buy their equipment +2024-10-20: + Drathek: + - qol: Added examine text to vendors that are connected via medlink + - balance: Blood vendors restock blood bags when connected via medlink (requires + 20 mins from round start) + - maptweak: Added more medlinks to the Almayer +2024-10-23: + Detective-Google: + - qol: the HM vendor's recommendations have been tweaked to be easier to understand. + Tyranicranger4: + - qol: Increased the ChemMaster reagent buffer from 300 to 500 + Willzadl: + - spellcheck: fixed typos in the names of the SEATech vendor and the chef's apron + efzapa: + - bugfix: Chinook Dock now works. + harryob: + - bugfix: the unbuckled message is now slightly more accurate + ihatethisengine: + - rscadd: Military CC now can take broadcasting camera from CC vendor. + realforest2001: + - admin: Moderators now have access to remote control as intended. + zzzmike: + - qol: xenos get the same bomb decryption timer notification that preds get +2024-10-25: + BOBAMA: + - bugfix: Fixes splint removal dupe bug +2024-10-27: + Ansekishoku: + - rscadd: Added 4 new hairs to the game. + BeagleGaming1: + - rscadd: Added keybindings to let humans pixel shift objects they are holding + BlackCrystalic: + - bugfix: No more multiple surgeries on same operation table for 2x and more patients + at same time + - bugfix: Now ejecting chambered bullet from smartgun drop /datum/ammo/bullet/smartgun + type bullet only + - code_imp: squads now have lists for roles limit and taken number, not hardcoded + role list in vars, plus one letter vars change + - bugfix: Underbarel flamer no more can drain fuel from empty tanks + - qol: Discord Certify only visible if you don't have linked discord acc + Blundir: + - rscadd: adds unique APOLLO pda to CE vendor + - imageadd: resprite of majority of attachments + - bugfix: fixes double bun hairstyle overriding normal bun hairstyle + Byte-Boxer: + - rscadd: Added 12 new hairstyles for marines! + CapCamIII: + - balance: The contractor ABR40 now fires slightly faster and does a bit more damage, + also having an integrated magharn. + - rscadd: Shuffles around contractor ABR40 loadout, sacrificing the smoke grenades + and holotargeting rounds for a bit more normal ammo. + Comxy: + - bugfix: Fixes wall damage multipliers from reflecting to mobs. + Drdodo: + - code_imp: Added the Engineer Kit pouch to the CE vendor + - code_imp: Added the M277 pattern construction rig to the CE vendor + - code_imp: Added the Small Tool Webbing to the CE vendor + - code_imp: Added the M276 G8-A General Utility Pouch to the CE vendor + - code_imp: Added a toolbelt section with the new changes to the vendor + GoldenDarkness55: + - rscadd: Added a warning to thermobaric missile direct fire. + Ibessas: + - bugfix: Prevent tackle noises from Queen corpses + Katskan: + - rscadd: Pen light added to synthetic points vendor + - rscdel: Removed stethoscope from the clothing vendor, left the one in the points + vendor + Killfish: + - qol: Paralyzing Slash now makes you slash regardless of intent for the duration + of the buff. + Nomoresolvalou, Thwomper: + - rscadd: Added 1 new hunter armor and 5 new hunter masks + - imageadd: Added sprites for the new cosmetics, made by Thwomper + Red-byte3D: + - code_imp: Praetorian one letter vars begone + - code_imp: fix warrior single letter wars + Rem1, Mistfrag: + - spellcheck: Converts UPP Ranks to follow USSR ranks without the silly looking + Latinization. + Sargeantmuffinman: + - qol: Added auto wiki for requisitions. + So-mii: + - balance: Removes flash protection from BiMex shades + Stakeyng: + - qol: more items count as helmet accessories (Multiple glasses, walkman/cassettes/cassette + pouch, playing cards, uniform patches, candle) + TheManWithNoHands: + - balance: rebalances hornet shells, increasing the spread cone to 25, inceasing + the projectile count to 15, lowers projectile dmg to 8. + - balance: Inceases Star shell fuel time from 30-60 seconds to 4.5- 5.5 minutes. + Increases starshell applyd fire stacks from 1 to 2 + - code_imp: changed the icon path of LTAA mags to be not literally the painless + mag + - imageadd: changed LTAA-AP minigun, 20m Autocanon, DRG-N flamer, LTAA-AP mag, DRG-N + mag, to use green tank camo + VileBeggar: + - rscadd: Dual-tube shotguns (like the HG-37) can now rechamber their currently + loaded shell with the other tube. This allows you to instantly switch from, + e.g. a tube filled with buck to one filled with slugs, and fire the slug immediately + just by switching shotgun tubes. + - rscadd: You can now take the time to remember your fallen friends at the memorial. + Don't be alone when trying to remember. It hurts to remember. + Zenith00000: + - imageadd: replaced some old icons from floors.dmi + cuberound: + - rscadd: flag for HvH to turn all internal bleeding into normal one + - balance: splints act as and look like nanosplints in faction clash + deathrobotpunch: + - balance: more items have been added to the arcade machine prize pool. + detectivegoogle: + - rscadd: the CL now gets a briefing about the lore of the active map, assuming + one has been written. + efzapa: + - balance: Escape Pods can no longer be burrowed into or tunneled. + harryob: + - bugfix: fixes being able to use hotkeys for humans when you're a dead human + kiVts: + - bugfix: Dropships notify about hostile xeno flying on them again. + thevandie: + - rscadd: Fiorina Corporate Liaison + - rscadd: Kutjevo Corporate Liaison + - rscadd: WY Headsets to WY roles on Fiorina +2024-10-28: + Blundir: + - rscadd: returned bimex description and flash protection, but price of it inscread + from 2 to 5 pref points + - rscadd: minimap icons for all factions, roles, etc + - code_imp: tweaked how icons are assembled, added support for custom icon background + on equipment preset + - imageadd: added a lot of new minimap icons + Killfish: + - balance: Added Stim and Medical Chem draining effects to Sentinel's Slowing Spit. + LordJike: + - rscadd: ASO now starts with a senior command headset (and thus access to the MP + radio channel.) and can also get a new one from their locker. + Red-byte3D: + - code_imp: Sentinel proper vars + SpypigDev: + - rscadd: Pressurized Chemical Dispenser + Tyranicranger4: + - balance: The surgical case can now hold Surgical Line, Synthetic-Graft, and Fix-O-Vein + (for real this time) + Venuska1117: + - code_imp: Removed code for some boudlers, removed code makes boulders meltable + and destructable by large explosions. + cuberound: + - bugfix: vehicle light turns back on after the vehicle is fixed + deathrobotpunch: + - balance: buffed the stun subtype of rubber bullets to have hit accuracy tier 4 + private-tristan: + - balance: The Lever action rifles R4T and XM88 now begin falloff at 7 tiles instead + of 0. +2024-10-29: + Ansekishoku: + - bugfix: Buckshot additional projectiles no more miss the target when they get + stunned by the main projectile. + - bugfix: Fixed autolathes printing blowtorches with fuel. + - spellcheck: Added description to blowtorches. + Ansekishokuu: + - qol: Squad engineer vendors now have welding visor. + - qol: Organized the corpsman vendor so that the perixadon revival mix is near the + tricordrazine revival mix. + BeagleGaming1: + - bugfix: fixed a bug with the pixel shift keybindings + Blundir: + - rscadd: you can no longer see or talk with a hugger on your face + - bugfix: welding protection now adds correct amount of vision impairment + - bugfix: blindfold now actually blinds + - bugfix: fixed larva bursting on mob image not working + - soundadd: new hugging sounds to humans + - soundadd: bursting screams to humans and yautja + - imageadd: added yautja bursting and afterburst gore icons + Joe Lampost, Beaglegaming, Sleepynecrons: + - rscadd: Adds two new vendors for preds + - rscadd: Re-sprites all but one of the pred weapons + - balance: Gives thwei brain and eye healing properties. + - bugfix: fixes the on mobs for retro caster + - rscdel: Removes being able to choose what accessory you spawn with (adds it to + the vendor) + - rscdel: Removes the conscious check for big SD laugh so SDing a dead pred triggers + the laugh + - rscdel: Removes all of the code related to claim gear + - refactor: refactored wrist blade code (now bracer attachments) + - soundadd: adds 3 pairs of deployment and retracting sounds for each current bracer + attachment + - soundadd: adds a sound for attaching attachments to the bracer + - maptweak: Re maps the predator blooded area to be more open + - maptweak: Removes the lightsabre from the pred ship + - rscadd: adds two new pred masks + Katskan: + - balance: enable generation selection to affect species and skillset for synthetics + - balance: removed generation 3 leadership skills + - balance: increased generation 1/2 engineering and construction skills + - bugfix: fixed the Solaris PMC nightmare spawn being incorrect skillset + MistChristmas, Private-Tristan: + - balance: You can no longer crawl while being grabbed by a xenomorph. + TheManWithNoHands: + - rscadd: 'Added vendor description to: AC3-E autocanon, LTAA-AP Minigun, DRG-N + Flamer, LTB canon, LZR-N Flamer, TOW launcher, M56cupola, and M92T Grenade Launcher.' + - rscadd: 'Expanded the description of: LTAA-AP Minigun, TOW launcher, M56cupola, + M92T Grenade Launcher and the magazins of the AC3-E autocanon, LTAA-AP Minigun, + DRG-N Flamer, LZR-N Flamer, and M92T Grenade Launcher. As well as for the snowplow + hardpoint and heavy and ligth treads.' + Unknownity: + - bugfix: Fixes missing paygrades,ranks and comms titles to PMC Survivors and PMC + Medic. Fixes certain PMC Survivors having incorrect headsets. + - balance: PMC Synthvivor skillset has been buffed to be consistent with the regular + PMC Synth. PMC Synthvivor's loadout has been nerfed. Dutch Lifesaver belt (used + by PMCs and DDs) has been buffed with improved splints and kits. + - rscadd: PMC Synthetics were granted a higher budget and they gained a Maintenance + Jack in their loadout. + VileBeggar: + - balance: Egg morphers now generate facehuggers on their own, up to 6 in total + every 2 minutes. Bodies can no longer be fed to egg morphers. Eggs can now get + planted beneath light fixtures and nested mobs. Egg morphers can no longer be + built in tallgrass. + - qol: Carriers can now automatically fill egg morphers with their own egg supply + by using the Retrieve Egg ability on them. + - balance: shotgun slugs have had their accurate range increased to 8, and their + accuracy tripled. any targets shot within 8 tiles will always be hit. incendiary + have had a milder accuracy increase. + blackcrystall: + - bugfix: fix of squad marines not getting squads + cuberound: + - balance: containers are destructible with bullets and xeno slashing + - rscadd: faction shuttle computers functionality + - bugfix: SMES units made explosion proof + ihatethisengine: + - balance: limbs are now only be delimb-able if they were fractured BEFORE the hit +2024-10-30: + BeagleGaming1: + - bugfix: Fixes chat showing "You fire the plasma caster" when firing an energy + weapon after equipping the plasma caster + - bugfix: Bracer attachments get properly deleted on bracer destruction + - bugfix: One bracer attachment cannot be attached to both bracer attachment slots + Blundir: + - rscadd: new minimap icons for numerous things + - bugfix: fixed squads having incorrect colors on minimap + Joe lampost: + - bugfix: Changes what armor is spawned from the pred vendor + Nanu, HarryOb, Spartanbobby: + - rscadd: Added a feature that will delete weeds in the surrounding area of the + Marines selected landing zone, and keep them subject to be unweedable for the + next eight minutes. + - balance: Maps currently affected by this change/test - Big Red, LV-624, Kutjevo, + New Varadero, Sorokyne Strata, Prison Station Science Annex, Shiva's Snowball. + - maptweak: Slight area tweaks and changes to allow more subjective control over + areas. + - maptweak: Big Red, South West Cave now has timed blockers to hinder a SW hive + and Marines alike from going a straight line to attack each other. These blockers + dissappear in a "cavein" at fourty minutes, Roughly on average twenty minutes + after marines land. + - balance: Queens can only ovi and build the hivecore on "their" side of the map + at roundstart, this protection drops off 25min from roundstart. + harryob: + - bugfix: stops a crisis in the part fabricator point economy by preventing infinite + money generation through cancelling items in the queue + joookschad: + - qol: Toy mechs will now fit into storage. +2024-10-31: + SpartanBobby: + - maptweak: Rearranges Almayer Upper Medical to accommodate a Psychiatric Care Unit diff --git a/html/changelogs/archive/2024-11.yml b/html/changelogs/archive/2024-11.yml new file mode 100644 index 000000000000..83519d76cde1 --- /dev/null +++ b/html/changelogs/archive/2024-11.yml @@ -0,0 +1,450 @@ +2024-11-01: + Ansekishoku: + - bugfix: Headsets no longer accept multiple encryption keys of the same kind. + BeagleGaming1: + - bugfix: Bracers properly update owner when unequipped or worn + - rscadd: When gibbed, the ghost will stay as the character instead of turning into + a brain + Blundir: + - rscadd: dead marines now have minimap revival icons animated, different icons + depending on how much time is left + - bugfix: fixed working joe not being able to use ai lockdown/nerve gas + GoldenDarkness55: + - balance: OT M40 grenade casing volume from 90 to 120, power 175 to 180, falloff + 75 to 80, shards 32 to 40, fire intensity 20 to 25, metal cost from 3750 to + 4250 which is 12% of a single metal sheet + - balance: OT M15 grenade casing power 215 to 220, falloff 90 to 120, shards 32 + to 80, fire radius from 5 to 6, fire intensity 20 to 30 and fire duration 24 + to 32 + - balance: OT claymore casing power 105 to 100, falloff 60 to 80, shards 32 to 40, + fire radius 5 to 4, fire intensity 12 to 20 + - balance: OT C4 casing damage multiplier against walls from 1.5 to 2, power 260 + to 280, falloff 90 to 120, shards 64 to 100, fire radius 6 to 4, fire intensity + 26 to 50, duration 30 to 20 + - balance: OT rocket casing power 240 to 220, falloff 90 to 160, shards 64 to 80, + fire radius 6 to 4, fire intensity 40 to 45 + - balance: OT mortar casing falloff 90 to 130, shards 128 to 200, fire intensity + 40 to 45 + - balance: Custom rocket accuracy raised from tier 2 to 5 and range lowered from + 8 to 7 + Red-byte3D: + - balance: base ravager empowered charge stun is increased from 1.3 to 1.6 + Steelpoint: + - maptweak: The north-east and south-east areas of Shivas Snowball start of pre-weeded, + in addition to a few resin doors and walls near the main entrances to hive locations. + ghostsheet: + - balance: Beserker Ravs no longer heals while on fire. + harryob: + - rscadd: the chem master ui is now tgui, and faster. hopefully better + - server: server hosts can now configure a cobalt.tools api to provide media playing + with "COBALT_BASE_API" and "COBALT_API_KEY" + realforest2001: + - bugfix: No store cryo pods now work as intended. +2024-11-02: + Drathek: + - ui: The ghost observer tacmap will now scroll both horizontally and vertically + as needed to display a large map. + - ui: The TGUI panels for tacmaps and drawings have been polished to utilize more + minimap space fully. + - refactor: Refactored minimap generation code to calculate min and max faster, + to more aggressively trim minimaps, and to support larger minimaps (was 480px + now 512px). + - bugfix: Fixes an issue where predator tacmap would take over the ghost tacmap + preventing it from opening for observers + - bugfix: Fix hive core placement restriction + Red-byte3D: + - balance: sg effective range nerfed to 5 + - balance: sg falloff increased + Sporticusmge: + - balance: Night Vision Optic now works 2 times longer, and recharge 2 times longer. + Squad Leader NVO prices changed, from 20 to 25. + Zenith00000: + - bugfix: fixed some un-needed code and added missing tiles + deathrobotpunch: + - balance: The Tactical compact nail gun is now available in the Chief Engineers + vendor. + private-tristan: + - balance: Forecon M39 spawn now has its spawn ammo in belt, instead of in satchel. +2024-11-03: + Ansekishoku: + - bugfix: Smartpack abilities no longer function if the user is dead. + GoldenDarkness55: + - balance: Cooldown multiplier for interrupting remote building raised from 2 to + 3 + - balance: Queen remote building modifier raised from 1 to 1.5 (slower, around 2.3-2.5s), + cooldown raised from 2s to 4s + - balance: Resin Whisperer remote building modifier raised from 2 to 2.5 (slower, + around 2.5s), cooldown raised from 1s to 2.5s + - balance: Sentinel neuro spit cooldown raised 1.5 to 2s, superslow 2.5 to 4s + - balance: Sentinel scatter spit scatter lowered 60 to 45, cooldown lowered 8s to + 6s + - balance: Sentinel paralyzing slash stuns after 3 seconds instead of 4 and lasts + 2.5 seconds from 2. +2024-11-04: + Drathek: + - bugfix: Fixes additional projectiles being fired from humans that placed a shotgun + sentry instead of the sentry. + - bugfix: Fixes cause_data for flamer sentries so now kills they make are explained + in the message and attributed to the kill counter for the sentry. + - bugfix: Fix reloading under barrel flamers with any reagent from a flamer tank + - ui: Fixed the ping relay buttons not displaying anything when clicked on the first + time. Now Button.Confirm.confirmContent will only replace children if it is + truthy. + - balance: Buffed SG armor penetration ammo damage falloff from 5 to 3. + VileBeggar: + - qol: You can now use the 'check status' verb and any stethoscope you might have + attached to your uniform directly by examining an adjacent human. + harryob: + - rscadd: a new tgui with better previews for the different skin colors / body types + / body sizes + - admin: you can add "known alts" to players, now + vero5123: + - bugfix: Special characters are now properly sanitized and removed in bug reports. +2024-11-05: + Drathek: + - code_imp: Enabled 3 more OD pragmas for linting and fixed some ambiguous usage + of In + Killfish: + - balance: Improved consistency of Scatter Spits accuracy. Now one of your projectiles + is guaranteed to to go in the direction you're aiming at, instead of potentially + going everywhere except where you're aiming and missing everything. + Nanu, HarryOb: + - code_imp: Adds some code so if you're above the pointcap on your loadout, items + will be removed to put you at the point cap limit. + Sargeantmuffinman: + - rscadd: Added more lore emails to the computers +2024-11-06: + BOBAMA: + - balance: You can now go on Ovi and build Hive Cores anywhere in the Atmospheric + Processor on Chance's Claim + - bugfix: bugged Shivas areas + - maptweak: Removed Sorokyne "hallway areas" + - balance: Areas on Sorokyne that were only CASable because of the "hallway areas" + can now just be CASd + Blundir: + - rscadd: XO spawning is now announced just like SEA/CO + detectivegoogle Drathek: + - balance: Morphers generate huggers twice as fast if queen is on ovi + efzapa: + - rscadd: All USCM Flag Officers now understand and can use Tactical Sign Language. + - qol: Tactical Sign Language is now the default language for all MARSOC spawned. + harryob: + - bugfix: you can transfer riflemen between squads again + - bugfix: sebb grenades can no longer degroin synths through EMPs, which was unintended + thevandie: + - imageadd: added a new sprite for the liaison's wall divider behind his desk + - mapadd: added a WY mre to the liaison's liquor cabinet (cardboard box full of + donk pockets) + - mapadd: added a tv to the liaison's desk, in place of the containment cell console + - mapadd: added a new button to the liaison's desk to replace the wall divider button. + it controls the back office shutters + - maptweak: moved the liaison's shutters button and console to the back office + - maptweak: moved some stuff around in the liquor cabinet to accommodate the MRE + being placed into it + - maptweak: moved some stuff around on the liaison's desk to make it look cleaner +2024-11-07: + Drathek: + - balance: Fix XvX landmarks being used for roundstart oviable locations + - balance: Roundstart oviable locations are expanded on Kurjevo, Shivas, Trijent + Dam, Chances's Claim, and Fiorina + - bugfix: XvX now makes all areas oviable + Joe Lampost: + - code_imp: Makes using LOOC use your real name instead of unknown + - code_imp: Sding preds now have their name shown instead of unknown + Joelampost: + - rscadd: Added first names for spawned preds + - rscadd: Added last names for spawned preds + Nomoresolvalou: + - rscadd: Hunters can now put their bone trophies on their armor to have it show + up there instead of on their mesh. + TheDonkified: + - code_imp: Xeno ability names in chat and stats page changed to match the names + for xeno ability buttons + VileBeggar: + - bugfix: Memorial ghosts will now face the user instead of facing south. +2024-11-08: + BOBAMA: + - maptweak: quadrupled the limit for roundstart corpses on maps. + - maptweak: Removed Corpses from Solaris. Added corpses to Shivas, Fiorina, and + Trijent + - maptweak: added some "last stand" holds to Trijent and Shivas to put bodies in. + Trijent research lab had most CMB weapons replaced with corporate/goon stuff. + - balance: Intel points from human bodies are now capped at 5 (50 bodies) + BOBAMAx: + - bugfix: extra apc in shivas removed + Nomoresolvalou, Thwomper: + - rscadd: Adds a new predator mask accessory + - ui: added a selection for mask accessories in yautja prefs + - bugfix: fixes one speicifc yautja mask having no sprite onmob + - code_imp: infrastructure for adding in new mask accessories + - imageadd: added Thwomp's cool as hell horn sprites + Red-byte3D: + - rscadd: New preference toggle that allows Queen's to pick if they want to automatically + shove people they step on or not + cuberound: + - balance: binoculars have miniscope level zoom on HvH + harryob, drathek: + - ui: replaces the lists for hair/facial hair with images in a separate picker + - ui: replaces the eye color picker with a tgui color picker + - code_imp: added unit test for duplicate sprite accessories (hair) +2024-11-09: + SerheyKr: + - balance: Changing the UPP vendors stuff + cuberound: + - bugfix: UPP req vendor no longer spends points + - rscadd: adds UPP vs USCM gamemode, event only + - ui: adds option to both early and latejoin UPP roles from lobby on UPP vs USCM + - rscadd: adds early and latespawners for UPP roles + - balance: updates UPP ERT vendors to have 45 points + - rscadd: Added standard apparel to every UPP roles to clothing vendor + - balance: A lot of changes to upp vendor stuff in order to make them on pair with + USCM + - rscadd: adds option for spawners to use lists of jobs + - rscadd: enables overwatch consoles of other factions + - rscadd: UPP squad supply drops +2024-11-10: + Joe Lampost: + - code_imp: Changes the spawn message for predators + Venuska1117: + - code_imp: Added ability to Destroy Platform Edges by xenos on "Disarm" intent, + now depending on xenos "size" they can break Platform Edges quicker or Slower, + Now Explosives have chance to destroy Platform Edges by depending on how strong + explosion is. + - imageadd: Added Sprites for Broken Platforms Edges. + - soundadd: Added Sound for Breaking "Stone" Edges. + cuberound: + - qol: handrails are autoclimbable when on harm intent, you take some harm when + doing so + - balance: crusher and ravager destroy handrails when trying to pass them similar + to tables + harryob: + - ui: adds a prettier custom loadout menu with images +2024-11-11: + Drathek: + - balance: Queen remote building (while boosted) is now prevented in LZ linked weed + restricted areas + - balance: Adjusted/added LZ linked weed restriction areas on all maps in rotation + - maptweak: Fixed misplaced areas on Shivas. + - maptweak: Split the Telecoms Valley area to make a Security Valley area on Trijent. + cuberound: + - bugfix: UPP CO joining from lobby should recive proper rank + harryob: + - ui: added a new tgui to select character traits. it's quite similar to the old + one +2024-11-12: + An A Jay: + - balance: Made Medicomp heal to full for predators. + Katskan: + - bugfix: G2 cosmetic working properly + Nomoresolvalou, Thwomper: + - rscadd: 'Added two new yautja weapons: the longaxe and the staff' + - imageadd: Added sprites for the new weapons + Sunless2: + - rscadd: Added the ability for bayonets to cut down fences + - balance: It now takes twice the amount of throws to bring down a fence +2024-11-13: + Blundir: + - rscadd: working joe's and early gen synth's eyes now glow in a dark + - rscadd: working joe's and early gen synth's eyes color tweak on disarm and grab + Drathek: + - maptweak: Fixed the rotation of the telecoms APC in the Aerodome on Shivas + - balance: LZ smoke is now disabled by default on distress signal + - admin: Added game mode toggle to toggle LZ smoke during the first 3 minutes of + the round (otherwise is locked in) + - balance: Eggs that lose their hive weeds will now turn fragile (like egg carrier + eggs) lasting 5 minutes. + - bugfix: Fixed an exploit allowing egg carrier eggs to last indefinitely. + - bugfix: Fixed the inability to examine planted eggs from further than one tile. + - code_imp: Added some more sanity code to ensure time of death is recorded for + larva queue + JustLat: + - imageadd: Adds icon states for l_hand and r_hand for yautja accessories. + Steelpoint, Zenith: + - mapadd: Two UPP dropships have been added for event use, the Morana and the Devana. + - maptweak: Fixes a issue preventing the Saipan, a USCM dropship, from being spawned + by admins for events. + cuberound: + - bugfix: removes dupe definitions and corrects items i UPP Loudouts + - bugfix: makes UPP synth lobby joinable for events + zzzmike: + - rscadd: tip of the round regarding lesser known cryotube utility +2024-11-16: + BeagleGaming1: + - rscadd: Adds the personal gear vendor, where people can get their donator items + or a random loadout item + - rscadd: Custom Items can be gotten from Requisitions instead of spawning with + them + - config: Changes to config/custom_items.txt +2024-11-18: + Drulikar: + - code_imp: dmm_test now checks if there are pending mapmerge2 conversions. + - code_imp: Improved dmm_test error handling + - code_imp: mapmerge2 now uses keys sequentially rather than randomly. + - code_imp: mapmerge2 fixup script now assigns upstream remote if needed, and checks/fixes + pending mapmerge2 conversions. + SASoperative: + - rscadd: Personal Gear Vendor allows retrieval of additional kits for multi-kit + donators +2024-11-19: + AlanParkerMasters: + - rscdel: A single period from the ABR-40 description that shouldn't be there. + An A Jay: + - balance: Gave predators the ability to cut through fences + Red-byte3D: + - code_imp: rewrote tremor code + cuberound: + - bugfix: emp act is called once on each limb not three time + - balance: reduces g2 electroshock grenade stamina damage + - bugfix: yauta bracers get properly drained by emp + harryob: + - ui: adds a search bar to the pred/wj emote panels + zzzmike: + - qol: nuclear device messaging more helpful for newbies +2024-11-20: + BOBAMA: + - rscadd: Added a new corporate version of the M-39. + - rscadd: Added new PMC TL to the Big Red nightmare insert. + - rscadd: corporate M-39, Mk221, and corporate FP9000 to PMC survivor weapon pool + to replace the MAR, FP9000, CMB shotgun, custom shotgun, and MP5. + - mapadd: Changed the PMC Big Red nightmare insert to now have supplies in the second + crashed dropship near EVA. + - maptweak: Changed standard M-39 gun lockers in Eta Labs to the new corporate version. + Drathek: + - bugfix: Fixed xenos sometimes becoming immortal with warding pheros (xenos do + not cap brute/fire damage now) + - code_imp: Added sanity checks for whenever AREA_UNWEEDABLE is used or when an + area is somehow null + - balance: All maps have their round start is_resin_allowed restriction lifted unless + out of bounds + - maptweak: All maps with OOB areas have now AREA_UNWEEDABLE set to make the restriction + permanent + - bugfix: Resin walls and doors will now properly get weed killed + - bugfix: Fixed corrupted xenos not getting the English language + - bugfix: Fixed ammo boxes allowing cramming under north facing platforms + Drulikar: + - code_imp: Refactored donator lists to GLOBs that automatically initialize and + made ckeys in custom_items.txt more flexible + - config: Updated example config for custom_items.txt + Joe Lampost: + - rscadd: Thwei crystals now delete themselves after a set time + Steelpoint: + - rscadd: UPP synthetics spawned as part of events may now have access to a Snowflake + clothing vendor, to better allow them to customise their appearance. + - balance: During the 'Faction Clash' (HvH) game mode. Marine Helmets, gloves and + boots will have similar armour values to their UPP counterparts. + TheGamerdk: + - rscadd: Barricades have been covered in petroleum jelly. They can no longer be + pixelshifted. + cuberound: + - balance: add flashing light to mortar impacts for UPP vs USCM gamemode + - imageadd: tacmap icon for sensor tower (displayed to all factions) + - rscadd: UPP HUD icons get their squad color + - balance: launchbay is now useable on transport run + - balance: changes UPP rifleman, medic,engi and squad leader skills to be the same + as USCM coutnerparts for HvH events + - bugfix: UPP CO and synth whitelists work on lobby joning + private-tristan: + - bugfix: SOF Encryption Keys now properly give you SOF comms. + realforest2001: + - rscadd: Added unique identifier to all fax machines. + - rscadd: Added a new way to contact fax machines directly, titled Specific Machine + Code in the select department setting. + - rscadd: Added a Fax Responder role, broken down into subsidiary jobs for each + faction. This is currently experimental in handling, and access is restricted. + - rscadd: Fax Machines will tell you (when selecting a faction's High Command) if + a Fax Responder is awake. + - code_imp: Makes the Whitelist Panel use the correct permissions for Overseer. + stanalbatross: + - bugfix: made the first-aid pouch descriptions accurately reflect their contents +2024-11-21: + SpypigDev: + - bugfix: no longer forces pill bottles to begin emptying on a click + stanalbatross: + - code_imp: slightly optimised how pulse is checked by checking it when required + rather than every lifetick +2024-11-22: + Drathek: + - rscadd: Added 5 minute cooldown when de-evolving to evolve into the same caste + - bugfix: Fixed queen de-evolve deleting her own organ rather than target xeno's + - bugfix: Fixed queen de-evolve not transferring built_structures list + - bugfix: Fixed regular de-evolve not stopping stat tracking on old xeno + - bugfix: Fixed de-evolve verb getting restored if it was taken away (Wouldn't without + admin intervention currently) + - bugfix: Fixed mature larva name never getting applied when full evo threshold + - rscdel: De-evolving to larva is now never bloodied (bloody used to only depend + on evolution points to determine bloody status) + - rscadd: Monkeys in lockers can cause the locker to emote and have a higher chance + of escaping + - soundadd: Monkeys now have a chance to use two different chimpers (existing sfx) + - balance: Increased orphan egg time from 5 mins to 6 mins. + - balance: Xeno ammo can no longer push items (e.g. Oppressor Tail Seize) + SpartanBobby: + - maptweak: Readds LV522 LZ1 shortfog + realforest2001: + - bugfix: Staff can properly access Fax Responder WL. +2024-11-23: + MaximusRex: + - balance: Increased flare duration from a variable 9.5 --> 10.5 minute length to + 16 minutes flat. + - balance: Flares start out strong (7 radius) and burn down to nothingness. + - balance: Increased flare_damage from acid by 20% across the board. + - balance: 'Weak Acid: 150-->180' + - balance: 'Medium Acid: 500-->600' + - balance: 'Strong Acid: 1875 -->2250 (RIP flare)' + - balance: Starshell ash fuel variance changed from (4.5 to 6.0) minutes ----> (6.0 + to 6.5) minute variance. + - balance: Starshell ash starts out semi-bright (6 radius) and burns down to nothingness. + - balance: Flare Mortars now have a static 7 tile radius , and variably last from + 5 to 6 minutes. + - balance: Flare gun unique-action now produces a static 7 tile radius light for + 3 minutes. Slightly lower luminosity than normal. + - code_imp: Implemented a new proc, flare_burn_down, and incorporated it into process(delta_time). + Nivrak Birdtalon Wei Zenith: + - rscdel: Removed passive larva gain from pylons + - rscadd: Added a new currency, Royal resin which is gained 1 per 5 minutes per + pylon which can be used to buy various buffs. Minor buffs require one pylon + while major buffs require both. + - rscadd: Current royal resin can be viewed on the Queen's status panel and buffs + can be bought through Manage the Hive ability. + - rscadd: Minor Hive buff - Larva Surge - Costs 5 royal resin, Gives 5 larva, one + time use + - rscadd: Minor Hive Buff - Boon of Evolution - Costs 1 royal resin, Gain 2x evolution + speed for 5 minutes + - rscadd: Minor Hive Buff - Boon of Defense - Costs 1 royal resin, Gain 2.5 additional + armor for 5 minutes + - rscadd: Minor Hive Buff - Boon of Aggression - Costs 1 royal resin, Gain 5 additional + damage for 5 minutes + - rscadd: Major variants of Plenty, Defense and Aggression, Each costing 2 royal + resin, having usually twice as strong effect and duration. Major boon of evolution + also allows gaining evolution with the Queen out of ovi. + - balance: Pylons will have OB protection while the King is hatching. + - rscadd: Major Hive Buff - His Grace - Costs 0 royal resin, Can only be bought + between 1:35 and 1:55 minutes (random). Spawns a cocoon of the King. The cocoon + requires both comms to be held for 10 minutes. If any of the comms are lost + or the cocoon itself is the destroyed it will despawn and will be on cooldown + for 5-15 minutes. Can be rebought like most other buffs. All living xenos can + vote for a candidate after which one of the top 2 will be randomally picked, + otherwise a player is randomly selected from all living xenos > 50 hours (will + fallbacks to ghosts and then again with no playtime requirements). Evacuating + while the destroyer is hatching will cause it to instantly hatch. + - rscadd: The King - A new xenomorph caste which is serves as the xeno's counterpart + to a nuke and is designed to end sieges. Has a rend to attack around it, a light + extinguishing smoke, a gigantic leap, group bulwark shield that caps all incoming + damage, and very strong pheromones. Cannot be body blocked. + - imageadd: Sprites by Mikoka Wei and Zenith +2024-11-25: + Drathek: + - balance: emp_pulse, flash_powder, and foam reactions are no longer possible in + mobs + - balance: flash_powder has been reworked to attach to its holder (so it can be + destroyed), and values retuned/capped. + - refactor: Refactored the metabolize proc for chemistry reactors (removed required_other + and changed required_container to use a path check instead) + efzapa: + - maptweak: Replaced a shutter in Lambda on Solaris Ridge so Larva aren't hard trapped + on roundstart. + realforest2001: + - maptweak: Lifeboat air pipes are now reinforced (again) and no longer explode. +2024-11-26: + Drdodo: + - bugfix: now CEs can buy all of their essentials diff --git a/icons/effects/96x96.dmi b/icons/effects/96x96.dmi index 521aea66d403..011bacb760cf 100644 Binary files a/icons/effects/96x96.dmi and b/icons/effects/96x96.dmi differ diff --git a/icons/effects/heavyimpact.dmi b/icons/effects/heavyimpact.dmi new file mode 100644 index 000000000000..e7af5cf49b76 Binary files /dev/null and b/icons/effects/heavyimpact.dmi differ diff --git a/icons/mob/hud/actions.dmi b/icons/mob/hud/actions.dmi index 3c3e6dd9de3d..1abf889b82c8 100644 Binary files a/icons/mob/hud/actions.dmi and b/icons/mob/hud/actions.dmi differ diff --git a/icons/mob/hud/marine_hud.dmi b/icons/mob/hud/marine_hud.dmi index 8be1ae31ba68..16f20176a4d2 100644 Binary files a/icons/mob/hud/marine_hud.dmi and b/icons/mob/hud/marine_hud.dmi differ diff --git a/icons/mob/humans/human_hair.dmi b/icons/mob/humans/human_hair.dmi index 1a91c7f0e43a..a5a900f51abb 100644 Binary files a/icons/mob/humans/human_hair.dmi and b/icons/mob/humans/human_hair.dmi differ diff --git a/icons/mob/humans/onmob/OnFire.dmi b/icons/mob/humans/onmob/OnFire.dmi index 696b12584e43..dd325cea67e2 100644 Binary files a/icons/mob/humans/onmob/OnFire.dmi and b/icons/mob/humans/onmob/OnFire.dmi differ diff --git a/icons/mob/humans/onmob/hunter/items_lefthand.dmi b/icons/mob/humans/onmob/hunter/items_lefthand.dmi index de2931c5666f..e6c79b0eafa5 100644 Binary files a/icons/mob/humans/onmob/hunter/items_lefthand.dmi and b/icons/mob/humans/onmob/hunter/items_lefthand.dmi differ diff --git a/icons/mob/humans/onmob/hunter/items_righthand.dmi b/icons/mob/humans/onmob/hunter/items_righthand.dmi index 6098a06810ff..1a1de5fe4f4d 100644 Binary files a/icons/mob/humans/onmob/hunter/items_righthand.dmi and b/icons/mob/humans/onmob/hunter/items_righthand.dmi differ diff --git a/icons/mob/humans/onmob/hunter/pred_gear.dmi b/icons/mob/humans/onmob/hunter/pred_gear.dmi index f4e01f8335ad..8a0504809509 100644 Binary files a/icons/mob/humans/onmob/hunter/pred_gear.dmi and b/icons/mob/humans/onmob/hunter/pred_gear.dmi differ diff --git a/icons/mob/humans/onmob/hunter/pred_mask_accessories.dmi b/icons/mob/humans/onmob/hunter/pred_mask_accessories.dmi new file mode 100644 index 000000000000..49331f4137cd Binary files /dev/null and b/icons/mob/humans/onmob/hunter/pred_mask_accessories.dmi differ diff --git a/icons/mob/humans/onmob/uniform_0.dmi b/icons/mob/humans/onmob/uniform_0.dmi index 36551630209d..d1fb32f6d05d 100644 Binary files a/icons/mob/humans/onmob/uniform_0.dmi and b/icons/mob/humans/onmob/uniform_0.dmi differ diff --git a/icons/mob/humans/species/synth_k9/onmob/synth_k9_overlays.dmi b/icons/mob/humans/species/synth_k9/onmob/synth_k9_overlays.dmi new file mode 100644 index 000000000000..207abb57de66 Binary files /dev/null and b/icons/mob/humans/species/synth_k9/onmob/synth_k9_overlays.dmi differ diff --git a/icons/mob/humans/species/synth_k9/r_k9.dmi b/icons/mob/humans/species/synth_k9/r_k9.dmi new file mode 100644 index 000000000000..f6ec5cbe7540 Binary files /dev/null and b/icons/mob/humans/species/synth_k9/r_k9.dmi differ diff --git a/icons/mob/xenos/effects.dmi b/icons/mob/xenos/effects.dmi index 132c5f78b0d7..dfdcbf95d54b 100644 Binary files a/icons/mob/xenos/effects.dmi and b/icons/mob/xenos/effects.dmi differ diff --git a/icons/mob/xenos/king.dmi b/icons/mob/xenos/king.dmi new file mode 100644 index 000000000000..cee599ba7f77 Binary files /dev/null and b/icons/mob/xenos/king.dmi differ diff --git a/icons/mob/xenos/overlay_effects64x64.dmi b/icons/mob/xenos/overlay_effects64x64.dmi index 360aa4c54ff8..0be09311a780 100644 Binary files a/icons/mob/xenos/overlay_effects64x64.dmi and b/icons/mob/xenos/overlay_effects64x64.dmi differ diff --git a/icons/mob/xenos/roguedamage.dmi b/icons/mob/xenos/roguedamage.dmi new file mode 100644 index 000000000000..92ca12ed9d7c Binary files /dev/null and b/icons/mob/xenos/roguedamage.dmi differ diff --git a/icons/mob/xenos/rogueking.dmi b/icons/mob/xenos/rogueking.dmi new file mode 100644 index 000000000000..10ea5680698a Binary files /dev/null and b/icons/mob/xenos/rogueking.dmi differ diff --git a/icons/mob/xenos/structures64x64.dmi b/icons/mob/xenos/structures64x64.dmi index 92ffdccf3b95..410f1a6f49e2 100644 Binary files a/icons/mob/xenos/structures64x64.dmi and b/icons/mob/xenos/structures64x64.dmi differ diff --git a/icons/mob/xenos/wounds.dmi b/icons/mob/xenos/wounds.dmi index 1b8ca0cebdd5..68f728c1efd8 100644 Binary files a/icons/mob/xenos/wounds.dmi and b/icons/mob/xenos/wounds.dmi differ diff --git a/icons/obj/items/clothing/backpacks.dmi b/icons/obj/items/clothing/backpacks.dmi index f4151b592e76..4ac5ae6b39b6 100644 Binary files a/icons/obj/items/clothing/backpacks.dmi and b/icons/obj/items/clothing/backpacks.dmi differ diff --git a/icons/obj/items/hunter/pred_gear.dmi b/icons/obj/items/hunter/pred_gear.dmi index fc9288641764..ff684282645b 100644 Binary files a/icons/obj/items/hunter/pred_gear.dmi and b/icons/obj/items/hunter/pred_gear.dmi differ diff --git a/icons/obj/items/hunter/pred_mask_accessories.dmi b/icons/obj/items/hunter/pred_mask_accessories.dmi new file mode 100644 index 000000000000..8530639f01cf Binary files /dev/null and b/icons/obj/items/hunter/pred_mask_accessories.dmi differ diff --git a/icons/obj/items/hunter/pred_vendor.dmi b/icons/obj/items/hunter/pred_vendor.dmi new file mode 100644 index 000000000000..b5fcda7afb3f Binary files /dev/null and b/icons/obj/items/hunter/pred_vendor.dmi differ diff --git a/icons/obj/items/pamphlets.dmi b/icons/obj/items/pamphlets.dmi index b178b6389802..d593fb6080f2 100644 Binary files a/icons/obj/items/pamphlets.dmi and b/icons/obj/items/pamphlets.dmi differ diff --git a/icons/obj/items/storage/kits.dmi b/icons/obj/items/storage/kits.dmi index 5c24d40b2474..b88e1e5e38a8 100644 Binary files a/icons/obj/items/storage/kits.dmi and b/icons/obj/items/storage/kits.dmi differ diff --git a/icons/obj/items/synth/wj_pda.dmi b/icons/obj/items/synth/wj_pda.dmi index 6bd7205e9a94..a6a397ad9d3c 100644 Binary files a/icons/obj/items/synth/wj_pda.dmi and b/icons/obj/items/synth/wj_pda.dmi differ diff --git a/icons/obj/items/weapons/guns/ammo_by_faction/uscm.dmi b/icons/obj/items/weapons/guns/ammo_by_faction/uscm.dmi index 8b3b5e0f1c80..b4ac1830ee66 100644 Binary files a/icons/obj/items/weapons/guns/ammo_by_faction/uscm.dmi and b/icons/obj/items/weapons/guns/ammo_by_faction/uscm.dmi differ diff --git a/icons/obj/items/weapons/guns/attachments.dmi b/icons/obj/items/weapons/guns/attachments.dmi index e627f7559a78..eb36689805d8 100644 Binary files a/icons/obj/items/weapons/guns/attachments.dmi and b/icons/obj/items/weapons/guns/attachments.dmi differ diff --git a/icons/obj/items/weapons/guns/attachments/barrel.dmi b/icons/obj/items/weapons/guns/attachments/barrel.dmi index 2400465e4bf4..cedbd065072a 100644 Binary files a/icons/obj/items/weapons/guns/attachments/barrel.dmi and b/icons/obj/items/weapons/guns/attachments/barrel.dmi differ diff --git a/icons/obj/items/weapons/guns/attachments/rail.dmi b/icons/obj/items/weapons/guns/attachments/rail.dmi index f53187160e92..33e92832d5ad 100644 Binary files a/icons/obj/items/weapons/guns/attachments/rail.dmi and b/icons/obj/items/weapons/guns/attachments/rail.dmi differ diff --git a/icons/obj/items/weapons/guns/attachments/under.dmi b/icons/obj/items/weapons/guns/attachments/under.dmi index 1138e0044c34..8814a4e94ee7 100644 Binary files a/icons/obj/items/weapons/guns/attachments/under.dmi and b/icons/obj/items/weapons/guns/attachments/under.dmi differ diff --git a/icons/obj/structures/alien/xenoKingHatchery.dmi b/icons/obj/structures/alien/xenoKingHatchery.dmi new file mode 100644 index 000000000000..e7911658b3f0 Binary files /dev/null and b/icons/obj/structures/alien/xenoKingHatchery.dmi differ diff --git a/icons/obj/structures/doors/blastdoors_shutters.dmi b/icons/obj/structures/doors/blastdoors_shutters.dmi index 1fe1df44b23a..b52322c01ed7 100644 Binary files a/icons/obj/structures/doors/blastdoors_shutters.dmi and b/icons/obj/structures/doors/blastdoors_shutters.dmi differ diff --git a/icons/obj/structures/doors/dropship_upp_cargo.dmi b/icons/obj/structures/doors/dropship_upp_cargo.dmi new file mode 100644 index 000000000000..f348cbf63586 Binary files /dev/null and b/icons/obj/structures/doors/dropship_upp_cargo.dmi differ diff --git a/icons/obj/structures/doors/dropship_upp_pilot.dmi b/icons/obj/structures/doors/dropship_upp_pilot.dmi new file mode 100644 index 000000000000..b4da9fbb4cb6 Binary files /dev/null and b/icons/obj/structures/doors/dropship_upp_pilot.dmi differ diff --git a/icons/obj/structures/doors/dropship_upp_side2.dmi b/icons/obj/structures/doors/dropship_upp_side2.dmi new file mode 100644 index 000000000000..9a1cb7ba681e Binary files /dev/null and b/icons/obj/structures/doors/dropship_upp_side2.dmi differ diff --git a/icons/obj/structures/machinery/shuttle-parts.dmi b/icons/obj/structures/machinery/shuttle-parts.dmi index 7db27387e7c1..ba2b36943184 100644 Binary files a/icons/obj/structures/machinery/shuttle-parts.dmi and b/icons/obj/structures/machinery/shuttle-parts.dmi differ diff --git a/icons/obj/structures/props/dropship_equipment.dmi b/icons/obj/structures/props/dropship_equipment.dmi index a3df74e3c07a..6b3675d63a53 100644 Binary files a/icons/obj/structures/props/dropship_equipment.dmi and b/icons/obj/structures/props/dropship_equipment.dmi differ diff --git a/icons/obj/structures/props/platforms.dmi b/icons/obj/structures/props/platforms.dmi index c0fbf42633a7..aef604ac4d44 100644 Binary files a/icons/obj/structures/props/platforms.dmi and b/icons/obj/structures/props/platforms.dmi differ diff --git a/icons/obj/vehicles/hardpoints/tank.dmi b/icons/obj/vehicles/hardpoints/tank.dmi index 0bb8987316f8..c9af30849eb8 100644 Binary files a/icons/obj/vehicles/hardpoints/tank.dmi and b/icons/obj/vehicles/hardpoints/tank.dmi differ diff --git a/icons/obj/vehicles/tank.dmi b/icons/obj/vehicles/tank.dmi index ec8135c2dde6..1991bc9caa70 100644 Binary files a/icons/obj/vehicles/tank.dmi and b/icons/obj/vehicles/tank.dmi differ diff --git a/icons/turf/almayer.dmi b/icons/turf/almayer.dmi index 07f771ec78c7..a028f7e5c89d 100644 Binary files a/icons/turf/almayer.dmi and b/icons/turf/almayer.dmi differ diff --git a/icons/turf/floors/floors.dmi b/icons/turf/floors/floors.dmi index 7b68cbb2b6b2..b06fdf9e5210 100644 Binary files a/icons/turf/floors/floors.dmi and b/icons/turf/floors/floors.dmi differ diff --git a/icons/turf/upp_dropship.dmi b/icons/turf/upp_dropship.dmi new file mode 100644 index 000000000000..f1e3aa01095f Binary files /dev/null and b/icons/turf/upp_dropship.dmi differ diff --git a/icons/ui_icons/hivebuff_radial.dmi b/icons/ui_icons/hivebuff_radial.dmi new file mode 100644 index 000000000000..f546ec268512 Binary files /dev/null and b/icons/ui_icons/hivebuff_radial.dmi differ diff --git a/icons/ui_icons/map_blips.dmi b/icons/ui_icons/map_blips.dmi index 28195bb238fe..269765df9ec9 100644 Binary files a/icons/ui_icons/map_blips.dmi and b/icons/ui_icons/map_blips.dmi differ diff --git a/icons/ui_icons/minimap.dmi b/icons/ui_icons/minimap.dmi index 7eeb5680b90f..08dbb8de4512 100644 Binary files a/icons/ui_icons/minimap.dmi and b/icons/ui_icons/minimap.dmi differ diff --git a/maps/Nightmare/maps/BigRed/nightmare.json b/maps/Nightmare/maps/BigRed/nightmare.json index 5c66a5dc94f1..56b017889726 100644 --- a/maps/Nightmare/maps/BigRed/nightmare.json +++ b/maps/Nightmare/maps/BigRed/nightmare.json @@ -1,9 +1,19 @@ [ { "type": "map_sprinkle", "path": "sprinkles/" }, - { "type": "pick", "chance": 0.40, "choices": [ - { "type": "map_insert", "landmark": "crashlanding-offices", "path": "standalone/crashlanding-offices.dmm" }, - { "type": "map_insert", "landmark": "crashlanding-eva", "path": "standalone/crashlanding-eva.dmm" } - ]}, + { + "type": "map_insert", + "landmark": "crashlanding-offices", + "chance": 1.0, + "path": "standalone/crashlanding-offices.dmm", + "when": { "lvevent": "pmccrash" } + }, + { + "type": "map_insert", + "landmark": "crashlanding-eva", + "chance": 1.0, + "path": "standalone/crashlanding-eva.dmm", + "when": { "lvevent": "pmccrash" } + }, { "type": "map_insert", "chance": 0.50, "landmark": "lambda-graveyard", "path": "standalone/lambda-graveyard.dmm" }, { "type": "pick", "chance": 0.50, "choices": [ { "type": "map_insert", "landmark": "lambda-cave-mushroom", "path": "standalone/lambda-cave_mushroom.dmm" }, diff --git a/maps/Nightmare/maps/BigRed/scenario.json b/maps/Nightmare/maps/BigRed/scenario.json index fe51488c7066..c3fad27a6c55 100644 --- a/maps/Nightmare/maps/BigRed/scenario.json +++ b/maps/Nightmare/maps/BigRed/scenario.json @@ -1 +1,10 @@ -[] +[ + { + "type": "pick", "name": "pmccrash", + "choices": [ + { "weight": 10, "type": "def", "values": { "lvevent": "none" } }, + { "weight": 4, "type": "def", "values": { "lvevent": "pmccrash" } } + ] + } +] + diff --git a/maps/desert_dam.json b/maps/desert_dam.json index b40e9887d15b..be12691c0dd5 100644 --- a/maps/desert_dam.json +++ b/maps/desert_dam.json @@ -27,6 +27,7 @@ ], "map_item_type": "/obj/item/map/desert_dam", "announce_text": "We've lost contact with Weyland-Yutani's extra-solar colony, \"Trijent Dam\", on the planet \"Raijin.\" The ###SHIPNAME### has been dispatched to assist.", + "liaison_briefing": "maps/map_briefings/cl_brief_trijent.html", "monkey_types": [ "stok" ], diff --git a/maps/fiorina_sciannex.json b/maps/fiorina_sciannex.json index 61212c433be0..1bd845d33d90 100644 --- a/maps/fiorina_sciannex.json +++ b/maps/fiorina_sciannex.json @@ -13,6 +13,7 @@ "/datum/equipment_preset/survivor/prisoner", "/datum/equipment_preset/survivor/gangleader", "/datum/equipment_preset/survivor/engineer/fiorina", + "/datum/equipment_preset/survivor/corporate/fiorina", "/datum/equipment_preset/survivor/clf", "/datum/equipment_preset/survivor/civilian" ], diff --git a/maps/kutjevo.json b/maps/kutjevo.json index 83a0ff90c575..cb61f5f29834 100644 --- a/maps/kutjevo.json +++ b/maps/kutjevo.json @@ -11,6 +11,7 @@ "/datum/equipment_preset/survivor/colonial_marshal/kutjevo", "/datum/equipment_preset/survivor/trucker/kutjevo", "/datum/equipment_preset/survivor/security/kutjevo", + "/datum/equipment_preset/survivor/corporate/kutjevo", "/datum/equipment_preset/survivor/clf", "/datum/equipment_preset/survivor/civilian" ], @@ -23,6 +24,7 @@ ], "map_item_type": "/obj/item/map/kutjevo_map", "announce_text": "An automated distress signal has been received from Weyland-Yutani colony Kutjevo Refinery, known for botanical research, export, and raw materials processing and refinement. The ###SHIPNAME### has been dispatched to investigate.", + "liaison_briefing": "maps/map_briefings/cl_brief_kutjevo.html", "monkey_types": [ "neaera", "stok" diff --git a/maps/map_briefings/cl_brief_kutjevo.html b/maps/map_briefings/cl_brief_kutjevo.html new file mode 100644 index 000000000000..366e1b819da7 --- /dev/null +++ b/maps/map_briefings/cl_brief_kutjevo.html @@ -0,0 +1,61 @@ +
+
Weyland-Yutani Corporation
"Building Better + Worlds" +
+
Special Services Division
Liaison Colony Briefing
+
+
The ship AI aboard your stationed ship has informed us that a distress +signal has been picked up from the colony on LV-686, and that a mission is being +prepared to investigate the disturbance.

As such, the special +services division has prepared a briefing on the nature of the colony, and known +potential threats to it's operation.

Classified materials are +excluded from this briefing and should be requested separately, and as such, the +contents of this document may be shared or withheld at your discretion, unless +otherwise specified.
+
+
Planet: LV-686
Facility: Kutjevo Refinery
Operator: Weyland-Yutani
+
+
History and Purpose
+
+
Discovered in 2089, the planet Dykuma I, also known as LV-686, was +originally marked by geological survey as a potentially terraformable desert +planet, was later found to be abundantly rich in underground aquifers of +exceptionally high purity, and as such an independent core colony began +colonization efforts in the 2160s.

Shortly after the colonization +efforts began, a hostile takeover by the Canadian Space Affairs Ministry in 2162 +brought the colony under new ownership, soon sold to the Weyland-Yutani +Corporation, where in 2165 it began operations as a bottling plant under the +Weyland Spring brand.

As the demand for spring water and the +size of the colony's operations both have grown, the deposits of drinking water +at the original site for the colony have dried up, and as such the sprawl has +continued to expand outwards, ever in search of more desposits to tap.

With +an estimated 2500 colonists, the refinery has become a bustling town, and the +number one provider of drinkable water in the Neroid Sector and surrounding +space, as well as a significant supplier for the +Weyland Spring brand.

Company Priorities
+
+
The number one priority is that any operation on the site of Weyland +Spring Bottling Center No.8 does not employ chemical weapons or otherwise risk +contaminating the ground water supply and the aquifers below. The use of lead +and depleted uranium bullets should be avoided.

In addition to this, +the colony's water treatment plant contains large stockpiles of chemicals that +may be hazardous in unapproved amounts, and damage to the tanks storing these +chemicals must be mitigated.

Potential Threats
+
+
The Kutjevo facility contains only a token Colonial Marshals Bureau, +staffing roughly 2-6 members, and is primarily staffed by corporate security. +While the security garrison is relatively undersized for a colony of this size, +division analysts believe corporate espionage is unlikely due to a variety of +factors. After reviewing the data, the analysts believe these are the most +likely causes for the automated distress beacon, from most to least likely:

* +Geological Activity; e.g. earthquakes or land-shift due to the drained aquifers +beneath the site.
* Maintenance failure of the colony's communications +equipment.
* Failure to send the weekly "All-Clear" signal to prevent +automated distress being dispatched.
* Sabotage by the "Colonial +Liberation Front"
* A solar flare from the Dykuma star causing electrical +failures.
diff --git a/maps/map_briefings/cl_brief_placeholder.html b/maps/map_briefings/cl_brief_placeholder.html new file mode 100644 index 000000000000..1c9884b2c63c --- /dev/null +++ b/maps/map_briefings/cl_brief_placeholder.html @@ -0,0 +1,12 @@ +
+
Weyland-Yutani Corporation
"Building Better + Worlds" +
+
Special Services Division
Liaison Colony Briefing
+
+
The ship AI aboard your stationed ship has informed us that a distress +signal has been picked up from a nearby colony, however at this time the records +for the facility there are classified or unavailable. We apologize for the +inconvenience. diff --git a/maps/map_briefings/cl_brief_trijent.html b/maps/map_briefings/cl_brief_trijent.html new file mode 100644 index 000000000000..83d6b49fe723 --- /dev/null +++ b/maps/map_briefings/cl_brief_trijent.html @@ -0,0 +1,73 @@ +
+
Weyland-Yutani Corporation
"Building Better + Worlds" +
+
Special Services Division
Liaison Colony Briefing
+
+
The ship AI aboard your stationed ship has informed us that a distress +signal has been picked up from the colony on Raijin, and that a mission is being +prepared to investigate the disturbance.

As such, the special +services division has prepared a briefing on the nature of the colony, and known +potential threats to it's operation.

Classified materials are +excluded from this briefing and should be requested separately, and as such, the +contents of this document may be shared or withheld at your discretion, unless +otherwise specified.
+
+
Planet: Raijin, Formerly LV-670
Facility: Oxley's Butte
Operator: Trijent Corporation (Company Subsidiary)

+
+
History and Purpose
+
+
The colony of Oxley's Butte, often colloquially referred to as "Trijent +Dam" was settled after the discovery of vast reserves of Lithium-6 below the +surface of what was at the time known as LV-670. In 2129, Geological survey +teams landed on the planet and began to discern the ideal location to place a +mining settlement, eventually settling on a river fork on the planet's northern +hemisphere, roughly 4 kilometers above one of the particularly rich deposits.

To +power the mining operations, the Cebrini group was contracted to construct and +operate a large hydroelectric dam, utilizing the river's high throughput, with +three turbines working to produce an estimated 15,000Mw/H of electricity. Work +began in 2132, as the first colonists were brought in, with the hydroelectric +facility and electrical infrastructure being completed in late 2150, +colonization began as workers of other specialities were shipped in to fill the +needs of the rapidly growing colony. At present, the colony hosts a mix of +corporate personnel from both Trijent Corp. and the Cebrini Group, as well as a +number of third-party personnel staffing various positions.

The +colony on Raijin has provided lithium to buyers across the galaxy for about 20 +years now, in addition to hosting an archeological worksite due to +mundane discoveries in the periphery of the mining campsites.

Company Priorities
+
+
Lithium-6 is one of the principle components of Tritium, needed to fuel +the fusion reactors powering a galaxy worth of human expansion. As such, +Raijin's immeasurably rich deposits of the mineral have led the Trijent +Corporation, and by extension, the Company, to a domineering position in the +market for fusion reactor fuel. Due to the nature of the ore reserves, damage to +the mining site itself is of limited concern, however, the hydroelectric dam +powering the colony is a highly valuable asset and it is paramount that it is +returned to operation as soon as possible if damaged, and that further damage +from intervention is minimized.

Of secondary priority, the +northeastern edge of the colony hosts an archeological site and attached +research lab. The research notes from the lab should be recovered and delivered +to the Company as soon as possible, and care should be taken not to disturb or +destroy the dig sites, and the artifacts buried within.

Potential Threats
+
+
Due to the economic relavence of the colony, both Neroid Sector Policing +Authority and Corporate security staffing are present in various capacities. As +such, the majority of known threats to the colony's operation have been dealt +with swiftly and without incident. Despite this, company analysts believe the +most likely cause for the distress signal are as follows; From most to least +likely.
* Carelessness in sending the weekly required "All Clear" signal, +preventing the automated distress beacon.
* Failure in maintenance of the +colony's communication equipment.
* Sabotage of equipment by the "Colonial +Liberation Front".
* Viral or Bacterial outbreak.
* Disruption by the +Union Of Progressive Peoples as they establish a competing colony elsewhere on +the planet.
* Corporate Espionage to disrupt the Trijent Corporation as a +leader in fusion reactor fuel.
diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm index bf30b8b73fd2..78ac0b5c64a2 100644 --- a/maps/map_files/BigRed/BigRed.dmm +++ b/maps/map_files/BigRed/BigRed.dmm @@ -679,22 +679,6 @@ "acZ" = ( /turf/open/floor/greengrid, /area/bigredv2/outside/telecomm) -"ada" = ( -/mob/living/simple_animal/hostile/retaliate/clown{ - desc = "Always returning. Always watching."; - health = 10000; - move_to_delay = 2; - name = "Gonzo the Magnificent"; - rapid = 1 - }, -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 8 - }, -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 4 - }, -/turf/open/mars_cave/mars_cave_2, -/area/space) "adb" = ( /obj/structure/surface/table, /obj/item/tool/hand_labeler, @@ -1465,7 +1449,7 @@ /area/bigredv2/caves/lambda/xenobiology) "agm" = ( /turf/closed/wall/solaris/rock, -/area/bigredv2/caves_north) +/area/bigredv2/outside/marshal_office) "agn" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 @@ -2085,16 +2069,6 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/wood, /area/bigredv2/caves/lambda/breakroom) -"ajn" = ( -/obj/structure/platform/shiva{ - dir = 1 - }, -/obj/structure/platform/shiva, -/obj/structure/machinery/light/small/built{ - dir = 8 - }, -/turf/open/floor/bluegrid/bcircuitoff, -/area/bigredv2/caves/lambda/research) "ajp" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -2921,6 +2895,14 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/redcorner, /area/bigredv2/outside/marshal_office) +"ane" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer, +/obj/structure/machinery/light/small/built{ + dir = 8 + }, +/turf/open/floor/bluegrid/bcircuitoff, +/area/bigredv2/caves/lambda/research) "anf" = ( /obj/structure/bed/chair{ dir = 4 @@ -3100,12 +3082,6 @@ /obj/effect/landmark/monkey_spawn, /turf/open/floor/plating/warnplate/north, /area/bigredv2/caves/lambda/xenobiology) -"anR" = ( -/obj/structure/machinery/door/poddoor/almayer{ - dir = 4 - }, -/turf/open/floor/plating/warnplate/northeast, -/area/bigredv2/caves/lambda/xenobiology) "anS" = ( /obj/item/tool/warning_cone, /turf/open/floor/warnwhite/west, @@ -8439,6 +8415,10 @@ /obj/item/tool/pen, /turf/open/floor/white, /area/bigredv2/outside/admin_building) +"aNA" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/dark, +/area/bigredv2/outside/admin_building) "aNB" = ( /obj/structure/machinery/computer/cameras, /obj/structure/surface/table, @@ -10184,12 +10164,6 @@ /obj/item/storage/box/snappops, /turf/open/floor/whitebluefull/northeast, /area/bigredv2/outside/general_store) -"aVc" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 1 - }, -/turf/open/mars/mars_dirt_9, -/area/space) "aVd" = ( /obj/structure/surface/table, /obj/item/toy/dice, @@ -10351,16 +10325,6 @@ }, /turf/open/floor/yellowfull, /area/bigredv2/outside/general_store) -"aVQ" = ( -/obj/structure/platform_decoration/kutjevo/rock, -/turf/open/mars, -/area/space) -"aVR" = ( -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 1 - }, -/turf/open/mars/mars_dirt_12, -/area/space) "aVS" = ( /obj/structure/machinery/camera/autoname{ dir = 1; @@ -10829,18 +10793,6 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/darkredcorners2/west, /area/bigredv2/outside/admin_building) -"aYi" = ( -/obj/effect/spawner/random/toolbox, -/obj/structure/platform_decoration, -/turf/open/floor/dark, -/area/bigredv2/outside/admin_building) -"aYk" = ( -/obj/effect/landmark/survivor_spawner, -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/dark, -/area/bigredv2/outside/admin_building) "aYl" = ( /obj/item/cell/hyper/empty, /turf/open/floor/darkred2/east, @@ -12259,6 +12211,10 @@ }, /turf/open/floor/asteroidfloor/north, /area/bigredv2/outside/c) +"beD" = ( +/obj/structure/platform/metal/almayer, +/turf/open/gm/river, +/area/bigredv2/outside/engineering/reactor) "beG" = ( /obj/structure/barricade/wooden, /turf/open/floor/asteroidwarning/southeast, @@ -15081,6 +15037,7 @@ "buk" = ( /obj/structure/flora/grass/desert/lightgrass_4, /obj/structure/flora/grass/desert/lightgrass_11, +/obj/effect/sentry_landmark/lz_2/top_right, /turf/open/mars_cave/mars_dirt_4, /area/bigredv2/outside/space_port_lz2) "bun" = ( @@ -15173,6 +15130,7 @@ /obj/structure/bed/chair/office/light{ dir = 1 }, +/obj/structure/machinery/power/apc/power/west, /turf/open/floor, /area/bigredv2/outside/lz2_south_cas) "bvH" = ( @@ -16063,7 +16021,7 @@ /turf/open/floor/darkblue2/northeast, /area/bigredv2/caves/eta/research) "bzJ" = ( -/obj/item/weapon/gun/smg/m39, +/obj/item/weapon/gun/smg/m39/corporate/no_lock, /obj/structure/closet/secure_closet/guncabinet/wy, /turf/open/floor/redfull/northwest, /area/bigredv2/caves/eta/research) @@ -17459,6 +17417,9 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/mars_cave/mars_cave_2, /area/bigredv2/caves_se) +"bLE" = ( +/turf/open/floor/darkyellow2/east, +/area/bigredv2/outside/engineering/reactor) "bLG" = ( /obj/effect/decal/cleanable/blood/gibs/xeno, /obj/effect/decal/cleanable/blood/xeno, @@ -17511,6 +17472,12 @@ /obj/item/ammo_casing/shell, /turf/open/floor/whiteblue/southeast, /area/bigredv2/outside/medical) +"bPe" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/northwest, +/turf/open/gm/river, +/area/bigredv2/outside/engineering/reactor) "bPl" = ( /obj/structure/surface/table, /obj/structure/pipes/vents/pump, @@ -17843,6 +17810,10 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/mars_cave/mars_cave_18, /area/bigredv2/caves_lambda) +"chw" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/dark, +/area/bigredv2/outside/engineering/reactor) "chx" = ( /obj/structure/surface/table, /obj/item/trash/kepler{ @@ -17877,6 +17848,10 @@ }, /turf/open/mars_cave/mars_dirt_4, /area/bigredv2/caves/mining) +"cjS" = ( +/obj/effect/sentry_landmark/lz_1/top_right, +/turf/open/floor/asteroidfloor/north, +/area/bigredv2/outside/space_port) "ckr" = ( /obj/item/device/defibrillator{ pixel_x = -9; @@ -17888,6 +17863,15 @@ }, /turf/open/floor/white, /area/bigredv2/outside/medical) +"ckC" = ( +/obj/structure/barricade/handrail{ + dir = 1; + layer = 3.05; + pixel_y = 9 + }, +/obj/structure/barricade/handrail, +/turf/open/floor/plating/plating_catwalk, +/area/bigredv2/outside/engineering/reactor) "cla" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -17929,24 +17913,6 @@ }, /turf/open/mars_cave/mars_cave_2, /area/bigredv2/caves/mining) -"cnk" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 8 - }, -/obj/structure/platform/kutjevo/rock{ - dir = 4 - }, -/obj/structure/platform/kutjevo/rock{ - dir = 1 - }, -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 8 - }, -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 4 - }, -/turf/open/mars_cave/mars_cave_2, -/area/space) "cns" = ( /obj/effect/landmark/nightmare{ insert_tag = "se-checkpoint" @@ -17958,12 +17924,6 @@ /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/asteroidwarning/west, /area/bigredv2/outside/eta) -"cnG" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/asteroidfloor/north, -/area/bigredv2/outside/telecomm/n_cave) "cnQ" = ( /obj/item/paper, /turf/open/floor, @@ -18154,6 +18114,17 @@ /obj/item/stack/sheet/wood, /turf/open/mars_cave/mars_dirt_4, /area/bigredv2/caves_north) +"cAM" = ( +/obj/effect/decal/cleanable/blood{ + dir = 8; + icon_state = "gib6"; + layer = 4; + pixel_x = 12; + pixel_y = 3 + }, +/obj/effect/decal/cleanable/blood, +/turf/open/mars_cave/mars_cave_13, +/area/bigredv2/caves/mining) "cAN" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/oil, @@ -18163,12 +18134,31 @@ /obj/structure/flora/grass/desert/lightgrass_9, /turf/open/mars, /area/bigredv2/outside/n) +"cBj" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/flora/jungle/planttop1{ + pixel_y = 10 + }, +/turf/open/floor/dark, +/area/bigredv2/outside/admin_building) "cBq" = ( /obj/structure/machinery/camera/autoname{ dir = 1 }, /turf/open/floor/asteroidwarning/north, /area/bigredv2/outside/n) +"cCq" = ( +/mob/living/simple_animal/hostile/retaliate/clown{ + desc = "Always returning. Always watching."; + health = 10000; + move_to_delay = 2; + name = "Gonzo the Magnificent"; + rapid = 1 + }, +/obj/structure/platform_decoration/stone/kutjevo/west, +/obj/structure/platform_decoration/stone/kutjevo/east, +/turf/open/mars_cave/mars_cave_2, +/area/space) "cCr" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/mars_cave/mars_cave_3, @@ -18405,7 +18395,7 @@ dir = 1 }, /turf/open/floor/dark, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "cNH" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/delivery, @@ -18437,6 +18427,11 @@ /obj/structure/machinery/vending/coffee, /turf/open/floor/yellowfull, /area/bigredv2/outside/hydroponics) +"cOH" = ( +/obj/structure/platform/metal/almayer/west, +/obj/item/disk, +/turf/open/floor/bluegrid/bcircuitoff, +/area/bigredv2/caves/lambda/research) "cOJ" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -18780,10 +18775,6 @@ }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached2, /area/bigredv2/outside/nw) -"dkY" = ( -/obj/structure/platform, -/turf/open/floor/asteroidfloor/north, -/area/bigredv2/outside/telecomm/n_cave) "dme" = ( /turf/open/mars/mars_dirt_5, /area/bigredv2/outside/nw) @@ -18904,13 +18895,6 @@ }, /turf/open/floor, /area/bigredv2/outside/general_offices) -"dsy" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/gm/river, -/area/bigredv2/outside/engineering) "dsU" = ( /obj/item/trash/cheesie, /obj/item/trash/pistachios, @@ -18952,12 +18936,6 @@ /obj/structure/machinery/botany, /turf/open/floor/redcorner, /area/bigredv2/outside/marshal_office) -"duA" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/gm/river, -/area/bigredv2/outside/engineering) "duG" = ( /obj/structure/surface/table, /obj/structure/machinery/light{ @@ -19029,6 +19007,10 @@ "dyv" = ( /turf/open/mars, /area/bigredv2/caves/eta/xenobiology) +"dyA" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/darkyellow2, +/area/bigredv2/outside/engineering/reactor) "dyH" = ( /obj/structure/machinery/computer/area_atmos{ dir = 1 @@ -19078,12 +19060,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/platingdmg3/west, /area/bigredv2/caves/mining) -"dBm" = ( -/obj/structure/platform{ - dir = 8 +"dBx" = ( +/obj/structure/platform/stone/kutjevo/west{ + pixel_x = -3 }, -/turf/open/floor/dark, -/area/bigredv2/outside/admin_building) +/turf/closed/wall/solaris/rock, +/area/bigredv2/caves) "dBE" = ( /obj/item/trash/cigbutt/cigarbutt{ pixel_x = 2; @@ -19097,14 +19079,6 @@ }, /turf/open/floor/plating/platingdmg3/west, /area/bigredv2/caves/mining) -"dBU" = ( -/obj/structure/barricade/handrail{ - dir = 1; - layer = 3.01; - pixel_y = 9 - }, -/turf/open/floor/darkyellow2/north, -/area/bigredv2/outside/engineering) "dCb" = ( /obj/effect/landmark/corpsespawner/security/marshal, /obj/effect/decal/cleanable/blood/oil, @@ -19217,13 +19191,6 @@ /obj/structure/flora/grass/desert/lightgrass_6, /turf/open/mars_cave/mars_dirt_4, /area/bigredv2/outside/nw) -"dHr" = ( -/obj/effect/decal/cleanable/blood{ - icon_state = "gib6"; - pixel_y = -15 - }, -/turf/open/mars_cave, -/area/bigredv2/caves/mining) "dHs" = ( /obj/item/ammo_casing/bullet, /obj/item/ammo_casing/bullet, @@ -19300,14 +19267,9 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, /turf/open/mars_cave/mars_cave_5, /area/bigredv2/caves_lambda) -"dLJ" = ( -/obj/structure/platform/kutjevo/rock, -/obj/item/trash/used_stasis_bag{ - pixel_y = 8; - pixel_x = 9 - }, -/turf/open/mars_cave/mars_cave_9, -/area/bigredv2/outside/nw) +"dLd" = ( +/turf/open/floor/darkyellow2/southwest, +/area/bigredv2/outside/engineering/reactor) "dLS" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/flora/pottedplant{ @@ -19485,6 +19447,10 @@ /obj/effect/decal/cleanable/blood/splatter, /turf/open/mars_cave/mars_cave_6, /area/bigredv2/caves/mining) +"dUN" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/asteroidfloor/north, +/area/bigredv2/outside/telecomm/n_cave) "dVj" = ( /obj/structure/surface/table/woodentable, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot{ @@ -19541,6 +19507,13 @@ /obj/structure/bed, /turf/open/floor/whitegreen/east, /area/bigredv2/outside/marshal_office) +"dYb" = ( +/obj/structure/platform/stone/kutjevo/west{ + pixel_x = -3 + }, +/obj/effect/decal/cleanable/blood/drip, +/turf/closed/wall/solaris/rock, +/area/bigredv2/caves) "dYv" = ( /turf/open/asphalt/cement_sunbleached, /area/bigredv2/outside/virology) @@ -19596,6 +19569,12 @@ "eak" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached15, /area/bigredv2/outside/c) +"eaC" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/southeast, +/turf/open/gm/river, +/area/bigredv2/outside/engineering/reactor) "eaW" = ( /obj/structure/disposalpipe/segment, /obj/item/frame/rack, @@ -19771,6 +19750,10 @@ }, /turf/open/floor/whitegreen/east, /area/bigredv2/outside/medical) +"ehN" = ( +/obj/effect/sentry_landmark/lz_2/top_left, +/turf/open/mars, +/area/bigredv2/outside/space_port_lz2) "eiK" = ( /obj/structure/flora/grass/desert/lightgrass_9, /turf/open/mars, @@ -19976,13 +19959,6 @@ /obj/structure/window, /turf/open/floor/wood, /area/bigredv2/outside/library) -"etg" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 4 - }, -/obj/item/trash/cigbutt/cigarbutt, -/turf/open/mars_cave/mars_cave_13, -/area/bigredv2/outside/nw) "etw" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached1, /area/bigredv2/outside/e) @@ -20032,13 +20008,6 @@ "evt" = ( /turf/open/asphalt/cement/cement9, /area/bigredv2/caves_lambda) -"evA" = ( -/obj/structure/platform_decoration/shiva{ - dir = 8 - }, -/obj/structure/platform_decoration/shiva, -/turf/open/floor/bluegrid/bcircuitoff, -/area/bigredv2/caves/lambda/research) "evQ" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, @@ -20066,6 +20035,10 @@ "exc" = ( /turf/open/floor/asteroidwarning/east, /area/bigred/ground/garage_workshop) +"eyR" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/darkyellow2/west, +/area/bigredv2/outside/engineering/reactor) "ezz" = ( /obj/effect/decal/cleanable/dirt, /obj/item/trash/hotdog{ @@ -20102,12 +20075,10 @@ }, /turf/open/floor/wood, /area/bigredv2/outside/library) -"eCM" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 1 - }, -/turf/closed/wall/solaris/rock, -/area/bigredv2/caves) +"eCF" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/bluegrid/bcircuitoff, +/area/bigredv2/caves/lambda/research) "eDQ" = ( /obj/structure/closet/secure_closet/engineering_personal, /obj/effect/landmark/objective_landmark/medium, @@ -20150,6 +20121,11 @@ }, /turf/open/floor/red/north, /area/bigredv2/outside/marshal_office) +"eFX" = ( +/obj/structure/platform/stone/kutjevo/east, +/obj/item/trash/cigbutt/cigarbutt, +/turf/open/mars_cave/mars_cave_13, +/area/bigredv2/outside/nw) "eGa" = ( /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, /turf/open/mars_cave/mars_cave_17, @@ -20207,7 +20183,7 @@ /obj/structure/machinery/power/port_gen/pacman, /obj/effect/decal/cleanable/dirt, /turf/open/floor/darkyellow2/west, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "eJf" = ( /obj/structure/flora/grass/desert/lightgrass_2, /turf/open/mars, @@ -20438,6 +20414,11 @@ /obj/structure/reagent_dispensers/fueltank/gas, /turf/open/mars/mars_dirt_14, /area/bigredv2/outside/c) +"eTm" = ( +/obj/structure/platform_decoration/metal/almayer, +/obj/structure/machinery/power/apc/no_power/north, +/turf/open/floor/asteroidfloor/north, +/area/bigredv2/outside/telecomm/n_cave) "eTK" = ( /obj/effect/decal/cleanable/blood/xeno, /obj/item/ammo_casing/bullet, @@ -20607,12 +20588,23 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/plating/platingdmg3/west, /area/bigredv2/caves/mining) +"fcO" = ( +/obj/structure/pipes/standard/manifold/hidden/green, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor, +/area/bigredv2/outside/marshal_office) "fdr" = ( /turf/open/mars_cave/mars_cave_10, /area/bigredv2/caves_sw) "fdy" = ( /turf/open/floor, /area/bigredv2/caves/eta/living) +"fdP" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/effect/landmark/objective_landmark/close, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/asteroidfloor/north, +/area/bigredv2/outside/telecomm/n_cave) "feN" = ( /turf/open/floor/asteroidwarning/northwest, /area/bigredv2/outside/space_port_lz2) @@ -20702,6 +20694,10 @@ }, /turf/open/floor/plating, /area/bigredv2/outside/bar) +"fiQ" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/dark, +/area/bigredv2/outside/admin_building) "fjz" = ( /obj/structure/surface/table, /obj/structure/machinery/computer/objective{ @@ -20713,6 +20709,11 @@ /obj/effect/landmark/lv624/xeno_tunnel, /turf/open/mars/mars_dirt_6, /area/bigredv2/outside/w) +"fjN" = ( +/obj/effect/spawner/random/toolbox, +/obj/structure/platform_decoration/metal/almayer, +/turf/open/floor/dark, +/area/bigredv2/outside/admin_building) "fjP" = ( /turf/open/floor/delivery, /area/bigredv2/caves) @@ -20794,6 +20795,10 @@ /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/white, /area/bigredv2/outside/medical) +"frs" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/gm/river, +/area/bigredv2/outside/engineering/reactor) "fsy" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/mars_cave/mars_cave_13, @@ -20997,14 +21002,6 @@ "fBo" = ( /turf/open/floor/dark, /area/bigredv2/outside/filtration_plant) -"fBJ" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 8; - layer = 2.9; - pixel_x = -3 - }, -/turf/closed/wall/solaris/rock, -/area/bigredv2/caves) "fCb" = ( /turf/open/floor, /area/bigredv2/outside/filtration_cave_cas) @@ -21030,7 +21027,7 @@ name = "\improper Engine Reactor" }, /turf/open/floor/delivery, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "fEE" = ( /turf/open/mars_cave/mars_cave_15, /area/bigredv2/outside/ne) @@ -21167,7 +21164,7 @@ /area/bigredv2/outside/s) "fOc" = ( /turf/open/mars_cave/mars_cave_3, -/area/bigredv2/caves_virology) +/area/bigredv2/outside/lz1_telecomm_cas) "fOf" = ( /obj/item/trash/eat{ pixel_x = 2; @@ -21324,7 +21321,7 @@ name = "\improper Engine Reactor" }, /turf/open/floor/delivery, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "fVt" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/table, @@ -21471,15 +21468,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/bigredv2/outside/bar) -"gan" = ( -/obj/structure/platform_decoration/shiva{ - dir = 1 - }, -/obj/structure/platform_decoration/shiva{ - dir = 4 - }, -/turf/open/floor/bluegrid/bcircuitoff, -/area/bigredv2/caves/lambda/research) "gat" = ( /obj/structure/machinery/shower{ dir = 8 @@ -21590,7 +21578,7 @@ "giB" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/mars_cave, -/area/bigredv2/caves_sw) +/area/bigredv2/outside/lz2_south_cas) "giC" = ( /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/blood/gibs/body, @@ -21728,6 +21716,12 @@ "gpB" = ( /turf/open/mars_cave/mars_dirt_6, /area/bigredv2/caves_research) +"gpE" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/decal/cleanable/blood, +/obj/effect/decal/cleanable/blood/gibs/body, +/turf/open/floor/dark, +/area/bigredv2/outside/general_offices) "gpR" = ( /turf/open/gm/river, /area/bigredv2/outside/c) @@ -21790,13 +21784,14 @@ /obj/structure/fence, /turf/open/asphalt/cement, /area/bigredv2/outside/filtration_cave_cas) -"gsW" = ( -/obj/structure/platform/kutjevo/rock, -/obj/structure/platform/kutjevo/rock{ - dir = 8 +"gtk" = ( +/obj/structure/barricade/handrail{ + dir = 1; + layer = 3.05; + pixel_y = 9 }, -/turf/open/mars_cave/mars_dirt_4, -/area/space) +/turf/open/floor/darkyellow2/northwest, +/area/bigredv2/outside/engineering/reactor) "gts" = ( /obj/structure/machinery/light{ dir = 1 @@ -21818,7 +21813,7 @@ "guu" = ( /obj/structure/machinery/light, /turf/open/floor/dark, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "guM" = ( /turf/open/mars_cave/mars_dirt_4, /area/bigredv2/caves_research) @@ -21832,6 +21827,14 @@ }, /turf/open/floor/delivery, /area/bigredv2/caves/lambda/breakroom) +"gvs" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/gibs/body, +/turf/open/floor, +/area/bigredv2/outside/marshal_office) "gvC" = ( /obj/structure/machinery/cm_vending/sorted/medical/no_access{ layer = 3.5 @@ -21963,6 +21966,12 @@ }, /turf/open/mars_cave/mars_cave_14, /area/bigredv2/caves/mining) +"gAg" = ( +/obj/structure/platform/stone/kutjevo/east, +/obj/structure/platform/stone/kutjevo/north, +/obj/structure/platform_decoration/stone/kutjevo/west, +/turf/open/mars, +/area/space) "gAE" = ( /obj/structure/sink{ dir = 1; @@ -22023,7 +22032,7 @@ "gFR" = ( /obj/structure/machinery/power/port_gen/pacman, /turf/open/floor/darkyellow2/east, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "gGf" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/asphalt/cement_sunbleached/cement_sunbleached12, @@ -22094,10 +22103,6 @@ }, /turf/open/mars_cave/mars_dirt_4, /area/bigredv2/outside/nw) -"gJw" = ( -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/mars_cave, -/area/bigredv2/caves_virology) "gJB" = ( /obj/effect/decal/cleanable/blood{ layer = 3 @@ -22173,7 +22178,7 @@ "gML" = ( /obj/structure/machinery/power/turbine, /turf/open/floor/darkyellow2/east, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "gNv" = ( /obj/structure/machinery/light{ dir = 1 @@ -22220,7 +22225,7 @@ name = "\improper Engine Reactor" }, /turf/open/floor/delivery, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "gPE" = ( /obj/effect/decal/cleanable/dirt, /obj/item/device/flashlight/lantern, @@ -22292,14 +22297,6 @@ /obj/structure/flora/grass/desert/lightgrass_1, /turf/open/asphalt/cement_sunbleached/cement_sunbleached12, /area/bigredv2/outside/c) -"gUD" = ( -/obj/structure/barricade/handrail{ - dir = 1; - layer = 3.01; - pixel_y = 9 - }, -/turf/open/floor/darkyellow2/northwest, -/area/bigredv2/outside/engineering) "gVl" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -22401,6 +22398,10 @@ "haV" = ( /turf/open/asphalt/cement_sunbleached, /area/bigredv2/outside/e) +"hbg" = ( +/obj/effect/sentry_landmark/lz_2/bottom_left, +/turf/open/mars, +/area/bigredv2/outside/space_port_lz2) "hby" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached3, /area/bigredv2/outside/nw) @@ -22571,13 +22572,10 @@ }, /turf/open/floor, /area/bigredv2/outside/general_offices) -"hkS" = ( -/obj/structure/platform/kutjevo/rock, -/obj/structure/platform/kutjevo/rock{ - dir = 4 - }, -/turf/open/mars_cave/mars_cave_14, -/area/bigredv2/outside/nw) +"hkR" = ( +/obj/structure/window/framed/solaris, +/turf/open/floor/plating, +/area/bigredv2/outside/engineering/reactor) "hkY" = ( /obj/structure/machinery/light{ dir = 4 @@ -22615,15 +22613,10 @@ }, /turf/open/mars_cave/mars_cave_17, /area/bigredv2/caves_research) -"hos" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 8; - layer = 2.9; - pixel_x = -3 - }, -/obj/effect/decal/cleanable/blood/drip, -/turf/closed/wall/solaris/rock, -/area/bigredv2/caves) +"hot" = ( +/obj/structure/platform_decoration/stone/kutjevo/north, +/turf/open/mars/mars_dirt_12, +/area/space) "hoI" = ( /obj/structure/bed/roller, /obj/structure/closet/bodybag, @@ -22713,6 +22706,12 @@ "htb" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached3, /area/bigredv2/outside/c) +"hub" = ( +/obj/structure/platform/stone/kutjevo/west, +/obj/structure/platform/stone/kutjevo, +/obj/structure/platform_decoration/stone/kutjevo/north, +/turf/open/mars/mars_dirt_12, +/area/space) "hvd" = ( /obj/structure/machinery/door/poddoor/almayer/closed{ dir = 4; @@ -22920,12 +22919,6 @@ /obj/item/shard/shrapnel, /turf/open/floor/white, /area/bigredv2/outside/marshal_office) -"hFv" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/asteroidfloor/north, -/area/bigredv2/outside/telecomm/n_cave) "hFP" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/item_pool_spawner/survivor_ammo, @@ -23037,10 +23030,10 @@ }, /turf/open/floor/red/southwest, /area/bigredv2/outside/lambda_cave_cas) -"hLp" = ( -/obj/effect/landmark/corpsespawner/ua_riot, -/turf/open/mars_cave, -/area/bigredv2/caves/mining) +"hLq" = ( +/obj/effect/sentry_landmark/lz_1/bottom_left, +/turf/open/floor/asteroidfloor/north, +/area/bigredv2/outside/space_port) "hLS" = ( /obj/structure/sign/poster/safety, /turf/closed/wall/wood, @@ -23168,29 +23161,11 @@ /obj/item/reagent_container/spray/cleaner, /turf/open/floor/whitegreencorner/west, /area/bigredv2/outside/medical) -"hYB" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 5 - }, -/turf/open/gm/river, -/area/bigredv2/outside/engineering) "hYI" = ( /obj/effect/landmark/xeno_hive_spawn, /obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/white, /area/bigredv2/outside/virology) -"hZc" = ( -/obj/structure/platform/shiva{ - dir = 4 - }, -/turf/open/floor/bluegrid/bcircuitoff, -/area/bigredv2/caves/lambda/research) "hZl" = ( /obj/effect/decal/cleanable/blood/drip{ pixel_x = 3; @@ -23223,10 +23198,6 @@ }, /turf/open/floor, /area/bigredv2/outside/cargo) -"iaC" = ( -/obj/structure/platform, -/turf/open/gm/river, -/area/bigredv2/outside/engineering) "iaD" = ( /obj/item/shard, /obj/structure/window_frame/solaris, @@ -23438,7 +23409,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/window/framed/solaris, /turf/open/floor/plating, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "iih" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/floor4, @@ -23479,6 +23450,11 @@ /obj/item/frame/rack, /turf/open/floor/dark, /area/bigredv2/outside/marshal_office) +"ilG" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/bluegrid/bcircuitoff, +/area/bigredv2/caves/lambda/research) "ilH" = ( /obj/structure/machinery/light, /obj/structure/machinery/portable_atmospherics/hydroponics, @@ -23786,12 +23762,6 @@ "iAF" = ( /turf/open/mars_cave/mars_cave_11, /area/bigredv2/caves_sw) -"iAI" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/gm/river, -/area/bigredv2/outside/engineering) "iAL" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached4, /area/bigredv2/outside/space_port_lz2) @@ -23877,11 +23847,19 @@ /obj/effect/decal/cleanable/dirt, /obj/item/bananapeel, /turf/open/floor/darkyellow2/east, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "iFr" = ( /obj/effect/decal/cleanable/generic, /turf/open/asphalt/cement_sunbleached/cement_sunbleached3, /area/bigredv2/outside/nw) +"iFT" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer, +/obj/item/shard{ + icon_state = "medium" + }, +/turf/open/floor/bluegrid/bcircuitoff, +/area/bigredv2/caves/lambda/research) "iGp" = ( /obj/effect/decal/cleanable/dirt, /turf/open/asphalt/cement_sunbleached, @@ -23961,7 +23939,7 @@ /area/bigredv2/outside/telecomm/warehouse) "iNR" = ( /turf/open/gm/river, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "iOR" = ( /obj/effect/landmark/crap_item, /turf/open/floor/asteroidfloor/north, @@ -24011,15 +23989,6 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/asteroidwarning/east, /area/bigredv2/outside/n) -"iSz" = ( -/obj/structure/barricade/handrail{ - dir = 1; - layer = 3.01; - pixel_y = 9 - }, -/obj/structure/barricade/handrail, -/turf/open/floor/plating/plating_catwalk, -/area/bigredv2/outside/engineering) "iTD" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, @@ -24047,18 +24016,10 @@ "iUe" = ( /turf/open/floor/darkred2/southeast, /area/bigredv2/caves/eta/research) -"iVd" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 4 - }, -/obj/structure/platform/kutjevo/rock{ - dir = 1 - }, -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 8 - }, -/turf/open/mars, -/area/space) +"iUW" = ( +/obj/structure/platform/metal/almayer, +/turf/open/floor/asteroidfloor/north, +/area/bigredv2/outside/telecomm/n_cave) "iVi" = ( /obj/structure/fence, /turf/open/mars, @@ -24100,21 +24061,15 @@ }, /turf/open/floor, /area/bigredv2/outside/hydroponics) +"iWP" = ( +/obj/effect/sentry_landmark/lz_2/bottom_right, +/turf/open/mars_cave/mars_dirt_4, +/area/bigredv2/outside/space_port_lz2) "iXo" = ( /obj/structure/bed, /obj/item/bedsheet/medical, /turf/open/floor/whitegreen/east, /area/bigredv2/outside/medical) -"iXs" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/obj/structure/prop/server_equipment/yutani_server{ - density = 0; - pixel_y = 16 - }, -/turf/open/floor/asteroidfloor/north, -/area/bigredv2/outside/telecomm/n_cave) "iXx" = ( /turf/open/mars_cave, /area/bigredv2/outside/n) @@ -24466,13 +24421,11 @@ "juF" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached14, /area/bigredv2/outside/se) -"jwj" = ( -/obj/structure/platform/shiva{ - dir = 8 - }, -/obj/item/disk, -/turf/open/floor/bluegrid/bcircuitoff, -/area/bigredv2/caves/lambda/research) +"jwa" = ( +/obj/structure/platform_decoration/stone/kutjevo, +/obj/effect/decal/cleanable/generic, +/turf/open/mars_cave/mars_cave_19, +/area/bigredv2/outside/nw) "jwU" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor, @@ -24494,13 +24447,13 @@ "jxA" = ( /obj/structure/barricade/handrail, /turf/open/floor/plating/plating_catwalk, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "jxS" = ( /obj/structure/machinery/light{ dir = 4 }, /turf/open/floor/darkyellow2/west, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "jxV" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/asteroidwarning/northeast, @@ -24540,8 +24493,7 @@ /turf/open/floor/wood, /area/bigredv2/outside/admin_building) "jAo" = ( -/obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, -/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/mars_cave/mars_cave_5, /area/bigredv2/caves_sw) "jAJ" = ( @@ -24581,6 +24533,12 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor/asteroidfloor/north, /area/bigredv2/outside/eta) +"jBC" = ( +/obj/effect/timed_event/scrapeaway{ + time = 40 + }, +/turf/closed/wall/solaris/rock, +/area/bigredv2/outside/lz2_west_cas) "jCg" = ( /obj/effect/spawner/random/attachment, /obj/structure/machinery/light{ @@ -24588,21 +24546,6 @@ }, /turf/open/floor/plating/platingdmg3/west, /area/bigredv2/caves/mining) -"jCq" = ( -/obj/effect/landmark/corpsespawner/ua_riot, -/obj/effect/decal/cleanable/blood{ - dir = 8; - icon_state = "gib6"; - layer = 4; - pixel_x = 12; - pixel_y = 3 - }, -/obj/effect/decal/cleanable/blood{ - layer = 3 - }, -/obj/item/weapon/baton/loaded, -/turf/open/mars_cave/mars_dirt_4, -/area/bigredv2/caves/mining) "jCY" = ( /turf/open/mars_cave/mars_cave_10, /area/bigredv2/caves_virology) @@ -24642,6 +24585,10 @@ /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/whitegreen/north, /area/bigredv2/outside/medical) +"jFi" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/gm/river, +/area/bigredv2/outside/engineering/reactor) "jFq" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/barricade/wooden{ @@ -24660,6 +24607,9 @@ /obj/item/storage/box/gloves, /turf/open/floor/whitegreen/east, /area/bigredv2/outside/medical) +"jFG" = ( +/turf/open/floor/darkyellowcorners2/east, +/area/bigredv2/outside/engineering/reactor) "jGd" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/mars_cave/mars_cave_2, @@ -24712,12 +24662,6 @@ "jIQ" = ( /turf/open/mars_cave/mars_cave_19, /area/bigredv2/outside/lz1_north_cas) -"jIV" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 4 - }, -/turf/open/mars_cave/mars_cave_17, -/area/bigredv2/outside/nw) "jJB" = ( /obj/effect/decal/cleanable/dirt, /turf/open/mars, @@ -24773,16 +24717,12 @@ }, /turf/open/floor/red/north, /area/bigredv2/outside/lambda_cave_cas) -"jKI" = ( -/obj/structure/platform_decoration/shiva{ - dir = 8 - }, -/obj/structure/platform_decoration/shiva, -/obj/item/shard{ - icon_state = "medium" - }, -/turf/open/floor/bluegrid/bcircuitoff, -/area/bigredv2/caves/lambda/research) +"jLa" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/southwest, +/turf/open/gm/river, +/area/bigredv2/outside/engineering/reactor) "jLj" = ( /obj/structure/flora/grass/desert/lightgrass_1, /turf/open/mars, @@ -24855,6 +24795,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet13_5/west, /area/bigredv2/outside/bar) +"jPK" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood, +/obj/effect/decal/cleanable/blood/gibs/body, +/turf/open/floor/dark, +/area/bigredv2/outside/general_offices) "jPQ" = ( /turf/open/mars_cave/mars_cave_16, /area/bigredv2/outside/ne) @@ -25053,13 +24999,6 @@ }, /turf/open/floor/darkyellow2/east, /area/bigredv2/outside/engineering) -"jXw" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 4 - }, -/obj/effect/decal/cleanable/blood, -/turf/open/mars_cave/mars_cave_13, -/area/bigredv2/outside/nw) "jXA" = ( /obj/effect/decal/cleanable/blood/xeno, /turf/open/floor, @@ -25070,7 +25009,7 @@ dir = 8 }, /turf/open/floor/darkyellow2/west, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "jXP" = ( /obj/item/stack/cable_coil/cut, /turf/open/mars_cave/mars_cave_16, @@ -25243,6 +25182,14 @@ }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached3, /area/bigredv2/outside/nw) +"keO" = ( +/obj/effect/sentry_landmark/lz_1/bottom_right, +/turf/open/floor/plating, +/area/bigredv2/outside/space_port) +"keU" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/bluegrid/bcircuitoff, +/area/bigredv2/caves/lambda/research) "kfg" = ( /obj/structure/barricade/wooden{ desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it..."; @@ -25306,12 +25253,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/asteroidfloor/north, /area/bigredv2/outside/n) -"khP" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/dark, -/area/bigredv2/outside/admin_building) "khR" = ( /obj/structure/machinery/floodlight, /turf/open/mars_cave/mars_dirt_6, @@ -25395,20 +25336,20 @@ /obj/structure/machinery/power/apc/no_power/north, /turf/open/asphalt/cement_sunbleached/cement_sunbleached1, /area/bigredv2/outside/telecomm/lz2_cave) -"kka" = ( -/obj/structure/barricade/handrail, -/obj/structure/barricade/handrail{ - dir = 1; - layer = 3.01; - pixel_y = 9 - }, -/turf/open/floor/plating/plating_catwalk, -/area/bigredv2/outside/engineering) "kkF" = ( /obj/structure/machinery/camera/autoname, /obj/structure/bed, /turf/open/floor/white, /area/bigredv2/outside/marshal_office) +"kkJ" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/obj/structure/platform_decoration/metal/almayer/east, +/obj/item/shard{ + icon_state = "medium" + }, +/obj/item/stack/cable_coil/random, +/turf/open/floor/bluegrid/bcircuitoff, +/area/bigredv2/caves/lambda/research) "kle" = ( /obj/item/prop{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; @@ -25618,6 +25559,14 @@ "kvp" = ( /turf/open/mars_cave/mars_cave_7, /area/bigredv2/caves_sw) +"kvs" = ( +/obj/structure/barricade/handrail{ + dir = 1; + layer = 3.05; + pixel_y = 9 + }, +/turf/open/floor/darkyellow2/northeast, +/area/bigredv2/outside/engineering/reactor) "kvB" = ( /obj/item/device/flashlight, /turf/open/floor/plating/platingdmg3/west, @@ -25677,14 +25626,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet, /area/bigredv2/outside/library) -"kAs" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/effect/landmark/objective_landmark/close, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/asteroidfloor/north, -/area/bigredv2/outside/telecomm/n_cave) "kAD" = ( /obj/effect/decal/cleanable/dirt, /obj/item/stack/sheet/cardboard{ @@ -25698,6 +25639,11 @@ /obj/effect/decal/cleanable/generic, /turf/open/floor/plating, /area/bigredv2/outside/bar) +"kAM" = ( +/obj/structure/platform/stone/kutjevo, +/obj/structure/platform/stone/kutjevo/west, +/turf/open/mars_cave/mars_dirt_4, +/area/space) "kBn" = ( /turf/closed/wall/solaris, /area/bigredv2/caves) @@ -25797,6 +25743,12 @@ /obj/item/prop/alien/hugger, /turf/open/floor/wood, /area/bigredv2/outside/admin_building) +"kID" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/obj/structure/platform_decoration/metal/almayer/east, +/obj/effect/landmark/objective_landmark/far, +/turf/open/floor/bluegrid/bcircuitoff, +/area/bigredv2/caves/lambda/research) "kIF" = ( /obj/structure/bed/chair/comfy/orange{ dir = 1 @@ -25845,6 +25797,12 @@ /obj/effect/decal/cleanable/blood/xeno, /turf/open/floor/plating/platingdmg1, /area/bigredv2/outside/medical) +"kMk" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer, +/obj/item/stack/cable_coil, +/turf/open/floor/bluegrid/bcircuitoff, +/area/bigredv2/caves/lambda/research) "kMs" = ( /obj/structure/prop/invuln/minecart_tracks{ desc = "Righty tighty, lefty loosey!"; @@ -26002,6 +25960,11 @@ }, /turf/open/floor/plating/platingdmg3/west, /area/bigredv2/caves/mining) +"kSB" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/bluegrid/bcircuitoff, +/area/bigredv2/caves/lambda/research) "kSH" = ( /obj/structure/ore_box, /turf/open/mars_cave/mars_cave_19, @@ -26009,6 +25972,11 @@ "kSL" = ( /turf/open/mars_cave/mars_cave_7, /area/bigredv2/outside/filtration_cave_cas) +"kSZ" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/asteroidfloor/north, +/area/bigredv2/outside/telecomm/n_cave) "kTs" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor, @@ -26099,6 +26067,10 @@ "lbh" = ( /turf/open/mars_cave/mars_cave_17, /area/bigredv2/outside/n) +"lbw" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/gm/river, +/area/bigredv2/outside/engineering/reactor) "lbZ" = ( /obj/item/frame/rack, /obj/effect/decal/cleanable/dirt, @@ -26235,6 +26207,11 @@ }, /turf/open/floor/whitegreen/east, /area/bigredv2/outside/medical) +"ljE" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/asteroidfloor/north, +/area/bigredv2/outside/telecomm/n_cave) "ljS" = ( /obj/item/stack/rods{ pixel_x = 9; @@ -26305,17 +26282,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt/cement, /area/bigredv2/outside/filtration_cave_cas) -"lom" = ( -/obj/effect/landmark/corpsespawner/miner, -/obj/effect/decal/cleanable/blood{ - dir = 8; - icon_state = "gib6"; - layer = 4; - pixel_x = 12; - pixel_y = 3 - }, -/turf/open/mars_cave/mars_cave_3, -/area/bigredv2/caves/mining) "lqd" = ( /obj/structure/surface/table, /obj/item/bodybag, @@ -26334,13 +26300,6 @@ /obj/structure/surface/table, /turf/open/floor/dark, /area/bigredv2/outside/engineering) -"lqp" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/asteroidfloor/north, -/area/bigredv2/outside/telecomm/n_cave) "lqC" = ( /obj/effect/decal/cleanable/dirt, /turf/open/asphalt/cement, @@ -26442,14 +26401,14 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/wood, /area/bigredv2/outside/bar) -"lwR" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 4; - layer = 2.9; - pixel_x = 4 - }, -/turf/closed/wall/solaris/rock, -/area/bigredv2/caves) +"lwt" = ( +/obj/structure/platform/stone/kutjevo/west, +/obj/structure/platform/stone/kutjevo/east, +/obj/structure/platform/stone/kutjevo/north, +/obj/structure/platform_decoration/stone/kutjevo/west, +/obj/structure/platform_decoration/stone/kutjevo/east, +/turf/open/mars_cave/mars_cave_2, +/area/space) "lwT" = ( /obj/structure/machinery/light{ dir = 8 @@ -26465,6 +26424,12 @@ /obj/item/reagent_container/food/drinks/bottle/cognac, /turf/open/floor/wood, /area/bigredv2/outside/bar) +"lxN" = ( +/obj/structure/platform/stone/kutjevo/east, +/obj/structure/platform/stone/kutjevo/north, +/obj/structure/platform_decoration/stone/kutjevo/west, +/turf/open/mars_cave/mars_dirt_4, +/area/space) "lxQ" = ( /obj/effect/decal/cleanable/dirt, /obj/item/paper/bigred/union, @@ -26550,6 +26515,10 @@ }, /turf/open/floor/plating/platingdmg3/west, /area/bigredv2/caves/mining) +"lBL" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/gm/river, +/area/bigredv2/outside/engineering/reactor) "lBQ" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -26565,7 +26534,7 @@ name = "Reactor Turbine" }, /turf/open/floor/delivery, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "lCR" = ( /obj/structure/surface/table, /obj/item/reagent_container/food/drinks/flask/vacuumflask{ @@ -26645,12 +26614,6 @@ }, /turf/closed/wall/solaris/rock, /area/bigredv2/caves) -"lGl" = ( -/obj/effect/landmark/corpsespawner/scientist, -/obj/effect/decal/cleanable/blood/gibs/body, -/obj/effect/decal/cleanable/blood, -/turf/open/floor/asteroidfloor/north, -/area/bigredv2/outside/eta) "lGt" = ( /turf/open/floor/delivery, /area/bigredv2/caves/eta/living) @@ -26714,6 +26677,14 @@ }, /turf/open/floor/plating/platingdmg3/west, /area/bigredv2/caves/mining) +"lKH" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer, +/obj/structure/machinery/light/small/built{ + dir = 4 + }, +/turf/open/floor/bluegrid/bcircuitoff, +/area/bigredv2/caves/lambda/research) "lKL" = ( /obj/effect/decal/strata_decals/grime/grime4, /turf/open/asphalt/cement_sunbleached/cement_sunbleached12, @@ -26785,6 +26756,10 @@ /obj/effect/decal/strata_decals/grime/grime3, /turf/open/asphalt/cement_sunbleached/cement_sunbleached3, /area/bigredv2/outside/nw) +"lOV" = ( +/obj/effect/sentry_landmark/lz_1/bottom_right, +/turf/open/floor/asteroidfloor/north, +/area/bigredv2/outside/space_port) "lOY" = ( /obj/effect/landmark/nightmare{ insert_tag = "etatunnel_open" @@ -26801,15 +26776,6 @@ }, /turf/open/mars_cave/mars_cave_15, /area/bigredv2/caves/mining) -"lPL" = ( -/obj/structure/platform/shiva{ - dir = 4 - }, -/obj/item/shard{ - icon_state = "medium" - }, -/turf/open/floor/bluegrid/bcircuitoff, -/area/bigredv2/caves/lambda/research) "lQb" = ( /obj/item/trash/cigbutt{ pixel_x = 1; @@ -26930,13 +26896,6 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/mars_cave/mars_cave_7, /area/bigredv2/caves_sw) -"lXt" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/colonist, -/obj/effect/decal/cleanable/blood/gibs/body, -/turf/open/floor/dark, -/area/bigredv2/outside/general_offices) "lXC" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/whitegreenfull, @@ -27120,6 +27079,9 @@ /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/wood, /area/bigredv2/outside/bar) +"mge" = ( +/turf/open/floor/darkyellow2/north, +/area/bigredv2/outside/engineering/reactor) "mgr" = ( /obj/structure/barricade/wooden{ desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it..."; @@ -27263,9 +27225,17 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet, /area/bigredv2/outside/library) +"mon" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/dark, +/area/bigredv2/outside/admin_building) "moE" = ( /turf/open/mars_cave/mars_cave_9, /area/bigredv2/caves_research) +"moH" = ( +/obj/structure/platform/stone/kutjevo/north, +/turf/open/mars/mars_dirt_9, +/area/space) "mqf" = ( /obj/structure/bed/chair{ dir = 8; @@ -27277,7 +27247,12 @@ "mqh" = ( /obj/structure/window/framed/solaris, /turf/open/floor/panelscorched, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) +"mqu" = ( +/obj/item/tool/extinguisher, +/obj/structure/machinery/power/apc/power/west, +/turf/open/floor/darkyellow2/west, +/area/bigredv2/outside/engineering/reactor) "mqK" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached14, /area/bigredv2/outside/space_port_lz2) @@ -27292,6 +27267,10 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/mars_cave/mars_cave_3, /area/bigredv2/caves/mining) +"mrc" = ( +/obj/effect/sentry_landmark/lz_2/bottom_right, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached2, +/area/bigredv2/outside/space_port_lz2) "mrF" = ( /obj/structure/flora/grass/desert/lightgrass_9, /turf/open/mars, @@ -27322,6 +27301,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/asteroidwarning/north, /area/bigred/ground/garage_workshop) +"mtj" = ( +/obj/structure/platform/stone/kutjevo/east, +/obj/effect/decal/cleanable/blood, +/turf/open/mars_cave/mars_cave_13, +/area/bigredv2/outside/nw) "mts" = ( /obj/item/ore, /turf/open/mars_cave/mars_cave_2, @@ -27368,20 +27352,6 @@ /obj/item/tool/shovel, /turf/open/mars, /area/bigredv2/outside/nw) -"mvP" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/corpsespawner/security, -/obj/effect/decal/cleanable/blood, -/obj/effect/decal/cleanable/blood/gibs/body, -/obj/item/weapon/gun/pistol/holdout{ - pixel_x = 9; - pixel_y = 18 - }, -/turf/open/floor, -/area/bigredv2/outside/marshal_office) "mwq" = ( /obj/structure/machinery/light{ dir = 4 @@ -27476,15 +27446,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/asteroidwarning/east, /area/bigredv2/outside/e) -"mzC" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 8; - layer = 2.9; - pixel_x = -3 - }, -/obj/structure/platform/kutjevo/rock, -/turf/closed/wall/solaris/rock, -/area/bigredv2/caves) "mzV" = ( /turf/open/mars, /area/bigredv2/outside/filtration_plant) @@ -27663,6 +27624,12 @@ /obj/item/tank/air, /turf/open/floor/asteroidwarning/west, /area/bigredv2/outside/filtration_plant) +"mJx" = ( +/obj/structure/platform/stone/kutjevo/east{ + pixel_x = 4 + }, +/turf/closed/wall/solaris/rock, +/area/bigredv2/caves) "mKi" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_10" @@ -27853,6 +27820,13 @@ }, /turf/open/floor/plating/platebotc, /area/bigredv2/outside/space_port) +"mSC" = ( +/obj/structure/platform/metal/almayer/east, +/obj/item/shard{ + icon_state = "medium" + }, +/turf/open/floor/bluegrid/bcircuitoff, +/area/bigredv2/caves/lambda/research) "mSS" = ( /turf/open/floor/darkyellowcorners2/west, /area/bigredv2/outside/engineering) @@ -27977,6 +27951,11 @@ "mZC" = ( /turf/open/mars_cave/mars_cave_11, /area/bigredv2/caves_virology) +"mZY" = ( +/obj/effect/decal/cleanable/blood/gibs/body, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/asteroidfloor/north, +/area/bigredv2/outside/eta) "nbi" = ( /obj/effect/landmark/hunter_secondary, /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -28001,17 +27980,6 @@ }, /turf/open/floor/dark, /area/bigredv2/outside/general_offices) -"ncv" = ( -/obj/effect/landmark/corpsespawner/ua_riot, -/obj/effect/decal/cleanable/blood{ - dir = 8; - icon_state = "gib6"; - layer = 4; - pixel_x = 12; - pixel_y = 3 - }, -/turf/open/mars_cave/mars_dirt_4, -/area/bigredv2/caves_research) "ncL" = ( /obj/structure/bed/chair{ can_buckle = 0; @@ -28175,14 +28143,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/darkyellow2, /area/bigredv2/outside/filtration_plant) -"nlW" = ( -/obj/structure/platform/kutjevo/rock, -/obj/structure/platform/kutjevo/rock{ - dir = 4 - }, -/obj/structure/platform_decoration/kutjevo/rock, -/turf/open/mars, -/area/space) "nmb" = ( /obj/effect/decal/cleanable/vomit{ icon_state = "vomit_4" @@ -28344,18 +28304,6 @@ }, /turf/open/floor/plating/platingdmg3/west, /area/bigredv2/caves/mining) -"nug" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 9 - }, -/turf/open/gm/river, -/area/bigredv2/outside/engineering) "nuq" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -28377,7 +28325,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/barricade/handrail, /turf/open/floor/darkyellow2, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "nuQ" = ( /obj/structure/surface/table/woodentable, /obj/effect/landmark/objective_landmark/close, @@ -28410,6 +28358,17 @@ }, /turf/open/mars_cave/mars_cave_3, /area/bigredv2/caves/mining) +"nxl" = ( +/obj/effect/sentry_landmark/lz_2/top_right, +/turf/open/floor/asteroidwarning, +/area/bigredv2/outside/space_port_lz2) +"nxG" = ( +/turf/open/floor/darkyellow2/west, +/area/bigredv2/outside/engineering/reactor) +"nxK" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/asteroidfloor/north, +/area/bigredv2/outside/telecomm/n_cave) "nyZ" = ( /obj/item/tool/minihoe{ pixel_x = -4; @@ -28451,6 +28410,10 @@ }, /turf/open/mars, /area/bigredv2/outside/nw) +"nAJ" = ( +/obj/effect/sentry_landmark/lz_2/bottom_left, +/turf/open/mars_cave/mars_dirt_4, +/area/bigredv2/outside/space_port_lz2) "nBb" = ( /obj/item/ammo_magazine/pistol/b92fs, /obj/item/weapon/gun/pistol/b92fs{ @@ -28505,6 +28468,11 @@ "nEl" = ( /turf/open/mars_cave/mars_cave_13, /area/bigredv2/outside/lz2_south_cas) +"nEt" = ( +/obj/effect/decal/cleanable/blood/gibs/body, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/asteroidwarning/north, +/area/bigredv2/outside/eta) "nEv" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -28580,6 +28548,12 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/mars_cave/mars_cave_17, /area/bigredv2/outside/filtration_cave_cas) +"nGN" = ( +/obj/effect/timed_event/scrapeaway{ + time = 40 + }, +/turf/closed/wall/solaris/rock, +/area/bigredv2/caves_sw) "nHQ" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /obj/structure/machinery/door/poddoor/almayer/closed{ @@ -28717,13 +28691,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/bigredv2/outside/bar) -"nPH" = ( -/obj/structure/platform_decoration/kutjevo/rock{ - layer = 3.1 - }, -/obj/effect/decal/cleanable/generic, -/turf/open/mars_cave/mars_cave_19, -/area/bigredv2/outside/nw) "nQl" = ( /obj/item/ore{ pixel_x = -1; @@ -28910,12 +28877,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/asteroidwarning/north, /area/bigredv2/outside/telecomm/n_cave) -"nZD" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/dark, -/area/bigredv2/outside/admin_building) "nZK" = ( /obj/item/ore/diamond, /obj/item/stack/sheet/mineral/diamond{ @@ -29056,12 +29017,6 @@ /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/dark, /area/bigredv2/outside/general_offices) -"ojD" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/gm/river, -/area/bigredv2/outside/engineering) "okh" = ( /obj/structure/cable{ icon_state = "4-8" @@ -29187,14 +29142,6 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/asphalt/cement, /area/bigredv2/caves_lambda) -"ooi" = ( -/obj/structure/platform_decoration/shiva{ - dir = 8 - }, -/obj/structure/platform_decoration/shiva, -/obj/item/stack/cable_coil, -/turf/open/floor/bluegrid/bcircuitoff, -/area/bigredv2/caves/lambda/research) "oox" = ( /obj/structure/machinery/door/poddoor/almayer/closed{ dir = 4; @@ -29339,7 +29286,7 @@ "ouh" = ( /obj/item/tool/extinguisher, /turf/open/floor/darkyellow2/west, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "ouo" = ( /turf/open/floor/whitegreencorner/north, /area/bigredv2/outside/medical) @@ -29507,6 +29454,10 @@ /obj/item/shard, /turf/open/floor/dark, /area/bigredv2/outside/general_offices) +"oCA" = ( +/obj/effect/sentry_landmark/lz_2/top_left, +/turf/open/floor/asteroidwarning/north, +/area/bigredv2/outside/space_port_lz2) "oCK" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached4, /area/bigredv2/outside/e) @@ -29569,6 +29520,9 @@ /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/dark, /area/bigredv2/outside/general_offices) +"oHc" = ( +/turf/open/floor/darkyellow2/southeast, +/area/bigredv2/outside/engineering/reactor) "oHu" = ( /obj/effect/decal/cleanable/dirt, /obj/item/stack/sheet/metal{ @@ -29620,16 +29574,6 @@ /obj/effect/decal/cleanable/blood/gibs/xeno/limb, /turf/open/floor/asteroidwarning/southeast, /area/bigredv2/outside/c) -"oIK" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 6 - }, -/turf/open/gm/river, -/area/bigredv2/outside/engineering) "oJd" = ( /obj/structure/prop/invuln/minecart_tracks{ desc = "A heavy duty power cable for high voltage applications"; @@ -29850,13 +29794,6 @@ }, /turf/open/mars_cave/mars_dirt_7, /area/bigredv2/caves/mining) -"oUY" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/asteroidfloor/north, -/area/bigredv2/outside/telecomm/n_cave) "oVg" = ( /obj/structure/surface/table/woodentable, /obj/item/ashtray/glass, @@ -29896,7 +29833,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/barricade/handrail, /turf/open/floor/darkyellow2/southwest, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "oWC" = ( /obj/structure/prop/invuln/minecart_tracks{ desc = "A heavy duty power cable for high voltage applications"; @@ -29907,6 +29844,11 @@ }, /turf/open/mars_cave/mars_cave_2, /area/bigredv2/caves/mining) +"oWE" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer, +/turf/open/floor/bluegrid/bcircuitoff, +/area/bigredv2/caves/lambda/research) "oXj" = ( /obj/structure/surface/table, /turf/open/floor/dark, @@ -30188,15 +30130,6 @@ "pnL" = ( /turf/open/mars/mars_dirt_11, /area/bigredv2/caves_north) -"pog" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/gm/river, -/area/bigredv2/outside/engineering) "pok" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /obj/effect/decal/cleanable/blood, @@ -30251,6 +30184,15 @@ /obj/structure/sign/safety/hazard, /turf/closed/wall/solaris/rock, /area/bigredv2/caves) +"ppu" = ( +/obj/structure/barricade/handrail, +/obj/structure/barricade/handrail{ + dir = 1; + layer = 3.05; + pixel_y = 9 + }, +/turf/open/floor/plating/plating_catwalk, +/area/bigredv2/outside/engineering/reactor) "ppZ" = ( /obj/structure/barricade/handrail/medical{ dir = 4 @@ -30267,6 +30209,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/whitegreencorner/north, /area/bigredv2/outside/medical) +"pqL" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/gm/river, +/area/bigredv2/outside/engineering/reactor) "pri" = ( /obj/structure/barricade/wooden{ desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it..."; @@ -30287,6 +30233,11 @@ }, /turf/open/asphalt/cement/cement4, /area/bigredv2/outside/lambda_cave_cas) +"prN" = ( +/obj/structure/platform/stone/kutjevo, +/obj/structure/platform/stone/kutjevo/east, +/turf/open/mars_cave/mars_cave_14, +/area/bigredv2/outside/nw) "prU" = ( /obj/structure/machinery/light{ dir = 4 @@ -30413,12 +30364,6 @@ }, /turf/open/mars_cave/mars_cave_14, /area/bigredv2/caves/mining) -"pxH" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/dark, -/area/bigredv2/outside/admin_building) "pxP" = ( /obj/structure/bed/chair{ dir = 4 @@ -30680,7 +30625,7 @@ dir = 1 }, /turf/open/floor/darkyellow2/west, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "pOt" = ( /obj/structure/machinery/optable, /turf/open/floor/whiteblue/east, @@ -30767,20 +30712,14 @@ /obj/item/restraint/handcuffs, /turf/open/floor/dark, /area/bigredv2/outside/marshal_office) -"pTA" = ( -/obj/structure/platform_decoration/shiva{ - dir = 1 - }, -/obj/structure/platform_decoration/shiva{ - dir = 4 - }, -/obj/effect/landmark/objective_landmark/far, -/turf/open/floor/bluegrid/bcircuitoff, -/area/bigredv2/caves/lambda/research) "pTH" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_core, /turf/open/mars_cave/mars_cave_2, /area/bigredv2/caves_se) +"pTY" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/darkyellow2/north, +/area/bigredv2/outside/engineering/reactor) "pUi" = ( /obj/item/weapon/broken_bottle, /turf/open/floor/plating, @@ -30792,6 +30731,9 @@ }, /turf/open/floor/whitebluefull/northeast, /area/bigredv2/outside/medical) +"pVi" = ( +/turf/open/floor/darkyellowcorners2/north, +/area/bigredv2/outside/engineering/reactor) "pVp" = ( /obj/structure/prop/invuln/minecart_tracks{ dir = 1 @@ -30804,7 +30746,7 @@ dir = 1 }, /turf/open/floor/darkyellow2/west, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "pVP" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/asteroidfloor/north, @@ -30816,14 +30758,6 @@ /obj/item/stack/sheet/wood, /turf/open/floor/dark, /area/bigredv2/outside/general_offices) -"pWs" = ( -/obj/structure/barricade/handrail{ - dir = 1; - layer = 3.01; - pixel_y = 9 - }, -/turf/open/floor/plating/plating_catwalk, -/area/bigredv2/outside/engineering) "pXm" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -30865,6 +30799,10 @@ /obj/item/weapon/gun/rifle/m41a/training, /turf/open/mars_cave/mars_cave_17, /area/bigredv2/caves/mining) +"pXM" = ( +/obj/effect/sentry_landmark/lz_1/top_right, +/turf/open/floor/plating, +/area/bigredv2/outside/space_port) "pXY" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -31284,6 +31222,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/bigredv2/outside/library) +"qtv" = ( +/obj/structure/platform/stone/kutjevo, +/obj/structure/platform/stone/kutjevo/west, +/obj/structure/platform_decoration/stone/kutjevo/north, +/turf/open/mars_cave/mars_cave_2, +/area/space) "qty" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 @@ -31301,6 +31245,10 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/wood, /area/bigredv2/outside/bar) +"qtZ" = ( +/obj/effect/sentry_landmark/lz_1/top_left, +/turf/open/floor/asteroidfloor/north, +/area/bigredv2/outside/space_port) "qus" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/delivery, @@ -31505,10 +31453,6 @@ }, /turf/open/floor/asteroidwarning/west, /area/bigredv2/outside/n) -"qEs" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, -/turf/open/mars_cave/mars_cave_2, -/area/bigredv2/outside/lz2_south_cas) "qEz" = ( /obj/structure/flora/grass/desert/lightgrass_3, /turf/open/mars, @@ -31572,6 +31516,10 @@ /obj/structure/surface/table/reinforced/prison, /turf/open/floor/plating/platingdmg3/west, /area/bigredv2/caves/mining) +"qGD" = ( +/obj/effect/sentry_landmark/lz_2/bottom_left, +/turf/open/mars/mars_dirt_10, +/area/bigredv2/outside/space_port_lz2) "qGT" = ( /obj/item/stack/sheet/metal{ pixel_x = 4; @@ -31622,6 +31570,10 @@ /obj/effect/decal/cleanable/blood/gibs/body, /turf/open/floor/dark, /area/bigredv2/outside/general_offices) +"qJK" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/asteroidfloor/north, +/area/bigredv2/outside/telecomm/n_cave) "qJM" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet, @@ -31854,13 +31806,6 @@ /obj/item/shard, /turf/open/floor/plating, /area/bigredv2/outside/general_offices) -"qVd" = ( -/obj/item/reagent_container/food/snacks/sausage, -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 8 - }, -/turf/open/mars_cave/mars_dirt_4, -/area/space) "qVi" = ( /obj/structure/window/framed/solaris/reinforced, /turf/open/floor/plating, @@ -31900,6 +31845,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/whitegreen, /area/bigredv2/outside/medical) +"qYf" = ( +/obj/structure/platform/stone/kutjevo/west{ + pixel_x = -3 + }, +/obj/structure/platform/stone/kutjevo, +/turf/closed/wall/solaris/rock, +/area/bigredv2/caves) "qYB" = ( /obj/structure/sink{ dir = 8; @@ -32096,18 +32048,6 @@ }, /turf/closed/wall/solaris/rock, /area/bigredv2/caves) -"rfe" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 8 - }, -/obj/structure/platform/kutjevo/rock{ - dir = 1 - }, -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 4 - }, -/turf/open/mars_cave/mars_cave_2, -/area/space) "rfL" = ( /obj/item/shard, /turf/open/floor/whitegreencorner, @@ -32170,14 +32110,6 @@ }, /turf/open/floor/plating/platingdmg3/west, /area/bigredv2/caves/mining) -"riL" = ( -/obj/item/storage/toolbox{ - pixel_x = 4; - pixel_y = 9 - }, -/obj/item/ammo_casing/bullet, -/turf/open/floor/redcorner/east, -/area/bigredv2/outside/marshal_office) "rjw" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor, @@ -32551,10 +32483,10 @@ /obj/structure/barricade/deployable, /turf/open/floor/dark, /area/bigredv2/outside/marshal_office) -"rGr" = ( -/obj/effect/landmark/corpsespawner/colonist, -/turf/open/floor/wood, -/area/bigredv2/outside/dorms) +"rGz" = ( +/obj/structure/machinery/light/double, +/turf/open/mars_cave/mars_cave_5, +/area/bigredv2/caves_sw) "rGD" = ( /obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/red/north, @@ -32882,6 +32814,12 @@ /obj/structure/fence, /turf/open/floor/asteroidfloor/north, /area/bigredv2/outside/filtration_plant) +"rTP" = ( +/obj/structure/platform/stone/kutjevo/west, +/obj/structure/platform/stone/kutjevo/north, +/obj/structure/platform_decoration/stone/kutjevo/east, +/turf/open/mars_cave/mars_cave_2, +/area/space) "rUn" = ( /obj/effect/decal/warning_stripes{ icon_state = "N" @@ -32903,12 +32841,6 @@ }, /turf/open/floor/wood, /area/bigredv2/caves/lambda/breakroom) -"rUN" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/gm/river, -/area/bigredv2/outside/engineering) "rUU" = ( /obj/effect/decal/cleanable/dirt, /obj/item/trash/cigbutt{ @@ -33086,18 +33018,13 @@ "saX" = ( /obj/structure/machinery/power/turbine, /turf/open/floor/darkyellow2/west, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "sbc" = ( /obj/structure/surface/table, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /obj/item/restraint/handcuffs, /turf/open/floor, /area/bigredv2/outside/marshal_office) -"sbk" = ( -/obj/effect/landmark/corpsespawner/miner, -/obj/effect/decal/cleanable/blood, -/turf/open/mars_cave/mars_dirt_4, -/area/bigredv2/caves/mining) "sbm" = ( /obj/structure/surface/table, /obj/effect/spawner/random/toolbox, @@ -33111,16 +33038,12 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/asteroidfloor/north, /area/bigredv2/outside/eta) -"sbz" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 8 - }, -/obj/structure/platform/kutjevo/rock, -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 1 - }, -/turf/open/mars/mars_dirt_12, -/area/space) +"sbt" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/northeast, +/turf/open/gm/river, +/area/bigredv2/outside/engineering/reactor) "sbA" = ( /obj/item/frame/rack, /obj/effect/spawner/random/toolbox, @@ -33154,12 +33077,6 @@ }, /turf/open/floor/plating, /area/bigredv2/outside/bar) -"scK" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/asteroidfloor/north, -/area/bigredv2/outside/telecomm/n_cave) "scP" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -33387,7 +33304,7 @@ dir = 4 }, /turf/open/floor/darkyellow2/east, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "snT" = ( /obj/item/stack/rods{ pixel_y = 13; @@ -33630,6 +33547,9 @@ }, /turf/open/mars_cave/mars_cave_16, /area/bigredv2/caves/mining) +"syJ" = ( +/turf/open/mars_cave/mars_cave_23, +/area/bigredv2/outside/lz2_south_cas) "syK" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -33662,10 +33582,14 @@ }, /turf/open/floor/freezerfloor, /area/bigredv2/outside/dorms) +"sAw" = ( +/obj/structure/platform/stone/kutjevo/east, +/turf/open/mars_cave/mars_cave_17, +/area/bigredv2/outside/nw) "sAG" = ( /obj/effect/landmark/hunter_primary, /turf/open/mars_cave/mars_cave_2, -/area/bigredv2/caves_sw) +/area/bigredv2/outside/lz2_south_cas) "sAS" = ( /obj/item/toy/prize/fireripley{ pixel_y = 19 @@ -33744,7 +33668,7 @@ "sDO" = ( /obj/structure/machinery/power/port_gen/pacman, /turf/open/floor/darkyellow2/west, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "sDZ" = ( /obj/effect/decal/cleanable/dirt, /obj/item/clothing/head/welding, @@ -33876,6 +33800,10 @@ /obj/structure/machinery/suit_storage_unit/carbon_unit, /turf/open/floor/plating, /area/bigredv2/outside/admin_building) +"sLU" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/dark, +/area/bigredv2/outside/admin_building) "sMg" = ( /obj/structure/flora/bush/desert{ icon_state = "tree_3" @@ -33901,7 +33829,7 @@ "sNP" = ( /obj/structure/window/framed/solaris, /turf/open/floor/plating/panelscorched, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "sNQ" = ( /turf/open/mars_cave/mars_cave_11, /area/bigredv2/caves_lambda) @@ -34132,7 +34060,7 @@ "tcP" = ( /obj/effect/decal/cleanable/dirt/greenglow, /turf/closed/wall/solaris/reinforced, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "tcV" = ( /obj/effect/decal/cleanable/generic, /turf/open/asphalt/cement_sunbleached/cement_sunbleached1, @@ -34534,6 +34462,14 @@ }, /turf/open/floor/loadingarea/west, /area/bigredv2/outside/cargo) +"tuG" = ( +/obj/structure/platform/stone/kutjevo, +/obj/item/trash/used_stasis_bag{ + pixel_y = 8; + pixel_x = 9 + }, +/turf/open/mars_cave/mars_cave_9, +/area/bigredv2/outside/nw) "tuN" = ( /obj/structure/machinery/light/small, /turf/open/mars_cave, @@ -34546,7 +34482,7 @@ dir = 1 }, /turf/open/floor/darkyellow2/east, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "twt" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 @@ -35054,12 +34990,6 @@ }, /turf/open/mars_cave/mars_cave_14, /area/bigredv2/caves/mining) -"tSI" = ( -/obj/structure/platform/shiva{ - dir = 8 - }, -/turf/open/floor/bluegrid/bcircuitoff, -/area/bigredv2/caves/lambda/research) "tSY" = ( /obj/structure/surface/table, /turf/open/floor/whitegreencorner, @@ -35088,6 +35018,13 @@ /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/asteroidfloor/north, /area/bigredv2/outside/eta) +"tUB" = ( +/obj/structure/machinery/iv_drip, +/obj/effect/decal/cleanable/blood, +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/blood/gibs/body, +/turf/open/floor/whitegreen, +/area/bigredv2/outside/medical) "tUL" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/hefa_cult_decals/d32, @@ -35261,7 +35198,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/window/framed/solaris, /turf/open/floor/plating/panelscorched, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "ueM" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -35309,6 +35246,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt/cement_sunbleached/cement_sunbleached9, /area/bigredv2/outside/space_port_lz2) +"ugT" = ( +/obj/effect/sentry_landmark/lz_2/bottom_right, +/turf/open/asphalt/cement_sunbleached, +/area/bigredv2/outside/space_port_lz2) "ugW" = ( /obj/structure/machinery/light/small, /turf/open/floor/plating/platingdmg3/west, @@ -35588,6 +35529,10 @@ "uyk" = ( /turf/open/mars_cave/mars_cave_7, /area/bigredv2/outside/lz2_west_cas) +"uyS" = ( +/obj/effect/sentry_landmark/lz_2/top_right, +/turf/open/asphalt/cement_sunbleached, +/area/bigredv2/outside/w) "uzb" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/blood, @@ -35641,10 +35586,6 @@ /obj/structure/cargo_container/arious/leftmid, /turf/open/mars, /area/bigredv2/outside/space_port_lz2) -"uCa" = ( -/obj/effect/landmark/corpsespawner/miner, -/turf/open/floor/plating/platingdmg3/west, -/area/bigredv2/caves/mining) "uCV" = ( /obj/effect/decal/cleanable/vomit{ icon_state = "vomit_2" @@ -35806,7 +35747,7 @@ dir = 8 }, /turf/open/floor/darkyellow2/east, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "uJu" = ( /obj/item/robot_parts/robot_component/diagnosis_unit{ pixel_y = 15 @@ -35860,18 +35801,6 @@ }, /turf/open/floor/asteroidfloor/north, /area/bigredv2/outside/ne) -"uNW" = ( -/obj/effect/decal/cleanable/blood{ - dir = 8; - icon_state = "gib6"; - layer = 4; - pixel_x = 12; - pixel_y = 3 - }, -/obj/effect/landmark/corpsespawner/miner, -/obj/effect/decal/cleanable/blood, -/turf/open/mars_cave/mars_cave_13, -/area/bigredv2/caves/mining) "uOy" = ( /obj/structure/prop/invuln/overhead_pipe{ dir = 4; @@ -35897,16 +35826,6 @@ }, /turf/open/mars_cave/mars_dirt_4, /area/bigredv2/caves/mining) -"uPK" = ( -/obj/structure/platform/shiva{ - dir = 1 - }, -/obj/structure/platform/shiva, -/obj/structure/machinery/light/small/built{ - dir = 4 - }, -/turf/open/floor/bluegrid/bcircuitoff, -/area/bigredv2/caves/lambda/research) "uQZ" = ( /obj/structure/flora/grass/desert/lightgrass_6, /turf/open/mars, @@ -36050,6 +35969,9 @@ }, /turf/open/floor/white, /area/bigredv2/outside/medical) +"uZy" = ( +/turf/closed/wall/solaris/reinforced, +/area/bigredv2/outside/engineering/reactor) "uZG" = ( /obj/effect/decal/cleanable/dirt, /obj/item/trash/cigbutt{ @@ -36067,14 +35989,6 @@ /obj/structure/flora/grass/desert/lightgrass_1, /turf/open/asphalt/cement_sunbleached/cement_sunbleached12, /area/bigredv2/outside/filtration_plant) -"vaR" = ( -/obj/structure/machinery/iv_drip, -/obj/effect/landmark/corpsespawner/chef, -/obj/effect/decal/cleanable/blood, -/obj/effect/decal/cleanable/blood/drip, -/obj/effect/decal/cleanable/blood/gibs/body, -/turf/open/floor/whitegreen, -/area/bigredv2/outside/medical) "vbi" = ( /turf/open/floor/darkpurple2/northeast, /area/bigredv2/caves/lambda/research) @@ -36124,7 +36038,7 @@ icon_state = "S" }, /turf/open/mars_cave/mars_cave_5, -/area/bigredv2/outside/lz2_south_cas) +/area/bigredv2/caves_sw) "vcy" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot{ @@ -36216,13 +36130,6 @@ /obj/structure/fence, /turf/open/floor/asteroidwarning/east, /area/bigredv2/outside/n) -"vgZ" = ( -/obj/structure/platform/shiva, -/obj/structure/platform/shiva{ - dir = 1 - }, -/turf/open/floor/bluegrid/bcircuitoff, -/area/bigredv2/caves/lambda/research) "vhF" = ( /obj/item/device/flashlight/lantern, /turf/open/mars_cave/mars_cave_13, @@ -36398,16 +36305,6 @@ }, /turf/open/floor/asteroidfloor/north, /area/bigredv2/outside/ne) -"vnJ" = ( -/obj/structure/bed/bedroll{ - dir = 5 - }, -/obj/effect/landmark/corpsespawner/colonist, -/obj/effect/decal/cleanable/blood, -/obj/effect/decal/cleanable/blood/gibs/body, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/freezerfloor, -/area/bigredv2/outside/general_offices) "vnR" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-in" @@ -36422,18 +36319,11 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/barricade/handrail, /turf/open/floor/darkyellow2/southeast, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "vpu" = ( /obj/item/weapon/twohanded/folded_metal_chair, /turf/open/mars_cave/mars_cave_3, /area/bigredv2/caves/mining) -"vpx" = ( -/obj/structure/platform, -/obj/structure/flora/jungle/planttop1{ - pixel_y = 10 - }, -/turf/open/floor/dark, -/area/bigredv2/outside/admin_building) "vpY" = ( /obj/structure/machinery/door/poddoor/almayer/closed{ id = "eta"; @@ -36499,6 +36389,14 @@ }, /turf/open/floor/asteroidfloor/north, /area/bigredv2/outside/nw) +"vsS" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/obj/structure/prop/server_equipment/yutani_server{ + density = 0; + pixel_y = 16 + }, +/turf/open/floor/asteroidfloor/north, +/area/bigredv2/outside/telecomm/n_cave) "vsX" = ( /obj/item/trash/semki{ layer = 2; @@ -36717,6 +36615,10 @@ "vCU" = ( /turf/open/mars_cave/mars_cave_16, /area/bigredv2/outside/lz2_south_cas) +"vDq" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/dark, +/area/bigredv2/outside/admin_building) "vDw" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/blood/drip, @@ -36726,6 +36628,13 @@ }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached15, /area/bigredv2/outside/nw) +"vDJ" = ( +/obj/item/storage/toolbox{ + pixel_x = 4; + pixel_y = 9 + }, +/turf/open/floor/redcorner/east, +/area/bigredv2/outside/marshal_office) "vDK" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/blood, @@ -36833,6 +36742,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt/cement_sunbleached/cement_sunbleached1, /area/bigredv2/outside/s) +"vKl" = ( +/obj/structure/barricade/handrail{ + dir = 1; + layer = 3.05; + pixel_y = 9 + }, +/turf/open/floor/plating/plating_catwalk, +/area/bigredv2/outside/engineering/reactor) "vKv" = ( /turf/open/floor/asteroidwarning/west, /area/bigredv2/outside/space_port_lz2) @@ -36885,7 +36802,7 @@ "vNm" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/mars_cave/mars_cave_5, -/area/bigredv2/caves_virology) +/area/bigredv2/outside/lz1_telecomm_cas) "vND" = ( /obj/structure/flora/grass/desert/lightgrass_10, /turf/open/mars, @@ -36955,6 +36872,12 @@ /obj/structure/machinery/power/apc/power/east, /turf/open/floor/darkred2/east, /area/bigredv2/caves/eta/research) +"vQt" = ( +/obj/structure/platform/stone/kutjevo, +/obj/structure/platform/stone/kutjevo/east, +/obj/structure/platform_decoration/stone/kutjevo, +/turf/open/mars, +/area/space) "vQF" = ( /obj/structure/machinery/power/apc/power/north, /turf/open/floor/darkyellowcorners2/north, @@ -37069,6 +36992,10 @@ "vXJ" = ( /turf/open/mars_cave/mars_dirt_4, /area/bigredv2/caves_lambda) +"vYf" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/darkyellow2/east, +/area/bigredv2/outside/engineering/reactor) "vYp" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /obj/effect/decal/cleanable/blood, @@ -37159,18 +37086,6 @@ }, /turf/open/floor/darkred2/west, /area/bigredv2/outside/admin_building) -"wdM" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 4 - }, -/obj/structure/platform/kutjevo/rock{ - dir = 1 - }, -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 8 - }, -/turf/open/mars_cave/mars_dirt_4, -/area/space) "wdV" = ( /obj/structure/surface/rack, /obj/effect/decal/cleanable/dirt, @@ -37260,6 +37175,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor, /area/bigredv2/outside/general_offices) +"whp" = ( +/obj/structure/barricade/handrail{ + dir = 1; + layer = 3.05; + pixel_y = 9 + }, +/turf/open/floor/darkyellow2/north, +/area/bigredv2/outside/engineering/reactor) "whw" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/table/woodentable, @@ -37270,6 +37193,10 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/dark, /area/bigredv2/outside/filtration_plant) +"whG" = ( +/obj/effect/landmark/crap_item, +/turf/open/mars_cave, +/area/bigredv2/outside/lz2_west_cas) "whL" = ( /obj/structure/barricade/deployable, /turf/open/floor/asteroidwarning/west, @@ -37309,12 +37236,6 @@ }, /turf/open/floor/whitegreenfull, /area/bigredv2/outside/medical) -"wjW" = ( -/obj/structure/platform/shiva{ - dir = 1 - }, -/turf/open/floor/bluegrid/bcircuitoff, -/area/bigredv2/caves/lambda/research) "wko" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -37362,6 +37283,15 @@ "wni" = ( /turf/open/floor/darkredcorners2, /area/bigredv2/caves/eta/xenobiology) +"wnl" = ( +/obj/structure/bed/bedroll{ + dir = 5 + }, +/obj/effect/decal/cleanable/blood, +/obj/effect/decal/cleanable/blood/gibs/body, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/freezerfloor, +/area/bigredv2/outside/general_offices) "wnZ" = ( /obj/structure/window_frame/solaris, /turf/open/floor/plating, @@ -37391,7 +37321,7 @@ "wpn" = ( /obj/structure/closet/radiation, /turf/open/floor/delivery, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "wpv" = ( /obj/structure/pipes/vents/pump{ dir = 8 @@ -37559,7 +37489,7 @@ "wwT" = ( /obj/effect/decal/cleanable/dirt, /turf/closed/wall/solaris/reinforced, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "wxo" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/asteroidwarning, @@ -37589,19 +37519,6 @@ /obj/item/ammo_casing/bullet, /turf/open/floor/dark, /area/bigredv2/outside/general_offices) -"wAy" = ( -/obj/structure/pipes/standard/manifold/hidden/green, -/obj/effect/decal/cleanable/dirt, -/obj/item/ammo_casing/bullet, -/obj/item/ammo_casing/bullet, -/turf/open/floor, -/area/bigredv2/outside/marshal_office) -"wBi" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/mars_cave/mars_cave_2, -/area/bigredv2/outside/lz2_south_cas) "wBq" = ( /obj/structure/fence, /turf/open/mars_cave/mars_cave_2, @@ -37933,11 +37850,19 @@ }, /turf/open/floor/dark, /area/bigredv2/outside/marshal_office) +"wRD" = ( +/obj/effect/landmark/survivor_spawner, +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/dark, +/area/bigredv2/outside/admin_building) "wRH" = ( /obj/effect/decal/cleanable/dirt, /obj/item/device/flashlight, /turf/open/mars_cave/mars_cave_2, /area/bigredv2/caves/mining) +"wRP" = ( +/turf/open/floor/dark, +/area/bigredv2/outside/engineering/reactor) "wSj" = ( /obj/structure/sign/safety/life_support, /obj/structure/sign/safety/maint{ @@ -37974,16 +37899,6 @@ "wVw" = ( /turf/open/floor/darkyellow2/southeast, /area/bigredv2/outside/filtration_plant) -"wVB" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 10 - }, -/turf/open/gm/river, -/area/bigredv2/outside/engineering) "wVQ" = ( /turf/open/mars_cave/mars_cave_17, /area/bigredv2/caves/mining) @@ -38174,19 +38089,6 @@ }, /turf/open/floor/asteroidwarning, /area/bigredv2/outside/c) -"xfN" = ( -/obj/structure/platform_decoration/shiva{ - dir = 1 - }, -/obj/structure/platform_decoration/shiva{ - dir = 4 - }, -/obj/item/shard{ - icon_state = "medium" - }, -/obj/item/stack/cable_coil/random, -/turf/open/floor/bluegrid/bcircuitoff, -/area/bigredv2/caves/lambda/research) "xfW" = ( /turf/open/jungle/impenetrable, /area/bigredv2/caves/eta/living) @@ -38310,16 +38212,6 @@ "xmy" = ( /turf/open/mars_cave/mars_cave_2, /area/bigredv2/outside/lz1_telecomm_cas) -"xmT" = ( -/obj/structure/platform/kutjevo/rock, -/obj/structure/platform/kutjevo/rock{ - dir = 8 - }, -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 1 - }, -/turf/open/mars_cave/mars_cave_2, -/area/space) "xnf" = ( /obj/structure/barricade/wooden{ desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it..."; @@ -38398,6 +38290,10 @@ }, /turf/open/floor/whitepurplecorner/north, /area/bigredv2/outside/medical) +"xqk" = ( +/obj/effect/decal/cleanable/blood/gibs/body, +/turf/open/floor/asteroidfloor/north, +/area/bigredv2/outside/eta) "xqy" = ( /obj/effect/spawner/random/tool{ pixel_x = -11; @@ -38597,6 +38493,10 @@ }, /turf/open/floor/dark, /area/bigredv2/caves/eta/living) +"xzC" = ( +/obj/structure/platform_decoration/stone/kutjevo, +/turf/open/mars, +/area/space) "xAh" = ( /obj/effect/landmark/xeno_spawn, /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -38617,12 +38517,6 @@ /obj/structure/flora/grass/desert/lightgrass_1, /turf/open/mars/mars_dirt_9, /area/bigredv2/outside/nw) -"xBn" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/dark, -/area/bigredv2/outside/admin_building) "xBo" = ( /obj/structure/barricade/metal{ dir = 1 @@ -38644,6 +38538,15 @@ "xBS" = ( /turf/open/mars_cave/mars_cave_14, /area/bigredv2/outside/lz1_north_cas) +"xBY" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/bluegrid/bcircuitoff, +/area/bigredv2/caves/lambda/research) +"xCk" = ( +/obj/item/reagent_container/food/snacks/sausage, +/obj/structure/platform_decoration/stone/kutjevo/west, +/turf/open/mars_cave/mars_dirt_4, +/area/space) "xCX" = ( /obj/effect/decal/cleanable/blood/xeno, /turf/open/floor/dark, @@ -38846,11 +38749,6 @@ /obj/structure/machinery/light, /turf/open/floor/plating/platingdmg3/west, /area/bigredv2/caves/mining) -"xMz" = ( -/obj/structure/platform_decoration, -/obj/structure/machinery/power/apc/no_power/north, -/turf/open/floor/asteroidfloor/north, -/area/bigredv2/outside/telecomm/n_cave) "xMT" = ( /obj/structure/closet, /obj/item/explosive/grenade/high_explosive/frag, @@ -38900,6 +38798,10 @@ }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached12, /area/bigredv2/outside/c) +"xQa" = ( +/obj/structure/platform/stone/kutjevo/north, +/turf/closed/wall/solaris/rock, +/area/bigredv2/caves) "xQb" = ( /obj/structure/pipes/vents/pump/on, /obj/effect/decal/cleanable/dirt, @@ -38924,13 +38826,6 @@ }, /turf/open/floor/asteroidwarning/east, /area/bigredv2/outside/c) -"xRl" = ( -/obj/item/weapon/gun/pistol/b92fs{ - pixel_x = 13; - pixel_y = -7 - }, -/turf/open/mars_cave/mars_dirt_4, -/area/bigredv2/caves/mining) "xRn" = ( /turf/open/floor/asteroidfloor/north, /area/bigredv2/caves_north) @@ -38938,6 +38833,9 @@ /obj/structure/prop/dam/crane, /turf/open/mars_cave/mars_cave_13, /area/bigredv2/caves/mining) +"xSu" = ( +/turf/open/floor/darkyellow2, +/area/bigredv2/outside/engineering/reactor) "xTk" = ( /obj/limb/arm/l_arm, /obj/effect/decal/cleanable/blood/drip, @@ -39029,14 +38927,6 @@ }, /turf/open/mars_cave/mars_dirt_7, /area/bigredv2/caves/mining) -"xXq" = ( -/obj/structure/barricade/handrail{ - dir = 1; - layer = 3.01; - pixel_y = 9 - }, -/turf/open/floor/darkyellow2/northeast, -/area/bigredv2/outside/engineering) "xXP" = ( /obj/structure/prop/invuln/minecart_tracks/bumper, /turf/open/mars_cave/mars_cave_2, @@ -39265,12 +39155,6 @@ /obj/item/weapon/broken_bottle, /turf/open/floor/plating/platingdmg3/west, /area/bigredv2/caves/mining) -"yjV" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/gm/river, -/area/bigredv2/outside/engineering) "ykb" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -39290,7 +39174,7 @@ /area/bigredv2/outside/s) "ykR" = ( /turf/closed/wall/mineral/uranium, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "ykW" = ( /obj/effect/decal/cleanable/blood/drip{ pixel_x = -3; @@ -39991,8 +39875,8 @@ aaa aab aao aao -rfe -xmT +rTP +qtv aao aao aao @@ -40055,10 +39939,10 @@ aao aao aao aao -jCY -fLj -fLj -fmn +fxK +csE +csE +sQw aao aao aao @@ -40207,10 +40091,10 @@ aaa aaa aab aao -cnk -ada +lwt +cCq qjO -gsW +kAM aao aao aao @@ -40273,10 +40157,10 @@ aao aao fxK xmy -rDP -rDP -rDP -fmn +xmy +xmy +xmy +sQw aao aao aao @@ -40425,10 +40309,10 @@ aaa aab aao aao -wdM -qVd -aVR -sbz +lxN +xCk +hot +hub aao aao aao @@ -40490,10 +40374,10 @@ aao fxK xmy xmy -rDP -iwG -rDP -rDP +xmy +lrH +xmy +xmy fmn aao aao @@ -40643,9 +40527,9 @@ aab aao aao aao -aVc -aVQ -nlW +moH +xzC +vQt aao aao aao @@ -40707,10 +40591,10 @@ aao rCA xmy xmy -rDP -rDP -rDP -rDP +xmy +xmy +xmy +xmy rDP rDP rDP @@ -40860,8 +40744,8 @@ aab aao aao aao -iVd -nlW +gAg +vQt aao aao aao @@ -40924,10 +40808,10 @@ fxK xmy xmy xmy -rDP -rDP -rDP -oAf +xmy +xmy +xmy +sGi rDP rDP rDP @@ -41141,10 +41025,10 @@ rCA xmy xmy xmy -rDP -rDP -rDP -oAf +xmy +xmy +xmy +sGi rDP rDP rDP @@ -41358,10 +41242,10 @@ rCA xmy xmy xmy -rDP -rDP -rDP -oAf +xmy +xmy +xmy +sGi rDP rDP rDP @@ -41575,10 +41459,10 @@ xmy xmy hcb xmy -rDP -rDP -rDP -oAf +xmy +xmy +xmy +sGi rDP rDP rDP @@ -41792,10 +41676,10 @@ xmy xmy xmy xmy -rDP -rDP -rDP -oAf +xmy +xmy +xmy +sGi aao aao aao @@ -42009,10 +41893,10 @@ xmy xmy xmy xmy -rDP -rDP -rDP -oAf +xmy +xmy +xmy +sGi aao aao aao @@ -42075,10 +41959,10 @@ cYJ vMj vMj cYJ -cYJ -wog -wog -wog +jBC +nGN +nGN +nGN wog wog wog @@ -42227,10 +42111,10 @@ xmy gda gda fOc -rDP -rDP -iwG -fmn +xmy +xmy +lrH +sQw aao aao aao @@ -42288,15 +42172,15 @@ cYJ cYJ ski eEy -ski -cYJ -cYJ +whG cYJ ovB +cYJ +jBC +nGN +nGN +wog wog -icQ -gYt -gYt wog sLy gYt @@ -42443,10 +42327,10 @@ gda eci aao aao -fwa -gJw -gJw -vNh +rCA +pQM +pQM +eOd vNm aao aao @@ -42508,12 +42392,12 @@ cYJ cYJ uyk cYJ -cYJ -cYJ -wog +jBC +jBC +nGN wog jAo -gYt +wog wog wog wog @@ -42660,7 +42544,7 @@ aao aao aao aao -mZC +eci aao wvk aGo @@ -42725,9 +42609,9 @@ cYJ cYJ uyk cYJ -tDv -wog -wog +jBC +nGN +nGN wog wog wog @@ -42825,7 +42709,7 @@ aaf aaf aar aaf -aaf +qtZ aaf aaf aaf @@ -42941,11 +42825,11 @@ aao aao aao bQb -ski -ski +jBC +jBC +nGN +nGN wog -gYt -gYt wog wog wog @@ -43160,9 +43044,9 @@ aao aao aao aao -kvp -gYt -gYt +nGN +wog +wog wog sLy wog @@ -43255,7 +43139,7 @@ aaf aaf aaf aaf -aaf +qtZ aaf aaf aaf @@ -43418,8 +43302,8 @@ key jUY jUY jUY -dHr -hLp +jUY +jUY drT vHw aao @@ -43490,7 +43374,7 @@ acJ aaf aaf aaf -aaf +hLq aaf aaf aaf @@ -43686,7 +43570,7 @@ aao aao aae aag -aaf +qtZ aaf aaf aaf @@ -43710,7 +43594,7 @@ aaf aaf aaf aaf -aaf +hLq aaf aaf aae @@ -44226,7 +44110,7 @@ cVY cVY cVY cVY -cVY +ehN cVY ayf ayf @@ -44362,7 +44246,7 @@ aah aei aaf aaf -aaf +hLq acJ aae aao @@ -44439,7 +44323,7 @@ nbu cVY cVY cVY -cVY +ehN hpg mMf cVY @@ -44673,12 +44557,12 @@ tVp fFO cVY cVY -uSC +qGD tVp fFO cVY cVY -cVY +hbg ayf ayf aao @@ -44736,7 +44620,7 @@ wfd jOS kjr kCe -uCa +pSa oTL eER uHQ @@ -44825,7 +44709,7 @@ aao vGR iKU jYp -dLJ +tuG aeI aeI jHK @@ -45039,10 +44923,10 @@ aeI aeI aao aao -jIV -jXw -etg -hkS +sAw +mtj +eFX +prN aeI aeI aeI @@ -45087,7 +44971,7 @@ cVY cVY hpg tVp -bgX +oCA eWd eWd eWd @@ -45764,7 +45648,7 @@ bie bsc eWd dAX -tVp +nAJ tVp ayf aao @@ -46315,7 +46199,7 @@ aah aej aaf aaf -aaf +lOV acJ aae aao @@ -46507,7 +46391,7 @@ aao aao aae aaf -aaf +cjS aap aav aaG @@ -47180,7 +47064,7 @@ jmQ lrf mSz dbO -aah +keO rIx iuI hyO @@ -47539,7 +47423,7 @@ hzP fnO xkR tWS -uNW +cAM iJF omG pJX @@ -47611,7 +47495,7 @@ dbO skZ skZ dbO -aah +keO aah aah aah @@ -47684,7 +47568,7 @@ aSB mQY jzO jzO -jzO +uyS vDS woe tVp @@ -47812,7 +47696,7 @@ aae aae wHg aah -aah +pXM aaU abc aah @@ -48034,7 +47918,7 @@ aah aah aah aah -aah +pXM abD aah aah @@ -48562,7 +48446,7 @@ tVp bgX sbm eWd -dAX +nxl kOv qNH mDt @@ -48578,13 +48462,13 @@ qcQ tVp tVp tVp -qet +mrc mVp mqK tVp qcQ tVp -tVp +iWP tVp aao aao @@ -48608,11 +48492,11 @@ aao aao aao aao -fus -kgx -qEs -hEE -wBi +kvp +wog +sLy +icQ +jMm uxx fOM kcx @@ -48825,10 +48709,10 @@ aao aao aao aao -fus -kgx -kgx -kgx +kvp +wog +wog +wog vct bvV rUn @@ -49044,9 +48928,9 @@ aao aao fus kgx -kgx -kgx -fvu +wog +wog +rGz uHQ tBf qjA @@ -49263,7 +49147,7 @@ lQN kgx kgx kgx -dVA +feS uHQ uHQ uHQ @@ -49449,7 +49333,7 @@ eKY tCn mic mic -tCn +ugT tCn tCn tCn @@ -52070,18 +51954,18 @@ euF euF aao aao -buz -ibZ -ibZ -ibZ -wog -trk -wog -wog -wog -trk -trk -trk +sSU +vCU +vCU +vCU +kgx +nEl +kgx +kgx +kgx +nEl +nEl +nEl wog wog aao @@ -52287,17 +52171,17 @@ aao aao aao aao -wog -wog -wog -wog -jXX +kgx +kgx +kgx +kgx +tsK aao aao aao aao aao -dxV +euF dxV qgY wog @@ -52502,12 +52386,12 @@ aao aao aao aao -wog -oQI -wog -wog -wog -wog +kgx +syJ +kgx +kgx +kgx +kgx aao bRC aao @@ -52715,16 +52599,16 @@ bpx aao aao aao -wog -wog -wog -wog +kgx +kgx +kgx +kgx sAG -wog -oQI -wog -wog -wog +kgx +syJ +kgx +kgx +kgx aao aao aao @@ -52932,15 +52816,15 @@ bpx aao aao aao -wog -wog -wog -wog -wog -wog -wog -icQ -wog +kgx +kgx +kgx +kgx +kgx +kgx +kgx +hEE +kgx aao aao aao @@ -53271,7 +53155,7 @@ mPR nJt siK hEr -nPH +jwa wNe rcR alD @@ -53360,23 +53244,23 @@ ayZ axX axX axX -axX -axX -axX -axX -axX -axX -axX -axX +uZy +uZy +uZy +uZy +uZy +uZy +uZy +uZy wwT -axX -axX -axX -axX -axX -axX -axX -axX +uZy +uZy +uZy +uZy +uZy +uZy +uZy +uZy aao aao aao @@ -53577,23 +53461,23 @@ kVT ayZ bsP ayZ -ouh -lck +mqu +eyR jXJ -btr +nxG sDO pOg saX pVv saX eIN -lck -btr -ayZ -btr -kVT -axX -axX +eyR +nxG +hkR +nxG +dLd +uZy +uZy aao aao wog @@ -53794,23 +53678,23 @@ tTI nIi bte nIi -btu -gwg -gwg -gwg -tTI -btu -gwg -gwg -tTI -btu -btu -ndw +bLE +vYf +vYf +vYf +chw +bLE +vYf +vYf +chw +bLE +bLE +jFG fUp -nVq -sCt +wRP +xSu wpn -axX +uZy aao wog wog @@ -53843,8 +53727,8 @@ rsv oIc vHw ciY -xRl -sbk +wCo +wCo wVQ rxh rxh @@ -54018,16 +53902,16 @@ mqh fEv iig iig -ayZ +hkR fEv ueL ueL -ayZ -axX +hkR +uZy fEv -ayZ -axX -axX +hkR +uZy +uZy aao wog wog @@ -54228,22 +54112,22 @@ uDA bsP bsP axX -hYB -iAI -iAI -dsy -iSz -hYB -iAI -wVB -kka -pog -iAI -wVB -ayZ -ndw -sCt -axX +sbt +pqL +pqL +jLa +ckC +sbt +pqL +jLa +ppu +sbt +pqL +jLa +hkR +jFG +xSu +uZy aao aao wog @@ -54445,22 +54329,22 @@ mSS mij kVT dhN -duA +frs iNR ykR -iaC -iSz -duA +beD +ckC +frs iNR -iaC -kka -duA +beD +ppu +frs ykR -iaC -ayZ -hhK -sCt -axX +beD +hkR +mge +xSu +uZy aao wog qgY @@ -54489,7 +54373,7 @@ aao aao szw wVQ -lom +xgi vpu dZO ndy @@ -54513,7 +54397,7 @@ aao aao vHw cfr -jCq +wCo wCo nSP nSP @@ -54586,7 +54470,7 @@ alu gNv awO kNs -vaR +tUB amj ayl ayL @@ -54662,22 +54546,22 @@ slG dWd sCt dhN -duA +frs iNR iNR -iaC -iSz -duA +beD +ckC +frs iNR -iaC -kka -duA +beD +ppu +frs iNR -iaC -ayZ -hhK -sCt -axX +beD +hkR +mge +xSu +uZy aao wog wog @@ -54879,22 +54763,22 @@ gwg cla gdx dhN -nug -yjV +bPe +jFi ykR -iaC -iSz -duA +beD +ckC +frs iNR -iaC -kka -duA +beD +ppu +frs ykR -iaC -ayZ -hhK -sCt -axX +beD +hkR +mge +xSu +uZy uVn wog wog @@ -55097,21 +54981,21 @@ uaS axX axX axX -duA +frs iNR -iaC -iSz -nug -rUN -oIK -kka -duA +beD +ckC +bPe +lbw +eaC +ppu +frs iNR -iaC -ayZ -hhK -sCt -axX +beD +hkR +mge +xSu +uZy dQw wog qgY @@ -55314,20 +55198,20 @@ cla btr jTk dhN -duA +frs ykR -iaC -pWs +beD +vKl lCt lCt lCt jxA -duA +frs ykR -iaC +beD ueL -nzN -sCt +pTY +xSu tcP dQw wog @@ -55531,20 +55415,20 @@ bqN btt uGs gmm -duA +frs iNR -iaC -gUD -btr +beD +gtk +nxG jxS -btr +nxG oWp -duA +frs iNR -iaC +beD ueL -nzN -cKu +pTY +dyA tcP rvS wog @@ -55748,21 +55632,21 @@ tTI nVq qUF dhN -duA +frs ykR -iaC -dBU +beD +whp guu -axX +uZy cNb nuz -duA +frs ykR -iaC -ayZ -hhK -cKu -axX +beD +hkR +mge +dyA +uZy rvS wog wog @@ -55965,21 +55849,21 @@ tTI btt nmU dhN -duA +frs iNR -iaC -xXq -btu +beD +kvs +bLE uJj -gwg +vYf voG -duA +frs iNR -iaC -ayZ -hhK -sCt -axX +beD +hkR +mge +xSu +uZy rvS wog wog @@ -56182,21 +56066,21 @@ nVq btu gHV dhN -duA +frs ykR -iaC -pWs +beD +vKl lCt lCt lCt jxA -duA +frs ykR -iaC -ayZ -nzN -sCt -axX +beD +hkR +pTY +xSu +uZy rvS wog jXX @@ -56399,21 +56283,21 @@ tzJ axX axX axX -duA +frs iNR -iaC -iSz -hYB -iAI -wVB -kka -duA +beD +ckC +sbt +pqL +jLa +ppu +frs iNR -iaC -ayZ -nzN -sCt -axX +beD +hkR +pTY +xSu +uZy aao aao aao @@ -56466,7 +56350,7 @@ guM fGN jrD nXC -ncv +guM guM aao aao @@ -56615,22 +56499,22 @@ btr tTI kVT dhN -hYB -ojD +sbt +lBL ykR -iaC -iSz -duA +beD +ckC +frs iNR -iaC -kka -duA +beD +ppu +frs ykR -iaC +beD iig -nzN -sCt -axX +pTY +xSu +uZy aao aao aao @@ -56832,22 +56716,22 @@ nVq tTI sCt dhN -duA +frs iNR iNR -iaC -iSz -duA +beD +ckC +frs iNR -iaC -kka -duA +beD +ppu +frs iNR -iaC -ayZ -hhK -sCt -axX +beD +hkR +mge +xSu +uZy aao aao aao @@ -57049,22 +56933,22 @@ iQC nVq vWm dhN -duA +frs iNR ykR -iaC -iSz -duA +beD +ckC +frs iNR -iaC -kka -duA +beD +ppu +frs ykR -iaC -ayZ -hhK -sCt -axX +beD +hkR +mge +xSu +uZy aao aao aao @@ -57266,22 +57150,22 @@ eGM btu dyH axX -nug -rUN -rUN -oIK -iSz -nug -rUN -oIK -kka -nug -rUN -oIK -ayZ -slC -sCt -axX +bPe +lbw +lbw +eaC +ckC +bPe +lbw +eaC +ppu +bPe +lbw +eaC +hkR +pVi +xSu +uZy aao aao aao @@ -57483,23 +57367,23 @@ wFL axX axX axX -ayZ -ayZ -ayZ -ayZ +hkR +hkR +hkR +hkR fEv -ayZ +hkR sNP ueL gPh sNP -ayZ -ayZ -axX +hkR +hkR +uZy fEv -ayZ -axX -axX +hkR +uZy +uZy aao aao aao @@ -57656,9 +57540,9 @@ bMa aof mEH aOM -aYi -xBn -nZD +fjN +aNA +sLU aPS aOM aOM @@ -57700,23 +57584,23 @@ tTI nIi gZc nIi -btr -lck -lck -lck -tTI -lck -lck +nxG +eyR +eyR +eyR +chw +eyR +eyR ouh -tTI -btr -btr -slC +chw +nxG +nxG +pVi fUp -nVq -sCt +wRP +xSu wpn -axX +uZy aao aao aao @@ -57873,9 +57757,9 @@ aof aof mEH aOM -vpx +cBj aFd -khP +fiQ aZW aOK bbk @@ -57917,23 +57801,23 @@ pMi ayZ bsP ayZ -btu +bLE iFa snv -btu +bLE gFR tvH gML tvH gML gFR -btu -btu -ayZ -btu -gdx -axX -axX +bLE +bLE +hkR +bLE +oHc +uZy +uZy aao aao aao @@ -58020,10 +57904,10 @@ dQR fsy aaB pRP -xMz -hFv -hFv -kAs +eTm +qJK +qJK +fdP oMf aWy acP @@ -58090,9 +57974,9 @@ aRd bcJ aSW aOM -aYk -dBm -pxH +wRD +mon +vDq aZX aof aof @@ -58134,22 +58018,22 @@ sDZ axX axX axX -axX -axX -axX -axX -axX -axX -axX -axX -axX -axX -axX -axX -axX -axX -axX -axX +uZy +uZy +uZy +uZy +uZy +uZy +uZy +uZy +uZy +uZy +uZy +uZy +uZy +uZy +uZy +uZy aao aao aao @@ -58237,10 +58121,10 @@ kfx fsT aaB oMf -dkY +iUW qDZ hJH -lqp +kSZ iRf aWy acP @@ -58259,8 +58143,8 @@ afT ikq rEe aer -riL -mvP +vDJ +gvs pMc aer aoi @@ -58454,10 +58338,10 @@ kfx aqL nZB oMf -dkY +iUW qDZ qDZ -cnG +nxK iRf aWy acP @@ -58477,7 +58361,7 @@ lYc akm fyC lAV -wAy +fcO ahj acp aer @@ -58671,10 +58555,10 @@ kfx aqL nZB pRP -iXs -scK -scK -oUY +vsS +dUN +dUN +ljE oMf wmN acP @@ -59233,7 +59117,7 @@ vpY wIE bvH ihW -kGn +nEt kdr kdr kdr @@ -59311,10 +59195,10 @@ aao aao aao aao -lwR -lwR -lwR -lwR +mJx +mJx +mJx +mJx aao aao aao @@ -59532,7 +59416,7 @@ aao aao aao uut -eCM +xQa ylx aao aao @@ -59664,7 +59548,7 @@ jwV vpY xnm vpY -lGl +xqk bvQ eAU tUe @@ -59749,7 +59633,7 @@ aao aao cUN fkD -eCM +xQa rvB aao tjX @@ -59962,11 +59846,11 @@ aao aao aao aao -fBJ -mzC +dBx +qYf rSE lSA -eCM +xQa rvB aao xqW @@ -60181,8 +60065,8 @@ aao aao aao aao -fBJ -hos +dBx +dYb btZ tHH aao @@ -62268,7 +62152,7 @@ bjw vpY jBq vpY -lGl +mZY vcd bvQ kdr @@ -63696,7 +63580,7 @@ amD asc amn jlr -rGr +atY amn avG awq @@ -66947,7 +66831,7 @@ opn oEz poL kGK -vnJ +wnl ako vjW atE @@ -70201,7 +70085,7 @@ akL pwa cIC qYH -qJh +jPK bZH apU qFq @@ -70417,7 +70301,7 @@ aao akL pqj apn -lXt +gpE tcI oGr fik @@ -77792,7 +77676,7 @@ adZ alO amM adZ -anR +alO amM adZ adZ @@ -80644,11 +80528,11 @@ aIQ wko anI aMr -wjW +xBY ePk -ajn +ane aMr -wjW +xBY xKb anI aao @@ -80860,13 +80744,13 @@ anI aIR aJL anI -tSI -gan -tSI -xfN -jwj -pTA -tSI +eCF +ilG +eCF +kkJ +cOH +kID +eCF anI aao aao @@ -81077,13 +80961,13 @@ anI aIL aJM anI -hZc -jKI -hZc -evA -lPL -ooi -hZc +keU +iFT +keU +oWE +mSC +kMk +keU anI aao aao @@ -81295,11 +81179,11 @@ aIK wko anI aMr -vgZ +kSB aMr -uPK +lKH ePk -wjW +xBY uUV anI aao diff --git a/maps/map_files/BigRed/sprinkles/10.prison_breakout.dmm b/maps/map_files/BigRed/sprinkles/10.prison_breakout.dmm index 907f40733d2e..eb43f5670406 100644 --- a/maps/map_files/BigRed/sprinkles/10.prison_breakout.dmm +++ b/maps/map_files/BigRed/sprinkles/10.prison_breakout.dmm @@ -649,13 +649,8 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/corpsespawner/security, /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/blood/gibs/body, -/obj/item/weapon/gun/pistol/holdout{ - pixel_x = 9; - pixel_y = 18 - }, /turf/open/floor, /area/bigredv2/outside/marshal_office) "if" = ( @@ -933,7 +928,6 @@ pixel_x = 4; pixel_y = 9 }, -/obj/item/ammo_casing/bullet, /turf/open/floor/redcorner/east, /area/bigredv2/outside/marshal_office) "wL" = ( @@ -974,7 +968,6 @@ "za" = ( /obj/effect/decal/cleanable/dirt, /obj/item/ammo_casing/shell, -/obj/effect/landmark/corpsespawner/prisoner, /obj/effect/decal/cleanable/blood/gibs/body, /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/blood/drip, @@ -1103,8 +1096,6 @@ "Ho" = ( /obj/structure/pipes/standard/manifold/hidden/green, /obj/effect/decal/cleanable/dirt, -/obj/item/ammo_casing/bullet, -/obj/item/ammo_casing/bullet, /turf/open/floor, /area/bigredv2/outside/marshal_office) "HO" = ( @@ -1134,7 +1125,6 @@ /area/bigredv2/outside/marshal_office) "IR" = ( /obj/structure/machinery/light, -/obj/effect/landmark/corpsespawner/prisoner, /obj/effect/decal/cleanable/blood/gibs/body, /obj/effect/decal/cleanable/blood, /obj/item/shard, @@ -1170,13 +1160,8 @@ /area/bigredv2/outside/marshal_office) "Ml" = ( /obj/item/ammo_casing/shell, -/obj/effect/landmark/corpsespawner/prisoner, /obj/effect/decal/cleanable/blood/gibs/body, /obj/effect/decal/cleanable/blood, -/obj/item/tool/kitchen/knife/butcher{ - pixel_x = 8; - pixel_y = 12 - }, /turf/open/floor/dark, /area/bigredv2/outside/marshal_office) "Mq" = ( diff --git a/maps/map_files/BigRed/sprinkles/15.reactor_meltdown.dmm b/maps/map_files/BigRed/sprinkles/15.reactor_meltdown.dmm index 897f76d0f656..c5dc410ba02e 100644 --- a/maps/map_files/BigRed/sprinkles/15.reactor_meltdown.dmm +++ b/maps/map_files/BigRed/sprinkles/15.reactor_meltdown.dmm @@ -576,14 +576,14 @@ /area/bigredv2/outside/lz2_south_cas) "cP" = ( /turf/open/floor/plating, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "cR" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "cS" = ( /turf/open/gm/river, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "cT" = ( /turf/open/mars/mars_dirt_13, /area/bigredv2/outside/lz2_south_cas) @@ -602,12 +602,12 @@ /area/bigredv2/outside/lz2_south_cas) "da" = ( /turf/closed/wall/mineral/uranium, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "db" = ( /obj/effect/decal/cleanable/dirt, /obj/item/tool/extinguisher, /turf/open/floor/plating, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "dc" = ( /turf/open/mars_cave/mars_dirt_7, /area/bigredv2/outside/lz2_south_cas) @@ -621,7 +621,7 @@ "df" = ( /obj/structure/machinery/power/port_gen/pacman, /turf/open/floor/plating, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "di" = ( /obj/structure/machinery/light{ dir = 8 @@ -632,7 +632,7 @@ "dj" = ( /obj/effect/decal/cleanable/dirt/greenglow, /turf/open/gm/river, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "dk" = ( /obj/structure/girder, /turf/open/floor/plating, @@ -648,19 +648,19 @@ dir = 1 }, /turf/open/floor/plating, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "dp" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/light_construct{ dir = 8 }, /turf/open/floor/plating, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "dq" = ( /obj/item/bananapeel, /obj/effect/decal/cleanable/dirt/greenglow, /turf/open/floor/plating, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "dr" = ( /obj/structure/machinery/door/poddoor/almayer{ id = "rad_door"; @@ -674,21 +674,21 @@ "dv" = ( /obj/structure/machinery/power/turbine, /turf/open/floor/plating, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "dx" = ( /obj/effect/decal/cleanable/dirt/greenglow, /turf/open/floor/plating/panelscorched, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "dy" = ( /obj/structure/machinery/power/reactor/colony{ name = "Reactor Turbine" }, /turf/open/floor/plating, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "dz" = ( /obj/structure/machinery/light_construct, /turf/open/floor/plating, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "dA" = ( /turf/open/mars_cave/mars_dirt_4, /area/bigredv2/outside/s) @@ -706,7 +706,7 @@ /obj/structure/machinery/power/port_gen/pacman, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "dJ" = ( /obj/effect/landmark/hunter_primary, /turf/open/mars_cave/mars_cave_2, @@ -717,7 +717,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "dO" = ( /turf/open/mars_cave/mars_cave_6, /area/bigredv2/outside/lz2_south_cas) @@ -726,17 +726,17 @@ /area/bigredv2/outside/lz2_south_cas) "dS" = ( /turf/open/mars_cave/mars_cave_7, -/area/bigredv2/outside/lz2_south_cas) +/area/bigredv2/caves_sw) "dT" = ( /turf/closed/wall/solaris/rock, /area/bigredv2/caves) "dU" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/mars_cave/mars_cave_10, -/area/bigredv2/outside/lz2_south_cas) +/area/bigredv2/caves_sw) "dV" = ( /turf/open/mars_cave/mars_cave_5, -/area/bigredv2/outside/lz2_south_cas) +/area/bigredv2/caves_sw) "dW" = ( /turf/open/mars_cave/mars_cave_23, /area/bigredv2/outside/lz2_south_cas) @@ -747,47 +747,47 @@ "dY" = ( /obj/effect/decal/cleanable/dirt/greenglow, /turf/open/floor/wall_thermite, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "dZ" = ( /obj/effect/decal/cleanable/dirt/greenglow, /turf/open/floor/plating, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "eb" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/greenglow, /turf/open/floor/plating/panelscorched, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "ec" = ( /obj/structure/catwalk/bigred, /turf/open/gm/river/desert/shallow/covered, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "ee" = ( /obj/effect/decal/cleanable/molten_item, /turf/open/floor/plating, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "ef" = ( /obj/structure/machinery/light_construct{ dir = 4 }, /turf/open/gm/river, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "eh" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/greenglow, /turf/open/floor/plating, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "ei" = ( /obj/structure/machinery/compressor{ dir = 1 }, /turf/open/floor/plating/panelscorched, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "ej" = ( /obj/structure/machinery/light_construct{ dir = 4 }, /turf/open/floor/plating/panelscorched, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "ek" = ( /obj/structure/machinery/camera/autoname{ dir = 4 @@ -796,42 +796,42 @@ dir = 8 }, /turf/open/floor/plating, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "el" = ( /obj/structure/machinery/light_construct{ dir = 8 }, /turf/open/gm/river, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "em" = ( /obj/structure/machinery/light_construct{ dir = 1 }, /turf/open/floor/plating, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "en" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/girder, /turf/open/floor/plating, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "eo" = ( /obj/effect/decal/cleanable/dirt/greenglow, /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/mars_cave/mars_cave_7, -/area/bigredv2/outside/lz2_south_cas) +/area/bigredv2/caves_sw) "ep" = ( /obj/item/tool/extinguisher, /turf/open/floor/plating, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "eq" = ( /obj/effect/decal/cleanable/molten_item, /turf/open/floor/plating/panelscorched, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "er" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/molten_item, /turf/open/floor/plating, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "et" = ( /obj/structure/bed/chair/office/light, /turf/open/floor/plating/panelscorched, @@ -839,7 +839,7 @@ "ev" = ( /obj/structure/machinery/light_construct, /turf/open/floor/plating/panelscorched, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "ew" = ( /turf/open/floor/plating/panelscorched, /area/bigredv2/outside/engineering) @@ -847,14 +847,14 @@ /obj/effect/decal/cleanable/molten_item, /obj/effect/decal/cleanable/dirt/greenglow, /turf/open/floor/wall_thermite, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "ey" = ( /obj/structure/machinery/light_construct{ dir = 4 }, /obj/effect/decal/cleanable/ash, /turf/open/floor/plating, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "ez" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/panelscorched, @@ -864,7 +864,7 @@ dir = 1 }, /turf/open/floor/plating/panelscorched, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "eB" = ( /obj/effect/decal/cleanable/dirt/greenglow, /obj/structure/blocker/forcefield/multitile_vehicles, @@ -893,11 +893,11 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/greenglow, /turf/open/floor/wall_thermite, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "eH" = ( /obj/effect/decal/cleanable/molten_item, /turf/open/floor/panelscorched, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "eI" = ( /obj/effect/decal/cleanable/ash, /turf/open/floor/darkyellow2/west, @@ -905,28 +905,28 @@ "eJ" = ( /obj/effect/decal/cleanable/molten_item, /turf/open/floor/wall_thermite, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "eK" = ( /obj/effect/decal/cleanable/molten_item, /obj/effect/decal/cleanable/dirt/greenglow, /turf/open/gm/river, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "eL" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/wall_thermite, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "eM" = ( /obj/effect/decal/cleanable/dirt/greenglow, /obj/effect/decal/cleanable/molten_item, /turf/open/gm/river, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "eN" = ( /obj/effect/decal/cleanable/dirt/greenglow, /turf/open/mars_cave/mars_cave_5, -/area/bigredv2/outside/lz2_south_cas) +/area/bigredv2/caves_sw) "eO" = ( /turf/closed/wall/mineral/uranium/leaking, -/area/bigredv2/outside/engineering) +/area/bigredv2/outside/engineering/reactor) "fI" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/dark, @@ -969,6 +969,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/darkyellow2/west, /area/bigredv2/outside/engineering) +"pK" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/panelscorched, +/area/bigredv2/outside/engineering/reactor) +"sy" = ( +/obj/structure/girder, +/turf/open/floor/plating, +/area/bigredv2/outside/engineering/reactor) "sU" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/mars_cave/mars_dirt_6, @@ -986,6 +994,10 @@ }, /turf/open/floor/plating/panelscorched, /area/bigredv2/outside/telecomm/engi) +"wu" = ( +/obj/structure/machinery/power/apc/power/west, +/turf/open/floor/plating, +/area/bigredv2/outside/engineering/reactor) "xl" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/darkyellowcorners2/west, @@ -1000,6 +1012,9 @@ }, /turf/open/floor/plating/panelscorched, /area/bigredv2/outside/telecomm/engi) +"Af" = ( +/turf/closed/wall/solaris/reinforced, +/area/bigredv2/outside/engineering/reactor) "Ah" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/mars, @@ -1022,14 +1037,24 @@ "Dq" = ( /turf/open/floor/darkyellow2/east, /area/bigredv2/outside/engineering) +"EG" = ( +/obj/structure/girder/reinforced, +/turf/open/floor/plating, +/area/bigredv2/outside/engineering/reactor) "ET" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/darkyellow2/west, /area/bigredv2/outside/engineering) +"FO" = ( +/turf/open/mars_cave/mars_cave_2, +/area/bigredv2/caves_sw) +"GC" = ( +/turf/open/floor/plating/panelscorched, +/area/bigredv2/outside/engineering/reactor) "IE" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/mars_cave/mars_cave_7, -/area/bigredv2/outside/lz2_south_cas) +/area/bigredv2/caves_sw) "KJ" = ( /obj/structure/window_frame/solaris/reinforced, /turf/open/floor/plating, @@ -1079,6 +1104,9 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/darkyellow2/east, /area/bigredv2/outside/engineering) +"YX" = ( +/turf/open/mars_cave/mars_cave_23, +/area/bigredv2/caves_sw) (1,1,1) = {" au @@ -1141,7 +1169,7 @@ dW dR dR dR -dR +FO dT "} (3,1,1) = {" @@ -1172,9 +1200,9 @@ dR dR dO dR -dR -dR -dR +FO +FO +FO "} (4,1,1) = {" au @@ -1204,9 +1232,9 @@ kN kN kN dn -dR -dR -dR +FO +FO +FO "} (5,1,1) = {" au @@ -1221,24 +1249,24 @@ aF aq aq aq -dX -dX -aq -aq -dk -aq -aq +EG +EG +Af +Af +sy +Af +Af ex eG -dk -dk -aq -aq +sy +sy +Af +Af dT dT dS -dW -dR +YX +FO "} (6,1,1) = {" au @@ -1256,7 +1284,7 @@ aq cP cR dp -cP +wu df do dv @@ -1265,12 +1293,12 @@ dZ dG dK dv -aq -aq +Af +Af dT dS dV -dR +FO "} (7,1,1) = {" au @@ -1286,23 +1314,23 @@ cn cB cn cP -ez -ez +pK +pK cR cR cP eh eh eh -ew -ew -ew -aq -aq +GC +GC +GC +Af +Af dT dT dS -dR +FO "} (8,1,1) = {" au @@ -1321,20 +1349,20 @@ db cR cR eH -ew +GC cR eh eh -ew -ez -ez +GC +pK +pK cP -aq -aq -aq +Af +Af +Af dT dS -dR +FO "} (9,1,1) = {" au @@ -1362,11 +1390,11 @@ cS cS cS cP -aq -aq +Af +Af dT dS -dR +FO "} (10,1,1) = {" bC @@ -1394,11 +1422,11 @@ cS da cS dz -aq -aq +Af +Af dT dS -dR +FO "} (11,1,1) = {" au @@ -1426,11 +1454,11 @@ dj dj dj cP -aq -aq +Af +Af dT dS -dR +FO "} (12,1,1) = {" au @@ -1459,10 +1487,10 @@ eO dj dZ dZ -aq +Af dT dS -dR +FO "} (13,1,1) = {" au @@ -1491,10 +1519,10 @@ dj dj eh dZ -aq +Af dU dV -dR +FO "} (14,1,1) = {" au @@ -1515,7 +1543,7 @@ da cS ec ev -aq +Af em ec cS @@ -1526,7 +1554,7 @@ eb dY eo eN -dR +FO "} (15,1,1) = {" au @@ -1546,19 +1574,19 @@ cS cS cS cP -ew +GC ek eq -ez +pK cS cS cS -ez +pK cR eL eo -dR -dR +FO +FO "} (16,1,1) = {" ak @@ -1577,20 +1605,20 @@ oE cS da cS -ew +GC ee dy -ez +pK er cS da cS -ew +GC ee en IE -dR -dR +FO +FO "} (17,1,1) = {" au @@ -1609,20 +1637,20 @@ oE cS cS cS -ew -ew +GC +GC ey -ez -ez +pK +pK cS cS cS cP cP -aq +Af IE -dR -dR +FO +FO "} (18,1,1) = {" au @@ -1643,7 +1671,7 @@ da cS ec dz -aq +Af eA ec cS @@ -1651,10 +1679,10 @@ da dj cP cR -dk +sy IE -dR -dR +FO +FO "} (19,1,1) = {" au @@ -1682,8 +1710,8 @@ dj dj dj dZ -ez -dX +pK +EG dT dT dT @@ -1713,9 +1741,9 @@ ec dj eO dj -ez -ez -aq +pK +pK +Af dT dT dT @@ -1746,8 +1774,8 @@ cS dj dj cP -aq -aq +Af +Af dT dT dT @@ -1809,9 +1837,9 @@ ec cS cS cS -ew -dX -aq +GC +EG +Af dT dT dT @@ -1835,15 +1863,15 @@ dZ dZ dZ dZ -ew -ez -ez -ew +GC +pK +pK +GC cP cP ee -dX -aq +EG +Af dT dT dT @@ -1869,12 +1897,12 @@ cR eh eb ep -ez +pK cP cP cP -dk -aq +sy +Af dT dT dT @@ -1900,12 +1928,12 @@ dZ df ei dv -ew +GC cP df do dv -aq +Af dT dT dT @@ -1926,18 +1954,18 @@ aq aq dX dY -aq -aq -dk +Af +Af +sy eJ eJ eJ -aq -dk -dX -dk -aq -aq +Af +sy +EG +sy +Af +Af dT dT dT diff --git a/maps/map_files/BigRed/sprinkles/40.admin_pmc.dmm b/maps/map_files/BigRed/sprinkles/40.admin_pmc.dmm index 8eefcb16466a..b86d7b383073 100644 --- a/maps/map_files/BigRed/sprinkles/40.admin_pmc.dmm +++ b/maps/map_files/BigRed/sprinkles/40.admin_pmc.dmm @@ -128,9 +128,7 @@ /turf/open/floor/darkred2/east, /area/bigredv2/outside/admin_building) "eg" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, +/obj/structure/platform_decoration/metal/almayer/west, /obj/effect/decal/cleanable/blood/xeno, /turf/open/floor/dark, /area/bigredv2/outside/admin_building) @@ -159,7 +157,7 @@ /turf/open/floor/carpet, /area/bigredv2/outside/admin_building) "he" = ( -/obj/structure/platform, +/obj/structure/platform/metal/almayer, /obj/structure/flora/jungle/planttop1{ pixel_y = 10 }, @@ -198,9 +196,7 @@ /turf/open/floor/darkredcorners2/west, /area/bigredv2/outside/admin_building) "jm" = ( -/obj/structure/platform{ - dir = 4 - }, +/obj/structure/platform/metal/almayer/east, /turf/open/floor/dark, /area/bigredv2/outside/admin_building) "jq" = ( @@ -249,7 +245,7 @@ /area/bigredv2/outside/admin_building) "mi" = ( /obj/effect/spawner/random/toolbox, -/obj/structure/platform_decoration, +/obj/structure/platform_decoration/metal/almayer, /turf/open/floor/dark, /area/bigredv2/outside/admin_building) "mr" = ( @@ -310,9 +306,7 @@ /area/bigredv2/outside/admin_building) "tz" = ( /obj/effect/landmark/survivor_spawner, -/obj/structure/platform_decoration{ - dir = 1 - }, +/obj/structure/platform_decoration/metal/almayer/north, /turf/open/floor/dark, /area/bigredv2/outside/admin_building) "uH" = ( @@ -328,9 +322,7 @@ /turf/open/floor/carpet, /area/bigredv2/outside/admin_building) "xe" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, +/obj/structure/platform_decoration/metal/almayer/east, /turf/open/floor/dark, /area/bigredv2/outside/admin_building) "xQ" = ( @@ -356,9 +348,7 @@ /turf/open/floor, /area/bigredv2/outside/admin_building) "AF" = ( -/obj/structure/platform{ - dir = 8 - }, +/obj/structure/platform/metal/almayer/west, /turf/open/floor/dark, /area/bigredv2/outside/admin_building) "Br" = ( @@ -394,9 +384,7 @@ /turf/open/floor/wood, /area/bigredv2/outside/admin_building) "ER" = ( -/obj/structure/platform{ - dir = 1 - }, +/obj/structure/platform/metal/almayer/north, /turf/open/floor/dark, /area/bigredv2/outside/admin_building) "Gc" = ( diff --git a/maps/map_files/BigRed/sprinkles/40.dorms_party.dmm b/maps/map_files/BigRed/sprinkles/40.dorms_party.dmm index 38b92227e1f1..23ad87162183 100644 --- a/maps/map_files/BigRed/sprinkles/40.dorms_party.dmm +++ b/maps/map_files/BigRed/sprinkles/40.dorms_party.dmm @@ -138,10 +138,6 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor, /area/bigredv2/outside/dorms) -"aD" = ( -/obj/effect/landmark/corpsespawner/colonist/random, -/turf/open/floor, -/area/bigredv2/outside/dorms) "aE" = ( /obj/structure/bed/chair{ dir = 4 @@ -383,7 +379,6 @@ /turf/open/floor, /area/bigredv2/outside/dorms) "iE" = ( -/obj/effect/landmark/corpsespawner/colonist/random, /obj/effect/decal/cleanable/blood, /obj/structure/machinery/camera/autoname, /turf/open/floor, @@ -446,7 +441,7 @@ ad ad ad ad -aD +ad ad bf "} @@ -544,7 +539,7 @@ aq ad an az -aD +ad aT aK bn diff --git a/maps/map_files/BigRed/standalone/crashlanding-eva.dmm b/maps/map_files/BigRed/standalone/crashlanding-eva.dmm index cce52624863f..b017629c733e 100644 --- a/maps/map_files/BigRed/standalone/crashlanding-eva.dmm +++ b/maps/map_files/BigRed/standalone/crashlanding-eva.dmm @@ -1,11 +1,91 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/obj/item/prop/colony/used_flare, +/turf/open/floor/plating/panelscorched, +/area/bigredv2/outside/ne) "ab" = ( /turf/closed/wall/solaris/rock, /area/bigredv2/caves) +"ac" = ( +/obj/item/prop/colony/used_flare, +/turf/open/floor/plating, +/area/bigredv2/outside/general_offices) +"ad" = ( +/obj/effect/decal/cleanable/blood/xeno{ + icon_state = "xgib3" + }, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/general_offices) +"ae" = ( +/obj/effect/decal/cleanable/blood/xeno, +/turf/open/floor/plating/panelscorched, +/area/bigredv2/outside/general_offices) +"af" = ( +/obj/effect/spawner/gibspawner/xeno, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/general_offices) +"ag" = ( +/obj/effect/decal/cleanable/blood/xeno, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/general_offices) +"ah" = ( +/obj/effect/decal/cleanable/blood/gibs/xeno, +/obj/effect/spawner/gibspawner/xeno, +/turf/open/floor/plating/panelscorched, +/area/bigredv2/outside/general_offices) +"ai" = ( +/obj/item/prop/colony/used_flare, +/turf/open/floor/plating/panelscorched, +/area/bigredv2/outside/general_offices) +"aj" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/xeno, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/general_offices) +"ak" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/ammo_magazine/rifle/heap{ + current_rounds = 0 + }, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/general_offices) +"al" = ( +/obj/structure/barricade/sandbags/wired, +/turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, +/area/bigredv2/outside/general_offices) +"am" = ( +/obj/item/stack/sandbags/small_stack, +/turf/open/floor/wall_thermite, +/area/bigredv2/outside/general_offices) "an" = ( /obj/effect/decal/cleanable/dirt, +/obj/item/stack/rods, /turf/open/mars, /area/bigredv2/caves_north) +"ao" = ( +/obj/item/ammo_magazine/rifle/nsg23/heap{ + current_rounds = 0 + }, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/general_offices) +"ap" = ( +/obj/structure/barricade/sandbags/wired, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/general_offices) +"aq" = ( +/obj/item/ammo_box/magazine/nsg23/heap/empty, +/turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, +/area/bigredv2/outside/general_offices) +"ar" = ( +/obj/effect/decal/cleanable/blood/gibs/xeno/down, +/obj/item/stack/sandbags/small_stack, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/general_offices) +"as" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/corpsespawner/wygoon, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/general_offices) "at" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor/plating, @@ -16,7 +96,15 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/mars, /area/bigredv2/caves_north) +"av" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/ammo_magazine/rifle/nsg23/heap{ + current_rounds = 0 + }, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/general_offices) "aw" = ( +/obj/structure/prop/invuln/fire, /turf/closed/shuttle/ert{ icon_state = "wy20" }, @@ -31,22 +119,43 @@ icon_state = "wy25" }, /area/bigredv2/caves_north) +"az" = ( +/obj/item/ammo_magazine/rifle/heap{ + current_rounds = 0 + }, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/general_offices) +"aA" = ( +/obj/structure/closet/crate/secure/weyland, +/obj/item/ammo_magazine/rifle/ap, +/obj/item/ammo_magazine/rifle/ap, +/obj/item/ammo_magazine/rifle/nsg23/ap, +/obj/item/ammo_magazine/rifle/nsg23/ap, +/obj/item/ammo_magazine/rifle/nsg23/ap, +/obj/item/ammo_magazine/rifle/ap, +/turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, +/area/bigredv2/outside/general_offices) "aB" = ( /turf/closed/wall/solaris, /area/bigredv2/outside/general_offices) +"aC" = ( +/obj/item/ammo_magazine/smg/m39, +/turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, +/area/bigredv2/outside/general_offices) "aD" = ( /turf/closed/shuttle/ert{ icon_state = "wy22" }, /area/bigredv2/outside/general_offices) -"aF" = ( -/turf/closed/shuttle/ert{ - icon_state = "wy23" +"aE" = ( +/obj/effect/decal/cleanable/blood/xeno{ + icon_state = "xgibleg" }, +/turf/open/floor/platingdmg1, /area/bigredv2/outside/general_offices) -"aG" = ( +"aF" = ( /turf/closed/shuttle/ert{ - icon_state = "wy21" + icon_state = "wy23" }, /area/bigredv2/outside/general_offices) "aH" = ( @@ -57,38 +166,131 @@ "aI" = ( /turf/closed/wall/solaris/reinforced, /area/bigredv2/outside/general_offices) +"aJ" = ( +/obj/item/ammo_box/rounds/heap/empty, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/general_offices) "aK" = ( /turf/open/floor, /area/bigredv2/outside/general_offices) -"aP" = ( -/turf/closed/shuttle/ert{ - icon_state = "wy18" +"aL" = ( +/obj/item/stack/sheet/cardboard/small_stack, +/turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_up_to_down, +/area/bigredv2/outside/general_offices) +"aM" = ( +/obj/item/ammo_magazine/rifle/heap{ + current_rounds = 0 }, +/turf/open/floor/wall_thermite, +/area/bigredv2/outside/general_offices) +"aN" = ( +/obj/structure/machinery/cm_vending/sorted/tech/comp_storage, +/turf/open/floor/freezerfloor, +/area/bigredv2/outside/general_offices) +"aO" = ( +/obj/item/prop/colony/used_flare, +/obj/structure/machinery/cm_vending/sorted/tech/tool_storage, +/turf/open/floor/platingdmg1, /area/bigredv2/outside/general_offices) "aQ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/mars, /area/bigredv2/caves_north) -"aR" = ( -/turf/open/shuttle/dropship/can_surgery/light_grey_top_left, -/area/bigredv2/outside/general_offices) "aS" = ( /turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_left_to_right, /area/bigredv2/outside/general_offices) "aT" = ( +/obj/item/ammo_magazine/smg/fp9000, /turf/open/shuttle/dropship/can_surgery/light_grey_top_right, /area/bigredv2/outside/general_offices) +"aU" = ( +/obj/item/storage/firstaid/adv/empty, +/obj/item/stack/medical/advanced/bruise_pack/upgraded{ + amount = 2 + }, +/turf/open/floor/plating/platingdmg3, +/area/bigredv2/outside/general_offices) "aV" = ( /turf/closed/shuttle/ert{ icon_state = "wy19" }, /area/bigredv2/outside/general_offices) +"aW" = ( +/obj/item/prop/colony/usedbandage{ + dir = 5 + }, +/obj/item/prop/colony/usedbandage{ + dir = 1 + }, +/turf/open/floor/wall_thermite, +/area/bigredv2/outside/general_offices) +"aX" = ( +/obj/structure/closet/crate/secure/weyland, +/obj/item/ammo_magazine/rifle/nsg23, +/obj/item/ammo_magazine/rifle/nsg23, +/obj/item/ammo_magazine/rifle/nsg23/extended, +/obj/item/ammo_magazine/rifle/nsg23/extended, +/obj/item/ammo_magazine/rifle, +/obj/item/ammo_magazine/rifle, +/obj/item/ammo_magazine/rifle, +/obj/item/ammo_magazine/rifle, +/obj/item/ammo_magazine/rifle, +/obj/item/ammo_magazine/rifle/nsg23, +/obj/item/ammo_magazine/rifle, +/obj/item/ammo_magazine/rifle, +/obj/item/ammo_magazine/rifle/nsg23, +/obj/item/ammo_magazine/rifle/nsg23, +/turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, +/area/bigredv2/outside/general_offices) +"aY" = ( +/obj/effect/decal/cleanable/blood{ + dir = 4; + icon_state = "gib6" + }, +/obj/effect/decal/cleanable/blood{ + dir = 1; + icon_state = "gib6" + }, +/obj/item/weapon/gun/pistol/vp78{ + current_mag = null + }, +/turf/open/floor/plating/panelscorched, +/area/bigredv2/outside/general_offices) "aZ" = ( /obj/structure/window_frame/solaris, /obj/item/shard, /turf/open/floor/plating, /area/bigredv2/outside/general_offices) +"ba" = ( +/obj/effect/decal/cleanable/blood, +/obj/item/clothing/head/helmet/marine/veteran/pmc, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/general_offices) +"bb" = ( +/obj/structure/barricade/wooden{ + desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it..."; + dir = 8; + health = 25000 + }, +/turf/open/floor/plating, +/area/bigredv2/outside/general_offices) +"bc" = ( +/obj/structure/bed/bedroll, +/obj/effect/landmark/corpsespawner/wygoon, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/general_offices) +"bd" = ( +/obj/item/ammo_magazine/smg/fp9000, +/turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, +/area/bigredv2/outside/general_offices) +"be" = ( +/obj/item/ammo_magazine/rifle/heap{ + current_rounds = 0 + }, +/turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_up_to_down, +/area/bigredv2/outside/general_offices) "bf" = ( /turf/open/floor/plating, /area/bigredv2/outside/general_offices) @@ -96,6 +298,17 @@ /obj/structure/machinery/door/airlock/almayer/generic, /turf/open/shuttle/dropship/can_surgery, /area/bigredv2/outside/general_offices) +"bh" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood{ + dir = 1; + icon_state = "gib6" + }, +/obj/item/ammo_magazine/pistol/vp78{ + current_rounds = 0 + }, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/general_offices) "bi" = ( /obj/item/paper/crumpled/bloody, /obj/effect/decal/cleanable/blood{ @@ -103,33 +316,102 @@ }, /turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_up_to_down, /area/bigredv2/outside/general_offices) +"bj" = ( +/obj/structure/machinery/washing_machine, +/turf/open/floor/plating, +/area/bigredv2/outside/general_offices) "bk" = ( /turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_up_to_down, /area/bigredv2/outside/general_offices) +"bl" = ( +/obj/item/prop/alien/hugger, +/turf/open/floor/plating/panelscorched, +/area/bigredv2/outside/general_offices) +"bm" = ( +/obj/item/ammo_magazine/smg/m39/heap{ + current_rounds = 0 + }, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/general_offices) +"bn" = ( +/obj/item/stack/rods, +/obj/item/stack/cable_coil/blue, +/turf/open/floor/plating, +/area/bigredv2/outside/general_offices) +"bo" = ( +/obj/item/xeno_restraints, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/general_offices) "bp" = ( /obj/structure/surface/table, /obj/structure/bedsheetbin, /turf/open/floor/plating, /area/bigredv2/outside/general_offices) +"bq" = ( +/obj/structure/surface/rack, +/obj/item/ammo_box/rounds{ + bullet_amount = 145 + }, +/turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, +/area/bigredv2/outside/general_offices) "br" = ( /turf/closed/shuttle/ert{ icon_state = "wy16" }, /area/bigredv2/outside/general_offices) +"bs" = ( +/obj/effect/spawner/gibspawner/xeno, +/turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_up_to_down, +/area/bigredv2/outside/general_offices) "bt" = ( /obj/effect/decal/cleanable/blood, /obj/effect/landmark/corpsespawner/wygoon, /turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_up_to_down, /area/bigredv2/outside/general_offices) +"bu" = ( +/obj/item/prop/colony/used_flare, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/general_offices) +"bv" = ( +/obj/effect/spawner/gibspawner/human, +/obj/effect/decal/cleanable/blood{ + layer = 3 + }, +/obj/item/weapon/gun/smg/m39/corporate/no_lock{ + current_mag = null + }, +/obj/item/clothing/head/helmet/marine/veteran/pmc/corporate, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/general_offices) "bw" = ( /turf/closed/shuttle/ert{ icon_state = "wy17" }, /area/bigredv2/outside/general_offices) +"bx" = ( +/obj/structure/girder/displaced, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/general_offices) +"by" = ( +/obj/item/frame/rack, +/obj/item/storage/box/m94, +/obj/item/storage/box/m94, +/turf/open/floor/plating, +/area/bigredv2/outside/general_offices) +"bz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/sandbags_empty/small_stack, +/turf/open/mars, +/area/bigredv2/caves_north) "bA" = ( /obj/structure/surface/table, /turf/open/floor, /area/bigredv2/outside/general_offices) +"bB" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/tool/shovel, +/turf/open/mars, +/area/bigredv2/caves_north) "bE" = ( /turf/closed/shuttle/ert{ icon_state = "wy14" @@ -148,7 +430,9 @@ }, /area/bigredv2/outside/general_offices) "bJ" = ( -/obj/structure/bed/chair/dropship/passenger, +/obj/item/ammo_magazine/rifle/heap{ + current_rounds = 0 + }, /turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, /area/bigredv2/outside/general_offices) "bM" = ( @@ -170,6 +454,13 @@ /turf/open/shuttle/dropship/can_surgery/light_grey_bottom_left, /area/bigredv2/outside/general_offices) "cd" = ( +/obj/structure/closet/crate/secure/weyland, +/obj/item/weapon/gun/rifle/nsg23/no_lock, +/obj/item/explosive/grenade/high_explosive/pmc, +/obj/item/explosive/grenade/high_explosive/pmc, +/obj/item/weapon/gun/rifle/m41a/corporate/no_lock, +/obj/item/device/motiondetector/hacked/pmc, +/obj/item/defenses/handheld/planted_flag/wy, /turf/open/shuttle/dropship/can_surgery/light_grey_bottom_right, /area/bigredv2/outside/general_offices) "cf" = ( @@ -223,11 +514,13 @@ /area/bigredv2/outside/general_offices) "cA" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Dormitories Tool Storage" + name = "\improper Dormitories Tool Storage"; + welded = 1 }, /turf/open/floor, /area/bigredv2/outside/general_offices) "cC" = ( +/obj/structure/prop/invuln/fire, /turf/closed/shuttle/ert{ icon_state = "leftengine_2"; opacity = 0 @@ -300,6 +593,7 @@ /area/bigredv2/outside/general_offices) "cV" = ( /obj/item/stack/sheet/metal, +/obj/structure/girder/displaced, /turf/open/floor/plating, /area/bigredv2/caves_north) "di" = ( @@ -330,7 +624,8 @@ /area/template_noop) "eL" = ( /obj/structure/machinery/door/airlock/almayer/generic{ - dir = 2 + dir = 2; + welded = 1 }, /turf/open/shuttle/dropship/can_surgery, /area/bigredv2/outside/general_offices) @@ -357,10 +652,6 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/platingdmg1, /area/bigredv2/outside/general_offices) -"gp" = ( -/obj/structure/machinery/washing_machine, -/turf/open/floor/freezerfloor, -/area/bigredv2/outside/general_offices) "gP" = ( /turf/open/floor/plating/platingdmg3/west, /area/bigredv2/outside/general_offices) @@ -376,7 +667,10 @@ /area/bigredv2/outside/general_offices) "id" = ( /obj/structure/surface/rack, -/obj/item/xeno_restraints, +/obj/item/storage/belt/marine, +/obj/item/storage/belt/marine, +/obj/item/storage/belt/marine, +/obj/item/storage/belt/marine, /turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, /area/bigredv2/outside/general_offices) "ig" = ( @@ -553,15 +847,12 @@ "tQ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/oil, +/obj/structure/barricade/sandbags/wired, /turf/open/floor/platingdmg1, /area/bigredv2/outside/general_offices) "uj" = ( /turf/open/floor/dark, /area/bigredv2/outside/general_offices) -"uw" = ( -/obj/structure/machinery/cm_vending/sorted/tech/comp_storage, -/turf/open/floor/platingdmg1, -/area/bigredv2/outside/general_offices) "vi" = ( /turf/open/floor/plating/wood_broken5, /area/bigredv2/outside/general_offices) @@ -594,6 +885,9 @@ /area/bigredv2/outside/hydroponics) "xW" = ( /obj/item/stack/rods, +/obj/item/ammo_magazine/rifle/nsg23/heap{ + current_rounds = 0 + }, /turf/open/floor/plating/platingdmg3, /area/bigredv2/outside/general_offices) "yy" = ( @@ -617,6 +911,7 @@ /area/bigredv2/outside/general_offices) "AX" = ( /obj/structure/surface/rack, +/obj/item/ammo_magazine/smg/m39, /turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, /area/bigredv2/outside/general_offices) "Bb" = ( @@ -664,6 +959,10 @@ /area/bigredv2/outside/ne) "Dg" = ( /obj/item/stack/rods, +/obj/effect/decal/cleanable/blood{ + dir = 1; + icon_state = "gib6" + }, /turf/open/floor/plating/panelscorched, /area/bigredv2/outside/general_offices) "Dh" = ( @@ -676,13 +975,8 @@ /obj/structure/machinery/cm_vending/sorted/tech/electronics_storage, /turf/open/floor/platingdmg1, /area/bigredv2/outside/general_offices) -"EO" = ( -/turf/closed/shuttle/ert{ - icon_state = "wy20" - }, -/area/bigredv2/outside/general_offices) "Fw" = ( -/obj/effect/landmark/corpsespawner/wygoon, +/obj/effect/decal/cleanable/blood/xeno, /turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, /area/bigredv2/outside/general_offices) "FF" = ( @@ -724,8 +1018,7 @@ /turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, /area/bigredv2/outside/general_offices) "Hw" = ( -/obj/structure/bed/chair/dropship/passenger, -/obj/effect/landmark/corpsespawner/wygoon, +/obj/item/reagent_container/food/drinks/flask/weylandyutani, /turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, /area/bigredv2/outside/general_offices) "HG" = ( @@ -740,6 +1033,9 @@ /area/bigredv2/outside/general_offices) "HS" = ( /obj/structure/surface/table, +/obj/item/ammo_magazine/rifle/nsg23/heap{ + current_rounds = 0 + }, /turf/open/floor/platingdmg1, /area/bigredv2/outside/general_offices) "Id" = ( @@ -816,10 +1112,6 @@ /obj/item/stack/sheet/mineral/diamond, /turf/open/floor/dark, /area/bigredv2/outside/general_offices) -"PE" = ( -/obj/structure/machinery/cm_vending/sorted/tech/tool_storage, -/turf/open/floor/platingdmg1, -/area/bigredv2/outside/general_offices) "PI" = ( /turf/open/floor/freezerfloor, /area/bigredv2/outside/general_offices) @@ -1174,13 +1466,13 @@ dR CA GM aB -Dk +Yg PO Yg aB PO bf -bf +ac aB iq FF @@ -1199,13 +1491,13 @@ eF eF eF aB -gp +PI fY Jv -PI +aN bf nD -uw +Yg BC Yg wM @@ -1231,17 +1523,17 @@ eF eF aB oD -bf +bj bp -Yg -Yg +aO +Dk wM -PE -Yg Yg +qb +ao cA Yg -Yg +ag PN rv vi @@ -1261,15 +1553,15 @@ eF eF eF aB -Yg -OI -bf -PN +bm +bl +bb +aU Yg pt -Yg -PO -PO +ao +as +TX aK ge qb @@ -1292,19 +1584,19 @@ eF eF eF aB -Yg -Yg +bv +bm PN HG Yg -Yg -Yg -PO -Yg +az +aJ +av +ap pt OI dX -Yg +ad aB aB aB @@ -1323,18 +1615,18 @@ eF ab ab aB -aB -aB -aB -pt +bx +ag +bc +aW dX pt dX -Yg +az tQ oW -PO -OI +aj +ah PO rv vU @@ -1353,9 +1645,9 @@ eF eF aQ cV -EO -aP -bg +dX +bf +bn br bE bM @@ -1384,9 +1676,9 @@ eF eF aQ cI -aG -AX -Ul +bx +by +bo Hq Hq Hq @@ -1416,16 +1708,16 @@ eF at aw aD -aR +dX bi bt bF bF bF cc -Ul -Ul -Ul +aA +aq +al eL gP Gn @@ -1448,9 +1740,9 @@ aQ ax Bv cm -bJ -bJ -bJ +bq +bd +aX Hw bJ aS @@ -1462,7 +1754,7 @@ OI Yg Yg YQ -YQ +aa Od dQ ta @@ -1479,15 +1771,15 @@ au ay aF aT +bs +be bk bk -bk -bk -bk +aL cd -Ul +aC qo -Ul +al eL Ml Ro @@ -1508,7 +1800,7 @@ eF eF aQ an -aG +bx pn Fw ig @@ -1538,7 +1830,7 @@ eF eF eF Bb -an +bz aH aV bg @@ -1569,21 +1861,21 @@ eF eF eF XK -an +bB Dg -OI -PO -PO -OI -Yg -pt -Yg -Yg +Ml +Ro +bh +aY Yg -pt +aM +qb +ad +ao +am PO fB -OI +ae OI eF eF @@ -1605,16 +1897,16 @@ aB PN PO xW -Yg +ba fB dX kL -Yg -Yg +aE +ar JW -PO -OI -Yg +ak +ai +af wM eF eF @@ -1634,7 +1926,7 @@ Hj ab aB Pg -Yg +bu Yg fm HS diff --git a/maps/map_files/BigRed/standalone/crashlanding-offices.dmm b/maps/map_files/BigRed/standalone/crashlanding-offices.dmm index 6fd3ae9aad83..a2d21911a893 100644 --- a/maps/map_files/BigRed/standalone/crashlanding-offices.dmm +++ b/maps/map_files/BigRed/standalone/crashlanding-offices.dmm @@ -1,10 +1,89 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/obj/item/stack/rods, +/obj/effect/decal/cleanable/liquid_fuel, +/turf/open/floor/plating/platingdmg3, +/area/bigredv2/outside/office_complex) +"ab" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/liquid_fuel, +/turf/open/floor/wall_thermite, +/area/bigredv2/outside/office_complex) +"ac" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/liquid_fuel, +/turf/open/floor/asteroidfloor/north, +/area/bigredv2/outside/se) +"ad" = ( +/obj/effect/decal/cleanable/liquid_fuel, +/turf/open/floor/plating/panelscorched, +/area/bigredv2/outside/office_complex) +"ae" = ( +/obj/effect/spawner/gibspawner/xeno, +/turf/open/floor/wall_thermite, +/area/bigredv2/outside/office_complex) +"af" = ( +/obj/item/frame/table, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/office_complex) +"ag" = ( +/obj/effect/decal/cleanable/liquid_fuel, +/obj/effect/decal/cleanable/blood/xeno, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/office_complex) +"ah" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/liquid_fuel, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/office_complex) "ai" = ( /turf/open/mars, /area/bigredv2/outside/e) +"aj" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/prop/colony/used_flare, +/turf/open/floor/plating/platingdmg3, +/area/bigredv2/outside/office_complex) +"ak" = ( +/obj/structure/prop/invuln/fire, +/turf/closed/shuttle/ert{ + icon_state = "wy5" + }, +/area/bigredv2/outside/office_complex) +"al" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/xeno, +/turf/open/floor/plating/platingdmg3, +/area/bigredv2/outside/office_complex) +"am" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/ammo_magazine/rifle/nsg23{ + current_rounds = 0 + }, +/turf/open/floor/whiteyellowfull/east, +/area/bigredv2/outside/office_complex) +"an" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/tool/weldingtool/simple, +/turf/open/floor/whiteyellowfull/east, +/area/bigredv2/outside/office_complex) +"ao" = ( +/obj/item/stack/cable_coil, +/turf/open/floor/plating, +/area/bigredv2/outside/office_complex) "ap" = ( /turf/closed/wall/solaris, /area/bigredv2/outside/office_complex) +"aq" = ( +/obj/structure/girder/displaced, +/turf/open/floor/plating/platingdmg3, +/area/bigredv2/outside/office_complex) +"ar" = ( +/obj/structure/prop/invuln/fire, +/turf/closed/shuttle/ert{ + icon_state = "wy16" + }, +/area/bigredv2/outside/office_complex) "as" = ( /obj/structure/window/framed/solaris, /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -13,16 +92,67 @@ }, /turf/open/floor/plating, /area/bigredv2/outside/office_complex) +"at" = ( +/obj/structure/girder/reinforced, +/turf/open/floor/plating/panelscorched, +/area/bigredv2/outside/office_complex) +"au" = ( +/obj/structure/bed/chair/dropship/passenger{ + dir = 8 + }, +/obj/effect/landmark/survivor_spawner/bigred_crashed_pmc_engineer, +/turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, +/area/bigredv2/outside/office_complex) +"av" = ( +/obj/effect/decal/cleanable/blood, +/obj/item/stack/sheet/metal, +/turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, +/area/bigredv2/outside/office_complex) +"aw" = ( +/obj/structure/bed/chair/dropship/passenger{ + dir = 4 + }, +/turf/open/floor/plating/panelscorched, +/area/bigredv2/outside/office_complex) "ax" = ( /obj/structure/window_frame/solaris, /obj/item/shard, /turf/open/floor/plating, /area/bigredv2/outside/office_complex) -"aC" = ( +"ay" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/rods, +/obj/structure/girder/displaced, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/office_complex) +"az" = ( +/obj/effect/decal/cleanable/blood{ + dir = 4; + icon_state = "gib6" + }, +/obj/effect/decal/cleanable/blood{ + dir = 1; + icon_state = "gib6" + }, +/turf/open/floor/plating/platingdmg3, +/area/bigredv2/outside/office_complex) +"aA" = ( +/obj/effect/spawner/gibspawner/human, +/turf/open/floor/plating/platingdmg3, +/area/bigredv2/outside/office_complex) +"aB" = ( +/obj/structure/prop/invuln/fire, /turf/closed/shuttle/ert{ - icon_state = "wy20" + icon_state = "wy17" }, /area/bigredv2/outside/office_complex) +"aC" = ( +/obj/effect/decal/cleanable/blood{ + dir = 1; + icon_state = "gib6" + }, +/turf/open/floor/plating/platingdmg3, +/area/bigredv2/outside/office_complex) "aD" = ( /turf/closed/shuttle/ert{ icon_state = "wy27" @@ -33,25 +163,74 @@ icon_state = "wy25" }, /area/bigredv2/outside/office_complex) +"aF" = ( +/obj/effect/spawner/gibspawner/xeno, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/office_complex) +"aG" = ( +/obj/effect/landmark/crap_item, +/obj/item/frame/rack, +/turf/open/floor/plating/panelscorched, +/area/bigredv2/outside/office_complex) +"aH" = ( +/obj/item/frame/rack, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/office_complex) +"aI" = ( +/obj/effect/landmark/crap_item, +/turf/open/floor/plating/platingdmg3, +/area/bigredv2/outside/office_complex) +"aJ" = ( +/obj/effect/decal/cleanable/blood{ + dir = 1; + icon_state = "gib6" + }, +/obj/effect/landmark/corpsespawner/wygoon, +/obj/item/weapon/gun/pistol/m4a3/training{ + name = "dented M4A3 service pistol" + }, +/obj/item/limb/leg/r_leg, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/asteroidfloor/north, +/area/bigredv2/outside/c) +"aK" = ( +/obj/structure/prop/invuln/fire, +/turf/closed/shuttle/ert{ + icon_state = "wy20" + }, +/area/bigredv2/outside/office_complex) "aL" = ( /obj/effect/decal/mecha_wreckage/ripley/firefighter, /turf/open/floor/mech_bay_recharge_floor, /area/bigredv2/outside/office_complex) +"aM" = ( +/obj/structure/girder/displaced, +/obj/item/stack/rods, +/turf/open/floor/plating, +/area/bigredv2/outside/office_complex) "aN" = ( -/turf/closed/shuttle/ert{ - icon_state = "wy21" - }, +/obj/structure/girder/displaced, +/obj/item/stack/cable_coil, +/turf/open/floor/plating/platingdmg3, /area/bigredv2/outside/office_complex) "aO" = ( -/turf/closed/shuttle/ert{ - icon_state = "wy22" - }, +/obj/item/stack/rods, +/obj/structure/girder/displaced, +/turf/open/floor/plating/platingdmg3, +/area/bigredv2/outside/office_complex) +"aP" = ( +/obj/structure/girder/reinforced, +/turf/open/floor/plating/platingdmg3, /area/bigredv2/outside/office_complex) "aQ" = ( /turf/closed/shuttle/ert{ icon_state = "wy23" }, /area/bigredv2/outside/office_complex) +"aR" = ( +/obj/item/stack/rods, +/turf/open/floor/plating/panelscorched, +/area/bigredv2/outside/office_complex) "aT" = ( /turf/closed/shuttle/ert{ icon_state = "wy18" @@ -61,7 +240,8 @@ /obj/structure/bed/chair/dropship/pilot{ dir = 1 }, -/turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_up_to_down, +/obj/effect/spawner/gibspawner/human, +/turf/open/floor/platingdmg1, /area/bigredv2/outside/office_complex) "aX" = ( /turf/closed/shuttle/ert{ @@ -98,18 +278,9 @@ icon_state = "wy16" }, /area/bigredv2/outside/office_complex) -"bl" = ( -/turf/open/shuttle/dropship/can_surgery/light_grey_top_left, -/area/bigredv2/outside/office_complex) "bm" = ( /turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_left_to_right, /area/bigredv2/outside/office_complex) -"bn" = ( -/turf/open/shuttle/dropship/can_surgery/light_grey_middle, -/area/bigredv2/outside/office_complex) -"bo" = ( -/turf/open/shuttle/dropship/can_surgery/light_grey_top_right, -/area/bigredv2/outside/office_complex) "bq" = ( /turf/closed/shuttle/ert{ icon_state = "wy17" @@ -202,6 +373,7 @@ }, /area/bigredv2/outside/office_complex) "cL" = ( +/obj/structure/prop/invuln/fire, /turf/closed/shuttle/ert{ icon_state = "leftengine_3"; opacity = 0 @@ -234,6 +406,7 @@ }, /area/bigredv2/outside/office_complex) "cU" = ( +/obj/structure/prop/invuln/fire, /turf/closed/shuttle/ert{ icon_state = "rightengine_2"; opacity = 0 @@ -561,15 +734,12 @@ }, /turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_up_to_down, /area/bigredv2/outside/office_complex) -"uL" = ( -/obj/item/weapon/gun/rifle/nsg23/no_lock, -/turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_up_to_down, -/area/bigredv2/outside/office_complex) "va" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/asphalt/cement_sunbleached/cement_sunbleached12, /area/bigredv2/outside/c) "ve" = ( +/obj/item/map/big_red_map, /turf/open/shuttle/dropship/can_surgery/light_grey_top, /area/bigredv2/outside/office_complex) "vl" = ( @@ -589,6 +759,7 @@ dir = 8 }, /obj/item/limb/hand/l_hand, +/obj/effect/landmark/survivor_spawner/bigred_crashed_pmc_leader, /turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, /area/bigredv2/outside/office_complex) "wn" = ( @@ -624,7 +795,7 @@ /area/bigredv2/outside/c) "xx" = ( /obj/structure/surface/rack, -/obj/item/map/big_red_map, +/obj/item/ammo_magazine/shotgun/buckshot, /turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, /area/bigredv2/outside/office_complex) "xU" = ( @@ -657,7 +828,8 @@ /area/bigredv2/outside/office_complex) "zq" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Office Complex Janitor Room" + name = "\improper Office Complex Janitor Room"; + welded = 1 }, /turf/open/floor/whiteyellowfull/east, /area/bigredv2/outside/office_complex) @@ -859,6 +1031,7 @@ "HE" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/liquid_fuel, /turf/open/floor/plating/platingdmg3, /area/bigredv2/outside/office_complex) "HG" = ( @@ -933,18 +1106,6 @@ /obj/structure/surface/rack, /turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, /area/bigredv2/outside/office_complex) -"Mb" = ( -/obj/structure/bed/chair/dropship/passenger{ - dir = 4 - }, -/obj/effect/decal/cleanable/blood, -/obj/item/limb/leg/r_leg, -/obj/item/weapon/gun/pistol/m4a3/training{ - name = "dented M4A3 service pistol" - }, -/obj/effect/landmark/corpsespawner/wygoon, -/turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, -/area/bigredv2/outside/office_complex) "Ml" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/tech_supply, @@ -984,9 +1145,6 @@ /turf/open/floor/dark, /area/bigredv2/outside/office_complex) "NZ" = ( -/obj/structure/bed/chair/dropship/passenger{ - dir = 8 - }, /obj/effect/decal/cleanable/blood, /obj/effect/spawner/gibspawner/human, /obj/item/clothing/head/helmet/marine/veteran/pmc, @@ -1018,9 +1176,8 @@ /turf/open/floor/platingdmg1, /area/bigredv2/outside/office_complex) "OX" = ( -/obj/structure/surface/rack, /obj/effect/spawner/random/tech_supply, -/turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, +/turf/open/floor/platingdmg1, /area/bigredv2/outside/office_complex) "Pp" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -1054,6 +1211,8 @@ /turf/open/floor/platingdmg1, /area/bigredv2/outside/office_complex) "Rd" = ( +/obj/effect/decal/cleanable/liquid_fuel, +/obj/effect/decal/cleanable/blood/xeno, /turf/open/floor/wall_thermite, /area/bigredv2/outside/office_complex) "Sf" = ( @@ -1067,9 +1226,8 @@ /turf/open/floor/platingdmg1, /area/bigredv2/outside/office_complex) "Sy" = ( -/obj/structure/surface/rack, /obj/item/xeno_restraints, -/turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, +/turf/open/floor/plating/panelscorched, /area/bigredv2/outside/office_complex) "SD" = ( /obj/effect/decal/cleanable/dirt, @@ -1121,7 +1279,7 @@ /area/bigredv2/outside/office_complex) "Vg" = ( /obj/effect/landmark/objective_landmark/medium, -/turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_left_to_right, +/turf/open/floor/plating/platingdmg3, /area/bigredv2/outside/office_complex) "Vi" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -1137,6 +1295,7 @@ "VG" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/decal/cleanable/liquid_fuel, /turf/open/floor/plating/platingdmg3, /area/bigredv2/outside/office_complex) "Wb" = ( @@ -1177,11 +1336,15 @@ /turf/open/floor/white, /area/bigredv2/outside/office_complex) "WV" = ( -/obj/structure/bed/chair/dropship/passenger{ - dir = 4 +/obj/effect/decal/cleanable/blood{ + dir = 1; + icon_state = "gib6" }, -/obj/effect/landmark/survivor_spawner/bigred_crashed_pmc_engineer, -/turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, +/obj/effect/decal/cleanable/blood{ + dir = 4; + icon_state = "gib6" + }, +/turf/open/floor/plating/platingdmg3, /area/bigredv2/outside/office_complex) "WZ" = ( /obj/item/stack/rods, @@ -1461,10 +1624,10 @@ Hq xr FV ap -ap -ap -AF -QD +aq +WA +aF +ay LN oE tG @@ -1488,17 +1651,17 @@ Hq Vy FV SK -SK -ap +aJ aC -bj -bz -bF -bJ -bj +aC +az bz bF bJ +ar +aq +Tb +ao bj bz bF @@ -1506,8 +1669,8 @@ cD cL cT dc -Eq -Tb +ad +aa Eq "} (11,1,1) = {" @@ -1519,13 +1682,13 @@ SK WB aN WV -Mb +Tb hl Al KK Nc OX -Al +Tb ws hl hl @@ -1534,7 +1697,7 @@ cM cM cM dg -tG +ab tG "} (12,1,1) = {" @@ -1542,17 +1705,17 @@ XS ap ap ap -aC +aK aT aO -bl +Tb dz bc bc dB bc bc -bc +UB bc Bu dF @@ -1568,14 +1731,14 @@ Is XS ap qk -Eq -aN +aR +aM Sy -KK -bm -wO +aG +UB +av ql -oc +au oc oc oc @@ -1595,12 +1758,12 @@ Wt va Xm yI -aC -aO -Al -Al +aq +Eq +aH +Eq Vg -hl +aw qw ws hl @@ -1625,8 +1788,8 @@ zl aD Ko aW -uL -bn +UB +UB NZ jx dE @@ -1651,8 +1814,8 @@ ba Hr aE aQ -Al -Al +Tb +UB vw wm wO @@ -1677,12 +1840,12 @@ ka ap MJ Tb -aN -KK +aP +aI Qr bm hl -hl +ws hl zH ZR @@ -1707,7 +1870,7 @@ ap aE aX aQ -bo +AF bc bc uC @@ -1733,8 +1896,8 @@ of of of Ym -aN -ql +WA +aA Fi oc Al @@ -1746,11 +1909,11 @@ ql wO oc cF -cN +ak cN cN di -Tk +ac jl "} (20,1,1) = {" @@ -1760,12 +1923,12 @@ ka Au Au qY -aE -bq +aO +aB bA bG bJ -bq +at bA bG bJ @@ -1777,7 +1940,7 @@ cO cU dd Rd -Tk +ac Na "} (21,1,1) = {" @@ -1801,10 +1964,10 @@ uw AF Cy JH -Cy -UB -Rd -Tk +ah +af +ae +ac Na "} (22,1,1) = {" @@ -1827,9 +1990,9 @@ Cy ap zv UB -Kp +al QD -UB +ag WB Tk Na @@ -1855,7 +2018,7 @@ ap vH UB Fp -Kp +aj Cy dk Tk @@ -1879,7 +2042,7 @@ ap Yd ie zq -pu +an Cy Cz Pv @@ -1908,7 +2071,7 @@ UB Db UB zh -pu +am OH hU ap diff --git a/maps/map_files/BigRed/standalone/medbay-v3.dmm b/maps/map_files/BigRed/standalone/medbay-v3.dmm index 924485050ce9..522c65f07b89 100644 --- a/maps/map_files/BigRed/standalone/medbay-v3.dmm +++ b/maps/map_files/BigRed/standalone/medbay-v3.dmm @@ -758,7 +758,6 @@ }, /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/corpsespawner/wygoon, /turf/open/floor/platingdmg1, /area/bigredv2/outside/medical) "CP" = ( @@ -1387,7 +1386,6 @@ "WH" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/wygoon, /turf/open/floor/plating/platingdmg3, /area/bigredv2/outside/medical) "WQ" = ( diff --git a/maps/map_files/CORSAT/Corsat.dmm b/maps/map_files/CORSAT/Corsat.dmm index 59f0a59d6ca5..d5531341ec7c 100644 --- a/maps/map_files/CORSAT/Corsat.dmm +++ b/maps/map_files/CORSAT/Corsat.dmm @@ -1508,7 +1508,7 @@ /area/corsat/gamma/sigmaremote/teleporter) "agd" = ( /obj/structure/window/reinforced, -/obj/structure/platform, +/obj/structure/platform/metal/almayer, /turf/open/floor/corsat/plate, /area/corsat/sigma/north) "age" = ( @@ -2860,14 +2860,6 @@ /obj/item/device/flashlight/lamp/green, /turf/open/floor/wood, /area/corsat/gamma/residential/east) -"als" = ( -/obj/structure/stairs, -/obj/structure/platform{ - dir = 4; - layer = 2 - }, -/turf/open/floor/corsat/tan/north, -/area/corsat/gamma/residential/west) "alt" = ( /turf/open/floor/corsat/redcorner, /area/corsat/gamma/residential) @@ -2941,9 +2933,7 @@ /turf/open/floor/corsat/brown/northwest, /area/corsat/gamma/cargo) "alG" = ( -/obj/structure/platform{ - dir = 8 - }, +/obj/structure/platform/metal/almayer/west, /obj/structure/flora/pottedplant{ icon_state = "pottedplant_21" }, @@ -2963,10 +2953,7 @@ /turf/open/floor/plating, /area/corsat/gamma/rnr/bar) "alL" = ( -/obj/structure/platform{ - dir = 4; - layer = 2.7 - }, +/obj/structure/platform/metal/almayer/east, /obj/structure/flora/pottedplant{ icon_state = "pottedplant_21" }, @@ -3068,9 +3055,7 @@ /turf/open/floor/corsat/yellow/east, /area/corsat/gamma/residential/maint) "amd" = ( -/obj/structure/platform{ - dir = 8 - }, +/obj/structure/platform/metal/almayer/west, /turf/open/floor/corsat/white/west, /area/corsat/sigma/dorms) "ame" = ( @@ -3082,10 +3067,7 @@ /turf/open/floor/wood, /area/corsat/gamma/residential/east) "amf" = ( -/obj/structure/platform{ - dir = 4; - layer = 2.7 - }, +/obj/structure/platform/metal/almayer/east, /turf/open/floor/corsat/white/east, /area/corsat/sigma/dorms) "amg" = ( @@ -3359,10 +3341,7 @@ /turf/open/floor/corsat/spiralplate, /area/corsat/sigma/airlock/south) "and" = ( -/obj/structure/platform{ - dir = 1; - layer = 2.7 - }, +/obj/structure/platform/metal/almayer/north, /obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/corsat/white/north, /area/corsat/sigma/dorms) @@ -3378,10 +3357,7 @@ /turf/closed/wall/biodome, /area/corsat/gamma/cargo/disposal) "anh" = ( -/obj/structure/platform{ - dir = 1; - layer = 2.7 - }, +/obj/structure/platform/metal/almayer/north, /turf/open/floor/corsat/white/north, /area/corsat/sigma/dorms) "ani" = ( @@ -3403,18 +3379,14 @@ /turf/open/floor/wood, /area/corsat/gamma/residential/researcher) "anl" = ( -/obj/structure/platform{ - density = 0; - dir = 4; - icon_state = "platform_deco" +/obj/structure/platform_decoration/metal/almayer/east{ + density = 0 }, /turf/open/floor/corsat/whitecorner/north, /area/corsat/sigma/dorms) "anm" = ( -/obj/structure/platform{ - density = 0; - dir = 8; - icon_state = "platform_deco" +/obj/structure/platform_decoration/metal/almayer/west{ + density = 0 }, /turf/open/floor/corsat/whitecorner/east, /area/corsat/sigma/dorms) @@ -3422,10 +3394,7 @@ /turf/closed/wall/biodome, /area/corsat/gamma/cargo/lobby) "ano" = ( -/obj/structure/platform{ - dir = 1; - layer = 2.7 - }, +/obj/structure/platform/metal/almayer/north, /obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/corsat/white/northeast, /area/corsat/sigma/dorms) @@ -3625,9 +3594,7 @@ /turf/closed/wall/biodome, /area/corsat/omega/complex) "aod" = ( -/obj/structure/platform{ - dir = 8 - }, +/obj/structure/platform/metal/almayer/west, /turf/open/floor/corsat/white/west, /area/corsat/gamma/hallwaysouth) "aoe" = ( @@ -4409,10 +4376,7 @@ /obj/structure/flora/pottedplant{ icon_state = "pottedplant_21" }, -/obj/structure/platform{ - dir = 4; - layer = 2 - }, +/obj/structure/platform/metal/almayer/east, /turf/open/floor/corsat/plate, /area/corsat/sigma/north) "arv" = ( @@ -5787,10 +5751,9 @@ /turf/open/floor/corsat/red/east, /area/corsat/gamma/hangar/checkpoint) "axc" = ( -/obj/structure/machinery/vending/coffee, -/obj/structure/platform{ - dir = 1; - layer = 2.7 +/obj/structure/platform/metal/almayer/north, +/obj/structure/machinery/vending/coffee{ + layer = 3 }, /turf/open/floor/corsat/white/northwest, /area/corsat/gamma/hallwaysouth) @@ -8293,10 +8256,7 @@ "aGd" = ( /obj/structure/surface/table, /obj/item/folder/yellow, -/obj/structure/platform{ - dir = 4; - layer = 2 - }, +/obj/structure/platform/metal/almayer/east, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, @@ -8312,10 +8272,8 @@ /turf/closed/wall/r_wall/biodome/biodome_unmeltable, /area/corsat/omega/control) "aGg" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 8 - }, +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/west, /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/corsat/plate, /area/corsat/sigma/south/complex) @@ -9423,13 +9381,8 @@ /turf/open/floor/plating, /area/corsat/theta/airlock/control) "aKb" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform{ - dir = 1; - layer = 2.7 - }, +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, /turf/open/floor/corsat/plate, /area/corsat/sigma/south/complex) "aKc" = ( @@ -10599,10 +10552,8 @@ /area/corsat/inaccessible) "aOR" = ( /obj/structure/prop/almayer/computers/sensor_computer2, -/obj/structure/platform{ - density = 0; - dir = 1; - icon_state = "platform_deco" +/obj/structure/platform_decoration/metal/almayer/north{ + density = 0 }, /turf/open/floor/corsat/plate, /area/corsat/sigma/south/complex) @@ -10611,10 +10562,8 @@ icon_state = "processor"; name = "Processor Unit" }, -/obj/structure/platform{ - density = 0; - dir = 4; - icon_state = "platform_deco" +/obj/structure/platform_decoration/metal/almayer/east{ + density = 0 }, /turf/open/floor/corsat/plate, /area/corsat/sigma/south/complex) @@ -12711,10 +12660,7 @@ /area/corsat/omega/cargo) "aWj" = ( /obj/structure/surface/table/woodentable, -/obj/structure/platform{ - dir = 4; - layer = 2.8 - }, +/obj/structure/platform/metal/almayer/east, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/corsat/plate, /area/corsat/sigma/north) @@ -12732,10 +12678,7 @@ "aWl" = ( /obj/structure/surface/table/woodentable, /obj/effect/landmark/crap_item, -/obj/structure/platform{ - dir = 8; - layer = 2.8 - }, +/obj/structure/platform/metal/almayer/west, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/corsat/plate, /area/corsat/sigma/north) @@ -13550,9 +13493,7 @@ /area/corsat/omega/hangar/office) "aZh" = ( /obj/structure/stairs, -/obj/structure/platform{ - dir = 8 - }, +/obj/structure/platform/metal/almayer/west, /turf/open/floor/corsat/tan/north, /area/corsat/gamma/residential/west) "aZi" = ( @@ -13582,10 +13523,8 @@ /turf/open/gm/grass/grass1/weedable, /area/corsat/theta/biodome) "aZn" = ( -/obj/structure/platform{ - density = 0; - dir = 8; - icon_state = "platform_deco" +/obj/structure/platform_decoration/metal/almayer/west{ + density = 0 }, /turf/open/floor/corsat/tan/north, /area/corsat/gamma/residential/west) @@ -13618,10 +13557,7 @@ /turf/open/mars_cave/mars_cave_2, /area/corsat/sigma/biodome/scrapyard) "aZt" = ( -/obj/structure/platform{ - dir = 1; - layer = 2.7 - }, +/obj/structure/platform/metal/almayer/north, /obj/structure/bed/chair/office/light, /turf/open/floor/corsat/tan/north, /area/corsat/gamma/residential/west) @@ -13633,10 +13569,7 @@ /obj/structure/pipes/vents/pump{ dir = 4 }, -/obj/structure/platform{ - dir = 1; - layer = 2.7 - }, +/obj/structure/platform/metal/almayer/north, /obj/structure/bed/chair/office/light, /turf/open/floor/corsat/tan/north, /area/corsat/gamma/residential/west) @@ -13719,10 +13652,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, -/obj/structure/platform{ - dir = 1; - layer = 2.7 - }, +/obj/structure/platform/metal/almayer/north, /obj/structure/bed/chair/office/light, /turf/open/floor/corsat/tan/north, /area/corsat/gamma/residential/west) @@ -13730,10 +13660,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 }, -/obj/structure/platform{ - dir = 1; - layer = 2.7 - }, +/obj/structure/platform/metal/almayer/north, /obj/structure/bed/chair/office/light, /turf/open/floor/corsat/tan/north, /area/corsat/gamma/residential/west) @@ -13755,10 +13682,8 @@ /area/corsat/omega/offices) "aZK" = ( /obj/effect/decal/cleanable/blood/splatter, -/obj/structure/platform{ - density = 0; - dir = 4; - icon_state = "platform_deco" +/obj/structure/platform_decoration/metal/almayer/east{ + density = 0 }, /turf/open/floor/corsat/tan/north, /area/corsat/gamma/residential/west) @@ -13770,10 +13695,7 @@ /area/corsat/sigma/south/complex) "aZM" = ( /obj/structure/stairs, -/obj/structure/platform{ - dir = 4; - layer = 2.7 - }, +/obj/structure/platform/metal/almayer/east, /turf/open/floor/corsat/tan/north, /area/corsat/gamma/residential/west) "aZN" = ( @@ -13801,10 +13723,8 @@ /turf/open/floor/corsat/squares, /area/corsat/sigma/southeast/datamaint) "aZT" = ( -/obj/structure/platform{ - density = 0; - dir = 4; - icon_state = "platform_deco" +/obj/structure/platform_decoration/metal/almayer/east{ + density = 0 }, /turf/open/floor/corsat/tan/north, /area/corsat/gamma/residential/west) @@ -13848,10 +13768,7 @@ /turf/open/floor/corsat/red/east, /area/corsat/omega/control) "bab" = ( -/obj/structure/platform{ - dir = 1; - layer = 2.7 - }, +/obj/structure/platform/metal/almayer/north, /turf/open/floor/corsat/tan/north, /area/corsat/gamma/residential/west) "bac" = ( @@ -13919,10 +13836,7 @@ /area/corsat/omega/hangar/security) "bak" = ( /obj/effect/decal/cleanable/blood/splatter, -/obj/structure/platform{ - dir = 1; - layer = 2.7 - }, +/obj/structure/platform/metal/almayer/north, /turf/open/floor/corsat/tan/north, /area/corsat/gamma/residential/west) "bal" = ( @@ -22148,9 +22062,7 @@ /turf/open/floor/corsat/plate, /area/corsat/gamma/rnr) "bHl" = ( -/obj/structure/platform{ - dir = 1 - }, +/obj/structure/platform/metal/almayer/north, /turf/open/floor/corsat/white/north, /area/corsat/gamma/residential/east) "bHy" = ( @@ -24439,20 +24351,14 @@ /area/corsat/sigma/hangar) "bSZ" = ( /obj/structure/bed/chair, -/obj/structure/platform{ - dir = 4; - layer = 2 - }, +/obj/structure/platform/metal/almayer/east, /turf/open/floor/corsat/plate, /area/corsat/sigma/north) "bTb" = ( /obj/structure/bed/chair{ dir = 1 }, -/obj/structure/platform{ - dir = 4; - layer = 2 - }, +/obj/structure/platform/metal/almayer/east, /turf/open/floor/corsat/plate, /area/corsat/sigma/north) "bTh" = ( @@ -26666,10 +26572,8 @@ /turf/open/floor/corsat/yellow/east, /area/corsat/gamma/engineering) "cJU" = ( -/obj/structure/platform{ - density = 0; - dir = 4; - icon_state = "platform_deco" +/obj/structure/platform_decoration/metal/almayer/east{ + density = 0 }, /turf/open/floor/corsat/whitecorner/north, /area/corsat/sigma/south) @@ -26942,10 +26846,7 @@ /area/corsat/sigma/southeast/datalab) "dbn" = ( /obj/structure/surface/table, -/obj/structure/platform{ - dir = 4; - layer = 2 - }, +/obj/structure/platform/metal/almayer/east, /obj/item/paper, /obj/item/tool/pen/blue, /turf/open/floor/corsat/tan/north, @@ -27321,27 +27222,14 @@ /turf/open/floor/corsat/squares, /area/corsat/gamma/engineering/core) "duC" = ( -/obj/structure/platform{ - dir = 1; - layer = 2.7 - }, -/obj/structure/platform{ - dir = 8; - layer = 2.7 - }, +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, /turf/open/floor/corsat/white/northwest, /area/corsat/sigma/south) "duW" = ( /obj/structure/machinery/blackbox_recorder, /turf/open/floor/corsat/lightplate, /area/corsat/theta/biodome/complex) -"duY" = ( -/obj/structure/platform{ - dir = 8; - layer = 2.7 - }, -/turf/open/floor/corsat/white/west, -/area/corsat/gamma/hallwaysouth) "dvn" = ( /turf/open/floor/corsat/whitecorner, /area/corsat/gamma/hallwaysouth) @@ -27350,7 +27238,7 @@ dir = 1 }, /obj/structure/window/reinforced, -/obj/structure/platform, +/obj/structure/platform/metal/almayer, /turf/open/floor/corsat/plate, /area/corsat/sigma/north) "dvx" = ( @@ -28319,14 +28207,8 @@ /turf/open/floor/corsat/purplewhite/west, /area/corsat/omega/complex) "erP" = ( -/obj/structure/platform{ - dir = 1; - layer = 2.7 - }, -/obj/structure/platform{ - dir = 8; - layer = 2.7 - }, +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, /obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/corsat/white/northwest, /area/corsat/gamma/residential/east) @@ -28673,9 +28555,8 @@ /turf/open/floor/almayer/research/containment/corner/north, /area/corsat/sigma/south/complex) "eNI" = ( -/obj/structure/platform{ - density = 0; - icon_state = "platform_deco" +/obj/structure/platform_decoration/metal/almayer{ + density = 0 }, /turf/open/floor/corsat/whitecorner, /area/corsat/sigma/south) @@ -30597,10 +30478,7 @@ /turf/open/floor/corsat/purple, /area/corsat/omega/complex) "gNt" = ( -/obj/structure/platform{ - dir = 1; - layer = 2.7 - }, +/obj/structure/platform/metal/almayer/north, /turf/open/floor/corsat/plate, /area/corsat/sigma/north) "gOk" = ( @@ -30648,13 +30526,6 @@ }, /turf/open/floor/corsat/darkgreencorner/east, /area/corsat/gamma/foyer) -"gPo" = ( -/obj/structure/platform{ - dir = 4; - layer = 2 - }, -/turf/open/floor/corsat/white/east, -/area/corsat/gamma/hallwaysouth) "gPC" = ( /obj/structure/bed/sofa/vert/grey/top, /turf/open/floor/corsat/darkgreen, @@ -30814,10 +30685,7 @@ /area/corsat/sigma/south/robotics) "gWS" = ( /obj/structure/surface/table, -/obj/structure/platform{ - dir = 4; - layer = 2 - }, +/obj/structure/platform/metal/almayer/east, /obj/structure/machinery/computer3/laptop/secure_data, /turf/open/floor/corsat/tan/north, /area/corsat/gamma/residential/west) @@ -30879,9 +30747,7 @@ /turf/open/floor/corsat/tcomms/southwest, /area/corsat/gamma/sigmaremote) "gZc" = ( -/obj/structure/platform{ - dir = 8 - }, +/obj/structure/platform/metal/almayer/west, /turf/open/floor/corsat/retrosquareslight, /area/corsat/theta/biodome/complex) "gZj" = ( @@ -30891,13 +30757,6 @@ /obj/item/tool/pen/blue, /turf/open/floor/corsat/bluegrey/west, /area/corsat/sigma/southeast/dataoffice) -"gZs" = ( -/obj/structure/platform{ - dir = 4; - layer = 2 - }, -/turf/open/floor/corsat/white/east, -/area/corsat/sigma/south) "gZw" = ( /obj/effect/landmark/corpsespawner/chef, /obj/effect/decal/cleanable/blood/splatter, @@ -30998,9 +30857,7 @@ /turf/closed/wall/r_wall/biodome, /area/corsat/sigma/cargo) "hei" = ( -/obj/structure/platform{ - dir = 8 - }, +/obj/structure/platform/metal/almayer/west, /obj/item/storage/toolbox/electrical, /turf/open/floor/corsat/retrosquareslight, /area/corsat/theta/biodome/complex) @@ -31030,10 +30887,7 @@ /obj/structure/bed/chair{ dir = 1 }, -/obj/structure/platform{ - dir = 8; - layer = 2.8 - }, +/obj/structure/platform/metal/almayer/west, /turf/open/floor/corsat/plate, /area/corsat/sigma/north) "hgB" = ( @@ -31237,10 +31091,7 @@ "hsJ" = ( /obj/structure/surface/table, /obj/item/paper, -/obj/structure/platform{ - dir = 4; - layer = 2 - }, +/obj/structure/platform/metal/almayer/east, /obj/item/tool/pen/blue, /turf/open/floor/corsat/tan/north, /area/corsat/gamma/residential/west) @@ -31378,10 +31229,8 @@ /turf/open/floor/corsat/redcorner, /area/corsat/omega/security) "hwV" = ( -/obj/structure/platform{ - density = 0; - dir = 4; - icon_state = "platform_deco" +/obj/structure/platform_decoration/metal/almayer/east{ + density = 0 }, /turf/open/floor/corsat/plate, /area/corsat/sigma/north) @@ -31935,14 +31784,8 @@ /turf/open/floor/corsat/officesquares, /area/corsat/sigma/hangar/office) "hTr" = ( -/obj/structure/platform{ - dir = 1; - layer = 2.7 - }, -/obj/structure/platform{ - dir = 4; - layer = 2.7 - }, +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, /turf/open/floor/corsat/white/northeast, /area/corsat/gamma/hallwaysouth) "hTI" = ( @@ -32770,9 +32613,8 @@ /turf/open/floor/corsat/purplewhite/north, /area/corsat/gamma/biodome/toxins) "iPn" = ( -/obj/structure/platform{ - density = 0; - icon_state = "platform_deco" +/obj/structure/platform_decoration/metal/almayer{ + density = 0 }, /turf/open/floor/corsat/white/east, /area/corsat/gamma/residential/east) @@ -32835,10 +32677,8 @@ /turf/open/floor/plating, /area/corsat/sigma/hangar/arrivals) "iTt" = ( -/obj/structure/platform{ - density = 0; - dir = 1; - icon_state = "platform_deco" +/obj/structure/platform_decoration/metal/almayer/north{ + density = 0 }, /turf/open/floor/corsat/whitecorner/west, /area/corsat/gamma/hallwaysouth) @@ -32914,10 +32754,7 @@ /turf/open/floor/corsat/yellowcorner, /area/corsat/gamma/engineering/core) "iZu" = ( -/obj/structure/platform{ - dir = 1; - layer = 2.7 - }, +/obj/structure/platform/metal/almayer/north, /obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/corsat/white/north, /area/corsat/gamma/hallwaysouth) @@ -32944,9 +32781,8 @@ /turf/open/floor/corsat/whitetan/north, /area/corsat/sigma/dorms) "jai" = ( -/obj/structure/platform{ - density = 0; - icon_state = "platform_deco" +/obj/structure/platform_decoration/metal/almayer{ + density = 0 }, /turf/open/floor/corsat/whitecorner, /area/corsat/gamma/hallwaysouth) @@ -33058,9 +32894,7 @@ /turf/open/floor/corsat/lightplate, /area/corsat/gamma/biodome/complex) "jhz" = ( -/obj/structure/platform{ - dir = 8 - }, +/obj/structure/platform/metal/almayer/west, /turf/open/floor/corsat/purplewhite/north, /area/corsat/theta/biodome/complex) "jhL" = ( @@ -33463,10 +33297,8 @@ /turf/open/floor/corsat/whitetan/southwest, /area/corsat/sigma/dorms) "jGd" = ( -/obj/structure/platform{ - density = 0; - dir = 1; - icon_state = "platform_deco" +/obj/structure/platform_decoration/metal/almayer/north{ + density = 0 }, /turf/open/floor/corsat/white/west, /area/corsat/gamma/hallwaysouth) @@ -33562,10 +33394,7 @@ /area/corsat/gamma/biodome) "jLT" = ( /obj/structure/bed/chair, -/obj/structure/platform{ - dir = 8; - layer = 2.8 - }, +/obj/structure/platform/metal/almayer/west, /turf/open/floor/corsat/plate, /area/corsat/sigma/north) "jLU" = ( @@ -33788,9 +33617,7 @@ /turf/open/floor/corsat/tan/north, /area/corsat/gamma/residential/west) "kbS" = ( -/obj/structure/platform{ - dir = 8 - }, +/obj/structure/platform/metal/almayer/west, /obj/structure/machinery/mech_bay_recharge_port{ pixel_x = 8 }, @@ -34061,9 +33888,7 @@ /turf/open/floor/corsat/whitetan/northeast, /area/corsat/gamma/residential/west) "krn" = ( -/obj/structure/platform{ - dir = 1 - }, +/obj/structure/platform/metal/almayer/north, /turf/open/shuttle/escapepod/floor1, /area/corsat/theta/biodome/complex) "krK" = ( @@ -34404,10 +34229,8 @@ /turf/open/floor/corsat/squares, /area/corsat/sigma/hangar/security) "kMZ" = ( -/obj/structure/platform{ - density = 0; - dir = 4; - icon_state = "platform_deco" +/obj/structure/platform_decoration/metal/almayer/east{ + density = 0 }, /turf/open/floor/corsat/whitecorner/north, /area/corsat/gamma/residential/east) @@ -34722,10 +34545,8 @@ /obj/structure/sign/safety/laser{ pixel_x = 32 }, -/obj/structure/platform{ - density = 0; - dir = 4; - icon_state = "platform_deco" +/obj/structure/platform_decoration/metal/almayer/east{ + density = 0 }, /turf/open/floor/corsat/purplewhite/east, /area/corsat/theta/biodome/complex) @@ -34785,10 +34606,8 @@ /turf/open/floor/almayer/tcomms, /area/corsat/sigma/southeast/datalab) "lgt" = ( -/obj/structure/platform{ - density = 0; - dir = 4; - icon_state = "platform_deco" +/obj/structure/platform_decoration/metal/almayer/east{ + density = 0 }, /turf/open/floor/corsat/whitecorner/north, /area/corsat/gamma/hallwaysouth) @@ -34908,9 +34727,7 @@ /turf/open/floor/wood, /area/corsat/gamma/residential/lounge) "llM" = ( -/obj/structure/platform{ - dir = 1 - }, +/obj/structure/platform/metal/almayer/north, /turf/open/floor/corsat/white/north, /area/corsat/sigma/south) "lmx" = ( @@ -35165,10 +34982,9 @@ /turf/open/floor/corsat/lightplate, /area/corsat/theta/biodome/complex) "lBx" = ( -/obj/structure/machinery/vending/snack, -/obj/structure/platform{ - dir = 1; - layer = 2.7 +/obj/structure/platform/metal/almayer/north, +/obj/structure/machinery/vending/snack{ + layer = 3 }, /turf/open/floor/corsat/white/north, /area/corsat/gamma/hallwaysouth) @@ -35347,12 +35163,8 @@ /turf/open/floor/corsat/purplewhite, /area/corsat/sigma/south/complex) "lIY" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 1 - }, +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/north, /turf/open/floor/corsat/white/north, /area/corsat/sigma/south) "lJj" = ( @@ -35417,10 +35229,7 @@ /turf/open/floor/corsat/plate, /area/corsat/theta/airlock/east) "lOM" = ( -/obj/structure/platform{ - dir = 4; - layer = 2.7 - }, +/obj/structure/platform/metal/almayer/east, /turf/open/floor/corsat/white/east, /area/corsat/gamma/residential/east) "lON" = ( @@ -35595,7 +35404,7 @@ /turf/open/gm/dirtgrassborder/west, /area/corsat/theta/biodome) "lVW" = ( -/obj/structure/platform, +/obj/structure/platform/metal/almayer, /turf/open/gm/river/desert/shallow/pool, /area/corsat/gamma/residential/showers) "lWf" = ( @@ -35655,9 +35464,7 @@ /area/corsat/omega/complex) "lYt" = ( /obj/structure/sign/safety/high_voltage, -/obj/structure/platform{ - dir = 8 - }, +/obj/structure/platform/metal/almayer/west, /obj/item/stack/sheet/metal{ pixel_x = 1 }, @@ -35862,10 +35669,8 @@ /area/corsat/sigma/checkpoint) "mhq" = ( /obj/effect/decal/cleanable/blood/splatter, -/obj/structure/platform{ - density = 0; - dir = 8; - icon_state = "platform_deco" +/obj/structure/platform_decoration/metal/almayer/west{ + density = 0 }, /turf/open/floor/corsat/whitecorner/east, /area/corsat/sigma/south) @@ -36116,9 +35921,8 @@ /turf/open/floor/corsat/lightplate, /area/corsat/gamma/biodome/virology) "mxa" = ( -/obj/structure/platform{ - density = 0; - icon_state = "platform_deco" +/obj/structure/platform_decoration/metal/almayer{ + density = 0 }, /turf/open/floor/corsat/plate, /area/corsat/sigma/north) @@ -36462,10 +36266,8 @@ /turf/open/floor/corsat/purplewhite/southwest, /area/corsat/gamma/sigmaremote) "mQU" = ( -/obj/structure/platform{ - density = 0; - dir = 8; - icon_state = "platform_deco" +/obj/structure/platform_decoration/metal/almayer/west{ + density = 0 }, /turf/open/floor/corsat/whitecorner/east, /area/corsat/gamma/residential/east) @@ -36632,14 +36434,8 @@ /turf/open/floor/corsat/marked, /area/corsat/sigma/south/complex) "mZf" = ( -/obj/structure/platform{ - dir = 1; - layer = 2.7 - }, -/obj/structure/platform{ - dir = 4; - layer = 2.7 - }, +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, /obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/corsat/white/northeast, /area/corsat/gamma/residential/east) @@ -37068,10 +36864,7 @@ /turf/open/floor/corsat/yellowcorner/west, /area/corsat/omega/control) "nvA" = ( -/obj/structure/platform{ - dir = 4; - layer = 2.7 - }, +/obj/structure/platform/metal/almayer/east, /obj/structure/stairs, /turf/open/floor/corsat/white/northeast, /area/corsat/gamma/residential/east) @@ -37186,14 +36979,8 @@ /turf/open/floor/corsat/squareswood/north, /area/corsat/gamma/biodome/complex) "nBi" = ( -/obj/structure/platform{ - dir = 1; - layer = 2.7 - }, -/obj/structure/platform{ - dir = 4; - layer = 2.7 - }, +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, /turf/open/floor/corsat/white/northeast, /area/corsat/sigma/south) "nBk" = ( @@ -37956,9 +37743,7 @@ /turf/open/auto_turf/snow/layer1, /area/corsat/gamma/biodome) "ost" = ( -/obj/structure/platform{ - dir = 8 - }, +/obj/structure/platform/metal/almayer/west, /turf/open/floor/corsat/plate, /area/corsat/sigma/south/complex) "osY" = ( @@ -38507,10 +38292,7 @@ /turf/open/floor/corsat/whitetan/southwest, /area/corsat/gamma/residential/west) "oYP" = ( -/obj/structure/platform{ - dir = 8; - layer = 2.7 - }, +/obj/structure/platform/metal/almayer/west, /turf/open/floor/corsat/white/west, /area/corsat/gamma/residential/east) "oYY" = ( @@ -38932,10 +38714,7 @@ /obj/structure/flora/pottedplant{ icon_state = "pottedplant_21" }, -/obj/structure/platform{ - dir = 8; - layer = 2.8 - }, +/obj/structure/platform/metal/almayer/west, /turf/open/floor/corsat/plate, /area/corsat/sigma/north) "pya" = ( @@ -39211,11 +38990,8 @@ /turf/open/mars_cave/mars_cave_6, /area/corsat/sigma/biodome) "pRX" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 4; - layer = 2 - }, +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/east, /turf/open/floor/corsat/white/southeast, /area/corsat/sigma/south) "pSb" = ( @@ -39871,10 +39647,7 @@ "qww" = ( /obj/structure/surface/table, /obj/item/folder, -/obj/structure/platform{ - dir = 4; - layer = 2 - }, +/obj/structure/platform/metal/almayer/east, /turf/open/floor/corsat/tan/north, /area/corsat/gamma/residential/west) "qwM" = ( @@ -40287,10 +40060,8 @@ /area/corsat/gamma/sigmaremote) "qTd" = ( /obj/structure/reagent_dispensers/water_cooler, -/obj/structure/platform{ - density = 0; - dir = 8; - icon_state = "platform_deco" +/obj/structure/platform_decoration/metal/almayer/west{ + density = 0 }, /turf/open/floor/corsat/whitecorner/east, /area/corsat/gamma/hallwaysouth) @@ -40319,9 +40090,7 @@ /turf/open/floor/corsat/yellow, /area/corsat/gamma/engineering/atmos) "qVd" = ( -/obj/structure/platform{ - dir = 1 - }, +/obj/structure/platform/metal/almayer/north, /turf/open/shuttle/escapepod/floor5, /area/corsat/theta/biodome/complex) "qVe" = ( @@ -40348,10 +40117,8 @@ /turf/open/floor/corsat/plate, /area/corsat/omega/biodome) "qVF" = ( -/obj/structure/platform{ - density = 0; - dir = 1; - icon_state = "platform_deco" +/obj/structure/platform_decoration/metal/almayer/north{ + density = 0 }, /turf/open/floor/corsat/plate, /area/corsat/sigma/north) @@ -40785,10 +40552,8 @@ /turf/open/gm/dirt, /area/corsat/theta/biodome) "rws" = ( -/obj/structure/platform{ - density = 0; - dir = 1; - icon_state = "platform_deco" +/obj/structure/platform_decoration/metal/almayer/north{ + density = 0 }, /turf/open/floor/corsat/white/west, /area/corsat/gamma/residential/east) @@ -41149,11 +40914,8 @@ /turf/open/floor/corsat/red/southeast, /area/corsat/omega/hangar/security) "rRm" = ( -/obj/structure/platform{ - dir = 8; - layer = 2.7 - }, -/obj/structure/platform, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform/metal/almayer, /turf/open/floor/corsat/white/southwest, /area/corsat/gamma/hallwaysouth) "rRR" = ( @@ -41193,10 +40955,7 @@ /area/corsat/sigma/hangar/monorail) "rTf" = ( /obj/structure/surface/table, -/obj/structure/platform{ - dir = 4; - layer = 2 - }, +/obj/structure/platform/metal/almayer/east, /turf/open/floor/corsat/tan/north, /area/corsat/gamma/residential/west) "rTj" = ( @@ -41669,9 +41428,8 @@ /turf/open/floor/corsat/darkgreen/north, /area/corsat/sigma/hangar) "snP" = ( -/obj/structure/platform{ - density = 0; - icon_state = "platform_deco" +/obj/structure/platform_decoration/metal/almayer{ + density = 0 }, /turf/open/floor/corsat/white/east, /area/corsat/gamma/hallwaysouth) @@ -42136,9 +41894,7 @@ /area/corsat/omega/hangar/security) "sOq" = ( /obj/effect/decal/cleanable/blood/splatter, -/obj/structure/platform{ - dir = 1 - }, +/obj/structure/platform/metal/almayer/north, /turf/open/floor/corsat/white/north, /area/corsat/sigma/south) "sOt" = ( @@ -42178,10 +41934,7 @@ /turf/open/floor/corsat/officesquares, /area/corsat/omega/offices) "sQI" = ( -/obj/structure/platform{ - dir = 8; - layer = 2.7 - }, +/obj/structure/platform/metal/almayer/west, /obj/structure/stairs, /turf/open/floor/corsat/white/northwest, /area/corsat/gamma/residential/east) @@ -42534,10 +42287,7 @@ /turf/open/floor/corsat/red/north, /area/corsat/theta/airlock/control) "tlP" = ( -/obj/structure/platform{ - dir = 4; - layer = 2.7 - }, +/obj/structure/platform/metal/almayer/east, /turf/open/floor/corsat/white/east, /area/corsat/sigma/south) "tlX" = ( @@ -43712,14 +43462,8 @@ /turf/open/floor/corsat/red/north, /area/corsat/sigma/hangar/monorail) "uzS" = ( -/obj/structure/platform{ - dir = 1; - layer = 2.7 - }, -/obj/structure/platform{ - dir = 8; - layer = 2.7 - }, +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, /turf/open/floor/corsat/white/northwest, /area/corsat/gamma/hallwaysouth) "uzW" = ( @@ -44144,10 +43888,7 @@ layer = 2; name = "coolant feed" }, -/obj/structure/platform{ - dir = 4; - layer = 2 - }, +/obj/structure/platform/metal/almayer/east, /turf/open/floor/corsat, /area/corsat/gamma/sigmaremote) "uUW" = ( @@ -44938,9 +44679,7 @@ /turf/open/floor/corsat/bluegrey/northeast, /area/corsat/omega/offices) "vMA" = ( -/obj/structure/platform{ - dir = 1 - }, +/obj/structure/platform/metal/almayer/north, /turf/open/floor/corsat/white/north, /area/corsat/gamma/residential) "vMI" = ( @@ -45116,10 +44855,8 @@ /turf/open/floor/corsat/white, /area/corsat/gamma/residential/researcher) "vXy" = ( -/obj/structure/platform{ - density = 0; - dir = 8; - icon_state = "platform_deco" +/obj/structure/platform_decoration/metal/almayer/west{ + density = 0 }, /turf/open/floor/corsat/whitecorner/east, /area/corsat/sigma/south) @@ -45725,10 +45462,8 @@ /turf/open/floor/corsat/yellow/east, /area/corsat/sigma/airlock/control) "wDw" = ( -/obj/structure/platform{ - density = 0; - dir = 4; - icon_state = "platform_deco" +/obj/structure/platform_decoration/metal/almayer/east{ + density = 0 }, /turf/open/floor/corsat/whitecorner/north, /area/corsat/gamma/residential) @@ -45939,9 +45674,7 @@ /turf/open/floor/corsat/marked, /area/corsat/omega/cargo) "wMg" = ( -/obj/structure/platform{ - dir = 8 - }, +/obj/structure/platform/metal/almayer/west, /obj/item/stack/sheet/metal{ pixel_x = 3 }, @@ -46154,10 +45887,8 @@ /turf/open/floor/corsat/whitecorner, /area/corsat/gamma/residential/east) "wZC" = ( -/obj/structure/platform{ - density = 0; - dir = 8; - icon_state = "platform_deco" +/obj/structure/platform_decoration/metal/almayer/west{ + density = 0 }, /turf/open/floor/corsat/whitecorner/east, /area/corsat/gamma/residential) @@ -46172,18 +45903,15 @@ /turf/open/floor/corsat/purplewhite/north, /area/corsat/gamma/biodome/complex) "xaQ" = ( -/obj/structure/machinery/vending/coffee, -/obj/structure/platform{ - dir = 1; - layer = 2.7 +/obj/structure/platform/metal/almayer/north, +/obj/structure/machinery/vending/coffee{ + layer = 3 }, /turf/open/floor/corsat/white/northeast, /area/corsat/gamma/hallwaysouth) "xbu" = ( -/obj/structure/platform{ - density = 0; - dir = 8; - icon_state = "platform_deco" +/obj/structure/platform_decoration/metal/almayer/west{ + density = 0 }, /turf/open/floor/corsat/whitecorner/east, /area/corsat/gamma/hallwaysouth) @@ -46308,10 +46036,7 @@ /area/corsat/gamma/medbay/morgue) "xld" = ( /obj/effect/decal/cleanable/blood/splatter, -/obj/structure/platform{ - dir = 4; - layer = 2 - }, +/obj/structure/platform/metal/almayer/east, /turf/open/floor/corsat/white/east, /area/corsat/sigma/south) "xlg" = ( @@ -46872,11 +46597,8 @@ /turf/open/floor/corsat/retrosquares, /area/corsat/gamma/hangar/arrivals) "xRb" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 4; - layer = 2 - }, +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/east, /turf/open/floor/corsat/white/southeast, /area/corsat/gamma/hallwaysouth) "xRq" = ( @@ -47020,17 +46742,12 @@ /turf/open/floor/corsat/yellowcorner/west, /area/corsat/sigma/south/robotics) "ybv" = ( -/obj/structure/platform{ - dir = 4; - layer = 2.7 - }, +/obj/structure/platform/metal/almayer/east, /turf/open/floor/corsat/white/east, /area/corsat/gamma/hallwaysouth) "ybJ" = ( -/obj/structure/platform{ - density = 0; - dir = 8; - icon_state = "platform_deco" +/obj/structure/platform_decoration/metal/almayer/west{ + density = 0 }, /turf/open/floor/corsat/plate, /area/corsat/sigma/north) @@ -52917,7 +52634,7 @@ gvl adJ pPp ulb -als +aZM aZn aZM aZn @@ -67934,7 +67651,7 @@ anw anw anw jGd -duY +aod xFf xFf xFf @@ -67948,7 +67665,7 @@ uzS xFf xFf xFf -duY +aod anw aqs aqs @@ -68184,11 +67901,11 @@ aqH aqH aqH iTt -duY -duY -duY -duY -duY +aod +aod +aod +aod +aod lgt aqH aqH @@ -76999,7 +76716,7 @@ anw anw anw snP -gPo +ybv lgx lgx lgx @@ -98133,11 +97850,11 @@ lIq ahu ahu eNI -gZs -gZs -gZs +tlP +tlP +tlP xld -gZs +tlP vXy ahu ahu @@ -98372,8 +98089,8 @@ okE arJ arJ arJ -gZs -gZs +tlP +tlP dCP dCP dCP diff --git a/maps/map_files/DesertDam/Desert_Dam.dmm b/maps/map_files/DesertDam/Desert_Dam.dmm index 14404540f73d..aa230ab55af4 100644 --- a/maps/map_files/DesertDam/Desert_Dam.dmm +++ b/maps/map_files/DesertDam/Desert_Dam.dmm @@ -10,16 +10,6 @@ /obj/effect/blocker/toxic_water, /turf/open/gm/river/desert/deep, /area/desert_dam/exterior/river/riverside_central_north) -"aac" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_2, -/obj/effect/landmark/nightmare{ - insert_tag = "green-east-bridge" - }, -/turf/open/desert/desert_shore/desert_shore1, -/area/desert_dam/exterior/river/riverside_east) "aad" = ( /obj/structure/sign/safety/bulkhead_door, /turf/closed/wall/r_wall, @@ -235,13 +225,6 @@ /obj/structure/machinery/colony_floodlight, /turf/open/asphalt/cement_sunbleached/cement_sunbleached18, /area/desert_dam/exterior/valley/valley_medical) -"aaZ" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/river/riverside_central_north) "aba" = ( /obj/structure/flora/grass/desert/lightgrass_9, /turf/open/desert/dirt/desert_transition_edge1/east, @@ -274,15 +257,6 @@ /obj/item/trash/cigbutt/bcigbutt, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_labs) -"abg" = ( -/obj/structure/stairs{ - dir = 8 - }, -/obj/structure/platform{ - dir = 1 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached2, -/area/desert_dam/exterior/valley/valley_medical) "abh" = ( /obj/item/trash/USCMtray, /turf/open/asphalt/cement_sunbleached/cement_sunbleached13, @@ -328,11 +302,6 @@ }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached3, /area/desert_dam/exterior/valley/valley_labs) -"abq" = ( -/obj/structure/powerloader_wreckage, -/obj/effect/decal/cleanable/blood/oil, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_labs) "abr" = ( /turf/open/gm/river/desert/shallow_edge/northeast, /area/desert_dam/exterior/valley/valley_labs) @@ -373,19 +342,6 @@ name = "reinforced metal wall" }, /area/desert_dam/exterior/river/riverside_east) -"abB" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/gm/river/desert/shallow_edge/northwest, -/area/desert_dam/exterior/valley/valley_labs) -"abC" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/shallow_edge/northeast, -/area/desert_dam/exterior/river/riverside_central_north) "abD" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -400,13 +356,6 @@ /obj/item/trash/boonie, /turf/open/desert/desert_shore/shore_edge1, /area/desert_dam/exterior/river/riverside_central_north) -"abG" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/shallow_edge/southeast, -/area/desert_dam/exterior/river/riverside_central_north) "abH" = ( /obj/effect/landmark/xeno_spawn, /obj/effect/landmark/queen_spawn, @@ -443,12 +392,6 @@ /obj/structure/surface/rack, /turf/open/floor/prison, /area/desert_dam/exterior/valley/south_valley_dam) -"abP" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/gm/river/desert/shallow_edge/west, -/area/desert_dam/exterior/valley/valley_labs) "abQ" = ( /obj/structure/machinery/landinglight/ds1/delayone, /turf/open/asphalt/cement_sunbleached/cement_sunbleached4, @@ -491,15 +434,6 @@ /obj/structure/largecrate/random, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_labs) -"abY" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/decal/sand_overlay/sand1{ - dir = 10 - }, -/turf/closed/wall/r_wall/bunker/floodgate, -/area/desert_dam/exterior/valley/valley_labs) "abZ" = ( /obj/structure/desertdam/decals/road_edge, /turf/open/asphalt, @@ -536,13 +470,6 @@ "ach" = ( /turf/open/gm/river/desert/deep, /area/desert_dam/exterior/valley/valley_labs) -"aci" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/item/trash/chips, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_labs) "acj" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 10 @@ -558,13 +485,6 @@ /obj/item/trash/eat, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_labs) -"aco" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/obj/structure/largecrate/random, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_labs) "acp" = ( /obj/structure/flora/bush/desert{ icon_state = "tree_4" @@ -591,12 +511,6 @@ icon_state = "pwall" }, /area/desert_dam/exterior/rock) -"acv" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/closed/wall/r_wall/bunker/floodgate, -/area/desert_dam/exterior/valley/valley_labs) "acw" = ( /turf/closed/wall/r_wall/bunker, /area/desert_dam/interior/dam_interior/east_tunnel_entrance) @@ -723,12 +637,6 @@ /obj/structure/largecrate/random/secure, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_northwest) -"acX" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/gm/river/desert/shallow_edge/southwest, -/area/desert_dam/exterior/valley/valley_labs) "acY" = ( /turf/open/desert/rock/deep/rock3, /area/desert_dam/interior/caves/east_caves) @@ -871,101 +779,36 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/desert/rock, /area/desert_dam/interior/caves/east_caves) -"adE" = ( -/obj/structure/platform, -/turf/open/gm/river/desert/shallow_edge/southeast, -/area/desert_dam/exterior/valley/valley_labs) "adF" = ( /turf/open/desert/rock/deep/rock3, /area/desert_dam/interior/dam_interior/north_tunnel) -"adG" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/shallow_corner/west, -/area/desert_dam/exterior/river/riverside_east) -"adH" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_east) "adI" = ( /turf/open/desert/rock/deep, /area/desert_dam/interior/dam_interior/north_tunnel_entrance) -"adJ" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/shallow_corner/east, -/area/desert_dam/exterior/river/riverside_east) "adK" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 1 }, /turf/open/floor/plating/warnplate/north, /area/desert_dam/exterior/valley/valley_crashsite) -"adL" = ( -/obj/effect/blocker/toxic_water, -/obj/structure/platform, -/turf/open/gm/river/desert/shallow_edge, -/area/desert_dam/exterior/river/riverside_east) -"adM" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water, -/turf/open/gm/river/desert/shallow_edge/southeast, -/area/desert_dam/exterior/river/riverside_east) -"adN" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water, -/turf/open/gm/river/desert, -/area/desert_dam/exterior/river/riverside_east) "adO" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 8 }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached9, /area/desert_dam/exterior/valley/valley_labs) -"adP" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water, -/turf/open/gm/river/desert/shallow_edge/southwest, -/area/desert_dam/exterior/river/riverside_east) -"adQ" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/obj/effect/blocker/toxic_water, -/turf/open/gm/river/desert/shallow_corner/west, -/area/desert_dam/exterior/river/riverside_east) "adR" = ( /obj/effect/blocker/toxic_water/Group_2, /turf/open/desert/desert_shore/shore_edge1, /area/desert_dam/exterior/river/riverside_east) -"adS" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water, -/turf/open/gm/river/desert/shallow_edge/southwest, -/area/desert_dam/exterior/river/riverside_east) "adU" = ( /obj/effect/blocker/toxic_water, /turf/open/gm/river/desert/shallow_edge/southeast, /area/desert_dam/exterior/river/riverside_east) -"adV" = ( -/obj/structure/platform, -/turf/open/gm/river/desert/shallow, -/area/desert_dam/exterior/valley/valley_labs) -"adW" = ( -/obj/structure/platform, -/turf/open/desert/desert_shore/shore_corner2/east, -/area/desert_dam/exterior/valley/valley_labs) "adX" = ( /obj/effect/blocker/toxic_water, /turf/open/desert/desert_shore/shore_corner2/east, /area/desert_dam/exterior/river/riverside_east) -"adY" = ( -/obj/structure/platform, -/turf/open/desert/desert_shore/shore_edge1/west, -/area/desert_dam/exterior/valley/valley_labs) "adZ" = ( /obj/structure/flora/bush/desert/cactus/multiple{ icon_state = "cacti_10" @@ -1031,13 +874,6 @@ }, /turf/open/asphalt/cement_sunbleached, /area/desert_dam/exterior/valley/valley_labs) -"ael" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/effect/blocker/toxic_water, -/turf/open/desert/desert_shore/shore_corner2, -/area/desert_dam/exterior/river/riverside_east) "aem" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 1 @@ -1135,35 +971,6 @@ /obj/effect/blocker/toxic_water, /turf/open/desert/desert_shore/shore_edge1/west, /area/desert_dam/exterior/river/riverside_east) -"aeG" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/obj/structure/platform, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/river/riverside_east) -"aeH" = ( -/obj/effect/blocker/toxic_water/Group_2, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_east) -"aeI" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water, -/turf/open/desert/desert_shore/desert_shore1/west, -/area/desert_dam/exterior/river/riverside_east) -"aeJ" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water, -/turf/open/gm/river/desert/shallow_edge/west, -/area/desert_dam/exterior/river/riverside_east) -"aeK" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water, -/turf/open/gm/river/desert/shallow_edge/east, -/area/desert_dam/exterior/river/riverside_east) "aeL" = ( /obj/structure/machinery/light{ dir = 1 @@ -1174,11 +981,6 @@ /obj/effect/decal/sand_overlay/sand1, /turf/open/asphalt/cement_sunbleached, /area/desert_dam/exterior/valley/valley_labs) -"aeN" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water, -/turf/open/desert/desert_shore/desert_shore1/east, -/area/desert_dam/exterior/river/riverside_east) "aeO" = ( /obj/effect/decal/sand_overlay/sand1/corner1, /turf/open/asphalt/tile, @@ -1341,14 +1143,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/bright_clean2, /area/desert_dam/building/administration/control_room) -"aft" = ( -/obj/effect/blocker/toxic_water/Group_2, -/obj/structure/platform, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_east) "afu" = ( /obj/structure/machinery/colony_floodlight, /turf/open/desert/rock, @@ -1379,21 +1173,9 @@ "afB" = ( /turf/open/desert/rock/deep/transition/west, /area/desert_dam/interior/dam_interior/northeastern_tunnel) -"afC" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/desert/rock, -/area/desert_dam/interior/dam_interior/south_tunnel) "afD" = ( /turf/open/desert/rock/deep, /area/desert_dam/interior/dam_interior/western_dam_cave) -"afE" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/desert/rock, -/area/desert_dam/interior/dam_interior/south_tunnel) "afF" = ( /obj/effect/decal/sand_overlay/sand1/corner1, /turf/open/asphalt/tile, @@ -1413,16 +1195,6 @@ "afK" = ( /turf/open/floor/plating/warnplate/west, /area/desert_dam/interior/lab_northeast/east_lab_containment) -"afL" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_east) "afM" = ( /turf/open/floor/filtrationside/east, /area/desert_dam/exterior/valley/valley_mining) @@ -1546,13 +1318,6 @@ /obj/structure/flora/grass/tallgrass/desert/corner, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_northwest) -"agl" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/blocker/toxic_water, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_east) "agm" = ( /obj/structure/machinery/colony_floodlight, /turf/open/desert/rock, @@ -1589,16 +1354,6 @@ }, /turf/open/asphalt/cement_sunbleached, /area/desert_dam/exterior/valley/valley_northwest) -"ags" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_east) "agt" = ( /turf/open/gm/river/desert/shallow_corner/west, /area/desert_dam/exterior/valley/valley_labs) @@ -1655,10 +1410,6 @@ "agD" = ( /turf/open/desert/dirt/desert_transition_edge1, /area/desert_dam/exterior/valley/valley_crashsite) -"agE" = ( -/obj/structure/platform, -/turf/open/desert/desert_shore/desert_shore1, -/area/desert_dam/exterior/valley/valley_labs) "agF" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 1 @@ -1680,14 +1431,6 @@ "agI" = ( /turf/open/floor/plating/warnplate/southwest, /area/desert_dam/interior/lab_northeast/east_lab_containment) -"agJ" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_east) "agK" = ( /turf/open/desert/dirt/desert_transition_edge1/west, /area/desert_dam/exterior/valley/valley_crashsite) @@ -1858,12 +1601,6 @@ "aho" = ( /turf/open/desert/rock/deep/rock3, /area/desert_dam/interior/dam_interior/western_dam_cave) -"ahp" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/desert/rock/deep/transition/west, -/area/desert_dam/interior/dam_interior/west_tunnel) "ahq" = ( /obj/structure/desertdam/decals/road_stop, /turf/open/asphalt, @@ -1890,14 +1627,6 @@ "ahu" = ( /turf/open/desert/dirt/rock1, /area/desert_dam/exterior/valley/valley_northwest) -"ahv" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_east) "ahw" = ( /obj/effect/blocker/toxic_water/Group_2, /obj/structure/barricade/wooden{ @@ -2139,12 +1868,6 @@ "ait" = ( /turf/open/desert/dirt/desert_transition_corner1/east, /area/desert_dam/exterior/valley/valley_northwest) -"aiu" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_northwest) "aiv" = ( /obj/effect/decal/sand_overlay/sand2{ dir = 9 @@ -2160,13 +1883,6 @@ }, /turf/open/asphalt/cement_sunbleached, /area/desert_dam/exterior/valley/valley_wilderness) -"aix" = ( -/obj/effect/blocker/toxic_water/Group_2, -/obj/structure/platform{ - dir = 1 - }, -/turf/open/gm/river/desert/shallow_edge/west, -/area/desert_dam/exterior/river/riverside_central_north) "aiy" = ( /obj/effect/decal/sand_overlay/sand1/corner1{ dir = 4 @@ -2177,44 +1893,13 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/prison/bright_clean/southwest, /area/desert_dam/interior/lab_northeast/east_lab_containment) -"aiA" = ( -/obj/effect/blocker/toxic_water/Group_2, -/obj/structure/platform{ - dir = 1 - }, -/turf/open/gm/river/desert/shallow_edge/east, -/area/desert_dam/exterior/river/riverside_central_north) "aiB" = ( /obj/structure/machinery/light, /turf/open/floor/prison, /area/desert_dam/interior/lab_northeast/east_lab_containment) -"aiC" = ( -/obj/effect/blocker/toxic_water/Group_2, -/obj/structure/platform{ - dir = 1 - }, -/turf/open/gm/river/desert/shallow, -/area/desert_dam/exterior/river/riverside_central_north) -"aiD" = ( -/obj/effect/blocker/toxic_water/Group_2, -/obj/structure/platform{ - dir = 1 - }, -/turf/open/desert/desert_shore/shore_corner2/west, -/area/desert_dam/exterior/river/riverside_central_north) "aiE" = ( /turf/open/floor/prison/darkpurple2/southeast, /area/desert_dam/interior/lab_northeast/east_lab_biology) -"aiF" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_2, -/obj/structure/platform{ - dir = 1 - }, -/turf/open/desert/desert_shore/shore_edge1/east, -/area/desert_dam/exterior/river/riverside_central_north) "aiG" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -2452,21 +2137,6 @@ }, /turf/open/floor/prison/bright_clean2, /area/desert_dam/interior/lab_northeast/east_lab_biology) -"ajx" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/plating, -/area/desert_dam/interior/lab_northeast/east_lab_containment) -"ajy" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/plating, -/area/desert_dam/interior/lab_northeast/east_lab_containment) "ajz" = ( /turf/closed/wall/r_wall/chigusa, /area/desert_dam/interior/lab_northeast/east_lab_workshop) @@ -2538,15 +2208,6 @@ "ajM" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached15, /area/desert_dam/exterior/valley/valley_labs) -"ajN" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/plating, -/area/desert_dam/interior/lab_northeast/east_lab_containment) "ajO" = ( /turf/open/floor/prison/whitepurple/west, /area/desert_dam/interior/lab_northeast/east_lab_central_hallway) @@ -2727,12 +2388,6 @@ }, /turf/open/floor/dark2, /area/desert_dam/interior/lab_northeast/east_lab_containment) -"akx" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/plating, -/area/desert_dam/interior/lab_northeast/east_lab_containment) "aky" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached2, /area/desert_dam/exterior/valley/valley_northwest) @@ -2744,18 +2399,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_northwest) -"akB" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_northwest) -"akC" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/plating, -/area/desert_dam/interior/lab_northeast/east_lab_containment) "akD" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ dir = 4; @@ -2818,39 +2461,10 @@ "akQ" = ( /turf/open/floor/prison/darkpurple2/northwest, /area/desert_dam/interior/lab_northeast/east_lab_biology) -"akR" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/valley/north_valley_dam) -"akS" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/valley/north_valley_dam) -"akT" = ( -/obj/structure/platform_decoration, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/valley/north_valley_dam) "akU" = ( /obj/structure/prop/dam/truck/cargo, /turf/open/asphalt, /area/desert_dam/exterior/landing_pad_one) -"akV" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/desert/rock, -/area/desert_dam/exterior/valley/valley_crashsite) "akW" = ( /turf/open/jungle/impenetrable, /area/desert_dam/interior/lab_northeast/east_lab_containment) @@ -2915,12 +2529,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_northwest) -"alj" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/desert/rock, -/area/desert_dam/exterior/valley/valley_crashsite) "alk" = ( /turf/open/mars/mars_dirt_12, /area/desert_dam/interior/lab_northeast/east_lab_containment) @@ -2944,16 +2552,6 @@ "alp" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached1, /area/desert_dam/exterior/valley/valley_northwest) -"alr" = ( -/obj/structure/stairs{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8; - layer = 2.7 - }, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/north_valley_dam) "als" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/prison/bright_clean2, @@ -3056,16 +2654,6 @@ /obj/structure/window/framed/chigusa, /turf/open/floor/plating, /area/desert_dam/interior/lab_northeast/east_lab_excavation) -"alQ" = ( -/obj/structure/stairs{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4; - layer = 2.7 - }, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/north_valley_dam) "alR" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Excavation" @@ -3127,53 +2715,15 @@ /obj/item/alienjar, /turf/open/floor/prison/darkpurple2/east, /area/desert_dam/interior/lab_northeast/east_lab_biology) -"amd" = ( -/obj/structure/platform, -/turf/open/floor/plating, -/area/desert_dam/interior/lab_northeast/east_lab_containment) "ame" = ( /turf/open/asphalt/tile, /area/desert_dam/exterior/valley/valley_northwest) -"amf" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_northwest) -"amg" = ( -/obj/structure/platform, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_northwest) "amh" = ( /turf/open/floor/coagulation/icon6_8_2, /area/desert_dam/exterior/valley/valley_mining) "ami" = ( /turf/open/floor/coagulation/icon7_8_2, /area/desert_dam/exterior/valley/valley_mining) -"amj" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/obj/structure/stairs{ - dir = 1 - }, -/turf/open/floor/plating, -/area/desert_dam/interior/lab_northeast/east_lab_containment) -"amk" = ( -/obj/structure/platform_decoration, -/obj/structure/stairs{ - dir = 1 - }, -/turf/open/floor/plating, -/area/desert_dam/interior/lab_northeast/east_lab_containment) -"aml" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform, -/turf/open/floor/plating, -/area/desert_dam/interior/lab_northeast/east_lab_containment) "amm" = ( /obj/structure/machinery/light{ dir = 4 @@ -3225,20 +2775,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_northwest) -"amu" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/river/riverside_central_north) -"amv" = ( -/obj/effect/blocker/toxic_water/Group_2, -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/desert/desert_shore/desert_shore1/west, -/area/desert_dam/exterior/river/riverside_central_north) "amw" = ( /turf/closed/wall/r_wall/bunker/floodgate, /area/desert_dam/exterior/river/riverside_central_north) @@ -3328,26 +2864,10 @@ "amP" = ( /turf/open/desert/dirt/desert_transition_edge1/east, /area/desert_dam/exterior/valley/valley_northwest) -"amQ" = ( -/obj/structure/flora/bush/desert/cactus{ - icon_state = "cactus_8" - }, -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/desert/dirt, -/area/desert_dam/exterior/telecomm/lz1_valley) "amR" = ( /obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison, /area/desert_dam/interior/lab_northeast/east_lab_containment) -"amS" = ( -/obj/effect/blocker/toxic_water/Group_2, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/desert/desert_shore/desert_shore1/west, -/area/desert_dam/exterior/river/riverside_central_north) "amT" = ( /turf/open/floor/coagulation/icon0_5, /area/desert_dam/exterior/valley/valley_mining) @@ -3391,12 +2911,6 @@ "anc" = ( /turf/open/desert/dirt/desert_transition_edge1, /area/desert_dam/interior/dam_interior/west_tunnel) -"and" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/river/riverside_central_north) "ane" = ( /obj/effect/decal/sand_overlay/sand2{ dir = 8 @@ -3599,16 +3113,6 @@ /obj/structure/machinery/vending/security, /turf/open/floor/prison/darkredfull2, /area/desert_dam/interior/lab_northeast/east_lab_security_armory) -"anS" = ( -/obj/structure/surface/table/reinforced, -/obj/item/ammo_magazine/revolver/cmb, -/turf/open/floor/prison/darkredfull2, -/area/desert_dam/interior/lab_northeast/east_lab_security_armory) -"anT" = ( -/obj/structure/surface/rack, -/obj/item/weapon/gun/revolver/cmb, -/turf/open/floor/prison/darkredfull2, -/area/desert_dam/interior/lab_northeast/east_lab_security_armory) "anU" = ( /obj/structure/surface/table/reinforced, /obj/structure/machinery/computer/cameras{ @@ -4112,15 +3616,6 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_northwest) -"aqm" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/river/riverside_central_north) "aqn" = ( /obj/effect/decal/cleanable/dirt, /turf/open/asphalt/cement, @@ -4161,13 +3656,6 @@ /obj/structure/filingcabinet, /turf/open/floor/prison/darkred2/north, /area/desert_dam/interior/lab_northeast/east_lab_security_armory) -"aqw" = ( -/obj/structure/stairs{ - dir = 8 - }, -/obj/structure/platform, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached14, -/area/desert_dam/exterior/valley/valley_medical) "aqx" = ( /obj/structure/surface/table/reinforced, /obj/structure/machinery/computer/cameras{ @@ -4200,13 +3688,6 @@ /obj/structure/closet/secure_closet/security, /turf/open/floor/prison/darkred2/northeast, /area/desert_dam/interior/lab_northeast/east_lab_security_armory) -"aqE" = ( -/obj/effect/blocker/toxic_water/Group_1, -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/desert/desert_shore/desert_shore1/west, -/area/desert_dam/exterior/river/riverside_central_north) "aqF" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk, @@ -4337,12 +3818,6 @@ }, /turf/open/floor/prison/whitepurple/northeast, /area/desert_dam/interior/lab_northeast/east_lab_west_hallway) -"ard" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/river/riverside_central_north) "are" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -4591,17 +4066,6 @@ "asg" = ( /turf/open/floor/prison/darkbrown2/northwest, /area/desert_dam/interior/dam_interior/hanger) -"ash" = ( -/obj/structure/fence, -/turf/open/desert/dirt/desert_transition_edge1, -/area/desert_dam/exterior/valley/valley_telecoms) -"asl" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/desert/desert_shore/desert_shore1, -/area/desert_dam/exterior/valley/valley_labs) "asm" = ( /obj/structure/surface/table/reinforced, /obj/structure/machinery/computer/guestpass, @@ -4660,10 +4124,6 @@ "asx" = ( /turf/open/floor/prison/bright_clean2, /area/desert_dam/interior/lab_northeast/east_lab_west_entrance) -"asy" = ( -/obj/structure/platform_decoration, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/river/riverside_central_north) "asz" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ dir = 4; @@ -4748,6 +4208,11 @@ }, /turf/open/floor/prison, /area/desert_dam/building/water_treatment_two/floodgate_control) +"asP" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/desert/desert_shore/shore_edge1/east, +/area/desert_dam/exterior/valley/valley_civilian) "asQ" = ( /obj/structure/surface/table, /obj/structure/machinery/computer/emails, @@ -4765,13 +4230,6 @@ /obj/structure/machinery/computer/atmos_alert, /turf/open/floor/prison, /area/desert_dam/building/water_treatment_two/floodgate_control) -"asT" = ( -/obj/effect/blocker/toxic_water/Group_2, -/obj/structure/platform{ - dir = 1 - }, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_east) "asW" = ( /turf/open/floor/darkyellowcorners2/east, /area/desert_dam/building/substation/northeast) @@ -4785,16 +4243,6 @@ }, /turf/open/floor/darkyellow2/northeast, /area/desert_dam/building/substation/northeast) -"asZ" = ( -/obj/effect/blocker/toxic_water/Group_2, -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_east) "ata" = ( /obj/structure/surface/table/reinforced, /obj/structure/machinery/door/window/brigdoor/eastleft{ @@ -4820,15 +4268,6 @@ }, /turf/open/desert/dirt/dirt2, /area/desert_dam/interior/caves/east_caves) -"ate" = ( -/obj/structure/stairs{ - dir = 4 - }, -/obj/structure/platform{ - dir = 1 - }, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/valley_mining) "atf" = ( /obj/structure/flora/tree/joshua, /turf/open/desert/dirt, @@ -4959,24 +4398,6 @@ }, /turf/open/gm/river/desert/deep/toxic, /area/desert_dam/building/water_treatment_two) -"atB" = ( -/obj/effect/blocker/toxic_water/Group_2, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_east) -"atC" = ( -/obj/structure/filtration/machine_96x96/distribution, -/obj/effect/blocker/toxic_water/Group_2, -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/valley/valley_mining) "atD" = ( /obj/effect/decal/sand_overlay/sand2/corner2, /obj/structure/machinery/sentry_holder/colony{ @@ -5073,19 +4494,6 @@ "atV" = ( /turf/open/floor/vault2/northeast, /area/desert_dam/building/substation/northeast) -"atW" = ( -/obj/effect/blocker/toxic_water/Group_2, -/obj/structure/platform, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_east) -"atX" = ( -/obj/effect/blocker/toxic_water/Group_2, -/obj/structure/platform, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_east) "atY" = ( /obj/structure/surface/table, /obj/item/paper_bin, @@ -5187,15 +4595,6 @@ /obj/structure/flora/grass/desert/lightgrass_3, /turf/open/desert/rock, /area/desert_dam/interior/dam_interior/west_tunnel) -"auv" = ( -/obj/structure/stairs{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached3, -/area/desert_dam/exterior/valley/valley_medical) "auw" = ( /obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/darkpurple2/northeast, @@ -5306,15 +4705,6 @@ hull = 1 }, /area/shuttle/trijent_shuttle/engi) -"auX" = ( -/obj/structure/stairs{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached1, -/area/desert_dam/exterior/valley/valley_medical) "auY" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 8 @@ -5545,13 +4935,6 @@ }, /turf/open/desert/rock/deep/transition/east, /area/desert_dam/interior/dam_interior/north_tunnel_entrance) -"avT" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_east) "avU" = ( /turf/open/floor/darkyellow2, /area/desert_dam/building/substation/northeast) @@ -5627,20 +5010,6 @@ "awl" = ( /turf/open/desert/rock/deep/transition/northeast, /area/desert_dam/interior/dam_interior/workshop) -"awm" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_east) -"awn" = ( -/obj/structure/stairs{ - dir = 4 - }, -/obj/structure/platform, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/valley_mining) "awo" = ( /obj/effect/decal/cleanable/dirt, /turf/open/asphalt/cement_sunbleached/cement_sunbleached2, @@ -5745,10 +5114,6 @@ /obj/effect/spawner/random/toolbox, /turf/open/floor/prison/darkpurple2, /area/desert_dam/interior/lab_northeast/east_lab_RND) -"awK" = ( -/obj/structure/platform, -/turf/open/desert/desert_shore/shore_corner2, -/area/desert_dam/exterior/valley/valley_labs) "awL" = ( /obj/effect/decal/sand_overlay/sand2, /turf/open/floor/plating, @@ -5852,30 +5217,12 @@ }, /turf/open/floor/prison/whitepurple, /area/desert_dam/interior/lab_northeast/east_lab_west_hallway) -"axi" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/valley/valley_labs) "axj" = ( /turf/open/desert/desert_shore/shore_edge1, /area/desert_dam/exterior/valley/valley_crashsite) -"axk" = ( -/obj/structure/fence, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_telecoms) "axl" = ( /turf/open/desert/rock/deep/transition, /area/desert_dam/interior/lab_northeast/east_lab_west_hallway) -"axm" = ( -/obj/structure/platform, -/turf/open/gm/river/desert/shallow_edge/southwest, -/area/desert_dam/exterior/valley/valley_labs) -"axn" = ( -/obj/structure/platform, -/turf/open/gm/river/desert/shallow_corner/west, -/area/desert_dam/exterior/valley/valley_labs) "axo" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal11" @@ -5992,10 +5339,6 @@ }, /turf/open/floor/plating, /area/desert_dam/interior/lab_northeast/east_lab_west_hallway) -"axJ" = ( -/obj/structure/platform, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/valley/valley_labs) "axK" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, @@ -6011,10 +5354,6 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, /area/desert_dam/interior/lab_northeast/east_lab_west_hallway) -"axO" = ( -/obj/structure/platform, -/turf/open/gm/river/desert/shallow_corner/east, -/area/desert_dam/exterior/valley/valley_labs) "axP" = ( /turf/open/desert/rock/deep/transition/west, /area/desert_dam/exterior/valley/valley_wilderness) @@ -6240,12 +5579,6 @@ "ayS" = ( /turf/open/floor/prison/whitepurple/northeast, /area/desert_dam/interior/lab_northeast/east_lab_west_hallway) -"ayT" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/prison/blue/west, -/area/desert_dam/interior/lab_northeast/east_lab_RND) "ayU" = ( /obj/structure/bed/chair/office/light{ dir = 4 @@ -6258,10 +5591,6 @@ /obj/item/disk/nuclear, /turf/open/floor/prison/southwest, /area/desert_dam/interior/lab_northeast/east_lab_RND) -"ayW" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/prison/bluecorner/north, -/area/desert_dam/interior/lab_northeast/east_lab_RND) "ayX" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -6277,20 +5606,12 @@ "ayZ" = ( /turf/open/floor/prison/bright_clean2, /area/desert_dam/interior/lab_northeast/east_lab_west_hallway) -"aza" = ( -/obj/structure/platform, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/valley/valley_labs) "azb" = ( /turf/open/desert/rock/deep/transition/west, /area/desert_dam/interior/dam_interior/western_dam_cave) "azc" = ( /turf/open/floor/prison/whitepurple/east, /area/desert_dam/interior/lab_northeast/east_lab_west_hallway) -"azd" = ( -/obj/structure/machinery/power/apc/no_power/west, -/turf/open/floor/prison/blue/west, -/area/desert_dam/interior/lab_northeast/east_lab_RND) "azf" = ( /obj/structure/closet/firecloset, /obj/structure/machinery/light{ @@ -6309,22 +5630,6 @@ }, /turf/open/floor/prison/southwest, /area/desert_dam/interior/lab_northeast/east_lab_RND) -"azi" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/open/floor/prison/southwest, -/area/desert_dam/interior/lab_northeast/east_lab_RND) -"azj" = ( -/obj/structure/machinery/door/airlock/almayer/research/glass/colony{ - name = "\improper Research Director Office" - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/turf/open/floor/prison/southwest, -/area/desert_dam/interior/lab_northeast/east_lab_RND) "azk" = ( /obj/effect/landmark/xeno_spawn, /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -6370,12 +5675,6 @@ }, /turf/open/asphalt/cement/cement7, /area/desert_dam/exterior/valley/valley_wilderness) -"azw" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/turf/open/floor/prison/sterile_white/west, -/area/desert_dam/interior/lab_northeast/east_lab_west_hallway) "azx" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -6447,15 +5746,6 @@ }, /turf/open/floor/prison/green/east, /area/desert_dam/interior/dam_interior/atmos_storage) -"azK" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/desert/rock, -/area/desert_dam/exterior/valley/valley_crashsite) "azM" = ( /obj/effect/decal/sand_overlay/sand2{ dir = 4 @@ -6479,10 +5769,6 @@ /obj/structure/flora/grass/tallgrass/desert/corner, /turf/open/desert/dirt, /area/desert_dam/interior/caves/central_caves) -"azQ" = ( -/obj/structure/platform, -/turf/open/desert/desert_shore/shore_edge1, -/area/desert_dam/exterior/valley/valley_labs) "azR" = ( /obj/effect/decal/sand_overlay/sand2{ dir = 4 @@ -6496,12 +5782,6 @@ "azT" = ( /turf/open/desert/rock, /area/desert_dam/exterior/valley/valley_crashsite) -"azU" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/desert/rock, -/area/desert_dam/exterior/valley/valley_crashsite) "azV" = ( /obj/structure/flora/bush/desert, /turf/open/desert/dirt, @@ -6572,12 +5852,6 @@ "aAl" = ( /turf/open/desert/excavation/component8/southeast, /area/desert_dam/exterior/valley/valley_crashsite) -"aAm" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/desert/rock, -/area/desert_dam/exterior/valley/valley_crashsite) "aAn" = ( /obj/effect/decal/sand_overlay/sand2/corner2, /turf/open/asphalt/cement, @@ -6649,12 +5923,6 @@ }, /turf/open/desert/dirt/dirt2, /area/desert_dam/interior/caves/central_caves) -"aAB" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/desert/desert_shore/shore_edge1/west, -/area/desert_dam/exterior/valley/valley_labs) "aAC" = ( /obj/effect/decal/sand_overlay/sand1/corner1{ dir = 8 @@ -6670,21 +5938,6 @@ }, /turf/open/asphalt/cement/cement15, /area/desert_dam/exterior/valley/valley_wilderness) -"aAE" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_northwest) -"aAF" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/desert/excavation/component8/southwest, -/area/desert_dam/exterior/valley/valley_crashsite) "aAG" = ( /turf/open/desert/desert_shore/desert_shore1/north, /area/desert_dam/interior/caves/central_caves) @@ -6972,22 +6225,12 @@ "aBL" = ( /turf/closed/wall/mineral/sandstone/runed, /area/desert_dam/interior/caves/temple) -"aBO" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed, -/turf/open/desert/desert_shore/shore_edge1/east, -/area/desert_dam/interior/caves/temple) "aBQ" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_wilderness) -"aBR" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/desert/desert_shore/shore_corner1/west, -/area/desert_dam/interior/caves/temple) "aBS" = ( /turf/open/desert/rock/deep/rock4, /area/desert_dam/interior/caves/temple) @@ -7035,12 +6278,6 @@ "aCc" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached4, /area/desert_dam/interior/dam_interior/south_tunnel) -"aCd" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/desert/dirt/desert_transition_corner1/north, -/area/desert_dam/exterior/valley/valley_labs) "aCe" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 8 @@ -7275,6 +6512,10 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_northwest) +"aDd" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/desert/rock/deep/transition/north, +/area/desert_dam/interior/dam_interior/south_tunnel) "aDe" = ( /obj/effect/decal/sand_overlay/sand1, /turf/open/asphalt/tile, @@ -7540,13 +6781,6 @@ /obj/structure/prop/dam/boulder/boulder3, /turf/open/desert/dirt/desert_transition_edge1, /area/desert_dam/exterior/valley/valley_crashsite) -"aDZ" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/desert/rock, -/area/desert_dam/exterior/valley/valley_crashsite) "aEa" = ( /turf/closed/wall, /area/desert_dam/interior/dam_interior/east_tunnel_entrance) @@ -7570,10 +6804,6 @@ }, /turf/open/asphalt/tile, /area/desert_dam/exterior/valley/valley_medical) -"aEf" = ( -/obj/structure/platform, -/turf/open/desert/rock, -/area/desert_dam/exterior/valley/valley_crashsite) "aEg" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -7583,33 +6813,16 @@ }, /turf/open/floor/interior/wood, /area/desert_dam/building/bar/backroom) -"aEh" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/desert/rock, -/area/desert_dam/exterior/valley/valley_crashsite) "aEi" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal9" }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_medical) -"aEj" = ( -/obj/structure/platform_decoration, -/turf/open/desert/rock, -/area/desert_dam/exterior/valley/valley_crashsite) "aEk" = ( /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, /area/desert_dam/interior/dam_interior/central_tunnel) -"aEl" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/desert/rock, -/area/desert_dam/exterior/valley/valley_crashsite) "aEm" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 10 @@ -7659,24 +6872,6 @@ }, /turf/open/floor/prison/sterile_white/west, /area/desert_dam/exterior/valley/valley_medical) -"aEv" = ( -/obj/structure/stairs{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/valley_crashsite) -"aEw" = ( -/obj/structure/stairs{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/valley_crashsite) "aEx" = ( /obj/effect/decal/sand_overlay/sand1/corner1, /turf/open/asphalt/tile, @@ -7720,13 +6915,6 @@ }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached14, /area/desert_dam/exterior/valley/valley_northwest) -"aEE" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_telecoms) "aEF" = ( /obj/effect/decal/sand_overlay/sand1/corner1{ dir = 8 @@ -7780,16 +6968,6 @@ /obj/effect/blocker/toxic_water/Group_1, /turf/open/floor/neutral, /area/desert_dam/interior/dam_interior/engine_room) -"aEN" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_central_south) "aEO" = ( /obj/structure/desertdam/decals/road_stop{ icon_state = "stop_decal5" @@ -7958,20 +7136,6 @@ /obj/structure/prop/dam/large_boulder/boulder1, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_northwest) -"aFv" = ( -/obj/effect/decal/sand_overlay/sand1/corner1, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached4, -/area/desert_dam/exterior/valley/valley_telecoms) -"aFw" = ( -/obj/effect/decal/sand_overlay/sand1, -/turf/open/asphalt/cement/cement4, -/area/desert_dam/exterior/valley/valley_telecoms) -"aFx" = ( -/obj/effect/decal/sand_overlay/sand1/corner1{ - dir = 8 - }, -/turf/open/asphalt/cement/cement4, -/area/desert_dam/exterior/valley/valley_telecoms) "aFy" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -8557,13 +7721,6 @@ /obj/item/tool/shovel, /turf/open/asphalt/tile, /area/desert_dam/exterior/valley/valley_crashsite) -"aHK" = ( -/obj/structure/stairs, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/valley_crashsite) "aHL" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -8571,13 +7728,6 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/prison/bright_clean2, /area/desert_dam/interior/lab_northeast/east_lab_west_hallway) -"aHM" = ( -/obj/structure/stairs, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/valley_crashsite) "aHN" = ( /obj/structure/flora/grass/desert/heavygrass_3, /turf/open/desert/dirt, @@ -8634,12 +7784,6 @@ }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached20, /area/desert_dam/interior/dam_interior/south_tunnel_entrance) -"aHZ" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/desert/rock, -/area/desert_dam/exterior/valley/valley_crashsite) "aIa" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 1 @@ -8679,22 +7823,9 @@ }, /turf/open/floor/whitegreen/east, /area/desert_dam/building/lab_northwest/west_lab_xenoflora) -"aIh" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_central_south) "aIi" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached20, /area/desert_dam/interior/dam_interior/south_tunnel_entrance) -"aIj" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/desert/rock, -/area/desert_dam/exterior/valley/valley_crashsite) "aIk" = ( /obj/structure/flora/grass/desert/lightgrass_6, /turf/open/desert/dirt, @@ -8754,28 +7885,10 @@ }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached4, /area/desert_dam/exterior/valley/valley_crashsite) -"aIB" = ( -/obj/structure/stairs{ - dir = 4 - }, -/obj/structure/platform{ - dir = 1 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached9, -/area/desert_dam/exterior/valley/valley_crashsite) "aIC" = ( /obj/effect/landmark/monkey_spawn, /turf/open/desert/excavation/component1/northeast, /area/desert_dam/exterior/valley/valley_crashsite) -"aID" = ( -/obj/structure/stairs{ - dir = 8 - }, -/obj/structure/platform{ - dir = 1 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached9, -/area/desert_dam/exterior/valley/valley_crashsite) "aIE" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 5 @@ -8823,52 +7936,22 @@ "aIO" = ( /turf/open/floor/whitegreencorner/west, /area/desert_dam/building/lab_northwest/west_lab_xenoflora) -"aIP" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_telecoms) "aIQ" = ( /obj/effect/decal/sand_overlay/sand1/corner1{ dir = 8 }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached12, /area/desert_dam/exterior/valley/valley_crashsite) -"aIR" = ( -/obj/structure/stairs{ - dir = 4 - }, -/obj/structure/platform, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached15, -/area/desert_dam/exterior/valley/valley_crashsite) "aIS" = ( /obj/effect/blocker/toxic_water/Group_2, /turf/open/gm/river/desert/shallow_edge/west, /area/desert_dam/exterior/river/riverside_central_north) -"aIT" = ( -/obj/structure/stairs, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/asphalt/cement_sunbleached, -/area/desert_dam/exterior/valley/valley_telecoms) "aIU" = ( /turf/open/desert/excavation/component2, /area/desert_dam/exterior/valley/valley_crashsite) "aIV" = ( /turf/open/desert/excavation/component2/north, /area/desert_dam/exterior/valley/valley_crashsite) -"aIW" = ( -/obj/structure/stairs{ - dir = 8 - }, -/obj/structure/platform, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached15, -/area/desert_dam/exterior/valley/valley_crashsite) "aIX" = ( /turf/open/desert/excavation/component2/east, /area/desert_dam/exterior/valley/valley_crashsite) @@ -8968,16 +8051,6 @@ /obj/effect/blocker/toxic_water/Group_2, /turf/open/gm/river/desert/deep, /area/desert_dam/exterior/river/riverside_central_north) -"aJz" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_central_south) "aJA" = ( /obj/structure/flora/bush/desert{ icon_state = "tree_4" @@ -9025,18 +8098,6 @@ }, /turf/open/desert/dirt/dirt2, /area/desert_dam/exterior/valley/valley_crashsite) -"aJN" = ( -/obj/structure/platform, -/turf/open/desert/excavation/component5/southeast, -/area/desert_dam/exterior/valley/valley_crashsite) -"aJO" = ( -/obj/structure/platform, -/turf/open/desert/excavation/component5/southwest, -/area/desert_dam/exterior/valley/valley_crashsite) -"aJP" = ( -/obj/structure/platform, -/turf/open/desert/excavation/component5/northeast, -/area/desert_dam/exterior/valley/valley_crashsite) "aJQ" = ( /turf/open/desert/desert_shore/desert_shore1, /area/desert_dam/interior/caves/central_caves) @@ -9084,15 +8145,6 @@ }, /turf/open/desert/excavation/component6/east, /area/desert_dam/exterior/valley/valley_crashsite) -"aKb" = ( -/obj/effect/decal/sand_overlay/sand1{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/asphalt/cement_sunbleached, -/area/desert_dam/exterior/valley/valley_telecoms) "aKc" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/freezerfloor, @@ -9144,15 +8196,6 @@ /obj/structure/stairs, /turf/open/asphalt/cement_sunbleached/cement_sunbleached3, /area/desert_dam/exterior/valley/valley_telecoms) -"aKo" = ( -/obj/effect/decal/sand_overlay/sand1{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached1, -/area/desert_dam/exterior/valley/valley_cargo) "aKp" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ dir = 2; @@ -9160,15 +8203,6 @@ }, /turf/open/floor/white, /area/desert_dam/building/lab_northwest/west_lab_xenoflora) -"aKq" = ( -/obj/effect/decal/sand_overlay/sand1{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached3, -/area/desert_dam/exterior/valley/valley_cargo) "aKs" = ( /turf/open/desert/rock/deep/transition/southwest, /area/desert_dam/interior/dam_interior/workshop) @@ -9179,14 +8213,6 @@ }, /turf/open/asphalt/tile, /area/desert_dam/exterior/valley/valley_cargo) -"aKu" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_central_south) "aKv" = ( /obj/effect/decal/cleanable/dirt, /turf/open/asphalt/cement_sunbleached/cement_sunbleached18, @@ -9224,23 +8250,6 @@ /obj/structure/flora/grass/desert/heavygrass_5, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) -"aKE" = ( -/obj/structure/platform_decoration, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_crashsite) -"aKF" = ( -/obj/structure/platform, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_crashsite) -"aKG" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/obj/effect/decal/sand_overlay/sand1{ - dir = 4 - }, -/turf/open/asphalt/cement_sunbleached, -/area/desert_dam/exterior/valley/valley_crashsite) "aKH" = ( /obj/structure/flora/grass/desert/lightgrass_12, /turf/open/desert/dirt, @@ -9251,25 +8260,6 @@ }, /turf/open/desert/dirt, /area/desert_dam/interior/caves/central_caves) -"aKJ" = ( -/obj/structure/platform_decoration, -/obj/effect/decal/sand_overlay/sand1{ - dir = 8 - }, -/turf/open/asphalt/cement_sunbleached, -/area/desert_dam/exterior/valley/valley_crashsite) -"aKK" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_crashsite) -"aKL" = ( -/obj/effect/decal/sand_overlay/sand1{ - dir = 10 - }, -/turf/open/desert/excavation/component7/southeast, -/area/desert_dam/exterior/valley/valley_crashsite) "aKM" = ( /obj/effect/decal/sand_overlay/sand1, /turf/open/desert/excavation/component7/southwest, @@ -9287,31 +8277,6 @@ }, /turf/open/desert/dirt/dirt2, /area/desert_dam/interior/caves/central_caves) -"aKQ" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_crashsite) -"aKR" = ( -/obj/structure/stairs{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/asphalt/cement_sunbleached, -/area/desert_dam/exterior/valley/valley_crashsite) -"aKS" = ( -/obj/structure/stairs{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/asphalt/cement_sunbleached, -/area/desert_dam/exterior/valley/valley_crashsite) "aKT" = ( /obj/effect/decal/sand_overlay/sand1, /obj/effect/decal/sand_overlay/sand1{ @@ -9369,23 +8334,6 @@ /obj/effect/blocker/toxic_water/Group_2, /turf/open/gm/river/desert/shallow_corner/north, /area/desert_dam/exterior/river/riverside_central_north) -"aLe" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_crashsite) -"aLf" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/asteroidplating, -/area/desert_dam/exterior/valley/valley_crashsite) "aLg" = ( /obj/effect/decal/warning_stripes{ icon_state = "N" @@ -9395,30 +8343,6 @@ "aLh" = ( /turf/open/floor/coagulation/icon0_4, /area/desert_dam/exterior/valley/valley_mining) -"aLi" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/asteroidplating, -/area/desert_dam/exterior/valley/valley_crashsite) -"aLj" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/asteroidplating, -/area/desert_dam/exterior/valley/valley_crashsite) -"aLk" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E" - }, -/turf/open/floor/asteroidplating, -/area/desert_dam/exterior/valley/valley_crashsite) "aLl" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -9434,13 +8358,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/asteroidplating, /area/desert_dam/exterior/valley/valley_crashsite) -"aLo" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/asteroidplating, -/area/desert_dam/exterior/valley/valley_crashsite) "aLp" = ( /obj/effect/decal/warning_stripes{ icon_state = "E" @@ -9459,113 +8376,22 @@ }, /turf/open/floor/plating/warnplate/northwest, /area/desert_dam/exterior/valley/valley_crashsite) -"aLs" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/asteroidplating, -/area/desert_dam/exterior/valley/valley_crashsite) "aLt" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" }, /turf/open/floor/asteroidplating, /area/desert_dam/exterior/valley/valley_crashsite) -"aLu" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E" - }, -/turf/open/floor/asteroidplating, -/area/desert_dam/exterior/valley/valley_crashsite) "aLv" = ( /obj/structure/machinery/colony_floodlight, /turf/open/asphalt/cement_sunbleached/cement_sunbleached9, /area/desert_dam/exterior/valley/valley_labs) -"aLw" = ( -/obj/structure/stairs, -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached3, -/area/desert_dam/exterior/valley/valley_crashsite) -"aLx" = ( -/obj/structure/stairs, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached1, -/area/desert_dam/exterior/valley/valley_crashsite) "aLy" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 4 }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached1, /area/desert_dam/exterior/landing_pad_two) -"aLz" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/desert/dirt/desert_transition_edge1/northeast, -/area/desert_dam/exterior/valley/valley_crashsite) -"aLA" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached3, -/area/desert_dam/exterior/valley/valley_crashsite) -"aLB" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/effect/decal/sand_overlay/sand1{ - dir = 8 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached1, -/area/desert_dam/exterior/valley/valley_crashsite) -"aLC" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_crashsite) -"aLD" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_crashsite) -"aLE" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/desert/dirt/desert_transition_edge1/east, -/area/desert_dam/exterior/valley/valley_crashsite) -"aLF" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_crashsite) -"aLG" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/sand_overlay/sand1{ - dir = 4 - }, -/turf/open/asphalt/cement_sunbleached, -/area/desert_dam/exterior/valley/valley_crashsite) "aLH" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/prison/southwest, @@ -9658,13 +8484,6 @@ "aLX" = ( /turf/open/desert/rock/deep/transition, /area/desert_dam/interior/dam_interior/workshop) -"aLY" = ( -/obj/structure/desertdam/decals/road_edge{ - icon_state = "road_edge_decal10" - }, -/obj/structure/disposalpipe/segment, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_telecoms) "aLZ" = ( /obj/effect/decal/sand_overlay/sand1/corner1{ dir = 1 @@ -9680,22 +8499,6 @@ "aMb" = ( /turf/open/floor/whitegreenfull, /area/desert_dam/building/lab_northwest/west_lab_xenoflora) -"aMc" = ( -/obj/effect/decal/sand_overlay/sand1/corner1{ - dir = 4 - }, -/obj/effect/decal/sand_overlay/sand1/corner1{ - dir = 1 - }, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/valley_crashsite) -"aMd" = ( -/obj/effect/decal/sand_overlay/sand1{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/desert_dam/exterior/valley/valley_crashsite) "aMe" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 8 @@ -9730,21 +8533,6 @@ }, /turf/open/gm/river/desert/deep/toxic, /area/desert_dam/building/water_treatment_two) -"aMm" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/river/riverside_east) -"aMn" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_2, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/river/riverside_east) "aMo" = ( /obj/structure/cargo_container/trijent/left/alt, /turf/open/floor/plating, @@ -10220,13 +9008,6 @@ }, /turf/open/gm/river/desert/deep/toxic, /area/desert_dam/building/water_treatment_two) -"aOe" = ( -/obj/structure/desertdam/decals/road_edge{ - icon_state = "road_edge_decal2" - }, -/obj/structure/disposalpipe/segment, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_telecoms) "aOf" = ( /turf/open/desert/dirt/desert_transition_corner1/north, /area/desert_dam/exterior/valley/valley_wilderness) @@ -10478,14 +9259,6 @@ /obj/effect/blocker/toxic_water/Group_2, /turf/open/floor/prison, /area/desert_dam/building/water_treatment_two/purification) -"aPu" = ( -/turf/closed/wall/r_wall/prison, -/area/desert_dam/exterior/valley/valley_telecoms) -"aPv" = ( -/obj/structure/platform_decoration, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/shallow_edge, -/area/desert_dam/exterior/river/riverside_east) "aPw" = ( /obj/structure/cargo_container/trijent/right/alt, /turf/open/asphalt/tile, @@ -10584,36 +9357,9 @@ "aPP" = ( /turf/open/asphalt/tile, /area/desert_dam/exterior/valley/valley_wilderness) -"aPQ" = ( -/obj/structure/desertdam/decals/road_edge{ - icon_state = "road_edge_decal8" - }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_telecoms) -"aPR" = ( -/obj/structure/desertdam/decals/road_edge{ - icon_state = "road_edge_decal3" - }, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_telecoms) "aPS" = ( /turf/open/desert/rock/deep/transition/northwest, /area/desert_dam/interior/dam_interior/north_tunnel) -"aPT" = ( -/obj/structure/desertdam/decals/road_edge{ - icon_state = "road_edge_decal9" - }, -/obj/structure/machinery/door_control{ - id = "garage_dd"; - name = "Garage Lockdown"; - pixel_y = 28 - }, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_telecoms) "aPU" = ( /turf/open/floor/prison/darkyellow2/north, /area/desert_dam/interior/dam_interior/garage) @@ -10637,12 +9383,6 @@ "aPX" = ( /turf/open/floor/coagulation/icon0_5, /area/desert_dam/building/water_treatment_two/purification) -"aPY" = ( -/obj/structure/desertdam/decals/road_edge{ - icon_state = "road_edge_decal4" - }, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_telecoms) "aPZ" = ( /obj/structure/cargo_container/ferret/mid, /turf/open/asphalt/tile, @@ -10654,18 +9394,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/desert_dam/building/water_treatment_two/purification) -"aQb" = ( -/obj/effect/decal/sand_overlay/sand1{ - dir = 4 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached4, -/area/desert_dam/exterior/valley/valley_telecoms) -"aQc" = ( -/obj/effect/decal/sand_overlay/sand1{ - dir = 9 - }, -/turf/open/asphalt/cement_sunbleached, -/area/desert_dam/exterior/valley/valley_telecoms) "aQd" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Filtration" @@ -10735,12 +9463,6 @@ }, /turf/open/floor/prison/darkred2/north, /area/desert_dam/building/security/southern_hallway) -"aQn" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/desert/dirt/desert_transition_edge1/east, -/area/desert_dam/exterior/valley/valley_labs) "aQo" = ( /obj/effect/blocker/toxic_water/Group_2, /obj/structure/filtration/machine_96x96{ @@ -10762,18 +9484,6 @@ /obj/effect/blocker/toxic_water/Group_2, /turf/open/floor/coagulation/icon0_5, /area/desert_dam/building/water_treatment_two/purification) -"aQt" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/asphalt/cement_sunbleached, -/area/desert_dam/exterior/valley/valley_telecoms) -"aQu" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/liquid_fuel, -/obj/effect/decal/cleanable/blood/oil/streak, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_telecoms) "aQv" = ( /obj/structure/cargo_container/ferret/right, /turf/open/asphalt/tile, @@ -10793,17 +9503,6 @@ "aQB" = ( /turf/open/floor/coagulation/icon8_0, /area/desert_dam/building/water_treatment_two/purification) -"aQC" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_telecoms) -"aQE" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_telecoms) "aQF" = ( /obj/effect/blocker/toxic_water/Group_2, /turf/open/floor/coagulation/icon8_0, @@ -10821,17 +9520,6 @@ }, /turf/open/floor/prison/darkred2/north, /area/desert_dam/building/security/southern_hallway) -"aQI" = ( -/obj/effect/decal/sand_overlay/sand1{ - dir = 4 - }, -/turf/open/asphalt/cement_sunbleached, -/area/desert_dam/exterior/valley/valley_telecoms) -"aQJ" = ( -/obj/structure/desertdam/decals/road_edge, -/obj/effect/decal/cleanable/dirt, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_telecoms) "aQK" = ( /obj/effect/decal/cleanable/dirt, /turf/open/asphalt/cement/cement12, @@ -10859,11 +9547,6 @@ name = "reinforced metal wall" }, /area/desert_dam/building/mining/workshop) -"aQQ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/asphalt/cement_sunbleached, -/area/desert_dam/exterior/valley/valley_telecoms) "aQS" = ( /obj/structure/machinery/floodlight/landing, /obj/effect/decal/sand_overlay/sand1{ @@ -10925,15 +9608,6 @@ /obj/structure/filtration/machine_96x96/filtration, /turf/open/floor/coagulation/icon4_8, /area/desert_dam/building/water_treatment_two/purification) -"aRi" = ( -/obj/structure/stairs{ - dir = 8 - }, -/obj/structure/platform{ - dir = 1 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached2, -/area/desert_dam/exterior/valley/valley_wilderness) "aRj" = ( /obj/effect/decal/sand_overlay/sand1/corner1{ dir = 4 @@ -11002,10 +9676,6 @@ }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached12, /area/desert_dam/exterior/valley/valley_medical) -"aRA" = ( -/obj/structure/flora/tree/joshua, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_telecoms) "aRB" = ( /obj/docking_port/stationary/trijent_elevator/occupied{ id = "trijent_lz2"; @@ -11034,13 +9704,6 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_labs) -"aRH" = ( -/obj/structure/stairs{ - dir = 8 - }, -/obj/structure/platform, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached14, -/area/desert_dam/exterior/valley/valley_wilderness) "aRI" = ( /obj/effect/blocker/toxic_water/Group_2, /turf/open/floor/coagulation/icon8_8, @@ -11166,13 +9829,6 @@ }, /turf/open/asphalt/tile, /area/desert_dam/exterior/valley/valley_wilderness) -"aSj" = ( -/obj/structure/desertdam/decals/road_edge, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_telecoms) "aSk" = ( /turf/open/desert/dirt/desert_transition_edge1/west, /area/desert_dam/exterior/valley/valley_wilderness) @@ -11229,12 +9885,6 @@ "aSt" = ( /turf/open/floor/prison/southwest, /area/desert_dam/interior/dam_interior/garage) -"aSu" = ( -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_telecoms) -"aSv" = ( -/turf/open/desert/rock/deep/transition/west, -/area/desert_dam/exterior/valley/valley_telecoms) "aSw" = ( /obj/structure/window/framed/hangar/reinforced, /turf/open/floor/plating, @@ -11291,12 +9941,6 @@ }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached4, /area/desert_dam/exterior/valley/valley_telecoms) -"aSJ" = ( -/obj/effect/decal/sand_overlay/sand1/corner1{ - dir = 1 - }, -/turf/open/asphalt/cement_sunbleached, -/area/desert_dam/exterior/valley/valley_telecoms) "aSK" = ( /turf/open/asphalt/cement_sunbleached, /area/desert_dam/exterior/valley/valley_telecoms) @@ -11306,12 +9950,6 @@ "aSM" = ( /turf/open/floor/coagulation/icon0_4, /area/desert_dam/building/water_treatment_two/purification) -"aSN" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/desert/rock/deep/transition/west, -/area/desert_dam/exterior/valley/valley_telecoms) "aSP" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, @@ -11330,24 +9968,9 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/bright_clean/southwest, /area/desert_dam/building/security/lobby) -"aSV" = ( -/obj/structure/desertdam/decals/road_stop{ - dir = 1; - icon_state = "stop_decal5" - }, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_telecoms) "aSW" = ( /turf/open/desert/rock/deep/transition/north, /area/desert_dam/interior/dam_interior/east_tunnel_entrance) -"aSX" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/desertdam/decals/road_stop{ - dir = 1; - icon_state = "stop_decal5" - }, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_telecoms) "aSY" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -11408,12 +10031,6 @@ /obj/effect/blocker/toxic_water/Group_2, /turf/open/gm/river/desert/shallow_corner/east, /area/desert_dam/exterior/river/riverside_central_north) -"aTl" = ( -/obj/structure/desertdam/decals/road_edge{ - icon_state = "road_edge_decal7" - }, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_telecoms) "aTm" = ( /obj/effect/blocker/toxic_water/Group_2, /turf/open/gm/river/desert/shallow_edge/southeast, @@ -11502,22 +10119,6 @@ "aTH" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached9, /area/desert_dam/exterior/valley/valley_telecoms) -"aTI" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform, -/turf/open/floor/plating, -/area/desert_dam/interior/lab_northeast/east_lab_containment) -"aTJ" = ( -/obj/effect/decal/sand_overlay/sand1, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached15, -/area/desert_dam/exterior/valley/valley_telecoms) -"aTK" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached15, -/area/desert_dam/exterior/valley/valley_telecoms) "aTL" = ( /obj/effect/decal/sand_overlay/sand1/corner1{ dir = 4 @@ -11538,14 +10139,6 @@ /obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/darkyellow2/north, /area/desert_dam/building/mining/workshop) -"aTP" = ( -/obj/structure/desertdam/decals/road_stop{ - dir = 1; - icon_state = "stop_decal5" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_telecoms) "aTQ" = ( /turf/open/asphalt/cement/cement12, /area/desert_dam/interior/dam_interior/western_dam_cave) @@ -11614,10 +10207,6 @@ "aUf" = ( /turf/open/floor/prison/redcorner/north, /area/desert_dam/building/security/lobby) -"aUg" = ( -/obj/structure/prop/dam/boulder/boulder2, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_telecoms) "aUh" = ( /obj/structure/machinery/colony_floodlight, /turf/open/desert/dirt, @@ -11687,21 +10276,6 @@ }, /turf/open/floor/prison/red/north, /area/desert_dam/building/security/lobby) -"aUw" = ( -/obj/structure/desertdam/decals/road_edge{ - icon_state = "road_edge_decal8" - }, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_telecoms) -"aUx" = ( -/obj/structure/desertdam/decals/road_edge{ - icon_state = "road_edge_decal4" - }, -/obj/structure/disposalpipe/junction{ - dir = 4 - }, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_telecoms) "aUz" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Decontamination" @@ -11709,21 +10283,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/bright_clean/southwest, /area/desert_dam/building/water_treatment_two/equipment) -"aUA" = ( -/obj/structure/desertdam/decals/road_edge{ - icon_state = "road_edge_decal4" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_telecoms) -"aUB" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_telecoms) "aUC" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached2, /area/desert_dam/exterior/landing_pad_one) @@ -11739,6 +10298,11 @@ }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached9, /area/desert_dam/exterior/landing_pad_one) +"aUJ" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/shallow_edge/east, +/area/desert_dam/exterior/river/riverside_south) "aUK" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison/bright_clean/southwest, @@ -11747,13 +10311,6 @@ /obj/structure/flora/tree/joshua, /turf/open/desert/dirt/desert_transition_edge1/northeast, /area/desert_dam/exterior/valley/valley_northwest) -"aUM" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_telecoms) "aUN" = ( /turf/open/floor/prison/bright_clean/southwest, /area/desert_dam/building/water_treatment_two/equipment) @@ -12016,23 +10573,6 @@ }, /turf/open/floor/interior/wood, /area/desert_dam/building/security/office) -"aWd" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/desert/rock/deep, -/area/desert_dam/interior/dam_interior/south_tunnel) -"aWe" = ( -/obj/structure/disposalpipe/segment, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_telecoms) -"aWf" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/warning_stripes{ - icon_state = "N" - }, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_telecoms) "aWg" = ( /obj/structure/surface/table, /obj/structure/machinery/computer/atmos_alert, @@ -12089,16 +10629,6 @@ }, /turf/open/floor/carpet7_3/west, /area/desert_dam/building/administration/office) -"aWs" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/desert/desert_shore/desert_shore1/north, -/area/desert_dam/exterior/valley/south_valley_dam) "aWt" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -12135,25 +10665,6 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_wilderness) -"aWC" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/warning_stripes{ - icon_state = "N" - }, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_telecoms) -"aWD" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_telecoms) -"aWE" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N" - }, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_telecoms) "aWF" = ( /turf/open/floor/interior/wood, /area/desert_dam/building/security/office) @@ -12251,13 +10762,6 @@ /obj/structure/prop/dam/boulder/boulder2, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_wilderness) -"aXd" = ( -/obj/structure/desertdam/decals/road_edge{ - icon_state = "road_edge_decal3" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_telecoms) "aXf" = ( /obj/structure/closet/secure_closet/engineering_personal, /obj/effect/landmark/objective_landmark/close, @@ -12442,15 +10946,6 @@ /obj/effect/blocker/toxic_water/Group_2, /turf/open/gm/river/desert/shallow_corner, /area/desert_dam/exterior/river/riverside_central_north) -"aXT" = ( -/obj/structure/stairs{ - dir = 8 - }, -/obj/structure/platform{ - dir = 1 - }, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/valley_wilderness) "aXU" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached13, /area/desert_dam/exterior/valley/valley_wilderness) @@ -12477,14 +10972,6 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/interior/wood, /area/desert_dam/building/security/marshals_office) -"aYa" = ( -/obj/structure/desertdam/decals/road_edge{ - icon_state = "road_edge_decal3" - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_telecoms) "aYb" = ( /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/dirt, @@ -12600,13 +11087,6 @@ }, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_labs) -"aYy" = ( -/obj/structure/stairs{ - dir = 8 - }, -/obj/structure/platform, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/valley_wilderness) "aYz" = ( /turf/open/desert/dirt/desert_transition_edge1/east, /area/desert_dam/exterior/valley/valley_wilderness) @@ -12757,13 +11237,6 @@ "aZc" = ( /turf/open/floor/prison/bluecorner/west, /area/desert_dam/building/administration/hallway) -"aZd" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/valley/valley_labs) "aZe" = ( /obj/effect/blocker/toxic_water/Group_2, /turf/open/gm/river/desert/shallow_edge/northeast, @@ -12900,10 +11373,6 @@ "aZM" = ( /turf/open/floor/interior/wood/alt, /area/desert_dam/building/security/marshals_office) -"aZN" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached4, -/area/desert_dam/exterior/valley/valley_telecoms) "aZO" = ( /obj/structure/machinery/photocopier, /obj/structure/machinery/light{ @@ -12975,13 +11444,6 @@ /obj/structure/disposalpipe/trunk, /turf/open/floor/dark2, /area/desert_dam/building/administration/archives) -"bab" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/desert/desert_shore/shore_edge1, -/area/desert_dam/exterior/river/riverside_central_north) "bac" = ( /obj/effect/blocker/toxic_water/Group_2, /turf/open/desert/desert_shore/shore_corner2, @@ -12989,18 +11451,10 @@ "bad" = ( /turf/open/floor/prison, /area/desert_dam/building/water_treatment_two/hallway) -"bae" = ( -/obj/structure/disposalpipe/segment, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached4, -/area/desert_dam/exterior/valley/valley_telecoms) "baf" = ( /obj/structure/flora/pottedplant, /turf/open/floor/prison, /area/desert_dam/building/water_treatment_two/hallway) -"bah" = ( -/obj/structure/disposalpipe/segment, -/turf/open/asphalt/cement_sunbleached, -/area/desert_dam/exterior/valley/valley_telecoms) "bai" = ( /turf/open/floor/prison/blue/west, /area/desert_dam/building/administration/hallway) @@ -13020,12 +11474,6 @@ /obj/effect/landmark/crap_item, /turf/open/floor/prison/blue/east, /area/desert_dam/building/administration/control_room) -"bam" = ( -/obj/effect/decal/sand_overlay/sand1{ - dir = 8 - }, -/turf/open/asphalt/cement_sunbleached, -/area/desert_dam/exterior/valley/valley_telecoms) "ban" = ( /obj/structure/window/framed/colony/reinforced, /turf/open/floor/plating, @@ -13155,12 +11603,6 @@ /obj/item/tool/pen/blue, /turf/open/floor/dark2, /area/desert_dam/building/administration/archives) -"baI" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/desert/dirt/desert_transition_edge1/southwest, -/area/desert_dam/exterior/valley/valley_northwest) "baL" = ( /obj/structure/machinery/light{ dir = 1 @@ -13339,14 +11781,6 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison/darkbrown2/northwest, /area/desert_dam/building/mining/workshop_foyer) -"bbz" = ( -/turf/open/desert/dirt/desert_transition_corner1/west, -/area/desert_dam/exterior/valley/valley_telecoms) -"bbA" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/decal/cleanable/dirt, -/turf/open/asphalt/cement_sunbleached, -/area/desert_dam/exterior/valley/valley_telecoms) "bbB" = ( /obj/effect/decal/sand_overlay/sand2/corner2, /obj/effect/decal/cleanable/dirt, @@ -13373,12 +11807,6 @@ "bbF" = ( /turf/open/asphalt, /area/desert_dam/exterior/river/riverside_east) -"bbG" = ( -/obj/effect/decal/sand_overlay/sand1{ - dir = 5 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached9, -/area/desert_dam/exterior/valley/valley_telecoms) "bbH" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 1 @@ -13471,30 +11899,6 @@ }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached2, /area/desert_dam/exterior/valley/valley_northwest) -"bbZ" = ( -/obj/structure/stairs{ - dir = 4 - }, -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached4, -/area/desert_dam/exterior/valley/valley_northwest) -"bca" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/sand_overlay/sand1{ - dir = 1 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached4, -/area/desert_dam/exterior/valley/valley_northwest) "bcb" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -13513,9 +11917,6 @@ }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached4, /area/desert_dam/exterior/valley/valley_northwest) -"bck" = ( -/turf/open/desert/dirt/desert_transition_corner1/east, -/area/desert_dam/exterior/valley/valley_telecoms) "bcn" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -13543,20 +11944,6 @@ }, /turf/open/floor/prison/bright_clean2, /area/desert_dam/building/administration/meetingrooom) -"bcs" = ( -/obj/structure/stairs{ - dir = 4 - }, -/obj/structure/platform, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached12, -/area/desert_dam/exterior/valley/valley_northwest) -"bct" = ( -/obj/effect/decal/sand_overlay/sand1, -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached12, -/area/desert_dam/exterior/valley/valley_northwest) "bcu" = ( /obj/effect/decal/sand_overlay/sand1, /turf/open/asphalt/cement_sunbleached/cement_sunbleached12, @@ -13612,15 +11999,6 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison/bright_clean2, /area/desert_dam/building/administration/meetingrooom) -"bcF" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/obj/effect/decal/sand_overlay/sand1{ - dir = 4 - }, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/valley_northwest) "bcH" = ( /turf/open/desert/rock/deep/transition/southeast, /area/desert_dam/interior/dam_interior/south_tunnel) @@ -13676,15 +12054,6 @@ /obj/structure/surface/table, /turf/open/floor/prison/darkyellow2/northeast, /area/desert_dam/interior/dam_interior/engine_east_wing) -"bcX" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/decal/sand_overlay/sand1/corner1{ - dir = 1 - }, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/valley_northwest) "bcY" = ( /turf/open/desert/dirt/dirt2, /area/desert_dam/exterior/river/riverside_central_north) @@ -13754,12 +12123,6 @@ /obj/item/paper_bin, /turf/open/floor/wood, /area/desert_dam/building/administration/meetingrooom) -"bdq" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/valley_northwest) "bdt" = ( /obj/effect/blocker/toxic_water/Group_2, /turf/open/desert/desert_shore/shore_corner2/west, @@ -13948,13 +12311,6 @@ /obj/structure/flora/grass/desert/heavygrass_3, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_northwest) -"bek" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/desert/desert_shore/shore_edge1/east, -/area/desert_dam/exterior/river/riverside_central_north) "bel" = ( /turf/open/desert/dirt/desert_transition_corner1/east, /area/desert_dam/interior/caves/central_caves) @@ -14034,9 +12390,6 @@ "beB" = ( /turf/open/desert/dirt/desert_transition_edge1/west, /area/desert_dam/interior/caves/central_caves) -"beC" = ( -/turf/open/desert/rock, -/area/desert_dam/exterior/valley/valley_telecoms) "beD" = ( /obj/structure/flora/grass/desert/heavygrass_4, /turf/open/desert/dirt, @@ -14093,19 +12446,9 @@ "beM" = ( /turf/open/desert/dirt/desert_transition_edge1/southwest, /area/desert_dam/interior/caves/central_caves) -"beN" = ( -/obj/effect/decal/sand_overlay/sand1/corner1{ - dir = 8 - }, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/valley_telecoms) "beO" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached3, /area/desert_dam/exterior/valley/valley_telecoms) -"beP" = ( -/obj/effect/decal/sand_overlay/sand1/corner1, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached12, -/area/desert_dam/exterior/valley/valley_telecoms) "beQ" = ( /obj/structure/surface/table, /obj/item/tool/wrench, @@ -14129,28 +12472,9 @@ /obj/structure/flora/grass/desert/heavygrass_6, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_northwest) -"beW" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached13, -/area/desert_dam/exterior/valley/valley_northwest) -"beX" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached13, -/area/desert_dam/exterior/valley/valley_northwest) "beY" = ( /turf/open/floor/carpet5_1/west, /area/desert_dam/building/administration/overseer_office) -"beZ" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/shallow_edge, -/area/desert_dam/exterior/river/riverside_east) "bfa" = ( /turf/open/floor/carpet9_4/west, /area/desert_dam/building/administration/overseer_office) @@ -14244,22 +12568,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/bright_clean/southwest, /area/desert_dam/building/water_treatment_two/hallway) -"bfs" = ( -/obj/effect/decal/sand_overlay/sand1/corner1{ - dir = 8 - }, -/turf/open/asphalt/cement_sunbleached, -/area/desert_dam/exterior/valley/valley_telecoms) -"bft" = ( -/obj/structure/flora/bush/desert/cactus/multiple{ - icon_state = "cacti_9" - }, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_telecoms) -"bfu" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached14, -/area/desert_dam/exterior/valley/valley_telecoms) "bfw" = ( /obj/structure/machinery/photocopier, /turf/open/floor/wood, @@ -14284,20 +12592,6 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/wood, /area/desert_dam/building/administration/overseer_office) -"bfB" = ( -/obj/structure/stairs, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached3, -/area/desert_dam/exterior/valley/valley_northwest) -"bfC" = ( -/obj/structure/stairs, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached1, -/area/desert_dam/exterior/valley/valley_northwest) "bfD" = ( /obj/structure/filtration/machine_64x128{ icon_state = "filtration_1" @@ -14308,57 +12602,6 @@ /obj/structure/machinery/light, /turf/open/floor/prison, /area/desert_dam/building/water_treatment_two/purification) -"bfG" = ( -/obj/structure/disposalpipe/segment, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached15, -/area/desert_dam/exterior/valley/valley_telecoms) -"bfH" = ( -/obj/structure/prop/dam/large_boulder/boulder2, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_telecoms) -"bfJ" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached3, -/area/desert_dam/exterior/valley/valley_northwest) -"bfK" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/asphalt/cement_sunbleached, -/area/desert_dam/exterior/valley/valley_northwest) -"bfL" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached18, -/area/desert_dam/exterior/valley/valley_northwest) -"bfM" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached9, -/area/desert_dam/exterior/valley/valley_northwest) -"bfN" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/valley_northwest) -"bfO" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/valley_northwest) -"bfP" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/desert/desert_shore/shore_corner2/west, -/area/desert_dam/exterior/river/riverside_central_north) "bfR" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ dir = 2; @@ -14383,15 +12626,6 @@ }, /turf/open/asphalt/cement/cement3, /area/desert_dam/interior/dam_interior/northeastern_tunnel) -"bfV" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/asphalt/cement/cement1, -/area/desert_dam/interior/dam_interior/west_tunnel) "bfX" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, @@ -14426,30 +12660,6 @@ /obj/structure/prop/dam/boulder/boulder2, /turf/open/desert/dirt/desert_transition_edge1/northeast, /area/desert_dam/exterior/landing_pad_one) -"bgf" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached3, -/area/desert_dam/exterior/valley/valley_northwest) -"bgg" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached4, -/area/desert_dam/exterior/valley/valley_northwest) -"bgh" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/asphalt/cement_sunbleached, -/area/desert_dam/exterior/valley/valley_northwest) -"bgi" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/valley/north_valley_dam) "bgj" = ( /turf/open/desert/dirt/dirt2, /area/desert_dam/exterior/valley/north_valley_dam) @@ -14599,10 +12809,6 @@ "bgR" = ( /turf/open/desert/dirt/desert_transition_edge1/east, /area/desert_dam/exterior/valley/north_valley_dam) -"bgU" = ( -/obj/structure/platform, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/river/riverside_central_north) "bgV" = ( /obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison, @@ -14626,11 +12832,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/bright_clean/southwest, /area/desert_dam/building/water_treatment_two/equipment) -"bhc" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_central_south) "bhe" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 4 @@ -14740,12 +12941,6 @@ }, /turf/open/floor/prison/floor_plate/southwest, /area/desert_dam/interior/dam_interior/hanger) -"bhC" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached17, -/area/desert_dam/exterior/valley/valley_northwest) "bhD" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 1 @@ -14774,12 +12969,6 @@ "bhL" = ( /turf/open/floor/plating/warnplate/southwest, /area/desert_dam/building/substation/northwest) -"bhM" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/desert/rock/deep/transition/north, -/area/desert_dam/interior/dam_interior/south_tunnel) "bhN" = ( /obj/structure/largecrate/random/barrel/blue, /turf/open/floor/prison/southwest, @@ -14839,15 +13028,6 @@ "bib" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached1, /area/desert_dam/exterior/valley/north_valley_dam) -"bic" = ( -/obj/structure/stairs{ - dir = 4 - }, -/obj/structure/platform{ - dir = 1 - }, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/bar_valley_dam) "bif" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 8 @@ -14862,13 +13042,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/bright_clean/southwest, /area/desert_dam/building/water_treatment_two/lobby) -"bii" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/river/riverside_east) "bij" = ( /turf/open/asphalt/cement/cement4, /area/desert_dam/exterior/valley/valley_wilderness) @@ -14924,13 +13097,6 @@ "bit" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached3, /area/desert_dam/exterior/valley/north_valley_dam) -"biu" = ( -/obj/structure/stairs{ - dir = 4 - }, -/obj/structure/platform, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/bar_valley_dam) "biw" = ( /obj/structure/machinery/colony_floodlight, /turf/open/desert/dirt, @@ -15147,14 +13313,6 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/north_valley_dam) -"bjs" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_2, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_central_north) "bju" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached15, /area/desert_dam/exterior/valley/north_valley_dam) @@ -15189,6 +13347,12 @@ icon_state = "swall11" }, /area/desert_dam/interior/dam_interior/hanger) +"bjD" = ( +/obj/effect/decal/sand_overlay/sand1/corner1{ + dir = 4 + }, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_security) "bjE" = ( /obj/effect/decal/sand_overlay/sand1, /turf/open/asphalt/cement_sunbleached/cement_sunbleached18, @@ -15214,19 +13378,6 @@ }, /turf/open/floor/interior/wood, /area/desert_dam/building/security/detective) -"bjK" = ( -/obj/effect/blocker/toxic_water/Group_2, -/obj/structure/platform_decoration, -/turf/open/gm/river/desert/shallow, -/area/desert_dam/exterior/river/riverside_central_north) -"bjL" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform/stair_cut/alt, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/river/riverside_central_north) "bjM" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached13, /area/desert_dam/exterior/valley/north_valley_dam) @@ -15287,12 +13438,6 @@ "bkb" = ( /turf/open/desert/dirt/desert_transition_corner1/east, /area/desert_dam/exterior/valley/valley_mining) -"bkc" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/asphalt/cement/cement3, -/area/desert_dam/interior/dam_interior/central_tunnel) "bkf" = ( /turf/open/desert/dirt/desert_transition_edge1/northeast, /area/desert_dam/exterior/valley/north_valley_dam) @@ -15492,13 +13637,6 @@ /obj/structure/machinery/light, /turf/open/floor/prison, /area/desert_dam/building/water_treatment_two/lobby) -"blg" = ( -/obj/effect/blocker/toxic_water/Group_2, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/gm/river/desert/shallow_edge/northeast, -/area/desert_dam/exterior/river/riverside_central_north) "blh" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal5" @@ -15885,6 +14023,12 @@ "bmG" = ( /turf/open/floor/prison/southwest, /area/desert_dam/interior/dam_interior/tech_storage) +"bmH" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "xgib2" + }, +/turf/open/floor/prison/yellowcorner/east, +/area/desert_dam/building/hydroponics/hydroponics) "bmI" = ( /obj/structure/machinery/cm_vending/sorted/tech/tool_storage, /turf/open/floor/prison/blue/northeast, @@ -15952,10 +14096,6 @@ }, /turf/open/floor/interior/wood, /area/desert_dam/building/security/marshals_office) -"bmY" = ( -/obj/structure/flora/grass/desert/lightgrass_9, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_telecoms) "bnb" = ( /obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/interior/wood, @@ -16031,12 +14171,6 @@ /obj/effect/decal/sand_overlay/sand1/corner1, /turf/open/asphalt/tile, /area/desert_dam/exterior/valley/north_valley_dam) -"bnv" = ( -/obj/structure/flora/bush/desert/cactus{ - icon_state = "cactus_4" - }, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_telecoms) "bnw" = ( /turf/open/floor/prison/darkbrown2/north, /area/desert_dam/building/mining/workshop_foyer) @@ -16047,10 +14181,6 @@ }, /turf/open/gm/river/desert/deep/toxic, /area/desert_dam/exterior/river/filtration_a) -"bny" = ( -/obj/structure/flora/grass/desert/lightgrass_8, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_telecoms) "bnz" = ( /obj/effect/decal/sand_overlay/sand1/corner1{ dir = 1 @@ -16066,11 +14196,6 @@ }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached1, /area/desert_dam/exterior/valley/valley_telecoms) -"bnC" = ( -/obj/structure/surface/table, -/obj/item/ammo_magazine/shotgun/slugs, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/valley_telecoms) "bnD" = ( /obj/structure/machinery/door/airlock/almayer/security/glass/colony{ dir = 1; @@ -16160,6 +14285,12 @@ "bnX" = ( /turf/open/floor/prison/darkred2/west, /area/desert_dam/interior/dam_interior/north_tunnel_entrance) +"bnY" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_central_north) "bnZ" = ( /turf/open/floor/prison/floor_plate/southwest, /area/desert_dam/interior/dam_interior/north_tunnel_entrance) @@ -16206,6 +14337,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/bright_clean/southwest, /area/desert_dam/building/security/northern_hallway) +"bok" = ( +/obj/structure/stairs/perspective{ + dir = 10; + icon_state = "p_stair_full" + }, +/obj/structure/platform_decoration/metal/almayer, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/river/riverside_central_north) "bom" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/bright_clean/southwest, @@ -16357,10 +14496,6 @@ name = "reinforced metal wall" }, /area/desert_dam/building/warehouse/breakroom) -"boQ" = ( -/obj/structure/toilet, -/turf/open/floor/prison/bright_clean2, -/area/desert_dam/building/warehouse/breakroom) "boR" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 2; @@ -16431,24 +14566,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/prison/bright_clean/southwest, /area/desert_dam/building/security/northern_hallway) -"bpk" = ( -/obj/structure/barricade/sandbags{ - dir = 1 - }, -/obj/structure/barricade/sandbags{ - dir = 4 - }, -/obj/effect/decal/sand_overlay/sand1{ - dir = 1 - }, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/valley_telecoms) -"bpl" = ( -/obj/effect/decal/sand_overlay/sand1{ - dir = 1 - }, -/turf/open/floor/plating/warnplate/northwest, -/area/desert_dam/exterior/valley/valley_telecoms) "bpq" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/red/north, @@ -16459,12 +14576,6 @@ }, /turf/open/floor/coagulation/icon8_3, /area/desert_dam/exterior/valley/valley_mining) -"bps" = ( -/obj/effect/decal/sand_overlay/sand1{ - dir = 1 - }, -/turf/open/floor/plating/warnplate/north, -/area/desert_dam/exterior/valley/valley_telecoms) "bpt" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 2 @@ -16622,12 +14733,6 @@ }, /turf/open/floor/prison/darkyellow2/north, /area/desert_dam/interior/dam_interior/smes_main) -"bpX" = ( -/obj/effect/decal/sand_overlay/sand1{ - dir = 5 - }, -/turf/open/floor/plating/warnplate/northeast, -/area/desert_dam/exterior/valley/valley_telecoms) "bpY" = ( /obj/structure/window/framed/colony/reinforced, /turf/open/floor/plating, @@ -16642,21 +14747,6 @@ "bqd" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached1, /area/desert_dam/exterior/valley/valley_telecoms) -"bqe" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/asphalt/cement/cement1, -/area/desert_dam/interior/dam_interior/north_tunnel) -"bqf" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/asphalt/cement/cement1, -/area/desert_dam/interior/dam_interior/north_tunnel) "bqg" = ( /turf/open/asphalt/cement/cement1, /area/desert_dam/interior/dam_interior/western_dam_cave) @@ -16664,12 +14754,6 @@ /obj/structure/closet, /turf/open/floor/prison/floor_plate, /area/desert_dam/building/security/evidence) -"bqi" = ( -/obj/structure/barricade/sandbags{ - dir = 4 - }, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/valley_telecoms) "bqk" = ( /obj/structure/machinery/landinglight/ds1/delaythree{ dir = 4 @@ -16784,38 +14868,6 @@ "bqL" = ( /turf/open/floor/prison/blue/east, /area/desert_dam/interior/dam_interior/tech_storage) -"bqM" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/decal/sand_overlay/sand2/corner2{ - dir = 4 - }, -/turf/open/asphalt/cement, -/area/desert_dam/interior/dam_interior/north_tunnel) -"bqN" = ( -/obj/structure/platform_decoration, -/turf/open/asphalt/cement/cement2, -/area/desert_dam/interior/dam_interior/northeastern_tunnel) -"bqO" = ( -/obj/structure/platform, -/obj/structure/machinery/light, -/turf/open/asphalt/cement/cement4, -/area/desert_dam/interior/dam_interior/northeastern_tunnel) -"bqP" = ( -/obj/structure/platform, -/turf/open/asphalt/cement/cement4, -/area/desert_dam/interior/dam_interior/northeastern_tunnel) -"bqQ" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/asphalt/cement/cement4, -/area/desert_dam/interior/dam_interior/northeastern_tunnel) -"bqU" = ( -/obj/structure/platform_decoration, -/turf/open/asphalt/cement/cement4, -/area/desert_dam/interior/dam_interior/northeastern_tunnel) "bqV" = ( /turf/open/floor/prison/darkyellow2/west, /area/desert_dam/interior/dam_interior/engine_west_wing) @@ -16898,12 +14950,6 @@ }, /turf/open/floor/prison/bright_clean/southwest, /area/desert_dam/building/security/northern_hallway) -"brq" = ( -/turf/open/floor/plating/warnplate/west, -/area/desert_dam/exterior/valley/valley_telecoms) -"brr" = ( -/turf/open/floor/plating, -/area/desert_dam/exterior/valley/valley_telecoms) "brs" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ dir = 1; @@ -16921,6 +14967,10 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/prison/bright_clean/southwest, /area/desert_dam/building/security/northern_hallway) +"brw" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_telecoms) "brz" = ( /obj/structure/disposalpipe/segment, /turf/open/asphalt/cement_sunbleached/cement_sunbleached13, @@ -16976,6 +15026,10 @@ "brI" = ( /turf/open/floor/prison/darkredcorners2/east, /area/desert_dam/building/security/holding) +"brJ" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/valley/north_valley_dam) "brK" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -16999,12 +15053,6 @@ /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/prison/blue/southeast, /area/desert_dam/interior/dam_interior/tech_storage) -"brO" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/asphalt/cement/cement3, -/area/desert_dam/interior/dam_interior/northeastern_tunnel) "brP" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal9" @@ -17086,18 +15134,6 @@ "bsh" = ( /turf/open/floor/prison/redcorner/west, /area/desert_dam/building/security/northern_hallway) -"bsi" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/asphalt/cement/cement1, -/area/desert_dam/interior/dam_interior/northwestern_tunnel) -"bsj" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/asphalt/cement/cement3, -/area/desert_dam/interior/dam_interior/north_tunnel) "bsk" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/blood, @@ -17348,9 +15384,6 @@ "btE" = ( /turf/open/desert/rock/deep/transition/east, /area/desert_dam/interior/caves/east_caves) -"btF" = ( -/turf/open/floor/prison/darkyellow2/northwest, -/area/desert_dam/interior/dam_interior/engine_west_wing) "btG" = ( /turf/open/floor/prison/darkyellowcorners2/east, /area/desert_dam/interior/dam_interior/engine_west_wing) @@ -17449,29 +15482,13 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/wood, /area/desert_dam/building/warehouse/breakroom) -"bub" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/asphalt/cement/cement1, -/area/desert_dam/exterior/valley/valley_telecoms) "buc" = ( /turf/open/floor/wood, /area/desert_dam/building/warehouse/breakroom) -"bud" = ( -/obj/structure/target, -/turf/open/floor/plating, -/area/desert_dam/exterior/valley/valley_telecoms) "bue" = ( /obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/darkred2/north, /area/desert_dam/building/security/holding) -"buf" = ( -/obj/effect/decal/sand_overlay/sand1{ - dir = 8 - }, -/turf/open/floor/plating/warnplate/east, -/area/desert_dam/exterior/valley/valley_telecoms) "bug" = ( /obj/structure/closet/secure_closet/security, /obj/item/clothing/suit/armor/vest/security, @@ -17739,15 +15756,11 @@ /obj/structure/surface/rack, /turf/open/floor/prison/bright_clean/southwest, /area/desert_dam/building/mining/workshop) -"bvr" = ( -/obj/structure/stairs{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/asphalt/cement/cement1, -/area/desert_dam/interior/dam_interior/northeastern_tunnel) +"bvt" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_east) "bvu" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, @@ -17886,10 +15899,6 @@ "bwc" = ( /turf/open/asphalt/cement/cement4, /area/desert_dam/interior/dam_interior/northwestern_tunnel) -"bwd" = ( -/obj/structure/platform, -/turf/open/asphalt/cement, -/area/desert_dam/interior/dam_interior/northeastern_tunnel) "bwe" = ( /turf/open/asphalt/cement/cement4, /area/desert_dam/interior/dam_interior/north_tunnel) @@ -18162,15 +16171,6 @@ "bxr" = ( /turf/open/floor/prison/sterile_white, /area/desert_dam/interior/dam_interior/northeastern_tunnel) -"bxs" = ( -/obj/structure/stairs{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/asphalt/cement/cement3, -/area/desert_dam/interior/dam_interior/northeastern_tunnel) "bxt" = ( /turf/open/asphalt/cement/cement1, /area/desert_dam/interior/dam_interior/northeastern_tunnel) @@ -18199,6 +16199,12 @@ /obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison/darkyellow2/west, /area/desert_dam/interior/dam_interior/smes_main) +"bxA" = ( +/obj/effect/decal/sand_overlay/sand1{ + dir = 5 + }, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_security) "bxB" = ( /turf/open/floor/prison/darkyellowcorners2, /area/desert_dam/interior/dam_interior/smes_main) @@ -18236,79 +16242,10 @@ }, /turf/open/floor/prison/bright_clean/southwest, /area/desert_dam/interior/dam_interior/engine_east_wing) -"bxR" = ( -/obj/structure/barricade/sandbags, -/obj/structure/barricade/sandbags{ - dir = 4 - }, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/valley_telecoms) -"bxS" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/shallow_edge/west, -/area/desert_dam/exterior/river/riverside_east) -"bxT" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/shallow_edge/east, -/area/desert_dam/exterior/river/riverside_east) -"bxU" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/desert/desert_shore/shore_corner2/north, -/area/desert_dam/exterior/river/riverside_east) -"bxV" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/shallow_edge/west, -/area/desert_dam/exterior/river/riverside_east) -"bxW" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/shallow_corner, -/area/desert_dam/exterior/river/riverside_east) -"bxX" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/asphalt/cement, -/area/desert_dam/interior/dam_interior/north_tunnel) -"bxY" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/asphalt/cement/cement12, -/area/desert_dam/interior/dam_interior/northwestern_tunnel) "bxZ" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/prison, /area/desert_dam/building/security/staffroom) -"bya" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/asphalt/cement/cement12, -/area/desert_dam/interior/dam_interior/northwestern_tunnel) "byb" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/disposalpipe/segment, @@ -18431,6 +16368,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/bright_clean2, /area/desert_dam/building/administration/hallway) +"byH" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached13, +/area/desert_dam/exterior/valley/valley_northwest) "byL" = ( /obj/structure/machinery/light{ dir = 4 @@ -18482,13 +16423,6 @@ }, /turf/open/floor/plating, /area/desert_dam/building/substation/northwest) -"byY" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/valley_wilderness) "byZ" = ( /turf/open/asphalt/cement/cement3, /area/desert_dam/exterior/valley/valley_wilderness) @@ -18591,12 +16525,6 @@ /obj/structure/largecrate/random/case/double, /turf/open/floor/prison/sterile_white, /area/desert_dam/interior/dam_interior/northwestern_tunnel) -"bzz" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/asphalt/cement/cement12, -/area/desert_dam/interior/dam_interior/northwestern_tunnel) "bzA" = ( /obj/structure/desertdam/decals/road_edge, /turf/open/asphalt, @@ -18604,12 +16532,6 @@ "bzB" = ( /turf/open/asphalt, /area/desert_dam/interior/dam_interior/northwestern_tunnel) -"bzC" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/asphalt/cement/cement15, -/area/desert_dam/interior/dam_interior/northwestern_tunnel) "bzD" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Tool Storage" @@ -18746,6 +16668,12 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/prison/southwest, /area/desert_dam/interior/dam_interior/hangar_storage) +"bAk" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood, +/obj/effect/landmark/corpsespawner/colonist/burst, +/turf/open/floor/prison/kitchen/southwest, +/area/desert_dam/building/cafeteria/cafeteria) "bAm" = ( /obj/structure/window/framed/hangar, /turf/open/floor/plating, @@ -18908,10 +16836,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkred2/east, /area/desert_dam/building/security/southern_hallway) -"bBf" = ( -/obj/effect/decal/sand_overlay/sand1, -/turf/open/floor/plating/warnplate/southwest, -/area/desert_dam/exterior/valley/valley_telecoms) "bBg" = ( /obj/structure/bed/chair, /obj/structure/disposalpipe/segment, @@ -18944,33 +16868,12 @@ "bBm" = ( /turf/open/asphalt/cement, /area/desert_dam/interior/dam_interior/northwestern_tunnel) -"bBo" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/asphalt/cement/cement1, -/area/desert_dam/interior/dam_interior/northwestern_tunnel) "bBp" = ( /turf/open/floor/delivery, /area/desert_dam/interior/dam_interior/northwestern_tunnel) "bBq" = ( /turf/open/floor/delivery, /area/desert_dam/interior/dam_interior/north_tunnel) -"bBr" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/asphalt/cement, -/area/desert_dam/interior/dam_interior/north_tunnel) -"bBs" = ( -/obj/structure/stairs{ - dir = 8 - }, -/obj/structure/platform{ - dir = 1 - }, -/turf/open/asphalt/cement, -/area/desert_dam/interior/dam_interior/north_tunnel) "bBt" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic, /obj/structure/pipes/standard/simple/hidden/green, @@ -19040,15 +16943,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt/cement/cement12, /area/desert_dam/interior/dam_interior/north_tunnel) -"bBQ" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/asphalt/cement/cement3, -/area/desert_dam/interior/dam_interior/northeastern_tunnel) "bBR" = ( /turf/open/floor/prison/darkbrown2/east, /area/desert_dam/building/mining/workshop_foyer) @@ -19078,30 +16972,6 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/asphalt/cement, /area/desert_dam/interior/dam_interior/northwestern_tunnel) -"bCh" = ( -/obj/structure/stairs{ - dir = 4 - }, -/obj/structure/platform, -/turf/open/asphalt/cement, -/area/desert_dam/interior/dam_interior/northwestern_tunnel) -"bCi" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/asphalt/cement/cement1, -/area/desert_dam/interior/dam_interior/northwestern_tunnel) -"bCj" = ( -/obj/structure/platform_decoration, -/turf/open/asphalt/cement, -/area/desert_dam/interior/dam_interior/north_tunnel) -"bCk" = ( -/obj/structure/stairs{ - dir = 8 - }, -/obj/structure/platform, -/turf/open/asphalt/cement, -/area/desert_dam/interior/dam_interior/north_tunnel) "bCm" = ( /obj/structure/machinery/power/apc/no_power/north, /obj/effect/decal/sand_overlay/sand2{ @@ -19245,39 +17115,9 @@ }, /turf/open/floor/prison/sterile_white, /area/desert_dam/interior/dam_interior/north_tunnel) -"bCW" = ( -/obj/structure/stairs{ - dir = 4 - }, -/obj/structure/platform{ - dir = 1 - }, -/turf/open/asphalt/cement, -/area/desert_dam/interior/dam_interior/north_tunnel) -"bCX" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/asphalt/cement/cement14, -/area/desert_dam/interior/dam_interior/north_tunnel) "bCY" = ( /turf/open/floor/delivery, /area/desert_dam/interior/dam_interior/northeastern_tunnel) -"bCZ" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/asphalt/cement, -/area/desert_dam/interior/dam_interior/northeastern_tunnel) -"bDa" = ( -/obj/structure/stairs{ - dir = 8 - }, -/obj/structure/platform{ - dir = 1 - }, -/turf/open/asphalt/cement, -/area/desert_dam/interior/dam_interior/northeastern_tunnel) "bDb" = ( /turf/open/asphalt/cement/cement4, /area/desert_dam/interior/dam_interior/northeastern_tunnel) @@ -19360,6 +17200,11 @@ "bDp" = ( /turf/open/floor/prison/bright_clean/southwest, /area/desert_dam/interior/dam_interior/control_room) +"bDq" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/blocker/toxic_water, +/turf/open/desert/desert_shore/desert_shore1/north, +/area/desert_dam/exterior/river_mouth/southern) "bDu" = ( /obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/neutral, @@ -19415,12 +17260,6 @@ }, /turf/open/floor/prison, /area/desert_dam/building/security/staffroom) -"bDK" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/asphalt/cement/cement12, -/area/desert_dam/interior/dam_interior/north_tunnel) "bDL" = ( /turf/open/floor/prison/darkred2/north, /area/desert_dam/building/security/southern_hallway) @@ -19501,26 +17340,6 @@ }, /turf/open/floor/prison/floor_marked/southwest, /area/desert_dam/interior/dam_interior/hangar_storage) -"bEg" = ( -/obj/structure/stairs, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/asphalt/cement/cement3, -/area/desert_dam/interior/dam_interior/northwestern_tunnel) -"bEh" = ( -/obj/structure/stairs, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/asphalt/cement, -/area/desert_dam/interior/dam_interior/northwestern_tunnel) -"bEi" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/asphalt/cement/cement15, -/area/desert_dam/interior/dam_interior/north_tunnel) "bEj" = ( /obj/effect/decal/sand_overlay/sand2/corner2{ dir = 4 @@ -19544,33 +17363,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/southwest, /area/desert_dam/interior/dam_interior/auxilary_tool_storage) -"bEp" = ( -/obj/structure/platform, -/turf/open/asphalt/cement/cement4, -/area/desert_dam/interior/dam_interior/northwestern_tunnel) -"bEq" = ( -/obj/structure/stairs{ - dir = 4 - }, -/obj/structure/platform, -/turf/open/asphalt/cement, -/area/desert_dam/interior/dam_interior/north_tunnel) -"bEr" = ( -/obj/structure/platform, -/obj/structure/machinery/light, -/turf/open/asphalt/cement/cement4, -/area/desert_dam/interior/dam_interior/northwestern_tunnel) -"bEu" = ( -/obj/structure/platform_decoration, -/turf/open/asphalt/cement, -/area/desert_dam/interior/dam_interior/northeastern_tunnel) -"bEv" = ( -/obj/structure/stairs{ - dir = 8 - }, -/obj/structure/platform, -/turf/open/asphalt/cement, -/area/desert_dam/interior/dam_interior/northeastern_tunnel) "bEw" = ( /turf/open/asphalt/cement, /area/desert_dam/interior/dam_interior/northeastern_tunnel) @@ -19846,15 +17638,6 @@ "bFs" = ( /turf/open/floor/prison/darkredcorners2/north, /area/desert_dam/building/security/southern_hallway) -"bFt" = ( -/obj/effect/decal/sand_overlay/sand1, -/turf/open/floor/plating/warnplate, -/area/desert_dam/exterior/valley/valley_telecoms) -"bFu" = ( -/obj/structure/target, -/obj/effect/decal/sand_overlay/sand1, -/turf/open/floor/plating/warnplate, -/area/desert_dam/exterior/valley/valley_telecoms) "bFv" = ( /obj/structure/surface/table, /obj/item/evidencebag, @@ -19882,11 +17665,6 @@ /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/prison, /area/desert_dam/building/security/staffroom) -"bFA" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/desert/desert_shore/desert_shore1/west, -/area/desert_dam/exterior/river/riverside_central_north) "bFB" = ( /obj/structure/machinery/landinglight/ds1{ dir = 1 @@ -19925,31 +17703,6 @@ "bFK" = ( /turf/open/floor/prison/darkbrown3/north, /area/desert_dam/interior/dam_interior/hangar_storage) -"bFL" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/asphalt/cement, -/area/desert_dam/interior/dam_interior/northwestern_tunnel) -"bFM" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/asphalt/cement/cement9, -/area/desert_dam/interior/dam_interior/north_tunnel) -"bFN" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/asphalt/cement, -/area/desert_dam/interior/dam_interior/northwestern_tunnel) -"bFO" = ( -/obj/structure/platform_decoration, -/turf/open/asphalt/cement/cement2, -/area/desert_dam/interior/dam_interior/north_tunnel) "bFP" = ( /obj/structure/machinery/light, /turf/open/floor/prison/sterile_white, @@ -20064,10 +17817,6 @@ }, /turf/open/floor/prison/darkbrown2/east, /area/desert_dam/building/mining/workshop_foyer) -"bGu" = ( -/obj/structure/platform, -/turf/open/asphalt/cement/cement4, -/area/desert_dam/interior/dam_interior/central_tunnel) "bGv" = ( /obj/structure/surface/table, /obj/item/explosive/grenade/flashbang, @@ -20433,15 +18182,6 @@ }, /turf/open/floor/prison/bright_clean/southwest, /area/desert_dam/interior/dam_interior/hangar_storage) -"bHR" = ( -/obj/structure/stairs{ - dir = 4 - }, -/obj/structure/platform{ - dir = 1 - }, -/turf/open/asphalt/cement, -/area/desert_dam/interior/dam_interior/northwestern_tunnel) "bHS" = ( /obj/structure/desertdam/decals/road_stop{ dir = 8; @@ -20529,6 +18269,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/bright_clean/southwest, /area/desert_dam/interior/dam_interior/smes_main) +"bIp" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/weapon/gun/revolver/cmb, +/turf/open/floor/prison/bright_clean/southwest, +/area/desert_dam/building/water_treatment_two/control_room) "bIq" = ( /turf/open/floor/prison/darkyellowcorners2/north, /area/desert_dam/interior/dam_interior/smes_backup) @@ -20612,6 +18357,11 @@ "bIK" = ( /turf/open/desert/rock/deep/transition, /area/desert_dam/interior/caves/east_caves) +"bIL" = ( +/obj/effect/landmark/corpsespawner/wygoon, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison/bright_clean/southwest, +/area/desert_dam/interior/lab_northeast/east_lab_security_armory) "bIR" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -20622,12 +18372,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkred2/northeast, /area/desert_dam/building/security/southern_hallway) -"bIU" = ( -/obj/effect/decal/sand_overlay/sand1{ - dir = 6 - }, -/turf/open/floor/plating/warnplate/southeast, -/area/desert_dam/exterior/valley/valley_telecoms) "bIV" = ( /obj/structure/surface/table/woodentable, /obj/effect/landmark/good_item, @@ -20672,32 +18416,14 @@ "bJf" = ( /turf/open/floor/prison/darkbrown3, /area/desert_dam/interior/dam_interior/hangar_storage) -"bJg" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/asphalt/cement, -/area/desert_dam/interior/dam_interior/northwestern_tunnel) "bJh" = ( /turf/closed/wall/hangar{ name = "reinforced metal wall" }, /area/desert_dam/interior/dam_interior/north_tunnel) -"bJi" = ( -/obj/structure/stairs, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/asphalt/cement/cement3, -/area/desert_dam/interior/dam_interior/north_tunnel) "bJj" = ( /turf/open/asphalt/cement/cement1, /area/desert_dam/interior/dam_interior/north_tunnel) -"bJk" = ( -/obj/structure/platform, -/obj/structure/machinery/light, -/turf/open/asphalt/cement/cement4, -/area/desert_dam/interior/dam_interior/central_tunnel) "bJl" = ( /obj/structure/surface/table/reinforced, /obj/structure/machinery/light{ @@ -20815,11 +18541,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkred2/southeast, /area/desert_dam/building/security/southern_hallway) -"bJN" = ( -/obj/effect/blocker/toxic_water/Group_2, -/obj/structure/platform, -/turf/open/gm/river/desert/shallow_edge/west, -/area/desert_dam/exterior/river/riverside_central_north) "bJO" = ( /turf/open/floor/prison/darkredcorners2/southwest, /area/desert_dam/building/security/staffroom) @@ -20945,12 +18666,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt/cement/cement4, /area/desert_dam/interior/dam_interior/workshop) -"bKv" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/asphalt/cement, -/area/desert_dam/interior/dam_interior/north_tunnel) "bKw" = ( /obj/structure/surface/table/reinforced, /obj/effect/spawner/random/technology_scanner, @@ -21223,14 +18938,10 @@ "bLE" = ( /turf/open/floor/prison/darkyellow2/southeast, /area/desert_dam/interior/dam_interior/smes_backup) -"bLF" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_central_south) +"bLH" = ( +/obj/structure/desertdam/decals/road_edge, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_security) "bLJ" = ( /obj/effect/blocker/toxic_water, /turf/open/gm/river/desert/deep, @@ -21413,27 +19124,6 @@ /obj/structure/surface/table, /turf/open/floor/prison/darkred2/north, /area/desert_dam/building/security/warden) -"bMt" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/desert/desert_shore/desert_shore1/west, -/area/desert_dam/exterior/river/riverside_central_north) -"bMu" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/desert/desert_shore/shore_corner2/east, -/area/desert_dam/exterior/river/riverside_central_north) -"bMv" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/desert/desert_shore/desert_shore1/east, -/area/desert_dam/exterior/river/riverside_central_north) "bMw" = ( /obj/structure/window/framed/hangar/reinforced, /turf/open/floor/plating, @@ -21630,30 +19320,6 @@ /obj/structure/disposalpipe/segment, /turf/open/asphalt/cement_sunbleached/cement_sunbleached1, /area/desert_dam/exterior/valley/south_valley_dam) -"bNr" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/shallow_edge/west, -/area/desert_dam/exterior/river/riverside_central_south) -"bNs" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/shallow_edge/west, -/area/desert_dam/exterior/river/riverside_central_south) -"bNt" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/desert/desert_shore/shore_edge1/west, -/area/desert_dam/exterior/river/riverside_central_north) "bNu" = ( /obj/effect/landmark/xeno_spawn, /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -21768,14 +19434,6 @@ /obj/structure/machinery/autolathe, /turf/open/floor/prison/sterile_white, /area/desert_dam/interior/dam_interior/workshop) -"bOb" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform, -/obj/structure/machinery/light, -/turf/open/asphalt/cement, -/area/desert_dam/interior/dam_interior/northwestern_tunnel) "bOc" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -21787,23 +19445,6 @@ /obj/effect/decal/sand_overlay/sand1/corner1, /turf/open/asphalt/cement_sunbleached/cement_sunbleached1, /area/desert_dam/exterior/valley/valley_telecoms) -"bOh" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/asphalt/cement, -/area/desert_dam/interior/dam_interior/central_tunnel) -"bOi" = ( -/obj/structure/platform_decoration, -/turf/open/asphalt/cement, -/area/desert_dam/interior/dam_interior/central_tunnel) -"bOj" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/asphalt/cement, -/area/desert_dam/interior/dam_interior/northeastern_tunnel) "bOk" = ( /turf/open/floor/prison/darkyellow2/west, /area/desert_dam/interior/dam_interior/primary_tool_storage) @@ -21857,23 +19498,6 @@ /obj/effect/blocker/toxic_water/Group_1, /turf/open/gm/river/desert/deep, /area/desert_dam/exterior/river/riverside_central_south) -"bOv" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_central_south) -"bOw" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/shallow_edge/east, -/area/desert_dam/exterior/river/riverside_central_north) -"bOx" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/shallow, -/area/desert_dam/exterior/river/riverside_central_north) "bOz" = ( /obj/structure/stairs{ dir = 4 @@ -21951,12 +19575,6 @@ name = "reinforced metal wall" }, /area/desert_dam/interior/dam_interior/office) -"bOT" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/asphalt/cement/cement1, -/area/desert_dam/interior/dam_interior/west_tunnel) "bOU" = ( /obj/structure/desertdam/decals/road_edge, /turf/open/asphalt, @@ -21967,28 +19585,18 @@ }, /turf/open/asphalt, /area/desert_dam/interior/dam_interior/central_tunnel) +"bOW" = ( +/obj/structure/stairs, +/obj/structure/platform/metal/almayer/east, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached15, +/area/desert_dam/exterior/valley/valley_crashsite) "bOX" = ( /turf/closed/wall/r_wall/bunker, /area/desert_dam/interior/dam_interior/central_tunnel) "bOY" = ( /turf/open/floor/prison/sterile_white, /area/desert_dam/interior/dam_interior/central_tunnel) -"bOZ" = ( -/obj/structure/stairs, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/asphalt/cement/cement1, -/area/desert_dam/interior/dam_interior/north_tunnel) -"bPa" = ( -/obj/structure/stairs{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/asphalt/cement/cement3, -/area/desert_dam/interior/dam_interior/central_tunnel) "bPb" = ( /turf/closed/wall/hangar{ name = "reinforced metal wall" @@ -22022,28 +19630,6 @@ }, /turf/open/floor/prison/bright_clean/southwest, /area/desert_dam/interior/dam_interior/primary_tool_storage) -"bPi" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/desert/desert_shore/desert_shore1/west, -/area/desert_dam/exterior/river/riverside_central_south) -"bPj" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/shallow_edge/west, -/area/desert_dam/exterior/river/riverside_central_south) -"bPk" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/desert/desert_shore/desert_shore1/east, -/area/desert_dam/exterior/river/riverside_central_north) "bPl" = ( /obj/effect/blocker/toxic_water/Group_2, /turf/open/asphalt/tile, @@ -22218,15 +19804,6 @@ }, /turf/open/floor/prison/sterile_white, /area/desert_dam/interior/dam_interior/central_tunnel) -"bQa" = ( -/obj/structure/stairs{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/asphalt/cement/cement1, -/area/desert_dam/interior/dam_interior/central_tunnel) "bQb" = ( /turf/open/asphalt/cement, /area/desert_dam/interior/dam_interior/central_tunnel) @@ -22399,9 +19976,6 @@ }, /turf/open/floor/prison/darkredfull2, /area/desert_dam/building/security/warden) -"bQN" = ( -/turf/open/floor/warnwhite/north, -/area/desert_dam/exterior/valley/valley_telecoms) "bQO" = ( /turf/open/gm/river/desert/shallow_edge/east, /area/desert_dam/interior/dam_interior/western_dam_cave) @@ -22447,6 +20021,16 @@ /obj/effect/landmark/survivor_spawner, /turf/open/floor/prison/sterile_white, /area/desert_dam/interior/dam_interior/workshop) +"bQX" = ( +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal8" + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_security) "bQY" = ( /obj/effect/decal/sand_overlay/sand2/corner2, /turf/open/floor/prison/sterile_white, @@ -22541,9 +20125,6 @@ /obj/effect/blocker/toxic_water/Group_2, /turf/open/asphalt, /area/desert_dam/exterior/river/riverside_central_north) -"bRv" = ( -/turf/open/floor/warnwhite/northeast, -/area/desert_dam/exterior/valley/valley_telecoms) "bRw" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 8 @@ -22595,12 +20176,6 @@ "bRF" = ( /turf/open/floor/prison, /area/desert_dam/building/security/armory) -"bRG" = ( -/obj/structure/flora/bush/desert/cactus{ - icon_state = "cactus_8" - }, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_telecoms) "bRH" = ( /turf/open/gm/river/desert/deep, /area/desert_dam/interior/dam_interior/western_dam_cave) @@ -22799,9 +20374,6 @@ "bSu" = ( /turf/open/floor/prison/darkredcorners2/north, /area/desert_dam/building/security/armory) -"bSv" = ( -/turf/open/floor/warnwhite/northwest, -/area/desert_dam/exterior/valley/valley_telecoms) "bSw" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/disposalpipe/segment, @@ -22827,21 +20399,6 @@ "bSB" = ( /turf/open/floor/prison/darkredcorners2/east, /area/desert_dam/building/security/warden) -"bSG" = ( -/obj/structure/holohoop{ - dir = 4 - }, -/turf/open/floor/warnwhite/west, -/area/desert_dam/exterior/valley/valley_telecoms) -"bSH" = ( -/turf/open/floor/white, -/area/desert_dam/exterior/valley/valley_telecoms) -"bSI" = ( -/obj/structure/holohoop{ - dir = 8 - }, -/turf/open/floor/warnwhite/east, -/area/desert_dam/exterior/valley/valley_telecoms) "bSJ" = ( /obj/effect/decal/sand_overlay/sand2{ dir = 4 @@ -23319,25 +20876,10 @@ "bUM" = ( /turf/open/floor/prison/darkredcorners2/north, /area/desert_dam/building/security/warden) -"bUN" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_east) "bUQ" = ( /obj/structure/machinery/door/airlock/almayer/security/glass/colony, /turf/open/floor/prison/southwest, /area/desert_dam/interior/dam_interior/north_tunnel_entrance) -"bUR" = ( -/turf/open/floor/warnwhite, -/area/desert_dam/exterior/valley/valley_telecoms) -"bUS" = ( -/turf/open/floor/warnwhite/southeast, -/area/desert_dam/exterior/valley/valley_telecoms) -"bUT" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/valley_telecoms) "bUU" = ( /obj/effect/landmark/monkey_spawn, /turf/open/floor/whiteyellowfull/east, @@ -23475,34 +21017,10 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/south_valley_dam) -"bVw" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/river/riverside_central_south) -"bVx" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/desert/desert_shore/shore_corner2/north, -/area/desert_dam/exterior/river/riverside_central_south) "bVy" = ( /obj/effect/blocker/toxic_water/Group_1, /turf/open/gm/river/desert/shallow_edge/west, /area/desert_dam/exterior/river/riverside_central_south) -"bVz" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/shallow, -/area/desert_dam/exterior/river/riverside_central_south) "bVA" = ( /turf/open/floor/darkyellowcorners2/north, /area/desert_dam/building/security/prison) @@ -23527,15 +21045,11 @@ "bVJ" = ( /turf/open/floor/prison/darkredcorners2/east, /area/desert_dam/building/security/armory) -"bVK" = ( -/obj/structure/barricade/sandbags{ - dir = 1 - }, -/obj/structure/barricade/sandbags{ - dir = 4 - }, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/valley_telecoms) +"bVL" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/decal/cleanable/dirt, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_crashsite) "bVN" = ( /turf/open/floor/prison/darkred2/east, /area/desert_dam/building/security/armory) @@ -23570,27 +21084,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt/cement/cement4, /area/desert_dam/interior/dam_interior/workshop) -"bVS" = ( -/obj/structure/stairs{ - dir = 4 - }, -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/asphalt/cement, -/area/desert_dam/interior/dam_interior/west_tunnel) -"bVT" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/asphalt/cement, -/area/desert_dam/interior/dam_interior/west_tunnel) "bVU" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -23603,27 +21096,6 @@ }, /turf/open/floor/delivery, /area/desert_dam/interior/dam_interior/central_tunnel) -"bVW" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/asphalt/cement/cement3, -/area/desert_dam/interior/dam_interior/central_tunnel) -"bVX" = ( -/obj/structure/stairs{ - dir = 8 - }, -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/asphalt/cement, -/area/desert_dam/interior/dam_interior/central_tunnel) "bVY" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -23695,28 +21167,10 @@ /obj/structure/flora/grass/desert/lightgrass_2, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/south_valley_dam) -"bWm" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/river/riverside_central_south) -"bWn" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/shallow_edge/west, -/area/desert_dam/exterior/river/riverside_central_south) "bWo" = ( /obj/effect/blocker/toxic_water/Group_1, /turf/open/asphalt/cement_sunbleached/cement_sunbleached18, /area/desert_dam/exterior/valley/north_valley_dam) -"bWq" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/shallow, -/area/desert_dam/exterior/river/riverside_central_north) "bWs" = ( /obj/effect/decal/sand_overlay/sand1/corner1{ dir = 4 @@ -23735,31 +21189,10 @@ }, /turf/open/floor/prison, /area/desert_dam/building/security/warden) -"bWu" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/shallow, -/area/desert_dam/exterior/river/riverside_central_north) -"bWv" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/shallow, -/area/desert_dam/exterior/river/riverside_central_north) "bWw" = ( /obj/effect/blocker/toxic_water/Group_2, /turf/open/desert/desert_shore/desert_shore1, /area/desert_dam/exterior/river/riverside_central_north) -"bWx" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/desert/desert_shore/desert_shore1/west, -/area/desert_dam/exterior/river/riverside_central_north) "bWA" = ( /obj/structure/pipes/vents/pump{ dir = 8 @@ -23854,33 +21287,9 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkbrown3/east, /area/desert_dam/interior/dam_interior/hangar_storage) -"bWT" = ( -/obj/structure/stairs{ - dir = 4 - }, -/obj/structure/platform, -/turf/open/asphalt/cement, -/area/desert_dam/interior/dam_interior/west_tunnel) -"bWU" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/asphalt/cement, -/area/desert_dam/interior/dam_interior/west_tunnel) "bWV" = ( /turf/open/floor/delivery, /area/desert_dam/interior/dam_interior/west_tunnel) -"bWW" = ( -/obj/structure/platform_decoration, -/turf/open/asphalt/cement/cement3, -/area/desert_dam/interior/dam_interior/central_tunnel) -"bWX" = ( -/obj/structure/stairs{ - dir = 8 - }, -/obj/structure/platform, -/turf/open/asphalt/cement, -/area/desert_dam/interior/dam_interior/central_tunnel) "bWY" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, @@ -23904,20 +21313,6 @@ /obj/effect/blocker/toxic_water/Group_1, /turf/open/asphalt/cement_sunbleached/cement_sunbleached18, /area/desert_dam/exterior/valley/south_valley_dam) -"bXf" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/desert/desert_shore/desert_shore1/west, -/area/desert_dam/exterior/river/riverside_central_south) -"bXg" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/desert/desert_shore/shore_edge1/north, -/area/desert_dam/exterior/river/riverside_central_north) "bXh" = ( /obj/effect/blocker/toxic_water/Group_1, /turf/open/desert/desert_shore/shore_corner2/north, @@ -23926,21 +21321,6 @@ /obj/effect/blocker/toxic_water/Group_1, /turf/open/gm/river/desert/shallow_edge/west, /area/desert_dam/exterior/river/riverside_central_north) -"bXj" = ( -/obj/effect/blocker/toxic_water/Group_2, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform, -/turf/open/desert/desert_shore/desert_shore1/east, -/area/desert_dam/exterior/river/riverside_central_north) -"bXk" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/desert/desert_shore/desert_shore1/west, -/area/desert_dam/exterior/river/riverside_central_north) "bXl" = ( /obj/effect/blocker/toxic_water/Group_1, /turf/open/gm/river/desert/shallow_edge/northwest, @@ -23953,52 +21333,6 @@ /obj/effect/blocker/toxic_water/Group_1, /turf/open/gm/river/desert/deep, /area/desert_dam/exterior/river/riverside_central_north) -"bXo" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/river/riverside_east) -"bXp" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/river/riverside_east) -"bXq" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/river/riverside_east) -"bXr" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/desert/desert_shore/desert_shore1/west, -/area/desert_dam/exterior/river/riverside_central_north) -"bXs" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/shallow, -/area/desert_dam/exterior/river/riverside_central_north) -"bXt" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/shallow_edge/west, -/area/desert_dam/exterior/river/riverside_central_north) -"bXu" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_central_north) -"bXv" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_central_north) "bXw" = ( /obj/structure/machinery/door/airlock/almayer/security/glass/colony{ name = "\improper Armoury" @@ -24012,21 +21346,6 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_mining) -"bXz" = ( -/obj/effect/blocker/toxic_water/Group_2, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/gm/river/desert/shallow_corner, -/area/desert_dam/exterior/river/riverside_central_north) -"bXA" = ( -/obj/structure/stairs/perspective{ - dir = 10; - icon_state = "p_stair_full" - }, -/obj/structure/platform_decoration, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/river/riverside_central_north) "bXB" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached2, /area/desert_dam/exterior/valley/valley_mining) @@ -24103,11 +21422,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/vault2/northeast, /area/desert_dam/building/security/prison) -"bXP" = ( -/obj/effect/decal/sand_overlay/sand1, -/obj/effect/decal/cleanable/dirt, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/valley_telecoms) "bXQ" = ( /turf/closed/wall/r_wall/bunker{ name = "reinforced metal wall" @@ -24147,20 +21461,6 @@ /obj/structure/machinery/light, /turf/open/floor/prison/sterile_white, /area/desert_dam/interior/dam_interior/central_tunnel) -"bXY" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/shallow, -/area/desert_dam/exterior/river/riverside_central_south) -"bXZ" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/shallow_edge/west, -/area/desert_dam/exterior/river/riverside_central_south) "bYa" = ( /obj/effect/blocker/toxic_water/Group_1, /turf/open/desert/desert_shore/desert_shore1/west, @@ -24188,16 +21488,6 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_mining) -"bYf" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/shallow_edge/west, -/area/desert_dam/exterior/river/riverside_central_north) "bYg" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -24225,13 +21515,6 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_mining) -"bYj" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_central_north) "bYl" = ( /turf/open/floor/darkyellowcorners2, /area/desert_dam/building/security/prison) @@ -24362,26 +21645,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/white, /area/desert_dam/interior/dam_interior/break_room) -"bYI" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_central_north) -"bYJ" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_central_north) "bYK" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3" @@ -24406,11 +21669,6 @@ "bYO" = ( /turf/open/floor/prison/darkbrowncorners2/west, /area/desert_dam/building/mining/workshop_foyer) -"bYP" = ( -/obj/effect/decal/sand_overlay/sand1, -/obj/effect/decal/cleanable/blood, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/valley_telecoms) "bYQ" = ( /obj/structure/surface/rack, /obj/item/explosive/grenade/incendiary, @@ -24420,9 +21678,6 @@ }, /turf/open/floor/prison, /area/desert_dam/building/security/armory) -"bYR" = ( -/turf/open/floor/warnwhite/southwest, -/area/desert_dam/exterior/valley/valley_telecoms) "bYS" = ( /obj/structure/bed/chair{ dir = 4 @@ -24566,37 +21821,10 @@ /obj/effect/blocker/toxic_water/Group_1, /turf/open/gm/river/desert/shallow_corner/north, /area/desert_dam/exterior/river/riverside_central_south) -"bZr" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/desert/desert_shore/shore_edge1/north, -/area/desert_dam/exterior/river/riverside_central_south) -"bZs" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_central_north) -"bZt" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_central_north) "bZu" = ( /obj/structure/bed, /turf/open/floor/prison/darkred2/east, /area/desert_dam/building/security/deathrow) -"bZv" = ( -/turf/open/floor/plating/warnplate/northwest, -/area/desert_dam/exterior/valley/valley_telecoms) "bZw" = ( /turf/closed/wall/r_wall/prison, /area/desert_dam/building/security/execution_chamber) @@ -24679,10 +21907,6 @@ "bZJ" = ( /turf/open/floor/prison, /area/desert_dam/building/security/execution_chamber) -"bZK" = ( -/obj/structure/target, -/turf/open/floor/plating/warnplate/north, -/area/desert_dam/exterior/valley/valley_telecoms) "bZL" = ( /obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison, @@ -24815,9 +22039,6 @@ }, /turf/open/floor/whiteyellowfull/east, /area/desert_dam/building/security/prison) -"can" = ( -/turf/open/floor/plating/warnplate/north, -/area/desert_dam/exterior/valley/valley_telecoms) "cao" = ( /obj/structure/bed/chair, /obj/structure/machinery/light{ @@ -24825,9 +22046,6 @@ }, /turf/open/floor/prison, /area/desert_dam/building/security/execution_chamber) -"cap" = ( -/turf/open/floor/plating/warnplate/northeast, -/area/desert_dam/exterior/valley/valley_telecoms) "caq" = ( /obj/structure/machinery/light{ dir = 8 @@ -24879,6 +22097,11 @@ /obj/item/trash/syndi_cakes, /turf/open/floor/plating, /area/desert_dam/interior/dam_interior/disposals) +"caz" = ( +/obj/effect/landmark/corpsespawner/scientist, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison/whitegreen/north, +/area/desert_dam/building/medical/virology_isolation) "caB" = ( /turf/open/asphalt/cement/cement3, /area/desert_dam/interior/dam_interior/west_tunnel) @@ -24912,23 +22135,6 @@ }, /turf/open/asphalt/cement_sunbleached, /area/desert_dam/exterior/valley/valley_medical) -"caL" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/shallow_edge/east, -/area/desert_dam/exterior/river/riverside_central_north) -"caM" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/shallow_edge/west, -/area/desert_dam/exterior/river/riverside_central_north) "caO" = ( /obj/structure/surface/rack, /obj/item/explosive/plastic, @@ -24955,14 +22161,6 @@ /obj/structure/machinery/light, /turf/open/floor/darkyellowcorners2/west, /area/desert_dam/building/security/prison) -"caT" = ( -/obj/structure/barricade/sandbags, -/obj/structure/barricade/sandbags{ - dir = 4 - }, -/obj/effect/decal/sand_overlay/sand1, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/valley_telecoms) "caU" = ( /obj/effect/landmark/crap_item, /turf/open/floor/interior/wood, @@ -25111,56 +22309,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/bright_clean/southwest, /area/desert_dam/interior/dam_interior/control_room) -"cbt" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/desert/desert_shore/shore_edge1/north, -/area/desert_dam/exterior/river/riverside_central_south) -"cbu" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/desert/desert_shore/desert_shore1/north, -/area/desert_dam/exterior/river/riverside_central_south) -"cbv" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_central_north) -"cbw" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_central_north) -"cbx" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_central_north) -"cby" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/shallow_edge/east, -/area/desert_dam/exterior/river/riverside_central_north) -"cbz" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/shallow_edge/west, -/area/desert_dam/exterior/river/riverside_central_north) "cbA" = ( /obj/structure/window/framed/prison/cell, /turf/open/floor/plating, @@ -25312,55 +22460,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/grimy, /area/desert_dam/building/bar/bar) -"ccd" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/river/riverside_central_south) -"cce" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/desert/desert_shore/shore_corner2/north, -/area/desert_dam/exterior/river/riverside_central_south) -"ccf" = ( -/obj/structure/platform, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/river/riverside_central_south) -"ccg" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_central_north) -"cch" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_central_north) -"cci" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_central_north) -"ccj" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/shallow_edge/east, -/area/desert_dam/exterior/river/riverside_central_north) "cck" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -25400,12 +22499,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/darkyellowcorners2, /area/desert_dam/building/security/prison) -"ccu" = ( -/obj/effect/decal/sand_overlay/sand1{ - dir = 6 - }, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/valley_telecoms) "ccv" = ( /turf/open/floor/prison/darkredcorners2/east, /area/desert_dam/building/security/deathrow) @@ -25478,12 +22571,6 @@ "ccK" = ( /turf/open/desert/rock/deep/transition/north, /area/desert_dam/interior/caves/central_caves) -"ccL" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/river/riverside_central_south) "ccM" = ( /obj/effect/decal/sand_overlay/sand1/corner1, /turf/open/asphalt/tile, @@ -25494,27 +22581,6 @@ }, /turf/open/asphalt/tile, /area/desert_dam/exterior/valley/valley_medical) -"ccO" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/river/riverside_east) -"ccP" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/river/riverside_east) -"ccQ" = ( -/obj/structure/platform_decoration, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/river/riverside_east) -"ccR" = ( -/obj/structure/platform, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/river/riverside_east) "ccY" = ( /turf/open/floor/prison/darkredcorners2/north, /area/desert_dam/building/security/deathrow) @@ -25544,6 +22610,10 @@ /obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/darkred2/north, /area/desert_dam/building/security/deathrow) +"cde" = ( +/obj/effect/spawner/gibspawner/xeno, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_labs) "cdf" = ( /obj/structure/surface/table, /obj/structure/machinery/faxmachine, @@ -25552,27 +22622,15 @@ "cdg" = ( /turf/open/floor/prison/darkred2, /area/desert_dam/building/security/warden) -"cdh" = ( -/turf/closed/wall/r_wall/bunker, -/area/desert_dam/exterior/valley/valley_telecoms) "cdi" = ( /obj/structure/machinery/computer/station_alert, /obj/structure/surface/table, /turf/open/floor/dark, /area/desert_dam/interior/dam_interior/office) -"cdj" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E" - }, -/turf/open/asphalt/cement/cement3, -/area/desert_dam/exterior/valley/valley_telecoms) "cdk" = ( /obj/effect/decal/sand_overlay/sand1/corner1, /turf/open/asphalt/cement_sunbleached, /area/desert_dam/exterior/valley/valley_telecoms) -"cdl" = ( -/turf/open/floor, -/area/desert_dam/exterior/valley/valley_telecoms) "cdm" = ( /turf/closed/wall/r_wall/bunker, /area/desert_dam/interior/dam_interior/break_room) @@ -25635,24 +22693,6 @@ }, /turf/open/asphalt/tile, /area/desert_dam/exterior/valley/valley_medical) -"cdy" = ( -/obj/structure/stairs{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached2, -/area/desert_dam/exterior/valley/valley_medical) -"cdz" = ( -/obj/structure/stairs{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached9, -/area/desert_dam/exterior/valley/valley_medical) "cdA" = ( /obj/effect/decal/sand_overlay/sand1, /turf/open/asphalt/tile, @@ -25718,23 +22758,6 @@ "cdN" = ( /turf/open/floor/freezerfloor, /area/desert_dam/building/security/prison) -"cdO" = ( -/obj/structure/stairs, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/asphalt/cement/cement3, -/area/desert_dam/interior/dam_interior/west_tunnel) -"cdP" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/stairs, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/asphalt/cement/cement1, -/area/desert_dam/interior/dam_interior/west_tunnel) "cdQ" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -25744,43 +22767,6 @@ }, /turf/open/asphalt/cement/cement4, /area/desert_dam/interior/dam_interior/workshop) -"cdR" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/asphalt/cement, -/area/desert_dam/interior/dam_interior/central_tunnel) -"cdS" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/asphalt/cement, -/area/desert_dam/interior/dam_interior/central_tunnel) -"cdT" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/asphalt/cement, -/area/desert_dam/interior/dam_interior/south_tunnel) -"cdU" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/turf/open/asphalt/cement, -/area/desert_dam/interior/dam_interior/south_tunnel) -"cdV" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/decal/sand_overlay/sand2{ - dir = 8 - }, -/turf/open/asphalt/cement, -/area/desert_dam/interior/dam_interior/south_tunnel) "cdX" = ( /turf/open/desert/rock/deep/transition/southeast, /area/desert_dam/interior/caves/central_caves) @@ -25827,13 +22813,6 @@ /obj/effect/blocker/toxic_water/Group_1, /turf/open/gm/river/desert/shallow, /area/desert_dam/exterior/river/riverside_central_south) -"ceh" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/desert/desert_shore/desert_shore1/west, -/area/desert_dam/exterior/river/riverside_central_south) "cei" = ( /obj/effect/blocker/toxic_water/Group_1, /turf/open/desert/desert_shore/shore_corner2/east, @@ -25891,33 +22870,12 @@ /obj/effect/blocker/toxic_water/Group_1, /turf/open/gm/river/desert/shallow_edge/covered/west, /area/desert_dam/exterior/river/riverside_central_south) -"cew" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/effect/decal/sand_overlay/sand1/corner1{ - dir = 1 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached4, -/area/desert_dam/exterior/valley/valley_telecoms) -"cex" = ( -/obj/structure/stairs{ - dir = 8 - }, -/obj/structure/platform{ - dir = 1 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached4, -/area/desert_dam/exterior/valley/valley_telecoms) "cey" = ( /obj/effect/decal/sand_overlay/sand1/corner1{ dir = 4 }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached4, /area/desert_dam/exterior/valley/valley_telecoms) -"cez" = ( -/turf/open/desert/dirt/desert_transition_edge1/northeast, -/area/desert_dam/exterior/valley/valley_telecoms) "ceA" = ( /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_telecoms) @@ -25942,9 +22900,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/interior/wood, /area/desert_dam/building/bar/bar) -"ceG" = ( -/turf/open/desert/dirt/desert_transition_edge1/north, -/area/desert_dam/exterior/valley/valley_telecoms) "ceH" = ( /obj/structure/machinery/vending/cigarette/colony, /turf/open/floor/interior/wood, @@ -26099,20 +23054,6 @@ /obj/effect/blocker/toxic_water/Group_1, /turf/open/desert/desert_shore/desert_shore1/east, /area/desert_dam/exterior/river/riverside_central_south) -"cfo" = ( -/obj/structure/platform_decoration, -/obj/effect/decal/sand_overlay/sand1/corner1{ - dir = 8 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached12, -/area/desert_dam/exterior/valley/valley_telecoms) -"cfp" = ( -/obj/structure/stairs{ - dir = 8 - }, -/obj/structure/platform, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached12, -/area/desert_dam/exterior/valley/valley_telecoms) "cfq" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 8 @@ -26186,23 +23127,6 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_medical) -"cfC" = ( -/obj/structure/platform, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_telecoms) -"cfD" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water, -/turf/open/gm/river/desert/shallow_edge/west, -/area/desert_dam/exterior/river_mouth/southern) -"cfE" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/desert/rock/edge1/east, -/area/desert_dam/exterior/valley/valley_telecoms) "cfG" = ( /turf/open/desert/rock/edge1/east, /area/desert_dam/exterior/valley/valley_cargo) @@ -26249,41 +23173,6 @@ }, /turf/open/asphalt, /area/desert_dam/interior/dam_interior/south_tunnel) -"cfX" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/shallow, -/area/desert_dam/exterior/river/riverside_central_south) -"cfY" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/shallow, -/area/desert_dam/exterior/river/riverside_central_south) -"cfZ" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/desert/desert_shore/desert_shore1/west, -/area/desert_dam/exterior/river/riverside_central_south) -"cga" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/shallow, -/area/desert_dam/exterior/river/riverside_central_south) -"cgb" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached1, -/area/desert_dam/exterior/valley/valley_telecoms) "cgc" = ( /turf/open/desert/dirt/rock1, /area/desert_dam/exterior/valley/valley_medical) @@ -26314,27 +23203,6 @@ /obj/effect/blocker/toxic_water/Group_2, /turf/open/floor/neutral, /area/desert_dam/interior/dam_interior/engine_room) -"cgj" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/decal/sand_overlay/sand1{ - dir = 8 - }, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/valley_telecoms) -"cgk" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/decal/sand_overlay/sand1{ - dir = 4 - }, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/valley_telecoms) "cgm" = ( /turf/closed/wall/r_wall/bunker, /area/desert_dam/building/substation/west) @@ -26356,20 +23224,6 @@ /obj/effect/blocker/toxic_water, /turf/open/gm/river/desert/shallow, /area/desert_dam/exterior/river_mouth/southern) -"cgr" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water, -/turf/open/gm/river/desert/shallow_corner/north, -/area/desert_dam/exterior/river_mouth/southern) -"cgs" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river_mouth/southern) "cgt" = ( /obj/structure/machinery/power/smes/batteryrack/substation, /turf/open/floor/plating, @@ -26450,6 +23304,10 @@ /obj/effect/blocker/toxic_water/Group_2, /turf/open/floor/neutral, /area/desert_dam/interior/dam_interior/engine_room) +"cgV" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/river/riverside_south) "cgY" = ( /turf/open/floor/plating/warnplate/southwest, /area/desert_dam/building/substation/west) @@ -26516,13 +23374,6 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/desert/rock/deep/transition/northeast, /area/desert_dam/interior/caves/east_caves) -"chm" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/shallow, -/area/desert_dam/exterior/river/riverside_south) "chn" = ( /obj/effect/blocker/toxic_water/Group_1, /turf/open/gm/river/desert/shallow_edge/west, @@ -26566,16 +23417,6 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_medical) -"chv" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_telecoms) -"chw" = ( -/obj/structure/platform_decoration, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_telecoms) "chx" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 1 @@ -26588,43 +23429,6 @@ }, /turf/open/asphalt/tile, /area/desert_dam/exterior/valley/valley_medical) -"chz" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_central_south) -"chA" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_central_south) -"chB" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_central_south) -"chC" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform, -/obj/effect/decal/sand_overlay/sand1{ - dir = 4 - }, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/valley_telecoms) "chD" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -26663,41 +23467,10 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/bar_valley_dam) -"chS" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/shallow, -/area/desert_dam/exterior/river/riverside_south) -"chT" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/shallow_edge/northwest, -/area/desert_dam/exterior/river/riverside_south) "chU" = ( /obj/effect/blocker/toxic_water/Group_1, /turf/open/gm/river/desert/shallow_corner/north, /area/desert_dam/exterior/river/riverside_south) -"chV" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/shallow, -/area/desert_dam/exterior/river/riverside_south) -"chW" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/shallow_edge/west, -/area/desert_dam/exterior/river/riverside_south) "chX" = ( /obj/effect/blocker/toxic_water/Group_1, /turf/open/gm/river/desert/shallow_corner/east, @@ -26718,33 +23491,6 @@ "cic" = ( /turf/open/floor/plating/warnplate/east, /area/desert_dam/building/substation/west) -"cid" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/valley/valley_medical) -"cie" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_central_south) -"cif" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_central_south) -"cig" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_central_south) "cih" = ( /turf/open/floor/prison, /area/desert_dam/building/substation/west) @@ -26766,33 +23512,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/interior/wood/alt, /area/desert_dam/building/bar/bar) -"cim" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/effect/decal/sand_overlay/sand2{ - dir = 4 - }, -/turf/open/asphalt/cement/cement12, -/area/desert_dam/interior/dam_interior/west_tunnel) -"cin" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/asphalt/cement/cement12, -/area/desert_dam/interior/dam_interior/west_tunnel) -"cio" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/asphalt/cement/cement12, -/area/desert_dam/interior/dam_interior/west_tunnel) -"cip" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/asphalt/cement/cement15, -/area/desert_dam/interior/dam_interior/west_tunnel) "cir" = ( /obj/effect/decal/sand_overlay/sand2{ dir = 6 @@ -26832,29 +23551,6 @@ }, /turf/open/floor/prison, /area/desert_dam/building/substation/west) -"ciD" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/shallow_edge/east, -/area/desert_dam/exterior/river/riverside_central_south) -"ciE" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_central_south) -"ciF" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_telecoms) "ciG" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -26963,28 +23659,6 @@ }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached13, /area/desert_dam/exterior/valley/bar_valley_dam) -"cjk" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/desert/desert_shore/shore_corner2/east, -/area/desert_dam/exterior/river/riverside_south) -"cjl" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/shallow, -/area/desert_dam/exterior/river/riverside_south) -"cjm" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/shallow_edge/southwest, -/area/desert_dam/exterior/river/riverside_south) "cjn" = ( /obj/structure/machinery/cm_vending/sorted/medical/no_access, /turf/open/floor/whitepurplecorner/east, @@ -27151,10 +23825,6 @@ "ckc" = ( /turf/open/floor/prison/bright_clean2/southwest, /area/desert_dam/building/medical/morgue) -"ckd" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/whiteyellowcorner/east, -/area/desert_dam/interior/dam_interior/lobby) "cke" = ( /obj/structure/surface/table, /obj/item/bodybag, @@ -27189,13 +23859,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkyellowcorners2/east, /area/desert_dam/interior/dam_interior/smes_backup) -"ckn" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/desert/desert_shore/desert_shore1/east, -/area/desert_dam/exterior/river/riverside_south) "cko" = ( /turf/open/asphalt/tile, /area/desert_dam/exterior/valley/valley_civilian) @@ -27245,12 +23908,6 @@ }, /turf/open/floor/whiteyellowfull/east, /area/desert_dam/building/security/prison) -"ckx" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/river/riverside_south) "cky" = ( /obj/structure/filingcabinet, /obj/effect/landmark/objective_landmark/close, @@ -27403,64 +24060,13 @@ /obj/effect/blocker/toxic_water/Group_2, /turf/open/gm/river/desert/deep, /area/desert_dam/exterior/river/riverside_central_south) -"cld" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_central_south) -"cle" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/shallow_edge/east, -/area/desert_dam/exterior/river/riverside_central_south) -"clf" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/shallow_edge/east, -/area/desert_dam/exterior/river/riverside_central_south) -"clg" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/desert/desert_shore/desert_shore1/east, -/area/desert_dam/exterior/river/riverside_central_south) "clh" = ( /obj/effect/blocker/toxic_water/Group_2, /turf/open/gm/river/desert/shallow_edge/east, /area/desert_dam/exterior/river/riverside_central_south) -"cli" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/desert/desert_shore/shore_corner2/west, -/area/desert_dam/exterior/river/riverside_central_south) "clj" = ( /turf/open/floor/plating, /area/desert_dam/building/warehouse/breakroom) -"clk" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/shallow_edge/east, -/area/desert_dam/exterior/river/riverside_central_south) -"cll" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/shallow, -/area/desert_dam/exterior/river/riverside_central_south) "clm" = ( /obj/effect/blocker/toxic_water, /turf/open/desert/desert_shore/shore_corner2/west, @@ -27469,26 +24075,6 @@ /obj/effect/blocker/toxic_water, /turf/open/desert/desert_shore/shore_edge1/east, /area/desert_dam/exterior/river_mouth/southern) -"clo" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/filtration_a) -"clp" = ( -/obj/structure/filtration/collector_pipes{ - icon_state = "upper_2" - }, -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/blocker/toxic_water, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/filtration_a) "clq" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony{ name = "\improper Lab Maintenance" @@ -27525,13 +24111,6 @@ /obj/structure/prop/dam/large_boulder/boulder2, /turf/open/desert/dirt/desert_transition_edge1/southeast, /area/desert_dam/exterior/valley/bar_valley_dam) -"clD" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/desert/desert_shore/shore_corner2, -/area/desert_dam/exterior/river/riverside_south) "clE" = ( /obj/effect/blocker/toxic_water/Group_1, /turf/open/gm/river/desert/shallow_edge/southwest, @@ -27593,10 +24172,6 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison/sterile_white/west, /area/desert_dam/building/medical/morgue) -"clP" = ( -/obj/structure/machinery/optable, -/turf/open/floor/prison/sterile_white/west, -/area/desert_dam/building/medical/morgue) "clQ" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -27629,13 +24204,6 @@ /obj/structure/disposalpipe/segment, /turf/open/asphalt/cement/cement1, /area/desert_dam/interior/dam_interior/central_tunnel) -"clV" = ( -/obj/structure/stairs, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/asphalt/cement/cement3, -/area/desert_dam/interior/dam_interior/central_tunnel) "clW" = ( /obj/effect/decal/sand_overlay/sand1, /turf/open/asphalt/tile, @@ -27675,22 +24243,6 @@ }, /turf/open/floor/prison/darkbrown3/west, /area/desert_dam/interior/dam_interior/hanger) -"cmg" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/blocker/toxic_water, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/filtration_a) -"cmh" = ( -/obj/effect/decal/sand_overlay/sand1{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/valley_telecoms) "cmi" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -27718,13 +24270,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/interior/wood/alt, /area/desert_dam/building/bar/bar) -"cmr" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/desert/desert_shore/desert_shore1/west, -/area/desert_dam/exterior/river/riverside_south) "cms" = ( /obj/effect/landmark/survivor_spawner, /turf/open/floor/prison/sterile_white/west, @@ -27818,16 +24363,6 @@ }, /turf/open/floor/prison, /area/desert_dam/building/warehouse/warehouse) -"cmQ" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/filtration_a) "cmR" = ( /turf/open/desert/dirt/dirt2, /area/desert_dam/exterior/valley/valley_civilian) @@ -27964,13 +24499,6 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/landing_pad_two) -"cnB" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/desert/desert_shore/shore_edge1, -/area/desert_dam/exterior/river/riverside_south) "cnC" = ( /obj/effect/blocker/toxic_water/Group_1, /turf/open/desert/desert_shore/shore_corner2, @@ -28155,12 +24683,6 @@ /obj/effect/blocker/toxic_water, /turf/open/gm/river/desert/shallow_edge/northeast, /area/desert_dam/exterior/river_mouth/southern) -"cos" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached4, -/area/desert_dam/exterior/valley/valley_telecoms) "cou" = ( /turf/open/floor/prison/darkyellowcorners2, /area/desert_dam/building/warehouse/breakroom) @@ -28224,12 +24746,6 @@ /obj/structure/flora/grass/desert/lightgrass_1, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_medical) -"coK" = ( -/obj/effect/decal/sand_overlay/sand1{ - dir = 1 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached16, -/area/desert_dam/exterior/valley/valley_medical) "coL" = ( /obj/structure/desertdam/decals/road_edge, /obj/effect/decal/sand_overlay/sand1/corner1{ @@ -28318,11 +24834,6 @@ /obj/structure/largecrate, /turf/open/floor/prison/darkbrowncorners2/north, /area/desert_dam/building/warehouse/warehouse) -"cpd" = ( -/obj/structure/platform_decoration, -/obj/effect/blocker/toxic_water, -/turf/open/desert/desert_shore/desert_shore1/east, -/area/desert_dam/exterior/river_mouth/southern) "cpf" = ( /turf/open/floor/prison/darkbrown2/north, /area/desert_dam/building/warehouse/warehouse) @@ -28374,13 +24885,6 @@ /obj/structure/flora/grass/desert/lightgrass_3, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/north_valley_dam) -"cpv" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/desert/desert_shore/shore_corner2/west, -/area/desert_dam/exterior/river/riverside_south) "cpw" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -28485,20 +24989,6 @@ /obj/structure/flora/grass/desert/lightgrass_6, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_civilian) -"cpU" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/shallow_edge/east, -/area/desert_dam/exterior/river/riverside_central_south) -"cpV" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/shallow_edge/southwest, -/area/desert_dam/exterior/river/riverside_central_south) "cpW" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 6 @@ -28584,6 +25074,11 @@ }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached3, /area/desert_dam/exterior/valley/valley_telecoms) +"cqp" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water, +/turf/open/gm/river/desert/shallow_edge/southwest, +/area/desert_dam/exterior/river/riverside_east) "cqq" = ( /obj/structure/flora/grass/desert/lightgrass_6, /turf/open/desert/dirt, @@ -28662,10 +25157,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/bright_clean/southwest, /area/desert_dam/interior/dam_interior/primary_tool_storage) -"cqG" = ( -/obj/structure/platform_decoration, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached12, -/area/desert_dam/exterior/valley/valley_telecoms) "cqH" = ( /obj/structure/machinery/door/airlock/almayer/command/colony{ dir = 1; @@ -28689,6 +25180,11 @@ /obj/structure/machinery/light, /turf/open/floor/prison, /area/desert_dam/building/warehouse/warehouse) +"cqN" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/shallow_edge/northwest, +/area/desert_dam/exterior/river/riverside_south) "cqQ" = ( /obj/structure/cargo_container/trijent/left/alt, /turf/open/floor/prison, @@ -28706,13 +25202,6 @@ "cqU" = ( /turf/open/desert/dirt/desert_transition_edge1/northeast, /area/desert_dam/exterior/valley/valley_civilian) -"cra" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/filtration_a) "crb" = ( /obj/effect/blocker/toxic_water, /turf/open/gm/river/desert/deep, @@ -28769,13 +25258,6 @@ /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/prison/darkyellow2/east, /area/desert_dam/building/substation/west) -"crm" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/decal/sand_overlay/sand1, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/valley_telecoms) "crn" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -28878,12 +25360,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/warnplate/southeast, /area/desert_dam/interior/dam_interior/smes_backup) -"crO" = ( -/obj/effect/decal/sand_overlay/sand1/corner1{ - dir = 8 - }, -/turf/open/asphalt/cement/cement3, -/area/desert_dam/exterior/valley/valley_telecoms) "crP" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/disposalpipe/segment{ @@ -28954,13 +25430,6 @@ "csf" = ( /turf/open/desert/dirt/desert_transition_corner1, /area/desert_dam/exterior/valley/valley_civilian) -"csg" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/filtration_a) "csh" = ( /turf/open/floor/darkyellow2/southwest, /area/desert_dam/building/security/prison) @@ -29262,15 +25731,6 @@ "ctw" = ( /turf/open/floor/prison/darkyellow2/north, /area/desert_dam/building/substation/west) -"ctz" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/valley_telecoms) "ctA" = ( /obj/item/device/flashlight, /turf/open/floor/prison/darkyellow2/west, @@ -29286,12 +25746,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt/cement/cement12, /area/desert_dam/interior/dam_interior/northeastern_tunnel) -"ctE" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/valley_telecoms) "ctF" = ( /obj/effect/decal/warning_stripes{ icon_state = "E" @@ -29305,6 +25759,12 @@ /obj/effect/decal/sand_overlay/sand1/corner1, /turf/open/asphalt, /area/desert_dam/exterior/valley/bar_valley_dam) +"ctJ" = ( +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal7" + }, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_security) "ctK" = ( /obj/effect/decal/sand_overlay/sand1/corner1{ dir = 8 @@ -29490,33 +25950,12 @@ /obj/structure/disposalpipe/segment, /turf/open/asphalt/cement/cement15, /area/desert_dam/interior/dam_interior/central_tunnel) -"cuu" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/asphalt/cement/cement3, -/area/desert_dam/interior/dam_interior/central_tunnel) -"cuv" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/asphalt/cement/cement3, -/area/desert_dam/interior/dam_interior/central_tunnel) "cuw" = ( /turf/open/desert/dirt/rock1, /area/desert_dam/exterior/valley/valley_civilian) "cux" = ( /turf/open/desert/dirt/desert_transition_edge1/southeast, /area/desert_dam/exterior/valley/valley_civilian) -"cuy" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/desert/dirt/desert_transition_edge1/west, -/area/desert_dam/exterior/valley/valley_telecoms) "cuz" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal12" @@ -29598,33 +26037,6 @@ /obj/effect/blocker/toxic_water/Group_1, /turf/open/desert/desert_shore/desert_shore1/west, /area/desert_dam/exterior/river/riverside_south) -"cuR" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_2, -/obj/item/clothing/head/soft/ferret, -/turf/open/desert/desert_shore/shore_edge1/east, -/area/desert_dam/exterior/river/riverside_central_south) -"cuS" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/desert/desert_shore/shore_edge1/north, -/area/desert_dam/exterior/river/riverside_south) -"cuT" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/river/riverside_south) "cuU" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 4 @@ -29728,10 +26140,6 @@ "cvq" = ( /turf/open/floor/carpet10_8/west, /area/desert_dam/building/bar/bar) -"cvr" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_telecoms) "cvs" = ( /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, @@ -29775,13 +26183,6 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison/darkyellow2, /area/desert_dam/building/substation/west) -"cvD" = ( -/obj/structure/stairs, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached3, -/area/desert_dam/exterior/valley/valley_telecoms) "cvE" = ( /obj/structure/surface/table, /obj/item/device/encryptionkey, @@ -30170,10 +26571,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/interior/tatami, /area/desert_dam/building/bar/bar) -"cxg" = ( -/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, -/turf/open/floor/interior/tatami, -/area/desert_dam/building/bar/bar) "cxh" = ( /obj/structure/bed/chair/wood/normal, /obj/effect/decal/cleanable/dirt, @@ -30211,42 +26608,6 @@ }, /turf/open/floor/prison/darkyellow2/southeast, /area/desert_dam/building/substation/west) -"cxq" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/desert/dirt/desert_transition_edge1, -/area/desert_dam/exterior/valley/valley_cargo) -"cxr" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/desert/dirt/desert_transition_corner1/east, -/area/desert_dam/exterior/valley/valley_cargo) -"cxt" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_cargo) -"cxu" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/decal/sand_overlay/sand1{ - dir = 4 - }, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/valley_cargo) -"cxv" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached3, -/area/desert_dam/exterior/valley/valley_telecoms) "cxw" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal5" @@ -30344,31 +26705,10 @@ "cxN" = ( /turf/open/floor/prison/darkyellow2/east, /area/desert_dam/building/substation/west) -"cxP" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_cargo) -"cxQ" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_cargo) "cxR" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor/glass/colony, /turf/open/floor/prison/greencorner, /area/desert_dam/building/substation/west) -"cxS" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/desert/dirt/desert_transition_edge1/east, -/area/desert_dam/exterior/valley/valley_cargo) "cxT" = ( /obj/structure/flora/grass/desert/lightgrass_6, /turf/open/desert/dirt, @@ -30379,14 +26719,6 @@ "cxV" = ( /turf/open/desert/dirt/desert_transition_edge1/north, /area/desert_dam/exterior/valley/valley_cargo) -"cxW" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/desert/desert_shore/desert_shore1/west, -/area/desert_dam/exterior/river/riverside_south) "cxY" = ( /obj/structure/window/reinforced, /obj/structure/surface/table/reinforced, @@ -30529,6 +26861,12 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/prison/darkbrown2, /area/desert_dam/building/mining/workshop_foyer) +"cyz" = ( +/obj/structure/flora/bush/desert/cactus/multiple{ + icon_state = "cacti_9" + }, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_security) "cyB" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 9 @@ -30573,11 +26911,6 @@ /obj/structure/flora/grass/desert/heavygrass_5, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_cargo) -"cyR" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/shallow_edge/west, -/area/desert_dam/exterior/river/riverside_south) "cyS" = ( /obj/effect/decal/sand_overlay/sand1/corner1{ dir = 1 @@ -30681,12 +27014,6 @@ /obj/structure/flora/grass/desert/lightgrass_1, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_cargo) -"czw" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/desert/dirt/desert_transition_corner1/east, -/area/desert_dam/exterior/valley/valley_cargo) "czx" = ( /obj/structure/flora/grass/desert/lightgrass_8, /turf/open/desert/dirt, @@ -30702,11 +27029,6 @@ "czA" = ( /turf/open/desert/dirt/desert_transition_corner1/west, /area/desert_dam/exterior/landing_pad_two) -"czB" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/shallow_edge/east, -/area/desert_dam/exterior/river/riverside_south) "czC" = ( /obj/effect/decal/sand_overlay/sand1/corner1{ dir = 1 @@ -30814,16 +27136,6 @@ /obj/effect/blocker/toxic_water/Group_2, /turf/open/gm/river/desert/shallow_edge/northeast, /area/desert_dam/exterior/river/riverside_central_south) -"czT" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/desert/desert_shore/desert_shore1/north, -/area/desert_dam/exterior/river/riverside_east) "czU" = ( /obj/effect/decal/sand_overlay/sand1/corner1{ dir = 4 @@ -30842,24 +27154,12 @@ /obj/effect/blocker/toxic_water/Group_1, /turf/open/gm/river/desert/shallow_edge/covered/east, /area/desert_dam/exterior/river/riverside_south) -"czY" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/desert/dirt/desert_transition_edge1/southwest, -/area/desert_dam/exterior/valley/valley_cargo) "czZ" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 8 }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached17, /area/desert_dam/exterior/valley/valley_cargo) -"cAa" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_cargo) "cAb" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -30881,63 +27181,14 @@ /obj/structure/flora/grass/desert/lightgrass_9, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_cargo) -"cAe" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/desert/desert_shore/desert_shore1/east, -/area/desert_dam/exterior/river/riverside_south) "cAf" = ( /obj/effect/blocker/toxic_water/Group_1, /turf/open/asphalt/tile, /area/desert_dam/exterior/river/riverside_south) -"cAg" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/desert/desert_shore/desert_shore1/north, -/area/desert_dam/exterior/river/riverside_east) -"cAh" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/desert/desert_shore/desert_shore1/north, -/area/desert_dam/exterior/river/riverside_east) -"cAi" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/shallow_edge/west, -/area/desert_dam/exterior/river/riverside_south) -"cAj" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/shallow_edge/east, -/area/desert_dam/exterior/river/riverside_south) -"cAk" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/desert/desert_shore/desert_shore1/east, -/area/desert_dam/exterior/river/riverside_south) "cAl" = ( /obj/effect/blocker/toxic_water/Group_1, /turf/open/desert/desert_shore/shore_corner2/west, /area/desert_dam/exterior/river/riverside_south) -"cAm" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/river/riverside_south) "cAn" = ( /obj/structure/surface/table, /obj/item/bodybag/cryobag, @@ -31091,24 +27342,6 @@ }, /turf/open/asphalt, /area/desert_dam/interior/dam_interior/east_tunnel_entrance) -"cAQ" = ( -/obj/structure/stairs{ - dir = 4 - }, -/obj/structure/platform{ - dir = 1 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached4, -/area/desert_dam/exterior/valley/valley_cargo) -"cAR" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/effect/decal/sand_overlay/sand1{ - dir = 1 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached4, -/area/desert_dam/exterior/valley/valley_cargo) "cAT" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3" @@ -31134,29 +27367,9 @@ /obj/structure/flora/bush/desert/cactus, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) -"cAX" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/desert/desert_shore/shore_edge1/east, -/area/desert_dam/exterior/river/riverside_south) -"cAY" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/shallow_edge/northeast, -/area/desert_dam/exterior/river/riverside_south) "cAZ" = ( /turf/open/desert/dirt/dirt2, /area/desert_dam/exterior/river/riverside_south) -"cBa" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/river/riverside_south) "cBb" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached17, /area/desert_dam/exterior/valley/valley_medical) @@ -31400,13 +27613,6 @@ /obj/structure/prop/dam/boulder/boulder3, /turf/open/desert/dirt/desert_transition_corner1/west, /area/desert_dam/exterior/valley/bar_valley_dam) -"cCb" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/shallow_corner, -/area/desert_dam/exterior/river/riverside_south) "cCc" = ( /turf/closed/wall/r_wall, /area/desert_dam/building/medical/garage) @@ -31551,29 +27757,10 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_civilian) -"cCJ" = ( -/obj/effect/decal/sand_overlay/sand1{ - dir = 6 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached15, -/area/desert_dam/exterior/valley/valley_telecoms) "cCL" = ( /obj/structure/machinery/colony_floodlight, /turf/open/desert/dirt/desert_transition_corner1, /area/desert_dam/exterior/valley/valley_cargo) -"cCM" = ( -/obj/effect/decal/sand_overlay/sand1{ - dir = 10 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached12, -/area/desert_dam/exterior/valley/valley_telecoms) -"cCO" = ( -/obj/structure/stairs{ - dir = 4 - }, -/obj/structure/platform, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached12, -/area/desert_dam/exterior/valley/valley_cargo) "cCP" = ( /turf/open/floor/prison/southwest, /area/desert_dam/interior/dam_interior/CE_office) @@ -31599,13 +27786,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt/cement/cement1, /area/desert_dam/interior/dam_interior/central_tunnel) -"cCU" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/obj/effect/decal/sand_overlay/sand1, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached12, -/area/desert_dam/exterior/valley/valley_cargo) "cCW" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/tech_supply, @@ -31627,13 +27807,6 @@ /obj/structure/flora/grass/desert/heavygrass_4, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_cargo) -"cDd" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_south) "cDe" = ( /obj/structure/machinery/light{ dir = 1 @@ -31800,27 +27973,6 @@ "cDN" = ( /turf/open/desert/rock/deep/transition, /area/desert_dam/interior/dam_interior/east_tunnel_entrance) -"cDP" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/desert/desert_shore/desert_shore1/north, -/area/desert_dam/exterior/river/riverside_east) -"cDQ" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/desert/desert_shore/shore_corner2/north, -/area/desert_dam/exterior/river/riverside_east) -"cDR" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/shallow_edge/northwest, -/area/desert_dam/exterior/river/riverside_east) "cDT" = ( /obj/structure/surface/table/almayer, /obj/item/storage/fancy/cigarettes/kpack, @@ -32078,26 +28230,12 @@ }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached1, /area/desert_dam/exterior/landing_pad_two) -"cFd" = ( -/obj/structure/stairs, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached1, -/area/desert_dam/exterior/valley/valley_telecoms) "cFe" = ( /obj/structure/machinery/landinglight/ds2/delaythree{ dir = 8 }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached3, /area/desert_dam/exterior/landing_pad_two) -"cFf" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_south) "cFg" = ( /obj/effect/decal/medical_decals{ icon_state = "docdecal1" @@ -32573,13 +28711,6 @@ }, /turf/open/asphalt/cement_sunbleached, /area/desert_dam/exterior/valley/valley_cargo) -"cGI" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/decal/sand_overlay/sand1/corner1, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/valley_cargo) "cGJ" = ( /obj/effect/decal/sand_overlay/sand1/corner1{ dir = 8 @@ -32630,13 +28761,6 @@ /obj/structure/machinery/landinglight/ds2/delaytwo, /turf/open/asphalt/cement_sunbleached/cement_sunbleached12, /area/desert_dam/exterior/landing_pad_two) -"cGT" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/shallow_corner, -/area/desert_dam/exterior/river/riverside_south) "cGU" = ( /obj/effect/decal/medical_decals{ icon_state = "docdecal3" @@ -32742,24 +28866,6 @@ /obj/structure/cargo_container/hd/mid, /turf/open/floor/prison/cell_stripe, /area/desert_dam/building/warehouse/warehouse) -"cHu" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/effect/decal/sand_overlay/sand1{ - dir = 4 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached3, -/area/desert_dam/exterior/valley/valley_cargo) -"cHv" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/effect/decal/sand_overlay/sand1{ - dir = 8 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached1, -/area/desert_dam/exterior/valley/valley_cargo) "cHx" = ( /turf/open/floor/plating/warnplate/north, /area/desert_dam/building/medical/garage) @@ -32786,10 +28892,6 @@ /obj/structure/prop/dam/truck/damaged, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_cargo) -"cHC" = ( -/obj/structure/flora/grass/desert/lightgrass_1, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_telecoms) "cHD" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 @@ -32797,16 +28899,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt/cement, /area/desert_dam/interior/dam_interior/workshop) -"cHE" = ( -/obj/structure/flora/grass/desert/lightgrass_6, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_telecoms) -"cHF" = ( -/obj/structure/flora/grass/tallgrass/desert/corner{ - dir = 6 - }, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_telecoms) "cHG" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 4 @@ -32886,44 +28978,10 @@ }, /turf/open/floor/prison/sterile_white/west, /area/desert_dam/building/medical/east_wing_hallway) -"cHV" = ( -/obj/structure/flora/grass/tallgrass/desert/corner, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_telecoms) -"cHX" = ( -/obj/structure/flora/grass/tallgrass/desert/corner{ - dir = 10 - }, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_telecoms) -"cHY" = ( -/obj/structure/flora/grass/tallgrass/desert/corner{ - dir = 5 - }, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_telecoms) "cIa" = ( /obj/effect/blocker/toxic_water/Group_2, /turf/open/gm/river/desert/shallow_edge/covered/north, /area/desert_dam/exterior/river/riverside_east) -"cIc" = ( -/obj/structure/flora/grass/tallgrass/desert/corner{ - dir = 9 - }, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_telecoms) -"cId" = ( -/obj/structure/flora/grass/desert/heavygrass_5, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_telecoms) -"cIe" = ( -/obj/structure/flora/grass/desert/lightgrass_4, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_telecoms) -"cIg" = ( -/obj/structure/flora/grass/desert/heavygrass_4, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_telecoms) "cIh" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached19, /area/desert_dam/exterior/valley/valley_cargo) @@ -33425,6 +29483,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/interior/tatami, /area/desert_dam/building/bar/bar) +"cKm" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_telecoms) "cKn" = ( /turf/open/floor/plating/warnplate/southeast, /area/desert_dam/exterior/telecomm/lz2_containers) @@ -33619,20 +29681,6 @@ }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached15, /area/desert_dam/exterior/landing_pad_two) -"cLh" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/shallow_edge/northeast, -/area/desert_dam/exterior/river/riverside_south) -"cLi" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/shallow, -/area/desert_dam/exterior/river/riverside_south) "cLj" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 1 @@ -33910,20 +29958,6 @@ }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached13, /area/desert_dam/exterior/valley/valley_cargo) -"cMN" = ( -/obj/structure/stairs, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/valley_medical) -"cMO" = ( -/obj/structure/stairs, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/valley_medical) "cMP" = ( /turf/closed/wall/r_wall, /area/desert_dam/building/medical/virology_isolation) @@ -34128,21 +30162,6 @@ }, /turf/open/floor/interior/wood, /area/desert_dam/building/bar/bar) -"cNC" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/valley/valley_medical) -"cND" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/valley/valley_medical) "cNE" = ( /obj/structure/surface/table, /obj/item/storage/fancy/vials/random, @@ -34285,12 +30304,6 @@ "cOk" = ( /turf/open/desert/dirt/dirt2, /area/desert_dam/exterior/valley/valley_medical) -"cOl" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/valley/valley_medical) "cOm" = ( /turf/open/floor/prison/whitegreen, /area/desert_dam/building/medical/virology_isolation) @@ -35656,6 +31669,10 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/prison/darkyellow2/southeast, /area/desert_dam/building/mining/workshop) +"cUw" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/asphalt/cement/cement2, +/area/desert_dam/interior/dam_interior/north_tunnel) "cUy" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal6" @@ -35707,19 +31724,6 @@ /obj/structure/bed/chair/office/light, /turf/open/floor/prison/sterile_white/west, /area/desert_dam/building/hydroponics/hydroponics_breakroom) -"cUI" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/valley/valley_hydro) -"cUJ" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/desert/desert_shore/shore_corner2/west, -/area/desert_dam/exterior/river/riverside_south) "cUK" = ( /obj/structure/flora/bush/desert/cactus/multiple{ icon_state = "cacti_7" @@ -35904,13 +31908,6 @@ /obj/structure/window/framed/colony/reinforced, /turf/open/floor/plating, /area/desert_dam/building/hydroponics/hydroponics_breakroom) -"cVX" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/desert/desert_shore/desert_shore1/north, -/area/desert_dam/exterior/river/riverside_south) "cWa" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 4 @@ -36005,27 +32002,6 @@ /obj/structure/disposalpipe/segment, /turf/open/asphalt/cement_sunbleached/cement_sunbleached2, /area/desert_dam/exterior/valley/valley_hydro) -"cWC" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/desert/desert_shore/shore_edge1/east, -/area/desert_dam/exterior/river/riverside_south) -"cWD" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/valley/valley_hydro) -"cWE" = ( -/obj/structure/platform_decoration, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/valley/valley_hydro) -"cWF" = ( -/obj/structure/platform, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/valley/valley_hydro) "cWH" = ( /obj/structure/fence, /turf/open/desert/dirt/desert_transition_edge1/north, @@ -36094,24 +32070,6 @@ }, /turf/open/asphalt/tile, /area/desert_dam/exterior/valley/valley_cargo) -"cXn" = ( -/obj/structure/stairs{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/valley_hydro) -"cXo" = ( -/obj/structure/stairs{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/valley_hydro) "cXp" = ( /obj/effect/blocker/toxic_water/Group_1, /turf/open/desert/desert_shore/desert_shore1/north, @@ -36143,13 +32101,6 @@ /obj/structure/window/framed/colony/reinforced, /turf/open/floor/plating, /area/desert_dam/building/hydroponics/hydroponics_storage) -"cXA" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/asphalt, -/area/desert_dam/exterior/landing_pad_two) "cXD" = ( /turf/open/floor/prison/darkbrown2, /area/desert_dam/building/warehouse/warehouse) @@ -36177,13 +32128,6 @@ /obj/structure/machinery/light, /turf/open/floor/prison/darkbrown2, /area/desert_dam/building/warehouse/warehouse) -"cYe" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/river/riverside_south) "cYf" = ( /obj/effect/blocker/toxic_water/Group_1, /turf/open/desert/desert_shore/shore_edge1/east, @@ -36402,13 +32346,6 @@ /obj/structure/largecrate/random, /turf/open/asphalt/tile, /area/desert_dam/exterior/valley/valley_hydro) -"cZd" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/shallow, -/area/desert_dam/exterior/river/riverside_south) "cZe" = ( /obj/structure/largecrate/random/barrel/blue, /turf/open/asphalt/tile, @@ -36524,10 +32461,6 @@ }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached9, /area/desert_dam/exterior/valley/valley_medical) -"cZK" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/prison/sterile_white/west, -/area/desert_dam/building/medical/morgue) "cZP" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/desertdam/decals/road_edge{ @@ -37185,6 +33118,11 @@ }, /turf/open/asphalt/cement_sunbleached, /area/desert_dam/exterior/valley/valley_civilian) +"ddH" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/shallow_edge, +/area/desert_dam/exterior/river/riverside_east) "ddJ" = ( /obj/structure/machinery/conveyor{ dir = 8; @@ -37961,22 +33899,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt/cement, /area/desert_dam/interior/dam_interior/central_tunnel) -"dgW" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/shallow, -/area/desert_dam/exterior/river/riverside_south) -"dgX" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/valley/valley_civilian) "dgY" = ( /turf/open/floor/prison/kitchen/southwest, /area/desert_dam/building/cafeteria/cafeteria) @@ -38023,6 +33945,11 @@ /obj/structure/window/framed/hangar/reinforced, /turf/open/floor/plating, /area/desert_dam/building/water_treatment_one/hallway) +"dhv" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/obj/effect/decal/sand_overlay/sand1, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached12, +/area/desert_dam/exterior/valley/valley_cargo) "dhA" = ( /obj/structure/window/framed/hangar/reinforced, /turf/open/floor/plating, @@ -38039,6 +33966,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/sterile_white, /area/desert_dam/interior/dam_interior/central_tunnel) +"dhV" = ( +/obj/effect/decal/sand_overlay/sand1, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached15, +/area/desert_dam/exterior/valley/valley_security) "dhX" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ dir = 2 @@ -38092,6 +34023,11 @@ /obj/structure/machinery/power/port_gen/pacman, /turf/open/floor/plating, /area/desert_dam/building/substation/northwest) +"diD" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/desert/desert_shore/desert_shore1/west, +/area/desert_dam/exterior/river/riverside_central_south) "diG" = ( /obj/structure/machinery/light, /turf/open/floor/prison/yellow, @@ -38124,13 +34060,6 @@ /obj/effect/blocker/toxic_water/Group_2, /turf/open/asphalt, /area/desert_dam/exterior/river/riverside_east) -"diM" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_east) "diN" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -38157,6 +34086,13 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_civilian) +"diX" = ( +/obj/structure/stairs{ + dir = 1 + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/asphalt/cement/cement1, +/area/desert_dam/interior/dam_interior/northeastern_tunnel) "dja" = ( /obj/structure/flora/grass/tallgrass/desert/corner{ dir = 8 @@ -38210,21 +34146,6 @@ /obj/effect/blocker/toxic_water/Group_1, /turf/open/desert/desert_shore/shore_edge1, /area/desert_dam/exterior/river/riverside_south) -"djy" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/desert/desert_shore/desert_shore1/west, -/area/desert_dam/exterior/river/riverside_south) -"djz" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/desert/desert_shore/shore_edge1, -/area/desert_dam/exterior/river/riverside_south) "djA" = ( /obj/structure/machinery/light{ dir = 4 @@ -38270,24 +34191,6 @@ }, /turf/open/floor/dark2, /area/desert_dam/building/hydroponics/hydroponics_loading) -"dkb" = ( -/obj/structure/stairs{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached2, -/area/desert_dam/exterior/valley/valley_hydro) -"dkc" = ( -/obj/structure/stairs{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached9, -/area/desert_dam/exterior/valley/valley_hydro) "dkd" = ( /obj/structure/machinery/door/airlock/almayer/generic{ name = "\improper Restroom" @@ -38390,11 +34293,6 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/floor/prison/darkyellow2/northwest, /area/desert_dam/building/substation/southwest) -"dkK" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/desert/desert_shore/desert_shore1, -/area/desert_dam/exterior/river/riverside_south) "dkL" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Breakroom" @@ -38509,17 +34407,6 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/prison/sterile_white, /area/desert_dam/building/cafeteria/cafeteria) -"dlP" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/stairs, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/turf/open/asphalt/cement/cement1, -/area/desert_dam/interior/dam_interior/central_tunnel) "dlQ" = ( /obj/structure/machinery/light{ dir = 8 @@ -38614,6 +34501,16 @@ }, /turf/open/floor/prison/sterile_white, /area/desert_dam/building/cafeteria/loading) +"dnp" = ( +/obj/structure/desertdam/decals/road_stop{ + dir = 4; + icon_state = "stop_decal5" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/liquid_fuel, +/obj/structure/largecrate/supply, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_medical) "dny" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Break Room" @@ -38629,21 +34526,16 @@ /obj/structure/disposalpipe/segment, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_hydro) -"dnC" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/desert/desert_shore/desert_shore1, -/area/desert_dam/exterior/river/riverside_south) -"dnD" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/desert/desert_shore/shore_edge1, -/area/desert_dam/exterior/river/riverside_south) "dnP" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached1, /area/desert_dam/exterior/valley/valley_medical) +"dnV" = ( +/obj/effect/landmark/corpsespawner/colonist/burst, +/obj/structure/closet/bodybag{ + icon_state = "bodybag_open" + }, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached13, +/area/desert_dam/exterior/valley/valley_medical) "dod" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached12, /area/desert_dam/exterior/valley/bar_valley_dam) @@ -38684,16 +34576,6 @@ name = "reinforced metal wall" }, /area/desert_dam/building/water_treatment_one/purification) -"doN" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/desert/desert_shore/shore_corner2, -/area/desert_dam/exterior/river/riverside_south) -"doO" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/shallow, -/area/desert_dam/exterior/river/riverside_south) "doQ" = ( /obj/effect/decal/sand_overlay/sand1, /turf/open/asphalt/cement_sunbleached/cement_sunbleached14, @@ -38746,20 +34628,6 @@ "dpC" = ( /turf/open/floor/prison, /area/desert_dam/building/water_treatment_one/purification) -"dpD" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/shallow, -/area/desert_dam/exterior/river/riverside_south) -"dpE" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/desert/desert_shore/desert_shore1, -/area/desert_dam/exterior/river/riverside_south) "dpF" = ( /obj/structure/machinery/vending/dinnerware, /obj/effect/decal/cleanable/dirt, @@ -38920,6 +34788,9 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/sterile_white, /area/desert_dam/building/cafeteria/cafeteria) +"drJ" = ( +/turf/open/floor/warnwhite/northeast, +/area/desert_dam/exterior/valley/valley_security) "drL" = ( /obj/structure/flora/grass/tallgrass/desert/corner{ dir = 6 @@ -39013,20 +34884,6 @@ /obj/effect/blocker/toxic_water/Group_2, /turf/open/gm/river/desert/shallow_corner/west, /area/desert_dam/exterior/river/riverside_central_south) -"dsi" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/shallow_edge/north, -/area/desert_dam/exterior/river/riverside_central_south) -"dsk" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/shallow_edge/north, -/area/desert_dam/exterior/river/riverside_central_south) "dsA" = ( /turf/open/floor/prison/red/west, /area/desert_dam/building/water_treatment_one/lobby) @@ -39058,22 +34915,9 @@ "dsT" = ( /turf/open/floor/filtrationside/north, /area/desert_dam/exterior/valley/valley_hydro) -"dsU" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/river/riverside_south) "dsV" = ( /turf/open/floor/filtrationside/northeast, /area/desert_dam/exterior/valley/valley_hydro) -"dsW" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/shallow_edge/northeast, -/area/desert_dam/exterior/river/riverside_central_south) "dto" = ( /obj/structure/surface/table, /turf/open/floor/prison, @@ -39124,13 +34968,6 @@ /obj/effect/blocker/toxic_water/Group_1, /turf/open/desert/desert_shore/shore_edge1/east, /area/desert_dam/exterior/valley/valley_civilian) -"dtG" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/desert/desert_shore/shore_edge1/east, -/area/desert_dam/exterior/valley/valley_civilian) "dtH" = ( /obj/effect/blocker/toxic_water/Group_1, /turf/open/desert/desert_shore/shore_edge1/north, @@ -39144,14 +34981,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt/cement/cement1, /area/desert_dam/interior/dam_interior/central_tunnel) -"dtX" = ( -/obj/structure/platform_decoration, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/river/riverside_south) -"dtY" = ( -/obj/structure/platform, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/river/riverside_south) "duc" = ( /obj/structure/flora/grass/tallgrass/desert/corner{ dir = 10 @@ -39164,6 +34993,11 @@ }, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) +"dug" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/desert/desert_shore/shore_edge1/north, +/area/desert_dam/exterior/river/riverside_east) "dun" = ( /obj/structure/machinery/computer/med_data/laptop, /obj/structure/surface/table/woodentable/fancy, @@ -39215,25 +35049,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/sterile_white, /area/desert_dam/building/cafeteria/cafeteria) -"duy" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/shallow, -/area/desert_dam/exterior/river/riverside_east) -"duz" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/desert/desert_shore/desert_shore1/east, -/area/desert_dam/exterior/valley/valley_civilian) -"duA" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/desert/desert_shore/desert_shore1/west, -/area/desert_dam/exterior/river/riverside_south) "duB" = ( /obj/structure/fence, /turf/open/desert/dirt/desert_transition_edge1/northwest, @@ -39248,6 +35063,11 @@ "duJ" = ( /turf/open/desert/dirt/desert_transition_corner1/east, /area/desert_dam/exterior/valley/bar_valley_dam) +"duN" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/shallow_edge/north, +/area/desert_dam/exterior/river/riverside_central_south) "duP" = ( /obj/structure/window/reinforced{ dir = 8; @@ -39302,6 +35122,13 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/prison/sterile_white, /area/desert_dam/building/cafeteria/cafeteria) +"dvi" = ( +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal2" + }, +/obj/effect/decal/cleanable/blood, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_medical) "dvj" = ( /obj/effect/decal/cleanable/dirt, /turf/open/asphalt/cement_sunbleached/cement_sunbleached2, @@ -39314,11 +35141,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt/cement_sunbleached/cement_sunbleached9, /area/desert_dam/exterior/valley/valley_civilian) -"dvn" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/sterile_white, -/area/desert_dam/building/cafeteria/cafeteria) "dvo" = ( /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, @@ -39327,18 +35149,6 @@ /obj/structure/machinery/computer/area_atmos, /turf/open/floor/prison, /area/desert_dam/building/water_treatment_one/control_room) -"dvx" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/shallow_edge/southwest, -/area/desert_dam/exterior/river/riverside_south) -"dvy" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/shallow_edge, -/area/desert_dam/exterior/river/riverside_south) "dvz" = ( /obj/effect/blocker/toxic_water/Group_1, /turf/open/desert/desert_shore/shore_corner2/east, @@ -39349,13 +35159,6 @@ }, /turf/open/asphalt/tile, /area/desert_dam/exterior/valley/south_valley_dam) -"dvB" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/shallow_edge/west, -/area/desert_dam/exterior/river/riverside_south) "dvD" = ( /obj/structure/bed, /obj/structure/machinery/light{ @@ -39761,6 +35564,11 @@ "dzm" = ( /turf/open/floor/prison/whitegreenfull/southwest, /area/desert_dam/building/water_treatment_one/floodgate_control) +"dzn" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/shallow_edge/northeast, +/area/desert_dam/exterior/river/riverside_south) "dzo" = ( /obj/effect/blocker/toxic_water/Group_1, /turf/open/desert/desert_shore/shore_edge1/west, @@ -39858,6 +35666,13 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_labs) +"dzV" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/decal/sand_overlay/sand1{ + dir = 4 + }, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_cargo) "dzY" = ( /obj/structure/surface/table/woodentable, /obj/structure/machinery/computer/objective, @@ -39921,13 +35736,6 @@ /obj/effect/blocker/toxic_water, /turf/open/gm/river/desert/deep/covered, /area/desert_dam/exterior/river/filtration_a) -"dAB" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/desert/desert_shore/shore_corner2/west, -/area/desert_dam/exterior/river/riverside_east) "dAD" = ( /turf/open/floor/prison/green, /area/desert_dam/building/dorms/hallway_northwing) @@ -40152,6 +35960,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/southwest, /area/desert_dam/interior/dam_interior/disposals) +"dCa" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/shallow_edge/west, +/area/desert_dam/exterior/river/riverside_central_south) "dCb" = ( /turf/open/floor/prison, /area/desert_dam/building/dorms/hallway_westwing) @@ -40295,13 +36108,6 @@ "dCT" = ( /turf/open/floor/coagulation/icon7_8_2, /area/desert_dam/exterior/valley/valley_hydro) -"dCU" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/desert/desert_shore/shore_edge1/east, -/area/desert_dam/exterior/river/riverside_east) "dCV" = ( /obj/structure/machinery/light{ dir = 4 @@ -40376,13 +36182,6 @@ "dDH" = ( /turf/open/floor/coagulation/icon8_7_2, /area/desert_dam/exterior/valley/valley_hydro) -"dDI" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/shallow_corner/north, -/area/desert_dam/exterior/river/riverside_south) "dDJ" = ( /turf/open/floor/prison/green/west, /area/desert_dam/building/dorms/hallway_westwing) @@ -40420,51 +36219,6 @@ "dEe" = ( /turf/open/floor/coagulation/icon8_3, /area/desert_dam/exterior/valley/valley_hydro) -"dEj" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/desert/desert_shore/shore_edge1/north, -/area/desert_dam/exterior/river/riverside_east) -"dEk" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/shallow_edge/northwest, -/area/desert_dam/exterior/river/riverside_east) -"dEl" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/shallow_edge/north, -/area/desert_dam/exterior/river/riverside_east) -"dEm" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/shallow_corner/north, -/area/desert_dam/exterior/river/riverside_east) -"dEn" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_south) -"dEo" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_south) "dEr" = ( /obj/structure/closet/cabinet, /turf/open/floor/wood, @@ -40494,49 +36248,19 @@ /obj/structure/machinery/colony_floodlight, /turf/open/asphalt/tile, /area/desert_dam/exterior/valley/valley_civilian) +"dEU" = ( +/obj/effect/landmark/corpsespawner/engineer, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison/southwest, +/area/desert_dam/interior/dam_interior/atmos_storage) "dEV" = ( /obj/structure/filtration/collector_pipes, /turf/open/floor/filtrationside/west, /area/desert_dam/exterior/valley/valley_hydro) -"dEW" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_east) -"dEX" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/shallow_edge/north, -/area/desert_dam/exterior/river/riverside_east) "dEY" = ( /obj/effect/blocker/toxic_water/Group_2, /turf/open/gm/river/desert/shallow_edge/north, /area/desert_dam/exterior/river/riverside_east) -"dEZ" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water, -/turf/open/desert/desert_shore/shore_corner2/west, -/area/desert_dam/exterior/river_mouth/southern) -"dFc" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/shallow_corner, -/area/desert_dam/exterior/river/riverside_south) -"dFd" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/shallow_edge/north, -/area/desert_dam/exterior/river/riverside_south) "dFe" = ( /obj/effect/blocker/toxic_water/Group_1, /turf/open/floor/filtrationside/east, @@ -40607,36 +36331,6 @@ "dFN" = ( /turf/open/floor/coagulation/icon8_4, /area/desert_dam/exterior/valley/valley_hydro) -"dFP" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/filtration_a) -"dFQ" = ( -/obj/structure/filtration/collector_pipes{ - icon_state = "lower_2" - }, -/obj/structure/platform, -/obj/effect/blocker/toxic_water, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/filtration_a) -"dFR" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_east) -"dFS" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/shallow_corner/west, -/area/desert_dam/exterior/river/riverside_south) "dFU" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 1; @@ -40688,26 +36382,6 @@ }, /turf/open/floor/filtrationside/west, /area/desert_dam/exterior/valley/valley_hydro) -"dGu" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/shallow_corner, -/area/desert_dam/exterior/river/riverside_east) -"dGv" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/filtration_a) -"dGw" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/filtration_a) "dGx" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -40721,28 +36395,6 @@ }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached12, /area/desert_dam/exterior/valley/valley_medical) -"dGz" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/shallow_edge/northeast, -/area/desert_dam/exterior/river/riverside_east) -"dGA" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_south) -"dGB" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/shallow_edge/southwest, -/area/desert_dam/exterior/river/riverside_south) "dGC" = ( /turf/open/floor/prison/green/north, /area/desert_dam/building/dorms/hallway_westwing) @@ -40767,15 +36419,6 @@ /obj/structure/disposalpipe/segment, /turf/open/asphalt, /area/desert_dam/exterior/valley/bar_valley_dam) -"dGN" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/decal/sand_overlay/sand1{ - dir = 4 - }, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/valley_telecoms) "dGQ" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 8 @@ -40805,38 +36448,6 @@ /obj/effect/blocker/toxic_water/Group_2, /turf/open/gm/river/desert/shallow, /area/desert_dam/exterior/river/riverside_central_south) -"dHc" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform, -/obj/effect/blocker/toxic_water, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/filtration_a) -"dHd" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water, -/turf/open/gm/river/desert/shallow_corner/west, -/area/desert_dam/exterior/river_mouth/southern) -"dHe" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water, -/turf/open/gm/river/desert/shallow, -/area/desert_dam/exterior/river_mouth/southern) -"dHf" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/shallow_corner/west, -/area/desert_dam/exterior/river/riverside_south) -"dHg" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_south) "dHh" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony{ name = "\improper Lab Maintenance" @@ -40915,28 +36526,6 @@ /obj/effect/decal/sand_overlay/sand1/corner1, /turf/open/floor/coagulation/icon8_3, /area/desert_dam/exterior/valley/valley_hydro) -"dHy" = ( -/obj/effect/blocker/toxic_water, -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/desert/desert_shore/shore_corner2/north, -/area/desert_dam/exterior/river_mouth/southern) -"dHA" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/river/riverside_south) -"dHB" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_1, -/turf/open/desert/desert_shore/shore_edge1/west, -/area/desert_dam/exterior/river/riverside_south) "dHD" = ( /turf/open/floor/prison/green, /area/desert_dam/building/dorms/hallway_westwing) @@ -41105,39 +36694,10 @@ /obj/structure/machinery/colony_floodlight, /turf/open/asphalt/cement_sunbleached/cement_sunbleached14, /area/desert_dam/exterior/valley/valley_hydro) -"dIC" = ( -/obj/structure/stairs{ - dir = 4 - }, -/obj/structure/platform{ - dir = 1 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached9, -/area/desert_dam/exterior/valley/valley_hydro) -"dID" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/valley/valley_hydro) -"dIG" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water, -/turf/open/gm/river/desert/shallow_edge/southwest, -/area/desert_dam/exterior/river_mouth/southern) "dIH" = ( /obj/effect/blocker/toxic_water, /turf/open/gm/river/desert/shallow_corner/west, /area/desert_dam/exterior/river_mouth/southern) -"dII" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water, -/turf/open/desert/desert_shore/shore_corner2, -/area/desert_dam/exterior/river_mouth/southern) "dIJ" = ( /turf/open/floor/prison/blue/west, /area/desert_dam/building/dorms/pool) @@ -41205,13 +36765,11 @@ /obj/structure/closet/lasertag/red, /turf/open/floor/prison/blue/north, /area/desert_dam/building/dorms/pool) -"dJd" = ( -/obj/structure/stairs{ - dir = 4 - }, -/obj/structure/platform, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached15, -/area/desert_dam/exterior/valley/valley_hydro) +"dIZ" = ( +/obj/effect/blocker/toxic_water/Group_2, +/obj/structure/platform/metal/almayer/west, +/turf/open/desert/desert_shore/desert_shore1/west, +/area/desert_dam/exterior/river/riverside_central_north) "dJe" = ( /turf/open/desert/dirt/dirt2, /area/desert_dam/exterior/river_mouth/southern) @@ -41219,13 +36777,6 @@ /obj/effect/blocker/toxic_water, /turf/open/gm/river/desert/shallow_edge/west, /area/desert_dam/exterior/river_mouth/southern) -"dJg" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water, -/turf/open/desert/desert_shore/shore_corner2/east, -/area/desert_dam/exterior/river_mouth/southern) "dJh" = ( /obj/structure/machinery/light, /turf/open/floor/wood, @@ -41246,13 +36797,10 @@ /obj/structure/surface/rack, /turf/open/floor/prison/blue/east, /area/desert_dam/building/dorms/pool) -"dJA" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water, -/turf/open/desert/desert_shore/desert_shore1/west, -/area/desert_dam/exterior/river_mouth/southern) +"dJx" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/asphalt/cement, +/area/desert_dam/interior/dam_interior/northeastern_tunnel) "dJB" = ( /obj/effect/blocker/toxic_water/Group_2, /turf/open/gm/river/desert/shallow_edge/northeast, @@ -41265,13 +36813,6 @@ /obj/effect/blocker/toxic_water, /turf/open/gm/river/desert/shallow_edge/southeast, /area/desert_dam/exterior/river_mouth/southern) -"dJE" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water, -/turf/open/desert/desert_shore/desert_shore1/east, -/area/desert_dam/exterior/river_mouth/southern) "dJG" = ( /turf/open/floor/prison/whitegreenfull, /area/desert_dam/building/dorms/pool) @@ -41313,13 +36854,6 @@ /obj/structure/lz_sign/dam_sign/damaged, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_northwest) -"dJS" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/blocker/toxic_water, -/turf/open/desert/desert_shore/shore_edge1/north, -/area/desert_dam/exterior/river_mouth/southern) "dJT" = ( /obj/effect/blocker/toxic_water/Group_2, /turf/open/gm/river/desert/shallow, @@ -41469,13 +37003,6 @@ /obj/effect/blocker/toxic_water/Group_2, /turf/open/desert/desert_shore/shore_corner2/west, /area/desert_dam/exterior/river/riverside_east) -"dKB" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/blocker/toxic_water, -/turf/open/desert/desert_shore/desert_shore1/north, -/area/desert_dam/exterior/river_mouth/southern) "dKE" = ( /obj/effect/decal/sand_overlay/sand1, /turf/open/asphalt/cement_sunbleached/cement_sunbleached18, @@ -41500,13 +37027,6 @@ /obj/effect/blocker/toxic_water, /turf/open/desert/desert_shore/shore_corner2/east, /area/desert_dam/exterior/river_mouth/southern) -"dKK" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water, -/turf/open/desert/desert_shore/shore_edge1/west, -/area/desert_dam/exterior/river_mouth/southern) "dKL" = ( /obj/effect/blocker/toxic_water, /turf/open/desert/desert_shore/desert_shore1/west, @@ -41629,20 +37149,6 @@ /obj/effect/blocker/toxic_water/Group_2, /turf/open/desert/desert_shore/shore_corner2/north, /area/desert_dam/exterior/river/riverside_east) -"dLh" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/desert/desert_shore/desert_shore1/north, -/area/desert_dam/exterior/river/riverside_east) -"dLi" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/shallow, -/area/desert_dam/exterior/river/riverside_east) "dLj" = ( /obj/effect/blocker/toxic_water/Group_2, /turf/open/gm/river/desert/shallow_edge/northwest, @@ -41651,13 +37157,6 @@ /obj/effect/blocker/toxic_water/Group_2, /turf/open/gm/river/desert/shallow_corner, /area/desert_dam/exterior/river/riverside_east) -"dLl" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/shallow_edge/north, -/area/desert_dam/exterior/river/riverside_east) "dLn" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -41665,13 +37164,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/freezerfloor, /area/desert_dam/interior/dam_interior/break_room) -"dLp" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/shallow_edge/north, -/area/desert_dam/exterior/river/riverside_east) "dLq" = ( /obj/effect/blocker/toxic_water/Group_2, /turf/open/desert/desert_shore/desert_shore1, @@ -41714,45 +37206,23 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/freezerfloor, /area/desert_dam/interior/dam_interior/break_room) -"dLF" = ( -/obj/structure/platform{ - dir = 8 +"dLH" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/shallow_edge, -/area/desert_dam/exterior/river/riverside_east) -"dLI" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/desert/desert_shore/shore_edge1, -/area/desert_dam/exterior/river/riverside_central_south) -"dLJ" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/desert/desert_shore/shore_corner2, -/area/desert_dam/exterior/river/riverside_central_south) -"dLK" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/shallow, -/area/desert_dam/exterior/river/riverside_central_south) -"dLL" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/desert/desert_shore/shore_corner2/east, -/area/desert_dam/exterior/river/riverside_central_south) -"dLM" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/desert/desert_shore/desert_shore1, -/area/desert_dam/exterior/river/riverside_central_south) -"dLN" = ( -/obj/structure/platform_decoration{ - dir = 1 +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/bed/bedroll, +/obj/effect/decal/cleanable/blood, +/obj/item/prop/colony/usedbandage{ + dir = 5; + pixel_x = 10; + pixel_y = 18 }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/desert/desert_shore/desert_shore1, -/area/desert_dam/exterior/river/riverside_east) +/obj/effect/landmark/corpsespawner/engineer, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_medical) "dLO" = ( /obj/effect/blocker/toxic_water/Group_2, /turf/open/desert/desert_shore/desert_shore1, @@ -41765,63 +37235,12 @@ /obj/effect/blocker/toxic_water/Group_2, /turf/open/desert/desert_shore/shore_corner2/east, /area/desert_dam/exterior/river/riverside_east) -"dLR" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/desert/desert_shore/desert_shore1, -/area/desert_dam/exterior/river/riverside_east) "dLS" = ( /obj/structure/flora/grass/tallgrass/desert/corner{ dir = 6 }, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_civilian) -"dLT" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/desert/desert_shore/desert_shore1, -/area/desert_dam/exterior/river/riverside_east) -"dLU" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/desert/desert_shore/shore_edge1, -/area/desert_dam/exterior/river/riverside_east) -"dLV" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/desert/desert_shore/desert_shore1, -/area/desert_dam/exterior/river/riverside_east) -"dLW" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/desert/desert_shore/shore_corner2, -/area/desert_dam/exterior/river/riverside_east) -"dLX" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/shallow, -/area/desert_dam/exterior/river/riverside_east) -"dLY" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/desert/desert_shore/shore_corner2/east, -/area/desert_dam/exterior/river/riverside_east) -"dLZ" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/desert/desert_shore/shore_edge1/west, -/area/desert_dam/exterior/river/riverside_east) -"dMf" = ( -/obj/effect/blocker/toxic_water/Group_2, -/obj/structure/platform{ - dir = 1 - }, -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/valley/valley_mining) "dMg" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -41839,11 +37258,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/whiteyellowcorner/east, /area/desert_dam/interior/dam_interior/break_room) -"dMq" = ( -/obj/structure/platform, -/obj/effect/blocker/toxic_water/Group_2, -/turf/open/gm/river/desert/shallow_edge, -/area/desert_dam/exterior/river/riverside_east) "dMw" = ( /obj/effect/blocker/toxic_water/Group_2, /turf/open/asphalt/tile, @@ -41861,12 +37275,22 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/whiteyellowcorner/east, /area/desert_dam/interior/dam_interior/break_room) +"dMH" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/desert/desert_shore/desert_shore1/north, +/area/desert_dam/exterior/river/riverside_central_south) "dMN" = ( /obj/structure/flora/grass/tallgrass/desert/corner{ dir = 1 }, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_civilian) +"dMT" = ( +/obj/effect/decal/sand_overlay/sand1, +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached12, +/area/desert_dam/exterior/valley/valley_northwest) "dMV" = ( /turf/closed/wall/r_wall/bunker{ name = "reinforced metal wall" @@ -42654,10 +38078,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/sterile_white/west, /area/desert_dam/building/medical/lobby) -"dQz" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison/whitegreencorner/north, -/area/desert_dam/building/medical/lobby) "dQA" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/disposalpipe/segment{ @@ -42701,10 +38121,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/whitegreencorner, /area/desert_dam/building/medical/west_wing_hallway) -"dQI" = ( -/obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/sterile_white/west, -/area/desert_dam/building/medical/surgery_room_one) "dQJ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/whitegreen/northwest, @@ -43120,11 +38536,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/whitegreen, /area/desert_dam/building/medical/emergency_room) -"dSg" = ( -/obj/effect/decal/cleanable/blood, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison/whitegreen/southeast, -/area/desert_dam/building/medical/emergency_room) "dSh" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -43484,6 +38895,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/yellow, /area/desert_dam/building/hydroponics/hydroponics) +"dUk" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/asphalt/cement/cement1, +/area/desert_dam/interior/dam_interior/northwestern_tunnel) "dUm" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/green{ @@ -44621,6 +40036,9 @@ /obj/structure/surface/table, /turf/open/floor/prison/green/west, /area/desert_dam/building/dorms/hallway_westwing) +"dZV" = ( +/turf/open/desert/rock/edge1/east, +/area/desert_dam/exterior/valley/valley_security) "dZX" = ( /obj/item/stool, /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -45496,6 +40914,11 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison/bright_clean/southwest, /area/desert_dam/building/hydroponics/hydroponics) +"egc" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/west, +/turf/open/desert/rock, +/area/desert_dam/exterior/valley/valley_crashsite) "ehg" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3" @@ -45660,6 +41083,13 @@ }, /turf/open/asphalt/tile, /area/desert_dam/exterior/valley/valley_hydro) +"ejK" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/effect/decal/sand_overlay/sand2{ + dir = 4 + }, +/turf/open/asphalt/cement/cement12, +/area/desert_dam/interior/dam_interior/west_tunnel) "ejR" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 8 @@ -45679,6 +41109,10 @@ }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached9, /area/desert_dam/exterior/valley/bar_valley_dam) +"ekJ" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/asphalt/cement_sunbleached, +/area/desert_dam/exterior/valley/valley_northwest) "ekN" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal7" @@ -45691,11 +41125,31 @@ }, /turf/open/asphalt/tile, /area/desert_dam/exterior/valley/valley_telecoms) +"epJ" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/stair_cut/platform_right, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/river/riverside_central_north) "eqo" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) +"eqv" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/desert/desert_shore/desert_shore1/west, +/area/desert_dam/exterior/river/riverside_central_north) +"ere" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_crashsite) +"erj" = ( +/turf/open/desert/dirt/desert_transition_corner1, +/area/desert_dam/exterior/valley/valley_security) "erB" = ( /obj/item/tool/surgery/surgicaldrill, /obj/item/tool/surgery/circular_saw, @@ -45708,35 +41162,109 @@ "erF" = ( /turf/open/desert/dirt/desert_transition_edge1/northeast, /area/desert_dam/exterior/landing_pad_two) +"esb" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/valley/valley_medical) +"esf" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/effect/decal/sand_overlay/sand1{ + dir = 8 + }, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached1, +/area/desert_dam/exterior/valley/valley_cargo) "esG" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" }, /turf/open/asphalt, /area/desert_dam/exterior/valley/bar_valley_dam) -"ett" = ( -/obj/structure/platform{ - dir = 8 +"esJ" = ( +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal2" }, -/turf/open/desert/dirt, -/area/desert_dam/exterior/telecomm/lz1_valley) +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_security) +"esX" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E" + }, +/obj/effect/decal/cleanable/blood{ + icon_state = "xgib1" + }, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_medical) +"etD" = ( +/turf/open/desert/rock, +/area/desert_dam/exterior/valley/valley_security) +"eut" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/asphalt/cement/cement3, +/area/desert_dam/interior/dam_interior/northeastern_tunnel) "euG" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached2, /area/desert_dam/exterior/valley/south_valley_dam) +"ewg" = ( +/obj/effect/landmark/corpsespawner/scientist, +/turf/open/floor/prison/darkpurple2/southeast, +/area/desert_dam/interior/lab_northeast/east_lab_biology) +"exp" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/effect/landmark/corpsespawner/administrator, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison/blue/west, +/area/desert_dam/interior/lab_northeast/east_lab_RND) +"eyp" = ( +/obj/effect/decal/sand_overlay/sand1{ + dir = 6 + }, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_security) "eyL" = ( /turf/open/gm/empty, /area/shuttle/trijent_shuttle/engi) +"ezP" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/decal/sand_overlay/sand1{ + dir = 8 + }, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_telecoms) +"ezQ" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water, +/turf/open/gm/river/desert/shallow_edge/west, +/area/desert_dam/exterior/river/riverside_east) "eAe" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 8 }, /turf/open/desert/rock, /area/desert_dam/exterior/valley/valley_crashsite) +"eBd" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water, +/turf/open/gm/river/desert/shallow_edge/southwest, +/area/desert_dam/exterior/river/riverside_east) +"eBe" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water, +/turf/open/gm/river/desert/shallow_corner/west, +/area/desert_dam/exterior/river_mouth/southern) "eBZ" = ( /obj/item/storage/fancy/vials/random, /obj/structure/surface/table/reinforced, /turf/open/floor/prison/whitegreenfull/southwest, /area/desert_dam/building/medical/treatment_room) +"eCb" = ( +/obj/structure/fence, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_security) "eCk" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal2" @@ -45749,11 +41277,30 @@ /obj/effect/decal/cleanable/liquid_fuel, /turf/open/asphalt, /area/desert_dam/building/water_treatment_one/garage) +"eDx" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/desert/excavation/component8/southwest, +/area/desert_dam/exterior/valley/valley_crashsite) +"eDH" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/river/riverside_central_south) "eDQ" = ( /obj/structure/surface/table, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/prison, /area/desert_dam/building/hydroponics/hydroponics) +"eFo" = ( +/obj/structure/stairs{ + dir = 1 + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached1, +/area/desert_dam/exterior/valley/valley_medical) +"eGv" = ( +/obj/effect/decal/sand_overlay/sand1/corner1, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached1, +/area/desert_dam/exterior/valley/valley_security) "eHi" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 1 @@ -45764,14 +41311,67 @@ /obj/structure/flora/grass/tallgrass/desert, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) +"eJs" = ( +/obj/structure/platform/metal/almayer, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_crashsite) +"eKe" = ( +/obj/structure/platform/metal/almayer, +/turf/open/desert/dirt, +/area/desert_dam/exterior/telecomm/lz1_valley) +"eKu" = ( +/obj/structure/stairs{ + dir = 4 + }, +/obj/structure/platform/metal/stair_cut/platform_left, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached4, +/area/desert_dam/exterior/valley/valley_cargo) +"eKL" = ( +/obj/item/prop/colony/used_flare, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_medical) "eKN" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/cell_stripe/west, /area/desert_dam/interior/dam_interior/hanger) +"eME" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/desert/desert_shore/desert_shore1/west, +/area/desert_dam/exterior/river/riverside_south) +"eNs" = ( +/obj/structure/stairs, +/obj/structure/platform/metal/almayer/west, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_crashsite) +"eNO" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/machinery/light, +/turf/open/asphalt/cement/cement4, +/area/desert_dam/interior/dam_interior/northeastern_tunnel) "eNU" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/prison/whitepurple, /area/desert_dam/interior/lab_northeast/east_lab_central_hallway) +"eOU" = ( +/obj/structure/bed, +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/effect/landmark/corpsespawner/colonist, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/wood, +/area/desert_dam/building/dorms/hallway_northwing) +"ePP" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_east) +"eRk" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached3, +/area/desert_dam/exterior/valley/valley_northwest) "eRn" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal10" @@ -45784,17 +41384,31 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/landing_pad_one) +"eRM" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/desert/desert_shore/shore_corner2/east, +/area/desert_dam/exterior/river/riverside_central_south) "eRX" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal8" }, /turf/open/asphalt, /area/desert_dam/exterior/landing_pad_two) +"eSg" = ( +/obj/structure/platform/metal/almayer, +/turf/open/asphalt/cement/cement4, +/area/desert_dam/interior/dam_interior/central_tunnel) "eTi" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/vault2/northeast, /area/desert_dam/building/security/prison) +"eUW" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/shallow_edge/north, +/area/desert_dam/exterior/river/riverside_south) "eVk" = ( /obj/effect/decal/warning_stripes{ icon_state = "N" @@ -45823,11 +41437,24 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/prison/green, /area/desert_dam/building/dorms/hallway_northwing) +"eWo" = ( +/turf/open/asphalt/cement_sunbleached/cement_sunbleached14, +/area/desert_dam/exterior/valley/valley_security) +"eWA" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/shallow_edge/west, +/area/desert_dam/exterior/river/riverside_south) "eXM" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_hydro) +"eXT" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_telecoms) "eYn" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/machinery/computer/objective{ @@ -45870,12 +41497,30 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/landing_pad_one) +"far" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood, +/obj/item/prop/colony/usedbandage{ + dir = 9; + pixel_x = 5; + pixel_y = 15 + }, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_medical) "faE" = ( /obj/structure/flora/grass/tallgrass/desert/corner{ dir = 1 }, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) +"faT" = ( +/obj/structure/flora/grass/tallgrass/desert/corner{ + dir = 6 + }, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_security) "fbK" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/plating, @@ -45898,36 +41543,68 @@ }, /turf/open/desert/rock/deep/transition/north, /area/desert_dam/exterior/telecomm/lz1_south) +"fcP" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_wilderness) "fdk" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3" }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_hydro) +"fdY" = ( +/obj/effect/decal/sand_overlay/sand1/corner1{ + dir = 1 + }, +/turf/open/asphalt/cement_sunbleached, +/area/desert_dam/exterior/valley/valley_security) +"feG" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_telecoms) +"feQ" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/desert/rock/deep, +/area/desert_dam/interior/dam_interior/south_tunnel) "feU" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached15, /area/desert_dam/exterior/valley/valley_crashsite) -"fgo" = ( -/obj/structure/platform/mineral/sandstone/runed{ +"ffO" = ( +/obj/effect/blocker/toxic_water/Group_2, +/obj/structure/platform/metal/almayer/north, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/valley/valley_mining) +"fgF" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_telecoms) +"fhT" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/desert/desert_shore/desert_shore1/west, +/area/desert_dam/exterior/river/riverside_south) +"fiq" = ( +/obj/structure/barricade/sandbags{ dir = 1 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/sandstone/runed, -/area/desert_dam/interior/caves/temple) -"fgU" = ( -/obj/structure/desertdam/decals/road_edge{ - icon_state = "road_edge_decal2" +/obj/structure/barricade/sandbags{ + dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_telecoms) -"fiW" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 8 +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_security) +"fiY" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/turf/open/desert/desert_shore/desert_shore1, -/area/desert_dam/interior/caves/temple) +/obj/effect/decal/warning_stripes{ + icon_state = "E" + }, +/obj/item/weapon/gun/revolver/cmb, +/turf/open/floor/asteroidplating, +/area/desert_dam/exterior/valley/valley_crashsite) "flj" = ( /obj/structure/filingcabinet, /obj/effect/landmark/objective_landmark/medium, @@ -45945,6 +41622,10 @@ "fmP" = ( /turf/open/gm/empty, /area/shuttle/trijent_shuttle/lz1) +"fnC" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/asphalt/cement/cement15, +/area/desert_dam/interior/dam_interior/north_tunnel) "foq" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -45961,6 +41642,13 @@ }, /turf/closed/wall/rock/orange, /area/desert_dam/exterior/rock) +"fpX" = ( +/obj/structure/platform_decoration/metal/almayer, +/obj/effect/decal/sand_overlay/sand1/corner1{ + dir = 8 + }, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached12, +/area/desert_dam/exterior/valley/valley_telecoms) "fqj" = ( /turf/open/desert/dirt/desert_transition_corner1/west, /area/desert_dam/exterior/landing_pad_one) @@ -45977,6 +41665,12 @@ /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/white, /area/desert_dam/building/lab_northwest/west_lab_xenoflora) +"fsE" = ( +/obj/structure/barricade/deployable{ + dir = 1 + }, +/turf/open/desert/dirt/desert_transition_edge1/southeast, +/area/desert_dam/exterior/valley/valley_medical) "fsK" = ( /obj/effect/decal/sand_overlay/sand1, /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -45987,12 +41681,37 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/wood, /area/desert_dam/building/dorms/hallway_westwing) +"ftF" = ( +/turf/open/floor/warnwhite/northwest, +/area/desert_dam/exterior/valley/valley_security) +"ftK" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_security) +"ftM" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/river/riverside_central_north) +"fuX" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/shallow, +/area/desert_dam/exterior/river/riverside_south) "fxs" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal6" }, /turf/open/asphalt, /area/desert_dam/exterior/valley/bar_valley_dam) +"fxw" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water, +/turf/open/gm/river/desert/shallow_edge/east, +/area/desert_dam/exterior/river/riverside_east) "fyq" = ( /turf/open/desert/dirt/desert_transition_edge1/southwest, /area/desert_dam/exterior/valley/south_valley_dam) @@ -46000,6 +41719,17 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/prison/darkyellow2/north, /area/desert_dam/interior/dam_interior/garage) +"fAH" = ( +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal9" + }, +/obj/structure/machinery/door_control{ + id = "garage_dd"; + name = "Garage Lockdown"; + pixel_y = 28 + }, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_security) "fBF" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal7" @@ -46009,6 +41739,16 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/bar_valley_dam) +"fBJ" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_central_south) +"fBL" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/decal/cleanable/dirt, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached3, +/area/desert_dam/exterior/valley/valley_crashsite) "fCB" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal11" @@ -46023,21 +41763,44 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/prison, /area/desert_dam/building/dorms/hallway_northwing) -"fEQ" = ( -/obj/structure/desertdam/decals/road_stop{ - dir = 4; - icon_state = "stop_decal5" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/liquid_fuel, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_medical) +"fDR" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/river/riverside_central_north) +"fEU" = ( +/obj/item/ammo_magazine/smg/mp5, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_crashsite) +"fFh" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/river/riverside_east) "fFw" = ( /obj/structure/prop/dam/boulder/boulder2{ desc = "A large rock. It looks very hard to get around." }, /turf/open/desert/rock/deep/rock3, /area/desert_dam/interior/caves/temple) +"fFG" = ( +/obj/structure/target, +/obj/effect/decal/sand_overlay/sand1, +/turf/open/floor/plating/warnplate, +/area/desert_dam/exterior/valley/valley_security) +"fGF" = ( +/obj/structure/stairs{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/platform/metal/stair_cut/platform_left, +/turf/open/asphalt/cement, +/area/desert_dam/interior/dam_interior/west_tunnel) +"fGL" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/river/riverside_central_south) "fHg" = ( /turf/open/desert/dirt/desert_transition_edge1, /area/desert_dam/exterior/valley/south_valley_dam) @@ -46060,9 +41823,36 @@ /obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/prison/bright_clean/southwest, /area/desert_dam/building/warehouse/loading) +"fKO" = ( +/obj/structure/platform/metal/almayer, +/turf/open/asphalt/cement/cement4, +/area/desert_dam/interior/dam_interior/northwestern_tunnel) +"fLe" = ( +/obj/structure/flora/grass/desert/heavygrass_5, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_security) +"fLl" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/river/riverside_south) +"fLu" = ( +/obj/effect/decal/sand_overlay/sand1{ + dir = 8 + }, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached1, +/area/desert_dam/exterior/valley/valley_security) +"fLT" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/desert/rock/edge1/east, +/area/desert_dam/exterior/valley/valley_telecoms) "fNw" = ( /turf/open/desert/dirt/desert_transition_edge1/east, /area/desert_dam/exterior/valley/bar_valley_dam) +"fOl" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/shallow_edge/west, +/area/desert_dam/exterior/river/riverside_south) "fPc" = ( /turf/closed/wall/r_wall/bunker{ acided_hole_dir = 4 @@ -46072,18 +41862,36 @@ /obj/structure/surface/rack, /turf/open/floor/prison/darkyellow2/north, /area/desert_dam/interior/dam_interior/primary_tool_storage) -"fRy" = ( -/obj/structure/stairs, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached15, -/area/desert_dam/exterior/valley/valley_crashsite) +"fPz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/largecrate/supply/supplies/mre, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_medical) +"fPK" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/shallow_edge/northeast, +/area/desert_dam/exterior/river/riverside_east) "fSc" = ( /obj/structure/flora/grass/desert/lightgrass_12, /turf/open/desert/dirt, /area/desert_dam/exterior/landing_pad_two) +"fSK" = ( +/obj/effect/decal/cleanable/blood{ + dir = 8; + icon_state = "gib6"; + layer = 4; + pixel_y = 3 + }, +/turf/open/floor/prison/southwest, +/area/desert_dam/interior/dam_interior/atmos_storage) +"fTg" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water, +/turf/open/desert/desert_shore/desert_shore1/west, +/area/desert_dam/exterior/river_mouth/southern) "fTk" = ( /obj/structure/sink/kitchen, /obj/structure/surface/table/reinforced, @@ -46092,12 +41900,47 @@ }, /turf/open/floor/prison/sterile_white, /area/desert_dam/building/cafeteria/cafeteria) +"fTJ" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/filtration_a) +"fUI" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/shallow_edge/east, +/area/desert_dam/exterior/river/riverside_central_north) "fUO" = ( /obj/effect/decal/sand_overlay/sand1/corner1{ dir = 1 }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached4, /area/desert_dam/exterior/valley/valley_hydro) +"fWo" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/asphalt/cement, +/area/desert_dam/interior/dam_interior/central_tunnel) +"fWC" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_east) +"fXL" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison/bright_clean2, +/area/desert_dam/interior/lab_northeast/east_lab_central_hallway) +"fYg" = ( +/obj/structure/stairs{ + dir = 4 + }, +/obj/structure/platform/metal/almayer, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_mining) "fYz" = ( /obj/structure/flora/grass/tallgrass/desert/corner, /turf/open/desert/dirt, @@ -46113,13 +41956,12 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/prison/southwest, /area/desert_dam/interior/dam_interior/tech_storage) -"fZj" = ( -/obj/effect/landmark/static_comms/net_one, -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/desert/dirt/rock1, -/area/desert_dam/exterior/telecomm/lz1_valley) +"fZB" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/filtration_a) "gab" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/closed/wall/r_wall/chigusa, @@ -46128,10 +41970,28 @@ /obj/effect/landmark/survivor_spawner, /turf/open/floor/prison/whitegreencorner/east, /area/desert_dam/building/medical/emergency_room) +"gau" = ( +/obj/structure/stairs{ + dir = 8 + }, +/obj/structure/platform/metal/stair_cut/platform_right, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached4, +/area/desert_dam/exterior/valley/valley_telecoms) +"gaW" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/asphalt/cement/cement1, +/area/desert_dam/exterior/valley/valley_security) "gca" = ( /obj/structure/fence, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) +"gcg" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/blocker/toxic_water, +/turf/open/desert/desert_shore/shore_edge1/north, +/area/desert_dam/exterior/river_mouth/southern) "gdW" = ( /turf/open/asphalt/tile, /area/desert_dam/exterior/valley/valley_hydro) @@ -46139,6 +41999,23 @@ /obj/effect/decal/sand_overlay/sand1, /turf/open/asphalt/cement_sunbleached/cement_sunbleached15, /area/desert_dam/exterior/valley/bar_valley_dam) +"geu" = ( +/obj/structure/platform/metal/almayer, +/turf/open/desert/desert_shore/shore_corner2, +/area/desert_dam/exterior/valley/valley_labs) +"geW" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/shallow_edge/west, +/area/desert_dam/exterior/river/riverside_central_south) +"gfs" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/shallow_edge/west, +/area/desert_dam/exterior/river/riverside_south) +"gfJ" = ( +/turf/open/desert/dirt/rock1, +/area/desert_dam/exterior/valley/valley_security) "ggn" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -46146,6 +42023,26 @@ }, /turf/open/floor/prison/bright_clean/southwest, /area/desert_dam/interior/dam_interior/garage) +"ggz" = ( +/obj/structure/surface/rack, +/obj/item/weapon/gun/rifle/m41a/corporate/no_lock, +/turf/open/floor/prison/darkredfull2, +/area/desert_dam/interior/lab_northeast/east_lab_security_armory) +"ggB" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/asphalt/cement/cement4, +/area/desert_dam/interior/dam_interior/northeastern_tunnel) +"ghh" = ( +/obj/effect/blocker/toxic_water/Group_2, +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_east) +"ghs" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/east, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/river/riverside_east) "ghz" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/oil/streak, @@ -46154,6 +42051,16 @@ }, /turf/open/floor/prison/bright_clean/southwest, /area/desert_dam/interior/dam_interior/garage) +"giS" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water, +/turf/open/gm/river/desert/shallow, +/area/desert_dam/exterior/river_mouth/southern) +"glg" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/machinery/light, +/turf/open/asphalt/cement/cement4, +/area/desert_dam/interior/dam_interior/central_tunnel) "gls" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -46178,6 +42085,12 @@ }, /turf/open/desert/rock/deep/rock3, /area/desert_dam/interior/caves/temple) +"glL" = ( +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal3" + }, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_security) "glO" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/desert/rock, @@ -46187,6 +42100,12 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison/green/north, /area/desert_dam/building/dorms/hallway_northwing) +"gmu" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/desert/desert_shore/desert_shore1/east, +/area/desert_dam/exterior/river/riverside_central_south) "gmZ" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ id = "warehouse_dam_3"; @@ -46219,6 +42138,9 @@ /obj/structure/prop/dam/large_boulder/boulder1, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_hydro) +"gpC" = ( +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_security) "gpZ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/desert/rock/deep/rock3, @@ -46227,6 +42149,12 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/desert/dirt/desert_transition_edge1/north, /area/desert_dam/interior/caves/central_caves) +"grG" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/shallow, +/area/desert_dam/exterior/river/riverside_south) "grQ" = ( /obj/structure/surface/table, /obj/item/storage/fancy/vials/random, @@ -46239,6 +42167,23 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_medical) +"gsO" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_security) +"guc" = ( +/obj/effect/decal/sand_overlay/sand1{ + dir = 8 + }, +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached1, +/area/desert_dam/exterior/valley/valley_cargo) +"guF" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/valley/valley_hydro) "guK" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 5 @@ -46246,6 +42191,10 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/desert/dirt/dirt2, /area/desert_dam/interior/caves/central_caves) +"gvD" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/gm/river/desert/shallow_edge/west, +/area/desert_dam/exterior/valley/valley_labs) "gxo" = ( /obj/structure/surface/table, /obj/item/clothing/glasses/welding{ @@ -46262,6 +42211,30 @@ }, /turf/open/floor/whiteyellow/north, /area/desert_dam/interior/dam_interior/garage) +"gxK" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/decal/sand_overlay/sand1/corner1{ + dir = 1 + }, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_northwest) +"gyA" = ( +/obj/effect/decal/sand_overlay/sand1{ + dir = 5 + }, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached9, +/area/desert_dam/exterior/valley/valley_security) +"gyF" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_central_south) +"gBE" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_east) "gBQ" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal4" @@ -46281,13 +42254,14 @@ /obj/effect/decal/cleanable/liquid_fuel, /turf/open/floor/prison, /area/desert_dam/building/hydroponics/hydroponics_loading) -"gCS" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 4 +"gCC" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/sandstone/runed, -/area/desert_dam/interior/caves/temple) +/obj/item/stack/rods, +/obj/item/stack/cable_coil, +/turf/open/floor/prison/southwest, +/area/desert_dam/interior/lab_northeast/east_lab_RND) "gEj" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -46295,13 +42269,31 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_hydro) +"gEp" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal2" + }, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_security) "gFr" = ( /obj/structure/machinery/colony_floodlight, /turf/open/asphalt/cement_sunbleached/cement_sunbleached18, /area/desert_dam/exterior/valley/south_valley_dam) +"gFx" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_crashsite) "gGC" = ( /turf/closed/wall/mineral/sandstone/runed/decor, /area/desert_dam/interior/caves/temple) +"gIs" = ( +/obj/structure/barricade/deployable{ + dir = 8 + }, +/obj/item/ammo_magazine/rifle, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_medical) "gIA" = ( /obj/structure/toilet, /obj/effect/landmark/objective_landmark/medium, @@ -46350,27 +42342,73 @@ }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached12, /area/desert_dam/exterior/valley/valley_telecoms) +"gNd" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/blocker/toxic_water, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_east) "gNq" = ( /obj/structure/surface/table, /obj/item/tool/pen, /turf/open/floor/wood, /area/desert_dam/interior/lab_northeast/east_lab_west_hallway) +"gOd" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water, +/turf/open/gm/river/desert/shallow_edge/southwest, +/area/desert_dam/exterior/river_mouth/southern) "gOE" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 6 }, /turf/open/desert/rock, /area/desert_dam/exterior/valley/valley_crashsite) +"gOG" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/plating, +/area/desert_dam/interior/lab_northeast/east_lab_containment) +"gPI" = ( +/obj/effect/decal/sand_overlay/sand1, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached12, +/area/desert_dam/exterior/valley/valley_security) "gQE" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 1 }, /turf/open/asphalt/tile, /area/desert_dam/exterior/valley/south_valley_dam) +"gQG" = ( +/obj/structure/stairs{ + dir = 8 + }, +/obj/structure/platform/metal/stair_cut/platform_right, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached2, +/area/desert_dam/exterior/valley/valley_wilderness) +"gRg" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/desert/desert_shore/desert_shore1/west, +/area/desert_dam/exterior/river/riverside_central_north) "gRC" = ( /obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/plating, /area/desert_dam/exterior/telecomm/lz2_containers) +"gRE" = ( +/obj/effect/decal/sand_overlay/sand1, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_security) +"gSt" = ( +/obj/structure/stairs{ + dir = 1 + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/asphalt/cement/cement3, +/area/desert_dam/interior/dam_interior/central_tunnel) +"gSB" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/shallow_edge/northeast, +/area/desert_dam/exterior/river/riverside_central_south) "gTD" = ( /obj/item/tool/wrench, /turf/open/asphalt/cement, @@ -46414,12 +42452,45 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_hydro) +"gWP" = ( +/turf/closed/wall/r_wall/bunker, +/area/desert_dam/exterior/valley/valley_security) "gXr" = ( /obj/effect/decal/remains/xeno{ pixel_x = 31 }, /turf/open/desert/dirt/rock1, /area/desert_dam/exterior/valley/valley_crashsite) +"gYf" = ( +/obj/structure/stairs{ + dir = 4 + }, +/obj/structure/platform/metal/almayer, +/turf/open/asphalt/cement, +/area/desert_dam/interior/dam_interior/northwestern_tunnel) +"gYm" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/shallow_edge/east, +/area/desert_dam/exterior/river/riverside_east) +"gYn" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/asphalt/cement/cement9, +/area/desert_dam/interior/dam_interior/north_tunnel) +"gYB" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/valley/valley_hydro) +"gYC" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_1, +/obj/effect/landmark/nightmare{ + insert_tag = "purple-center-bridge" + }, +/turf/open/gm/river/desert/shallow, +/area/desert_dam/exterior/river/riverside_south) "gYP" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, @@ -46432,6 +42503,12 @@ "gYU" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached2, /area/desert_dam/exterior/telecomm/lz2_storage) +"hbG" = ( +/obj/effect/decal/cleanable/blood{ + layer = 3 + }, +/turf/open/floor/prison/bright_clean2, +/area/desert_dam/interior/lab_northeast/east_lab_central_hallway) "hcP" = ( /obj/effect/decal/sand_overlay/sand1/corner1{ dir = 1 @@ -46447,13 +42524,31 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/freezerfloor, /area/desert_dam/building/cafeteria/cold_room) -"hhj" = ( -/obj/structure/stairs, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached14, -/area/desert_dam/exterior/valley/south_valley_dam) +"hgz" = ( +/obj/item/ammo_magazine/revolver/cmb, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_crashsite) +"hgR" = ( +/obj/structure/platform/metal/almayer, +/turf/open/desert/excavation/component5/southwest, +/area/desert_dam/exterior/valley/valley_crashsite) +"hgY" = ( +/obj/effect/landmark/corpsespawner/engineer, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/neutral, +/area/desert_dam/interior/dam_interior/engine_room) +"hhk" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/desert/desert_shore/desert_shore1, +/area/desert_dam/exterior/river/riverside_east) +"hiu" = ( +/turf/open/floor/plating, +/area/desert_dam/exterior/valley/valley_security) +"hiL" = ( +/obj/structure/platform/metal/almayer, +/turf/open/desert/desert_shore/shore_edge1, +/area/desert_dam/exterior/valley/valley_labs) "hiN" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 1 @@ -46477,6 +42572,14 @@ "hjW" = ( /turf/open/desert/dirt/desert_transition_edge1/northwest, /area/desert_dam/exterior/landing_pad_two) +"hlP" = ( +/turf/open/floor/warnwhite/north, +/area/desert_dam/exterior/valley/valley_security) +"hmc" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/shallow_corner, +/area/desert_dam/exterior/river/riverside_south) "hmA" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin, @@ -46486,59 +42589,79 @@ /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/prison/southwest, /area/desert_dam/interior/dam_interior/CE_office) -"hnJ" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/sandstone/runed, -/area/desert_dam/interior/caves/temple) -"hoc" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/sandstone/runed, -/area/desert_dam/interior/caves/temple) +"hmK" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/shallow, +/area/desert_dam/exterior/river/riverside_south) +"hnC" = ( +/obj/structure/machinery/colony_floodlight, +/turf/open/desert/rock/deep/transition/west, +/area/desert_dam/exterior/valley/valley_security) +"hoo" = ( +/obj/structure/flora/tree/joshua, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_security) +"hoW" = ( +/obj/structure/platform/metal/almayer, +/turf/open/asphalt/cement/cement4, +/area/desert_dam/interior/dam_interior/northeastern_tunnel) "hpw" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached3, /area/desert_dam/exterior/valley/south_valley_dam) -"hpL" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/sandstone/runed, -/area/desert_dam/interior/caves/temple) "hqp" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached4, /area/desert_dam/exterior/valley/valley_hydro) "hqT" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached1, /area/desert_dam/exterior/valley/south_valley_dam) +"hqV" = ( +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal2" + }, +/obj/effect/sentry_landmark/lz_2/bottom_left, +/turf/open/asphalt, +/area/desert_dam/exterior/landing_pad_two) +"hrM" = ( +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_security) +"hsd" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_east) "htc" = ( /turf/open/desert/dirt/desert_transition_edge1, /area/desert_dam/exterior/landing_pad_two) +"htl" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood{ + icon_state = "gib6"; + pixel_y = -8 + }, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_medical) "hvD" = ( /obj/structure/shuttle/diagonal{ icon_state = "swall_f10" }, /turf/open/shuttle/can_surgery/red, /area/desert_dam/interior/dam_interior/hanger) -"hvG" = ( -/turf/open/desert/dirt/desert_transition_edge1/east, -/area/desert_dam/exterior/valley/valley_telecoms) "hwc" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached4, /area/desert_dam/exterior/valley/south_valley_dam) +"hwX" = ( +/obj/structure/flora/grass/tallgrass/desert/corner{ + dir = 5 + }, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_security) "hxj" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 8 }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached13, /area/desert_dam/exterior/valley/valley_hydro) -"hyH" = ( -/obj/structure/tunnel, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_telecoms) "hzg" = ( /obj/effect/decal/sand_overlay/sand2, /obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, @@ -46579,6 +42702,16 @@ "hBr" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached3, /area/desert_dam/exterior/valley/valley_hydro) +"hBs" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/desert/desert_shore/shore_corner2/east, +/area/desert_dam/exterior/river/riverside_south) +"hBO" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water, +/turf/open/gm/river/desert/shallow_edge/west, +/area/desert_dam/exterior/river_mouth/southern) "hCf" = ( /turf/open/asphalt/cement_sunbleached, /area/desert_dam/exterior/valley/south_valley_dam) @@ -46592,6 +42725,13 @@ }, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_labs) +"hEv" = ( +/obj/structure/stairs{ + dir = 8 + }, +/obj/structure/platform/metal/stair_cut/platform_right, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached9, +/area/desert_dam/exterior/valley/valley_crashsite) "hEU" = ( /obj/effect/blocker/toxic_water/Group_1, /obj/structure/barricade/wooden{ @@ -46599,6 +42739,25 @@ }, /turf/open/gm/river/desert/deep/covered, /area/desert_dam/exterior/river/riverside_south) +"hFF" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/desert/desert_shore/desert_shore1/east, +/area/desert_dam/exterior/river/riverside_south) +"hFH" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/east, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/river/riverside_central_north) +"hGn" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_central_south) +"hGw" = ( +/obj/structure/flora/grass/desert/lightgrass_6, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_security) "hIO" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal4" @@ -46606,9 +42765,56 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_civilian) +"hIW" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/turf/open/asphalt/cement, +/area/desert_dam/interior/dam_interior/northwestern_tunnel) +"hJy" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/west, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/sandstone/runed, +/area/desert_dam/interior/caves/temple) +"hJY" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/corpsespawner/colonist/random, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/asteroidplating, +/area/desert_dam/exterior/valley/valley_crashsite) +"hKf" = ( +/obj/effect/decal/cleanable/blood, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/corpsespawner/engineer, +/turf/open/floor/prison/bright_clean/southwest, +/area/desert_dam/building/water_treatment_two/control_room) "hMc" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached13, /area/desert_dam/exterior/valley/valley_telecoms) +"hMz" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E" + }, +/turf/open/asphalt/cement/cement3, +/area/desert_dam/exterior/valley/valley_security) +"hNn" = ( +/obj/structure/surface/table/reinforced, +/obj/item/ammo_magazine/rifle, +/obj/item/ammo_magazine/rifle, +/turf/open/floor/prison/darkredfull2, +/area/desert_dam/interior/lab_northeast/east_lab_security_armory) +"hNE" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/decal/sand_overlay/sand2/corner2{ + dir = 4 + }, +/turf/open/asphalt/cement, +/area/desert_dam/interior/dam_interior/north_tunnel) "hOt" = ( /obj/structure/computerframe, /turf/open/shuttle/can_surgery/red, @@ -46626,6 +42832,10 @@ "hOK" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached18, /area/desert_dam/exterior/valley/valley_hydro) +"hPo" = ( +/obj/effect/decal/sand_overlay/sand1, +/turf/open/floor/plating/warnplate/southwest, +/area/desert_dam/exterior/valley/valley_security) "hPB" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal5" @@ -46636,11 +42846,31 @@ "hQM" = ( /turf/open/desert/rock/deep/transition/southwest, /area/desert_dam/interior/caves/temple) +"hQS" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/asteroidplating, +/area/desert_dam/exterior/valley/valley_crashsite) "hRU" = ( /obj/effect/landmark/xeno_hive_spawn, /obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/prison/bright_clean/southwest, /area/desert_dam/building/mining/workshop) +"hRZ" = ( +/obj/structure/disposalpipe/segment, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached15, +/area/desert_dam/exterior/valley/valley_security) +"hSi" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/asphalt/cement, +/area/desert_dam/interior/dam_interior/south_tunnel) "hTf" = ( /obj/structure/flora/grass/tallgrass/desert/corner{ dir = 6 @@ -46670,6 +42900,16 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/wood, /area/desert_dam/building/administration/overseer_office) +"hXV" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/turf/open/desert/rock, +/area/desert_dam/exterior/valley/valley_crashsite) +"hYy" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water, +/turf/open/desert/desert_shore/desert_shore1/east, +/area/desert_dam/exterior/river/riverside_east) "ibg" = ( /obj/structure/machinery/light{ dir = 4 @@ -46687,6 +42927,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_medical) +"ibL" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/desert/desert_shore/shore_corner2/west, +/area/desert_dam/exterior/river/riverside_east) "ibU" = ( /turf/open/desert/dirt/desert_transition_edge1/east, /area/desert_dam/exterior/valley/valley_hydro) @@ -46696,6 +42941,10 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_hydro) +"icF" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/asphalt/cement/cement1, +/area/desert_dam/interior/dam_interior/northwestern_tunnel) "icM" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal2" @@ -46704,14 +42953,41 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_medical) +"icY" = ( +/obj/effect/blocker/toxic_water, +/obj/structure/platform/metal/almayer, +/turf/open/gm/river/desert/shallow_edge, +/area/desert_dam/exterior/river/riverside_east) "idg" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_medical) +"idl" = ( +/obj/effect/blocker/toxic_water/Group_2, +/obj/structure/platform_decoration/metal/almayer, +/turf/open/gm/river/desert/shallow, +/area/desert_dam/exterior/river/riverside_central_north) +"idt" = ( +/obj/structure/stairs, +/obj/structure/platform/metal/almayer/west, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached14, +/area/desert_dam/exterior/valley/valley_crashsite) "idG" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached14, /area/desert_dam/exterior/telecomm/lz2_storage) +"idY" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_crashsite) +"ieR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/barricade/deployable{ + dir = 8 + }, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_medical) "ieU" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/bright_clean/southwest, @@ -46747,7 +43023,12 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison/darkyellow2/north, /area/desert_dam/building/warehouse/breakroom) -"iiQ" = ( +"iiq" = ( +/obj/structure/stairs, +/obj/structure/platform/metal/almayer/west, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached3, +/area/desert_dam/exterior/valley/valley_northwest) +"iiQ" = ( /obj/structure/surface/table/reinforced, /obj/item/roller, /obj/item/roller, @@ -46755,6 +43036,11 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison/whitegreen, /area/desert_dam/building/medical/emergency_room) +"iiU" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/asphalt/cement_sunbleached, +/area/desert_dam/exterior/valley/valley_security) "iiY" = ( /obj/structure/machinery/power/reactor/colony, /obj/structure/lattice{ @@ -46762,17 +43048,66 @@ }, /turf/open/floor/plating, /area/desert_dam/interior/dam_interior/engine_room) -"ijc" = ( -/obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/southwest, -/area/desert_dam/interior/dam_interior/tech_storage) +"ijH" = ( +/obj/structure/stairs{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/platform/metal/stair_cut/platform_right, +/turf/open/asphalt/cement, +/area/desert_dam/interior/dam_interior/central_tunnel) +"iki" = ( +/obj/structure/platform/metal/almayer, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/valley/valley_labs) +"ilg" = ( +/obj/structure/desertdam/decals/road_edge, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood{ + icon_state = "xgibdown1" + }, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_medical) "ilq" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/asphalt/tile, /area/desert_dam/exterior/valley/valley_crashsite) +"ino" = ( +/obj/structure/surface/table/reinforced, +/obj/item/ammo_magazine/pistol/mod88, +/obj/item/ammo_magazine/pistol/mod88, +/turf/open/floor/prison/darkredfull2, +/area/desert_dam/interior/lab_northeast/east_lab_security_armory) +"inG" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_central_north) +"inV" = ( +/obj/effect/decal/cleanable/blood{ + layer = 3 + }, +/turf/open/floor/prison/bright_clean/southwest, +/area/desert_dam/interior/lab_northeast/east_lab_containment) +"iof" = ( +/obj/structure/platform_decoration/metal/almayer, +/obj/effect/decal/sand_overlay/sand1{ + dir = 8 + }, +/turf/open/asphalt/cement_sunbleached, +/area/desert_dam/exterior/valley/valley_crashsite) "ioA" = ( /turf/open/gm/river/desert/shallow, /area/desert_dam/interior/caves/temple) +"ioH" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/asphalt/cement/cement4, +/area/desert_dam/interior/dam_interior/northeastern_tunnel) "ipQ" = ( /obj/docking_port/stationary/trijent_elevator/empty{ id = "trijent_omega"; @@ -46783,11 +43118,22 @@ }, /turf/open/gm/empty, /area/shuttle/trijent_shuttle/omega) +"iqh" = ( +/obj/structure/flora/bush/desert/cactus{ + icon_state = "cactus_4" + }, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_security) "iqs" = ( /obj/effect/decal/cleanable/dirt, /obj/item/trash/liquidfood, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_labs) +"iqv" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform/metal/almayer, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/valley/valley_labs) "iqK" = ( /obj/structure/surface/rack, /obj/item/stack/sheet/mineral/phoron{ @@ -46801,6 +43147,10 @@ }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached18, /area/desert_dam/exterior/valley/valley_hydro) +"irR" = ( +/obj/structure/flora/grass/desert/lightgrass_8, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_security) "isz" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -46813,6 +43163,9 @@ /obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/floor/prison/bright_clean2, /area/desert_dam/interior/lab_northeast/east_lab_biology) +"itI" = ( +/turf/open/desert/dirt/desert_transition_edge1, +/area/desert_dam/exterior/valley/valley_security) "iuk" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/desert/dirt/desert_transition_edge1/west, @@ -46849,9 +43202,20 @@ "iwh" = ( /turf/open/desert/dirt/desert_transition_edge1/east, /area/desert_dam/exterior/valley/south_valley_dam) +"iwk" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_central_south) "iwy" = ( /turf/open/desert/rock/deep/transition/west, /area/desert_dam/interior/caves/temple) +"iwW" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/shallow, +/area/desert_dam/exterior/river/riverside_south) "ixe" = ( /obj/structure/machinery/light{ dir = 8 @@ -46862,6 +43226,13 @@ /obj/effect/landmark/good_item, /turf/open/floor/whiteyellow/west, /area/desert_dam/interior/dam_interior/garage) +"izy" = ( +/obj/structure/stairs{ + dir = 4 + }, +/obj/structure/platform/metal/stair_cut/platform_left, +/turf/open/asphalt/cement, +/area/desert_dam/interior/dam_interior/north_tunnel) "iAf" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -46869,6 +43240,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_medical) +"iCn" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/asphalt/cement_sunbleached, +/area/desert_dam/exterior/valley/valley_northwest) "iCw" = ( /turf/open/floor/prison/darkyellow2, /area/desert_dam/interior/dam_interior/garage) @@ -46876,14 +43251,40 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/desert/dirt/desert_transition_edge1/northwest, /area/desert_dam/exterior/valley/valley_wilderness) +"iFb" = ( +/obj/structure/platform/metal/almayer, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_northwest) +"iGz" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/shallow_edge, +/area/desert_dam/exterior/river/riverside_south) +"iHz" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform/metal/almayer, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/river/riverside_south) "iHF" = ( /turf/open/desert/dirt/desert_transition_edge1/southwest, /area/desert_dam/exterior/landing_pad_two) +"iIi" = ( +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal2" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_security) "iIB" = ( /obj/structure/surface/table/reinforced, /obj/effect/landmark/objective_landmark/far, /turf/open/floor/prison/bright_clean2, /area/desert_dam/interior/lab_northeast/east_lab_biology) +"iIY" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/shallow, +/area/desert_dam/exterior/river/riverside_central_north) "iJC" = ( /obj/structure/surface/rack, /obj/effect/landmark/objective_landmark/close, @@ -46908,12 +43309,30 @@ /obj/structure/flora/grass/desert/lightgrass_2, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) +"iPi" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_crashsite) "iPJ" = ( /obj/effect/decal/sand_overlay/sand1/corner1{ dir = 1 }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached15, /area/desert_dam/exterior/valley/valley_hydro) +"iQh" = ( +/obj/effect/decal/sand_overlay/sand1{ + dir = 1 + }, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached4, +/area/desert_dam/exterior/valley/valley_security) +"iQG" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform/metal/almayer, +/obj/effect/decal/sand_overlay/sand1{ + dir = 4 + }, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_telecoms) "iRU" = ( /obj/effect/decal/sand_overlay/sand1/corner1{ dir = 8 @@ -46921,6 +43340,9 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/asphalt/cement_sunbleached/cement_sunbleached12, /area/desert_dam/exterior/valley/valley_civilian) +"iSP" = ( +/turf/open/floor/plating/warnplate/northwest, +/area/desert_dam/exterior/valley/valley_security) "iTi" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, @@ -46933,12 +43355,27 @@ }, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_hydro) +"iUm" = ( +/obj/effect/landmark/corpsespawner/wygoon, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/dark2, +/area/desert_dam/interior/lab_northeast/east_lab_west_entrance) +"iVG" = ( +/obj/structure/flora/grass/tallgrass/desert/corner{ + dir = 10 + }, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_security) "iVN" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal9" }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_labs) +"iVX" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/asphalt/cement/cement12, +/area/desert_dam/interior/dam_interior/north_tunnel) "iVZ" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal4" @@ -46946,11 +43383,32 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_hydro) +"iWF" = ( +/obj/structure/desertdam/decals/road_stop{ + dir = 4; + icon_state = "stop_decal5" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/iv_drip, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_medical) "iXt" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/liquid_fuel, /turf/open/floor/prison/southwest, /area/desert_dam/interior/dam_interior/hanger) +"iXX" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_northwest) +"iYq" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/desert/desert_shore/shore_edge1, +/area/desert_dam/exterior/river/riverside_south) "iYy" = ( /obj/structure/surface/table, /obj/item/device/lightreplacer, @@ -46966,6 +43424,11 @@ }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached18, /area/desert_dam/exterior/valley/bar_valley_dam) +"iZA" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_central_south) "iZY" = ( /obj/structure/flora/grass/desert/heavygrass_3, /turf/open/desert/dirt, @@ -46982,6 +43445,14 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison/bright_clean2/southwest, /area/desert_dam/building/security/staffroom) +"jcx" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/effect/spawner/gibspawner/xeno, +/turf/open/floor/prison/southwest, +/area/desert_dam/interior/lab_northeast/east_lab_RND) "jcK" = ( /obj/effect/decal/sand_overlay/sand1/corner1, /turf/open/asphalt/cement_sunbleached, @@ -46990,10 +43461,46 @@ /obj/structure/machinery/light, /turf/open/shuttle/can_surgery/red, /area/desert_dam/interior/dam_interior/hanger) +"jeo" = ( +/obj/effect/decal/cleanable/blood{ + layer = 3 + }, +/turf/open/floor/prison/whitepurple, +/area/desert_dam/interior/lab_northeast/east_lab_central_hallway) +"jex" = ( +/obj/effect/decal/sand_overlay/sand1{ + dir = 1 + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_telecoms) +"jeY" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/desert/dirt, +/area/desert_dam/exterior/telecomm/lz1_valley) "jfA" = ( /obj/structure/flora/tree/joshua, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_hydro) +"jit" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached4, +/area/desert_dam/exterior/valley/valley_northwest) +"jiF" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/prop/colony/used_flare, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_medical) +"jli" = ( +/obj/structure/stairs{ + dir = 4 + }, +/obj/structure/platform/metal/almayer, +/turf/open/asphalt/cement, +/area/desert_dam/interior/dam_interior/west_tunnel) +"jlI" = ( +/turf/open/asphalt/cement_sunbleached/cement_sunbleached2, +/area/desert_dam/exterior/valley/valley_security) "jlP" = ( /obj/structure/flora/grass/desert/heavygrass_5, /turf/open/desert/dirt, @@ -47004,9 +43511,33 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/bar_valley_dam) +"jmg" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/asphalt/cement/cement12, +/area/desert_dam/interior/dam_interior/northwestern_tunnel) +"jmI" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/west, +/turf/open/desert/desert_shore/desert_shore1, +/area/desert_dam/exterior/valley/valley_labs) +"jnX" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/desert/desert_shore/shore_edge1/west, +/area/desert_dam/exterior/river/riverside_south) +"jon" = ( +/obj/structure/platform/stone/runed_sandstone/north, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/sandstone/runed, +/area/desert_dam/interior/caves/temple) "jpa" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached14, /area/desert_dam/exterior/valley/valley_hydro) +"jqK" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/shallow, +/area/desert_dam/exterior/river/riverside_central_south) "jqU" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal2" @@ -47024,19 +43555,28 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, /area/desert_dam/exterior/river/riverside_south) -"jsN" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, +"jtd" = ( +/obj/structure/platform/metal/almayer/east, /obj/effect/blocker/toxic_water/Group_1, -/obj/effect/landmark/nightmare{ - insert_tag = "purple-south-bridge" - }, -/turf/open/gm/river/desert/shallow, +/turf/open/gm/river/desert/deep, /area/desert_dam/exterior/river/riverside_south) +"jtm" = ( +/obj/structure/holohoop{ + dir = 4 + }, +/turf/open/floor/warnwhite/west, +/area/desert_dam/exterior/valley/valley_security) +"jtp" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached3, +/area/desert_dam/exterior/valley/valley_northwest) +"jtv" = ( +/obj/structure/stairs{ + dir = 4 + }, +/obj/structure/platform/metal/almayer, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached15, +/area/desert_dam/exterior/valley/valley_hydro) "jtz" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_core, /turf/open/floor/prison/bright_clean/southwest, @@ -47046,15 +43586,20 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/freezerfloor, /area/desert_dam/building/water_treatment_two/equipment) -"jvZ" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 +"jvI" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/desert/desert_shore/desert_shore1/east, +/area/desert_dam/exterior/river/riverside_south) +"jwt" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N" }, -/turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/valley/south_valley_dam) +/obj/effect/decal/cleanable/dirt, +/obj/item/weapon/gun/smg/mp5, +/turf/open/floor/asteroidplating, +/area/desert_dam/exterior/valley/valley_crashsite) "jxq" = ( /obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/delivery, @@ -47063,11 +43608,27 @@ /obj/structure/tunnel, /turf/open/desert/dirt/desert_transition_edge1, /area/desert_dam/exterior/valley/valley_crashsite) +"jxO" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/valley/south_valley_dam) +"jzm" = ( +/obj/effect/decal/sand_overlay/sand1{ + dir = 10 + }, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_security) "jAr" = ( /obj/structure/closet/crate/hydroponics/prespawned, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/vault2/north, /area/desert_dam/building/hydroponics/hydroponics_storage) +"jAN" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood, +/obj/effect/landmark/corpsespawner/doctor, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_medical) "jAS" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/asphalt/cement_sunbleached/cement_sunbleached4, @@ -47076,20 +43637,74 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison/southwest, /area/desert_dam/interior/dam_interior/atmos_storage) +"jBx" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/desert/rock, +/area/desert_dam/exterior/valley/valley_crashsite) +"jBz" = ( +/obj/structure/platform/metal/almayer, +/turf/open/gm/river/desert/shallow, +/area/desert_dam/exterior/valley/valley_labs) +"jCb" = ( +/obj/structure/stairs, +/obj/structure/platform/metal/almayer/west, +/turf/open/asphalt/cement/cement3, +/area/desert_dam/interior/dam_interior/north_tunnel) +"jCn" = ( +/obj/structure/stairs{ + dir = 4 + }, +/obj/structure/platform/metal/stair_cut/platform_left, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_labs) +"jCr" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water, +/turf/open/desert/desert_shore/desert_shore1/east, +/area/desert_dam/exterior/river_mouth/southern) +"jCx" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_south) "jCJ" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/closed/wall, /area/desert_dam/building/dorms/hallway_northwing) +"jCQ" = ( +/obj/effect/decal/sand_overlay/sand1{ + dir = 8 + }, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_security) "jFf" = ( /obj/structure/flora/grass/desert/lightgrass_2, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_hydro) +"jGR" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/shallow, +/area/desert_dam/exterior/river/riverside_south) "jHR" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal5" }, /turf/open/asphalt, /area/desert_dam/exterior/valley/bar_valley_dam) +"jIf" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/filtration_a) +"jIl" = ( +/obj/structure/filtration/collector_pipes{ + icon_state = "lower_2" + }, +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/filtration_a) "jIH" = ( /obj/structure/window/framed/colony, /obj/effect/decal/cleanable/dirt, @@ -47108,16 +43723,33 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/freezerfloor, /area/desert_dam/building/cafeteria/cold_room) +"jJq" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/sand_overlay/sand1{ + dir = 1 + }, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached4, +/area/desert_dam/exterior/valley/valley_northwest) "jJE" = ( /obj/effect/landmark/objective_landmark/far, /turf/open/floor/plating, /area/desert_dam/interior/lab_northeast/east_lab_containment) -"jLI" = ( -/obj/effect/decal/sand_overlay/sand1{ - dir = 10 - }, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/valley_telecoms) +"jKc" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/desert/desert_shore/shore_corner2/north, +/area/desert_dam/exterior/river/riverside_east) +"jKP" = ( +/turf/open/floor, +/area/desert_dam/exterior/valley/valley_security) +"jMs" = ( +/obj/effect/decal/cleanable/blood, +/obj/effect/landmark/corpsespawner/scientist, +/turf/open/floor/wood, +/area/desert_dam/interior/lab_northeast/east_lab_west_hallway) "jMT" = ( /obj/effect/decal/warning_stripes{ icon_state = "N" @@ -47127,13 +43759,45 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/bar_valley_dam) +"jMZ" = ( +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal3" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_security) "jNB" = ( /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_labs) +"jNC" = ( +/obj/structure/stairs, +/obj/structure/platform/metal/almayer/east, +/turf/open/asphalt/cement/cement1, +/area/desert_dam/interior/dam_interior/north_tunnel) +"jNX" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/prop/dam/van, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_security) "jOe" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached12, /area/desert_dam/exterior/valley/valley_hydro) +"jPc" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/barricade/deployable{ + dir = 1 + }, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_medical) +"jPC" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/desert/desert_shore/desert_shore1/north, +/area/desert_dam/exterior/river/riverside_east) "jSS" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal2" @@ -47151,6 +43815,11 @@ }, /turf/open/asphalt/tile, /area/desert_dam/exterior/valley/valley_hydro) +"jVg" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/shallow_corner/west, +/area/desert_dam/exterior/river/riverside_east) "jVr" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison/bright_clean2/southwest, @@ -47160,24 +43829,45 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) -"jXv" = ( -/obj/structure/desertdam/decals/road_edge{ - icon_state = "road_edge_decal2" - }, -/turf/open/asphalt, +"jWz" = ( +/obj/structure/stairs, +/obj/structure/platform/metal/almayer/west, +/turf/open/asphalt/cement_sunbleached, /area/desert_dam/exterior/valley/valley_telecoms) "jXy" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/prison/green/north, /area/desert_dam/building/dorms/hallway_northwing) -"jZZ" = ( -/turf/open/desert/dirt/desert_transition_corner1, -/area/desert_dam/exterior/valley/valley_telecoms) +"jXZ" = ( +/obj/structure/disposalpipe/segment, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_security) +"jZb" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/desert/desert_shore/shore_edge1, +/area/desert_dam/exterior/river/riverside_central_north) "kbo" = ( /obj/structure/prop/dam/boulder/boulder1, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) +"kbZ" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_central_south) +"kcd" = ( +/obj/effect/blocker/toxic_water/Group_1, +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/desert/desert_shore/desert_shore1/west, +/area/desert_dam/exterior/river/riverside_central_north) +"kcm" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/desert/desert_shore/desert_shore1/west, +/area/desert_dam/exterior/river/riverside_south) "kcH" = ( /turf/closed/wall/r_wall/bunker, /area/desert_dam/exterior/telecomm/lz2_containers) @@ -47185,11 +43875,43 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/prison/bright_clean2, /area/desert_dam/building/dorms/restroom) +"kem" = ( +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal2" + }, +/obj/effect/decal/cleanable/blood{ + icon_state = "xgib1" + }, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_medical) +"keF" = ( +/obj/effect/blocker/toxic_water/Group_2, +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/desert/desert_shore/desert_shore1/west, +/area/desert_dam/exterior/river/riverside_central_north) +"kft" = ( +/obj/structure/flora/grass/desert/heavygrass_4, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_security) "kge" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, /turf/open/desert/dirt/desert_transition_edge1/southwest, /area/desert_dam/exterior/valley/valley_crashsite) +"kgt" = ( +/obj/effect/decal/sand_overlay/sand1/corner1, +/obj/effect/decal/cleanable/blood/gibs/xeno, +/turf/open/asphalt/cement_sunbleached, +/area/desert_dam/exterior/valley/valley_crashsite) +"kgV" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/river/riverside_east) +"kig" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/desert/desert_shore/shore_corner2/north, +/area/desert_dam/exterior/river/riverside_central_south) "kiy" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 8 @@ -47200,9 +43922,42 @@ /obj/structure/flora/grass/tallgrass/desert, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) +"kiU" = ( +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal4" + }, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_security) +"kjd" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/west, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/river/riverside_east) +"kjz" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/desert/desert_shore/shore_corner2/east, +/area/desert_dam/exterior/river/riverside_central_north) "kkm" = ( /turf/open/desert/dirt/desert_transition_edge1/northeast, /area/desert_dam/exterior/valley/valley_hydro) +"kkH" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/desert/desert_shore/desert_shore1/west, +/area/desert_dam/exterior/river/riverside_central_north) +"klt" = ( +/obj/structure/platform/metal/almayer, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/river/riverside_south) +"kmj" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/landmark/corpsespawner/wygoon, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison/bright_clean/southwest, +/area/desert_dam/interior/lab_northeast/east_lab_security_armory) "kmr" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3" @@ -47210,6 +43965,11 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_civilian) +"kmK" = ( +/obj/effect/landmark/corpsespawner/scientist, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison/bright_clean2, +/area/desert_dam/interior/lab_northeast/east_lab_east_hallway) "kmU" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/desert/dirt, @@ -47219,6 +43979,24 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison/sterile_white, /area/desert_dam/building/cafeteria/loading) +"koe" = ( +/turf/open/asphalt/cement_sunbleached, +/area/desert_dam/exterior/valley/valley_security) +"koj" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/shallow, +/area/desert_dam/exterior/river/riverside_east) +"koM" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/obj/structure/largecrate/random, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_labs) +"kpG" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_south) "kry" = ( /obj/effect/decal/warning_stripes{ icon_state = "N" @@ -47236,12 +44014,28 @@ "ktJ" = ( /turf/open/desert/desert_shore/desert_shore1, /area/desert_dam/interior/caves/temple) -"kzQ" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_telecoms) +"ktT" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/shallow_edge/west, +/area/desert_dam/exterior/river/riverside_central_north) +"kub" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/shallow_corner/north, +/area/desert_dam/exterior/river/riverside_east) +"kzV" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/desert/dirt/desert_transition_corner1/north, +/area/desert_dam/exterior/valley/valley_labs) +"kAq" = ( +/turf/open/desert/dirt/desert_transition_edge1/west, +/area/desert_dam/exterior/valley/valley_security) +"kAH" = ( +/obj/effect/blocker/toxic_water/Group_2, +/obj/structure/platform/metal/almayer, +/turf/open/gm/river/desert/shallow_edge/west, +/area/desert_dam/exterior/river/riverside_central_north) "kAJ" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -47255,6 +44049,13 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor/prison, /area/desert_dam/building/dorms/hallway_northwing) +"kEp" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_security) "kEq" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -47273,6 +44074,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/bright_clean/southwest, /area/desert_dam/interior/dam_interior/garage) +"kIk" = ( +/obj/structure/prop/dam/large_boulder/boulder2, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_security) "kIl" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached13, /area/desert_dam/exterior/valley/bar_valley_dam) @@ -47280,18 +44085,55 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/asphalt/cement_sunbleached, /area/desert_dam/exterior/valley/valley_civilian) +"kJa" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_security) +"kJD" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/valley/valley_hydro) +"kJO" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/shallow_edge/west, +/area/desert_dam/exterior/river/riverside_east) "kJP" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal2" }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_hydro) +"kKI" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/asphalt/cement, +/area/desert_dam/interior/dam_interior/north_tunnel) +"kKR" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/shallow_edge/east, +/area/desert_dam/exterior/river/riverside_central_south) "kLf" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 4 }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached13, /area/desert_dam/exterior/valley/bar_valley_dam) +"kMr" = ( +/obj/structure/stairs{ + dir = 8 + }, +/obj/structure/platform/metal/almayer, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached15, +/area/desert_dam/exterior/valley/valley_crashsite) +"kMI" = ( +/obj/effect/blocker/toxic_water/Group_2, +/obj/structure/platform/metal/almayer/north, +/turf/open/gm/river/desert/shallow_edge/west, +/area/desert_dam/exterior/river/riverside_central_north) "kMM" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkyellow2/north, @@ -47302,6 +44144,19 @@ }, /turf/open/asphalt/tile, /area/desert_dam/exterior/valley/valley_hydro) +"kNh" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/desertdam/decals/road_stop{ + dir = 1; + icon_state = "stop_decal5" + }, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_security) +"kNA" = ( +/obj/structure/surface/table, +/obj/item/ammo_magazine/shotgun/slugs, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_security) "kOC" = ( /obj/structure/machinery/power/reactor/colony, /turf/open/floor/plating, @@ -47322,23 +44177,54 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/desert/dirt, /area/desert_dam/interior/caves/central_caves) +"kPU" = ( +/obj/structure/stairs, +/obj/structure/platform/metal/almayer/east, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached1, +/area/desert_dam/exterior/valley/valley_crashsite) "kQd" = ( /obj/structure/tunnel, /turf/open/desert/rock/deep/rock3, /area/desert_dam/interior/caves/east_caves) +"kRr" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/shallow_edge, +/area/desert_dam/exterior/river/riverside_east) "kRX" = ( /obj/structure/surface/table, /obj/item/storage/fancy/vials/random, /turf/open/floor/whitegreen/west, /area/desert_dam/building/lab_northwest/west_lab_xenoflora) +"kSL" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/desert/desert_shore/desert_shore1/north, +/area/desert_dam/exterior/river/riverside_east) +"kSQ" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_central_south) "kTX" = ( /turf/open/desert/dirt/desert_transition_corner1/west, /area/desert_dam/exterior/valley/bar_valley_dam) +"kUp" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/gm/river/desert/shallow_edge/southwest, +/area/desert_dam/exterior/valley/valley_labs) "kUz" = ( /obj/structure/surface/table, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/whiteyellow/southeast, /area/desert_dam/interior/dam_interior/break_room) +"kUA" = ( +/obj/structure/desertdam/decals/road_edge, +/obj/effect/decal/sand_overlay/sand1{ + dir = 4 + }, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_security) "kVU" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached12, /area/desert_dam/exterior/valley/south_valley_dam) @@ -47346,6 +44232,32 @@ /obj/structure/flora/grass/desert/heavygrass_4, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) +"kZZ" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/desert/desert_shore/desert_shore1/east, +/area/desert_dam/exterior/river/riverside_central_north) +"laa" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/decal/sand_overlay/sand1/corner1, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_cargo) +"lah" = ( +/obj/structure/surface/rack, +/obj/item/weapon/gun/pistol/mod88, +/turf/open/floor/prison/darkredfull2, +/area/desert_dam/interior/lab_northeast/east_lab_security_armory) +"lat" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/filtration_a) +"lbq" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/desert/desert_shore/shore_corner2/west, +/area/desert_dam/exterior/river/riverside_south) "lcj" = ( /turf/closed/wall/hangar{ name = "Elevator Shaft"; @@ -47366,6 +44278,20 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/prison/floor_marked/southwest, /area/desert_dam/building/mining/workshop_foyer) +"leq" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/desert/rock/deep/transition/west, +/area/desert_dam/interior/dam_interior/west_tunnel) +"leH" = ( +/obj/structure/desertdam/decals/road_stop{ + dir = 4; + icon_state = "stop_decal5" + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/largecrate/supply/medicine/medkits, +/obj/item/reagent_container/blood/APlus, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_medical) "leJ" = ( /obj/structure/closet/crate/secure, /obj/effect/landmark/objective_landmark/science, @@ -47385,6 +44311,11 @@ "lfZ" = ( /turf/open/desert/dirt/desert_transition_edge1/east, /area/desert_dam/exterior/telecomm/lz1_valley) +"lgi" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_security) "lib" = ( /obj/structure/surface/table/reinforced, /obj/structure/window/reinforced{ @@ -47394,6 +44325,18 @@ /obj/structure/window/reinforced, /turf/open/floor/prison/bright_clean2/southwest, /area/desert_dam/building/medical/lobby) +"lic" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_central_south) +"liJ" = ( +/obj/structure/stairs{ + dir = 8 + }, +/obj/structure/platform/metal/almayer, +/turf/open/asphalt/cement, +/area/desert_dam/interior/dam_interior/northeastern_tunnel) "liN" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -47403,23 +44346,31 @@ /obj/structure/pipes/standard/manifold/hidden/green, /turf/open/floor/prison/whitegreen/north, /area/desert_dam/building/medical/north_wing_hallway) +"lji" = ( +/turf/closed/wall/r_wall/prison, +/area/desert_dam/exterior/valley/valley_security) +"ljt" = ( +/turf/open/desert/dirt/desert_transition_corner1/east, +/area/desert_dam/exterior/valley/valley_security) "ljB" = ( /obj/structure/closet/cabinet, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/interior/wood, /area/desert_dam/interior/dam_interior/east_tunnel_entrance) -"ljO" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/prop/dam/van{ - dir = 1 - }, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_telecoms) +"lkw" = ( +/obj/structure/stairs, +/obj/structure/platform/metal/almayer/west, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached14, +/area/desert_dam/exterior/valley/south_valley_dam) "lkZ" = ( /obj/structure/surface/table, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/whiteyellow, /area/desert_dam/interior/dam_interior/break_room) +"llZ" = ( +/obj/effect/spawner/gibspawner/xeno, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_crashsite) "lmq" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/vomit, @@ -47429,12 +44380,11 @@ /obj/effect/decal/sand_overlay/sand1/corner1, /turf/open/asphalt/tile, /area/desert_dam/exterior/valley/south_valley_dam) -"lop" = ( -/obj/structure/desertdam/decals/road_edge{ - icon_state = "road_edge_decal10" - }, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_telecoms) +"lnI" = ( +/obj/effect/blocker/toxic_water/Group_2, +/obj/structure/platform/metal/almayer/east, +/turf/open/gm/river/desert/shallow_edge/northeast, +/area/desert_dam/exterior/river/riverside_central_north) "lrn" = ( /obj/effect/landmark/nightmare{ insert_tag = "damtemple_intact" @@ -47462,6 +44412,13 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/plating, /area/desert_dam/interior/lab_northeast/east_lab_west_hallway) +"lvu" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood, +/obj/effect/landmark/corpsespawner/chef, +/obj/item/tool/kitchen/knife/butcher, +/turf/open/floor/prison/sterile_white, +/area/desert_dam/building/cafeteria/cafeteria) "lwh" = ( /obj/structure/machinery/computer/shuttle/elevator_controller/elevator_call/trijent/engi{ pixel_x = -32 @@ -47474,6 +44431,17 @@ /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/prison, /area/desert_dam/building/water_treatment_one/control_room) +"lxX" = ( +/obj/structure/stairs{ + dir = 8 + }, +/obj/structure/platform/metal/stair_cut/platform_right, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_wilderness) +"lya" = ( +/obj/structure/platform/metal/almayer, +/turf/open/desert/excavation/component5/southeast, +/area/desert_dam/exterior/valley/valley_crashsite) "lyw" = ( /obj/structure/flora/bush/desert/cactus{ icon_state = "cactus_8" @@ -47486,25 +44454,75 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_hydro) -"lzs" = ( -/turf/open/desert/dirt/rock1, -/area/desert_dam/exterior/landing_pad_two) -"lzZ" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison/floor_marked/southwest, -/area/desert_dam/building/cafeteria/loading) -"lAb" = ( -/obj/structure/sink{ +"lzf" = ( +/obj/structure/barricade/sandbags{ + dir = 1 + }, +/obj/structure/barricade/sandbags{ + dir = 4 + }, +/obj/effect/decal/sand_overlay/sand1{ + dir = 1 + }, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_security) +"lzs" = ( +/turf/open/desert/dirt/rock1, +/area/desert_dam/exterior/landing_pad_two) +"lzG" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/desert/desert_shore/desert_shore1, +/area/desert_dam/exterior/river/riverside_south) +"lzY" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/asphalt/cement/cement1, +/area/desert_dam/interior/dam_interior/north_tunnel) +"lzZ" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison/floor_marked/southwest, +/area/desert_dam/building/cafeteria/loading) +"lAb" = ( +/obj/structure/sink{ dir = 1; pixel_y = -10 }, /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/freezerfloor, /area/desert_dam/building/water_treatment_one/breakroom) +"lAu" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water, +/turf/open/gm/river/desert/shallow_edge/southeast, +/area/desert_dam/exterior/river/riverside_east) +"lBR" = ( +/obj/effect/sentry_landmark/lz_2/top_right, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_cargo) +"lCq" = ( +/obj/structure/stairs, +/obj/structure/platform/metal/almayer/east, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_medical) +"lDj" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water, +/turf/open/desert/desert_shore/shore_edge1/west, +/area/desert_dam/exterior/river_mouth/southern) "lDT" = ( /obj/structure/flora/grass/desert/lightgrass_3, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) +"lEf" = ( +/obj/structure/stairs{ + dir = 8 + }, +/obj/structure/platform/metal/almayer, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_wilderness) "lFc" = ( /obj/effect/decal/warning_stripes{ icon_state = "E" @@ -47513,6 +44531,23 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_medical) +"lFe" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/shallow_edge/west, +/area/desert_dam/exterior/river/riverside_south) +"lFi" = ( +/obj/structure/stairs{ + dir = 1 + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_crashsite) +"lGo" = ( +/obj/effect/decal/sand_overlay/sand1, +/obj/effect/decal/cleanable/blood, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_security) "lHW" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/whiteyellowfull/east, @@ -47529,6 +44564,18 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/landing_pad_two) +"lIL" = ( +/obj/structure/stairs{ + dir = 4 + }, +/obj/structure/platform/metal/almayer, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/bar_valley_dam) +"lIO" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water, +/turf/open/desert/desert_shore/shore_corner2/west, +/area/desert_dam/exterior/river_mouth/southern) "lJM" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 9 @@ -47554,6 +44601,10 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/desert/rock, /area/desert_dam/interior/caves/central_caves) +"lMC" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/asphalt/cement, +/area/desert_dam/interior/dam_interior/central_tunnel) "lNu" = ( /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) @@ -47570,21 +44621,59 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor/prison, /area/desert_dam/building/cafeteria/loading) +"lPb" = ( +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal10" + }, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_security) +"lPi" = ( +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal4" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_security) "lPn" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/asphalt/cement_sunbleached/cement_sunbleached14, /area/desert_dam/exterior/valley/valley_civilian) -"lQM" = ( -/obj/structure/stairs{ - dir = 4 +"lRb" = ( +/obj/effect/decal/sand_overlay/sand1{ + dir = 8 }, -/obj/structure/platform, -/turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/valley_labs) +/turf/open/asphalt/cement_sunbleached, +/area/desert_dam/exterior/valley/valley_security) +"lRu" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/valley/valley_hydro) +"lRz" = ( +/obj/effect/blocker/toxic_water/Group_2, +/obj/structure/platform/metal/almayer/east, +/turf/open/gm/river/desert/shallow_corner, +/area/desert_dam/exterior/river/riverside_central_north) +"lSp" = ( +/obj/effect/landmark/corpsespawner/colonist, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison/bright_clean/southwest, +/area/desert_dam/building/hydroponics/hydroponics) +"lSE" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached18, +/area/desert_dam/exterior/valley/valley_northwest) "lUl" = ( /obj/structure/surface/table/woodentable/fancy, /turf/open/floor/carpet15_15/west, /area/desert_dam/building/administration/office) +"lUA" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/shallow, +/area/desert_dam/exterior/river/riverside_central_south) "lUU" = ( /obj/effect/landmark/monkey_spawn, /turf/open/desert/dirt/desert_transition_edge1, @@ -47601,11 +44690,21 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_hydro) +"lYt" = ( +/obj/structure/platform/metal/almayer, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/valley/valley_hydro) "lYv" = ( /obj/structure/flora/grass/desert/lightgrass_4, /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) +"lYK" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_east) "lZP" = ( /obj/structure/flora/grass/tallgrass/desert/corner{ dir = 9 @@ -47632,6 +44731,14 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/south_valley_dam) +"mdZ" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/desert/rock, +/area/desert_dam/exterior/valley/valley_crashsite) +"meb" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_telecoms) "med" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 1 @@ -47652,6 +44759,11 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_civilian) +"mfg" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/shallow, +/area/desert_dam/exterior/river/riverside_central_south) "mfH" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -47684,6 +44796,12 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison/sterile_white, /area/desert_dam/interior/dam_interior/workshop) +"miV" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "xgib1" + }, +/turf/open/floor/prison/blue, +/area/desert_dam/interior/lab_northeast/east_lab_RND) "mjR" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal6" @@ -47700,19 +44818,36 @@ /obj/structure/flora/grass/desert/lightgrass_4, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) -"mkU" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 4 +"mkN" = ( +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal2" }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/sandstone/runed, -/area/desert_dam/interior/caves/temple) +/obj/effect/decal/sand_overlay/sand1{ + dir = 8 + }, +/obj/effect/sentry_landmark/lz_2/top_right, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_cargo) "mlK" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 4 }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached13, /area/desert_dam/exterior/telecomm/lz1_valley) +"mlS" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/valley/south_valley_dam) +"mlZ" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/desert/desert_shore/desert_shore1, +/area/desert_dam/exterior/river/riverside_east) +"mmL" = ( +/obj/structure/platform/stone/runed_sandstone/east, +/turf/open/gm/river/desert/shallow, +/area/desert_dam/interior/caves/temple) "mnc" = ( /turf/open/desert/dirt/dirt2, /area/desert_dam/interior/caves/temple) @@ -47721,44 +44856,73 @@ /obj/structure/machinery/camera/autoname/almayer, /turf/open/floor/prison/green/north, /area/desert_dam/interior/dam_interior/atmos_storage) +"moc" = ( +/turf/open/floor/white, +/area/desert_dam/exterior/valley/valley_security) "moq" = ( /turf/open/desert/dirt/desert_transition_edge1/southeast, /area/desert_dam/exterior/landing_pad_one) +"mpk" = ( +/turf/open/floor/plating/warnplate/north, +/area/desert_dam/exterior/valley/valley_security) +"mqe" = ( +/obj/effect/decal/cleanable/blood, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/corpsespawner/doctor, +/turf/open/floor/prison/whitegreen/southeast, +/area/desert_dam/building/medical/emergency_room) +"mqi" = ( +/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, +/turf/open/floor/interior/wood/alt, +/area/desert_dam/building/bar/bar) "mqM" = ( /obj/effect/landmark/monkey_spawn, /turf/open/desert/rock, /area/desert_dam/exterior/valley/valley_wilderness) -"mth" = ( -/obj/structure/showcase{ - color = "#880808"; - desc = "A large red statue dawned in ancient armor, it stares into your soul."; - icon = 'icons/mob/humans/species/r_synthetic.dmi'; - icon_state = "Synthetic_Template"; - name = "The Titan" - }, -/obj/item/clothing/suit/armor/yautja_flavor{ - anchored = 1; - icon_state = "halfarmor7_ebony" - }, -/obj/item/clothing/shoes/yautja_flavor{ - anchored = 1; - icon_state = "y-boots4_ebony" - }, -/obj/item/clothing/mask/yautja_flavor{ - anchored = 1; - icon_state = "pred_mask12_ebony"; - unacidable = 0 - }, -/turf/open/floor/strata/grey_multi_tiles, -/area/desert_dam/interior/caves/temple) +"mrU" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/desert/desert_shore/desert_shore1/north, +/area/desert_dam/exterior/valley/south_valley_dam) +"mtO" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/valley/valley_civilian) "muj" = ( /obj/structure/flora/grass/tallgrass/desert, /turf/open/desert/dirt, /area/desert_dam/exterior/landing_pad_two) +"mvM" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/plating, +/area/desert_dam/interior/lab_northeast/east_lab_containment) +"mvP" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/desert/dirt/desert_transition_edge1/north, +/area/desert_dam/exterior/telecomm/lz1_valley) +"mxL" = ( +/obj/structure/machinery/colony_floodlight, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_security) +"mxY" = ( +/obj/structure/platform/metal/almayer, +/turf/open/desert/excavation/component5/northeast, +/area/desert_dam/exterior/valley/valley_crashsite) "myx" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/prison/whitepurple/north, /area/desert_dam/interior/lab_northeast/east_lab_central_hallway) +"mza" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/asphalt/cement/cement12, +/area/desert_dam/interior/dam_interior/northwestern_tunnel) +"mzD" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/shallow, +/area/desert_dam/exterior/river/riverside_central_north) "mAm" = ( /obj/effect/decal/cleanable/dirt, /turf/open/desert/dirt, @@ -47769,29 +44933,20 @@ }, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) -"mAZ" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/asphalt/cement, -/area/desert_dam/interior/dam_interior/south_tunnel) -"mBd" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/blocker/toxic_water/Group_1, -/obj/effect/landmark/nightmare{ - insert_tag = "purple-center-bridge" - }, -/turf/open/gm/river/desert/shallow, -/area/desert_dam/exterior/river/riverside_south) "mBO" = ( /obj/structure/flora/grass/tallgrass/desert, /turf/open/desert/dirt, /area/desert_dam/exterior/landing_pad_one) +"mBP" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E" + }, +/obj/item/stack/sheet/wood, +/turf/open/floor/asteroidplating, +/area/desert_dam/exterior/valley/valley_crashsite) "mDd" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal12" @@ -47801,6 +44956,11 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/landing_pad_two) +"mDv" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/desert/desert_shore/desert_shore1/east, +/area/desert_dam/exterior/river/riverside_south) "mDz" = ( /obj/effect/decal/cleanable/dirt, /turf/open/asphalt/cement_sunbleached/cement_sunbleached4, @@ -47813,6 +44973,10 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/asphalt/cement_sunbleached, /area/desert_dam/exterior/valley/valley_crashsite) +"mEv" = ( +/obj/structure/platform/metal/almayer, +/turf/open/gm/river/desert/shallow_corner/west, +/area/desert_dam/exterior/valley/valley_labs) "mEC" = ( /obj/effect/decal/cleanable/liquid_fuel, /turf/open/floor/prison/bright_clean/southwest, @@ -47821,6 +44985,17 @@ /obj/structure/machinery/light, /turf/open/desert/rock/deep/transition/southwest, /area/desert_dam/interior/dam_interior/west_tunnel) +"mFo" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/decal/sand_overlay/sand1, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_telecoms) +"mFv" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_central_north) "mGo" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 8 @@ -47831,10 +45006,22 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/corsat/squareswood/north, /area/desert_dam/interior/caves/temple) +"mHC" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/desert/desert_shore/shore_edge1, +/area/desert_dam/exterior/river/riverside_south) "mHV" = ( /obj/effect/decal/sand_overlay/sand1, /turf/open/asphalt/cement_sunbleached/cement_sunbleached12, /area/desert_dam/exterior/telecomm/lz2_storage) +"mIg" = ( +/obj/structure/platform/metal/almayer, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/valley/valley_labs) +"mIi" = ( +/turf/open/desert/dirt/desert_transition_edge1/northeast, +/area/desert_dam/exterior/valley/valley_security) "mKs" = ( /turf/closed/wall/rock/orange, /area/desert_dam/exterior/valley/valley_telecoms) @@ -47876,14 +45063,11 @@ }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached12, /area/desert_dam/exterior/valley/bar_valley_dam) -"mTf" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_medical) +"mSU" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/item/trash/chips, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_labs) "mTY" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, @@ -47892,12 +45076,39 @@ /obj/structure/flora/grass/tallgrass/desert, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_medical) +"mVD" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/river/riverside_east) +"mVV" = ( +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal3" + }, +/obj/structure/barricade/deployable{ + dir = 8 + }, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_medical) +"mWp" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform/metal/almayer, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/river/riverside_central_north) +"mWt" = ( +/obj/structure/toilet, +/obj/effect/landmark/corpsespawner/colonist/random, +/turf/open/floor/prison/bright_clean2, +/area/desert_dam/building/warehouse/breakroom) "mXN" = ( /obj/effect/decal/sand_overlay/sand1/corner1{ dir = 8 }, /turf/open/asphalt/tile, /area/desert_dam/exterior/valley/bar_valley_dam) +"mYT" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_crashsite) "mZa" = ( /obj/structure/surface/table, /obj/effect/landmark/objective_landmark/close, @@ -47913,6 +45124,15 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/asphalt/cement_sunbleached/cement_sunbleached3, /area/desert_dam/exterior/valley/valley_crashsite) +"nan" = ( +/obj/effect/decal/sand_overlay/sand1{ + dir = 4 + }, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached4, +/area/desert_dam/exterior/valley/valley_security) +"nao" = ( +/turf/open/desert/dirt/desert_transition_edge1/southeast, +/area/desert_dam/exterior/valley/valley_security) "naF" = ( /obj/effect/landmark/objective_landmark/close, /turf/open/floor/plating, @@ -47923,6 +45143,11 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/south_valley_dam) +"nbK" = ( +/obj/effect/blocker/toxic_water/Group_2, +/obj/structure/platform/metal/almayer/north, +/turf/open/gm/river/desert/shallow_edge/east, +/area/desert_dam/exterior/river/riverside_central_north) "ncd" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal4" @@ -47934,6 +45159,10 @@ "ncm" = ( /turf/open/desert/rock/deep, /area/desert_dam/interior/dam_interior/east_tunnel_entrance) +"ncP" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/desert/rock, +/area/desert_dam/exterior/valley/valley_crashsite) "ndF" = ( /turf/open/desert/dirt/desert_transition_edge1/north, /area/desert_dam/exterior/landing_pad_one) @@ -47945,6 +45174,12 @@ }, /turf/open/desert/rock, /area/desert_dam/interior/caves/temple) +"nft" = ( +/obj/effect/decal/sand_overlay/sand1{ + dir = 1 + }, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_security) "ngk" = ( /obj/effect/landmark/objective_landmark/far, /turf/open/floor/prison/bright_clean2, @@ -47955,6 +45190,33 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/south_valley_dam) +"ngw" = ( +/obj/structure/platform/stone/runed_sandstone, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/sandstone/runed, +/area/desert_dam/interior/caves/temple) +"nhe" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_security) +"nhi" = ( +/obj/effect/decal/sand_overlay/sand1{ + dir = 1 + }, +/obj/item/prop/colony/used_flare, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached4, +/area/desert_dam/exterior/valley/valley_crashsite) +"nht" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/tool/surgery/circular_saw, +/turf/open/floor/prison/whitegreen/east, +/area/desert_dam/building/medical/lobby) +"nik" = ( +/obj/effect/blocker/toxic_water/Group_2, +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/east, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_east) "nil" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached13, /area/desert_dam/exterior/valley/south_valley_dam) @@ -47968,11 +45230,30 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/cell_stripe/east, /area/desert_dam/interior/dam_interior/hanger) +"njp" = ( +/obj/structure/stairs{ + dir = 4 + }, +/obj/structure/platform/metal/stair_cut/platform_left, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_mining) +"njv" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/desert/rock, +/area/desert_dam/interior/dam_interior/south_tunnel) "njF" = ( /obj/effect/decal/sand_overlay/sand1, /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/desert/dirt/dirt2, /area/desert_dam/exterior/valley/valley_crashsite) +"nkc" = ( +/obj/effect/decal/sand_overlay/sand1/corner1, +/turf/open/asphalt/cement_sunbleached, +/area/desert_dam/exterior/valley/valley_security) +"nkO" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached4, +/area/desert_dam/exterior/valley/valley_telecoms) "nlH" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -47985,13 +45266,10 @@ "nmr" = ( /turf/open/desert/dirt/desert_transition_corner1/north, /area/desert_dam/exterior/valley/south_valley_dam) -"nmP" = ( -/obj/structure/desertdam/decals/road_edge{ - icon_state = "road_edge_decal2" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_telecoms) +"nmB" = ( +/obj/structure/platform/metal/almayer, +/turf/open/desert/rock, +/area/desert_dam/exterior/valley/valley_crashsite) "nnl" = ( /obj/structure/closet/secure_closet/personal, /obj/effect/landmark/objective_landmark/science, @@ -48000,6 +45278,42 @@ "nnv" = ( /turf/open/desert/dirt/desert_transition_edge1/northwest, /area/desert_dam/exterior/landing_pad_one) +"nnC" = ( +/obj/structure/stairs{ + dir = 1 + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/north_valley_dam) +"nnL" = ( +/obj/effect/landmark/corpsespawner/scientist, +/obj/effect/decal/cleanable/blood{ + layer = 3 + }, +/turf/open/floor/prison/whitepurple/north, +/area/desert_dam/interior/lab_northeast/east_lab_central_hallway) +"noh" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/shallow_edge/northwest, +/area/desert_dam/exterior/river/riverside_east) +"nqg" = ( +/obj/structure/platform/stone/runed_sandstone/west, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/sandstone/runed, +/area/desert_dam/interior/caves/temple) +"nqv" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/tool/hatchet, +/turf/open/floor/prison/bright_clean/southwest, +/area/desert_dam/building/hydroponics/hydroponics) +"nqK" = ( +/obj/structure/stairs{ + dir = 1 + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/asphalt/cement/cement1, +/area/desert_dam/interior/dam_interior/central_tunnel) "nsf" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal12" @@ -48007,11 +45321,22 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_civilian) +"nsx" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_east) "ntt" = ( /obj/structure/closet/l3closet/security, /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison/floor_marked, /area/desert_dam/building/security/armory) +"ntQ" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/north, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/sandstone/runed, +/area/desert_dam/interior/caves/temple) "nue" = ( /turf/open/desert/dirt/desert_transition_edge1/southeast, /area/desert_dam/exterior/valley/south_valley_dam) @@ -48019,6 +45344,47 @@ /obj/structure/flora/grass/desert/heavygrass_3, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) +"nvD" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/decal/sand_overlay/sand1{ + dir = 4 + }, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_telecoms) +"nvT" = ( +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_security) +"nxP" = ( +/obj/structure/desertdam/decals/road_edge, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_security) +"nxS" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/asphalt/cement/cement12, +/area/desert_dam/interior/dam_interior/west_tunnel) +"nyc" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/desert/desert_shore/shore_corner2, +/area/desert_dam/exterior/river/riverside_central_south) +"nye" = ( +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal4" + }, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_security) +"nyE" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/filtration_a) "nyN" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_core, /turf/open/floor/prison/bright_clean2, @@ -48031,14 +45397,31 @@ /obj/structure/flora/grass/tallgrass/desert, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_northwest) +"nzE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood{ + layer = 3 + }, +/turf/open/floor/prison/southwest, +/area/desert_dam/interior/dam_interior/engine_west_wing) "nAm" = ( /obj/structure/desertdam/decals/road_edge, /turf/open/asphalt, /area/desert_dam/exterior/valley/south_valley_dam) +"nCg" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_northwest) "nCi" = ( /obj/item/stack/medical/advanced/ointment/predator, /turf/open/desert/rock/deep/transition, /area/desert_dam/interior/caves/temple) +"nEc" = ( +/obj/effect/decal/sand_overlay/sand1{ + dir = 1 + }, +/turf/open/floor/plating/warnplate/northwest, +/area/desert_dam/exterior/valley/valley_security) "nEM" = ( /turf/closed/wall/hangar{ name = "Elevator Shaft"; @@ -48046,15 +45429,45 @@ hull = 1 }, /area/shuttle/trijent_shuttle/lz2) +"nET" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_central_south) +"nEW" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/shallow, +/area/desert_dam/exterior/river/riverside_south) "nFh" = ( /obj/structure/closet/coffin/predator, /turf/open/floor/sandstone/runed, /area/desert_dam/interior/caves/temple) +"nFE" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/river/riverside_central_north) "nFW" = ( /obj/structure/surface/table, /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/white, /area/desert_dam/building/administration/meetingrooom) +"nGn" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_security) +"nHz" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/river/riverside_south) +"nHV" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/shallow_edge/east, +/area/desert_dam/exterior/river/riverside_central_north) "nIz" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/prison/green/north, @@ -48065,6 +45478,28 @@ }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached14, /area/desert_dam/exterior/landing_pad_one) +"nKB" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/desert/desert_shore/shore_edge1/east, +/area/desert_dam/exterior/river/riverside_east) +"nLe" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/turf/open/desert/dirt/desert_transition_edge1, +/area/desert_dam/exterior/valley/valley_cargo) +"nLG" = ( +/obj/structure/stairs{ + dir = 4 + }, +/obj/structure/platform/metal/almayer, +/turf/open/asphalt/cement, +/area/desert_dam/interior/dam_interior/north_tunnel) +"nLY" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/desert/desert_shore/desert_shore1, +/area/desert_dam/exterior/river/riverside_east) "nMO" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -48073,6 +45508,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/floor_marked/southwest, /area/desert_dam/building/cafeteria/loading) +"nMQ" = ( +/obj/structure/flora/grass/desert/lightgrass_4, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_security) +"nOq" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/shallow_edge/east, +/area/desert_dam/exterior/river/riverside_central_south) "nRV" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -48081,6 +45525,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_hydro) +"nSi" = ( +/obj/effect/decal/sand_overlay/sand1{ + dir = 6 + }, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached15, +/area/desert_dam/exterior/valley/valley_security) "nSN" = ( /obj/structure/surface/table/reinforced, /turf/open/floor/prison/whitered/west, @@ -48095,6 +45545,10 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison/darkyellow2/north, /area/desert_dam/interior/dam_interior/primary_tool_storage) +"nTo" = ( +/obj/structure/platform/metal/almayer, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/river/riverside_central_north) "nTp" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal6" @@ -48102,6 +45556,36 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_medical) +"nTQ" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/turf/open/desert/rock, +/area/desert_dam/exterior/valley/valley_crashsite) +"nTU" = ( +/obj/structure/target, +/turf/open/floor/plating, +/area/desert_dam/exterior/valley/valley_security) +"nTW" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/item/ammo_casing/bullet, +/turf/open/floor/prison/sterile_white/west, +/area/desert_dam/building/medical/morgue) +"nUp" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_2, +/obj/structure/platform/metal/almayer/east, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_central_north) +"nVg" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/shallow, +/area/desert_dam/exterior/river/riverside_central_north) +"nVL" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_east) "nXu" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal2" @@ -48111,6 +45595,12 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_labs) +"nXw" = ( +/obj/structure/barricade/sandbags{ + dir = 4 + }, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_security) "nYf" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/prison, @@ -48129,9 +45619,22 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt/cement_sunbleached/cement_sunbleached18, /area/desert_dam/exterior/valley/valley_medical) +"nZl" = ( +/turf/open/asphalt/cement_sunbleached/cement_sunbleached3, +/area/desert_dam/exterior/valley/valley_security) +"oaj" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_central_south) "oaz" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached14, /area/desert_dam/exterior/valley/bar_valley_dam) +"oaB" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/asphalt/cement, +/area/desert_dam/interior/dam_interior/northwestern_tunnel) "obv" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -48141,6 +45644,20 @@ }, /turf/open/floor/sandstone/runed, /area/desert_dam/interior/caves/temple) +"ocL" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/filtration_a) +"odj" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/effect/decal/sand_overlay/sand1{ + dir = 4 + }, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_telecoms) "odr" = ( /obj/structure/surface/table/reinforced, /obj/item/roller, @@ -48153,6 +45670,16 @@ /obj/structure/machinery/light, /turf/open/floor/prison/darkyellow2, /area/desert_dam/interior/dam_interior/garage) +"oey" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison/bright_clean2, +/area/desert_dam/interior/lab_northeast/east_lab_east_hallway) +"oeJ" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/shallow, +/area/desert_dam/exterior/river/riverside_south) "ofB" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 4 @@ -48164,10 +45691,30 @@ "ogc" = ( /turf/open/desert/dirt/rock1, /area/desert_dam/exterior/landing_pad_one) +"ogu" = ( +/obj/structure/desertdam/decals/road_edge, +/obj/effect/decal/cleanable/blood, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_medical) +"ogF" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/desert/rock, +/area/desert_dam/exterior/valley/valley_crashsite) "oit" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/desert/dirt/desert_transition_edge1/southwest, /area/desert_dam/exterior/valley/valley_crashsite) +"okj" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "xgib3"; + pixel_x = 17 + }, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_labs) +"olo" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/desert/dirt/desert_transition_corner1/east, +/area/desert_dam/exterior/valley/valley_cargo) "olL" = ( /obj/structure/barricade/wooden{ dir = 4 @@ -48194,6 +45741,10 @@ /obj/effect/decal/sand_overlay/sand1, /turf/open/asphalt/cement_sunbleached/cement_sunbleached12, /area/desert_dam/exterior/valley/bar_valley_dam) +"oqa" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_telecoms) "oqy" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal2" @@ -48201,6 +45752,29 @@ /obj/effect/decal/sand_overlay/sand1/corner1, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_labs) +"oqz" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/asphalt/cement, +/area/desert_dam/interior/dam_interior/north_tunnel) +"orn" = ( +/obj/structure/disposalpipe/segment, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached4, +/area/desert_dam/exterior/valley/valley_security) +"orD" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/shallow, +/area/desert_dam/exterior/river/riverside_east) +"osm" = ( +/obj/structure/platform/metal/almayer, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_telecoms) +"osD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/item/prop/colony/used_flare, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_medical) "osV" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood, @@ -48212,6 +45786,13 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_labs) +"otE" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/decal/sand_overlay/sand1{ + dir = 10 + }, +/turf/closed/wall/r_wall/bunker/floodgate, +/area/desert_dam/exterior/valley/valley_labs) "oua" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 4 @@ -48223,6 +45804,33 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/asphalt/cement_sunbleached/cement_sunbleached12, /area/desert_dam/exterior/valley/valley_crashsite) +"ovE" = ( +/obj/effect/decal/cleanable/blood, +/obj/effect/landmark/corpsespawner/doctor, +/turf/open/floor/prison/sterile_white/west, +/area/desert_dam/building/medical/surgery_room_one) +"owk" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/desert/desert_shore/shore_edge1/west, +/area/desert_dam/exterior/river/riverside_east) +"owq" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/river/riverside_central_south) +"owy" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "xgib4" + }, +/turf/open/floor/prison/bright_clean/southwest, +/area/desert_dam/interior/dam_interior/engine_west_wing) +"owz" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/desert/desert_shore/desert_shore1/west, +/area/desert_dam/exterior/river/riverside_central_south) "oyf" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -48230,53 +45838,105 @@ /obj/effect/decal/cleanable/liquid_fuel, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_medical) +"ozd" = ( +/obj/effect/decal/sand_overlay/sand1{ + dir = 4 + }, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached3, +/area/desert_dam/exterior/valley/valley_security) "ozu" = ( /turf/open/asphalt, /area/desert_dam/exterior/valley/south_valley_dam) +"ozv" = ( +/obj/effect/sentry_landmark/lz_2/top_left, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_cargo) "ozQ" = ( /obj/structure/machinery/door/unpowered/shuttle, /turf/open/shuttle/can_surgery/red, /area/desert_dam/interior/dam_interior/hanger) +"oAL" = ( +/obj/effect/decal/sand_overlay/sand1/corner1, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_security) "oAM" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal2" }, /turf/open/asphalt, /area/desert_dam/exterior/valley/south_valley_dam) +"oAY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_medical) "oBR" = ( /obj/structure/disposalpipe/segment, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_hydro) -"oCu" = ( -/obj/structure/desertdam/decals/road_edge{ - icon_state = "road_edge_decal12" - }, -/obj/effect/decal/sand_overlay/sand1{ - dir = 4 - }, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_telecoms) "oCD" = ( /obj/structure/machinery/landinglight/ds1/delayone{ dir = 8 }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached2, /area/desert_dam/exterior/landing_pad_one) +"oDi" = ( +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal3" + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_security) +"oDJ" = ( +/obj/effect/decal/sand_overlay/sand1, +/turf/open/floor/plating/warnplate, +/area/desert_dam/exterior/valley/valley_security) +"oEl" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_central_south) +"oFV" = ( +/obj/structure/stairs{ + dir = 1 + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_hydro) +"oGr" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/shallow_edge/north, +/area/desert_dam/exterior/river/riverside_east) +"oGY" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/desert/desert_shore/shore_edge1/north, +/area/desert_dam/exterior/river/riverside_south) "oHw" = ( /obj/structure/surface/table/reinforced, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison/blue, /area/desert_dam/interior/dam_interior/tech_storage) -"oHA" = ( -/obj/structure/desertdam/decals/road_stop{ - dir = 4; - icon_state = "stop_decal5" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, +"oHI" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/desert/desert_shore/desert_shore1/north, +/area/desert_dam/exterior/river/riverside_east) +"oIc" = ( +/obj/structure/desertdam/decals/road_edge, +/obj/effect/sentry_landmark/lz_2/bottom_left, /turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_medical) +/area/desert_dam/exterior/landing_pad_two) +"oIw" = ( +/obj/effect/decal/sand_overlay/sand1/corner1{ + dir = 1 + }, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached3, +/area/desert_dam/exterior/valley/valley_security) "oIE" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -48284,41 +45944,97 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/bar_valley_dam) +"oJs" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/shallow, +/area/desert_dam/exterior/river/riverside_central_north) "oJw" = ( /turf/open/desert/dirt/desert_transition_edge1/west, /area/desert_dam/exterior/valley/valley_hydro) +"oJL" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_central_north) +"oJM" = ( +/obj/structure/stairs, +/obj/structure/platform/metal/almayer/west, +/turf/open/asphalt/cement/cement3, +/area/desert_dam/interior/dam_interior/central_tunnel) "oJT" = ( /obj/structure/flora/grass/desert/lightgrass_2, /turf/open/desert/dirt, /area/desert_dam/exterior/landing_pad_one) +"oJU" = ( +/obj/structure/flora/grass/desert/lightgrass_1, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_security) "oJW" = ( /obj/structure/machinery/light{ dir = 8 }, /turf/open/floor/interior/wood, /area/desert_dam/building/security/detective) +"oKi" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_cargo) +"oKu" = ( +/obj/effect/decal/cleanable/blood, +/obj/effect/landmark/corpsespawner/chef, +/turf/open/floor/interior/tatami, +/area/desert_dam/building/bar/bar) "oKG" = ( /obj/structure/desertdam/decals/road_stop{ icon_state = "stop_decal5" }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_hydro) +"oKH" = ( +/obj/structure/prop/dam/boulder/boulder2, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_security) +"oKL" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_1, +/obj/effect/landmark/nightmare{ + insert_tag = "purple-south-bridge" + }, +/turf/open/gm/river/desert/shallow, +/area/desert_dam/exterior/river/riverside_south) +"oLu" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/blocker/toxic_water, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/filtration_a) +"oLT" = ( +/obj/structure/stairs, +/obj/structure/platform/metal/almayer/east, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached1, +/area/desert_dam/exterior/valley/valley_telecoms) "oMz" = ( /turf/open/desert/dirt/desert_transition_edge1/east, /area/desert_dam/exterior/landing_pad_one) -"oNS" = ( -/obj/structure/stairs, -/obj/structure/platform{ - dir = 4 +"oMK" = ( +/obj/structure/platform_decoration/metal/almayer, +/obj/structure/stairs{ + dir = 1 }, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached15, -/area/desert_dam/exterior/valley/south_valley_dam) +/turf/open/floor/plating, +/area/desert_dam/interior/lab_northeast/east_lab_containment) "oOj" = ( /obj/structure/largecrate/random, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/floor_marked/southwest, /area/desert_dam/building/cafeteria/loading) +"oPz" = ( +/obj/structure/platform/metal/almayer, +/turf/open/desert/desert_shore/shore_corner2/east, +/area/desert_dam/exterior/valley/valley_labs) "oQx" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached15, /area/desert_dam/exterior/valley/valley_hydro) @@ -48331,11 +46047,30 @@ /obj/effect/landmark/objective_landmark/far, /turf/open/floor/freezerfloor, /area/desert_dam/interior/dam_interior/break_room) +"oQZ" = ( +/obj/structure/fence, +/turf/open/desert/dirt/desert_transition_edge1, +/area/desert_dam/exterior/valley/valley_security) "oRZ" = ( /obj/structure/closet/radiation, /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison/darkpurple2/north, /area/desert_dam/interior/lab_northeast/east_lab_excavation) +"oSr" = ( +/obj/effect/decal/sand_overlay/sand1{ + dir = 8 + }, +/turf/open/floor/plating/warnplate/east, +/area/desert_dam/exterior/valley/valley_security) +"oTg" = ( +/obj/effect/decal/sand_overlay/sand1{ + dir = 1 + }, +/obj/structure/barricade/deployable{ + dir = 8 + }, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached18, +/area/desert_dam/exterior/valley/valley_medical) "oUr" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_core, /turf/open/desert/dirt, @@ -48349,6 +46084,17 @@ /obj/structure/surface/table, /turf/open/floor/wood, /area/desert_dam/building/dorms/hallway_northwing) +"oVM" = ( +/obj/structure/stairs{ + dir = 8 + }, +/obj/structure/platform/metal/almayer, +/turf/open/asphalt/cement, +/area/desert_dam/interior/dam_interior/central_tunnel) +"oVX" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached14, +/area/desert_dam/exterior/valley/valley_security) "oWx" = ( /obj/structure/machinery/power/reactor/colony, /turf/open/floor/greengrid, @@ -48357,6 +46103,12 @@ /obj/structure/machinery/colony_floodlight, /turf/open/asphalt/tile, /area/desert_dam/exterior/valley/south_valley_dam) +"oXD" = ( +/obj/effect/blocker/toxic_water/Group_2, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform/metal/almayer, +/turf/open/desert/desert_shore/desert_shore1/east, +/area/desert_dam/exterior/river/riverside_central_north) "oXK" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/prison, @@ -48369,12 +46121,38 @@ /obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/prison/bright_clean/southwest, /area/desert_dam/exterior/telecomm/lz1_valley) +"oYC" = ( +/obj/structure/stairs{ + dir = 8 + }, +/obj/structure/platform/metal/almayer, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached14, +/area/desert_dam/exterior/valley/valley_wilderness) +"oZb" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_security) +"oZu" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/effect/decal/sand_overlay/sand1{ + dir = 8 + }, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached1, +/area/desert_dam/exterior/valley/valley_crashsite) "pac" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/oil/streak, /turf/open/floor/prison/bright_clean/southwest, /area/desert_dam/interior/dam_interior/garage) +"pah" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/shallow_edge/east, +/area/desert_dam/exterior/river/riverside_central_north) "pal" = ( /obj/structure/machinery/colony_floodlight, /turf/open/desert/dirt, @@ -48393,6 +46171,23 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, /area/desert_dam/building/hydroponics/hydroponics_loading) +"pbX" = ( +/obj/structure/stairs{ + dir = 1 + }, +/obj/structure/platform/metal/almayer/east, +/obj/effect/decal/cleanable/dirt, +/turf/open/asphalt/cement_sunbleached, +/area/desert_dam/exterior/valley/valley_crashsite) +"pcu" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/effect/landmark/corpsespawner/security/marshal, +/obj/effect/decal/cleanable/blood, +/obj/item/ammo_magazine/smg/mp5, +/turf/open/floor/prison/darkyellow2/west, +/area/desert_dam/interior/dam_interior/engine_west_wing) "pdi" = ( /obj/effect/decal/sand_overlay/sand2{ dir = 1 @@ -48400,6 +46195,33 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/asphalt/cement_sunbleached/cement_sunbleached4, /area/desert_dam/interior/caves/central_caves) +"pdG" = ( +/obj/structure/machinery/optable, +/obj/effect/landmark/corpsespawner/colonist/burst, +/obj/effect/spawner/gibspawner/human, +/turf/open/floor/prison/sterile_white/west, +/area/desert_dam/building/medical/morgue) +"peH" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/shallow_edge/north, +/area/desert_dam/exterior/river/riverside_east) +"pgb" = ( +/obj/structure/barricade/deployable{ + dir = 8 + }, +/turf/open/desert/dirt/desert_transition_edge1, +/area/desert_dam/exterior/valley/valley_medical) +"phA" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/desert/desert_shore/shore_edge1/east, +/area/desert_dam/exterior/river/riverside_central_north) +"pib" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water, +/turf/open/gm/river/desert, +/area/desert_dam/exterior/river/riverside_east) "pif" = ( /obj/docking_port/stationary/trijent_elevator/empty{ id = "trijent_engineering"; @@ -48413,6 +46235,18 @@ "pij" = ( /turf/open/desert/dirt/desert_transition_edge1/southeast, /area/desert_dam/exterior/valley/bar_valley_dam) +"piZ" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/desert/desert_shore/shore_corner2/north, +/area/desert_dam/exterior/river/riverside_central_south) +"pjV" = ( +/obj/structure/stairs{ + dir = 1 + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/asphalt/cement/cement3, +/area/desert_dam/interior/dam_interior/northeastern_tunnel) "pke" = ( /obj/structure/prop/dam/wide_boulder/boulder1, /turf/open/desert/dirt, @@ -48421,6 +46255,40 @@ /obj/structure/flora/grass/desert/lightgrass_1, /turf/open/desert/dirt, /area/desert_dam/exterior/telecomm/lz1_xenoflora) +"pmt" = ( +/obj/effect/decal/sand_overlay/sand1{ + dir = 1 + }, +/obj/item/prop/colony/used_flare, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached18, +/area/desert_dam/exterior/valley/valley_medical) +"pmT" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/prop/dam/van{ + dir = 1 + }, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_security) +"pni" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/decal/sand_overlay/sand2{ + dir = 8 + }, +/turf/open/asphalt/cement, +/area/desert_dam/interior/dam_interior/south_tunnel) +"pnS" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/asphalt/cement/cement3, +/area/desert_dam/interior/dam_interior/northeastern_tunnel) +"pnZ" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/shallow_edge/southwest, +/area/desert_dam/exterior/river/riverside_south) +"pob" = ( +/obj/item/stack/sheet/wood, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_crashsite) "poi" = ( /obj/structure/desertdam/decals/road_edge, /obj/effect/decal/cleanable/dirt, @@ -48444,6 +46312,10 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison/whitegreen/west, /area/desert_dam/building/medical/virology_isolation) +"ptj" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/desert/rock, +/area/desert_dam/interior/dam_interior/south_tunnel) "puM" = ( /obj/structure/machinery/light{ dir = 1 @@ -48464,6 +46336,12 @@ "pvs" = ( /turf/open/desert/dirt/desert_transition_corner1, /area/desert_dam/exterior/valley/south_valley_dam) +"pvv" = ( +/obj/structure/barricade/deployable{ + dir = 1 + }, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_medical) "pvy" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/prison/whitepurple/east, @@ -48473,6 +46351,11 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/prison/darkyellow2, /area/desert_dam/building/mining/workshop) +"pyu" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/desert/desert_shore/shore_edge1/west, +/area/desert_dam/exterior/river/riverside_central_north) "pyP" = ( /obj/effect/decal/sand_overlay/sand1/corner1{ dir = 1 @@ -48498,14 +46381,51 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_hydro) +"pAB" = ( +/obj/structure/platform/metal/almayer, +/turf/open/floor/plating, +/area/desert_dam/interior/lab_northeast/east_lab_containment) "pAE" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/asphalt/cement_sunbleached/cement_sunbleached12, /area/desert_dam/exterior/valley/valley_crashsite) +"pBb" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_central_north) +"pBc" = ( +/obj/structure/flora/bush/desert/cactus{ + icon_state = "cactus_8" + }, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_security) +"pBe" = ( +/obj/effect/decal/cleanable/blood, +/obj/effect/landmark/corpsespawner/colonist/burst, +/obj/effect/spawner/gibspawner/human, +/turf/open/floor/interior/wood, +/area/desert_dam/interior/dam_interior/east_tunnel_entrance) +"pCS" = ( +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal2" + }, +/obj/structure/disposalpipe/segment, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_security) "pDd" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/warnplate/east, /area/desert_dam/building/substation/northwest) +"pDM" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_labs) +"pDN" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/desert/desert_shore/shore_edge1/north, +/area/desert_dam/exterior/river/riverside_central_south) "pDW" = ( /obj/effect/decal/sand_overlay/sand1/corner1{ dir = 4 @@ -48524,6 +46444,15 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/prison, /area/desert_dam/building/dorms/hallway_northwing) +"pES" = ( +/obj/effect/blocker/toxic_water, +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/desert/desert_shore/shore_corner2/north, +/area/desert_dam/exterior/river_mouth/southern) +"pEZ" = ( +/obj/structure/platform_decoration/stone/runed_sandstone, +/turf/open/desert/desert_shore/shore_edge1/east, +/area/desert_dam/interior/caves/temple) "pFj" = ( /obj/structure/surface/table, /obj/item/storage/fancy/vials/random, @@ -48550,6 +46479,11 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/landing_pad_one) +"pHS" = ( +/obj/effect/blocker/toxic_water/Group_2, +/obj/structure/platform/metal/almayer/north, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_east) "pHU" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, @@ -48567,17 +46501,43 @@ /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/prison/sterile_white/west, /area/desert_dam/building/warehouse/breakroom) -"pJW" = ( -/obj/structure/flora/grass/tallgrass/desert, -/turf/open/desert/dirt, -/area/desert_dam/exterior/valley/valley_telecoms) +"pIR" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/effect/decal/cleanable/blood{ + icon_state = "xgib2" + }, +/turf/open/floor/prison/sterile_white/west, +/area/desert_dam/interior/lab_northeast/east_lab_west_hallway) +"pLj" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/gm/river/desert/shallow_edge/northwest, +/area/desert_dam/exterior/valley/valley_labs) "pLm" = ( /turf/open/desert/dirt/desert_transition_edge1/northeast, /area/desert_dam/exterior/valley/south_valley_dam) +"pMp" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/shallow_edge/west, +/area/desert_dam/exterior/river/riverside_central_north) +"pMy" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/desert/desert_shore/desert_shore1, +/area/desert_dam/exterior/river/riverside_central_south) "pNG" = ( /obj/structure/xenoautopsy/tank/broken, /turf/open/desert/rock/deep/rock4, /area/desert_dam/interior/caves/temple) +"pOv" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_central_north) "pOE" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 4 @@ -48585,6 +46545,41 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/asphalt/cement_sunbleached/cement_sunbleached3, /area/desert_dam/exterior/valley/valley_civilian) +"pPC" = ( +/obj/effect/decal/sand_overlay/sand1{ + dir = 1 + }, +/obj/item/weapon/gun/revolver/cmb, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached18, +/area/desert_dam/exterior/valley/valley_medical) +"pPW" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/corpsespawner/engineer, +/obj/effect/decal/cleanable/blood, +/obj/effect/spawner/gibspawner/human, +/turf/open/floor/whiteyellowcorner/east, +/area/desert_dam/interior/dam_interior/lobby) +"pQN" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/effect/landmark/corpsespawner/colonist/burst, +/obj/item/weapon/baseballbat/metal, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/whitegreen/north, +/area/desert_dam/building/lab_northwest/west_lab_xenoflora) +"pRi" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/desert/desert_shore/desert_shore1/west, +/area/desert_dam/exterior/river/riverside_south) +"pRw" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/spawner/gibspawner/xeno, +/turf/open/floor/prison/bright_clean/southwest, +/area/desert_dam/interior/dam_interior/engine_west_wing) "pRD" = ( /turf/open/desert/dirt/desert_transition_edge1, /area/desert_dam/exterior/landing_pad_one) @@ -48603,6 +46598,11 @@ "pTU" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached14, /area/desert_dam/exterior/valley/south_valley_dam) +"pTZ" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/desert/desert_shore/shore_corner2, +/area/desert_dam/exterior/river/riverside_south) "pUO" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal4" @@ -48616,18 +46616,42 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_medical) -"pWn" = ( -/obj/structure/stairs, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/asphalt/cement_sunbleached/cement_sunbleached14, -/area/desert_dam/exterior/valley/valley_crashsite) +"pWI" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/shallow_edge/east, +/area/desert_dam/exterior/river/riverside_central_south) +"pXX" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform/metal/almayer, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_northwest) +"pYL" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/plating, +/area/desert_dam/interior/lab_northeast/east_lab_containment) +"pZg" = ( +/turf/open/desert/dirt/desert_transition_edge1/northwest, +/area/desert_dam/exterior/valley/valley_security) "qbC" = ( /obj/structure/surface/table/woodentable, /turf/open/floor/wood, /area/desert_dam/building/administration/meetingrooom) +"qbR" = ( +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal12" + }, +/obj/effect/decal/sand_overlay/sand1{ + dir = 4 + }, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_security) +"qbU" = ( +/obj/effect/decal/sand_overlay/sand1/corner1{ + dir = 8 + }, +/turf/open/asphalt/cement/cement3, +/area/desert_dam/exterior/valley/valley_security) "qbW" = ( /obj/structure/desertdam/decals/road_edge, /obj/effect/decal/sand_overlay/sand1{ @@ -48635,10 +46659,66 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/bar_valley_dam) +"qdn" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/desert/dirt/desert_transition_edge1/southwest, +/area/desert_dam/exterior/valley/valley_northwest) +"qdG" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water, +/turf/open/desert/desert_shore/shore_corner2/east, +/area/desert_dam/exterior/river_mouth/southern) +"qdI" = ( +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal2" + }, +/obj/item/weapon/gun/rifle/m41a/corporate/no_lock, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_medical) +"qex" = ( +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal2" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_security) +"qeG" = ( +/obj/effect/sentry_landmark/lz_2/bottom_right, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached1, +/area/desert_dam/exterior/landing_pad_two) +"qfr" = ( +/obj/structure/stairs{ + dir = 8 + }, +/obj/structure/platform/metal/stair_cut/platform_right, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached2, +/area/desert_dam/exterior/valley/valley_medical) "qfI" = ( /obj/structure/flora/bush/desert, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_hydro) +"qfP" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/asphalt/cement/cement12, +/area/desert_dam/interior/dam_interior/northwestern_tunnel) +"qgn" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/asphalt/cement/cement1, +/area/desert_dam/interior/dam_interior/northwestern_tunnel) +"qif" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/shallow_edge/east, +/area/desert_dam/exterior/river/riverside_central_south) +"qiD" = ( +/obj/structure/stairs{ + dir = 8 + }, +/obj/structure/platform/metal/almayer, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached12, +/area/desert_dam/exterior/valley/valley_telecoms) "qjg" = ( /turf/open/desert/rock/deep/transition/southeast, /area/desert_dam/interior/caves/temple) @@ -48659,6 +46739,11 @@ /obj/effect/decal/cleanable/blood/oil/streak, /turf/open/asphalt/cement/cement12, /area/desert_dam/exterior/telecomm/lz1_south) +"qln" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/sentry_landmark/lz_2/bottom_right, +/turf/open/asphalt, +/area/desert_dam/exterior/landing_pad_two) "qlr" = ( /obj/structure/flora/grass/desert/heavygrass_4, /turf/open/desert/dirt, @@ -48668,6 +46753,10 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/asphalt/cement_sunbleached/cement_sunbleached12, /area/desert_dam/exterior/valley/valley_civilian) +"qlC" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/asphalt/cement, +/area/desert_dam/interior/dam_interior/west_tunnel) "qlG" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/desert/dirt, @@ -48675,6 +46764,10 @@ "qlU" = ( /turf/open/desert/dirt/desert_transition_edge1, /area/desert_dam/exterior/valley/bar_valley_dam) +"qmf" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/desert/dirt/desert_transition_edge1/southwest, +/area/desert_dam/exterior/valley/valley_cargo) "qmn" = ( /obj/structure/machinery/light{ dir = 8 @@ -48696,10 +46789,29 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/asphalt/cement_sunbleached/cement_sunbleached4, /area/desert_dam/exterior/valley/valley_crashsite) +"qos" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_central_south) "qoJ" = ( /obj/structure/machinery/landinglight/ds1/delaytwo, /turf/open/asphalt/cement_sunbleached/cement_sunbleached4, /area/desert_dam/exterior/landing_pad_one) +"qps" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river_mouth/southern) +"qqy" = ( +/obj/effect/spawner/gibspawner/xeno, +/turf/open/floor/prison/bright_clean/southwest, +/area/desert_dam/building/hydroponics/hydroponics) +"qqJ" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/asphalt/cement/cement15, +/area/desert_dam/interior/dam_interior/northwestern_tunnel) "qqR" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal4" @@ -48709,12 +46821,26 @@ }, /turf/open/asphalt, /area/desert_dam/interior/dam_interior/south_tunnel) +"qqU" = ( +/obj/structure/barricade/wooden, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_crashsite) +"qrJ" = ( +/turf/open/asphalt/cement_sunbleached/cement_sunbleached9, +/area/desert_dam/exterior/valley/valley_security) "qtb" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 4 }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached13, /area/desert_dam/exterior/valley/valley_labs) +"qvk" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/obj/structure/stairs{ + dir = 1 + }, +/turf/open/floor/plating, +/area/desert_dam/interior/lab_northeast/east_lab_containment) "qwZ" = ( /obj/structure/bed/chair, /obj/effect/landmark/survivor_spawner, @@ -48724,6 +46850,15 @@ /obj/structure/machinery/colony_floodlight, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_labs) +"qxQ" = ( +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal6" + }, +/obj/effect/decal/cleanable/blood{ + icon_state = "xgib1" + }, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_labs) "qyu" = ( /obj/structure/prop/dam/boulder/boulder1, /turf/open/desert/dirt/desert_transition_edge1, @@ -48737,6 +46872,13 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/whiteyellow/east, /area/desert_dam/interior/dam_interior/garage) +"qzi" = ( +/obj/structure/stairs{ + dir = 8 + }, +/obj/structure/platform/metal/stair_cut/platform_right, +/turf/open/asphalt/cement, +/area/desert_dam/interior/dam_interior/north_tunnel) "qzo" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached19, /area/desert_dam/exterior/valley/valley_telecoms) @@ -48759,13 +46901,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt/cement_sunbleached/cement_sunbleached9, /area/desert_dam/exterior/landing_pad_one) -"qEJ" = ( -/obj/structure/desertdam/decals/road_edge, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, +"qDX" = ( +/obj/structure/desertdam/decals/road_stop{ + dir = 1; + icon_state = "stop_decal5" + }, /turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_medical) +/area/desert_dam/exterior/valley/valley_security) "qGb" = ( /obj/structure/closet, /obj/effect/landmark/objective_landmark/medium, @@ -48781,6 +46923,10 @@ }, /turf/open/desert/dirt, /area/desert_dam/exterior/landing_pad_two) +"qHs" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/asphalt/cement/cement2, +/area/desert_dam/interior/dam_interior/northeastern_tunnel) "qHt" = ( /obj/structure/surface/table, /obj/effect/landmark/objective_landmark/close, @@ -48790,6 +46936,16 @@ /obj/structure/flora/grass/desert/lightgrass_10, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) +"qIc" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_crashsite) +"qIp" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/desert/desert_shore/desert_shore1/west, +/area/desert_dam/exterior/river/riverside_central_south) "qIC" = ( /obj/structure/flora/tree/joshua, /turf/open/desert/dirt, @@ -48810,6 +46966,24 @@ "qKE" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached1, /area/desert_dam/exterior/valley/valley_hydro) +"qKF" = ( +/obj/structure/disposalpipe/segment, +/obj/item/weapon/gun/rifle/m41a/corporate/no_lock, +/turf/open/floor/prison/bluecorner/north, +/area/desert_dam/interior/lab_northeast/east_lab_RND) +"qKN" = ( +/obj/effect/decal/sand_overlay/sand1{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/prop/colony/used_flare, +/turf/open/floor/plating, +/area/desert_dam/exterior/valley/valley_crashsite) +"qKT" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/obj/effect/blocker/toxic_water, +/turf/open/gm/river/desert/shallow_corner/west, +/area/desert_dam/exterior/river/riverside_east) "qLD" = ( /obj/effect/decal/remains/human, /obj/effect/decal/cleanable/blood, @@ -48826,6 +47000,13 @@ }, /turf/open/floor/corsat/squareswood/north, /area/desert_dam/interior/caves/temple) +"qMT" = ( +/obj/structure/stairs{ + dir = 1 + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached3, +/area/desert_dam/exterior/valley/valley_medical) "qNk" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -48839,10 +47020,52 @@ }, /turf/open/floor/prison/bright_clean/southwest, /area/desert_dam/interior/dam_interior/garage) +"qPx" = ( +/obj/structure/platform/metal/almayer, +/turf/open/desert/desert_shore/shore_edge1/west, +/area/desert_dam/exterior/valley/valley_labs) +"qPB" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/barricade/deployable{ + dir = 8 + }, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_medical) "qQz" = ( /obj/effect/blocker/toxic_water/Group_1, /turf/open/asphalt/cement_sunbleached/cement_sunbleached18, /area/desert_dam/exterior/valley/south_valley_dam) +"qTv" = ( +/obj/structure/flora/bush/desert/cactus{ + icon_state = "cactus_8" + }, +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/desert/dirt, +/area/desert_dam/exterior/telecomm/lz1_valley) +"qTJ" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/effect/decal/sand_overlay/sand1{ + dir = 4 + }, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached3, +/area/desert_dam/exterior/valley/valley_cargo) +"qUP" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_northwest) +"qVn" = ( +/obj/effect/spawner/gibspawner/human, +/obj/effect/decal/cleanable/blood{ + icon_state = "gib6"; + pixel_y = 12 + }, +/turf/open/floor/white, +/area/desert_dam/building/lab_northwest/west_lab_xenoflora) +"qVF" = ( +/obj/structure/flora/grass/tallgrass/desert/corner, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_security) "qVN" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal7" @@ -48850,6 +47073,19 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_medical) +"qXJ" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/desert/desert_shore/shore_edge1/east, +/area/desert_dam/exterior/river/riverside_south) +"qXK" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "xgib1"; + pixel_x = 12; + pixel_y = 16 + }, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_labs) "qXM" = ( /obj/effect/decal/sand_overlay/sand1/corner1{ dir = 1 @@ -48861,24 +47097,75 @@ /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/prison, /area/desert_dam/building/water_treatment_one/control_room) +"qYd" = ( +/obj/structure/stairs{ + dir = 1 + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached9, +/area/desert_dam/exterior/valley/valley_hydro) +"qYs" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_central_north) "qYC" = ( /obj/structure/filingcabinet, /obj/effect/landmark/objective_landmark/far, /turf/open/floor/dark2, /area/desert_dam/building/administration/archives) -"ray" = ( +"qYM" = ( +/obj/structure/platform_decoration/metal/almayer/east, /obj/effect/decal/cleanable/dirt, -/obj/structure/desertdam/decals/road_edge{ - icon_state = "road_edge_decal2" +/obj/effect/decal/sand_overlay/sand1{ + dir = 4 }, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_telecoms) +/turf/open/asphalt/cement_sunbleached, +/area/desert_dam/exterior/valley/valley_crashsite) +"qZq" = ( +/obj/effect/blocker/toxic_water/Group_2, +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/west, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_east) +"qZF" = ( +/obj/structure/barricade/wooden{ + dir = 1; + pixel_y = 7 + }, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_crashsite) "rbp" = ( /turf/open/desert/desert_shore/shore_corner1/north, /area/desert_dam/interior/caves/temple) +"rbJ" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/plating, +/area/desert_dam/interior/lab_northeast/east_lab_containment) "rbM" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached4, /area/desert_dam/exterior/telecomm/lz2_storage) +"rbV" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/corpsespawner/colonist/random, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/asteroidplating, +/area/desert_dam/exterior/valley/valley_crashsite) +"rcu" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/asphalt/cement/cement14, +/area/desert_dam/interior/dam_interior/north_tunnel) +"rdo" = ( +/obj/effect/decal/cleanable/blood{ + layer = 3 + }, +/turf/open/floor/prison/bright_clean/southwest, +/area/desert_dam/interior/lab_northeast/east_lab_security_armory) "rdW" = ( /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_hydro) @@ -48889,6 +47176,13 @@ /obj/effect/landmark/survivor_spawner, /turf/open/floor/white, /area/desert_dam/interior/dam_interior/garage) +"reE" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/asphalt/cement, +/area/desert_dam/interior/dam_interior/west_tunnel) "rfm" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/remains/human, @@ -48901,6 +47195,11 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/south_valley_dam) +"rgD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached15, +/area/desert_dam/exterior/valley/valley_security) "rgT" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -48908,6 +47207,19 @@ /obj/item/stack/yautja_rope, /turf/open/desert/rock/deep/rock4, /area/desert_dam/interior/caves/temple) +"rgU" = ( +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal2" + }, +/obj/structure/barricade/deployable{ + dir = 1 + }, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_medical) +"rhb" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/valley/valley_medical) "rjd" = ( /obj/effect/blocker/toxic_water/Group_2, /turf/open/floor/filtrationside/northwest, @@ -48923,6 +47235,20 @@ }, /turf/open/asphalt/tile, /area/desert_dam/exterior/valley/bar_valley_dam) +"rmS" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/shallow_corner, +/area/desert_dam/exterior/river/riverside_south) +"rnp" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/shallow_corner/east, +/area/desert_dam/exterior/river/riverside_east) +"rnE" = ( +/obj/item/ammo_casing/bullet, +/turf/open/floor/prison/sterile_white/west, +/area/desert_dam/building/medical/morgue) "rob" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal7" @@ -48945,10 +47271,39 @@ /obj/effect/decal/cleanable/vomit, /turf/open/floor/prison/bluecorner, /area/desert_dam/interior/dam_interior/tech_storage) +"rqJ" = ( +/obj/effect/decal/sand_overlay/sand1/corner1{ + dir = 4 + }, +/turf/open/asphalt/cement_sunbleached, +/area/desert_dam/exterior/valley/valley_security) +"rqM" = ( +/obj/item/weapon/gun/smg/mp5, +/turf/open/floor/prison/darkyellow2/northwest, +/area/desert_dam/interior/dam_interior/engine_west_wing) +"rrw" = ( +/obj/structure/stairs, +/obj/structure/platform/metal/almayer/east, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_crashsite) +"rrJ" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_east) +"rsT" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached12, +/area/desert_dam/exterior/valley/valley_telecoms) "rtW" = ( /obj/effect/blocker/toxic_water/Group_2, /turf/open/asphalt/cement_sunbleached/cement_sunbleached18, /area/desert_dam/exterior/valley/south_valley_dam) +"rtX" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/shallow_edge/southwest, +/area/desert_dam/exterior/river/riverside_south) "ruJ" = ( /obj/structure/tunnel, /turf/open/desert/dirt/rock1, @@ -48962,6 +47317,35 @@ }, /turf/open/desert/rock/deep, /area/desert_dam/interior/caves/temple) +"rvj" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood{ + icon_state = "xgib2" + }, +/turf/open/floor/prison/bright_clean/southwest, +/area/desert_dam/interior/dam_interior/engine_west_wing) +"rvG" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/filtration_a) +"rwv" = ( +/obj/structure/stairs{ + dir = 4 + }, +/obj/structure/platform/metal/almayer, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached12, +/area/desert_dam/exterior/valley/valley_cargo) +"rxO" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_2, +/obj/structure/platform/metal/almayer/north, +/turf/open/desert/desert_shore/shore_edge1/east, +/area/desert_dam/exterior/river/riverside_central_north) "rxS" = ( /obj/docking_port/stationary/trijent_elevator/occupied{ id = "trijent_lz1"; @@ -48976,6 +47360,13 @@ /obj/structure/machinery/cm_vending/sorted/tech/electronics_storage, /turf/open/floor/prison/darkyellow2/northwest, /area/desert_dam/interior/dam_interior/garage) +"rzd" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/obj/effect/decal/sand_overlay/sand1{ + dir = 4 + }, +/turf/open/asphalt/cement_sunbleached, +/area/desert_dam/exterior/valley/valley_crashsite) "rAo" = ( /obj/structure/flora/grass/tallgrass/desert, /turf/open/desert/dirt, @@ -48989,6 +47380,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/desert_dam/building/hydroponics/hydroponics_loading) +"rBa" = ( +/obj/structure/stairs{ + dir = 4 + }, +/obj/structure/platform/metal/stair_cut/platform_left, +/turf/open/asphalt/cement, +/area/desert_dam/interior/dam_interior/northwestern_tunnel) "rBr" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, /obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, @@ -49001,20 +47399,38 @@ }, /turf/open/asphalt/tile, /area/desert_dam/exterior/valley/valley_hydro) -"rCp" = ( -/obj/structure/platform/mineral/sandstone/runed, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/sandstone/runed, -/area/desert_dam/interior/caves/temple) +"rCr" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_2, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/river/riverside_east) +"rCI" = ( +/obj/effect/decal/sand_overlay/sand1{ + dir = 9 + }, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_security) "rDa" = ( /obj/structure/surface/table, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/wood, /area/desert_dam/interior/lab_northeast/east_lab_west_hallway) +"rDj" = ( +/obj/structure/holohoop{ + dir = 8 + }, +/turf/open/floor/warnwhite/east, +/area/desert_dam/exterior/valley/valley_security) "rEa" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/plating, /area/desert_dam/interior/lab_northeast/east_lab_biology) +"rEf" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/shallow_edge/southeast, +/area/desert_dam/exterior/river/riverside_central_north) "rEH" = ( /obj/structure/surface/table, /obj/effect/landmark/objective_landmark/close, @@ -49037,13 +47453,31 @@ /obj/effect/decal/sand_overlay/sand1, /turf/open/asphalt/cement_sunbleached/cement_sunbleached12, /area/desert_dam/exterior/valley/valley_hydro) +"rHb" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/shallow_corner, +/area/desert_dam/exterior/river/riverside_east) "rHw" = ( /turf/open/floor/plating, /area/desert_dam/exterior/telecomm/lz2_containers) +"rHx" = ( +/obj/structure/desertdam/decals/road_edge, +/obj/effect/decal/sand_overlay/sand1{ + dir = 4 + }, +/obj/item/prop/colony/used_flare, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_medical) "rIY" = ( /obj/structure/tunnel, /turf/open/desert/dirt/rock1, /area/desert_dam/exterior/valley/valley_hydro) +"rJl" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/desert/desert_shore/desert_shore1/west, +/area/desert_dam/exterior/river/riverside_central_south) "rJA" = ( /obj/structure/lz_sign/dam_sign, /turf/open/desert/dirt/desert_transition_edge1, @@ -49052,6 +47486,22 @@ /obj/structure/desertdam/decals/road_edge, /turf/open/asphalt, /area/desert_dam/exterior/valley/bar_valley_dam) +"rKj" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/gibspawner/xeno, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_labs) +"rKE" = ( +/obj/structure/surface/table/reinforced, +/obj/effect/landmark/objective_landmark/medium, +/obj/item/ammo_magazine/rifle, +/obj/item/ammo_magazine/rifle, +/turf/open/floor/prison/darkredfull2, +/area/desert_dam/interior/lab_northeast/east_lab_security_armory) +"rLU" = ( +/obj/structure/target, +/turf/open/floor/plating/warnplate/north, +/area/desert_dam/exterior/valley/valley_security) "rNg" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ dir = 4; @@ -49062,11 +47512,26 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor/warning, /area/desert_dam/interior/lab_northeast/east_lab_west_entrance) +"rNh" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached1, +/area/desert_dam/exterior/valley/valley_telecoms) "rOa" = ( /obj/structure/toilet, /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison/bright_clean2, /area/desert_dam/building/warehouse/breakroom) +"rOp" = ( +/obj/effect/decal/sand_overlay/sand1/corner1{ + dir = 8 + }, +/turf/open/asphalt/cement/cement4, +/area/desert_dam/exterior/valley/valley_security) +"rPc" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/desert/desert_shore/desert_shore1/east, +/area/desert_dam/exterior/valley/valley_civilian) "rPp" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -49077,13 +47542,18 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkyellow2, /area/desert_dam/interior/dam_interior/garage) -"rQQ" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 8 - }, +"rRL" = ( +/obj/structure/desertdam/decals/road_edge, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/sandstone/runed, -/area/desert_dam/interior/caves/temple) +/obj/effect/spawner/gibspawner/xeno, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_medical) +"rSs" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/desert/desert_shore/desert_shore1/west, +/area/desert_dam/exterior/river/riverside_central_north) "rTP" = ( /obj/effect/decal/warning_stripes{ icon_state = "E" @@ -49113,12 +47583,50 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, /turf/open/floor/prison, /area/desert_dam/building/mining/workshop) +"rVH" = ( +/obj/structure/stairs{ + dir = 1 + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_hydro) +"rWY" = ( +/obj/structure/desertdam/decals/road_stop{ + dir = 4; + icon_state = "stop_decal5" + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate, +/obj/item/storage/box/m94, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_medical) +"rXG" = ( +/obj/effect/decal/sand_overlay/sand1{ + dir = 10 + }, +/obj/item/prop/colony/used_flare, +/turf/open/desert/excavation/component7/southeast, +/area/desert_dam/exterior/valley/valley_crashsite) "rXI" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal8" }, /turf/open/asphalt, /area/desert_dam/exterior/valley/bar_valley_dam) +"rYa" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_northwest) +"rYL" = ( +/obj/effect/decal/sand_overlay/sand1/corner1, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached4, +/area/desert_dam/exterior/valley/valley_security) +"rZx" = ( +/obj/effect/decal/cleanable/blood, +/obj/effect/landmark/corpsespawner/engineer, +/turf/open/floor/prison/southwest, +/area/desert_dam/interior/dam_interior/tech_storage) "rZU" = ( /obj/structure/desertdam/decals/road_stop{ icon_state = "stop_decal5" @@ -49126,6 +47634,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_medical) +"sam" = ( +/obj/structure/platform/metal/almayer, +/turf/open/gm/river/desert/shallow_edge/southeast, +/area/desert_dam/exterior/valley/valley_labs) "sav" = ( /turf/open/desert/dirt/desert_transition_corner1, /area/desert_dam/exterior/landing_pad_two) @@ -49153,17 +47665,22 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/whiteyellow/west, /area/desert_dam/interior/dam_interior/garage) -"sdq" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/desert/dirt/desert_transition_edge1/north, -/area/desert_dam/exterior/telecomm/lz1_valley) +"scW" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/valley/north_valley_dam) "sdu" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood, /turf/open/floor/prison/southwest, /area/desert_dam/interior/dam_interior/primary_tool_storage) +"sei" = ( +/obj/structure/stairs{ + dir = 1 + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/asphalt/cement_sunbleached, +/area/desert_dam/exterior/valley/valley_crashsite) "ser" = ( /obj/structure/surface/table, /obj/item/ashtray/bronze{ @@ -49177,9 +47694,22 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/whiteyellow/northwest, /area/desert_dam/interior/dam_interior/garage) +"seX" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/river/riverside_south) +"sfp" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/asphalt/cement/cement3, +/area/desert_dam/interior/dam_interior/central_tunnel) "sfK" = ( /turf/open/floor/white, /area/desert_dam/interior/dam_interior/garage) +"sgc" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_northwest) "shm" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached15, /area/desert_dam/exterior/valley/south_valley_dam) @@ -49198,6 +47728,13 @@ "skB" = ( /turf/open/desert/rock, /area/desert_dam/exterior/valley/valley_hydro) +"slm" = ( +/obj/structure/barricade/sandbags, +/obj/structure/barricade/sandbags{ + dir = 4 + }, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_security) "slN" = ( /obj/effect/decal/warning_stripes{ icon_state = "E" @@ -49226,6 +47763,18 @@ /obj/effect/landmark/queen_spawn, /turf/open/floor/prison/bright_clean/southwest, /area/desert_dam/building/mining/workshop) +"sns" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/shallow_corner, +/area/desert_dam/exterior/river/riverside_south) +"snw" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/asphalt/cement, +/area/desert_dam/interior/dam_interior/south_tunnel) "snD" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal7" @@ -49233,21 +47782,33 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_hydro) -"soS" = ( +"spT" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_cargo) +"sqE" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/valley/valley_labs) +"sqJ" = ( /obj/structure/stairs{ dir = 4 }, -/obj/structure/platform{ - dir = 1 - }, +/obj/structure/platform/metal/stair_cut/platform_left, /turf/open/asphalt/tile, -/area/desert_dam/exterior/valley/valley_labs) +/area/desert_dam/exterior/valley/bar_valley_dam) "srf" = ( /obj/effect/decal/sand_overlay/sand1, /obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/asphalt/cement_sunbleached/cement_sunbleached12, /area/desert_dam/exterior/valley/valley_crashsite) +"ssw" = ( +/obj/effect/decal/sand_overlay/sand1{ + dir = 9 + }, +/turf/open/asphalt/cement_sunbleached, +/area/desert_dam/exterior/valley/valley_security) "ssy" = ( /obj/effect/decal/warning_stripes{ icon_state = "E" @@ -49261,12 +47822,34 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor/prison/bright_clean2, /area/desert_dam/interior/lab_northeast/east_lab_west_hallway) +"stQ" = ( +/obj/effect/blocker/toxic_water/Group_2, +/obj/structure/platform/metal/almayer/north, +/turf/open/desert/desert_shore/shore_corner2/west, +/area/desert_dam/exterior/river/riverside_central_north) +"sup" = ( +/obj/effect/decal/sand_overlay/sand1{ + dir = 1 + }, +/turf/open/floor/plating/warnplate/north, +/area/desert_dam/exterior/valley/valley_security) "svy" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" }, /turf/open/asphalt, /area/desert_dam/exterior/valley/south_valley_dam) +"svF" = ( +/obj/structure/stairs{ + dir = 8 + }, +/obj/structure/platform/metal/almayer, +/turf/open/asphalt/cement, +/area/desert_dam/interior/dam_interior/north_tunnel) +"svH" = ( +/obj/item/prop/colony/used_flare, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_crashsite) "swg" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/prison/bright_clean2, @@ -49277,6 +47860,10 @@ }, /turf/open/shuttle/can_surgery/red, /area/desert_dam/interior/dam_interior/hanger) +"sxU" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/desert/dirt/desert_transition_edge1/east, +/area/desert_dam/exterior/valley/valley_labs) "sye" = ( /obj/effect/decal/cleanable/blood/oil/streak, /turf/open/asphalt/cement, @@ -49288,6 +47875,14 @@ /obj/effect/decal/cleanable/liquid_fuel, /turf/open/asphalt/cement_sunbleached/cement_sunbleached4, /area/desert_dam/exterior/valley/valley_hydro) +"syU" = ( +/obj/effect/decal/sand_overlay/sand1{ + dir = 1 + }, +/obj/effect/decal/cleanable/blood, +/obj/effect/landmark/corpsespawner/security/marshal, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached16, +/area/desert_dam/exterior/valley/valley_medical) "sAm" = ( /turf/open/desert/dirt/desert_transition_edge1/north, /area/desert_dam/exterior/landing_pad_two) @@ -49297,6 +47892,13 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/landing_pad_two) +"sCJ" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/asphalt/cement/cement3, +/area/desert_dam/interior/dam_interior/central_tunnel) "sCW" = ( /obj/structure/largecrate/random/secure, /turf/open/desert/dirt, @@ -49305,12 +47907,21 @@ /obj/effect/decal/cleanable/generic, /turf/open/floor/prison/southwest, /area/desert_dam/interior/dam_interior/tech_storage) +"sDr" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/east, +/turf/open/asphalt/cement, +/area/desert_dam/interior/dam_interior/northeastern_tunnel) "sEL" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 1 }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached4, /area/desert_dam/exterior/valley/south_valley_dam) +"sEW" = ( +/obj/structure/disposalpipe/segment, +/turf/open/asphalt/cement_sunbleached, +/area/desert_dam/exterior/valley/valley_security) "sFe" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -49318,6 +47929,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_medical) +"sFO" = ( +/obj/structure/platform_decoration/metal/almayer, +/obj/effect/blocker/toxic_water, +/turf/open/desert/desert_shore/desert_shore1/east, +/area/desert_dam/exterior/river_mouth/southern) "sFQ" = ( /obj/structure/shuttle/diagonal{ icon_state = "swall_f9" @@ -49334,29 +47950,65 @@ /obj/structure/prop/dam/boulder/boulder3, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/bar_valley_dam) +"sHm" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/asphalt/cement/cement3, +/area/desert_dam/interior/dam_interior/central_tunnel) +"sIh" = ( +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal9" + }, +/obj/effect/decal/sand_overlay/sand1/corner1{ + dir = 8 + }, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_security) +"sJm" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/effect/decal/sand_overlay/sand1/corner1{ + dir = 1 + }, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached4, +/area/desert_dam/exterior/valley/valley_telecoms) +"sJA" = ( +/obj/structure/stairs{ + dir = 8 + }, +/obj/structure/platform/metal/stair_cut/platform_right, +/turf/open/asphalt/cement, +/area/desert_dam/interior/dam_interior/northeastern_tunnel) "sLx" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_hydro) +"sLN" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/west, +/turf/open/desert/desert_shore/desert_shore1, +/area/desert_dam/interior/caves/temple) "sLS" = ( /obj/structure/window/framed/bunker/reinforced, /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor/plating, /area/desert_dam/interior/lab_northeast/east_lab_west_entrance) +"sMb" = ( +/obj/structure/platform/metal/almayer, +/turf/open/gm/river/desert/shallow_edge/southwest, +/area/desert_dam/exterior/valley/valley_labs) +"sMf" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/desert/dirt/desert_transition_edge1/west, +/area/desert_dam/exterior/valley/valley_telecoms) "sMi" = ( /obj/effect/landmark/monkey_spawn, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_civilian) -"sML" = ( -/obj/structure/desertdam/decals/road_stop{ - dir = 4; - icon_state = "stop_decal5" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_medical) +"sMU" = ( +/obj/structure/stairs, +/obj/structure/platform/metal/almayer/east, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached1, +/area/desert_dam/exterior/valley/valley_northwest) "sNn" = ( /turf/open/desert/rock/deep/transition/north, /area/desert_dam/exterior/telecomm/lz1_south) @@ -49372,6 +48024,10 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/landing_pad_two) +"sOs" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached13, +/area/desert_dam/exterior/valley/valley_northwest) "sOu" = ( /obj/structure/surface/table/reinforced, /obj/structure/machinery/chem_dispenser/soda{ @@ -49381,6 +48037,10 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/grimy, /area/desert_dam/building/bar/bar) +"sPc" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/asphalt/cement_sunbleached, +/area/desert_dam/exterior/valley/valley_security) "sPL" = ( /obj/structure/closet/secure_closet/medical3{ req_access_txt = "100" @@ -49397,12 +48057,36 @@ }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached18, /area/desert_dam/exterior/landing_pad_one) +"sQU" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/desert/desert_shore/shore_edge1/north, +/area/desert_dam/exterior/river/riverside_central_south) "sRl" = ( /obj/effect/landmark/nightmare{ insert_tag = "uppcrash" }, /turf/open/desert/dirt/desert_transition_edge1/southeast, /area/desert_dam/exterior/valley/valley_hydro) +"sRO" = ( +/obj/structure/stairs{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/platform/metal/stair_cut/platform_left, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached4, +/area/desert_dam/exterior/valley/valley_northwest) +"sTa" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/ammo_magazine/smg/mp5, +/turf/open/floor/prison/southwest, +/area/desert_dam/interior/dam_interior/engine_west_wing) +"sUb" = ( +/obj/effect/sentry_landmark/lz_2/top_left, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_cargo) "sUe" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 1 @@ -49418,6 +48102,33 @@ }, /turf/open/asphalt/tile, /area/desert_dam/exterior/landing_pad_one) +"sUV" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/plating, +/area/desert_dam/interior/lab_northeast/east_lab_containment) +"sVj" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/liquid_fuel, +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_security) +"sVD" = ( +/obj/structure/flora/grass/tallgrass/desert/corner{ + dir = 9 + }, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_security) +"sVM" = ( +/obj/structure/stairs, +/obj/structure/platform/metal/almayer/west, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached3, +/area/desert_dam/exterior/valley/valley_telecoms) +"sWs" = ( +/turf/open/floor/warnwhite, +/area/desert_dam/exterior/valley/valley_security) "sWS" = ( /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, @@ -49429,6 +48140,10 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) +"sXi" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/desert/rock/deep/transition/west, +/area/desert_dam/exterior/valley/valley_security) "sXM" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal7" @@ -49454,17 +48169,34 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/desert_dam/building/cafeteria/loading) +"sYR" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/shallow_corner/north, +/area/desert_dam/exterior/river/riverside_south) "sYU" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/prison/green/north, /area/desert_dam/building/dorms/hallway_westwing) +"sZe" = ( +/obj/effect/landmark/corpsespawner/colonist/random/burst, +/obj/structure/closet/bodybag{ + icon_state = "bodybag_open" + }, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached13, +/area/desert_dam/exterior/valley/valley_medical) "tai" = ( /obj/effect/decal/sand_overlay/sand1, /obj/effect/landmark/xeno_hive_spawn, /obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/asphalt/cement_sunbleached/cement_sunbleached12, /area/desert_dam/exterior/valley/valley_crashsite) +"taz" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, +/turf/open/asphalt/cement_sunbleached, +/area/desert_dam/exterior/valley/valley_security) "taG" = ( /obj/structure/desertdam/decals/road_stop{ dir = 1; @@ -49480,10 +48212,27 @@ /obj/structure/desertdam/decals/road_edge, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_labs) +"tbp" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/shallow, +/area/desert_dam/exterior/river/riverside_east) +"tby" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/shallow_edge/north, +/area/desert_dam/exterior/river/riverside_east) "tcB" = ( /obj/structure/machinery/camera/autoname/lz_camera, /turf/open/floor/plating, /area/desert_dam/exterior/landing_pad_two) +"tcO" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_2, +/obj/item/clothing/head/soft/ferret, +/turf/open/desert/desert_shore/shore_edge1/east, +/area/desert_dam/exterior/river/riverside_central_south) "tdf" = ( /obj/structure/surface/table, /obj/item/folder/yellow, @@ -49500,6 +48249,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/bright_clean/southwest, /area/desert_dam/building/hydroponics/hydroponics_loading) +"thm" = ( +/obj/structure/powerloader_wreckage, +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/landmark/corpsespawner/colonist/random, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_labs) "thp" = ( /obj/effect/blocker/toxic_water/Group_1, /obj/item/stack/sheet/wood/medium_stack, @@ -49509,10 +48264,18 @@ /obj/structure/flora/grass/desert/heavygrass_4, /turf/open/desert/dirt, /area/desert_dam/exterior/telecomm/lz2_storage) +"tjR" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/asphalt/cement/cement3, +/area/desert_dam/interior/dam_interior/north_tunnel) "tjX" = ( /obj/structure/flora/grass/desert/lightgrass_3, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_hydro) +"tkA" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/desert/dirt/desert_transition_edge1/northeast, +/area/desert_dam/exterior/valley/valley_crashsite) "tlh" = ( /obj/effect/decal/sand_overlay/sand1, /obj/structure/desertdam/decals/road_edge{ @@ -49520,6 +48283,28 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/landing_pad_two) +"tlj" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/shallow_corner, +/area/desert_dam/exterior/river/riverside_east) +"tlo" = ( +/obj/effect/decal/sand_overlay/sand1/corner1{ + dir = 4 + }, +/obj/effect/decal/sand_overlay/sand1/corner1{ + dir = 1 + }, +/obj/effect/decal/cleanable/blood/gibs/xeno, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_crashsite) +"tna" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/effect/decal/sand_overlay/sand1{ + dir = 1 + }, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached4, +/area/desert_dam/exterior/valley/valley_cargo) "tni" = ( /obj/effect/decal/sand_overlay/sand1, /turf/open/asphalt/tile, @@ -49533,6 +48318,55 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_hydro) +"toc" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/shallow_edge/west, +/area/desert_dam/exterior/river/riverside_central_north) +"toK" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/desert/desert_shore/shore_edge1, +/area/desert_dam/exterior/river/riverside_south) +"toR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/corpsespawner/wygoon, +/obj/effect/decal/cleanable/blood, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_medical) +"tpx" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/asphalt/cement/cement1, +/area/desert_dam/interior/dam_interior/north_tunnel) +"tpJ" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/machinery/light, +/turf/open/asphalt/cement/cement4, +/area/desert_dam/interior/dam_interior/northwestern_tunnel) +"tqf" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/desert/desert_shore/shore_edge1, +/area/desert_dam/exterior/river/riverside_east) +"tqw" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/prop/colony/used_flare, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_medical) +"trg" = ( +/obj/effect/landmark/static_comms/net_one, +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/desert/dirt/rock1, +/area/desert_dam/exterior/telecomm/lz1_valley) +"trw" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_south) "trP" = ( /obj/structure/prop/dam/boulder/boulder1, /turf/open/desert/dirt, @@ -49544,6 +48378,17 @@ "tsL" = ( /turf/open/asphalt/tile, /area/desert_dam/exterior/telecomm/lz2_storage) +"tsN" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/desert/desert_shore/shore_corner2/west, +/area/desert_dam/exterior/river/riverside_south) +"tux" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/shallow_edge/west, +/area/desert_dam/exterior/river/riverside_central_south) "tuA" = ( /obj/structure/closet/secure_closet/bar, /obj/effect/landmark/objective_landmark/close, @@ -49555,6 +48400,16 @@ }, /turf/open/floor/prison/bright_clean/southwest, /area/desert_dam/interior/dam_interior/garage) +"twF" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached9, +/area/desert_dam/exterior/valley/valley_northwest) +"twN" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_south) "txr" = ( /turf/open/desert/dirt/desert_transition_corner1/east, /area/desert_dam/exterior/landing_pad_one) @@ -49568,12 +48423,25 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison/bright_clean2/southwest, /area/desert_dam/building/security/staffroom) +"tya" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/shallow, +/area/desert_dam/exterior/river/riverside_central_south) "tyc" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal4" }, /turf/open/asphalt, /area/desert_dam/exterior/valley/bar_valley_dam) +"tyY" = ( +/obj/effect/sentry_landmark/lz_2/bottom_left, +/turf/open/asphalt, +/area/desert_dam/exterior/landing_pad_two) +"tAo" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached17, +/area/desert_dam/exterior/valley/valley_northwest) "tAs" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached18, /area/desert_dam/exterior/valley/valley_telecoms) @@ -49603,6 +48471,23 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/floor/wood, /area/desert_dam/building/dorms/hallway_westwing) +"tDs" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/shallow_edge/east, +/area/desert_dam/exterior/river/riverside_south) +"tDG" = ( +/obj/effect/decal/sand_overlay/sand1{ + dir = 4 + }, +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/asphalt/cement_sunbleached, +/area/desert_dam/exterior/valley/valley_telecoms) +"tDV" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/desert/desert_shore/desert_shore1/north, +/area/desert_dam/exterior/river/riverside_east) "tEn" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ dir = 4; @@ -49612,11 +48497,20 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor/prison/bright_clean2, /area/desert_dam/interior/lab_northeast/east_lab_east_entrance) +"tEM" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/asphalt/cement, +/area/desert_dam/interior/dam_interior/north_tunnel) "tFi" = ( /obj/effect/decal/sand_overlay/sand2, /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/asphalt/cement_sunbleached/cement_sunbleached12, /area/desert_dam/interior/caves/central_caves) +"tFD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/corpsespawner/doctor, +/turf/open/floor/prison/whitegreencorner/north, +/area/desert_dam/building/medical/lobby) "tFG" = ( /obj/structure/machinery/light{ dir = 1 @@ -49634,6 +48528,24 @@ /obj/effect/decal/remains/human, /turf/open/desert/rock, /area/desert_dam/interior/caves/temple) +"tGe" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform/metal/almayer, +/obj/structure/machinery/light, +/turf/open/asphalt/cement, +/area/desert_dam/interior/dam_interior/northwestern_tunnel) +"tIQ" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_central_north) +"tJc" = ( +/obj/effect/decal/cleanable/blood{ + dir = 4; + icon_state = "gib6" + }, +/turf/open/floor/dark2, +/area/desert_dam/interior/lab_northeast/east_lab_west_entrance) "tKQ" = ( /turf/open/desert/dirt/rock1, /area/desert_dam/exterior/valley/valley_crashsite) @@ -49644,12 +48556,21 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/prison/sterile_white, /area/desert_dam/building/dorms/pool) +"tLb" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/asphalt/cement, +/area/desert_dam/interior/dam_interior/northeastern_tunnel) "tLo" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 10 }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached14, /area/desert_dam/exterior/valley/bar_valley_dam) +"tLD" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/desert/desert_shore/shore_edge1/east, +/area/desert_dam/exterior/river/riverside_south) "tLQ" = ( /obj/structure/surface/rack, /obj/effect/landmark/objective_landmark/medium, @@ -49665,31 +48586,83 @@ name = "reinforced metal wall" }, /area/desert_dam/building/mining/workshop) +"tOa" = ( +/turf/open/desert/rock/deep/transition/west, +/area/desert_dam/exterior/valley/valley_security) +"tOb" = ( +/obj/structure/stairs{ + dir = 1 + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached2, +/area/desert_dam/exterior/valley/valley_hydro) "tOj" = ( /turf/open/desert/dirt/desert_transition_edge1/southwest, /area/desert_dam/exterior/telecomm/lz1_xenoflora) -"tPP" = ( -/obj/structure/platform, -/turf/open/desert/dirt, -/area/desert_dam/exterior/telecomm/lz1_valley) +"tPs" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/valley/valley_medical) +"tPz" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached4, +/area/desert_dam/exterior/valley/valley_security) +"tPQ" = ( +/obj/effect/landmark/corpsespawner/wygoon/lead, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison/blue, +/area/desert_dam/interior/lab_northeast/east_lab_RND) "tQR" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/closed/wall/r_wall/bunker, /area/desert_dam/interior/lab_northeast/east_lab_west_entrance) +"tRl" = ( +/obj/item/ammo_magazine/smg/mp5, +/turf/open/floor/prison/darkyellow2, +/area/desert_dam/interior/dam_interior/engine_west_wing) +"tRT" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/desert/dirt/desert_transition_edge1/east, +/area/desert_dam/exterior/valley/valley_crashsite) "tSK" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal7" }, /turf/open/asphalt, /area/desert_dam/exterior/valley/south_valley_dam) +"tTM" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/river/riverside_south) "tUF" = ( /turf/open/desert/dirt/desert_transition_edge1/southwest, /area/desert_dam/exterior/valley/bar_valley_dam) +"tUS" = ( +/obj/effect/blocker/toxic_water/Group_2, +/obj/structure/platform/metal/almayer/north, +/turf/open/gm/river/desert/shallow, +/area/desert_dam/exterior/river/riverside_central_north) +"tVo" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/shallow, +/area/desert_dam/exterior/river/riverside_south) +"tVF" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/shallow_corner/west, +/area/desert_dam/exterior/river/riverside_south) "tVX" = ( /obj/structure/sink, /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison/sterile_white/west, /area/desert_dam/building/bar/bar_restroom) +"tWp" = ( +/obj/effect/decal/sand_overlay/sand1{ + dir = 4 + }, +/turf/open/asphalt/cement_sunbleached, +/area/desert_dam/exterior/valley/valley_security) "tXS" = ( /turf/open/desert/dirt/desert_transition_edge1/north, /area/desert_dam/exterior/valley/south_valley_dam) @@ -49698,6 +48671,24 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/plating, /area/desert_dam/building/cafeteria/backroom) +"tYW" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform/metal/almayer, +/turf/open/floor/plating, +/area/desert_dam/interior/lab_northeast/east_lab_containment) +"tZk" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/shallow_edge/northwest, +/area/desert_dam/exterior/river/riverside_east) +"tZG" = ( +/obj/structure/barricade/sandbags, +/obj/structure/barricade/sandbags{ + dir = 4 + }, +/obj/effect/decal/sand_overlay/sand1, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_security) "tZQ" = ( /turf/closed/wall/r_wall, /area/desert_dam/exterior/rock) @@ -49705,6 +48696,24 @@ /obj/structure/flora/grass/tallgrass/desert, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_hydro) +"uaW" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/river/riverside_south) +"ubH" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/desert/rock, +/area/desert_dam/exterior/valley/valley_crashsite) +"ucq" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/desert/desert_shore/desert_shore1, +/area/desert_dam/exterior/river/riverside_east) +"ucG" = ( +/obj/effect/landmark/corpsespawner/scientist, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison/whitepurple/north, +/area/desert_dam/interior/lab_northeast/east_lab_central_hallway) "ucS" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal2" @@ -49714,11 +48723,32 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/landing_pad_one) +"udm" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/desert/dirt/desert_transition_corner1/east, +/area/desert_dam/exterior/valley/valley_cargo) +"uef" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate/green, +/obj/item/ammo_magazine/revolver/cmb, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_medical) "uez" = ( /turf/closed/wall/hangar{ name = "reinforced metal wall" }, /area/desert_dam/interior/dam_interior/garage) +"ueI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/item/ammo_magazine/rifle, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_medical) "ueS" = ( /turf/open/asphalt/cement/cement12, /area/desert_dam/exterior/telecomm/lz1_south) @@ -49735,13 +48765,36 @@ "ufW" = ( /turf/closed/wall/mineral/sandstone/runed, /area/desert_dam/exterior/rock) +"ugw" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/desert/rock, +/area/desert_dam/exterior/valley/valley_crashsite) +"ugJ" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/shallow_edge/west, +/area/desert_dam/exterior/river/riverside_central_south) "uhf" = ( /turf/open/desert/desert_shore/desert_shore1/north, /area/desert_dam/interior/caves/temple) +"uhC" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_south) "uic" = ( /obj/structure/machinery/colony_floodlight, /turf/open/desert/dirt, /area/desert_dam/exterior/landing_pad_two) +"uif" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/filtration_a) +"uiq" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/river/riverside_east) "uis" = ( /obj/effect/decal/sand_overlay/sand1, /turf/open/asphalt/cement_sunbleached/cement_sunbleached18, @@ -49750,11 +48803,31 @@ /obj/structure/machinery/colony_floodlight, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/south_valley_dam) +"uiM" = ( +/obj/structure/platform/metal/almayer, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/river/riverside_east) "ujl" = ( /obj/structure/closet/secure_closet/security, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison/darkred2/northeast, /area/desert_dam/interior/lab_northeast/east_lab_security_armory) +"ujr" = ( +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal3" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_security) +"ujV" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/asphalt/cement, +/area/desert_dam/interior/dam_interior/central_tunnel) +"ukD" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/desert/desert_shore/desert_shore1/north, +/area/desert_dam/exterior/river/riverside_south) "ukQ" = ( /obj/structure/machinery/light{ dir = 8 @@ -49763,6 +48836,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkyellow2/west, /area/desert_dam/interior/dam_interior/garage) +"ulc" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/asphalt/cement, +/area/desert_dam/interior/dam_interior/central_tunnel) "ulg" = ( /turf/open/desert/dirt/desert_transition_edge1/north, /area/desert_dam/exterior/telecomm/lz2_storage) @@ -49779,6 +48856,15 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/south_valley_dam) +"umU" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/desert/desert_shore/desert_shore1/west, +/area/desert_dam/exterior/river/riverside_central_north) +"upP" = ( +/obj/effect/spawner/gibspawner/xeno, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_medical) "urC" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal9" @@ -49795,6 +48881,13 @@ /obj/item/weapon/broken_bottle, /turf/open/desert/rock/deep/rock4, /area/desert_dam/interior/caves/temple) +"usN" = ( +/obj/effect/decal/sand_overlay/sand1{ + dir = 4 + }, +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached3, +/area/desert_dam/exterior/valley/valley_cargo) "ute" = ( /obj/structure/desertdam/decals/road_stop{ icon_state = "stop_decal5" @@ -49803,14 +48896,28 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_medical) +"utf" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/asphalt/cement, +/area/desert_dam/interior/dam_interior/south_tunnel) "uty" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_labs) +"uuv" = ( +/obj/structure/stairs, +/obj/structure/platform/metal/almayer/west, +/obj/effect/decal/cleanable/dirt, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached3, +/area/desert_dam/exterior/valley/valley_crashsite) "uvf" = ( /turf/open/desert/dirt, /area/desert_dam/exterior/telecomm/lz1_xenoflora) +"uvg" = ( +/obj/effect/spawner/gibspawner/xeno, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_crashsite) "uvh" = ( /obj/structure/toilet{ dir = 4 @@ -49832,11 +48939,30 @@ "uAo" = ( /turf/open/desert/dirt/desert_transition_edge1/north, /area/desert_dam/exterior/valley/valley_hydro) +"uAT" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_central_north) +"uBl" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/shallow_edge/north, +/area/desert_dam/exterior/river/riverside_east) "uBP" = ( /obj/structure/surface/rack, /obj/item/tool/pickaxe, /turf/open/desert/rock, /area/desert_dam/interior/caves/central_caves) +"uCV" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/desert/rock, +/area/desert_dam/exterior/valley/valley_crashsite) +"uDJ" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_cargo) "uFX" = ( /turf/open/asphalt/cement_sunbleached, /area/desert_dam/exterior/valley/valley_hydro) @@ -49855,37 +48981,64 @@ }, /turf/open/desert/dirt/dirt2, /area/desert_dam/exterior/valley/valley_crashsite) +"uHj" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_south) "uHx" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal8" }, /turf/open/asphalt, /area/desert_dam/exterior/landing_pad_one) +"uHJ" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/asphalt/cement/cement3, +/area/desert_dam/interior/dam_interior/central_tunnel) "uHT" = ( /obj/structure/machinery/camera/autoname/lz_camera, /turf/open/floor/plating, /area/desert_dam/exterior/landing_pad_one) +"uIn" = ( +/obj/structure/platform/stone/runed_sandstone/east, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/sandstone/runed, +/area/desert_dam/interior/caves/temple) "uIC" = ( /obj/structure/machinery/cm_vending/sorted/medical/no_access, /obj/structure/medical_supply_link/green, /turf/open/floor/prison/whitegreenfull/southwest, /area/desert_dam/building/medical/treatment_room) +"uJj" = ( +/obj/structure/platform/metal/almayer, +/turf/open/desert/dirt/desert_transition_edge1/east, +/area/desert_dam/exterior/telecomm/lz1_valley) "uJl" = ( /obj/structure/flora/grass/desert/lightgrass_9, /turf/open/desert/dirt, /area/desert_dam/exterior/landing_pad_one) -"uKo" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/gm/river/desert/shallow, -/area/desert_dam/interior/caves/temple) +"uKX" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/stairs, +/obj/structure/platform/metal/almayer/east, +/obj/structure/disposalpipe/segment, +/turf/open/asphalt/cement/cement1, +/area/desert_dam/interior/dam_interior/central_tunnel) "uLr" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/delivery, /area/desert_dam/interior/dam_interior/south_tunnel) +"uLM" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_cargo) "uMk" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, @@ -49898,16 +49051,24 @@ }, /turf/open/desert/rock, /area/desert_dam/exterior/valley/valley_crashsite) +"uMu" = ( +/obj/structure/stairs, +/obj/structure/platform/metal/almayer/east, +/turf/open/asphalt/cement, +/area/desert_dam/interior/dam_interior/northwestern_tunnel) "uME" = ( /obj/structure/flora/grass/desert/lightgrass_2, /turf/open/desert/dirt, /area/desert_dam/exterior/landing_pad_two) -"uMG" = ( -/obj/structure/platform{ - dir = 1 - }, +"uMJ" = ( +/obj/structure/stairs, +/obj/structure/platform/metal/almayer/west, +/turf/open/asphalt/cement/cement3, +/area/desert_dam/interior/dam_interior/west_tunnel) +"uMM" = ( +/obj/structure/platform_decoration/metal/almayer/west, /turf/open/desert/dirt/dirt2, -/area/desert_dam/exterior/valley/south_valley_dam) +/area/desert_dam/exterior/river/riverside_central_north) "uMZ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -49920,6 +49081,17 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/asphalt/cement_sunbleached, /area/desert_dam/exterior/valley/valley_crashsite) +"uOC" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/shallow_edge/east, +/area/desert_dam/exterior/river/riverside_central_north) +"uPu" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/desert/desert_shore/shore_edge1/north, +/area/desert_dam/exterior/river/riverside_central_north) "uPS" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 4 @@ -49927,17 +49099,40 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/asphalt/cement_sunbleached/cement_sunbleached3, /area/desert_dam/exterior/valley/valley_civilian) +"uQO" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/desert/desert_shore/shore_corner2, +/area/desert_dam/exterior/river/riverside_east) "uRx" = ( /obj/structure/surface/table/reinforced, /turf/open/floor/prison/blue, /area/desert_dam/interior/dam_interior/tech_storage) +"uRy" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/east, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/sandstone/runed, +/area/desert_dam/interior/caves/temple) "uRz" = ( /obj/structure/flora/grass/desert/lightgrass_9, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_hydro) +"uRT" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_security) +"uRU" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_northwest) "uSv" = ( /turf/open/asphalt/tile, /area/desert_dam/exterior/landing_pad_two) +"uSS" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/desert/desert_shore/shore_corner2/west, +/area/desert_dam/exterior/river/riverside_central_south) "uTo" = ( /obj/structure/flora/grass/tallgrass/desert, /turf/open/desert/dirt, @@ -49956,6 +49151,10 @@ name = "reinforced metal wall" }, /area/desert_dam/exterior/landing_pad_two) +"uWv" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/desert/dirt/desert_transition_edge1/east, +/area/desert_dam/exterior/valley/valley_cargo) "uWT" = ( /obj/effect/decal/warning_stripes{ icon_state = "N" @@ -49967,6 +49166,12 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/asphalt/cement_sunbleached/cement_sunbleached12, /area/desert_dam/exterior/valley/valley_crashsite) +"uXM" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_central_south) "uYD" = ( /obj/effect/decal/warning_stripes{ icon_state = "N" @@ -49975,9 +49180,55 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_medical) +"uYE" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/effect/blocker/toxic_water, +/turf/open/desert/desert_shore/shore_corner2, +/area/desert_dam/exterior/river/riverside_east) "uZr" = ( /turf/open/desert/dirt/desert_transition_corner1, /area/desert_dam/exterior/landing_pad_one) +"vaz" = ( +/turf/open/desert/dirt/desert_transition_corner1/west, +/area/desert_dam/exterior/valley/valley_security) +"vbC" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/obj/item/ammo_magazine/smg/mp5, +/turf/open/floor/asteroidplating, +/area/desert_dam/exterior/valley/valley_crashsite) +"vdI" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/desert/desert_shore/desert_shore1, +/area/desert_dam/exterior/river/riverside_south) +"vdJ" = ( +/obj/structure/barricade/wooden{ + dir = 8 + }, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_crashsite) +"vdP" = ( +/turf/open/floor/plating/warnplate/northeast, +/area/desert_dam/exterior/valley/valley_security) +"vdT" = ( +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal9" + }, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_security) +"vex" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/shallow_edge/west, +/area/desert_dam/exterior/river/riverside_central_north) +"veM" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_east) "vfr" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/desert/dirt/desert_transition_corner1/east, @@ -49997,6 +49248,11 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/floor/whitegreen/west, /area/desert_dam/building/lab_northwest/west_lab_xenoflora) +"via" = ( +/obj/structure/desertdam/decals/road_edge, +/obj/effect/decal/cleanable/dirt, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_security) "vir" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -50006,6 +49262,11 @@ }, /turf/open/floor/prison/floor_plate/southwest, /area/desert_dam/interior/dam_interior/hanger) +"viJ" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/shallow_edge/west, +/area/desert_dam/exterior/river/riverside_east) "viV" = ( /obj/structure/fence, /turf/open/desert/dirt, @@ -50014,6 +49275,14 @@ /obj/structure/flora/grass/desert/lightgrass_12, /turf/open/desert/dirt, /area/desert_dam/exterior/landing_pad_one) +"vjY" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/valley/north_valley_dam) +"vlP" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/asphalt/cement, +/area/desert_dam/interior/dam_interior/north_tunnel) "vnf" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -50021,6 +49290,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_hydro) +"vny" = ( +/obj/structure/stairs{ + dir = 4 + }, +/obj/structure/platform/metal/stair_cut/platform_left, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached9, +/area/desert_dam/exterior/valley/valley_crashsite) "vph" = ( /obj/structure/tunnel, /turf/open/desert/dirt/desert_transition_edge1/east, @@ -50063,6 +49339,9 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/desert/dirt, /area/desert_dam/interior/caves/central_caves) +"vtS" = ( +/turf/open/desert/dirt/desert_transition_edge1/southwest, +/area/desert_dam/exterior/valley/valley_security) "vud" = ( /obj/effect/decal/sand_overlay/sand1, /turf/open/asphalt/tile, @@ -50071,17 +49350,31 @@ /obj/structure/machinery/colony_floodlight, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_hydro) -"vvy" = ( -/obj/structure/desertdam/decals/road_edge, -/obj/effect/decal/sand_overlay/sand1{ - dir = 4 - }, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_telecoms) +"vvI" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/shallow_edge/east, +/area/desert_dam/exterior/river/riverside_central_south) +"vvL" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/asteroidplating, +/area/desert_dam/exterior/valley/valley_crashsite) "vxt" = ( /obj/effect/landmark/survivor_spawner, /turf/open/floor/freezerfloor, /area/desert_dam/building/water_treatment_one/breakroom) +"vyJ" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/shallow_edge/north, +/area/desert_dam/exterior/river/riverside_central_south) +"vyU" = ( +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal8" + }, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_security) "vzj" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached18, /area/desert_dam/exterior/valley/valley_labs) @@ -50095,6 +49388,10 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_hydro) +"vzt" = ( +/obj/structure/platform/metal/almayer, +/turf/open/gm/river/desert/shallow_corner/east, +/area/desert_dam/exterior/valley/valley_labs) "vzw" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal2" @@ -50109,6 +49406,13 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/prison/green, /area/desert_dam/building/dorms/hallway_northwing) +"vBD" = ( +/obj/structure/stairs{ + dir = 4 + }, +/obj/structure/platform/metal/almayer, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_labs) "vBJ" = ( /obj/structure/desertdam/decals/road_edge, /obj/effect/decal/sand_overlay/sand1{ @@ -50116,6 +49420,11 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_labs) +"vCe" = ( +/obj/effect/blocker/toxic_water/Group_2, +/obj/structure/platform/metal/almayer/west, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_east) "vCE" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached4, /area/desert_dam/exterior/valley/valley_labs) @@ -50137,6 +49446,14 @@ "vEW" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached3, /area/desert_dam/exterior/telecomm/lz2_storage) +"vFz" = ( +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal4" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_medical) "vGu" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -50158,6 +49475,11 @@ "vHQ" = ( /turf/open/gm/empty, /area/shuttle/trijent_shuttle/omega) +"vIv" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/desert/desert_shore/desert_shore1/north, +/area/desert_dam/exterior/river/riverside_east) "vIx" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -50186,18 +49508,50 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, /area/desert_dam/building/hydroponics/hydroponics_loading) +"vNN" = ( +/turf/open/asphalt/cement_sunbleached/cement_sunbleached4, +/area/desert_dam/exterior/valley/valley_security) +"vNW" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/prop/colony/used_flare, +/turf/open/floor/asteroidplating, +/area/desert_dam/exterior/valley/valley_crashsite) "vOv" = ( /obj/structure/disposalpipe/segment, /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor/prison, /area/desert_dam/building/dorms/hallway_northwing) +"vOY" = ( +/turf/open/asphalt/cement_sunbleached/cement_sunbleached1, +/area/desert_dam/exterior/valley/valley_security) +"vQE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/largecrate/supply, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_medical) +"vQR" = ( +/obj/structure/platform/metal/almayer, +/turf/open/desert/desert_shore/desert_shore1, +/area/desert_dam/exterior/valley/valley_labs) +"vQV" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/shallow_edge/southwest, +/area/desert_dam/exterior/river/riverside_central_south) "vRc" = ( /obj/structure/machinery/landinglight/ds1/delayone{ dir = 4 }, /turf/open/asphalt/cement_sunbleached/cement_sunbleached15, /area/desert_dam/exterior/landing_pad_one) +"vRm" = ( +/turf/open/floor/warnwhite/southwest, +/area/desert_dam/exterior/valley/valley_security) "vSF" = ( /turf/open/desert/dirt/desert_transition_corner1/west, /area/desert_dam/exterior/telecomm/lz2_storage) @@ -50212,6 +49566,14 @@ "vTA" = ( /turf/open/desert/dirt/desert_transition_edge1/southeast, /area/desert_dam/exterior/landing_pad_two) +"vTE" = ( +/obj/structure/machinery/power/apc/no_power/west, +/obj/effect/decal/cleanable/blood{ + icon_state = "gib6"; + pixel_y = 12 + }, +/turf/open/floor/prison/blue/west, +/area/desert_dam/interior/lab_northeast/east_lab_RND) "vTR" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal4" @@ -50219,6 +49581,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_labs) +"vTY" = ( +/obj/structure/filtration/machine_96x96/distribution, +/obj/effect/blocker/toxic_water/Group_2, +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/valley/valley_mining) "vUl" = ( /obj/structure/desertdam/decals/road_edge, /obj/effect/decal/sand_overlay/sand1/corner1{ @@ -50226,6 +49595,14 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_labs) +"vXF" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_security) "vYZ" = ( /obj/structure/surface/rack, /obj/item/tool/pickaxe/drill, @@ -50245,9 +49622,37 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_hydro) +"waY" = ( +/turf/open/floor/plating/warnplate/west, +/area/desert_dam/exterior/valley/valley_security) +"wbk" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/asphalt/cement/cement3, +/area/desert_dam/interior/dam_interior/central_tunnel) +"wbm" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_2, +/obj/effect/landmark/nightmare{ + insert_tag = "green-east-bridge" + }, +/turf/open/desert/desert_shore/desert_shore1, +/area/desert_dam/exterior/river/riverside_east) +"wbq" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/obj/effect/decal/cleanable/blood{ + icon_state = "xgib1" + }, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_medical) "wbv" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached2, /area/desert_dam/exterior/valley/valley_crashsite) +"wbJ" = ( +/obj/structure/platform/metal/almayer, +/turf/open/asphalt/cement, +/area/desert_dam/interior/dam_interior/northeastern_tunnel) "wcc" = ( /obj/effect/decal/warning_stripes{ icon_state = "N" @@ -50257,6 +49662,47 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_medical) +"wco" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/shallow, +/area/desert_dam/exterior/river/riverside_central_south) +"wcZ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/sentry_landmark/lz_2/bottom_right, +/turf/open/asphalt, +/area/desert_dam/exterior/landing_pad_two) +"wde" = ( +/obj/effect/decal/sand_overlay/sand1{ + dir = 4 + }, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_security) +"wfl" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/river/riverside_central_south) +"wft" = ( +/obj/structure/stairs{ + dir = 1 + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached9, +/area/desert_dam/exterior/valley/valley_medical) +"wfA" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/asphalt/cement/cement1, +/area/desert_dam/interior/dam_interior/west_tunnel) +"wfL" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/asphalt/cement/cement1, +/area/desert_dam/interior/dam_interior/west_tunnel) "wgi" = ( /obj/structure/desertdam/decals/road_edge, /turf/open/asphalt, @@ -50280,6 +49726,28 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/floor_marked/southwest, /area/desert_dam/building/cafeteria/loading) +"wjR" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/structure/disposalpipe/segment, +/turf/open/asphalt/cement, +/area/desert_dam/interior/dam_interior/south_tunnel) +"wla" = ( +/obj/structure/stairs, +/obj/structure/platform/metal/almayer/east, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached15, +/area/desert_dam/exterior/valley/south_valley_dam) +"wlz" = ( +/turf/open/asphalt/cement_sunbleached/cement_sunbleached15, +/area/desert_dam/exterior/valley/valley_security) +"wmo" = ( +/obj/effect/decal/sand_overlay/sand1, +/turf/open/asphalt/cement/cement4, +/area/desert_dam/exterior/valley/valley_security) +"wnw" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/desert/desert_shore/shore_corner2, +/area/desert_dam/exterior/river/riverside_south) "wnE" = ( /obj/structure/closet/crate/hydroponics/prespawned, /obj/effect/landmark/objective_landmark/close, @@ -50289,6 +49757,11 @@ /obj/effect/decal/cleanable/dirt, /turf/closed/wall/r_wall/bunker, /area/desert_dam/interior/dam_interior/garage) +"woL" = ( +/obj/structure/platform_decoration/metal/almayer, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/shallow_edge, +/area/desert_dam/exterior/river/riverside_east) "wpr" = ( /obj/effect/decal/sand_overlay/sand1, /turf/open/asphalt/tile, @@ -50297,15 +49770,10 @@ /obj/structure/flora/grass/desert/lightgrass_6, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_hydro) -"wqM" = ( -/obj/structure/desertdam/decals/road_edge{ - icon_state = "road_edge_decal9" - }, -/obj/effect/decal/sand_overlay/sand1/corner1{ - dir = 8 - }, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_telecoms) +"wqR" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/asphalt/cement, +/area/desert_dam/interior/dam_interior/northwestern_tunnel) "wrk" = ( /obj/structure/surface/table, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, @@ -50318,6 +49786,18 @@ }, /turf/closed/wall/rock/orange, /area/desert_dam/exterior/rock) +"wrz" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/asphalt/cement/cement12, +/area/desert_dam/interior/dam_interior/west_tunnel) +"wrG" = ( +/turf/open/desert/dirt/desert_transition_edge1/east, +/area/desert_dam/exterior/valley/valley_security) +"wrV" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_central_north) "wsD" = ( /obj/structure/bed/chair{ dir = 1 @@ -50330,26 +49810,77 @@ }, /turf/open/shuttle/can_surgery/red, /area/desert_dam/interior/dam_interior/hanger) +"wtc" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/shallow, +/area/desert_dam/exterior/river/riverside_central_north) +"wtr" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/river/riverside_east) +"wtu" = ( +/obj/structure/platform_decoration/stone/runed_sandstone, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/sandstone/runed, +/area/desert_dam/interior/caves/temple) "wud" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/whiteyellow/east, /area/desert_dam/interior/dam_interior/garage) -"wuC" = ( -/obj/structure/desertdam/decals/road_edge, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_telecoms) "wuV" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal5" }, /turf/open/asphalt, /area/desert_dam/exterior/landing_pad_one) +"wvx" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/desert/desert_shore/shore_corner2/north, +/area/desert_dam/exterior/river/riverside_east) +"wxc" = ( +/obj/effect/decal/sand_overlay/sand1/corner1{ + dir = 4 + }, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached1, +/area/desert_dam/exterior/valley/valley_security) +"wxg" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/shallow_edge/southwest, +/area/desert_dam/exterior/river/riverside_south) +"wxp" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/obj/structure/platform/metal/almayer, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/river/riverside_east) +"wxv" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_security) +"wxH" = ( +/obj/structure/stairs{ + dir = 1 + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_crashsite) "wya" = ( /obj/effect/decal/warning_stripes{ icon_state = "N" }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_hydro) +"wyh" = ( +/obj/effect/decal/sand_overlay/sand1, +/obj/effect/decal/cleanable/dirt, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_security) "wyo" = ( /turf/open/desert/desert_shore/desert_shore1/west, /area/desert_dam/interior/caves/temple) @@ -50368,11 +49899,21 @@ }, /turf/open/asphalt, /area/desert_dam/interior/dam_interior/south_tunnel) -"wAP" = ( -/obj/structure/desertdam/decals/road_edge{ - icon_state = "road_edge_decal9" - }, -/turf/open/asphalt, +"wzS" = ( +/obj/effect/decal/sand_overlay/sand1/corner1, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached12, +/area/desert_dam/exterior/valley/valley_security) +"wAN" = ( +/obj/structure/flora/grass/desert/lightgrass_9, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_security) +"wCd" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/desert/desert_shore/shore_edge1/west, +/area/desert_dam/exterior/valley/valley_labs) +"wDx" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached3, /area/desert_dam/exterior/valley/valley_telecoms) "wDC" = ( /obj/structure/prop/dam/large_boulder/boulder1, @@ -50381,21 +49922,70 @@ "wEy" = ( /turf/open/desert/dirt/desert_transition_corner1/north, /area/desert_dam/exterior/landing_pad_one) +"wEQ" = ( +/obj/item/ammo_casing/bullet, +/turf/open/floor/prison/bright_clean2/southwest, +/area/desert_dam/building/medical/morgue) "wFv" = ( /obj/structure/surface/table/reinforced, /turf/open/floor/prison/whitered/west, /area/desert_dam/building/medical/office1) +"wFU" = ( +/obj/structure/showcase{ + color = "#880808"; + desc = "A large red statue dawned in ancient armor, it stares into your soul."; + icon = 'icons/mob/humans/species/r_synthetic.dmi'; + icon_state = "Synthetic_Template"; + name = "The Titan" + }, +/obj/item/clothing/suit/armor/yautja_flavor{ + anchored = 1; + icon_state = "halfarmor7_ebony" + }, +/obj/item/clothing/shoes/yautja_flavor{ + anchored = 1; + icon_state = "y-boots4_ebony" + }, +/obj/item/clothing/mask/yautja_flavor{ + anchored = 1; + icon_state = "pred_mask12_ebony"; + unacidable = 0; + pixel_y = 9 + }, +/turf/open/floor/strata/grey_multi_tiles, +/area/desert_dam/interior/caves/temple) +"wGI" = ( +/obj/structure/stairs{ + dir = 8 + }, +/obj/structure/platform/metal/almayer, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached14, +/area/desert_dam/exterior/valley/valley_medical) +"wGR" = ( +/obj/structure/barricade/wooden{ + dir = 8 + }, +/obj/item/weapon/twohanded/spear, +/turf/open/floor/prison/southwest, +/area/desert_dam/interior/dam_interior/atmos_storage) +"wHO" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water, +/turf/open/desert/desert_shore/desert_shore1/west, +/area/desert_dam/exterior/river/riverside_east) +"wHR" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/asphalt/cement/cement15, +/area/desert_dam/interior/dam_interior/west_tunnel) "wIi" = ( /obj/structure/prop/dam/boulder/boulder2, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/south_valley_dam) -"wIl" = ( -/obj/structure/surface/table/reinforced, -/obj/item/ammo_magazine/shotgun/incendiary, -/obj/item/ammo_magazine/shotgun/incendiary, -/obj/effect/landmark/objective_landmark/medium, -/turf/open/floor/prison/darkredfull2, -/area/desert_dam/interior/lab_northeast/east_lab_security_armory) +"wIm" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/desert/desert_shore/shore_corner2/west, +/area/desert_dam/exterior/river/riverside_central_north) "wIr" = ( /obj/effect/decal/sand_overlay/sand1/corner1{ dir = 1 @@ -50403,6 +49993,27 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/asphalt/tile, /area/desert_dam/exterior/valley/valley_crashsite) +"wIu" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "xgib3" + }, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_medical) +"wIC" = ( +/obj/item/prop/colony/used_flare, +/turf/open/desert/dirt/desert_transition_edge1/west, +/area/desert_dam/exterior/valley/valley_crashsite) +"wKz" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/shallow, +/area/desert_dam/exterior/river/riverside_central_south) +"wKH" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_east) "wLq" = ( /obj/structure/bed/chair{ dir = 8 @@ -50424,11 +50035,24 @@ }, /turf/open/asphalt/tile, /area/desert_dam/exterior/valley/south_valley_dam) +"wMC" = ( +/turf/open/floor/warnwhite/southeast, +/area/desert_dam/exterior/valley/valley_security) +"wNc" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_central_north) "wOO" = ( /obj/structure/surface/rack, /obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison/bright_clean/southwest, /area/desert_dam/building/mining/workshop) +"wOX" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/desert/desert_shore/desert_shore1, +/area/desert_dam/exterior/river/riverside_south) "wPb" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 4 @@ -50461,6 +50085,9 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, /area/desert_dam/building/hydroponics/hydroponics_loading) +"wRl" = ( +/turf/open/asphalt/cement_sunbleached/cement_sunbleached12, +/area/desert_dam/exterior/valley/valley_security) "wRR" = ( /obj/structure/flora/grass/desert/lightgrass_1, /turf/open/desert/dirt, @@ -50468,6 +50095,13 @@ "wRX" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached2, /area/desert_dam/exterior/valley/valley_hydro) +"wTj" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/obj/effect/decal/sand_overlay/sand1{ + dir = 4 + }, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_northwest) "wTP" = ( /obj/structure/closet/crate, /obj/item/stack/sheet/mineral/phoron{ @@ -50484,6 +50118,25 @@ /obj/item/storage/briefcase/inflatable, /turf/open/floor/prison/southwest, /area/desert_dam/interior/dam_interior/atmos_storage) +"wUA" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water, +/turf/open/gm/river/desert/shallow_corner/north, +/area/desert_dam/exterior/river_mouth/southern) +"wVA" = ( +/obj/effect/decal/sand_overlay/sand1/corner1{ + dir = 8 + }, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_security) +"wVY" = ( +/obj/structure/desertdam/decals/road_stop{ + dir = 1; + icon_state = "stop_decal5" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_security) "wYO" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, /obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, @@ -50498,36 +50151,32 @@ /obj/structure/machinery/recharge_station, /turf/open/floor/prison, /area/desert_dam/building/substation/west) -"xaB" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_medical) "xbj" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal10" }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_hydro) +"xbs" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_central_south) "xbA" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal12" }, /turf/open/asphalt, /area/desert_dam/exterior/landing_pad_one) -"xcG" = ( -/obj/structure/desertdam/decals/road_edge{ - icon_state = "road_edge_decal3" +"xbO" = ( +/obj/structure/filtration/collector_pipes{ + icon_state = "upper_2" }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_telecoms) +/obj/structure/platform/metal/almayer/north, +/obj/effect/blocker/toxic_water, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/filtration_a) "xdj" = ( /obj/structure/flora/grass/desert/lightgrass_5, /turf/open/desert/dirt, @@ -50537,6 +50186,23 @@ /obj/structure/tunnel, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_civilian) +"xex" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/shallow, +/area/desert_dam/exterior/river/riverside_central_south) +"xeF" = ( +/obj/structure/stairs{ + dir = 4 + }, +/obj/structure/platform/metal/stair_cut/platform_left, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached9, +/area/desert_dam/exterior/valley/valley_hydro) +"xfg" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/shallow_corner/west, +/area/desert_dam/exterior/river/riverside_south) "xgA" = ( /obj/structure/flora/grass/tallgrass/desert/corner{ dir = 5 @@ -50549,6 +50215,11 @@ }, /turf/open/desert/rock, /area/desert_dam/exterior/valley/valley_wilderness) +"xhS" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/shallow, +/area/desert_dam/exterior/river/riverside_south) "xhZ" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal5" @@ -50590,12 +50261,25 @@ /obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/plating, /area/desert_dam/exterior/telecomm/lz2_storage) +"xkS" = ( +/obj/structure/stairs{ + dir = 1 + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/north_valley_dam) "xls" = ( /obj/effect/decal/sand_overlay/sand1/corner1{ dir = 8 }, /turf/open/asphalt/tile, /area/desert_dam/exterior/valley/valley_labs) +"xlt" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/stairs, +/obj/structure/platform/metal/almayer/east, +/turf/open/asphalt/cement/cement1, +/area/desert_dam/interior/dam_interior/west_tunnel) "xlE" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ dir = 4; @@ -50606,14 +50290,27 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor/warning/north, /area/desert_dam/interior/lab_northeast/east_lab_west_entrance) +"xmo" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/shallow_edge/northeast, +/area/desert_dam/exterior/river/riverside_central_north) "xmH" = ( /obj/effect/decal/cleanable/dirt, /turf/open/desert/rock/deep/rock4, /area/desert_dam/interior/caves/temple) +"xnO" = ( +/obj/structure/platform/metal/almayer, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/river/riverside_central_south) "xof" = ( /obj/effect/decal/sand_overlay/sand1, /turf/open/asphalt/tile, /area/desert_dam/exterior/valley/valley_labs) +"xov" = ( +/obj/structure/tunnel, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_security) "xoL" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -50626,6 +50323,11 @@ name = "reinforced metal wall" }, /area/desert_dam/exterior/valley/valley_hydro) +"xpg" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/desert/desert_shore/desert_shore1/east, +/area/desert_dam/exterior/river/riverside_central_north) "xpj" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3" @@ -50636,6 +50338,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt/cement_sunbleached, /area/desert_dam/exterior/valley/valley_hydro) +"xqV" = ( +/obj/effect/blocker/toxic_water/Group_2, +/obj/structure/platform/metal/almayer, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_east) "xrx" = ( /obj/effect/landmark/monkey_spawn, /turf/open/desert/dirt/desert_transition_edge1/northwest, @@ -50661,10 +50368,43 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/south_valley_dam) +"xsZ" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/valley/valley_medical) +"xuj" = ( +/obj/structure/stairs{ + dir = 1 + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached2, +/area/desert_dam/exterior/valley/valley_medical) "xuS" = ( /obj/effect/decal/sand_overlay/sand1, /turf/open/asphalt/cement_sunbleached/cement_sunbleached16, /area/desert_dam/exterior/valley/valley_hydro) +"xuY" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/neutral, +/area/desert_dam/interior/dam_interior/engine_room) +"xuZ" = ( +/obj/structure/flora/grass/tallgrass/desert, +/turf/open/desert/dirt, +/area/desert_dam/exterior/valley/valley_security) +"xvd" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/river/riverside_east) +"xvt" = ( +/obj/effect/sentry_landmark/lz_2/top_right, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_cargo) +"xvF" = ( +/obj/effect/blocker/toxic_water/Group_2, +/obj/structure/platform/metal/almayer/east, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_east) "xvX" = ( /obj/effect/decal/sand_overlay/sand1/corner1{ dir = 1 @@ -50677,10 +50417,6 @@ }, /turf/open/asphalt/tile, /area/desert_dam/exterior/valley/valley_hydro) -"xxQ" = ( -/obj/structure/platform, -/turf/open/desert/dirt/desert_transition_edge1/east, -/area/desert_dam/exterior/telecomm/lz1_valley) "xzc" = ( /obj/structure/surface/table, /turf/open/floor/wood, @@ -50691,6 +50427,12 @@ }, /turf/open/asphalt/tile, /area/desert_dam/exterior/valley/valley_medical) +"xzt" = ( +/obj/effect/decal/sand_overlay/sand1/corner1{ + dir = 8 + }, +/turf/open/asphalt/cement_sunbleached, +/area/desert_dam/exterior/valley/valley_security) "xBM" = ( /turf/open/desert/rock/deep/transition/northeast, /area/desert_dam/interior/caves/temple) @@ -50698,17 +50440,50 @@ /obj/effect/landmark/static_comms/net_two, /turf/open/floor/plating, /area/desert_dam/exterior/telecomm/lz2_containers) +"xDb" = ( +/obj/effect/landmark/corpsespawner/wygoon, +/obj/effect/decal/cleanable/blood{ + layer = 3 + }, +/turf/open/floor/prison/southwest, +/area/desert_dam/interior/lab_northeast/east_lab_east_entrance) +"xDn" = ( +/obj/structure/stairs{ + dir = 4 + }, +/obj/structure/platform/metal/almayer, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached15, +/area/desert_dam/exterior/valley/valley_crashsite) +"xDO" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/shallow_edge/northeast, +/area/desert_dam/exterior/river/riverside_south) "xEz" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/desert/rock, /area/desert_dam/exterior/valley/valley_crashsite) +"xEA" = ( +/obj/structure/closet/bodybag, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached13, +/area/desert_dam/exterior/valley/valley_medical) "xEP" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor/white, /area/desert_dam/interior/lab_northeast/east_lab_lobby) +"xFe" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/blocker/toxic_water, +/turf/open/desert/desert_shore/shore_corner2, +/area/desert_dam/exterior/river_mouth/southern) "xFk" = ( /turf/open/desert/dirt/desert_transition_corner1/west, /area/desert_dam/exterior/valley/valley_hydro) +"xFr" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/shallow_edge, +/area/desert_dam/exterior/river/riverside_east) "xFA" = ( /obj/effect/decal/sand_overlay/sand1, /obj/structure/disposalpipe/segment{ @@ -50717,6 +50492,12 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/asphalt/cement_sunbleached, /area/desert_dam/exterior/valley/valley_wilderness) +"xGe" = ( +/obj/effect/decal/sand_overlay/sand1{ + dir = 6 + }, +/turf/open/floor/plating/warnplate/southeast, +/area/desert_dam/exterior/valley/valley_security) "xHa" = ( /obj/effect/landmark/static_comms/net_two, /turf/open/desert/dirt, @@ -50730,9 +50511,21 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/bright_clean/southwest, /area/desert_dam/interior/dam_interior/garage) +"xHW" = ( +/obj/structure/stairs{ + dir = 4 + }, +/obj/structure/platform/metal/almayer, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached12, +/area/desert_dam/exterior/valley/valley_northwest) "xIC" = ( /turf/open/desert/dirt, /area/desert_dam/exterior/telecomm/lz2_storage) +"xJC" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/desert/desert_shore/shore_edge1, +/area/desert_dam/exterior/river/riverside_central_south) "xJG" = ( /obj/structure/surface/table, /obj/item/paper_bin, @@ -50747,6 +50540,15 @@ /obj/effect/decal/cleanable/blood/oil/streak, /turf/open/floor/prison/bright_clean/southwest, /area/desert_dam/interior/dam_interior/garage) +"xKH" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform/metal/almayer, +/turf/open/floor/plating, +/area/desert_dam/interior/lab_northeast/east_lab_containment) +"xLb" = ( +/obj/effect/decal/cleanable/blood/gibs/xeno, +/turf/open/desert/dirt/desert_transition_corner1, +/area/desert_dam/exterior/valley/valley_crashsite) "xLS" = ( /obj/structure/flora/grass/desert/lightgrass_5, /turf/open/desert/dirt, @@ -50780,11 +50582,21 @@ /obj/structure/disposalpipe/segment, /turf/open/gm/river/desert/deep, /area/desert_dam/exterior/river/riverside_east) +"xPv" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_central_south) "xPA" = ( /obj/structure/desertdam/decals/road_edge, /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_hydro) +"xQO" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_2, +/turf/open/desert/desert_shore/shore_corner2/east, +/area/desert_dam/exterior/river/riverside_east) "xRf" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/tech_supply, @@ -50803,6 +50615,15 @@ }, /turf/open/asphalt/tile, /area/desert_dam/exterior/valley/valley_labs) +"xTM" = ( +/obj/effect/landmark/corpsespawner/wygoon, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison/southwest, +/area/desert_dam/interior/lab_northeast/east_lab_RND) +"xUC" = ( +/obj/item/tool/weldingtool, +/turf/open/floor/neutral, +/area/desert_dam/interior/dam_interior/engine_room) "xUS" = ( /turf/open/desert/dirt/desert_transition_edge1/east, /area/desert_dam/exterior/landing_pad_two) @@ -50816,6 +50637,15 @@ }, /turf/open/desert/dirt, /area/desert_dam/exterior/landing_pad_one) +"xWl" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_central_north) +"xXY" = ( +/obj/structure/platform/stone/runed_sandstone/east, +/turf/open/desert/desert_shore/shore_corner1/west, +/area/desert_dam/interior/caves/temple) "xYb" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, @@ -50825,6 +50655,12 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor/glass/colony, /turf/open/floor/vault2/northeast, /area/desert_dam/building/substation/central) +"xZp" = ( +/obj/effect/decal/sand_overlay/sand1{ + dir = 10 + }, +/turf/open/asphalt/cement_sunbleached/cement_sunbleached12, +/area/desert_dam/exterior/valley/valley_security) "xZE" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3" @@ -50834,16 +50670,29 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_wilderness) -"yaA" = ( -/obj/structure/machinery/colony_floodlight, -/turf/open/desert/rock/deep/transition/west, -/area/desert_dam/exterior/valley/valley_telecoms) +"yab" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "gib6"; + pixel_y = 12 + }, +/turf/open/floor/white, +/area/desert_dam/building/lab_northwest/west_lab_xenoflora) +"yau" = ( +/obj/effect/decal/sand_overlay/sand1{ + dir = 5 + }, +/turf/open/floor/plating/warnplate/northeast, +/area/desert_dam/exterior/valley/valley_security) "ybA" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal12" }, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_labs) +"ybJ" = ( +/obj/structure/platform/metal/almayer/west, +/turf/closed/wall/r_wall/bunker/floodgate, +/area/desert_dam/exterior/valley/valley_labs) "ybW" = ( /obj/structure/desertdam/decals/road_edge, /obj/effect/decal/sand_overlay/sand1{ @@ -50851,11 +50700,19 @@ }, /turf/open/asphalt, /area/desert_dam/exterior/landing_pad_two) +"ycX" = ( +/turf/open/desert/dirt/desert_transition_edge1/north, +/area/desert_dam/exterior/valley/valley_security) "ydw" = ( /obj/structure/window/framed/hangar/reinforced, /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor/plating, /area/desert_dam/building/mining/workshop) +"ydM" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/river/riverside_central_north) "yeL" = ( /turf/closed/wall/r_wall/bunker, /area/desert_dam/exterior/telecomm/lz2_tcomms) @@ -50870,9 +50727,32 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_civilian) +"ygd" = ( +/obj/structure/stairs, +/obj/structure/platform/metal/almayer/west, +/turf/open/asphalt/tile, +/area/desert_dam/exterior/valley/valley_medical) +"yhl" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/desert/dirt/dirt2, +/area/desert_dam/exterior/valley/north_valley_dam) "yii" = ( /turf/closed/wall/r_wall/bunker, /area/desert_dam/exterior/rock) +"yiM" = ( +/obj/structure/desertdam/decals/road_edge{ + icon_state = "road_edge_decal10" + }, +/obj/structure/disposalpipe/segment, +/turf/open/asphalt, +/area/desert_dam/exterior/valley/valley_security) +"yjc" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/blocker/toxic_water/Group_1, +/turf/open/gm/river/desert/shallow_edge/west, +/area/desert_dam/exterior/river/riverside_central_south) "ykJ" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ dir = 4; @@ -50883,30 +50763,26 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor/prison/bright_clean2, /area/desert_dam/interior/lab_northeast/east_lab_west_entrance) +"ylc" = ( +/obj/structure/stairs, +/obj/structure/platform/metal/almayer/west, +/turf/open/asphalt/cement/cement3, +/area/desert_dam/interior/dam_interior/northwestern_tunnel) "ylf" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal6" }, /turf/open/asphalt, /area/desert_dam/exterior/valley/south_valley_dam) -"ylk" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/prop/dam/van, -/turf/open/asphalt, -/area/desert_dam/exterior/valley/valley_telecoms) -"yll" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/asphalt/cement, -/area/desert_dam/interior/dam_interior/south_tunnel) "ylo" = ( /obj/effect/landmark/objective_landmark/close, /turf/open/floor/freezerfloor, /area/desert_dam/building/hydroponics/hydroponics_breakroom) +"ylK" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/east, +/turf/open/desert/rock, +/area/desert_dam/exterior/valley/valley_crashsite) "ylS" = ( /obj/effect/decal/warning_stripes{ icon_state = "E" @@ -52674,8 +52550,8 @@ bPO bPO dTs dTs -cdh -cdh +gWP +gWP dTs dTs dTs @@ -52691,22 +52567,22 @@ dTs dTs dTs dTs -cfe +dZV dTs dTs dTs dTs dTs -cfe -cfe -cfe +dZV +dZV +dZV dTs dTs dTs dTs dTs dTs -cfe +dZV dTs dTs dTs @@ -52907,41 +52783,41 @@ afD afD bPO bPO -cdh -cdh -cez -cfe -cfe -cfe -cfe -cfe +gWP +gWP +mIi +dZV +dZV +dZV +dZV +dZV dTs dTs dTs -cfe -cfe -cfe +dZV +dZV +dZV dTs dTs -cfe -cxn -aRA -cez +dZV +nao +hoo +mIi dTs dTs dTs -ceA -ceA -ceA -ceA +hrM +hrM +hrM +hrM dTs dTs dTs dTs dTs -cxn -ceA -cez +nao +hrM +mIi dTs dTs dTs @@ -53141,50 +53017,50 @@ azb azs cbJ ccw -cdl -cdL -ceA -ceA -ceA -ceA -ceA -ceA -axk -ceA -ceA -ceA -ceA -ceA -ceA -ceA -ceA -ceA -ceA -ceA -ceA -ceA -ceA -ceA -ceA -ceA -ceA -ceA -ceA -dTs -ceA -ceA -ceA -ceA -ceA -ceA -cHF -cHY -cIe -ceA -ceA -ceA -ceG -beC +jKP +gRE +hrM +hrM +hrM +hrM +hrM +hrM +eCb +hrM +hrM +hrM +hrM +hrM +hrM +hrM +hrM +hrM +hrM +hrM +hrM +hrM +hrM +hrM +hrM +hrM +hrM +hrM +hrM +dTs +hrM +hrM +hrM +hrM +hrM +hrM +faT +hwX +nMQ +hrM +hrM +hrM +ycX +etD dTs dTs dTs @@ -53375,52 +53251,52 @@ bSJ bSJ cbK ccx -cdj -crO -ceB -ceB -aQI -aQI -aQI -aQI -aQI -aQI -aQI -ceB -ceB -ceB -ceB -ceB -ceB -ceB -ceB -ceB -ceB -ceB -ceB -ceB -ceB -ceB -ceB -ceB -ceB -ceB -ceB -ceB -ceB -aQI -cCM -ceA -cHV -pJW -cHY -bRG -ceA -ceA -cez -hvG -jZZ -beC +hMz +qbU +ozd +ozd +tWp +tWp +tWp +tWp +tWp +tWp +tWp +ozd +ozd +ozd +ozd +ozd +ozd +ozd +ozd +ozd +ozd +ozd +ozd +ozd +ozd +ozd +ozd +ozd +ozd +ozd +ozd +ozd +ozd +tWp +xZp +hrM +qVF +xuZ +hwX +pBc +hrM +hrM +mIi +wrG +erj +etD dTs dTs dTs @@ -53609,53 +53485,53 @@ bmy bow bqg bqg -bub -bOf -bao -bam -bam -bam -bam -bam -bam -bam -bbE -cdk -bao -bao -bao -bao -bao -bao -bao -bao -bao -bnB -aSK -aSK -bOf -bao -bao -bao -bao -bao -bao -bao -bao -bao -cCJ -cHC -cHV -pJW -cIc -ceA -ceA -ceA -ceA -ceA -cez -hvG -jZZ +gaW +eGv +fLu +lRb +lRb +lRb +lRb +lRb +lRb +lRb +rqJ +nkc +fLu +fLu +fLu +fLu +fLu +fLu +fLu +fLu +fLu +wxc +koe +koe +eGv +fLu +fLu +fLu +fLu +fLu +fLu +fLu +fLu +fLu +nSi +oJU +qVF +xuZ +sVD +hrM +hrM +hrM +hrM +hrM +mIi +wrG +erj dTs dTs dTs @@ -53843,53 +53719,53 @@ ahm cbc cbM ccw -cjO -cdL -ceA -ceA -ceA -ceA -ceA -ceA -axk -ceA -aSI -chG -ceA -ceA -ceA -ceA -ceA -ceA -ceA -ceA -ceA -bPA -aRy -aSL -cdL -ceA -ceA -ceA -ceA -ceA -ceA -ceA -ceA -ceA -ceA -cHE -cHX -cIc -cIg -bRZ -aUm -aUm -aUm -jLI -ceA -ceA -ceG +nvT +gRE +hrM +hrM +hrM +hrM +hrM +hrM +eCb +hrM +iQh +gPI +hrM +hrM +hrM +hrM +hrM +hrM +hrM +hrM +hrM +nft +vNN +wRl +gRE +hrM +hrM +hrM +hrM +hrM +hrM +hrM +hrM +hrM +hrM +hGw +iVG +sVD +kft +rCI +wde +wde +wde +jzm +hrM +hrM +ycX dTs dTs dTs @@ -54077,19 +53953,19 @@ awi awi bPO bPO -cdh -cdh -ceD -ceD -cwl -ceA -ceA -ceA -axk -ceA -aSI -chG -ceA +gWP +gWP +kAq +kAq +vtS +hrM +hrM +hrM +eCb +hrM +iQh +gPI +hrM acs acs aya @@ -54098,10 +53974,10 @@ aya aya acs acs -cjO -aTH -aTU -cjO +nvT +qrJ +wlz +nvT aTZ aUe aUe @@ -54112,24 +53988,24 @@ aUe aUe aUe aTZ -ceA -ceA -cId -ceA -bPA -bSv -bSG -bYR -beN -aUm -jLI -cez -jZZ +hrM +hrM +fLe +hrM +nft +ftF +jtm +vRm +wVA +wde +jzm +mIi +erj dTs dTs dTs dTs -cfE +fLT cfe cgm cgt @@ -54312,19 +54188,19 @@ dTs dTs dTs dTs -cdh -cdh -cff -cxk -ceA -ceA -ceA -axk -ceA -aSI -chG -ceA -hyH +gWP +gWP +gfJ +itI +hrM +hrM +hrM +eCb +hrM +iQh +gPI +hrM +xov acs aWc aWF @@ -54348,22 +54224,22 @@ bfz aTZ aTZ aTZ -ceA -ceA -bPA -bQN -bSH -bUR -cjO -cjO -cdL -ceA -ceG +hrM +hrM +nft +hlP +moc +sWs +nvT +nvT +gRE +hrM +ycX dTs dTs dTs dTs -kzQ +cKm ceA cgm cic @@ -54391,8 +54267,8 @@ cXl cuP cuP cXm -cAQ -cCO +eKu +rwv ctK dTs dTs @@ -54549,16 +54425,16 @@ dTs dTs dTs dTs -ash -axk -axk -axk -aPu -ceA -aSI -chG -ceA -ceA +oQZ +eCb +eCb +eCb +lji +hrM +iQh +gPI +hrM +hrM aya aWF aYV @@ -54582,23 +54458,23 @@ bgz bMY bgz aTZ -ceA -ceA -bPA -bQN -bSH -bUR -cjO -cjO -bYP -ceA -cez -jZZ -dTs -dTs -dTs -aIP -chv +hrM +hrM +nft +hlP +moc +sWs +nvT +nvT +lGo +hrM +mIi +erj +dTs +dTs +dTs +feG +brw cgm cgm chb @@ -54622,12 +54498,12 @@ dTs dTs dTs dTs -czw -czY -cAa -cAR -cCU -cAa +olo +qmf +spT +tna +dhv +spT dTs dTs vTA @@ -54783,16 +54659,16 @@ dTs dTs dTs dTs -cxk -ceA -ceA -ceA -ceA -ceA -aSI -chG -aUg -ceA +itI +hrM +hrM +hrM +hrM +hrM +iQh +gPI +oKH +hrM aya aWF aZj @@ -54816,23 +54692,23 @@ bgz bMZ bNK aTZ -ceA -ceA -bPA -bQN -bSH -bUR -cjO -cjO -cdL -ceA -ceA -cez -hvG +hrM +hrM +nft +hlP +moc +sWs +nvT +nvT +gRE +hrM +hrM +mIi +wrG dTs dTs bPA -kzQ +cKm ceA cgm cgm @@ -55016,17 +54892,17 @@ dTs dTs dTs dTs -wqM -vvy -vvy -oCu -ceA -aQc -ceB -aSJ -chG -ceA -ceA +sIh +kUA +kUA +qbR +hrM +ssw +ozd +fdY +gPI +hrM +hrM aya aWF aZn @@ -55050,23 +54926,23 @@ bgz bMZ bNN aTZ -ceA -ceA -bPA -bRv -bSI -bUS -bUT -cjO -cdL -ceA -ceA -ceA -ceA +hrM +hrM +nft +drJ +rDj +wMC +nhe +nvT +gRE +hrM +hrM +hrM +hrM dTs aUm emt -kzQ +cKm ceA ceA ceA @@ -55248,19 +55124,19 @@ odR arF dTs dTs -yaA -aSv -aPY -aSu -aSu -aPR -aQb -aSJ -aSK -aSK -aTJ -ceA -ceA +hnC +tOa +kiU +gpC +gpC +glL +nan +fdY +koe +koe +dhV +hrM +hrM aya aWF aZp @@ -55284,23 +55160,23 @@ bgz bMZ bNO aTZ -ceA -ceA -bPB -bRw -bSV -cjO -bUT -cjO -cdL -ceA -ceA -ceA -ceA +hrM +hrM +bxA +jCQ +bjD +nvT +nhe +nvT +gRE +hrM +hrM +hrM +hrM bPA cjO -aIT -aKb +jWz +tDG ceB ceB ceB @@ -55319,7 +55195,7 @@ aSK cwm aUh bPA -cxS +uWv crq dTs dTs @@ -55480,20 +55356,20 @@ tuC isz tuC qPl -wuC -wuC -wuC -wuC -aTl -aSu -cvr -aPR -aRy -aSK -aSK -aSL -cdL -aUh +bLH +bLH +bLH +bLH +ctJ +gpC +uRT +glL +vNN +koe +koe +wRl +gRE +mxL acs acs aWQ @@ -55518,19 +55394,19 @@ bgz bMZ bOz aTZ -ceA -ceA -ceA -ceA -bPA -bUT -bUT -bvJ -ccu -ceA -ceA -ceA -ceA +hrM +hrM +hrM +hrM +nft +nhe +nhe +oAL +eyp +hrM +hrM +hrM +hrM bPA cjO csu @@ -55553,7 +55429,7 @@ bbE gMN aUm emt -cxt +oKi crr cwB csD @@ -55714,21 +55590,21 @@ pac xKx ieU xHA -cvr -aQC -aQu -aQC -aSX -aUB -aWf -aXd -aRy -aQt -aSK -aSL -cdL -ceA -ceA +uRT +nGn +sVj +nGn +kNh +wxv +kEp +ujr +vNN +sPc +koe +wRl +gRE +hrM +hrM aya aWF aZp @@ -55752,42 +55628,42 @@ bgz bNa bgz aTZ -ceA -ceA -ceA -ceA -bPA -bUT -bUT -bXP -ceA -ceA -baz -cwl -ceA +hrM +hrM +hrM +hrM +nft +nhe +nhe +wyh +hrM +hrM +pZg +vtS +hrM bPA cjO -cFd -cgb +oLT +rNh aSK chG -chw -ciF -ciF -ciF -cmh -cos -cqG -crm -ciF -ciF -chv +oqa +fgF +fgF +fgF +jex +nkO +rsT +mFo +fgF +fgF +brw ceA aSI aSK beO -cvD -cHu +sVM +qTJ cYk cYk cRL @@ -55948,21 +55824,21 @@ ieU ieU ieU kFW -cvr -aQC -aQC -cvr -aSX -aSu -cvr -aPR -aRy -aSK -aSK -aSL -cdL -ceA -ceA +uRT +nGn +nGn +uRT +kNh +gpC +uRT +glL +vNN +koe +koe +wRl +gRE +hrM +hrM aya aWF aZr @@ -56002,20 +55878,20 @@ bNE bNE bRw bSV -cgj +ezP cey chG -cfC +osm cjO cjO cjO cjO -cex -cfp +gau +qiD cjO cjO cjO -kzQ +cKm ceA aSI aSK @@ -56182,21 +56058,21 @@ mkd ggn ghz qPl -ray -fgU -nmP -nmP -aUw -cvr -cvr -aPR -aZN -aSK -aSK -aSL -cdL -ceA -ceA +gEp +qex +iIi +iIi +vyU +uRT +uRT +glL +tPz +koe +koe +wRl +gRE +hrM +hrM aya aWF aZp @@ -56236,10 +56112,10 @@ uvh bNE dTs bPA -kzQ +cKm aSI chG -cfC +osm cjO ccm hMc @@ -56249,13 +56125,13 @@ bqd hMc aUu cjO -dGN +nvD aUm xvX aSK bqd -cFd -aKo +oLT +guc cIv cYZ cUl @@ -56265,9 +56141,9 @@ crx dlM crx crx -crx +sUb dFo -doE +lBR doE cDb cGS @@ -56416,21 +56292,21 @@ aSs aSs hAf uez -aPT -aQJ -aSj -aQJ -aTl -aUB -aWf -aXd -aZN -aQt -aSK -aSL -cdL -ceA -ceA +fAH +via +nxP +via +ctJ +wxv +kEp +ujr +tPz +sPc +koe +wRl +gRE +hrM +hrM aya aXb aWF @@ -56470,10 +56346,10 @@ cdJ bNE dTs bPA -kzQ +cKm aSI chG -cfC +osm cjO tAs cjK @@ -56482,14 +56358,14 @@ cmi cmi crn aRy -cvD -cxv +sVM +wDx beO aSK aSL cjO cjO -cxt +oKi cJx cYZ cUl @@ -56650,20 +56526,20 @@ aSt aSt iCw uez -aPY -cvr -aQC -ljO -aSX -aQC -cvr -aXd -aZN -aQt -aSK -aSL -cdL -ceA +kiU +uRT +nGn +pmT +kNh +nGn +uRT +ujr +tPz +sPc +koe +wRl +gRE +hrM act act aoj @@ -56704,10 +56580,10 @@ cdN bNE dTs emt -kzQ +cKm aSI chG -cfC +osm cjO tAs ckr @@ -56722,8 +56598,8 @@ aSK aSK aSK beO -cvD -aKq +sVM +usN cBU cYZ dlb @@ -56884,20 +56760,20 @@ ylT glz iCw uez -aPY -aQC -aQC -cvr -aSX -aSu -aSu -aPR -aRy -aQt -aSK -aSL -cdL -ceA +kiU +nGn +nGn +uRT +kNh +gpC +gpC +glL +vNN +sPc +koe +wRl +gRE +hrM act ayw aXz @@ -56938,10 +56814,10 @@ cdN bNE dTs cjO -kzQ +cKm aSI chG -cfC +osm cjO tAs ckr @@ -56950,8 +56826,8 @@ cmj cmj csj aTH -cFd -cgb +oLT +rNh bqd aSK aSK @@ -57118,20 +56994,20 @@ uez aSt gLb uez -lop -fgU -jXv -jXv -aUw -aUM -aWf -aXd -aRy -aQt -aQt -aSL -beN -aUm +lPb +qex +esJ +esJ +vyU +ftK +kEp +ujr +vNN +sPc +sPc +wRl +wVA +wde aoj aND aVp @@ -57172,10 +57048,10 @@ bcM bNE dTs cjO -cgk -cew -cfo -chC +odj +sJm +fpX +iQG cjO tAs ckr @@ -57185,13 +57061,13 @@ crg csj cjO cjO -ctz -ctE +eXT +meb aTH bqd bqd -cFd -cHv +oLT +esf cIv cYZ cUl @@ -57352,20 +57228,20 @@ ixe scv scv uez -wAP -aQJ -aQJ -aQJ -aTl -aQC -aSu -aPR -aRy -aSK -aQQ -aSK -beO -aUu +vdT +via +via +via +ctJ +nGn +gpC +glL +vNN +koe +iiU +koe +nZl +eWo aqA aSU aSU @@ -57407,8 +57283,8 @@ bNE dTs cjO cjO -cex -cfp +gau +qiD cjO cjO tAs @@ -57420,12 +57296,12 @@ csj bvJ bRw bSV -cgj +ezP bRw bRw bRw bSV -cxt +oKi cJx cYZ cUl @@ -57433,11 +57309,11 @@ crx crx crx dlM -crx +sUb crx crx dFo -doE +ozv doE alh cMC @@ -57586,20 +57462,20 @@ rdX pzd sfK ebZ -aPY -aQC -aQE -aSu -aSV -aSu -ylk -xcG -aZN -aQt -aQt -aQt -aQQ -aTK +kiU +nGn +kJa +gpC +qDX +gpC +jNX +jMZ +tPz +sPc +sPc +sPc +iiU +rgD art art art @@ -57654,12 +57530,12 @@ csj cdL ceA bPA -kzQ +cKm aUh ceA ceA bPA -cxt +oKi cJx cYZ dlb @@ -57669,7 +57545,7 @@ cMJ cUk crx crx -crx +xvt dFo doE doE @@ -57685,7 +57561,7 @@ cDX cDX cDX cDX -cDX +qeG cDX cDX cDX @@ -57820,20 +57696,20 @@ wsD sfK sfK pGF -aPY -cvr -cvr -aQC -aTP -aUM -aWf -aXd -aZN -aSK -aQQ -aQt -aSL -cjO +kiU +uRT +uRT +nGn +wVY +ftK +kEp +ujr +tPz +koe +iiU +sPc +wRl +nvT aoj aUf aVp @@ -57888,12 +57764,12 @@ cso cdL ceA bPA -kzQ +cKm ceA ceA bRZ emt -cxt +oKi cyG cfq cMM @@ -57928,7 +57804,7 @@ djl djl djl djl -djl +oIc djl djl djl @@ -58054,20 +57930,20 @@ ibg wud qyX iNg -aLY -aOe -aOe -aOe -aPQ -cvr -cvr -aXd -aRy -aQQ -aQQ -aSK -aSL -cjO +yiM +pCS +pCS +pCS +bQX +uRT +uRT +ujr +vNN +iiU +iiU +koe +wRl +nvT act aUv aVp @@ -58122,12 +57998,12 @@ dTs mKs cwl bPA -kzQ +cKm ceA bRZ emt -cxP -cxQ +uDJ +uLM doE doE doE @@ -58156,7 +58032,7 @@ dws ylS bhp bhp -cXA +wcZ dws dws ylS @@ -58290,18 +58166,18 @@ arF arF dTs dTs -yaA -aSv -aUA -aSu -aSu -aPR -aRy -aSK -aQt -aQt -aSL -cjO +hnC +tOa +lPi +gpC +gpC +glL +vNN +koe +sPc +sPc +wRl +nvT aoj aND aVp @@ -58356,11 +58232,11 @@ dTs dTs dTs dTs -cuy +sMf cwl bPA -cxq -cxQ +nLe +uLM doE drL drO @@ -58385,7 +58261,7 @@ vGu dws bhp mfH -bhp +qln bhp mfH bhp @@ -58400,7 +58276,7 @@ vGu dws dws vGu -dws +tyY dws dws tlh @@ -58525,17 +58401,17 @@ dTs dTs dTs dTs -aSv -aUA -aUB -aWC -aXd -aRy -aQt -aSK -aSK -aSK -bfu +tOa +lPi +wxv +vXF +ujr +vNN +sPc +koe +koe +koe +oVX aru aVp aSU @@ -58593,7 +58469,7 @@ dTs dTs dTs bPA -cxr +udm cwz doE dsE @@ -58605,7 +58481,7 @@ doE cAV cuJ cuJ -cuJ +mkN cuJ cuJ cuJ @@ -58628,7 +58504,7 @@ djk djk djk djk -djk +hqV djk djk eCk @@ -58759,17 +58635,17 @@ bXQ bXQ dTs dTs -aSv -aUx -aWe -aWD -aYa -bae -bah -bah -bbA -bah -bfG +tOa +nye +jXZ +lgi +oDi +orn +sEW +sEW +taz +sEW +hRZ atg atg aXA @@ -58965,12 +58841,12 @@ bzt bzt bzt bzt -bHR -bCh +rBa +gYf bzt bzt -bHR -bCh +rBa +gYf bzt bzt bRj @@ -58994,16 +58870,16 @@ bXQ bXQ dTs dTs -aUA -aSu -cvr -aPR -aFv -bam -bao -bbE -beP -bRw +lPi +gpC +uRT +glL +rYL +lRb +fLu +rqJ +wzS +jCQ aoj aUf aVp @@ -59197,16 +59073,16 @@ bwc bwT bCT bzu -bFL -bsi -bBo -bCi -bsi -bsi -bBo -bCi -bsi -bOb +hIW +qgn +dUk +icF +qgn +qgn +dUk +icF +qgn +tGe bOP dTs dTs @@ -59228,16 +59104,16 @@ ccy bXQ dTs dTs -aUA -aUM -aWE -aPR -aFw -ceA -ceA -aSI -chG -ceA +lPi +ftK +gsO +glL +wmo +hrM +hrM +iQh +gPI +hrM act mKZ aXD @@ -59431,7 +59307,7 @@ bwc bwT bzt bzt -bxY +mza bGU bzA bzA @@ -59440,7 +59316,7 @@ bGU bzA bzA bKq -bEp +fKO bOP dTs dTs @@ -59462,16 +59338,16 @@ dNm bXQ dTs dTs -aUA -aSu -aSu -aPR -aFw -aPu -ceA -aSI -chG -ceA +lPi +gpC +gpC +glL +wmo +lji +hrM +iQh +gPI +hrM awM awM aVB @@ -59511,7 +59387,7 @@ clz bTl bNE dTs -cxt +oKi cPG cTD cfd @@ -59664,8 +59540,8 @@ bzt bwc bBm bzr -bEg -bya +ylc +qfP bGV bzB bzB @@ -59674,7 +59550,7 @@ bGV bzB bzB bKr -bEp +fKO bOP dTs dTs @@ -59696,17 +59572,17 @@ dNB bXQ dTs dTs -aUA -aSu -aSu -aPR -aFw -axk -ceA -aSI -chG -ceA -ceA +lPi +gpC +gpC +glL +wmo +eCb +hrM +iQh +gPI +hrM +hrM aVB aXE aZJ @@ -59745,7 +59621,7 @@ btX bIW bsp cQm -cxu +dzV cXm cTD cfd @@ -59898,8 +59774,8 @@ bzt bwc bBm bwU -bEh -bzz +uMu +jmg bGV bzB bzB @@ -59908,7 +59784,7 @@ bGV bzB bzB bKr -bEp +fKO bOQ bOQ bOQ @@ -59929,18 +59805,18 @@ dLe dNF bXQ dTs -aSN -aUA -aUB -aWf -aPR -aFw -axk -ceA -aSI -chG -ceA -ceA +sXi +lPi +wxv +kEp +glL +wmo +eCb +hrM +iQh +gPI +hrM +hrM aVB krR aZK @@ -60133,7 +60009,7 @@ bwc bwT bzt bzt -bxY +mza bGV bzB bzB @@ -60142,7 +60018,7 @@ bGV bzB bzB bKr -bEr +tpJ bOR bPT bQZ @@ -60163,18 +60039,18 @@ bTu bTu bXQ dTs -aSN -aUA -aSu -aSu -aPR -aFw -axk -ceA -aSI -chG -ceA -ceA +sXi +lPi +gpC +gpC +glL +wmo +eCb +hrM +iQh +gPI +hrM +hrM aVB aXN aZL @@ -60363,11 +60239,11 @@ bwY bhu bzu bzt -bHR -bCh +rBa +gYf bCT bzu -bxY +mza bGV bHS bHS @@ -60376,7 +60252,7 @@ bGW bHS bHS bKr -bEp +fKO bRk bPU bRX @@ -60397,18 +60273,18 @@ bTG bTG bWR bTG -ahp +leq cfl -aSu -cvr -aPR -aFw -axk -ceA -aSI -chG -ceA -ceA +gpC +uRT +glL +wmo +eCb +hrM +iQh +gPI +hrM +hrM aVB aXV aZL @@ -60447,7 +60323,7 @@ bGz bIW bsp cQm -cGI +laa cGM cxU cwz @@ -60595,13 +60471,13 @@ bJt bLx bON bhu -bsi -bsi -bFN -bJg -bsi -bsi -bzC +qgn +qgn +oaB +wqR +qgn +qgn +qqJ bGV bzB bzB @@ -60610,7 +60486,7 @@ bzB bzB bzB bKr -bEp +fKO bRk cdi bRb @@ -60630,18 +60506,18 @@ dKx dKx dKx caB -cdO -cim +uMJ +ejK cfl bkk -aWE -aPR -aFw -axk -ceA -aSI -chG -ceA +gsO +glL +wmo +eCb +hrM +iQh +gPI +hrM awM awM awM @@ -60844,7 +60720,7 @@ bzB bzB bzB bKr -bEp +fKO bRk cfm bRc @@ -60864,19 +60740,19 @@ cLX cLX cLX cLX -cdP -cin +xlt +wrz cfl bkj -aSu -aPR -aFw -axk -ceA -aSI -chG -ceA -bnv +gpC +glL +wmo +eCb +hrM +iQh +gPI +hrM +iqh aVM aXX aZM @@ -61078,7 +60954,7 @@ bzB bzB bzB bKr -bEp +fKO bRk bPX tdf @@ -61099,18 +60975,18 @@ bTG ddP bTG bYC -cio +nxS cfl bkj -aSu -aPR -aFw -aPu -ceA -aSI -chG -ceA -ceA +gpC +glL +wmo +lji +hrM +iQh +gPI +hrM +hrM aVM aXZ aZM @@ -61312,7 +61188,7 @@ bpJ bpJ bzB bKr -bEr +tpJ bOR bRk bRk @@ -61321,8 +61197,8 @@ bOR bTI bTI bTG -bVS -bWT +fGF +jli bTG bTI bTG @@ -61333,18 +61209,18 @@ bTG bTG bTG bTI -cio +nxS cfl bkk -aWE -aPR -aFw -axk -ceA -aSI -chG -ceA -ceA +gsO +glL +wmo +eCb +hrM +iQh +gPI +hrM +hrM aVM aYE aZM @@ -61546,39 +61422,39 @@ bLh bsC bMH bNj -bFM -bfV -bOT -bOT -bOT -bOT -bfV -bOT -bOT -bVT -bWU -bOT -bfV -bOT -bOT -bOT -bfV -bOT -bOT -bOT -bfV -cip +gYn +wfA +wfL +wfL +wfL +wfL +wfA +wfL +wfL +reE +qlC +wfL +wfA +wfL +wfL +wfL +wfA +wfL +wfL +wfL +wfA +wHR cfl bkj -aSu -aPR -aFw -axk -ceA -aSI -chG -aUh -ceA +gpC +glL +wmo +eCb +hrM +iQh +gPI +mxL +hrM aVM aYE aZM @@ -61765,17 +61641,17 @@ bJt bLx bwX bhu -bsj -bsj -bBr -bCj -bsj -bsj -bsj -bsj -bsj -bsj -bCX +tjR +tjR +vlP +tEM +tjR +tjR +tjR +tjR +tjR +tjR +rcu brQ bpJ bpJ @@ -61804,15 +61680,15 @@ bOU bOU cwq bkj -aSu -aPR -aFw -axk -ceA -aSI -chG -ceA -ceA +gpC +glL +wmo +eCb +hrM +iQh +gPI +hrM +hrM axF aYN aYE @@ -62001,15 +61877,15 @@ bLz brF brF bAs -bBs -bCk +qzi +svF bAt bAt bAt bAt bHT bJh -bDK +iVX brQ bpJ bpJ @@ -62038,14 +61914,14 @@ bkj bRe cws bkj -aSu -aPR -aFw -axk -ceA -aSI -chG -ceA +gpC +glL +wmo +eCb +hrM +iQh +gPI +hrM axF axF aVM @@ -62243,7 +62119,7 @@ bAt bAt bAt bAt -bDK +iVX brQ bpJ bpJ @@ -62272,26 +62148,26 @@ bMI bRf cfR bMI -aSu -aPR -aFw -axk -ceA -aSI -chG -ceA -ceA -bPA -bnC -bnC -bnC -bnC -cjO -cjO -cjO -ccm -aUu -cjO +gpC +glL +wmo +eCb +hrM +iQh +gPI +hrM +hrM +nft +kNA +kNA +kNA +kNA +nvT +nvT +nvT +jlI +eWo +nvT aNH jci boq @@ -62477,7 +62353,7 @@ bWa bBD bAt bAt -bDK +iVX brQ bpJ bpJ @@ -62506,26 +62382,26 @@ bOV bOV cwA bMI -aSu -aPR -aFw -axk -ceA -aSI -bfs -ceB -ceB -bnz -beO -beO -beO -beO -beO -beO -beO -aSK -aSL -cjO +gpC +glL +wmo +eCb +hrM +iQh +xzt +ozd +ozd +oIw +nZl +nZl +nZl +nZl +nZl +nZl +nZl +koe +wRl +nvT aNH aTy aOC @@ -62586,7 +62462,7 @@ doE dTs dTs boP -boQ +mWt boR bLS bLS @@ -62711,55 +62587,55 @@ bpF bBP bAt bAt -bDK +iVX brQ bsC bMH bNj -bFO -bkc -bkc -bkc -bkc -bkc -cuu -bkc -bkc -bVW -bWW -bkc -bkc -bkc -bkc -bkc -cuu -bkc -bkc -bkc -cuv +cUw +sHm +sHm +sHm +sHm +sHm +uHJ +sHm +sHm +sCJ +wbk +sHm +sHm +sHm +sHm +sHm +uHJ +sHm +sHm +sHm +sfp ciM cxc bMI -aSu -aPR -aFw -aPu -ceA -bbG -bao -bao -bao -bnB -aSK -aSK -aSK -aSK -aSK -aSK -aSK -bqd -aTU -cjO +gpC +glL +wmo +lji +hrM +gyA +fLu +fLu +fLu +wxc +koe +koe +koe +koe +koe +koe +koe +vOY +wlz +nvT aNH aTy aOC @@ -62945,12 +62821,12 @@ bwe bBP bAt bAt -bDK +iVX brQ bpJ bMI bNm -bGu +eSg cjH cjH cjH @@ -62959,8 +62835,8 @@ cjH cjH cjH bOY -bVX -bWX +ijH +oVM bXV bYD bYD @@ -62970,29 +62846,29 @@ bOX bOX bOX bOX -cdR +lMC cuo cxc cfP -aWE -aPR -aFw -axk -ceA -ceA -bft -ceA -ceA -bPA -aTH -bqd -bqd -bqd -bqd -bqd -aTU -bvJ -bRw +gsO +glL +wmo +eCb +hrM +hrM +cyz +hrM +hrM +nft +qrJ +vOY +vOY +vOY +vOY +vOY +wlz +oAL +jCQ aNH aNH aNH @@ -63179,12 +63055,12 @@ bwe bBP bHT bJh -bDK +iVX brQ bpJ bMI bNm -bGu +eSg cjH cqa cqa @@ -63204,29 +63080,29 @@ dTs dTs dTs bOX -cdS +fWo cuo cxc bMI -aSu -aPR -aFw -axk -ceA -ceA -ceA -ceA -ceA -bPB -bSV -cjO -bvJ -bRw -bSV -cjO -bvJ -ccu -ceA +gpC +glL +wmo +eCb +hrM +hrM +hrM +hrM +hrM +bxA +bjD +nvT +oAL +jCQ +bjD +nvT +oAL +eyp +hrM aNH aOw aUd @@ -63413,12 +63289,12 @@ bzE bBP bAt bAt -bDK +iVX brQ bsC bMJ bNm -bJk +glg cjH cqa cqa @@ -63438,29 +63314,29 @@ dTs dTs dTs bOX -cdR +lMC cuo cxc bMI -aSu -aPR -aFw -axk -ceA -ceA -ceA -bfH -ceA -ceA -bpk -bqi -bxR -ceA -bVK -bqi -caT -ceA -ceA +gpC +glL +wmo +eCb +hrM +hrM +hrM +kIk +hrM +hrM +lzf +nXw +slm +hrM +fiq +nXw +tZG +hrM +hrM aNH aOC aOC @@ -63647,12 +63523,12 @@ bzE bmf bAt bAt -bDK +iVX brQ bpJ bMI bNm -bGu +eSg cjH cqa cqa @@ -63672,29 +63548,29 @@ dTs dTs dTs bOX -cdR +lMC cuo cxc cfP -aWE -aPR -aFw -axk -ceA -ceA -ceA -ceA -bny -ceA -bpl -brq -bBf -ceA -bZv -brq -bBf -ceA -ceA +gsO +glL +wmo +eCb +hrM +hrM +hrM +hrM +irR +hrM +nEc +waY +hPo +hrM +iSP +waY +hPo +hrM +hrM aNH aOC aOC @@ -63881,12 +63757,12 @@ bzE bmf bAt bAt -bDK +iVX brQ bpJ bMI bNm -bGu +eSg cjH cqa cqa @@ -63906,29 +63782,29 @@ bZe bZe bZe cdm -cdR +lMC cuo cxc bMI -aSu -aPR -aFw -axk -ceA -ceA -ceA -bmY -ceA -ceA -bps -brr -bFt -ceA -bZK -brr -bFt -ceA -ceA +gpC +glL +wmo +eCb +hrM +hrM +hrM +wAN +hrM +hrM +sup +hiu +oDJ +hrM +rLU +hiu +oDJ +hrM +hrM aNH aOC aOC @@ -64115,12 +63991,12 @@ bzE bBP bAt bAt -bDK +iVX brQ bsC bMJ bNm -bGu +eSg cjH rAL wLI @@ -64140,29 +64016,29 @@ cbi oQK caC bYE -cdR +lMC cuo cxc aEk -cvr -aPR -aFw -axk -baz -cwl -ceA -ceA -ceA -aUh -bps -brr -bFu -ceA -can -brr -bFt -aUh -ceA +uRT +glL +wmo +eCb +pZg +vtS +hrM +hrM +hrM +mxL +sup +hiu +fFG +hrM +mpk +hiu +oDJ +mxL +hrM aNH aRt aNH @@ -64349,12 +64225,12 @@ bwe bBP ciw bJh -bDK +iVX brQ bpJ bMI bNm -bGu +eSg cjH cjH aRS @@ -64374,29 +64250,29 @@ caC cbR caC bYE -cdR +lMC cuo cxc cfP -aEE -aPR -aFx -aPu -bbz -bck -cwl -ceA -ceA -ceA -bps -brr -bFt -ceA -can -brr -bFt -ceA -baz +oZb +glL +rOp +lji +vaz +ljt +vtS +hrM +hrM +hrM +sup +hiu +oDJ +hrM +mpk +hiu +oDJ +hrM +pZg aNH aRu aNH @@ -64583,12 +64459,12 @@ bzE bBP cfr bAt -bDK +iVX brQ bpJ bMI bNm -bGu +eSg bOY bPZ bRh @@ -64608,7 +64484,7 @@ caC dLn caC bYE -mAZ +utf bGn qqR bJE @@ -64617,20 +64493,20 @@ che cvv dTs dTs -beC -bck -ceD -cwl -ceA -bps -bud -bFt -ceA -bZK -brr -bFu -ceA -ceG +etD +ljt +kAq +vtS +hrM +sup +nTU +oDJ +hrM +rLU +hiu +fFG +hrM +ycX aNH aNH aNH @@ -64816,14 +64692,14 @@ bWa bUm bpF btD -bJi -bKv +jCb +kKI bBq bBq bML bML -bOh -bPa +ujV +gSt bWh bWh bWh @@ -64842,7 +64718,7 @@ bYE dLE bYE bYE -mAZ +utf bGn qqR aEI @@ -64853,18 +64729,18 @@ dTs dTs dTs dTs -beC +etD dTs -cwl -bpX -buf -bIU -ceA -cap -buf -bIU -baz -bbz +vtS +yau +oSr +xGe +hrM +vdP +oSr +xGe +pZg +vaz dTs dTs dTs @@ -65033,7 +64909,7 @@ bCf bCA bCA bCA -ijc +rZx brM blZ btw @@ -65050,14 +64926,14 @@ bUm cbT cbT bJj -bOZ -bBr +jNC +vlP bBq bBq bML bML -bOi -bQa +ulc +nqK bXa cCT cCT @@ -65076,7 +64952,7 @@ bZW dMg ccC bYE -yll +snw bGn qqR aEn @@ -65090,14 +64966,14 @@ dTs dTs dTs dTs -ceD -cwl -ceA -ceA -ceA -ceA -baz -bbz +kAq +vtS +hrM +hrM +hrM +hrM +pZg +vaz dTs dTs dTs @@ -65240,16 +65116,16 @@ asa akz aNp aNp -beW -beW -beW -beW -beW -beW -beW -beW -beW -bhC +sOs +sOs +sOs +sOs +sOs +sOs +sOs +sOs +sOs +tAo dTs dTs dTs @@ -65285,12 +65161,12 @@ bAt cfr cfr bAt -bDK +iVX brQ bpJ bMI bNm -bGu +eSg bOY bQc bOY @@ -65310,7 +65186,7 @@ dKI dMo ccD bTt -mAZ +utf bGn qqR bJE @@ -65326,12 +65202,12 @@ dTs dTs dTs dTs -ceD -ceD +kAq +kAq dTs dTs -bbz -beC +vaz +etD dTs dTs dTs @@ -65513,18 +65389,18 @@ brF brF brF bAs -bCW -bEq +izy +nLG bAt bAt bHT bJh -bDK +iVX brQ bsC bMJ bNm -bJk +glg bPb bPb bRy @@ -65544,7 +65420,7 @@ cbk cbW ccE bTt -mAZ +utf bGn qqR bJE @@ -65564,7 +65440,7 @@ dTs dTs dTs dTs -beC +etD dTs dTs dTs @@ -65735,30 +65611,30 @@ dTs dTs dTs dTs -bqM -bqe -bqf -bqe -bqe -bqe -bqe -bqe -bqf -bqe -bqe -bqe -bKv -bxX -bqe -bqe -bqe -bqe -bEi +hNE +tpx +lzY +tpx +tpx +tpx +tpx +tpx +lzY +tpx +tpx +tpx +kKI +oqz +tpx +tpx +tpx +tpx +fnC brQ bpJ bMI bNm -bGu +eSg bPb bQd bRi @@ -65778,7 +65654,7 @@ dKT dMx ccF bTt -mAZ +utf bGn qqR edo @@ -65992,7 +65868,7 @@ brR bpJ bMI bNm -bGu +eSg bRy czD cDk @@ -66012,7 +65888,7 @@ dKU dMC dNG bYE -mAZ +utf bGn qqR bJE @@ -66226,7 +66102,7 @@ bpJ bsC bMJ bNm -bGu +eSg bRy bQe cCQ @@ -66246,7 +66122,7 @@ dKV cbZ ccH bTt -mAZ +utf bGn qqR bJE @@ -66410,11 +66286,11 @@ bdA aNp aNp aNp -beX -beX -beX -beX -bgf +byH +byH +byH +byH +jtp apO apz aql @@ -66460,7 +66336,7 @@ btz btz btz buS -bqP +hoW bRy bQe cCP @@ -66480,7 +66356,7 @@ dKW bZX lkZ bTt -mAZ +utf bGn qqR edo @@ -66648,7 +66524,7 @@ ame ame ame ame -bgg +jit aoG apz aqg @@ -66694,7 +66570,7 @@ btC btC btC buU -bqP +hoW bPb bQf bRl @@ -66714,7 +66590,7 @@ dKW dEb lkZ bTt -mAZ +utf bGn qqR bJE @@ -66882,7 +66758,7 @@ bdg bdg bdg bdf -bgg +jit aoG apz aqg @@ -66910,25 +66786,25 @@ brQ bsC btA buS -bqN -brO -brO -bBQ -brO -brO -brO -bCZ -bEu -brO -brO -brO -bBQ -brO -brO -brO -brO -bBQ -bOj +qHs +pnS +pnS +eut +pnS +pnS +pnS +dJx +tLb +pnS +pnS +pnS +eut +pnS +pnS +pnS +pnS +eut +sDr bPb bPb cbg @@ -66948,7 +66824,7 @@ dKY dNk kUz bYE -yll +snw bGn qqR bJE @@ -67116,7 +66992,7 @@ bdC dKe bfw bdf -bgg +jit aoG apz aql @@ -67144,15 +67020,15 @@ brQ bpJ btz buS -bqO +eNO bxq bxq bxq bxq bxq bxr -bDa -bEv +sJA +liJ bxr bGX bGX @@ -67182,7 +67058,7 @@ dKZ bTt bYE bYE -mAZ +utf bGn qqR edo @@ -67350,7 +67226,7 @@ beY bdC bfx bdg -bgg +jit aoG apz aqg @@ -67359,7 +67235,7 @@ asa bdW aiZ aUL -xxQ +uJj rTV rTV rTV @@ -67378,7 +67254,7 @@ brQ bpJ btz buS -bqP +hoW bxq dTs dTs @@ -67416,7 +67292,7 @@ dLa bOY bOY bOY -mAZ +utf bGn qqR aEI @@ -67545,10 +67421,10 @@ dTs dTs dTs dTs -abB -abP -acX -asl +pLj +gvD +kUp +jmI aGA aGA aGA @@ -67584,7 +67460,7 @@ bPW bdC bfy bdg -bgg +jit aoG apz aqg @@ -67593,7 +67469,7 @@ amt bdW aiZ aiZ -tPP +eKe gYT oYp rTV @@ -67612,7 +67488,7 @@ brQ bsC btA buS -bqP +hoW bxq dTs dTs @@ -67649,8 +67525,8 @@ bQb dLb cGr bWh -clV -cdT +oJM +hSi bJC uLr cgB @@ -67782,7 +67658,7 @@ abM acb ach ahD -agE +vQR aGA aHk aIe @@ -67818,7 +67694,7 @@ bfa bdC hWz bdg -bgg +jit aoG apz aql @@ -67827,10 +67703,10 @@ asa bdW aiZ bcy -amQ -ett -sdq -fZj +qTv +jeY +mvP +trg dTs bkU blB @@ -67846,7 +67722,7 @@ brQ bpJ btz buS -bqP +hoW bxq dTs dTs @@ -67883,8 +67759,8 @@ cdo cla dNl clU -dlP -cdU +uKX +wjR ceK cxe cfQ @@ -68016,12 +67892,12 @@ aca ach ach ahD -awK +geu aGA -aHl -aIf -aIf -aIf +pQN +qVn +yab +yab aIf aIf aIf @@ -68052,7 +67928,7 @@ bdC bdC bfA bdf -bgg +jit aoG apz aqg @@ -68080,7 +67956,7 @@ brQ bpJ btz buS -bqP +hoW bxq dTs dTs @@ -68118,7 +67994,7 @@ bYD bYD bYD bVk -cdV +pni cuI cfj wzl @@ -68250,7 +68126,7 @@ aca ach ach ahD -adV +jBz aGz aHm aIf @@ -68286,7 +68162,7 @@ bdg dKi bdg bdf -bgg +jit aoG akp aqg @@ -68314,7 +68190,7 @@ brQ bsC btA buS -bqO +eNO bxq dTs dTs @@ -68352,7 +68228,7 @@ bbx afu afd bVl -afC +ptj cuK cfj cfS @@ -68484,7 +68360,7 @@ aca ach ach ahD -adV +jBz aGz aHm aIf @@ -68520,7 +68396,7 @@ ame ame ame ame -bgg +jit aoG apz akN @@ -68548,7 +68424,7 @@ brR bpJ btz buS -bqP +hoW bxq bxq afB @@ -68586,7 +68462,7 @@ baZ afd afd bVl -afC +ptj cuK cfj wzl @@ -68718,7 +68594,7 @@ aca ach ach agt -axm +sMb aGz aHm aIf @@ -68752,9 +68628,9 @@ aYk aZA aky alo -bfB -bfJ -bgh +iiq +eRk +iCn aoG apz aki @@ -68782,7 +68658,7 @@ brS bpJ btz buS -bqP +hoW bxr byv bzF @@ -68820,7 +68696,7 @@ dTs bRh bRh bVm -afC +ptj cuK cfj wzl @@ -68952,7 +68828,7 @@ aca ach ach ach -axn +mEv aGA aHn aIf @@ -68986,8 +68862,8 @@ bsE aYk akz alp -bfC -bfK +sMU +ekJ alp avC apz @@ -69016,8 +68892,8 @@ bAr bpJ btz buS -bqQ -bxs +ioH +pjV byw byw bSO @@ -69052,9 +68928,9 @@ dTs dTs dTs dTs -aWd -bhM -afE +feQ +aDd +njv cuK cfj cfS @@ -69186,7 +69062,7 @@ acb ach ach ach -axJ +iki aGz aHo aIf @@ -69221,7 +69097,7 @@ aZR ame ame ame -bfL +lSE aNn auy aks @@ -69250,8 +69126,8 @@ bpK bpK btC buU -bqU -bvr +ggB +diX bxt bxt bSP @@ -69420,7 +69296,7 @@ ach ach ach ach -axJ +iki aGz aHp aIf @@ -69455,7 +69331,7 @@ bcT bcU bcU bcT -bfL +lSE apz aqg aki @@ -69484,7 +69360,7 @@ bfj bfj bfT bfU -bwd +wbJ bxu byy byy @@ -69654,7 +69530,7 @@ ach ach ach ach -axO +vzt aGz aHq aIf @@ -69689,7 +69565,7 @@ beJ bfb nFW bcU -bfL +lSE apz dKg aki @@ -69888,7 +69764,7 @@ ach ach ach acH -adE +sam aGz aHr aIf @@ -69923,7 +69799,7 @@ beK bdj dKf bcU -bfL +lSE apz aqg aki @@ -70007,8 +69883,8 @@ ccc cdZ ceN cgy -cij -cxg +mqi +oKu cFN cQd cij @@ -70122,7 +69998,7 @@ ach ach ach ahD -adW +oPz aGA aHs aIf @@ -70157,7 +70033,7 @@ beL bfc bdj bcU -bfL +lSE apz aki aki @@ -70356,7 +70232,7 @@ ach ach acH acP -agE +vQR aGz aHm aIf @@ -70391,7 +70267,7 @@ bev bfd bdj bcU -bfL +lSE apz aki aqg @@ -70590,7 +70466,7 @@ ach ach ahD ahY -adY +qPx aGz aHm aIf @@ -70625,7 +70501,7 @@ bew bfe bdj bcT -bfL +lSE apz dKh aki @@ -70824,7 +70700,7 @@ ach ach ahD ahZ -aza +mIg aGz aHm aIf @@ -70859,7 +70735,7 @@ bew bfe bfq bcT -bfL +lSE apz aqg akA @@ -70890,8 +70766,8 @@ dTs dTs bpM bpM -btF -brU +rqM +pcu bAy bzH bxr @@ -71058,7 +70934,7 @@ ach ach ahD ahC -azQ +hiL aGA aHl aIf @@ -71093,7 +70969,7 @@ bew bfe bdj bcU -bfL +lSE apz aqg akA @@ -71126,7 +71002,7 @@ bpM bxv bRQ bRR -bAz +tRl byC bxr bWc @@ -71292,7 +71168,7 @@ acz ach agt afx -agE +vQR aGz aHt aIg @@ -71327,7 +71203,7 @@ bex bfd bdj bcU -bfL +lSE aIK auz aIJ @@ -71358,8 +71234,8 @@ dTs bpM bwf btG -bRR -bRR +sTa +nzE bAz byC bxr @@ -71526,7 +71402,7 @@ abr acz acH acP -agE +vQR aGz aGz aGA @@ -71549,8 +71425,8 @@ aiY ajR ajb afZ -bbZ -bcs +sRO +xHW ame bcU qbC @@ -71561,7 +71437,7 @@ bey dKd bdj bcU -bfM +twF aNp apO apz @@ -71760,9 +71636,9 @@ abs abr acP ahY -aAB -axi -aCd +wCd +sqE +kzV aev hTr ahF @@ -71781,11 +71657,11 @@ dTs ajb ajb afZ -aAE -aiu -bca -bct -amf +rYa +iXX +jJq +dMT +pXX bcU qbC bdj @@ -71795,7 +71671,7 @@ bdj bdj bdj bcU -bfN +sgc ame aoE apz @@ -71827,7 +71703,7 @@ bpM bwh bqW bRS -bpP +owy bAA bzH bxr @@ -72013,13 +71889,13 @@ akv dTs dTs dTs -baI -aiu -akB +qdn +iXX +uRU aiZ bcb bcu -amg +iFb bcT bcU bcU @@ -72029,7 +71905,7 @@ bcU bcU bcU bcT -bfN +sgc ame aoE apz @@ -72253,17 +72129,17 @@ aiZ ajR bcc bcv -bcF -bcX -bdq -bdq -bdq -bdq -bdq -bdq -bdq -bdq -bfO +wTj +gxK +qUP +qUP +qUP +qUP +qUP +qUP +qUP +qUP +nCg ame aoE apz @@ -72294,7 +72170,7 @@ dTs bpM bwj bEG -bvb +pRw bEG bEG bEG @@ -72528,7 +72404,7 @@ dTs bpM bwk bEG -bLo +rvj bpP bSR bzH @@ -72786,7 +72662,7 @@ dTs dTs aEa ljB -aCy +pBe aCC aCw aCZ @@ -73239,7 +73115,7 @@ bYA caF cts bPv -ckd +pPW ckX bJr cnw @@ -73634,7 +73510,7 @@ ahh pUO vqR vqR -otn +qxQ rob vqR vqR @@ -73868,10 +73744,10 @@ ahh aaT jNB sUr -jNB -sUr -sUr +rKj sUr +qXK +cde otn tbb vUl @@ -74100,8 +73976,8 @@ aez aaj aaJ aaV -sUr -abq +pDM +thm sUr sUr jNB @@ -74337,7 +74213,7 @@ vTR abd uty sUr -jNB +rKj sUr sUr jNB @@ -74572,7 +74448,7 @@ abf abv abz sUr -sUr +okj sUr tBD mhR @@ -75203,7 +75079,7 @@ dNS dbu daG dbq -daK +lSp dTP dTP dTP @@ -75437,7 +75313,7 @@ dNS daF daH dbq -dTP +nqv dTP dUa dev @@ -75508,8 +75384,8 @@ ahh ahh ahh ahh -soS -lQM +jCn +vBD ahh dTs dTs @@ -75603,8 +75479,8 @@ ejR ejR goq dCt -bic -biu +sqJ +lIL jbx jbx jbx @@ -75670,7 +75546,7 @@ cYT wPb dbu daI -dbr +bmH dTP daK ddQ @@ -75737,15 +75613,15 @@ dTs dTs dTs dTs -bMt -bab -axi -axi -abY -aci -aco -acv -aQn +eqv +jZb +sqE +sqE +otE +mSU +koM +ybJ +sxU dTs dTs dTs @@ -75837,16 +75713,16 @@ bVE bVE bVD dCt -ccd -ccL -bZr -cfZ +eDH +fGL +pDN +qIp cgG cgI cgI -chV -chm -cjl +grG +jGR +fuX jbx mXN rmo @@ -75904,7 +75780,7 @@ cYP dTK eeP daK -daK +qqy dTP daK ddR @@ -76071,36 +75947,36 @@ cTU cTU hcP dCt -bXf +diD bYa bZZ -cga -cfX -chm -chT -chW +tya +jqK +jGR +cqN +eWA chn -cjm -chm -clD -cmr -cnB -ckx -cuS -cmr -cxW +rtX +jGR +pTZ +fhT +toK +cgV +oGY +fhT +eME coF dfc ees dNR dTH coF -mBd -chm -chm -clD -cmr -cmr +gYC +jGR +jGR +pTZ +fhT +fhT dTs dTs dTs @@ -76299,13 +76175,13 @@ mfK tni bVE gQE -bVw -bZr -ceh -ceh -bVx -cfX -cfY +owq +pDN +rJl +rJl +piZ +jqK +wco bYb bVy bVy @@ -76322,14 +76198,14 @@ cnC cuQ cvK cvL -cyR +lFe cAf hEU hEU czV czV cAf -cAi +gfs chn chn chn @@ -76459,12 +76335,12 @@ dTs dTs dTs dTs -bMt -bMt -bMt -bab -axi -aZd +eqv +eqv +eqv +jZb +sqE +iqv ahh pUO sUr @@ -76476,10 +76352,10 @@ dTs dTs dTs dTs -bgi -bgi -bgi -akR +brJ +brJ +brJ +yhl bhk bhF bhZ @@ -76533,7 +76409,7 @@ mfK wMw bVD hcP -cbt +sQU bZZ ceg ceg @@ -76698,7 +76574,7 @@ aKw aKw bac bbK -bFA +umU axM ahf ahw @@ -76713,8 +76589,8 @@ bcY bgj bgj akJ -akS -alr +vjY +nnC bhF bia bit @@ -76767,7 +76643,7 @@ mfK dCt dCt dCt -cbu +dMH ceg bYb bVy @@ -76932,14 +76808,14 @@ aKw aKx aIS aIS -bJN +kAH agY ahg ahg ahI cyP agY -aix +kMI aZg aKw bac @@ -76947,8 +76823,8 @@ bbK bbK bbL bgj -akT -alQ +scW +xkS bhG bib bib @@ -76998,10 +76874,10 @@ ozu ozu xsS mfK -bVw -bWm -bZr -cce +owq +wfl +pDN +kig bYb bZq bOu @@ -77181,7 +77057,7 @@ aKw aKw bWw bcY -bgU +nTo bhl bhk bhk @@ -77232,7 +77108,7 @@ ozu ozu xsS mfK -bXf +diD bYa bZZ bYb @@ -77415,18 +77291,18 @@ aIS aZg bac bbK -bWx -bMt -bab -amu +gRg +eqv +jZb +mWp amw amw amw -aqm -bXg -bXk -bXk -bXr +nFE +uPu +kkH +kkH +rSs blM bir bki @@ -77466,7 +77342,7 @@ uml vgm xsS mfK -bXY +xex bYb bVy bZq @@ -77499,7 +77375,7 @@ czV cho cho cAf -cAj +tDs chp chp chp @@ -77652,15 +77528,15 @@ aIS aIS aZg bac -amv -amS -amS -amS -aqE +keF +dIZ +dIZ +dIZ +kcd bXh bXd bXd -bXs +wtc blM bir biP @@ -77691,16 +77567,16 @@ cTU cTU cTU hcP -bPi -bVx -bVz +owz +piZ +wKz qQz clB clB clB clB bXe -bXZ +yjc bZq bOu bOu @@ -77726,14 +77602,14 @@ cjS chp chp chp -czB +aUJ cAf czX czX czX cho cAf -cAk +mDv cAl ciQ ciQ @@ -77894,17 +77770,17 @@ bXd bXd bXl bXi -bXt +toc bWo bQF bQF bQF bQF bWo -bYf -caM -caM -cbz +vex +ktT +ktT +pMp bQF bCs bSY @@ -77917,24 +77793,24 @@ bwv bZQ aCf aEM -aEN -aKu +oaj +uXM bZQ bCs cev -bNr -bNs -bNs -bPj +tux +ugJ +ugJ +geW bVy -bWn +dCa qQz cev cev cev cev bXe -aIh +lic bOu bOu bOu @@ -77955,26 +77831,26 @@ dTs dTs dTs dTs -cAX -cpv -chS -chS -cjk -cAe +tLD +lbq +nEW +nEW +hBs +jvI coF dfc dgF jrV dTH coF -cuT -cAX -ckn -ckn -cpv -cAY -cCb -cDd +seX +tLD +hFF +hFF +lbq +xDO +sns +uhC cho cho cho @@ -78102,7 +77978,7 @@ aJy aTk aUl aUl -bOw +nHV bPl cCR cCS @@ -78128,17 +78004,17 @@ aIS bXi bXm bXn -bXu +ydM bWo bSY bSY bSY bSY bWo -bYj +tIQ bXn bXn -bXu +ydM bSY bCs bSY @@ -78151,24 +78027,24 @@ aCf bZQ aCf aEM -aIh -bhc +lic +fBJ bZQ bCs bZQ -aIh +lic bOu bOu bOu bOu -bhc +fBJ qQz bZQ bZQ bZQ bZQ bXe -aIh +lic bOu bOu bOu @@ -78208,7 +78084,7 @@ ceZ ceZ cnD caH -cFf +trw cho cho cho @@ -78336,14 +78212,14 @@ aUl aTm aKw aKw -bOx +mzD bPl bRs cEe xMr djZ bPl -aiA +nbK aXS aJy aJy @@ -78362,17 +78238,17 @@ aJy aJy bXn bXn -bXu +ydM bWo bSY bSY bSY bSY bWo -bYI -cbv -cbv -ccg +oJL +xWl +xWl +mFv bSY bCs bSY @@ -78385,24 +78261,24 @@ bwv bZQ aCf aEM -aJz -bLF +iwk +qos bZQ bCs bZQ -aJz -bOv -bOv -bOv -bOv -bLF +iwk +gyF +gyF +gyF +gyF +qos qQz bZQ bZQ bZQ bZQ bXe -aIh +lic bOu bOu bOu @@ -78442,7 +78318,7 @@ ceo ceo cen cnD -cGT +rmS cho cho cho @@ -78570,14 +78446,14 @@ aKw aUn aUk aUk -bPk +kZZ aPP aXW aWa aWB aZk aPP -aiC +tUS aZe aUl aUl @@ -78596,7 +78472,7 @@ aJy aJy aJy bXn -bXu +ydM blM bir biP @@ -78636,7 +78512,7 @@ ozu ozu xsS mfK -aIh +lic bOu bOu bOu @@ -78676,7 +78552,7 @@ cdw cdw ceo chx -cLh +dzn cjR cho cho @@ -78786,32 +78662,32 @@ dTs dTs dTs dTs -and -and -ard -asy -bek -bfP -bWq -bWq -abC -cby -abG -bWq -bWq -bMu -bMv -bNt -asy -and -aaZ +ftM +ftM +uMM +fDR +phA +wIm +nVg +nVg +xmo +pah +rEf +nVg +nVg +kjz +xpg +pyu +fDR +ftM +hFH aPP aXW aVZ ahK aZk aPP -aiD +stQ aKw aKw aKw @@ -78830,7 +78706,7 @@ aJy aJy aJy aJy -bXv +wrV blM bir bki @@ -78870,7 +78746,7 @@ uml vgm xsS mfK -aIh +lic bOu bOu caG @@ -78910,7 +78786,7 @@ cdw cdw ceo chx -cLi +tVo cjS cjR cho @@ -79022,8 +78898,8 @@ dTs dTs aSi aQq -aRi -aRH +gQG +oYC aPP aPP aPP @@ -79035,8 +78911,8 @@ aPP aPP aPP aPP -aXT -aYy +lxX +lEf aPP aPP aPP @@ -79045,11 +78921,11 @@ aVZ aVZ ahU aio -aiF -bMv -bfP -bWq -bWu +rxO +xpg +wIm +nVg +iIY aZe aUl aUl @@ -79064,7 +78940,7 @@ aJy aJy aJy aJy -bXv +wrV blM bir biP @@ -79104,7 +78980,7 @@ ozu ozu xsS mfK -chA +xPv clc dsf cef @@ -79144,7 +79020,7 @@ cxz cdw ceo chx -cUJ +tsN ciQ cYg cho @@ -79283,7 +79159,7 @@ aSi aSi aSi aQq -bWv +oJs aKw aKw aKw @@ -79298,17 +79174,17 @@ aJy aJy aJy aJy -bXv +wrV bYc bTi bTi bTi bTi bYc -bYJ -cbw -cbw -cch +qYs +wNc +wNc +bnY bTi bCy bTi @@ -79321,24 +79197,24 @@ bwv caI cgi cgU -chz -cie +oEl +xbs caI bCy caI -chz -ciE -ciE -ciE -ciE -cie +oEl +hGn +hGn +hGn +hGn +xbs rtW caI caI caI caI cpw -chA +xPv clc dsg dHb @@ -79378,7 +79254,7 @@ ctM cdw ceo chx -cVX +ukD ciQ cjS cjR @@ -79517,7 +79393,7 @@ aOh aXc aOh aPO -bWv +oJs aKw aKw aKw @@ -79532,17 +79408,17 @@ aJy aJy aJy aJy -bXv +wrV bYc bTi bTi bTi bTi bYc -bZs +pBb aJy aJy -bXv +wrV bTi bCy bTi @@ -79555,24 +79431,24 @@ cgi caI cgi cgU -chA -cif +xPv +kSQ caI bCy caI -chA +xPv clc clc clc clc -cif +kSQ rtW caI caI caI caI cpw -chA +xPv clc dsh dIh @@ -79604,7 +79480,7 @@ cfw idg cdC rZU -idg +osD oyf idg pUR @@ -79612,7 +79488,7 @@ ctM cdw ceo chx -cWC +qXJ cAl ciQ cjS @@ -79638,10 +79514,10 @@ dTs dTs dTs dTs -ckx -ckx -ckx -cYe +cgV +cgV +cgV +iHz gdW hqp uFX @@ -79751,7 +79627,7 @@ bdc aRM aPg aPO -bWv +oJs aKw aKw aKw @@ -79766,17 +79642,17 @@ aJy aJy aJy aJy -bXv +wrV bYc bTi bTi bTi bTi bYc -bZt -cbx -cbx -cci +pOv +uAT +uAT +inG bTi bCy bTi @@ -79789,24 +79665,24 @@ bwv caI cgi cgU -chB -cig +nET +kbZ caI bCy caI -chB -cld -cld -cld -cld -cig +nET +iZA +iZA +iZA +iZA +kbZ rtW caI caI caI caI cpw -chA +xPv clc clc dsh @@ -79846,7 +79722,7 @@ ctM cdw ceo chx -cAm +nHz cXp ciQ ciQ @@ -79875,8 +79751,8 @@ dTs dTs cAZ cAZ -dsU -cXn +uaW +rVH hqp uFX rpQ @@ -80000,7 +79876,7 @@ aXS aJy aJy aJy -bXv +wrV blM bir biP @@ -80015,7 +79891,7 @@ bhk btQ bvj bwu -bwv +hgY bwv bwv bwv @@ -80040,7 +79916,7 @@ ozu ozu xsS mfK -chA +xPv clc clc clc @@ -80080,7 +79956,7 @@ nYZ cdw cen czC -cAm +nHz cYf cAl ciQ @@ -80109,8 +79985,8 @@ cAZ cAZ cAZ cAZ -dtX -cXo +fLl +oFV hqp rpQ rpQ @@ -80234,7 +80110,7 @@ aZe aXS aJy aJy -bXv +wrV blM bir bki @@ -80249,8 +80125,8 @@ bhk btS bvk bwv -bwv -bwv +xUC +xuY bwv bwv bwv @@ -80274,7 +80150,7 @@ uml vgm xsS mfK -chA +xPv clc clc clc @@ -80306,15 +80182,15 @@ cfw dPY dPY cht -poi -qEJ +rRL +ilg poi cix nYZ cdw ceo chx -cAm +nHz cAZ cYf cAl @@ -80343,7 +80219,7 @@ cuQ djx cAZ cAZ -dtY +klt gdW cWy qKE @@ -80468,7 +80344,7 @@ aKw aZe aXS aJy -bXv +wrV blM bir biP @@ -80508,7 +80384,7 @@ ozu ozu xsS mfK -chA +xPv clc clc clc @@ -80535,10 +80411,10 @@ dTs cdF cdw cdw -coH +pmt cfw cge -cgL +wbq rZU dPY idg @@ -80548,7 +80424,7 @@ nYZ cdw ceo chx -cAm +nHz cAZ cAZ cYf @@ -80577,7 +80453,7 @@ ciQ cnC cuQ djx -dtY +klt gdW gdW gdW @@ -80665,7 +80541,7 @@ asx asA asG aud -aud +iUm avq aow dTs @@ -80693,26 +80569,26 @@ dTs dTs dTs dTs -and -ard +ftM +uMM anb bcY bdK bdt -bjK -blg -bXz -bjs +idl +lnI +lRz +nUp bYc bTi bTi bTi bTi bYc -bYJ -cbw -cbw -cch +qYs +wNc +wNc +bnY bTi bCy bTi @@ -80725,24 +80601,24 @@ bwv caI cgi cgU -chz -cie +oEl +xbs caI bCy caI -chz -ciE -ciE -ciE -ciE -cie +oEl +hGn +hGn +hGn +hGn +xbs rtW caI caI caI caI cpw -chA +xPv clc clc clc @@ -80751,7 +80627,7 @@ dsh dIh dLr dLC -ccf +xnO dTs dTs dTs @@ -80776,13 +80652,13 @@ dPY rZU idg idg -dPY +jiF chr nYZ cdw ceo chx -cAm +nHz cAZ cAZ cAZ @@ -80811,7 +80687,7 @@ ciQ ciQ ciQ cYh -dtY +klt gdW gdW gdW @@ -80899,7 +80775,7 @@ asx asA aow aue -aud +tJc avq aow dTs @@ -80928,12 +80804,12 @@ dTs dTs dTs dTs -bjL -bXA -and -and -bek -bXj +epJ +bok +ftM +ftM +phA +oXD bhk bhk bhk @@ -80943,10 +80819,10 @@ bTi bTi bTi bYc -bZs +pBb aJy aJy -bXv +wrV bTi bCy bTi @@ -80959,24 +80835,24 @@ cgi caI cgi cgU -chA -cif +xPv +kSQ caI bCy caI -chA +xPv clc clc clc clc -cif +kSQ rtW caI caI caI caI cpw -chA +xPv clc clc clc @@ -80985,7 +80861,7 @@ clc dsg dHb dLq -ccf +xnO cdA dTs dTs @@ -81016,7 +80892,7 @@ ctM cdw ceo chx -cAm +nHz cAZ cAZ cAZ @@ -81045,8 +80921,8 @@ ciQ ciQ ciQ cnC -djy -djz +pRi +iYq aTj gdW gdW @@ -81177,10 +81053,10 @@ bYF bYF bYF bYc -caL -cby -cby -ccj +fUI +pah +pah +uOC bYF bCy bTi @@ -81193,24 +81069,24 @@ bwv caI cgi cgU -chB -cig +nET +kbZ caI bCy cgC -ciD -cle -cle -clf +qif +kKR +kKR +vvI clh -clk +nOq rtW cgC cgC cgC cgC cpw -cpU +pWI czj clc clc @@ -81219,7 +81095,7 @@ clc dsh dIh dLr -dLI +xJC cdA cdv dTs @@ -81250,7 +81126,7 @@ ctM cdw ceo chx -cAm +nHz cAZ cAZ cAZ @@ -81280,7 +81156,7 @@ clE ciQ ciQ ciQ -dkK +vdI drg cZc gdW @@ -81435,16 +81311,16 @@ ejR goq dCt dCt -clg -cli -cll +gmu +uSS +lUA rtW cog cog cog cog cpw -cpV +vQV czS czj clc @@ -81453,7 +81329,7 @@ clc clc dsh dIh -dLJ +nyc cdA cdw cdv @@ -81470,33 +81346,33 @@ dTs dTs dTs dTs -cdF -coH +pgb +oTg dPR -dPY -idg +ieR +qPB rZU -idg -ibE -cdC -chr +oAY +ueI +gIs +mVV ctM cdw ceo chx -cuT -cBa -cBa -cBa -cBa -cBa -cAX -ckn -cpv -chS -chS -chS -cZd +seX +tTM +tTM +tTM +tTM +tTM +tLD +hFF +lbq +nEW +nEW +nEW +hmK ciQ ciQ cjS @@ -81514,8 +81390,8 @@ cjQ clE ciQ ciQ -dnC -cYe +lzG +iHz gdW gdW hqp @@ -81678,16 +81554,16 @@ ozu ozu xsS mfK -cuR -cli -dsi +tcO +uSS +vyJ clc clc clc clc clc dsg -dLK +mfg cdA cdw cej @@ -81704,15 +81580,15 @@ dTs ceW ceW ceW -cer -coH +fsE +pPC cfw idg idg ute -dPY -dPY -idg +htl +htl +toR pUR aaY cdw @@ -81730,10 +81606,10 @@ cEf cCc cCc caH -dgW -chS -chS -cZd +oeJ +nEW +nEW +hmK ciQ cjS cjR @@ -81749,7 +81625,7 @@ cjQ clE ciQ cnC -dnD +mHC pSM gdW hqp @@ -81914,14 +81790,14 @@ xsS mfK dCt dCt -dsk +duN clc clc clc clc clc dsg -dLL +eRM cdA cdw cdw @@ -81938,14 +81814,14 @@ cer cdw cdw cdw -cdw -coK +pvv +syU cfw iAf uYD chq cdc -cdc +qdI cdc ciy ctN @@ -81967,7 +81843,7 @@ ceZ cnD caH caH -cUJ +tsN ciQ ciQ cjS @@ -81983,7 +81859,7 @@ cho cYi ciQ ciQ -dkK +vdI gdW gdW hqp @@ -82148,14 +82024,14 @@ xsS bUB bVD goq -dsW +gSB czj clc clc clc clc dsg -dLM +pMy ccN cdx cdw @@ -82170,20 +82046,20 @@ cgd cgd cgd cgd -cgd +rHx cgd cgd coL qVN dPY -cdC +eKL cht ccZ ccZ ccZ ccZ ccZ -ccZ +ogu ccZ ccZ poi @@ -82201,7 +82077,7 @@ cdw cpP ceX caH -cWC +qXJ djw cAl ciQ @@ -82217,7 +82093,7 @@ cho cYi ciQ ciQ -doN +wnw gdW gdW hqp @@ -82382,15 +82258,15 @@ xsS bUC bVE gQE -duy +koj dEY dib dib dib dib dLu -dLN -ccO +mlZ +kjd ccN cek chy @@ -82401,15 +82277,15 @@ cdC cda cdC cdC -cda -cdC +esX cdC +upP cda dPY dPY cda dPY -cdC +wIu dPY ibE cda @@ -82417,7 +82293,7 @@ cdC dPY slN cdC -idg +osD lFc ibE dPY @@ -82434,8 +82310,8 @@ cEf cdw cLj civ -cMN -cid +ygd +tPs cOk cYf djw @@ -82451,7 +82327,7 @@ cho cjQ clE ciQ -doO +iwW gdW gdW hqp @@ -82616,7 +82492,7 @@ xsS bUC bVE gQE -duy +koj dEY dib dib @@ -82624,8 +82500,8 @@ dib dib dLu dLO -ccP -cdy +kgV +xuj cel ceX cfw @@ -82638,19 +82514,19 @@ cdC cdb cdC dPY -sFe -dPY +tqw dPY +jPc cdb dPY dPY dPY idg -mTf -idg -ibE -xaB -ibE +uef +vQE +fPz +dLH +far dPY sFe idg @@ -82668,8 +82544,8 @@ cCc cdw cLj civ -cMO -cNC +lCq +esb cOk cOk dTs @@ -82685,7 +82561,7 @@ cho cho cYi ciQ -doO +iwW cZe gdW cWy @@ -82850,7 +82726,7 @@ xsS bUC bVE gQE -duy +koj dJB dLk dib @@ -82858,8 +82734,8 @@ dib dib dLu dLO -ccQ -cdz +uiq +wft dnP ceY cfw @@ -82871,19 +82747,19 @@ cdc cdc cdc cdc +kem cdc cdc -cdc -cdc +rgU cdc cdc cdc cdc cfA -sML -fEQ -sML -oHA +rWY +dnp +leH +iWF ctO ctO ctO @@ -82903,9 +82779,9 @@ cfa cpQ civ caH -cND -cOl -cOl +xsZ +rhb +rhb dTs dTs dTs @@ -82919,7 +82795,7 @@ cho cho cjQ clE -doO +iwW drg cZc gdW @@ -83084,7 +82960,7 @@ xsS bUC bVE gQE -dAB +ibL dJT dEY dib @@ -83092,7 +82968,7 @@ dib dib dLu dLO -ccR +uiM caH caH ceZ @@ -83109,11 +82985,11 @@ cjT cjT cjT cjT -cjT -cjT -cjT +dnV +sZe +xEA ceX -dPR +vFz cdC dPY dPY @@ -83153,7 +83029,7 @@ cho cho cho cYi -doO +iwW cZe cZc gdW @@ -83318,7 +83194,7 @@ xsS bUB bVD bWs -cAg +oHI dJT dEY dib @@ -83326,7 +83202,7 @@ dib dib dLu dLO -ccR +uiM ccM cen cdw @@ -83353,8 +83229,8 @@ cdC cdC cdC cdC -cdC -dPY +eKL +jAN dPY chr ciU @@ -83387,10 +83263,10 @@ cho cho cho cYi -dpD -dpE -ckx -cYe +xhS +wOX +cgV +iHz vud dNS dNS @@ -83532,8 +83408,8 @@ bxQ bBH brh aff -bFa -bFa +wGR +fSK bHz bIx bDx @@ -83552,7 +83428,7 @@ xsS bUC bVE gQE -cAg +oHI dJT dEY dib @@ -83560,7 +83436,7 @@ dib dib dLu dLO -ccR +uiM cdA ceo cdw @@ -83585,7 +83461,7 @@ csH dPZ cdc cdc -cdc +dvi cdc cdc dPZ @@ -83624,7 +83500,7 @@ cjQ clE cnC djx -dtY +klt vud dNS dNS @@ -83767,7 +83643,7 @@ bBH brh bDz bFa -bFa +dEU bFa bIy bDx @@ -83786,7 +83662,7 @@ xsS bUC bVE gQE -dCU +nKB dKA dEY dib @@ -83794,7 +83670,7 @@ dib dib dLu dLP -dLU +tqf cdA ceo cdw @@ -83858,7 +83734,7 @@ cho cYi ciQ cYh -dtY +klt vud dNS dNS @@ -83953,8 +83829,8 @@ axL ayx aCr ayB -ayT -azd +exp +vTE azm aCr dTs @@ -84020,7 +83896,7 @@ xsS bUC bVE gQE -bXo +xvd dLf dEY dib @@ -84028,7 +83904,7 @@ dib dib dLv dLA -dLV +ucq cdA ceo cdw @@ -84092,7 +83968,7 @@ cho cYi ciQ cnC -dnD +mHC vud jfA dNS @@ -84133,9 +84009,9 @@ gdW gdW dsT dzd -clo -cra -dFP +nyE +jIf +rvG dzd dwD gdW @@ -84189,7 +84065,7 @@ aCr ayE auq auq -azo +tPQ aCr dTs dTs @@ -84254,7 +84130,7 @@ xsS bUC bVE gQE -bXo +xvd dLf dEY dib @@ -84262,7 +84138,7 @@ dib dib dib dLu -dLV +ucq cdA ceo cdw @@ -84326,7 +84202,7 @@ cho cjQ clE ciQ -doN +wnw vud dNS dNS @@ -84367,9 +84243,9 @@ gdW gdW dsT dzd -clp +xbO crb -dFQ +jIl dzd dwD gdW @@ -84488,7 +84364,7 @@ xsS bUD bVD hcP -bXo +xvd dLf dEY dib @@ -84496,7 +84372,7 @@ dib dib dib dLu -dLW +uQO cdB cen cdw @@ -84560,7 +84436,7 @@ cho cho cYi ciQ -doO +iwW xxv wPb wPb @@ -84601,9 +84477,9 @@ dxe gdW dsT dzd -cmg +oLu crb -dGv +fTJ dzd dwD gdW @@ -84722,7 +84598,7 @@ xsS mfK dCt dCt -bXo +xvd dLf dEY dib @@ -84730,7 +84606,7 @@ dib dib dib dLu -dLX +tbp cdA ceo cdw @@ -84794,20 +84670,20 @@ cho cho cjQ clE -dpD -chm -clD -cmr -cnB -cUI -cUI -cUI -cUI -cUI -cUI -cUI -cUI -dkb +xhS +jGR +pTZ +fhT +toK +guF +guF +guF +guF +guF +guF +guF +guF +tOb hBr uFX jOe @@ -84822,9 +84698,9 @@ kMT gdW dNx dsT -dEo -dFS -dGB +twN +xfg +wxg dwD dxe dyi @@ -84835,14 +84711,14 @@ dxe gdW dsT dzd -cmQ -csg -dGw +lat +uif +ocL dzd dwD gdW -dIC -dJd +xeF +jtv gdW dTs dTs @@ -84889,7 +84765,7 @@ dTs dTs aCr ayI -auq +xTM azh azo aCr @@ -84955,8 +84831,8 @@ vgm xsS bUE hpw -hhj -bXp +lkw +wtr dLf dJB dLk @@ -84964,7 +84840,7 @@ dib dib dib dLu -dLX +tbp cdA ceo cdw @@ -84991,8 +84867,8 @@ dQh crE crE crE -dQc -dQz +nht +tFD dQE dPT cBe @@ -85001,7 +84877,7 @@ dQY dRe dRm dRE -dSg +mqe dSu dia cCf @@ -85040,8 +84916,8 @@ cOG cOG cOG cOG -cWE -dkc +kJD +qYd qKE qKE oQx @@ -85056,9 +84932,9 @@ sUe gdW dNx eiq -dFc +hmc cho -dHf +tVF dwD din dWu @@ -85075,10 +84951,10 @@ dAA dzd dwD gdW -dID -cWD -cUI -cUI +gYB +lRu +guF +guF dTs dTs dTs @@ -85123,9 +84999,9 @@ dTs dTs aCr ayJ -ayW -azi -azo +qKF +jcx +miV aCr dTs dTs @@ -85189,8 +85065,8 @@ ozu xsS bUE hqT -oNS -bXq +wla +mVD dLf dJT dEY @@ -85198,7 +85074,7 @@ dib dib dib dLu -dLX +tbp cdA ceo cdw @@ -85274,7 +85150,7 @@ djx cOG cOG cOG -cWF +lYt cUi mGo mGo @@ -85292,7 +85168,7 @@ gdW dNx cYg cho -dHg +jCx dwD din dyj @@ -85303,13 +85179,13 @@ din gdW dsT dzd -clo -cra -dFP +nyE +jIf +rvG dzd dwD gdW -dID +gYB cOG cOG cOG @@ -85358,7 +85234,7 @@ avG aCr aug aug -azj +gCC aug aCr dTs @@ -85424,7 +85300,7 @@ xsS mfK dCt dCt -dEj +dug dLg dJT dEY @@ -85432,7 +85308,7 @@ dib dib dib dLu -dLX +tbp cdA ceo cdw @@ -85508,7 +85384,7 @@ cnC djx cAZ dtH -duA +kcm vud dNS dlc @@ -85524,9 +85400,9 @@ sUe gdW gdW gdW -dFd -dGA -dHA +eUW +jtd +uHj dwD din dyj @@ -85537,13 +85413,13 @@ din gdW dsT dzd -cmQ -csg -dHc +lat +uif +fZB dzd dwD gdW -dID +gYB dJe dJe dJe @@ -85592,7 +85468,7 @@ axS axS axS ayL -azw +pIR azq hVs dTs @@ -85658,7 +85534,7 @@ xsS bUB bVD goq -cAg +oHI dJT dJT dEY @@ -85666,7 +85542,7 @@ dib dib dib dLu -dLX +tbp cdB cen cdw @@ -85742,7 +85618,7 @@ ciQ cnC cuQ cvK -doO +iwW vud dNS dNS @@ -85777,7 +85653,7 @@ com dtI dwE gdW -dJS +gcg dKL dKL dKL @@ -85892,7 +85768,7 @@ xsS bUC bVE gQE -cAg +oHI dJT dJT dEY @@ -85900,7 +85776,7 @@ dib dib dib dLu -dLX +tbp cdA ceo cdw @@ -85976,7 +85852,7 @@ chn chn chn chn -dvx +pnZ xxv wPb wPb @@ -86011,7 +85887,7 @@ dAo gdW gdW gdW -dKB +bDq cgq cgq cgq @@ -86035,7 +85911,7 @@ aiz ahr ahr aju -ahr +inV ahr anK ahr @@ -86126,7 +86002,7 @@ xsS bUC bVE gQE -cDQ +jKc dJT dLj cEW @@ -86134,7 +86010,7 @@ dib dib dib dLu -dLX +tbp cdA ceo cdw @@ -86210,42 +86086,42 @@ cho cho cho cho -dvy -clD -cmr -cxW +iGz +pTZ +fhT +eME coF dfc dgD dNR dTH coF -jsN -chT -dvB -dvB -dDI -dEn -dEn -dEn -dEn -dEn -dFS -dvB +oKL +cqN +fOl +fOl +sYR +kpG +kpG +kpG +kpG +kpG +xfg +fOl dzr -cfD -cfD -cfD -cgr -cgs -cgs -cgs -cgs -dHd -dIG -dII -dJA -dHy +hBO +hBO +hBO +wUA +qps +qps +qps +qps +eBe +gOd +xFe +fTg +pES cgq dKN dJf @@ -86360,7 +86236,7 @@ xsS bUC bVE gQE -duy +koj dJT dEY dib @@ -86368,7 +86244,7 @@ dib dib dib dLu -dLY +xQO cdA ceo cdw @@ -86447,14 +86323,14 @@ cho cjQ chn chn -cyR +lFe cAf czV czV czV czV cAf -cAi +gfs chU cho cho @@ -86594,7 +86470,7 @@ xsS bUC bVE gQE -duy +koj dJT dEY dib @@ -86602,7 +86478,7 @@ dib dib dib dLu -dLV +ucq cdA ceo cdw @@ -86730,11 +86606,11 @@ eei (154,1,1) = {" acu afG -ajx -akx -akx -akx -aTI +sUV +rbJ +rbJ +rbJ +xKH afG agQ ahr @@ -86828,7 +86704,7 @@ xsS bUB bVD bWs -dAB +ibL dJT dEY dib @@ -86836,7 +86712,7 @@ dib dib dLt dLz -dLV +ucq cdB cen cdw @@ -86964,18 +86840,18 @@ eei (155,1,1) = {" acu afG -ajy +pYL afN afN afN -amd +pAB agH agQ ahr ahr agQ agH -amr +ucG aoP akO api @@ -87062,7 +86938,7 @@ xsS bUC bVE gQE -cAg +oHI dJT dEY dib @@ -87070,7 +86946,7 @@ dib dib dLu dJT -dLV +ucq cdA ceo cdw @@ -87198,11 +87074,11 @@ eei (156,1,1) = {" acu afG -ajy +pYL afN afN afN -amj +qvk amE ahr ahr @@ -87296,7 +87172,7 @@ xsS bUC bVE gQE -dCU +nKB dKA dEY dib @@ -87304,7 +87180,7 @@ dib dib dLu dLQ -dLZ +owk cdA ceo cdw @@ -87432,11 +87308,11 @@ acu (157,1,1) = {" acu afG -ajy +pYL jJE afN afN -amk +oMK ahr ahr ahr @@ -87530,7 +87406,7 @@ xsS bUC bVE gQE -uMG +jxO dLf dEY dib @@ -87538,7 +87414,7 @@ dib dib dLu dLO -ccR +uiM cdA ceo cdw @@ -87624,7 +87500,7 @@ czV czV czV cAf -cAj +tDs chp chp chp @@ -87666,11 +87542,11 @@ acu (158,1,1) = {" acu afG -ajy +pYL afN afN afN -amd +pAB agH agQ aiz @@ -87764,7 +87640,7 @@ xsS bUC bVE gQE -uMG +jxO dLf dEY dib @@ -87772,7 +87648,7 @@ dib dib dLu dLO -ccR +uiM cdA ceo cdw @@ -87851,14 +87727,14 @@ ciQ ciQ cjS chp -czB +aUJ cAf czX czX cho czX cAf -cAk +mDv djw cAl ciQ @@ -87900,11 +87776,11 @@ acu (159,1,1) = {" acu afG -ajN -akC -akC -akC -aml +mvM +gOG +gOG +gOG +tYW afG amR ahr @@ -87913,7 +87789,7 @@ agQ agH amr aoP -akO +fXL eNU aug aun @@ -87998,15 +87874,15 @@ xsS bUD bVD hcP -jvZ -dLh -dLl +mlS +vIv +tby dib dib dib -beZ -aac -bii +xFr +wbm +ghs ccN cen cdw @@ -88021,7 +87897,7 @@ cjv cke ckP clO -cZK +nTW jVr coT lKY @@ -88079,28 +87955,28 @@ dTs dTs dTs dTs -dgX -dtG -duz -duz -duz -duz -cAe +mtO +asP +rPc +rPc +rPc +rPc +jvI coF dfc dgF jrV dTH coF -cuT -dgX -cAX -ckn -cpv -chS -chS -cjk -dHB +seX +mtO +tLD +hFF +lbq +nEW +nEW +hBs +jnX dTs dTs dTs @@ -88111,15 +87987,15 @@ dTs dTs dTs cln -cpd -dEZ -dHe -dHe -dJg -dJE -dKK -dgX -dgX +sFO +lIO +giS +giS +qdG +jCr +lDj +mtO +mtO dTs dTs dTs @@ -88161,7 +88037,7 @@ aqC avG ayb ayk -ayv +jMs ayj avH ayO @@ -88254,9 +88130,9 @@ ciU cjv cke ckO -clP -ckO -ckc +pdG +rnE +wEQ cka cpL dPu @@ -88503,7 +88379,7 @@ cwQ cxE cyh cyZ -dQI +ovE dQO cyZ cCq @@ -89552,7 +89428,7 @@ aqF anX aou aoK -api +jeo aug aun auq @@ -89636,15 +89512,15 @@ ozu xsS gFr dCt -aWs -dLi -dLp +mrU +orD +peH dib dib dib -dLF -dLT -ccO +ddH +hhk +kjd ccM cen cdw @@ -89869,8 +89745,8 @@ ozu ozu xsS hwc -hhj -cAh +lkw +kSL dJT dEY dib @@ -89878,7 +89754,7 @@ dib dib dLu dLO -ccR +uiM cdA ceo cdw @@ -90103,8 +89979,8 @@ oAM oAM vLd hwc -oNS -cDP +wla +tDV dLj cEW dib @@ -90112,7 +89988,7 @@ dib dib dLu dLP -dLU +tqf cdA ceo cdw @@ -90338,7 +90214,7 @@ hpw hpw kVU dCt -cAg +oHI dEY dib dib @@ -90346,7 +90222,7 @@ dib dib dLu dJT -dLV +ucq cdA ceo cdw @@ -90391,7 +90267,7 @@ cIK cLm cHL cMW -cNH +caz dTd cOm cPN @@ -90572,7 +90448,7 @@ cBZ abo abk abk -cDQ +jKc dEY dib dib @@ -90580,7 +90456,7 @@ dib dib dLu dJT -dLW +uQO cdA ceo cdw @@ -90806,7 +90682,7 @@ abU abO acA abk -duy +koj dEY dib dib @@ -90814,7 +90690,7 @@ dib dib dLu dJT -dLY +xQO cdB cen cdw @@ -91040,7 +90916,7 @@ abU abU abU abo -dEk +noh cEW dib dib @@ -91048,7 +90924,7 @@ dib dib dLu dJT -dLV +ucq cdA ceo cdw @@ -91274,7 +91150,7 @@ abU acA abO abo -dEl +oGr dib dib dib @@ -91282,7 +91158,7 @@ dib dib dLu dJT -dLV +ucq cdA ceo cdw @@ -91508,7 +91384,7 @@ abU iJC aVE abo -dEm +kub dib dib dib @@ -91516,7 +91392,7 @@ dib dLt dLz dJT -dLV +ucq cdA ceo cdw @@ -91742,7 +91618,7 @@ abU abU abU abo -dEW +ePP dib dib dib @@ -91750,7 +91626,7 @@ dib dLu dJT dJT -dLV +ucq cdA ceo cdw @@ -91929,7 +91805,7 @@ bAS bAS bAS bAS -byY +fcP azT aET aET @@ -91976,7 +91852,7 @@ abU abO aVR abk -dEW +ePP dib dib dib @@ -91984,7 +91860,7 @@ dib dLu dJT dLQ -dLZ +owk cdB cen cdw @@ -92210,7 +92086,7 @@ abk abk abk abk -dEW +ePP dib dib dib @@ -92218,7 +92094,7 @@ dLt dLz dJT dLO -ccR +uiM cdA cdw cdw @@ -92444,7 +92320,7 @@ dTs dTs dTs dTs -dEW +ePP dib dib dib @@ -92631,7 +92507,7 @@ aSi aSi aQq aPP -byY +fcP adA adA aCG @@ -92678,7 +92554,7 @@ dTs dTs dTs dTs -dEl +oGr dib dib dib @@ -92911,8 +92787,8 @@ wbv aHU dTs dTs -czT -dEX +jPC +uBl dib dib dib @@ -93067,9 +92943,9 @@ dTs dTs dTs akL -amr +nnL aot -akO +hbG aqa aqr dTs @@ -93121,8 +92997,8 @@ aGD aGH aGH aGH -aIB -aIR +vny +xDn aGH aGH aGH @@ -93145,7 +93021,7 @@ aTr aHA aGH ilq -cAg +oHI dEY dib dib @@ -93352,15 +93228,15 @@ aFi adA ajG aGH -akV -azU -azU -aHZ -aEh -azU -azU -azU -aDZ +nTQ +uCV +uCV +ubH +ncP +uCV +uCV +uCV +egc aGH wQM eqo @@ -93378,8 +93254,8 @@ bmA aHb aGc aGw -pWn -cAh +idt +kSL dEY dib dib @@ -93586,7 +93462,7 @@ aFi adA ajG aGH -alj +ogF aIl aIr azT @@ -93594,7 +93470,7 @@ aIU aIX aJj azT -aEf +nmB aGH wQM eqo @@ -93612,8 +93488,8 @@ aMf aHb aGc aGE -fRy -cDP +bOW +tDV dEY dib dib @@ -93771,7 +93647,7 @@ afP afP amr aot -akO +hbG aqa aqr dTs @@ -93820,7 +93696,7 @@ aFi adA ajG aGH -alj +ogF aIm aIs azT @@ -93828,7 +93704,7 @@ aIV aIY aJk aJC -aEf +nmB aGH aEq adA @@ -93847,7 +93723,7 @@ aHb baX bjQ ilq -cDQ +jKc dEY dib dib @@ -93857,7 +93733,7 @@ dLA dLP adR aOu -ccR +uiM xzm ciU cfw @@ -93988,7 +93864,7 @@ ajV akY aln aln -aiE +ewg amH alI ahe @@ -94005,7 +93881,7 @@ apw afP amr aot -akO +hbG aqb akL dTs @@ -94054,7 +93930,7 @@ aFi adA ajG aGH -alj +ogF aIn aIt aIC @@ -94062,7 +93938,7 @@ azT aIZ aJl aJD -aEf +nmB aGH aEq adA @@ -94080,8 +93956,8 @@ aUO aZI ouK ilq -bxU -cDR +wvx +tZk cEW dib dib @@ -94091,7 +93967,7 @@ dLu adC dLP adR -ccR +uiM caH aKv cfw @@ -94161,7 +94037,7 @@ dbw dbw ded dcw -dvn +lvu dqs dAg dFh @@ -94184,7 +94060,7 @@ cmN cnW cmH duC -dvD +eOU dwF dxf dym @@ -94288,7 +94164,7 @@ aFi adA ajG aGH -alj +ogF azT azT azT @@ -94296,7 +94172,7 @@ azT azT aJn aJE -aEf +nmB aGH aEq adA @@ -94313,8 +94189,8 @@ aMf aMf aZI ouK -bxS -bxV +kJO +viJ cEW dib dib @@ -94325,7 +94201,7 @@ dLv dLA dJT dLO -ccR +uiM caH aKv cfw @@ -94522,7 +94398,7 @@ aFi adA ajG aGH -alj +ogF aIo azT azT @@ -94530,7 +94406,7 @@ azT aJa aJo aJF -aEf +nmB aGH aEq adA @@ -94547,7 +94423,7 @@ aMg aMg aTr ouK -dEl +oGr dib dib dib @@ -94559,7 +94435,7 @@ dib dLu dJT dLO -ccR +uiM caH ciU cfw @@ -94756,7 +94632,7 @@ tai adA ajG aGH -alj +ogF azT azT azT @@ -94764,7 +94640,7 @@ azT aJb aJp aJG -aJN +lya aGH aEq adA @@ -94781,7 +94657,7 @@ aMf aMf aTr ouK -dEl +oGr dib dib dib @@ -94793,8 +94669,8 @@ dib dLu dJT dLO -ccP -auv +kgV +qMT civ cfw cdC @@ -94990,7 +94866,7 @@ aFi adA ajG aGH -alj +ogF azT azT azT @@ -94998,7 +94874,7 @@ azT azT aJq aJJ -aJO +hgR aGH wQM eqo @@ -95015,10 +94891,10 @@ aMf bmB aTr pAE -bxT -bxW -diM -dFR +gYm +rHb +veM +hsd dib dib dib @@ -95027,8 +94903,8 @@ dib dLu dJT dLO -ccQ -auX +uiq +eFo civ cfw cge @@ -95223,8 +95099,8 @@ aEZ aGl mZj aHH -aHK -aHZ +eNs +ubH azT azT aIo @@ -95232,7 +95108,7 @@ azT aJg azT aJK -aJP +mxY aGH wQM eqo @@ -95252,7 +95128,7 @@ pAE ilq ilq ilq -dEW +ePP dib dib dib @@ -95261,7 +95137,7 @@ dib dLu dLQ aeh -ccR +uiM caH ciU cfw @@ -95457,8 +95333,8 @@ aHy aEP aEP aGB -aHM -aIj +rrw +ugw azT azT azT @@ -95466,7 +95342,7 @@ azT azT azT azT -aEf +nmB aGH aEq aCG @@ -95486,7 +95362,7 @@ aGc aGw aHU ilq -dGu +tlj dib dib dib @@ -95495,7 +95371,7 @@ dib dLu dLO aOu -aeG +wxp caH ciU cfw @@ -95692,7 +95568,7 @@ adA adA ajG aGH -alj +ogF azT azT azT @@ -95700,7 +95576,7 @@ azT azT azT azT -aEf +nmB aGH aEq aEX @@ -95720,7 +95596,7 @@ aGc aGE feU ilq -dGz +fPK dLk dib dib @@ -95729,7 +95605,7 @@ dib dLu dLO aOu -ccR +uiM caH ciU cfw @@ -95926,15 +95802,15 @@ adA adA ajG aGH -azK -aAm -aAm -aIj -aEj -aAm -aAm -aAm -aEl +hXV +mdZ +mdZ +ugw +jBx +mdZ +mdZ +mdZ +ylK aGH aEq aEX @@ -95954,7 +95830,7 @@ baX aEx azO pDW -duy +koj dEY dib dib @@ -95963,7 +95839,7 @@ dib dLu dLO aOu -ccR +uiM caH ciU cfw @@ -96163,8 +96039,8 @@ aGM aGH aGH aGH -aID -aIW +hEv +kMr aGH aGH aGH @@ -96188,16 +96064,16 @@ bhw aEq adA hiN -dAB +ibL dJB dLk dib dib dib -aPv -dLR -bXq -ccR +woL +nLY +mVD +uiM caH ciU cfw @@ -96366,11 +96242,11 @@ adA adA aFN ajG -akV -azU -aAF -azU -aDZ +nTQ +uCV +eDx +uCV +egc aEq adA adA @@ -96422,16 +96298,16 @@ azO aRU dTs wIr -dCU +nKB dKA dEY dib dib dib -dMq +kRr caH -abg -aqw +qfr +wGI caH ciU cfw @@ -96600,11 +96476,11 @@ adA ajC adA ajG -alj +ogF azT aAM aCK -aEf +nmB aEq adA adA @@ -96645,7 +96521,7 @@ dTs dTs dTs akq -agK +wIC agK agK agC @@ -96656,13 +96532,13 @@ aCG dTs dTs ilq -aMm +fFh dLf dEY dib dib dib -dMq +kRr caH chZ civ @@ -96834,11 +96710,11 @@ adA adA adA ajG -alj +ogF aAe aBw azT -aEf +nmB aEr aEm adA @@ -96879,7 +96755,7 @@ dTs adA aFr qCR -aGi +xLb azT azT dTs @@ -96890,13 +96766,13 @@ dTs dTs dTs ilq -aMm +fFh dLf dEY dib dib dib -dMq +kRr ccM ank arv @@ -96974,7 +96850,7 @@ dzD dDK dDK dIm -dJV +bAk dDK dDK dDK @@ -97068,12 +96944,12 @@ adA adA adA ajG -alj +ogF aAf aBy azT -aEh -aEv +ncP +wxH aEz aEW aEW @@ -97124,13 +97000,13 @@ dTs dTs dTs pDW -aMn +rCr dLf dEY dib dib dib -dMq +kRr abe arw arw @@ -97302,12 +97178,12 @@ adA adA dZl ajG -alj +ogF aAg aBA aCK -aEj -aEw +jBx +lFi aEA aEP aEP @@ -97344,13 +97220,13 @@ adA adA adA aFr -aKE -aKQ -aKQ -aKQ -aKQ -aLz -aLE +idY +ere +ere +ere +ere +tkA +tRT aJV aLP aLV @@ -97358,13 +97234,13 @@ dTs dTs dTs hiN -aMm +fFh dLf dEY dib dib dib -dMq +kRr ccN cek cek @@ -97536,11 +97412,11 @@ adA adA adA ajG -alj +ogF aAk aCm aCK -aEf +nmB aEx aEy adA @@ -97578,13 +97454,13 @@ eqo eqo adA kmU -aKF -aGH +eJs +vdJ aGH -aGH -aGH -aGH -aLC +vdJ +vdJ +qqU +gFx aLI adA aLW @@ -97592,13 +97468,13 @@ aMf aLV aLP hiN -aMm +fFh dLf dEY dib dib dib -dMq +kRr caH caH anm @@ -97770,11 +97646,11 @@ adA aeo adA ajG -alj +ogF aAl aCs azT -aEf +nmB aEq adA adA @@ -97812,13 +97688,13 @@ ofB ofB aKe adA -aKF -aGH -aLf +eJs +qZF +hQS aLl -aLs -aGH -aLC +hJY +qqU +gFx jVv aLQ aLZ @@ -97826,13 +97702,13 @@ aMf aGH aLP wIr -aMm +fFh dLf dEY dib dib dib -dMq +kRr caH rjd aDf @@ -98004,11 +97880,11 @@ agC adA adA ajG -alj +ogF azT aCz azT -aEf +nmB aEq adA adA @@ -98046,13 +97922,13 @@ aGf aHx aGn adA -aKF -aGH +eJs +pob aLg aLm aLt -aGH -aLC +qqU +gFx adA aLI ajG @@ -98060,18 +97936,18 @@ aGH aMi aLP ilq -dEj +dug dLg dEY dib dib dib -dMq +kRr bnA arx -atC -aeH -aft +vTY +vCe +qZq ahA bnA chZ @@ -98093,7 +97969,7 @@ aXq aOI aTM aVD -aYb +hKf aXh aXh biX @@ -98238,11 +98114,11 @@ aDY adA adA ajG -azK -aAm -aAm -aAm -aEl +hXV +mdZ +mdZ +mdZ +ylK aEq kmU adA @@ -98280,32 +98156,32 @@ aGq aGd aGn adA -aKF -aGH -aLi +eJs +fEU +jwt aLn -aLu +fiY aGH -aLC +gFx adA aLR -aMc +tlo aGH aGH aLP ilq -cAg +oHI dJT dEY dib dib dib -adG +jVg bnA aOo -dMf +ffO dib -atW +xqV ahA bnA chZ @@ -98327,7 +98203,7 @@ aXu aOH aTM aVV -aXh +bIp aXh aYb aXh @@ -98514,32 +98390,32 @@ adA aEZ aGn aHT -aKF -aGH -aLj -aLo -aGH -aGH -aLF +eJs +qZF +rbV +vNW +hgz +qqU +bVL adA adA -aMd +qKN aMf aMk aLV ilq -cAg +oHI dLj cEW dib dib dib -adH +wKH bnA aOo -dMf +ffO dib -atW +xqV ahA bnA aSH @@ -98677,8 +98553,8 @@ amz anD anP anP -wIl -apl +rKE +ggz aoF apl anP @@ -98745,16 +98621,16 @@ eqo adA adA kmU -aEZ +nhi aGl aJh -aKG -aKR -aLg -aLn -aLw -aLA -aLG +rzd +sei +vbC +vvL +uuv +fBL +qYM aEW aLT aLZ @@ -98762,18 +98638,18 @@ aMg fbK aGH ilq -cDQ +jKc dEY dib dib dib dib -adH +wKH aof arx -asT +pHS dib -atW +xqV ahA bnA aSH @@ -98980,14 +98856,14 @@ adA adA adA aEZ -aFf +kgt aGf -aKJ -aKS -aLk +iof +pbX +mBP aLp -aLx -aLB +kPU +oZu leZ aLJ aLU @@ -98996,18 +98872,18 @@ aGM aGH aGH ilq -duy +koj dEY dib dib dib dib -adH +wKH aof arx -asT +pHS dib -atW +xqV ahA bnA aSH @@ -99216,12 +99092,12 @@ adA aEZ aFi adA -aKF +eJs aGH aGH +uvg aGH -aGH -aLC +gFx adA adA adA @@ -99230,18 +99106,18 @@ aMh aMf aMf ilq -duy +koj dEY dib dib dib dib -adH +wKH aof arx -asZ -atB -atX +ghh +xvF +nik ahA bnA aSH @@ -99378,7 +99254,7 @@ amz amz apj anP -anS +hNn aod aoT aoT @@ -99450,27 +99326,27 @@ adA pyP rpc adA -aKK -aLe -aLe -aLe -aLe -aLD -adA +mYT +qIc +qIc +qIc +qIc +iPi adA adA +svH adA aMh aLP aMg ilq -duy +koj dEY dib dib dib dib -adH +wKH bnA aeP afM @@ -99612,7 +99488,7 @@ amz amz apj anP -anT +ggz aod aFA aoT @@ -99621,7 +99497,7 @@ aqd aqd anP arl -aqs +kmj aoT asJ anQ @@ -99685,7 +99561,7 @@ aHy aFj dic adA -adA +llZ adA dTs dTs @@ -99698,13 +99574,13 @@ dTs dTs dTs ilq -duy +koj dEY dib dib dib dib -adJ +rnp bnA bnA bnA @@ -99846,7 +99722,7 @@ amz amz apj anP -anS +ino aod aoT aoT @@ -99918,7 +99794,7 @@ lVW lVW lVW aKj -aKL +rXG adA adA aCG @@ -99932,13 +99808,13 @@ dTs dTs dTs ilq -duy +koj dEY dib dib dib dib -dMq +kRr aoi aoi aNU @@ -100080,7 +99956,7 @@ amz ant anD anP -anT +lah aod aoT aoT @@ -100166,13 +100042,13 @@ dTs dTs dTs ilq -duy +koj dEY dib dib dib dib -dMq +kRr aoi asO avp @@ -100400,13 +100276,13 @@ dTs dTs dTs ilq -dAB +ibL dJB dLk dib dib dib -dMq +kRr aNU asQ avv @@ -100634,13 +100510,13 @@ dTs dTs dTs ilq -cAg +oHI dJT dEY dib dib dib -dMq +kRr aNU asS aNy @@ -100786,7 +100662,7 @@ aoc aoS aFA aoT -aoT +rdo aqs aoT aoT @@ -100868,13 +100744,13 @@ dTs dTs dTs dTs -cAg +oHI dJT dEY dib dib dib -dMq +kRr aoi atY aNy @@ -101108,7 +100984,7 @@ cEW dib dib dib -dMq +kRr aoi atZ aNy @@ -101253,13 +101129,13 @@ anQ aoA aoT aoT -aoT +bIL aoT aoT aFA aoT aoT -aoT +rdo aoT apF anQ @@ -101342,7 +101218,7 @@ dib dib dib dib -dMq +kRr aoi auZ aNy @@ -101810,7 +101686,7 @@ bLJ bLJ bLJ bLJ -adL +icY aoi aoi aNU @@ -102044,7 +101920,7 @@ bLJ bLJ bLJ ack -adM +lAu bnA bnA bnA @@ -102183,7 +102059,7 @@ akK akK amz amz -amz +oey aoq amz amz @@ -102278,7 +102154,7 @@ bLJ bLJ bLJ acr -adN +pib bnA bXB bul @@ -102512,7 +102388,7 @@ bLJ bLJ bLJ acr -adN +pib bnA atc buh @@ -102650,7 +102526,7 @@ akk akk akk amx -amz +kmK amz anv anq @@ -102728,12 +102604,12 @@ aBL dTs dTs dTs -aBO -aBR -uKo -uKo -uKo -fiW +pEZ +xXY +mmL +mmL +mmL +sLN dTs dTs dTs @@ -102746,10 +102622,10 @@ bLJ bLJ bLJ adp -adP +cqp bnA -ate -awn +njp +fYg bnA bnA aPd @@ -102980,10 +102856,10 @@ bLJ bLJ bLJ bLJ -adQ -adS -ael -aeI +qKT +eBd +uYE +wHO bnA aOm aPk @@ -103217,7 +103093,7 @@ bLJ bLJ adp aey -aeJ +ezQ bnA aOo aeV @@ -103451,16 +103327,16 @@ bLJ bLJ bLJ bLJ -bUN +bvt aeV aOq -afL -agJ +gBE +lYK aeV -afL -avT -avT -agJ +gBE +rrJ +rrJ +lYK ahA bnA aSH @@ -103685,16 +103561,16 @@ bLJ bLJ bLJ bLJ -bUN +bvt aeV aOq -agl -bUN +gNd +bvt aeV -agl +gNd bLJ bLJ -bUN +bvt ahA bnA aSH @@ -103825,7 +103701,7 @@ app arq asw atJ -aus +xDb axA aas dTs @@ -103919,16 +103795,16 @@ bLJ bLJ bLJ bLJ -bUN +bvt aeV aOq -ags -ahv +fWC +nsx aeV -ags -awm -awm -ahv +fWC +nVL +nVL +nsx ahA bnA aSH @@ -104153,7 +104029,7 @@ bLJ bLJ bLJ ack -aeK +fxw bnA aOo aeV @@ -104387,7 +104263,7 @@ bLJ bLJ ack adU -adN +pib bnA aeP afM @@ -104595,9 +104471,9 @@ aBE aBE aBE aAv -hoc -gCS -rQQ +wtu +uIn +hJy qJU ooQ aCk @@ -104621,7 +104497,7 @@ bLJ ack adU adX -aeN +hYy aeO aeQ aMH @@ -104829,9 +104705,9 @@ aBE aBE aBE aAv -rCp -mth -fgo +ngw +wFU +jon qJU aCk aBL @@ -104855,7 +104731,7 @@ bLJ acr adX aeF -ccR +uiM bYN bkP dTs @@ -105063,9 +104939,9 @@ qjg azB aBE aAv -hnJ -hpL -mkU +ntQ +nqg +uRy qJU aBE qjg @@ -105089,7 +104965,7 @@ bLJ acr aeb aOu -ccR +uiM bWI dTs dTs diff --git a/maps/map_files/DesertDam/greenriver/newbridge.dmm b/maps/map_files/DesertDam/greenriver/newbridge.dmm index df19de868c79..96599acb3f76 100644 --- a/maps/map_files/DesertDam/greenriver/newbridge.dmm +++ b/maps/map_files/DesertDam/greenriver/newbridge.dmm @@ -3,19 +3,13 @@ /turf/open/asphalt/tile, /area/desert_dam/exterior/valley/valley_bridge) "ab" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, /obj/effect/blocker/toxic_water/Group_2, /turf/open/desert/desert_shore/shore_corner2/north, /area/desert_dam/exterior/river/riverside_east) "ac" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, +/obj/structure/platform_decoration/metal/almayer/east, /obj/effect/blocker/toxic_water/Group_2, /turf/open/gm/river/desert/shallow_edge/west, /area/desert_dam/exterior/river/riverside_east) @@ -24,9 +18,7 @@ /turf/open/gm/river/desert/deep, /area/desert_dam/exterior/river/riverside_east) "ae" = ( -/obj/structure/platform{ - dir = 4 - }, +/obj/structure/platform/metal/almayer/east, /obj/effect/blocker/toxic_water/Group_2, /turf/open/gm/river/desert/shallow_corner, /area/desert_dam/exterior/river/riverside_east) @@ -49,16 +41,12 @@ /turf/closed/wall/rock/orange, /area/desert_dam/exterior/rock) "ak" = ( -/obj/structure/platform{ - dir = 1 - }, +/obj/structure/platform/metal/almayer/north, /obj/effect/blocker/toxic_water/Group_2, /turf/open/desert/desert_shore/shore_corner2/north, /area/desert_dam/exterior/river/riverside_east) "al" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, +/obj/structure/platform_decoration/metal/almayer/east, /obj/effect/blocker/toxic_water/Group_2, /turf/open/gm/river/desert/shallow_edge/northwest, /area/desert_dam/exterior/river/riverside_east) @@ -67,9 +55,7 @@ /turf/open/gm/river/desert/shallow_corner/north, /area/desert_dam/exterior/river/riverside_east) "an" = ( -/obj/structure/platform{ - dir = 4 - }, +/obj/structure/platform/metal/almayer/east, /obj/effect/blocker/toxic_water/Group_2, /turf/open/gm/river/desert/deep, /area/desert_dam/exterior/river/riverside_east) @@ -102,20 +88,14 @@ /turf/open/gm/river/desert/shallow_edge/north, /area/desert_dam/exterior/river/riverside_east) "au" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, +/obj/structure/platform_decoration/metal/almayer/west, /obj/effect/blocker/toxic_water/Group_2, /turf/open/gm/river/desert/deep, /area/desert_dam/exterior/river/riverside_east) "av" = ( -/obj/structure/platform{ - dir = 1 - }, +/obj/structure/platform/metal/almayer/north, /obj/effect/blocker/toxic_water/Group_2, -/obj/structure/platform{ - dir = 4 - }, +/obj/structure/platform/metal/almayer/east, /turf/open/gm/river/desert/deep, /area/desert_dam/exterior/river/riverside_east) "aw" = ( @@ -127,41 +107,29 @@ /turf/open/gm/river/desert/shallow_edge/covered/east, /area/desert_dam/exterior/river/riverside_east) "ay" = ( -/obj/structure/platform{ - dir = 1 - }, +/obj/structure/platform/metal/almayer/north, /obj/effect/blocker/toxic_water/Group_2, -/obj/structure/platform{ - dir = 8 - }, +/obj/structure/platform/metal/almayer/west, /turf/open/gm/river/desert/shallow, /area/desert_dam/exterior/river/riverside_east) "az" = ( -/obj/structure/platform{ - dir = 1 - }, +/obj/structure/platform/metal/almayer/north, /obj/effect/blocker/toxic_water/Group_2, /turf/open/desert/desert_shore/shore_corner2/west, /area/desert_dam/exterior/river/riverside_east) "aA" = ( -/obj/structure/platform{ - dir = 1 - }, +/obj/structure/platform/metal/almayer/north, /obj/effect/blocker/toxic_water/Group_2, /turf/open/desert/desert_shore/shore_edge1/east, /area/desert_dam/exterior/river/riverside_east) "aB" = ( -/obj/structure/platform{ - dir = 1 - }, +/obj/structure/platform/metal/almayer/north, /obj/effect/blocker/toxic_water/Group_2, /turf/open/desert/dirt/dirt2, /area/desert_dam/exterior/river/riverside_east) "aC" = ( /obj/effect/blocker/toxic_water/Group_2, -/obj/structure/platform{ - dir = 4 - }, +/obj/structure/platform/metal/almayer/east, /turf/open/gm/river/desert/deep, /area/desert_dam/exterior/river/riverside_east) "aD" = ( @@ -170,9 +138,7 @@ /area/desert_dam/exterior/river/riverside_east) "aE" = ( /obj/effect/blocker/toxic_water/Group_2, -/obj/structure/platform{ - dir = 8 - }, +/obj/structure/platform/metal/almayer/west, /turf/open/gm/river/desert/shallow_edge/north, /area/desert_dam/exterior/river/riverside_east) "aF" = ( @@ -189,9 +155,7 @@ /area/desert_dam/exterior/river/riverside_east) "aI" = ( /obj/effect/blocker/toxic_water/Group_2, -/obj/structure/platform{ - dir = 8 - }, +/obj/structure/platform/metal/almayer/west, /turf/open/gm/river/desert/deep, /area/desert_dam/exterior/river/riverside_east) "aJ" = ( @@ -220,16 +184,14 @@ /turf/open/gm/river/desert/shallow, /area/desert_dam/exterior/river/riverside_east) "aP" = ( -/obj/structure/platform_decoration, +/obj/structure/platform_decoration/metal/almayer, /obj/effect/blocker/toxic_water/Group_2, /turf/open/gm/river/desert/shallow_edge, /area/desert_dam/exterior/river/riverside_east) "aQ" = ( -/obj/structure/platform, +/obj/structure/platform/metal/almayer, /obj/effect/blocker/toxic_water/Group_2, -/obj/structure/platform{ - dir = 4 - }, +/obj/structure/platform/metal/almayer/east, /turf/open/gm/river/desert/shallow_edge, /area/desert_dam/exterior/river/riverside_east) "aR" = ( @@ -238,19 +200,17 @@ /area/desert_dam/exterior/river/riverside_east) "aS" = ( /obj/effect/blocker/toxic_water/Group_2, -/obj/structure/platform, -/obj/structure/platform{ - dir = 8 - }, +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/west, /turf/open/gm/river/desert/shallow_edge, /area/desert_dam/exterior/river/riverside_east) "aT" = ( -/obj/structure/platform, +/obj/structure/platform/metal/almayer, /obj/effect/blocker/toxic_water/Group_2, /turf/open/gm/river/desert/shallow_edge, /area/desert_dam/exterior/river/riverside_east) "aU" = ( -/obj/structure/platform, +/obj/structure/platform/metal/almayer, /obj/effect/blocker/toxic_water/Group_2, /obj/effect/blocker/toxic_water/Group_2, /turf/open/gm/river/desert/shallow_edge, @@ -264,9 +224,7 @@ /turf/open/desert/desert_shore/desert_shore1, /area/desert_dam/exterior/river/riverside_east) "aX" = ( -/obj/structure/platform{ - dir = 4 - }, +/obj/structure/platform/metal/almayer/east, /obj/effect/blocker/toxic_water/Group_2, /turf/open/desert/desert_shore/desert_shore1, /area/desert_dam/exterior/river/riverside_east) @@ -287,18 +245,14 @@ /turf/open/desert/dirt/dirt2, /area/desert_dam/exterior/river/riverside_east) "bd" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, +/obj/structure/platform_decoration/metal/almayer/west, /turf/open/desert/dirt/dirt2, /area/desert_dam/exterior/river/riverside_east) "be" = ( /obj/structure/stairs{ dir = 8 }, -/obj/structure/platform{ - dir = 1 - }, +/obj/structure/platform/metal/stair_cut/platform_right, /turf/open/asphalt/cement_sunbleached/cement_sunbleached2, /area/desert_dam/exterior/valley/valley_medical) "bf" = ( @@ -314,28 +268,26 @@ /turf/open/asphalt/cement_sunbleached/cement_sunbleached9, /area/desert_dam/exterior/valley/valley_medical) "bi" = ( -/obj/structure/platform, +/obj/structure/platform/metal/almayer, /turf/open/desert/dirt/dirt2, /area/desert_dam/exterior/river/riverside_east) "bj" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, +/obj/structure/platform_decoration/metal/almayer/north, /turf/open/desert/dirt/dirt2, /area/desert_dam/exterior/river/riverside_east) "bk" = ( -/obj/structure/platform_decoration, +/obj/structure/platform_decoration/metal/almayer, /turf/open/desert/dirt/dirt2, /area/desert_dam/exterior/river/riverside_east) "bl" = ( /obj/structure/stairs{ dir = 8 }, -/obj/structure/platform, +/obj/structure/platform/metal/almayer, /turf/open/asphalt/cement_sunbleached/cement_sunbleached14, /area/desert_dam/exterior/valley/valley_medical) "bm" = ( -/obj/structure/platform, +/obj/structure/platform/metal/almayer, /turf/open/asphalt/cement_sunbleached, /area/desert_dam/exterior/valley/valley_medical) "bn" = ( @@ -348,18 +300,14 @@ /obj/structure/stairs{ dir = 1 }, -/obj/structure/platform{ - dir = 8 - }, +/obj/structure/platform/metal/almayer/west, /turf/open/asphalt/cement_sunbleached/cement_sunbleached3, /area/desert_dam/exterior/valley/valley_medical) "bp" = ( /obj/structure/stairs{ dir = 1 }, -/obj/structure/platform{ - dir = 4 - }, +/obj/structure/platform/metal/almayer/east, /turf/open/asphalt/cement_sunbleached/cement_sunbleached1, /area/desert_dam/exterior/valley/valley_medical) diff --git a/maps/map_files/DesertDam/purpleriver/newbridge.dmm b/maps/map_files/DesertDam/purpleriver/newbridge.dmm index 7cc7eac77db1..59c17d216912 100644 --- a/maps/map_files/DesertDam/purpleriver/newbridge.dmm +++ b/maps/map_files/DesertDam/purpleriver/newbridge.dmm @@ -24,12 +24,8 @@ /turf/open/asphalt/cement_sunbleached, /area/desert_dam/exterior/valley/valley_medical) "af" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, /obj/effect/blocker/toxic_water/Group_1, /turf/open/gm/river/desert/shallow, /area/desert_dam/exterior/river/riverside_south) @@ -79,9 +75,7 @@ /turf/open/asphalt/cement_sunbleached/cement_sunbleached9, /area/desert_dam/exterior/valley/valley_medical) "an" = ( -/obj/structure/platform{ - dir = 4 - }, +/obj/structure/platform/metal/almayer/east, /obj/effect/blocker/toxic_water/Group_1, /turf/open/gm/river/desert/shallow, /area/desert_dam/exterior/river/riverside_south) @@ -102,61 +96,43 @@ /area/desert_dam/exterior/valley/valley_medical) "as" = ( /obj/structure/stairs, -/obj/structure/platform{ - dir = 8 - }, +/obj/structure/platform/metal/almayer/west, /turf/open/asphalt/tile, /area/desert_dam/exterior/valley/valley_medical) "at" = ( /obj/structure/stairs, -/obj/structure/platform{ - dir = 4 - }, +/obj/structure/platform/metal/almayer/east, /turf/open/asphalt/tile, /area/desert_dam/exterior/valley/valley_medical) "au" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached3, /area/desert_dam/exterior/valley/valley_medical) "av" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, +/obj/structure/platform_decoration/metal/almayer/west, /obj/effect/blocker/toxic_water/Group_1, /turf/open/gm/river/desert/shallow, /area/desert_dam/exterior/river/riverside_south) "aw" = ( -/obj/structure/platform{ - dir = 1 - }, +/obj/structure/platform/metal/almayer/north, /obj/effect/blocker/toxic_water/Group_1, /turf/open/desert/desert_shore/shore_corner2/west, /area/desert_dam/exterior/river/riverside_south) "ax" = ( -/obj/structure/platform{ - dir = 1 - }, +/obj/structure/platform/metal/almayer/north, /obj/effect/blocker/toxic_water/Group_1, /turf/open/desert/desert_shore/shore_edge1/east, /area/desert_dam/exterior/river/riverside_south) "ay" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, +/obj/structure/platform_decoration/metal/almayer/east, /turf/open/desert/dirt/dirt2, /area/desert_dam/exterior/valley/valley_medical) "az" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, +/obj/structure/platform_decoration/metal/almayer/west, /turf/open/desert/dirt/dirt2, /area/desert_dam/exterior/valley/valley_medical) "aA" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, /turf/open/desert/dirt/dirt2, /area/desert_dam/exterior/valley/valley_medical) "aB" = ( @@ -171,9 +147,7 @@ /turf/open/desert/dirt/dirt2, /area/desert_dam/exterior/valley/valley_medical) "aE" = ( -/obj/structure/platform{ - dir = 4 - }, +/obj/structure/platform/metal/almayer/east, /turf/open/desert/dirt/dirt2, /area/desert_dam/exterior/valley/valley_medical) "aF" = ( @@ -205,36 +179,32 @@ /area/desert_dam/exterior/river/riverside_south) "aM" = ( /obj/effect/blocker/toxic_water/Group_1, -/obj/structure/platform_decoration, +/obj/structure/platform_decoration/metal/almayer, /turf/open/gm/river/desert/deep, /area/desert_dam/exterior/river/riverside_south) "aN" = ( /obj/effect/blocker/toxic_water/Group_1, -/obj/structure/platform, +/obj/structure/platform/metal/almayer, /turf/open/gm/river/desert/deep, /area/desert_dam/exterior/river/riverside_south) "aO" = ( /obj/effect/blocker/toxic_water/Group_1, -/obj/structure/platform, +/obj/structure/platform/metal/almayer, /turf/open/gm/river/desert/shallow_edge/east, /area/desert_dam/exterior/river/riverside_south) "aP" = ( /obj/effect/blocker/toxic_water/Group_1, -/obj/structure/platform, +/obj/structure/platform/metal/almayer, /turf/open/gm/river/desert/shallow, /area/desert_dam/exterior/river/riverside_south) "aQ" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform/metal/almayer, /turf/open/gm/river/desert/shallow, /area/desert_dam/exterior/river/riverside_south) "aR" = ( /obj/effect/blocker/toxic_water/Group_1, -/obj/structure/platform{ - dir = 4 - }, +/obj/structure/platform/metal/almayer/east, /turf/open/gm/river/desert/deep, /area/desert_dam/exterior/river/riverside_south) "aS" = ( @@ -270,40 +240,28 @@ /area/desert_dam/exterior/valley/valley_medical) "ba" = ( /obj/effect/blocker/toxic_water/Group_1, -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, /turf/open/gm/river/desert/deep, /area/desert_dam/exterior/river/riverside_south) "bb" = ( /obj/effect/blocker/toxic_water/Group_1, -/obj/structure/platform{ - dir = 1 - }, +/obj/structure/platform/metal/almayer/north, /turf/open/gm/river/desert/shallow_corner, /area/desert_dam/exterior/river/riverside_south) "bc" = ( /obj/effect/blocker/toxic_water/Group_1, -/obj/structure/platform{ - dir = 1 - }, +/obj/structure/platform/metal/almayer/north, /turf/open/gm/river/desert/shallow_edge/northeast, /area/desert_dam/exterior/river/riverside_south) "bd" = ( /obj/effect/blocker/toxic_water/Group_1, -/obj/structure/platform{ - dir = 1 - }, +/obj/structure/platform/metal/almayer/north, /turf/open/gm/river/desert/shallow, /area/desert_dam/exterior/river/riverside_south) "be" = ( /obj/effect/blocker/toxic_water/Group_1, -/obj/structure/platform{ - dir = 8 - }, +/obj/structure/platform/metal/almayer/west, /turf/open/gm/river/desert/deep, /area/desert_dam/exterior/river/riverside_south) "bf" = ( @@ -312,16 +270,12 @@ /area/desert_dam/exterior/river/riverside_south) "bg" = ( /obj/effect/blocker/toxic_water/Group_1, -/obj/structure/platform{ - dir = 4 - }, +/obj/structure/platform/metal/almayer/east, /turf/open/gm/river/desert/shallow_corner/west, /area/desert_dam/exterior/river/riverside_south) "bh" = ( /obj/effect/blocker/toxic_water/Group_1, -/obj/structure/platform{ - dir = 4 - }, +/obj/structure/platform/metal/almayer/east, /turf/open/gm/river/desert/shallow_edge/southwest, /area/desert_dam/exterior/river/riverside_south) "bi" = ( @@ -330,16 +284,12 @@ /area/desert_dam/exterior/river/riverside_south) "bj" = ( /obj/effect/blocker/toxic_water/Group_1, -/obj/structure/platform{ - dir = 8 - }, +/obj/structure/platform/metal/almayer/west, /turf/open/gm/river/desert/shallow_corner/west, /area/desert_dam/exterior/river/riverside_south) "bk" = ( /obj/effect/blocker/toxic_water/Group_1, -/obj/structure/platform{ - dir = 4 - }, +/obj/structure/platform/metal/almayer/east, /turf/open/gm/river/desert/shallow, /area/desert_dam/exterior/river/riverside_south) "bl" = ( @@ -347,9 +297,7 @@ /area/desert_dam/exterior/river/riverside_south) "bm" = ( /obj/effect/blocker/toxic_water/Group_1, -/obj/structure/platform{ - dir = 8 - }, +/obj/structure/platform/metal/almayer/west, /turf/open/gm/river/desert/shallow_edge/southwest, /area/desert_dam/exterior/river/riverside_south) "bn" = ( @@ -362,16 +310,12 @@ /area/desert_dam/exterior/river/riverside_south) "bp" = ( /obj/effect/blocker/toxic_water/Group_1, -/obj/structure/platform{ - dir = 4 - }, +/obj/structure/platform/metal/almayer/east, /turf/open/desert/desert_shore/shore_corner2, /area/desert_dam/exterior/river/riverside_south) "bq" = ( /obj/effect/blocker/toxic_water/Group_1, -/obj/structure/platform{ - dir = 8 - }, +/obj/structure/platform/metal/almayer/west, /turf/open/gm/river/desert/shallow, /area/desert_dam/exterior/river/riverside_south) "br" = ( @@ -379,30 +323,24 @@ /turf/open/gm/river/desert/shallow_edge/southwest, /area/desert_dam/exterior/river/riverside_south) "bs" = ( -/obj/structure/platform, +/obj/structure/platform/metal/almayer, /obj/effect/blocker/toxic_water/Group_1, -/obj/structure/platform{ - dir = 4 - }, +/obj/structure/platform/metal/almayer/east, /turf/open/desert/desert_shore/shore_edge1, /area/desert_dam/exterior/river/riverside_south) "bt" = ( -/obj/structure/platform, +/obj/structure/platform/metal/almayer, /obj/effect/blocker/toxic_water/Group_1, -/obj/structure/platform{ - dir = 8 - }, +/obj/structure/platform/metal/almayer/west, /turf/open/gm/river/desert/shallow, /area/desert_dam/exterior/river/riverside_south) "bu" = ( -/obj/structure/platform, +/obj/structure/platform/metal/almayer, /obj/effect/blocker/toxic_water/Group_1, /turf/open/gm/river/desert/shallow, /area/desert_dam/exterior/river/riverside_south) "bv" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, +/obj/structure/platform_decoration/metal/almayer/north, /obj/effect/blocker/toxic_water/Group_1, /turf/open/gm/river/desert/shallow, /area/desert_dam/exterior/river/riverside_south) @@ -418,9 +356,7 @@ /turf/open/asphalt/tile, /area/desert_dam/exterior/valley/valley_cargo) "bA" = ( -/obj/structure/platform{ - dir = 8 - }, +/obj/structure/platform/metal/almayer/west, /obj/effect/blocker/toxic_water/Group_1, /turf/open/desert/desert_shore/desert_shore1, /area/desert_dam/exterior/river/riverside_south) diff --git a/maps/map_files/DesertDam/sprinkles/10.damtemple_intact.dmm b/maps/map_files/DesertDam/sprinkles/10.damtemple_intact.dmm index 4ebaf4fbb798..e3f4e03e4994 100644 --- a/maps/map_files/DesertDam/sprinkles/10.damtemple_intact.dmm +++ b/maps/map_files/DesertDam/sprinkles/10.damtemple_intact.dmm @@ -53,12 +53,6 @@ }, /turf/open/floor/sandstone/runed, /area/desert_dam/interior/caves/temple) -"eA" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 1 - }, -/turf/open/floor/sandstone/runed, -/area/desert_dam/interior/caves/temple) "fl" = ( /obj/structure/surface/rack{ color = "#6b675e"; @@ -93,21 +87,13 @@ hull = 1 }, /area/desert_dam/interior/caves/temple) -"ik" = ( -/obj/structure/showcase{ - desc = "An ancient, dusty tomb with strange alien writing. It's best not to touch it."; - icon_state = "yaut"; - name = "alien sarcophagus" - }, -/obj/item/clothing/mask/gas/yautja/damaged{ - anchored = 1; - color = "#880808"; - desc = "A clan mask of uncertain origin, whoever wore it must have been cruel and sadistic."; - icon_state = "pred_mask_elder_tr"; - name = "ancient clan mask"; - pixel_y = 20 - }, -/turf/open/floor/corsat/squareswood/north, +"hn" = ( +/obj/structure/platform/stone/runed_sandstone/east, +/turf/open/floor/sandstone/runed, +/area/desert_dam/interior/caves/temple) +"iC" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/west, +/turf/open/gm/river/desert/deep, /area/desert_dam/interior/caves/temple) "iM" = ( /obj/structure/surface/table/reinforced/prison{ @@ -158,6 +144,30 @@ "mB" = ( /turf/open/floor/sandstone/runed, /area/desert_dam/interior/caves/temple) +"mL" = ( +/obj/structure/showcase{ + color = "#880808"; + desc = "A large red statue dawned in ancient armor, it stares into your soul."; + icon = 'icons/mob/humans/species/r_synthetic.dmi'; + icon_state = "Synthetic_Template"; + name = "The Titan" + }, +/obj/item/clothing/suit/armor/yautja_flavor{ + anchored = 1; + icon_state = "halfarmor7_ebony" + }, +/obj/item/clothing/shoes/yautja_flavor{ + anchored = 1; + icon_state = "y-boots4_ebony" + }, +/obj/item/clothing/mask/yautja_flavor{ + anchored = 1; + icon_state = "pred_mask12_ebony"; + unacidable = 0; + pixel_y = 10 + }, +/turf/open/floor/strata/grey_multi_tiles, +/area/desert_dam/interior/caves/temple) "mQ" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -197,29 +207,6 @@ "oR" = ( /turf/open/floor/strata/grey_multi_tiles, /area/desert_dam/interior/caves/temple) -"pC" = ( -/obj/structure/showcase{ - color = "#880808"; - desc = "A large red statue dawned in ancient armor, it stares into your soul."; - icon = 'icons/mob/humans/species/r_synthetic.dmi'; - icon_state = "Synthetic_Template"; - name = "The Titan" - }, -/obj/item/clothing/suit/armor/yautja_flavor{ - anchored = 1; - icon_state = "halfarmor7_ebony" - }, -/obj/item/clothing/shoes/yautja_flavor{ - anchored = 1; - icon_state = "y-boots4_ebony" - }, -/obj/item/clothing/mask/yautja_flavor{ - anchored = 1; - icon_state = "pred_mask12_ebony"; - unacidable = 0 - }, -/turf/open/floor/strata/grey_multi_tiles, -/area/desert_dam/interior/caves/temple) "qv" = ( /obj/effect/decal/remains/xeno{ pixel_x = 31 @@ -234,12 +221,6 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/desert/dirt/desert_transition_edge1/west, /area/desert_dam/exterior/valley/valley_crashsite) -"re" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 1 - }, -/turf/open/floor/sandstone/runed, -/area/desert_dam/interior/caves/temple) "rh" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -273,15 +254,13 @@ }, /turf/open/floor/strata/grey_multi_tiles, /area/desert_dam/interior/caves/temple) +"sZ" = ( +/obj/structure/platform/stone/runed_sandstone/east, +/turf/open/gm/river/desert/deep, +/area/desert_dam/interior/caves/temple) "td" = ( /turf/open/desert/rock, /area/desert_dam/interior/caves/central_caves) -"tn" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 8 - }, -/turf/open/gm/river/desert/deep, -/area/desert_dam/interior/caves/temple) "tq" = ( /obj/structure/closet/coffin/predator, /obj/item/storage/large_holster/katana, @@ -323,10 +302,8 @@ }, /turf/open/floor/sandstone/runed, /area/desert_dam/interior/caves/temple) -"wi" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 4 - }, +"wl" = ( +/obj/structure/platform_decoration/stone/runed_sandstone, /turf/open/gm/river/desert/deep, /area/desert_dam/interior/caves/temple) "yT" = ( @@ -340,9 +317,9 @@ "zg" = ( /turf/closed/wall/mineral/sandstone/runed/decor, /area/desert_dam/interior/caves/temple) -"An" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed, -/turf/open/gm/river/desert/deep, +"zH" = ( +/obj/structure/platform/stone/runed_sandstone/north, +/turf/open/floor/sandstone/runed, /area/desert_dam/interior/caves/temple) "Ax" = ( /obj/structure/surface/table/reinforced/prison{ @@ -378,6 +355,26 @@ "Co" = ( /turf/open/desert/dirt/dirt2, /area/desert_dam/exterior/valley/valley_crashsite) +"CC" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/north, +/turf/open/floor/sandstone/runed, +/area/desert_dam/interior/caves/temple) +"CH" = ( +/obj/structure/showcase{ + desc = "An ancient, dusty tomb with strange alien writing. It's best not to touch it."; + icon_state = "yaut"; + name = "alien sarcophagus" + }, +/obj/item/clothing/mask/gas/yautja/damaged{ + anchored = 1; + color = "#880808"; + desc = "A clan mask of uncertain origin, whoever wore it must have been cruel and sadistic."; + icon_state = "pred_mask_elder_tr"; + name = "ancient clan mask"; + pixel_y = 30 + }, +/turf/open/floor/corsat/squareswood/north, +/area/desert_dam/interior/caves/temple) "Dc" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/desert/rock, @@ -406,12 +403,6 @@ "EB" = ( /turf/closed/wall/rock/orange, /area/desert_dam/exterior/rock) -"FE" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 8 - }, -/turf/open/floor/sandstone/runed, -/area/desert_dam/interior/caves/temple) "Gz" = ( /obj/structure/bed/chair/comfy/beige{ dir = 4 @@ -434,6 +425,14 @@ /obj/item/xeno_egg, /turf/open/floor/corsat/squareswood/north, /area/desert_dam/interior/caves/temple) +"Hn" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/east, +/turf/open/floor/sandstone/runed, +/area/desert_dam/interior/caves/temple) +"Im" = ( +/obj/structure/platform_decoration/stone/runed_sandstone, +/turf/open/floor/sandstone/runed, +/area/desert_dam/interior/caves/temple) "Ix" = ( /obj/structure/surface/rack{ color = "#6b675e"; @@ -467,6 +466,10 @@ }, /turf/open/floor/corsat/squareswood/north, /area/desert_dam/interior/caves/temple) +"Jg" = ( +/obj/structure/platform/stone/runed_sandstone/west, +/turf/open/floor/sandstone/runed, +/area/desert_dam/interior/caves/temple) "Jh" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -483,20 +486,10 @@ /obj/item/clothing/head/hardhat, /turf/open/desert/rock, /area/desert_dam/interior/caves/central_caves) -"JM" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/floor/sandstone/runed, -/area/desert_dam/interior/caves/temple) "JP" = ( /obj/structure/xenoautopsy/tank, /turf/open/floor/strata/grey_multi_tiles, /area/desert_dam/interior/caves/temple) -"JU" = ( -/obj/structure/platform/mineral/sandstone/runed, -/turf/open/floor/sandstone/runed, -/area/desert_dam/interior/caves/temple) "JZ" = ( /obj/structure/machinery/autolathe/yautja, /turf/open/floor/strata/grey_multi_tiles, @@ -508,6 +501,10 @@ /obj/item/weapon/chainofcommand, /turf/open/floor/sandstone/runed, /area/desert_dam/interior/caves/temple) +"Kl" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/west, +/turf/open/floor/sandstone/runed, +/area/desert_dam/interior/caves/temple) "KA" = ( /obj/structure/closet/coffin/predator, /turf/open/floor/corsat/squareswood/north, @@ -584,32 +581,16 @@ /obj/item/weapon/unathiknife, /turf/open/floor/sandstone/runed, /area/desert_dam/interior/caves/temple) -"QT" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 8 - }, -/turf/open/floor/sandstone/runed, -/area/desert_dam/interior/caves/temple) "RB" = ( /obj/structure/machinery/door/window{ dir = 8 }, /turf/open/floor/corsat/squareswood/north, /area/desert_dam/interior/caves/temple) -"SD" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed, -/turf/open/floor/sandstone/runed, -/area/desert_dam/interior/caves/temple) "TO" = ( /obj/structure/xenoautopsy, /turf/open/floor/strata/grey_multi_tiles, /area/desert_dam/interior/caves/temple) -"TU" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/floor/sandstone/runed, -/area/desert_dam/interior/caves/temple) "UB" = ( /obj/structure/machinery/power/smes/magical{ capacity = 9e+008; @@ -639,6 +620,10 @@ }, /turf/open/floor/sandstone/runed, /area/desert_dam/interior/caves/temple) +"YH" = ( +/obj/structure/platform/stone/runed_sandstone, +/turf/open/floor/sandstone/runed, +/area/desert_dam/interior/caves/temple) "ZI" = ( /turf/open/desert/dirt/desert_transition_corner1/east, /area/desert_dam/exterior/valley/valley_crashsite) @@ -765,12 +750,12 @@ MH mB mB MH -An -wi -wi -wi -wi -tn +wl +sZ +sZ +sZ +sZ +iC MH "} (6,1,1) = {" @@ -968,9 +953,9 @@ MH MH mB mB -SD -JM -FE +Im +hn +Kl mB mB MH @@ -994,9 +979,9 @@ mB uK mB mB -JU -pC -eA +YH +mL +zH mB mB zg @@ -1020,9 +1005,9 @@ mB MH mB mB -re -QT -TU +CC +Jg +Hn mB mB Eh @@ -1299,7 +1284,7 @@ EB EB EB MH -ik +CH MH MH rh diff --git a/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm b/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm index 518ea89a0257..066d7ab18253 100644 --- a/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm +++ b/maps/map_files/FOP_v2_Cellblocks/Prison_Station_FOP.dmm @@ -4827,7 +4827,7 @@ /area/prison/research/RD) "aqF" = ( /obj/structure/surface/table/reinforced, -/obj/structure/platform, +/obj/structure/platform/metal/almayer, /obj/structure/machinery/computer/shuttle/dropship/flight/lz2{ dir = 4 }, @@ -5144,9 +5144,7 @@ icon_state = "p_stair_ew_full_cap"; layer = 3.1 }, -/obj/structure/platform{ - dir = 1 - }, +/obj/structure/platform/metal/stair_cut/platform_left, /turf/open/floor/prison/sterile_white/southwest, /area/prison/hanger/research) "arI" = ( @@ -5519,7 +5517,7 @@ /area/prison/medbay) "ate" = ( /obj/structure/machinery/power/apc/no_power/south, -/obj/structure/platform, +/obj/structure/platform/metal/almayer, /turf/open/floor/prison/sterile_white/southwest, /area/prison/hanger/research) "atf" = ( @@ -9236,9 +9234,7 @@ /obj/structure/stairs/perspective{ icon_state = "p_stair_sn_full_cap" }, -/obj/structure/platform{ - dir = 8 - }, +/obj/structure/platform/metal/almayer/west, /turf/open/floor/prison, /area/prison/security/checkpoint/maxsec) "aHV" = ( @@ -9342,9 +9338,7 @@ /obj/structure/machinery/alarm/almayer{ dir = 1 }, -/obj/structure/platform_decoration{ - dir = 8 - }, +/obj/structure/platform_decoration/metal/almayer/west, /turf/open/floor/prison/bright_clean2/southwest, /area/prison/hallway/central/north) "aIv" = ( @@ -9352,9 +9346,7 @@ /area/prison/residential/central) "aIw" = ( /obj/structure/pipes/vents/scrubber, -/obj/structure/platform{ - dir = 1 - }, +/obj/structure/platform/metal/almayer/north, /turf/open/floor/prison/bright_clean2/southwest, /area/prison/hallway/central/north) "aIx" = ( @@ -10067,9 +10059,7 @@ icon_state = "p_stair_ew_full_cap"; layer = 3.1 }, -/obj/structure/platform{ - dir = 1 - }, +/obj/structure/platform/metal/stair_cut/platform_left, /turf/open/floor/prison/sterile_white/southwest, /area/prison/security/checkpoint/highsec/n) "aLq" = ( @@ -14041,9 +14031,7 @@ /obj/structure/machinery/light{ dir = 4 }, -/obj/structure/platform{ - dir = 4 - }, +/obj/structure/platform/metal/almayer/east, /turf/open/floor/prison/bright_clean/southwest, /area/prison/canteen) "baX" = ( @@ -14849,9 +14837,7 @@ icon_state = "p_stair_ew_full_cap"; layer = 3.1 }, -/obj/structure/platform{ - dir = 1 - }, +/obj/structure/platform/metal/stair_cut/platform_right, /turf/open/floor/prison/sterile_white/southwest, /area/prison/canteen) "beg" = ( @@ -16117,9 +16103,7 @@ /obj/structure/machinery/alarm/almayer{ dir = 1 }, -/obj/structure/platform{ - dir = 1 - }, +/obj/structure/platform/metal/almayer/north, /turf/open/floor/prison/bright_clean/southwest, /area/prison/canteen) "biI" = ( @@ -16408,9 +16392,7 @@ icon_state = "p_stair_ew_full_cap"; layer = 3.1 }, -/obj/structure/platform{ - dir = 1 - }, +/obj/structure/platform/metal/stair_cut/platform_left, /turf/open/floor/prison/sterile_white/southwest, /area/prison/storage/vip) "bka" = ( @@ -19583,9 +19565,7 @@ icon_state = "p_stair_ew_full_cap"; layer = 3.1 }, -/obj/structure/platform{ - dir = 1 - }, +/obj/structure/platform/metal/stair_cut/platform_left, /turf/open/floor/prison/sterile_white/southwest, /area/prison/hallway/central/west) "bxG" = ( @@ -21999,9 +21979,7 @@ icon_state = "p_stair_ew_full_cap"; layer = 3.1 }, -/obj/structure/platform{ - dir = 1 - }, +/obj/structure/platform/metal/stair_cut/platform_left, /turf/open/floor/prison/sterile_white/southwest, /area/prison/security/checkpoint/highsec/s) "bHx" = ( @@ -32840,13 +32818,11 @@ dir = 8; icon_state = "p_stair_full" }, -/obj/structure/platform, +/obj/structure/platform/metal/almayer, /turf/open/floor/prison/sterile_white/southwest, /area/prison/canteen) "cSA" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, +/obj/structure/platform_decoration/metal/almayer/north, /turf/open/floor/prison/bright_clean2/southwest, /area/prison/hallway/central/west) "cWg" = ( @@ -32974,7 +32950,7 @@ dir = 4; icon_state = "p_stair_full" }, -/obj/structure/platform, +/obj/structure/platform/metal/almayer, /turf/open/floor/prison/sterile_white/southwest, /area/prison/storage/vip) "dqf" = ( @@ -32990,9 +32966,7 @@ /turf/open/organic/grass, /area/prison/residential/north) "dxF" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, +/obj/structure/platform_decoration/metal/almayer/north, /turf/open/floor/prison/darkpurplefull2, /area/prison/hanger/research) "dyt" = ( @@ -33009,7 +32983,7 @@ /turf/open/floor/plating, /area/prison/residential/north) "dzH" = ( -/obj/structure/platform_decoration, +/obj/structure/platform_decoration/metal/almayer, /turf/open/floor/prison/bright_clean_marked/southwest, /area/prison/canteen) "dAz" = ( @@ -33441,9 +33415,7 @@ /turf/open/floor/prison/redfull, /area/prison/cellblock/highsec/north/south) "fyi" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, +/obj/structure/platform_decoration/metal/almayer/east, /turf/open/floor/prison/bright_clean2/southwest, /area/prison/hallway/central/west) "fCr" = ( @@ -34134,7 +34106,7 @@ /turf/open/floor/prison/yellow/northeast, /area/prison/cellblock/mediumsec/north) "hXJ" = ( -/obj/structure/platform, +/obj/structure/platform/metal/almayer, /turf/open/floor/prison/bright_clean_marked/southwest, /area/prison/canteen) "hXW" = ( @@ -34230,9 +34202,7 @@ /turf/open/floor/prison/bright_clean2/southwest, /area/prison/hallway/east) "iqo" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, +/obj/structure/platform_decoration/metal/almayer/west, /turf/open/floor/prison/bright_clean_marked/southwest, /area/prison/canteen) "irh" = ( @@ -34437,9 +34407,7 @@ /turf/open/floor/prison/bright_clean/southwest, /area/prison/yard) "jfe" = ( -/obj/structure/platform{ - dir = 8 - }, +/obj/structure/platform/metal/almayer/west, /turf/open/floor/prison/darkpurple2/east, /area/prison/hanger/research) "jfp" = ( @@ -34469,9 +34437,7 @@ /area/prison/cellblock/mediumsec/south) "jmr" = ( /obj/structure/largecrate/random/barrel/red, -/obj/structure/platform{ - dir = 8 - }, +/obj/structure/platform/metal/almayer/west, /turf/open/floor/prison/bright_clean2/southwest, /area/prison/hallway/central/west) "jmY" = ( @@ -34496,7 +34462,7 @@ pixel_x = 1; pixel_y = 3 }, -/obj/structure/platform_decoration, +/obj/structure/platform_decoration/metal/almayer, /turf/open/floor/prison/bright_clean/southwest, /area/prison/canteen) "joJ" = ( @@ -34612,9 +34578,7 @@ /area/prison/storage/medsec) "jHy" = ( /obj/structure/largecrate/random/barrel/white, -/obj/structure/platform{ - dir = 8 - }, +/obj/structure/platform/metal/almayer/west, /turf/open/floor/prison/bright_clean2/southwest, /area/prison/hallway/central/west) "jJE" = ( @@ -34770,9 +34734,7 @@ /turf/open/floor/prison/bright_clean2/southwest, /area/prison/hallway/central/east) "koj" = ( -/obj/structure/platform{ - dir = 1 - }, +/obj/structure/platform/metal/almayer/north, /turf/open/floor/prison/bright_clean/southwest, /area/prison/canteen) "kpc" = ( @@ -35448,9 +35410,7 @@ /turf/open/floor/prison/darkredfull2/southwest, /area/prison/security/checkpoint/highsec/s) "nkB" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, +/obj/structure/platform_decoration/metal/almayer/east, /turf/open/floor/prison/darkpurple2/east, /area/prison/hanger/research) "nmr" = ( @@ -35601,7 +35561,7 @@ dir = 4; icon_state = "p_stair_full" }, -/obj/structure/platform, +/obj/structure/platform/metal/almayer, /turf/open/floor/prison/sterile_white/southwest, /area/prison/security/checkpoint/highsec/s) "nSK" = ( @@ -35665,9 +35625,7 @@ /turf/open/floor/prison/yellow/east, /area/prison/cellblock/mediumsec/south) "ocS" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, +/obj/structure/platform_decoration/metal/almayer/east, /turf/open/floor/prison/bright_clean2/southwest, /area/prison/hallway/central/north) "odp" = ( @@ -35716,9 +35674,7 @@ /turf/open/floor/prison/bright_clean/southwest, /area/prison/maintenance/residential/access/south) "onp" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, +/obj/structure/platform_decoration/metal/almayer/east, /turf/open/floor/prison/darkpurplefull2, /area/prison/hanger/research) "onA" = ( @@ -35777,9 +35733,7 @@ /turf/open/floor/prison/damaged2/southwest, /area/prison/storage/medsec) "oyQ" = ( -/obj/structure/platform{ - dir = 1 - }, +/obj/structure/platform/metal/almayer/north, /turf/open/floor/prison/bright_clean2/southwest, /area/prison/canteen) "oyZ" = ( @@ -35843,9 +35797,7 @@ /turf/open/floor/prison/bright_clean2/southwest, /area/prison/toilet/security) "oJi" = ( -/obj/structure/platform{ - dir = 8 - }, +/obj/structure/platform/metal/almayer/west, /turf/open/floor/prison/darkpurplefull2, /area/prison/hanger/research) "oLL" = ( @@ -35891,9 +35843,7 @@ /turf/open/floor/prison/yellow/west, /area/prison/cellblock/mediumsec/north) "oTg" = ( -/obj/structure/platform{ - dir = 8 - }, +/obj/structure/platform/metal/almayer/west, /turf/open/floor/prison/bright_clean2/southwest, /area/prison/hallway/central/west) "oTO" = ( @@ -35992,9 +35942,7 @@ /area/prison/residential/south) "pmO" = ( /obj/structure/largecrate/random/case/small, -/obj/structure/platform{ - dir = 8 - }, +/obj/structure/platform/metal/almayer/west, /turf/open/floor/prison/bright_clean2/southwest, /area/prison/hallway/central/north) "pnT" = ( @@ -36220,7 +36168,7 @@ dir = 4; icon_state = "p_stair_full" }, -/obj/structure/platform, +/obj/structure/platform/metal/almayer, /turf/open/floor/prison/sterile_white/southwest, /area/prison/hanger/research) "qjI" = ( @@ -36256,9 +36204,7 @@ /turf/open/floor/prison/darkpurple2/east, /area/prison/hanger/research) "qqm" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, +/obj/structure/platform_decoration/metal/almayer/west, /turf/open/floor/prison/bright_clean2/southwest, /area/prison/hallway/central/north) "qqn" = ( @@ -36279,7 +36225,7 @@ /turf/open/organic/grass, /area/prison/residential/south) "qwg" = ( -/obj/structure/platform, +/obj/structure/platform/metal/almayer, /turf/open/floor/prison/floor_marked/southwest, /area/prison/hanger/research) "qxY" = ( @@ -36465,9 +36411,7 @@ /turf/open/floor/plating, /area/prison/cellblock/mediumsec/south) "rxa" = ( -/obj/structure/platform{ - dir = 1 - }, +/obj/structure/platform/metal/almayer/north, /turf/open/floor/prison/bright_clean2/southwest, /area/prison/hallway/central/north) "rxG" = ( @@ -36488,9 +36432,7 @@ /turf/open/floor/prison/bright_clean/southwest, /area/prison/hallway/central/west) "rFO" = ( -/obj/structure/platform{ - dir = 1 - }, +/obj/structure/platform/metal/almayer/north, /turf/open/floor/prison/bright_clean_marked/southwest, /area/prison/canteen) "rKA" = ( @@ -36627,9 +36569,7 @@ /area/prison/cellblock/highsec/north/south) "sxx" = ( /obj/structure/machinery/light, -/obj/structure/platform{ - dir = 8 - }, +/obj/structure/platform/metal/almayer/west, /turf/open/floor/prison/bright_clean2/southwest, /area/prison/hallway/central/south) "sye" = ( @@ -36649,7 +36589,7 @@ /turf/open/floor/prison, /area/prison/security/checkpoint/highsec_medsec) "sEd" = ( -/obj/structure/platform, +/obj/structure/platform/metal/almayer, /turf/open/floor/prison/bright_clean/southwest, /area/prison/canteen) "sGc" = ( @@ -36675,9 +36615,7 @@ /turf/open/floor/prison/bright_clean/southwest, /area/prison/canteen) "sIA" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, +/obj/structure/platform_decoration/metal/almayer/north, /turf/open/floor/prison/darkpurple2/east, /area/prison/hanger/research) "sLI" = ( @@ -36788,9 +36726,7 @@ /obj/structure/pipes/vents/scrubber{ dir = 4 }, -/obj/structure/platform{ - dir = 8 - }, +/obj/structure/platform/metal/almayer/west, /turf/open/floor/prison/bright_clean2/southwest, /area/prison/hallway/central/west) "thZ" = ( @@ -36843,7 +36779,7 @@ dir = 4; icon_state = "p_stair_full" }, -/obj/structure/platform, +/obj/structure/platform/metal/almayer, /turf/open/floor/prison/sterile_white/southwest, /area/prison/hallway/central/west) "tuQ" = ( @@ -36878,7 +36814,7 @@ dir = 4; icon_state = "p_stair_full" }, -/obj/structure/platform, +/obj/structure/platform/metal/almayer, /turf/open/floor/prison/sterile_white/southwest, /area/prison/security/checkpoint/highsec/n) "tzm" = ( @@ -37399,9 +37335,7 @@ /area/prison/hanger/research) "vGg" = ( /obj/structure/largecrate/random, -/obj/structure/platform{ - dir = 8 - }, +/obj/structure/platform/metal/almayer/west, /turf/open/floor/prison/bright_clean2/southwest, /area/prison/hallway/central/west) "vHX" = ( @@ -37779,7 +37713,7 @@ /turf/open/floor/wood, /area/prison/parole/protective_custody) "xIA" = ( -/obj/structure/platform, +/obj/structure/platform/metal/almayer, /turf/open/floor/prison/bright_clean2/southwest, /area/prison/canteen) "xKa" = ( @@ -37796,9 +37730,7 @@ dir = 4; icon_state = "p_stair_sn_full_cap" }, -/obj/structure/platform{ - dir = 4 - }, +/obj/structure/platform/metal/almayer/east, /turf/open/floor/prison, /area/prison/security/checkpoint/maxsec) "xNi" = ( @@ -37853,9 +37785,7 @@ pixel_x = 1; pixel_y = 3 }, -/obj/structure/platform_decoration{ - dir = 8 - }, +/obj/structure/platform_decoration/metal/almayer/west, /turf/open/floor/prison/bright_clean/southwest, /area/prison/canteen) "yaY" = ( diff --git a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm index 2042a78f845d..634cb0f24b07 100644 --- a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm +++ b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm @@ -29,15 +29,6 @@ /obj/structure/machinery/power/apc/power/west, /turf/open/floor/wood, /area/fiorina/station/security/wardens) -"aaR" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/structure/stairs/perspective{ - icon_state = "p_stair_sn_full_cap" - }, -/turf/open/floor/plating/prison, -/area/fiorina/tumor/ice_lab) "abG" = ( /obj/item/trash/chunk, /turf/open/floor/prison/whitegreen/north, @@ -47,7 +38,7 @@ icon = 'icons/obj/structures/doors/2x1prepdoor.dmi' }, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "ace" = ( /obj/effect/landmark{ icon_state = "hive_spawn"; @@ -95,11 +86,6 @@ "aeb" = ( /turf/open/floor/prison/darkpurple2/northwest, /area/fiorina/tumor/servers) -"aej" = ( -/obj/item/weapon/gun/rifle/m16, -/obj/effect/decal/cleanable/blood, -/turf/open/floor/prison/damaged3, -/area/fiorina/station/security) "aeo" = ( /obj/structure/monorail{ name = "launch track" @@ -151,7 +137,7 @@ /obj/structure/surface/table/reinforced/prison, /obj/effect/spawner/random/pills/lowchance, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "agh" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/cameras{ @@ -232,17 +218,7 @@ icon_state = "abed" }, /turf/open/floor/prison/whitepurple/west, -/area/fiorina/station/research_cells) -"aje" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/transit_hub) +/area/fiorina/station/research_cells/east) "aju" = ( /obj/structure/machinery/light/double/blue{ dir = 8; @@ -258,10 +234,6 @@ }, /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/tumor/ice_lab) -"ajx" = ( -/obj/structure/platform/kutjevo/smooth, -/turf/open/space/basic, -/area/fiorina/oob) "ajP" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/pizzabox/margherita, @@ -281,7 +253,7 @@ "akM" = ( /obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "akW" = ( /obj/structure/bed/chair/janicart, /turf/open/floor/prison, @@ -294,6 +266,14 @@ }, /turf/open/floor/prison/darkyellowfull2/east, /area/fiorina/station/telecomm/lz1_tram) +"alk" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/plating/prison, +/area/fiorina/station/transit_hub) "alC" = ( /obj/structure/inflatable/popped, /turf/open/floor/prison/floor_plate, @@ -326,9 +306,13 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/civres) +"amg" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/prison, +/area/fiorina/station/park) "amn" = ( /turf/open/floor/prison/whitepurple/east, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "amF" = ( /turf/closed/wall/r_wall/prison, /area/fiorina/tumor/aux_engi) @@ -337,7 +321,7 @@ dir = 4 }, /turf/open/floor/prison/whitepurple/west, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "ane" = ( /obj/item/weapon/unathiknife{ name = "ceremonial knife" @@ -350,7 +334,7 @@ /obj/item/restraint/handcuffs, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "anm" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer{ @@ -432,13 +416,24 @@ /obj/structure/reagent_dispensers/water_cooler/stacks, /turf/open/floor/prison/floor_plate, /area/fiorina/station/flight_deck) +"aoG" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/firstaid/regular, +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 + }, +/turf/open/floor/prison/whitegreen/southeast, +/area/fiorina/station/medbay) "aoZ" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/reagent_dispensers/water_cooler/stacks{ pixel_y = 11 }, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "ape" = ( /obj/structure/bed/chair{ dir = 4; @@ -449,23 +444,22 @@ "apf" = ( /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) +"apg" = ( +/turf/open/floor/prison/whitepurple, +/area/fiorina/station/research_cells/east) +"apm" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison/whitepurple/north, +/area/fiorina/station/research_cells/east) "apu" = ( /turf/open/floor/prison/blue, /area/fiorina/station/power_ring) "apw" = ( /turf/open/auto_turf/sand/layer1, /area/fiorina/tumor/civres) -"apO" = ( -/obj/structure/platform_decoration, -/turf/open/floor/prison/whitegreen, -/area/fiorina/tumor/ice_lab) -"aqj" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_ew_full_cap" - }, -/obj/structure/platform/stair_cut/alt, -/turf/open/floor/plating/prison, -/area/fiorina/station/transit_hub) "aqo" = ( /obj/item/shard{ icon_state = "large" @@ -480,19 +474,13 @@ "arl" = ( /obj/effect/landmark/objective_landmark/close, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "arn" = ( /obj/effect/landmark/nightmare{ insert_tag = "researchprestine" }, /turf/closed/wall/prison, -/area/fiorina/station/research_cells) -"art" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/prison/greenblue/southwest, -/area/fiorina/station/botany) +/area/fiorina/station/research_cells/west) "arG" = ( /obj/structure/machinery/light/double/blue{ dir = 4; @@ -517,7 +505,7 @@ pixel_y = 21 }, /turf/open/floor/prison/yellow/northeast, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "ask" = ( /obj/structure/machinery/light/double/blue{ dir = 8; @@ -538,45 +526,28 @@ "asz" = ( /turf/open/floor/prison/yellow/southwest, /area/fiorina/station/central_ring) -"asE" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform, -/obj/structure/platform_decoration{ - dir = 6 - }, -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison, -/area/fiorina/station/transit_hub) +"asF" = ( +/obj/structure/extinguisher_cabinet, +/turf/closed/wall/prison, +/area/fiorina/station/research_cells/east) "asI" = ( /obj/item/toy/deck, /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/station/medbay) +"atb" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/plating/prison, +/area/fiorina/station/botany) "atd" = ( /obj/structure/bed/chair{ dir = 1 }, /turf/open/floor/prison/floor_plate, /area/fiorina/station/power_ring) -"atl" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 9 - }, -/obj/structure/platform_decoration{ - dir = 5 - }, -/turf/open/floor/plating/prison, -/area/fiorina/lz/near_lzI) "atp" = ( /obj/item/book/manual/security_space_law{ pixel_x = 3; @@ -588,10 +559,15 @@ /obj/item/reagent_container/food/snacks/eat_bar, /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/station/medbay) +"atD" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, +/obj/structure/lattice, +/turf/open/space/basic, +/area/fiorina/oob) "atY" = ( /obj/structure/bedsheetbin, /turf/open/floor/prison/yellow/west, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "auj" = ( /obj/item/frame/rack, /turf/open/floor/prison/floor_plate, @@ -613,14 +589,14 @@ /obj/structure/closet/wardrobe/orange, /obj/item/clothing/under/color/orange, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "avc" = ( /obj/structure/stairs/perspective{ dir = 5; icon_state = "p_stair_full" }, /turf/open/floor/plating/plating_catwalk/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "avJ" = ( /obj/item/reagent_container/food/drinks/cans/waterbottle, /turf/open/floor/prison, @@ -644,7 +620,7 @@ pixel_y = 19 }, /turf/open/floor/prison/whitepurple/north, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "axb" = ( /obj/item/clothing/suit/storage/marine/specialist, /turf/open/floor/plating/prison, @@ -663,6 +639,9 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) +"axz" = ( +/turf/closed/wall/r_wall/prison, +/area/fiorina/station/lowsec/east) "axA" = ( /obj/structure/prop/almayer/computers/mission_planning_system{ density = 0; @@ -673,16 +652,17 @@ }, /turf/closed/wall/prison, /area/fiorina/station/security) +"axW" = ( +/obj/structure/platform/metal/kutjevo_smooth, +/obj/structure/platform/metal/kutjevo_smooth/east, +/turf/open/space/basic, +/area/fiorina/oob) "aye" = ( /obj/structure/bed/chair{ dir = 1 }, /turf/open/floor/prison/floor_plate, /area/fiorina/station/security) -"ayo" = ( -/obj/structure/platform, -/turf/open/floor/prison/cell_stripe/east, -/area/fiorina/station/security) "ayB" = ( /obj/structure/bed/chair{ dir = 4; @@ -693,7 +673,7 @@ "ayG" = ( /obj/structure/machinery/power/apc/power/north, /turf/open/floor/prison/yellow/northwest, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "ayH" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/paper_bin{ @@ -706,7 +686,7 @@ /obj/item/explosive/grenade/incendiary/molotov, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "ayX" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; @@ -786,16 +766,6 @@ }, /turf/open/organic/grass/astroturf, /area/fiorina/station/civres_blue) -"aBD" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 10 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/park) "aBJ" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/book/manual/chef_recipes{ @@ -803,10 +773,17 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) +"aBX" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/prison/yellow/northeast, +/area/fiorina/station/disco/east_disco) "aBZ" = ( /obj/effect/landmark/yautja_teleport, /turf/open/floor/prison, /area/fiorina/station/park) +"aCw" = ( +/turf/open/floor/prison, +/area/fiorina/station/disco/east_disco) "aCC" = ( /obj/item/tool/soap{ pixel_x = 2; @@ -822,6 +799,14 @@ /obj/structure/reagent_dispensers/water_cooler/stacks, /turf/open/floor/prison/floor_plate, /area/fiorina/tumor/servers) +"aDj" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/power_ring) "aDx" = ( /turf/open/floor/prison/yellow, /area/fiorina/station/central_ring) @@ -850,6 +835,13 @@ }, /turf/open/floor/plating/plating_catwalk, /area/fiorina/tumor/ship) +"aFH" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/southeast, +/obj/structure/closet/emcloset, +/turf/open/floor/prison/whitegreenfull/southwest, +/area/fiorina/station/medbay) "aFK" = ( /obj/structure/machinery/light/double/blue{ dir = 8; @@ -858,12 +850,10 @@ }, /turf/open/floor/corsat/plate, /area/fiorina/station/telecomm/lz1_cargo) -"aFQ" = ( -/obj/effect/decal/cleanable/blood/splatter{ - icon_state = "gibmid3" - }, -/turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/medbay) +"aFL" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/prison/blue/northwest, +/area/fiorina/station/power_ring) "aFZ" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/medbay) @@ -924,11 +914,30 @@ /obj/structure/largecrate/random/case/double, /turf/open/floor/prison/floor_plate, /area/fiorina/station/park) +"aIG" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/plating/prison, +/area/fiorina/station/power_ring/reactor) +"aIT" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/northwest, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/transit_hub) "aJk" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/atmos_alert, /turf/open/floor/prison/sterile_white/southwest, /area/fiorina/tumor/ice_lab) +"aJm" = ( +/obj/structure/platform_decoration/metal/almayer, +/obj/structure/inflatable, +/turf/open/floor/prison/whitegreen, +/area/fiorina/station/medbay) "aJo" = ( /obj/structure/bed/chair{ dir = 4; @@ -963,12 +972,12 @@ }, /turf/open/floor/prison/whitegreen/northwest, /area/fiorina/station/medbay) -"aKA" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/turf/open/space, -/area/fiorina/oob) +"aKs" = ( +/obj/structure/platform/metal/almayer/west, +/obj/item/prop/almayer/handheld1, +/obj/structure/surface/rack, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) "aKN" = ( /obj/structure/machinery/computer/cameras{ network = list("omega") @@ -992,7 +1001,7 @@ pixel_y = 13 }, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "aLC" = ( /obj/structure/sink{ dir = 8; @@ -1000,7 +1009,7 @@ }, /obj/effect/spawner/random/pills/lowchance, /turf/open/floor/prison/whitepurple/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "aLT" = ( /obj/item/trash/uscm_mre, /turf/open/floor/plating/prison, @@ -1011,14 +1020,10 @@ layer = 2.7 }, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "aMg" = ( /turf/closed/wall/r_wall/prison, /area/fiorina/tumor/ice_lab) -"aMr" = ( -/obj/structure/platform_decoration, -/turf/open/floor/prison/bluefull, -/area/fiorina/station/power_ring) "aMu" = ( /obj/effect/alien/weeds/node, /turf/open/floor/prison/whitegreen/northeast, @@ -1057,19 +1062,10 @@ }, /turf/open/floor/prison, /area/fiorina/station/security) -"aNz" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/machinery/cm_vending/sorted/tech/tool_storage{ - layer = 3.5 - }, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) +"aNY" = ( +/obj/structure/machinery/door/airlock/prison_hatch/autoname, +/turf/open/floor/plating/prison, +/area/fiorina/station/research_cells/east) "aOc" = ( /turf/closed/shuttle/ert{ icon_state = "rightengine_3"; @@ -1079,6 +1075,10 @@ "aOm" = ( /turf/open/floor/prison/panelscorched, /area/fiorina/tumor/servers) +"aOp" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/prison/darkbrown2, +/area/fiorina/station/park) "aOC" = ( /obj/structure/bed/chair/comfy{ dir = 4 @@ -1117,13 +1117,6 @@ }, /turf/open/organic/grass/astroturf, /area/fiorina/station/park) -"aPr" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_ew_full_cap" - }, -/obj/structure/platform/stair_cut/alt, -/turf/open/floor/plating/prison, -/area/fiorina/station/security) "aPv" = ( /obj/structure/extinguisher_cabinet, /turf/closed/wall/prison, @@ -1148,6 +1141,10 @@ }, /turf/open/floor/prison/floor_plate, /area/fiorina/station/civres_blue) +"aQA" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/prison/whitegreen/west, +/area/fiorina/tumor/ice_lab) "aQH" = ( /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, /obj/effect/landmark/nightmare{ @@ -1167,12 +1164,6 @@ }, /turf/open/floor/prison, /area/fiorina/lz/near_lzII) -"aQY" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/prison/whitegreenfull/southwest, -/area/fiorina/tumor/ice_lab) "aRk" = ( /obj/structure/cargo_container/grant/left, /turf/open/floor/plating/plating_catwalk/prison, @@ -1183,12 +1174,6 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) -"aRv" = ( -/obj/structure/platform, -/obj/structure/closet/firecloset/full, -/obj/item/paper/prison_station/inmate_handbook, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) "aRT" = ( /obj/structure/barricade/handrail/type_b{ layer = 3.5 @@ -1206,7 +1191,7 @@ /area/fiorina/station/medbay) "aSz" = ( /turf/closed/wall/r_wall/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "aSA" = ( /obj/structure/bed/sofa/vert/grey/top, /turf/open/floor/prison, @@ -1252,7 +1237,7 @@ pixel_y = 13 }, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "aTO" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/toy/deck/uno, @@ -1287,9 +1272,23 @@ }, /turf/open/floor/prison/whitegreen/west, /area/fiorina/station/medbay) +"aWR" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/plating/prison, +/area/fiorina/station/lowsec/showers_laundry) "aWV" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/tumor/servers) +"aWY" = ( +/obj/structure/platform/metal/kutjevo_smooth/west, +/obj/structure/platform/metal/kutjevo_smooth/north, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/turf/open/space/basic, +/area/fiorina/oob) "aXk" = ( /obj/item/storage/fancy/candle_box, /turf/open/floor/prison/chapel_carpet/doubleside, @@ -1326,7 +1325,7 @@ /area/fiorina/lz/near_lzII) "aXC" = ( /turf/open/floor/prison/damaged2/southwest, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "aXO" = ( /turf/open/floor/prison/damaged2, /area/fiorina/station/central_ring) @@ -1352,26 +1351,24 @@ dir = 4 }, /turf/open/floor/prison/kitchen, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) +"aYR" = ( +/turf/open/floor/prison/whitepurple/west, +/area/fiorina/station/research_cells/east) +"aYX" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/turf/open/floor/plating/prison, +/area/fiorina/station/chapel) "aZi" = ( /turf/open/floor/prison/cell_stripe/east, /area/fiorina/tumor/servers) -"aZD" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform, -/obj/structure/platform_decoration{ - dir = 6 - }, -/obj/structure/platform_decoration{ - dir = 10 - }, -/turf/open/floor/plating/prison, -/area/fiorina/lz/near_lzI) +"aZA" = ( +/turf/open/floor/prison/blue, +/area/fiorina/station/power_ring/reactor) "aZL" = ( /turf/open/floor/prison/yellow/northeast, /area/fiorina/station/disco) @@ -1379,12 +1376,6 @@ /obj/item/toy/crayon/yellow, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"aZW" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/park) "baC" = ( /turf/closed/wall/mineral/bone_resin, /area/fiorina/station) @@ -1396,7 +1387,7 @@ "baM" = ( /obj/effect/spawner/random/gun/smg, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "bbn" = ( /obj/item/device/motiondetector, /turf/open/floor/prison/floor_plate, @@ -1419,7 +1410,7 @@ pixel_y = 23 }, /turf/open/floor/prison/yellow/north, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "bbU" = ( /obj/structure/sign/safety/fire_haz, /turf/open/floor/prison/floor_plate, @@ -1452,10 +1443,10 @@ }, /turf/open/floor/prison/floor_plate, /area/fiorina/tumor/aux_engi) -"bcT" = ( -/obj/structure/platform, -/turf/open/floor/prison/darkbrown2, -/area/fiorina/station/park) +"bcO" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/flight_deck) "bcX" = ( /obj/item/tool/warning_cone, /obj/structure/machinery/light/double/blue{ @@ -1494,12 +1485,6 @@ }, /turf/open/floor/corsat/squares, /area/fiorina/station/civres_blue) -"bem" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/prison, -/area/fiorina/station/transit_hub) "ber" = ( /obj/structure/inflatable/popped/door, /obj/item/ammo_magazine/m56d, @@ -1546,7 +1531,7 @@ req_access = null }, /turf/open/floor/plating/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "bgy" = ( /obj/item/trash/pistachios, /turf/open/floor/plating/prison, @@ -1562,18 +1547,9 @@ /obj/item/explosive/grenade/high_explosive/m15, /turf/open/floor/plating/prison, /area/fiorina/station/transit_hub) -"bhu" = ( -/obj/structure/platform, -/obj/structure/closet/crate/bravo, -/obj/item/stack/sheet/plasteel, -/obj/item/tool/wirecutters, -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = 13 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +"bhC" = ( +/turf/open/floor/prison/yellow/southwest, +/area/fiorina/station/lowsec/east) "bhW" = ( /turf/open/floor/prison/greencorner/east, /area/fiorina/tumor/civres) @@ -1586,6 +1562,11 @@ "bix" = ( /turf/open/floor/prison/darkyellow2/west, /area/fiorina/station/telecomm/lz1_cargo) +"biz" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/obj/structure/lattice, +/turf/open/space/basic, +/area/fiorina/oob) "bjf" = ( /obj/item/tool/warning_cone, /obj/structure/machinery/light/double/blue, @@ -1603,6 +1584,11 @@ /obj/structure/girder, /turf/open/floor/prison/yellowfull, /area/fiorina/station/lowsec) +"bjA" = ( +/obj/structure/platform/metal/kutjevo_smooth/north, +/obj/structure/platform/metal/kutjevo_smooth/west, +/turf/open/space/basic, +/area/fiorina/oob) "bjR" = ( /obj/structure/bed/chair, /turf/open/floor/prison/floor_plate, @@ -1610,7 +1596,7 @@ "bjZ" = ( /obj/item/weapon/twohanded/spear, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "bkg" = ( /obj/structure/bed/chair, /turf/open/floor/prison, @@ -1624,7 +1610,7 @@ icon_state = "casing_7_1" }, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "bkU" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/prison, @@ -1638,7 +1624,11 @@ "blf" = ( /obj/structure/machinery/power/reactor/colony, /turf/open/floor/prison/bluecorner/north, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) +"blt" = ( +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison/yellow, +/area/fiorina/station/lowsec/showers_laundry) "blA" = ( /obj/item/shard{ icon_state = "medium"; @@ -1652,7 +1642,17 @@ icon = 'icons/obj/structures/doors/2x1prepdoor.dmi' }, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) +"blI" = ( +/obj/structure/platform/metal/kutjevo_smooth/north, +/obj/structure/platform_decoration/metal/kutjevo, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/turf/open/space/basic, +/area/fiorina/oob) "bma" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/newspaper, @@ -1718,6 +1718,13 @@ }, /turf/open/floor/prison/floor_plate, /area/fiorina/tumor/civres) +"bnW" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/decal/medical_decals{ + icon_state = "triagedecalbottomleft" + }, +/turf/open/floor/prison/whitegreenfull/southwest, +/area/fiorina/station/medbay) "boe" = ( /obj/item/tool/wet_sign, /turf/open/floor/plating/prison, @@ -1737,10 +1744,6 @@ }, /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/station/medbay) -"bpe" = ( -/obj/structure/platform_decoration, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/civres_blue) "bpo" = ( /obj/item/dogtag, /turf/open/floor/prison/blue/west, @@ -1750,25 +1753,20 @@ /obj/structure/machinery/light/double/blue, /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/station/medbay) +"bpH" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/machinery/door/airlock/prison_hatch/autoname{ + dir = 1 + }, +/turf/open/floor/prison/floor_plate, +/area/fiorina/tumor/ice_lab) "bqu" = ( /obj/structure/toilet{ dir = 4; pixel_y = 8 }, /turf/open/floor/prison/whitepurple/northwest, -/area/fiorina/station/research_cells) -"bqC" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/prison/greenblue/west, -/area/fiorina/station/botany) -"bqD" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/research_cells/west) "bqF" = ( /obj/structure/closet/secure_closet/guncabinet{ req_access = null @@ -1787,15 +1785,6 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/prison, /area/fiorina/station/central_ring) -"brl" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/stairs/perspective{ - icon_state = "p_stair_sn_full_cap" - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/power_ring) "brC" = ( /turf/open/floor/prison/whitegreen/southeast, /area/fiorina/station/medbay) @@ -1810,19 +1799,13 @@ /obj/structure/prop/almayer/computers/sensor_computer3, /turf/open/floor/prison/darkredfull2, /area/fiorina/station/security) -"bsk" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/turf/open/space/basic, -/area/fiorina/oob) "bsm" = ( /obj/item/shard{ icon_state = "medium"; name = "ice shard" }, /turf/open/organic/grass/astroturf, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "bso" = ( /turf/closed/shuttle/ert{ icon_state = "stan_l_w" @@ -1834,13 +1817,16 @@ dir = 4 }, /turf/open/floor/prison/whitepurple/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "bsR" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/ashtray/plastic, /obj/item/trash/cigbutt, /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/station/medbay) +"btJ" = ( +/turf/open/floor/prison/yellow/north, +/area/fiorina/station/lowsec/showers_laundry) "buz" = ( /obj/item/stack/rods, /turf/open/floor/plating/prison, @@ -1907,7 +1893,7 @@ "bwk" = ( /obj/item/tool/wrench, /turf/open/floor/prison/whitepurple/north, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "bww" = ( /obj/item/trash/candy, /turf/open/floor/prison/floor_plate/southwest, @@ -1940,16 +1926,10 @@ "bxv" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison/bluecorner/east, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "bxy" = ( /turf/open/floor/prison/darkyellow2/northeast, /area/fiorina/lz/near_lzI) -"bxA" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/transit_hub) "bxE" = ( /obj/structure/prop/structure_lattice{ dir = 4; @@ -1994,19 +1974,19 @@ icon_state = "stan27" }, /area/fiorina/tumor/ship) -"byc" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/turf/open/floor/plating/prison, -/area/fiorina/station/chapel) "bym" = ( /turf/closed/shuttle/ert{ icon_state = "stan20" }, /area/fiorina/lz/near_lzI) +"byn" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/turf/open/floor/plating/prison, +/area/fiorina/station/park) "byB" = ( /obj/structure/surface/rack, /turf/open/floor/prison/floor_plate, @@ -2015,16 +1995,6 @@ /obj/structure/machinery/vending/cola, /turf/open/floor/prison, /area/fiorina/lz/near_lzII) -"byF" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 6 - }, -/turf/open/floor/prison/whitegreen/southeast, -/area/fiorina/tumor/ice_lab) "byG" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, /turf/open/floor/prison/whitegreen/east, @@ -2032,10 +2002,6 @@ "byJ" = ( /turf/open/floor/prison/green/west, /area/fiorina/tumor/civres) -"byT" = ( -/obj/structure/platform, -/turf/open/floor/prison, -/area/fiorina/station/transit_hub) "byY" = ( /turf/open/floor/prison, /area/fiorina/station/medbay) @@ -2071,7 +2037,7 @@ "bAM" = ( /obj/item/paper/prison_station/inmate_handbook, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "bBr" = ( /obj/structure/barricade/metal/wired{ dir = 1 @@ -2110,12 +2076,18 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"bDv" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/flight_deck) +"bCv" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/prison/whitegreenfull/southwest, +/area/fiorina/station/medbay) +"bCM" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/floor/prison, +/area/fiorina/tumor/ice_lab) +"bDf" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/prison/darkpurplefull2, +/area/fiorina/tumor/servers) "bDx" = ( /obj/item/tool/extinguisher/mini, /obj/structure/machinery/light/double/blue{ @@ -2148,7 +2120,7 @@ "bEm" = ( /obj/effect/landmark/wo_supplies/storage/belts/knifebelt, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "bEA" = ( /obj/structure/barricade/wooden{ dir = 4; @@ -2178,12 +2150,6 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison/kitchen/southwest, /area/fiorina/station/civres_blue) -"bFi" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/prison/darkbrown2/west, -/area/fiorina/station/park) "bFr" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/chapel) @@ -2254,14 +2220,6 @@ /obj/structure/largecrate/random, /turf/open/floor/prison/darkbrownfull2, /area/fiorina/tumor/aux_engi) -"bHU" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/platform/kutjevo/smooth, -/obj/structure/lattice, -/turf/open/space/basic, -/area/fiorina/oob) "bIz" = ( /obj/structure/machinery/landinglight/ds2{ dir = 8 @@ -2274,12 +2232,12 @@ }, /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison/yellow/southwest, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "bIR" = ( /obj/structure/closet/secure_closet/security, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "bIZ" = ( /turf/closed/shuttle/elevator{ dir = 6 @@ -2296,7 +2254,7 @@ "bJn" = ( /obj/item/stack/cable_coil/pink, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "bJp" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 @@ -2324,6 +2282,15 @@ /obj/item/storage/pill_bottle/imidazoline, /turf/open/floor/prison/sterile_white/southwest, /area/fiorina/tumor/ice_lab) +"bKO" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/park) +"bKT" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/item/stack/cable_coil, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) "bLA" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/flashlight, @@ -2368,7 +2335,7 @@ /obj/structure/surface/rack, /obj/item/restraint/handcuffs/zip, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "bMI" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/folder/black_random, @@ -2395,6 +2362,10 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) +"bNW" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/prison, +/area/fiorina/station/disco/east_disco) "bOp" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/stack/barbed_wire, @@ -2407,7 +2378,7 @@ "bOx" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/prison/whitepurple, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "bOK" = ( /obj/item/reagent_container/food/snacks/donkpocket, /turf/open/floor/corsat/squares, @@ -2466,14 +2437,6 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) -"bQj" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/turf/open/floor/prison, -/area/fiorina/station/transit_hub) "bQk" = ( /obj/structure/prop/invuln/minecart_tracks{ dir = 8 @@ -2525,7 +2488,7 @@ name = "\improper Fiorina Purple Block Canteen Vendor" }, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "bRo" = ( /obj/structure/sink{ pixel_y = 23 @@ -2592,10 +2555,6 @@ }, /turf/open/floor/prison/blue/west, /area/fiorina/station/chapel) -"bTo" = ( -/obj/structure/platform/kutjevo/smooth, -/turf/open/space, -/area/fiorina/oob) "bTp" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -2606,13 +2565,13 @@ "bTr" = ( /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison/whitepurple/northwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "bTC" = ( /obj/structure/machinery/power/terminal{ dir = 8 }, /turf/open/floor/prison/bluecorner/east, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "bTI" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ explo_proof = 1; @@ -2632,16 +2591,20 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) -"bUB" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/turf/open/space, -/area/fiorina/oob) +"bVm" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/lowsec) "bVE" = ( /obj/structure/closet/boxinggloves, /turf/open/floor/prison, /area/fiorina/station/central_ring) +"bVO" = ( +/obj/structure/bed{ + icon_state = "abed" + }, +/turf/open/floor/prison/whitepurple/east, +/area/fiorina/station/research_cells/east) "bVZ" = ( /turf/closed/shuttle/ert{ icon_state = "leftengine_1"; @@ -2673,7 +2636,7 @@ "bXz" = ( /obj/item/stack/sheet/wood, /turf/open/floor/prison/whitepurple/west, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "bXA" = ( /obj/item/tool/screwdriver, /turf/open/floor/prison, @@ -2701,7 +2664,7 @@ }, /obj/item/device/flashlight/lamp, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "bZY" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/plating/prison, @@ -2709,7 +2672,11 @@ "car" = ( /obj/structure/machinery/portable_atmospherics/canister/nitrogen, /turf/open/floor/prison/yellow/west, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) +"cas" = ( +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison/yellowfull, +/area/fiorina/station/lowsec/showers_laundry) "caA" = ( /obj/effect/spawner/random/toolbox, /turf/open/floor/prison/floor_plate, @@ -2719,7 +2686,7 @@ /area/fiorina/station/transit_hub) "caF" = ( /turf/open/floor/wood, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "caX" = ( /obj/structure/inflatable/popped/door, /obj/item/ammo_casing{ @@ -2747,23 +2714,13 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/civres) -"cbF" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/medbay) "cbN" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station) "cbY" = ( /obj/item/newspaper, /turf/open/floor/prison/whitepurplecorner, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "ccH" = ( /obj/structure/machinery/newscaster, /turf/closed/wall/prison, @@ -2810,6 +2767,13 @@ }, /turf/open/floor/prison/sterile_white/southwest, /area/fiorina/station/medbay) +"cee" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_ew_full_cap" + }, +/obj/structure/platform/metal/stair_cut/platform_right, +/turf/open/floor/plating/prison, +/area/fiorina/station/disco) "ceq" = ( /obj/item/bodybag, /obj/item/bodybag{ @@ -2839,7 +2803,7 @@ dir = 1 }, /turf/open/floor/prison/floor_plate/southwest, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "cfG" = ( /obj/structure/machinery/landinglight/ds1/delayone{ dir = 1 @@ -2849,7 +2813,15 @@ "cfU" = ( /obj/item/prop/helmetgarb/gunoil, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) +"cfX" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/power_ring) +"cgo" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/botany) "cgx" = ( /obj/structure/bed/chair, /turf/open/floor/prison/sterile_white/southwest, @@ -2893,17 +2865,13 @@ }, /turf/open/floor/prison/sterile_white/southwest, /area/fiorina/station/medbay) -"ciy" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 6 +"cia" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" }, -/obj/structure/closet/emcloset, -/turf/open/floor/prison/whitegreenfull/southwest, -/area/fiorina/station/medbay) +/turf/open/floor/plating/prison, +/area/fiorina/tumor/ice_lab) "ciA" = ( /obj/structure/machinery/vending/snack/packaged, /turf/open/floor/prison, @@ -2940,6 +2908,14 @@ }, /turf/open/floor/prison/floor_plate, /area/fiorina/station/security) +"ckl" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/turf/open/floor/plating/prison, +/area/fiorina/station/power_ring/reactor) "ckm" = ( /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, @@ -2951,18 +2927,10 @@ /obj/structure/machinery/light/double/blue, /turf/open/floor/prison/cell_stripe/east, /area/fiorina/station/medbay) -"ckA" = ( -/obj/structure/platform, -/turf/open/floor/prison, -/area/fiorina/tumor/ice_lab) "ckS" = ( /obj/item/stack/sheet/metal, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) -"ckZ" = ( -/obj/structure/platform, -/turf/open/floor/prison, -/area/fiorina/station/park) +/area/fiorina/station/lowsec/east) "clb" = ( /obj/item/prop/helmetgarb/spacejam_tickets{ desc = "A ticket to Souto Man's raffle!"; @@ -2985,7 +2953,7 @@ "clA" = ( /obj/item/weapon/baton/cattleprod, /turf/open/floor/prison/whitepurple/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "clN" = ( /obj/structure/prop/invuln/minecart_tracks{ dir = 1 @@ -3024,17 +2992,14 @@ /obj/item/stock_parts/manipulator/pico, /turf/open/floor/prison/darkpurple2/southeast, /area/fiorina/tumor/servers) +"cnU" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/prison/bluefull, +/area/fiorina/station/power_ring) "coj" = ( /obj/item/stool, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) -"cpv" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/surface/rack, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) +/area/fiorina/station/lowsec/east) "cpP" = ( /turf/closed/shuttle/elevator/gears, /area/fiorina/station/telecomm/lz1_cargo) @@ -3062,11 +3027,18 @@ "cqW" = ( /obj/item/stool, /turf/open/floor/prison/damaged2, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "cqX" = ( /obj/item/stool, /turf/open/floor/prison/floor_plate, /area/fiorina/station/medbay) +"cqZ" = ( +/obj/structure/platform/metal/stair_cut/platform_right, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_ew_full_cap" + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/power_ring/reactor) "cri" = ( /obj/structure/machinery/computer/prisoner, /obj/structure/window/reinforced{ @@ -3084,14 +3056,6 @@ }, /turf/open/floor/prison/sterile_white/southwest, /area/fiorina/station/medbay) -"cry" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/turf/open/floor/plating/prison, -/area/fiorina/station/disco) "crM" = ( /obj/structure/prop/invuln/minecart_tracks{ dir = 1 @@ -3101,12 +3065,24 @@ "csL" = ( /turf/open/floor/prison/cell_stripe/east, /area/fiorina/station/telecomm/lz1_tram) +"csW" = ( +/obj/structure/platform/metal/almayer, +/turf/open/floor/plating/prison, +/area/fiorina/station/lowsec/showers_laundry) "ctc" = ( /obj/structure/prop/resin_prop{ icon_state = "sheater0" }, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) +"ctj" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_ew_full_cap" + }, +/obj/structure/platform/metal/stair_cut/platform_left, +/turf/open/floor/plating/prison, +/area/fiorina/lz/near_lzII) "cto" = ( /obj/item/stack/rods, /turf/open/floor/plating/prison, @@ -3128,7 +3104,7 @@ }, /obj/effect/spawner/random/goggles/lowchance, /turf/open/floor/prison/whitepurple/southeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "ctW" = ( /obj/structure/bed{ icon_state = "abed" @@ -3153,7 +3129,7 @@ }, /obj/item/frame/rack, /turf/open/floor/prison/floor_plate/southwest, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "cvc" = ( /obj/structure/barricade/metal/wired{ dir = 4 @@ -3171,6 +3147,10 @@ }, /turf/open/floor/prison/bluefull, /area/fiorina/station/civres_blue) +"cvf" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/prison/bluefull, +/area/fiorina/station/power_ring) "cvi" = ( /obj/structure/surface/rack, /obj/item/storage/firstaid/fire, @@ -3263,6 +3243,10 @@ /obj/effect/spawner/random/pills/lowchance, /turf/open/floor/prison/bluefull, /area/fiorina/station/power_ring) +"czx" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/prison/whitegreenfull/southwest, +/area/fiorina/station/medbay) "czJ" = ( /obj/structure/reagent_dispensers/watertank{ layer = 2.6 @@ -3296,18 +3280,6 @@ /obj/item/storage/toolbox/electrical, /turf/open/floor/prison/floor_plate, /area/fiorina/tumor/aux_engi) -"cBn" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 9 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) "cBG" = ( /obj/effect/alien/weeds/node, /turf/open/floor/prison/darkbrown2/west, @@ -3334,7 +3306,7 @@ /area/fiorina/station/medbay) "cCe" = ( /turf/open/floor/prison/whitepurplecorner, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "cCh" = ( /obj/item/ammo_casing{ dir = 6; @@ -3394,6 +3366,14 @@ /obj/item/reagent_container/food/snacks/meat, /turf/open/floor/prison/floor_plate, /area/fiorina/station/security) +"cDO" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_ew_full_cap" + }, +/obj/structure/platform/metal/stair_cut/platform_left, +/turf/open/floor/plating/prison, +/area/fiorina/tumor/servers) "cEb" = ( /obj/structure/stairs/perspective{ dir = 4; @@ -3405,7 +3385,7 @@ /obj/structure/surface/table/reinforced/prison, /obj/item/ammo_magazine/shotgun/buckshot, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "cEw" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/transit_hub) @@ -3414,13 +3394,6 @@ icon_state = "stan_inner_t_right" }, /area/fiorina/tumor/ship) -"cEG" = ( -/obj/item/tool/pickaxe, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/prison/whitegreen/east, -/area/fiorina/tumor/ice_lab) "cEW" = ( /obj/structure/flora/bush/ausbushes/grassybush{ icon_state = "ywflowers_4" @@ -3475,6 +3448,10 @@ }, /turf/open/floor/prison/sterile_white/southwest, /area/fiorina/station/medbay) +"cHi" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/prison/whitegreenfull/southwest, +/area/fiorina/tumor/ice_lab) "cHl" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/prison/floor_plate, @@ -3488,7 +3465,7 @@ "cHC" = ( /obj/item/trash/popcorn, /turf/open/floor/prison/yellow/north, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "cHF" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/door/window/eastright, @@ -3502,13 +3479,16 @@ /obj/structure/closet/secure_closet/engineering_welding, /turf/open/floor/prison/darkbrownfull2, /area/fiorina/tumor/aux_engi) +"cIa" = ( +/turf/closed/wall/prison, +/area/fiorina/station/research_cells/east) "cIt" = ( /obj/structure/machinery/light/double/blue{ dir = 1; pixel_y = 21 }, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "cIJ" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -3516,7 +3496,7 @@ }, /obj/structure/inflatable, /turf/open/floor/prison/whitepurple/north, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "cIQ" = ( /obj/structure/bed/chair{ dir = 4 @@ -3570,7 +3550,7 @@ /area/fiorina/tumor/aux_engi) "cKa" = ( /turf/closed/wall/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "cKb" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -3578,22 +3558,12 @@ }, /turf/open/floor/prison/floor_plate, /area/fiorina/tumor/civres) -"cKB" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/prison/whitegreenfull/southwest, -/area/fiorina/tumor/ice_lab) "cKH" = ( /obj/structure/closet/bodybag, /obj/effect/decal/cleanable/blood/gibs/up, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "cKJ" = ( /obj/structure/closet/secure_closet/guncabinet{ req_access = null @@ -3605,16 +3575,6 @@ /obj/item/prop/helmetgarb/riot_shield, /turf/open/floor/prison/redfull, /area/fiorina/station/security) -"cKU" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/prison, -/area/fiorina/station/botany) "cLu" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -3622,12 +3582,6 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"cLy" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/prison/whitegreenfull/southwest, -/area/fiorina/tumor/ice_lab) "cLC" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/window/reinforced{ @@ -3662,13 +3616,19 @@ dir = 8 }, /turf/open/floor/prison/kitchen, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "cNe" = ( /obj/structure/bed/chair{ dir = 8 }, /turf/open/floor/prison/darkpurplefull2, /area/fiorina/tumor/servers) +"cNU" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform/metal/almayer, +/obj/structure/platform_decoration/metal/almayer/southeast, +/turf/open/gm/river/desert/deep, +/area/fiorina/lz/near_lzII) "cOj" = ( /turf/open/floor/prison/blue, /area/fiorina/station/civres_blue) @@ -3682,7 +3642,7 @@ /area/fiorina/station/park) "cOF" = ( /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "cOL" = ( /turf/open/floor/prison/darkyellow2/southwest, /area/fiorina/station/telecomm/lz1_cargo) @@ -3712,13 +3672,6 @@ /obj/item/stack/sandbags_empty, /turf/open/floor/prison/greenfull/northwest, /area/fiorina/tumor/civres) -"cPL" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_ew_full_cap" - }, -/obj/structure/platform/stair_cut/alt, -/turf/open/floor/plating/prison, -/area/fiorina/station/park) "cQe" = ( /obj/item/reagent_container/food/snacks/donkpocket, /turf/open/floor/prison/floor_plate, @@ -3741,10 +3694,19 @@ layer = 3 }, /area/fiorina/oob) +"cQB" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/prison, +/area/fiorina/station/transit_hub) "cRg" = ( /obj/structure/machinery/vending/coffee/simple, /turf/open/floor/prison/floor_plate, /area/fiorina/station/park) +"cRk" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison/darkbrown2, +/area/fiorina/station/park) "cRl" = ( /obj/structure/closet/secure_closet/security_empty, /obj/item/book/manual/security_space_law, @@ -3763,7 +3725,7 @@ opacity = 0 }, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "cRI" = ( /obj/structure/closet{ density = 0; @@ -3771,7 +3733,7 @@ }, /obj/item/stool, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "cRK" = ( /obj/structure/window, /turf/open/floor/prison/darkpurplefull2, @@ -3779,7 +3741,7 @@ "cRM" = ( /obj/effect/landmark/survivor_spawner, /turf/open/floor/prison/floor_plate/southwest, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "cRZ" = ( /obj/structure/machinery/landinglight/ds2/delaythree{ dir = 4 @@ -3829,15 +3791,6 @@ /obj/structure/machinery/light/double/blue, /turf/open/floor/prison/darkbrownfull2, /area/fiorina/station/park) -"cUU" = ( -/obj/structure/monorail{ - name = "launch track" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/telecomm/lz1_tram) "cVu" = ( /obj/item/stack/sandbags_empty/half, /turf/open/floor/prison/darkyellow2/west, @@ -3852,7 +3805,7 @@ "cVV" = ( /obj/structure/extinguisher_cabinet, /turf/closed/wall/r_wall/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "cXp" = ( /obj/item/stack/sheet/metal/medium_stack, /turf/open/floor/prison/floor_plate, @@ -3880,14 +3833,14 @@ pixel_y = 4 }, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "cYj" = ( /obj/structure/machinery/light/double/blue{ dir = 1; pixel_y = 21 }, /turf/open/floor/prison/floor_plate/southwest, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "cYI" = ( /turf/open/floor/prison/green/northeast, /area/fiorina/tumor/aux_engi) @@ -3898,30 +3851,22 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"cYS" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/prison/whitegreenfull/southwest, -/area/fiorina/station/central_ring) "cYT" = ( /obj/vehicle/powerloader{ dir = 8 }, /turf/open/organic/grass/astroturf, -/area/fiorina/station/research_cells) -"cYV" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_ew_full_cap" +/area/fiorina/station/research_cells/basketball) +"cYY" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" }, -/obj/structure/platform/stair_cut, -/turf/open/floor/plating/prison, -/area/fiorina/tumor/servers) +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison, +/area/fiorina/station/disco/east_disco) "cZe" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/phone, @@ -3948,18 +3893,16 @@ /obj/structure/largecrate/random/case/double, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) +"cZv" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/plating/prison, +/area/fiorina/station/power_ring) "cZy" = ( /obj/structure/machinery/door/window/northleft{ dir = 4 }, /turf/open/floor/prison/redfull, /area/fiorina/station/security/wardens) -"cZP" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/transit_hub) "cZR" = ( /turf/open/floor/prison/damaged2, /area/fiorina/station/disco) @@ -3973,6 +3916,14 @@ /obj/structure/machinery/vending/walkman, /turf/open/floor/prison/floor_plate, /area/fiorina/tumor/aux_engi) +"dar" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/prison/whitegreenfull/southwest, +/area/fiorina/station/central_ring) "daA" = ( /obj/item/clothing/accessory/armband/cargo{ desc = "Sworn to the shrapnel and the shards therein. So sayeth her command when the first detonation occured."; @@ -3980,13 +3931,6 @@ }, /turf/open/floor/prison/chapel_carpet/doubleside, /area/fiorina/station/chapel) -"daD" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/platform/kutjevo/smooth, -/turf/open/space, -/area/fiorina/oob) "daK" = ( /obj/structure/machinery/autolathe, /turf/open/floor/plating/prison, @@ -4003,7 +3947,7 @@ "dbh" = ( /obj/structure/machinery/vending/sovietsoda, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "dbi" = ( /obj/item/storage/toolbox/electrical, /turf/open/floor/prison, @@ -4017,16 +3961,10 @@ }, /turf/open/floor/prison/chapel_carpet/doubleside, /area/fiorina/station/chapel) -"dbr" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/park) "dbI" = ( /obj/structure/inflatable/popped/door, /turf/open/floor/prison/floor_marked/west, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "dbW" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/box/donkpockets{ @@ -4039,7 +3977,7 @@ "dcv" = ( /obj/structure/largecrate/random, /turf/open/floor/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "dcy" = ( /obj/structure/bed/chair{ dir = 8 @@ -4063,7 +4001,7 @@ pixel_y = 7 }, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "ddv" = ( /obj/structure/closet/secure_closet/engineering_welding, /obj/structure/machinery/light/double/blue{ @@ -4117,6 +4055,9 @@ }, /turf/closed/wall/prison, /area/fiorina/tumor/servers) +"deg" = ( +/turf/open/floor/prison/whitepurplecorner/west, +/area/fiorina/station/research_cells/east) "deB" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 8 @@ -4127,6 +4068,10 @@ }, /turf/open/organic/grass/astroturf, /area/fiorina/station/park) +"deC" = ( +/obj/structure/platform/metal/kutjevo_smooth/north, +/turf/open/floor/almayer_hull, +/area/fiorina/oob) "deR" = ( /obj/item/toy/crayon/red, /turf/open/floor/plating/prison, @@ -4142,6 +4087,11 @@ }, /turf/open/floor/prison/floor_plate, /area/fiorina/station/civres_blue) +"dfw" = ( +/obj/structure/platform/metal/kutjevo_smooth, +/obj/structure/platform/metal/kutjevo_smooth/west, +/turf/open/space, +/area/fiorina/oob) "dfA" = ( /obj/structure/barricade/sandbags{ icon_state = "sandbag_0"; @@ -4157,17 +4107,18 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) +"dgg" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/obj/structure/inflatable/popped, +/turf/open/floor/prison/whitegreen, +/area/fiorina/station/medbay) "dhc" = ( /obj/structure/largecrate/random/secure, /obj/structure/machinery/light/double/blue{ pixel_y = -1 }, /turf/open/floor/prison/yellow/southwest, -/area/fiorina/station/disco) -"dhi" = ( -/obj/structure/platform_decoration/kutjevo, -/turf/open/space/basic, -/area/fiorina/oob) +/area/fiorina/station/disco/east_disco) "dhL" = ( /obj/structure/barricade/wooden{ dir = 4 @@ -4185,21 +4136,11 @@ "diF" = ( /obj/item/stack/sheet/cardboard, /turf/open/floor/prison/yellow/north, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "diJ" = ( /obj/item/stool, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) -"diL" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/central_ring) +/area/fiorina/station/lowsec/east) "dje" = ( /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/plating/prison, @@ -4213,11 +4154,11 @@ dir = 4 }, /turf/open/organic/grass/astroturf, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "djF" = ( /obj/structure/machinery/portable_atmospherics/powered/scrubber, /turf/open/floor/prison/whitepurple, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "dkb" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/plating/prison, @@ -4251,10 +4192,21 @@ }, /turf/open/floor/prison/darkyellow2, /area/fiorina/station/telecomm/lz1_cargo) +"dlg" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/obj/structure/machinery/light/double/blue{ + pixel_y = -1 + }, +/turf/open/floor/plating/prison, +/area/fiorina/lz/near_lzI) "dlj" = ( /obj/structure/machinery/portable_atmospherics/powered/pump, /turf/open/floor/prison/whitepurple, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "dlr" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/radio{ @@ -4283,19 +4235,6 @@ }, /turf/open/floor/prison, /area/fiorina/station/park) -"dnj" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/prop/almayer/computers/mission_planning_system{ - density = 0; - desc = "Its a telephone, and a computer. Woah."; - name = "\improper funny telephone booth"; - pixel_x = 2; - pixel_y = 21 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/disco) "dnz" = ( /obj/structure/surface/table/woodentable/fancy, /obj/effect/spawner/random/toy, @@ -4310,6 +4249,10 @@ "dnX" = ( /turf/open/floor/prison/darkyellow2/west, /area/fiorina/lz/near_lzI) +"doc" = ( +/obj/item/stool, +/turf/open/floor/prison/darkpurplefull2, +/area/fiorina/station/research_cells/east) "doe" = ( /obj/item/tool/kitchen/utensil/pspoon, /turf/open/space/basic, @@ -4337,7 +4280,7 @@ dir = 1 }, /turf/open/floor/plating/prison, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "doY" = ( /obj/item/paper/crumpled/bloody, /turf/open/floor/prison/chapel_carpet/doubleside/north, @@ -4349,16 +4292,6 @@ }, /turf/open/floor/prison/yellow/southeast, /area/fiorina/station/lowsec) -"dpn" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/prison, -/area/fiorina/station/transit_hub) "dpH" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating/prison, @@ -4367,12 +4300,6 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/prison/greenblue, /area/fiorina/station/botany) -"dqa" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/gm/river/red_pool, -/area/fiorina/station/park) "dqE" = ( /obj/structure/prop/souto_land/pole, /turf/open/floor/wood, @@ -4402,7 +4329,7 @@ "drk" = ( /obj/effect/landmark/objective_landmark/far, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "drt" = ( /obj/structure/machinery/vending/hydroseeds, /turf/open/floor/prison/blue_plate/north, @@ -4410,7 +4337,7 @@ "drZ" = ( /obj/item/clothing/mask/cigarette, /turf/open/floor/prison/whitepurple/northwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "dsS" = ( /obj/structure/barricade/handrail/type_b{ dir = 4; @@ -4430,7 +4357,7 @@ /obj/structure/surface/table/reinforced/prison, /obj/item/ammo_magazine/shotgun/buckshot, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "dtk" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/drinks/golden_cup, @@ -4451,6 +4378,15 @@ }, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzII) +"dul" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = 13 + }, +/turf/open/floor/prison/whitegreen/southwest, +/area/fiorina/station/medbay) "duw" = ( /obj/structure/reagent_dispensers/fueltank, /obj/structure/machinery/light/double/blue{ @@ -4462,7 +4398,10 @@ "duF" = ( /obj/structure/window/framed/prison/reinforced, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) +"duL" = ( +/turf/open/floor/prison/yellow/southeast, +/area/fiorina/station/lowsec/east) "duM" = ( /obj/structure/machinery/photocopier, /turf/open/floor/wood, @@ -4471,7 +4410,7 @@ /obj/structure/surface/table/reinforced/prison, /obj/item/clipboard, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "duW" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison, @@ -4484,10 +4423,6 @@ /obj/structure/machinery/newscaster, /turf/closed/wall/prison, /area/fiorina/station/medbay) -"dvB" = ( -/obj/structure/platform_decoration, -/turf/open/floor/prison, -/area/fiorina/tumor/ice_lab) "dwf" = ( /obj/structure/bed/chair{ dir = 8 @@ -4581,27 +4516,33 @@ }, /turf/open/floor/prison/kitchen/southwest, /area/fiorina/tumor/civres) +"dzh" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/transit_hub) "dzl" = ( /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, /area/fiorina/station/flight_deck) +"dzq" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/power_ring) +"dzs" = ( +/obj/structure/platform/metal/almayer/east, +/obj/item/stool, +/turf/open/floor/prison/bluefull, +/area/fiorina/station/civres_blue) "dzB" = ( /turf/open/floor/prison/kitchen, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "dzE" = ( /obj/structure/machinery/shower{ dir = 1; pixel_y = -1 }, /turf/open/floor/prison/kitchen, -/area/fiorina/station/lowsec) -"dAd" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_ew_full_cap" - }, -/obj/structure/platform/stair_cut/alt, -/turf/open/floor/plating/prison, -/area/fiorina/station/disco) +/area/fiorina/station/lowsec/showers_laundry) "dAg" = ( /turf/open/floor/prison/whitegreen/northeast, /area/fiorina/station/medbay) @@ -4646,19 +4587,6 @@ "dBZ" = ( /turf/open/floor/prison/darkyellowcorners2/east, /area/fiorina/station/flight_deck) -"dCg" = ( -/obj/structure/bed/chair, -/obj/effect/decal/cleanable/blood/drip, -/obj/effect/decal/cleanable/blood/drip{ - icon_state = "2" - }, -/obj/effect/decal/cleanable/blood/drip{ - icon_state = "4" - }, -/obj/item/prop/helmetgarb/flair_initech, -/obj/effect/landmark/corpsespawner/ua_riot, -/turf/open/floor/prison, -/area/fiorina/station/medbay) "dCn" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ density = 0; @@ -4765,7 +4693,7 @@ pixel_y = -1 }, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "dFK" = ( /obj/structure/surface/rack, /obj/item/ammo_box/magazine/nailgun, @@ -4795,6 +4723,10 @@ }, /turf/open/floor/prison/cell_stripe/east, /area/fiorina/station/park) +"dGF" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/park) "dHb" = ( /obj/structure/closet/secure_closet/guncabinet{ req_access = null @@ -4811,6 +4743,10 @@ "dHD" = ( /turf/open/floor/prison/yellow/north, /area/fiorina/station/lowsec) +"dHE" = ( +/obj/structure/platform/metal/almayer, +/turf/open/floor/prison/cell_stripe/west, +/area/fiorina/station/botany) "dHU" = ( /turf/open/floor/prison/platingdmg1, /area/fiorina/station/security) @@ -4821,35 +4757,34 @@ "dIo" = ( /turf/closed/wall/prison, /area/fiorina/tumor/civres) -"dIx" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/prison/yellow/northeast, +"dIp" = ( +/turf/open/floor/prison/blue/east, +/area/fiorina/station/power_ring/reactor) +"dIu" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/prison/floor_plate, /area/fiorina/station/disco) +"dJc" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/botany) "dJd" = ( /obj/effect/decal/cleanable/blood/gibs, /obj/item/ammo_magazine/rifle/mar40, /turf/open/floor/prison/floor_plate, /area/fiorina/station/lowsec) -"dJe" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/prison, -/area/fiorina/station/park) "dJh" = ( /obj/structure/bookcase/manuals/research_and_development{ pixel_y = 10 }, /turf/open/floor/prison/whitepurple/north, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "dJt" = ( /obj/structure/machinery/light/double/blue{ pixel_y = -1 }, /turf/open/floor/prison/yellow, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "dKo" = ( /obj/effect/spawner/random/gun/shotgun, /turf/open/floor/carpet, @@ -4860,6 +4795,10 @@ }, /turf/open/floor/prison, /area/fiorina/station/telecomm/lz1_tram) +"dKO" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/prison/floor_plate, +/area/fiorina/tumor/ice_lab) "dKX" = ( /obj/effect/landmark/survivor_spawner, /turf/open/floor/plating/plating_catwalk/prison, @@ -4883,16 +4822,15 @@ "dMt" = ( /turf/open/floor/prison/darkbrowncorners2/west, /area/fiorina/tumor/aux_engi) -"dNc" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 +"dMT" = ( +/obj/structure/blocker/invisible_wall, +/obj/structure/platform/metal/almayer/north, +/obj/structure/ice/thin/indestructible{ + dir = 4; + icon_state = "Corner" }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) +/turf/open/ice/noweed, +/area/fiorina/tumor/ice_lab) "dNh" = ( /turf/open/auto_turf/sand/layer1, /area/fiorina/lz/near_lzI) @@ -4913,6 +4851,16 @@ /obj/structure/machinery/vending/cigarette/colony, /turf/open/floor/prison/darkredfull2, /area/fiorina/lz/near_lzI) +"dOc" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/northeast, +/turf/open/floor/plating/prison, +/area/fiorina/station/power_ring) +"dOf" = ( +/obj/structure/platform/metal/almayer, +/turf/open/floor/prison, +/area/fiorina/tumor/ice_lab) "dOk" = ( /turf/open/floor/prison/panelscorched, /area/fiorina/tumor/civres) @@ -4926,23 +4874,16 @@ /obj/item/storage/bible/hefa, /turf/open/floor/wood, /area/fiorina/station/chapel) +"dOI" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/park) "dOO" = ( /turf/open/floor/prison/whitegreen/north, /area/fiorina/station/medbay) "dOX" = ( /turf/closed/wall/r_wall/prison, /area/fiorina/lz/near_lzI) -"dOZ" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = 13 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) "dPe" = ( /obj/structure/bed/chair, /turf/open/floor/prison/yellowfull, @@ -4954,15 +4895,6 @@ }, /turf/open/floor/prison, /area/fiorina/station/power_ring) -"dPr" = ( -/obj/structure/monorail{ - name = "launch track" - }, -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/telecomm/lz1_tram) "dPZ" = ( /obj/structure/monorail{ dir = 6; @@ -4973,13 +4905,7 @@ "dQe" = ( /obj/item/tool/surgery/scalpel, /turf/open/floor/prison, -/area/fiorina/station/lowsec) -"dQV" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/lowsec/showers_laundry) "dQW" = ( /obj/item/ammo_casing{ dir = 8; @@ -5006,6 +4932,10 @@ }, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) +"dRF" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/floor/prison/bluefull, +/area/fiorina/station/power_ring) "dRO" = ( /obj/effect/acid_hole{ dir = 4 @@ -5031,6 +4961,11 @@ /obj/structure/machinery/door/airlock/prison_hatch/autoname, /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) +"dTQ" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/closet/radiation, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) "dTX" = ( /obj/structure/surface/rack, /obj/item/storage/bible/hefa{ @@ -5051,6 +4986,18 @@ }, /turf/open/floor/prison, /area/fiorina/lz/near_lzII) +"dUm" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/barricade/handrail/type_b{ + dir = 4; + layer = 3.5 + }, +/obj/structure/morgue{ + dir = 8; + layer = 2.6 + }, +/turf/open/floor/corsat/squares, +/area/fiorina/station/medbay) "dUn" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/flora/pottedplant{ @@ -5070,13 +5017,13 @@ pixel_x = 12 }, /turf/open/floor/prison/whitepurple/southeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "dVu" = ( /obj/structure/machinery/light/double/blue{ pixel_y = -1 }, /turf/open/floor/prison/yellow/southwest, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "dVx" = ( /obj/structure/stairs/perspective{ dir = 4; @@ -5087,12 +5034,12 @@ "dVA" = ( /obj/item/stool, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "dVC" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/clipboard, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "dVD" = ( /obj/structure/inflatable/popped/door, /turf/open/floor/prison/whitegreen, @@ -5151,12 +5098,7 @@ "dXS" = ( /obj/structure/bed/chair/office/light, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/research_cells) -"dXT" = ( -/obj/structure/platform_decoration, -/obj/effect/spawner/random/toolbox, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) +/area/fiorina/station/research_cells/west) "dYi" = ( /turf/open/floor/prison/yellow/west, /area/fiorina/station/central_ring) @@ -5177,6 +5119,14 @@ /obj/structure/machinery/faxmachine, /turf/open/floor/prison/bluefull, /area/fiorina/station/power_ring) +"dYB" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) "dYC" = ( /turf/open/floor/prison/yellow/east, /area/fiorina/station/central_ring) @@ -5206,6 +5156,10 @@ "dZK" = ( /turf/open/floor/prison/bluecorner/east, /area/fiorina/station/chapel) +"dZM" = ( +/obj/structure/window/framed/prison/cell, +/turf/open/floor/plating/prison, +/area/fiorina/station/research_cells/east) "dZQ" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/prison/darkyellow2/east, @@ -5221,24 +5175,41 @@ dir = 8 }, /turf/open/floor/prison/kitchen, -/area/fiorina/station/lowsec) -"eca" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/decal/medical_decals{ - icon_state = "cryomid" +/area/fiorina/station/lowsec/showers_laundry) +"eaH" = ( +/obj/structure/platform/metal/almayer, +/turf/open/floor/prison/greenfull/northwest, +/area/fiorina/station/transit_hub) +"ebx" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_ew_full_cap" }, -/turf/open/floor/prison/whitegreenfull/southwest, -/area/fiorina/station/medbay) +/obj/structure/platform/metal/stair_cut/platform_right, +/turf/open/floor/plating/prison, +/area/fiorina/station/park) "ecd" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) +"ecj" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/machinery/cm_vending/sorted/tech/tool_storage{ + layer = 3.5 + }, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/power_ring) "ecu" = ( /obj/item/stack/sheet/metal/medium_stack, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) +"ecz" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/prison/darkbrowncorners2/west, +/area/fiorina/station/park) "ecD" = ( /obj/structure/bed/chair{ dir = 1 @@ -5272,24 +5243,6 @@ /obj/item/device/multitool, /turf/open/floor/prison/darkyellow2/west, /area/fiorina/station/telecomm/lz1_cargo) -"edu" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/turf/open/floor/prison, -/area/fiorina/tumor/servers) -"edy" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/central_ring) "edY" = ( /obj/item/trash/used_stasis_bag{ desc = "Wow, instant sand. They really have everything in space."; @@ -5371,12 +5324,6 @@ "egv" = ( /turf/closed/wall/mineral/bone_resin, /area/fiorina/station/civres_blue) -"egz" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) "egL" = ( /obj/item/newspaper, /turf/open/floor/plating/prison, @@ -5393,33 +5340,21 @@ /obj/structure/machinery/landinglight/ds1/delaythree, /turf/open/floor/prison/darkyellowfull2/east, /area/fiorina/lz/near_lzI) -"ehO" = ( -/obj/structure/platform/shiva, -/turf/open/floor/plating/prison, -/area/fiorina/station/central_ring) -"eim" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/prison/darkpurplefull2, -/area/fiorina/tumor/servers) "eio" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison, -/area/fiorina/station/disco) -"eip" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" +/area/fiorina/station/disco/east_disco) +"eja" = ( +/obj/item/ammo_casing{ + icon_state = "casing_6_1" }, -/obj/structure/platform, -/turf/open/floor/plating/prison, -/area/fiorina/station/security) +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/lowsec/east) "ejf" = ( /obj/structure/closet/bodybag, /obj/effect/decal/cleanable/blood/gibs/down, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "ejq" = ( /obj/structure/machinery/space_heater, /turf/open/floor/plating/plating_catwalk/prison, @@ -5453,7 +5388,7 @@ pixel_y = 2 }, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "ekb" = ( /turf/open/floor/prison/floor_plate, /area/fiorina/station/telecomm/lz1_tram) @@ -5489,11 +5424,22 @@ /obj/structure/bed/roller, /obj/effect/decal/cleanable/blood/gibs/body, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "ele" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison/floor_plate, /area/fiorina/station/central_ring) +"elm" = ( +/obj/structure/window/framed/prison/cell, +/turf/open/floor/plating/prison, +/area/fiorina/station/lowsec/east) +"elr" = ( +/obj/effect/decal/cleanable/blood/splatter{ + icon_state = "gibmid3" + }, +/obj/effect/landmark/corpsespawner/doctor, +/turf/open/floor/prison/sterile_white/southwest, +/area/fiorina/station/medbay) "elO" = ( /turf/open/floor/prison/yellow/southwest, /area/fiorina/station/lowsec) @@ -5507,6 +5453,12 @@ /obj/structure/closet/crate/trashcart, /turf/open/floor/corsat/plate, /area/fiorina/tumor/aux_engi) +"emo" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/southeast, +/turf/open/floor/prison/whitegreen/southeast, +/area/fiorina/tumor/ice_lab) "emC" = ( /obj/structure/lattice, /obj/item/shard{ @@ -5514,10 +5466,21 @@ }, /turf/open/space, /area/fiorina/oob) +"emE" = ( +/turf/open/floor/prison/bluecorner/west, +/area/fiorina/station/power_ring/reactor) "end" = ( /obj/structure/window/framed/prison/cell, /turf/open/floor/plating/prison, /area/fiorina/station/lowsec) +"eni" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/floor/prison, +/area/fiorina/station/medbay) +"enn" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/transit_hub) "enu" = ( /obj/item/trash/uscm_mre, /turf/open/floor/prison/darkyellowfull2/east, @@ -5530,10 +5493,21 @@ /obj/effect/alien/weeds/node, /turf/open/organic/grass/astroturf, /area/fiorina/tumor/fiberbush) +"enU" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/northeast, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) "enY" = ( /obj/item/stack/sheet/metal, /turf/open/floor/plating/prison, /area/fiorina/oob) +"eor" = ( +/obj/item/tool/pickaxe, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/prison/whitegreen/east, +/area/fiorina/tumor/ice_lab) "eot" = ( /turf/open/floor/prison/darkyellow2/west, /area/fiorina/station/telecomm/lz1_tram) @@ -5542,10 +5516,10 @@ desc = "A huge chunk of metal used to seperate rooms."; name = "metal wall" }, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "eow" = ( /turf/open/floor/prison/whitepurple/west, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "eoW" = ( /obj/structure/largecrate/random/case, /turf/open/floor/plating/prison, @@ -5578,18 +5552,6 @@ /obj/item/device/flashlight, /turf/open/floor/prison/darkyellow2/north, /area/fiorina/lz/near_lzI) -"eqw" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/prison/bluecorner/east, -/area/fiorina/station/power_ring) -"eqJ" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/prison, -/area/fiorina/station/medbay) "eqQ" = ( /turf/open/floor/corsat/squares, /area/fiorina/station/telecomm/lz1_cargo) @@ -5637,19 +5599,6 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison/floor_plate, /area/fiorina/station/power_ring) -"erD" = ( -/obj/structure/largecrate/supply, -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/plating/plating_catwalk/prison, -/area/fiorina/station/medbay) -"erT" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/space, -/area/fiorina/oob) "erU" = ( /obj/structure/machinery/shower{ pixel_y = 13 @@ -5658,10 +5607,14 @@ dir = 8 }, /turf/open/floor/prison/kitchen, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "esw" = ( /turf/open/floor/prison/cell_stripe/west, /area/fiorina/station/medbay) +"esy" = ( +/obj/structure/platform/metal/almayer, +/turf/open/floor/plating/prison, +/area/fiorina/lz/near_lzI) "esR" = ( /obj/structure/machinery/space_heater, /turf/open/floor/prison/whitegreenfull/southwest, @@ -5670,6 +5623,10 @@ /obj/item/stack/sheet/metal, /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) +"esY" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/prison/blue/west, +/area/fiorina/station/power_ring) "esZ" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 @@ -5679,12 +5636,6 @@ "etj" = ( /turf/open/floor/prison/green/northeast, /area/fiorina/station/chapel) -"etq" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/prison/yellow/southwest, -/area/fiorina/station/disco) "etL" = ( /obj/item/tool/weldingtool, /turf/open/floor/plating/prison, @@ -5703,7 +5654,7 @@ dir = 8 }, /turf/open/floor/prison/yellow/east, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "euz" = ( /obj/structure/bed/chair{ dir = 4 @@ -5868,28 +5819,24 @@ /obj/structure/machinery/portable_atmospherics/canister/phoron, /turf/open/floor/corsat/plate, /area/fiorina/station/telecomm/lz1_cargo) +"eyB" = ( +/obj/structure/platform/metal/kutjevo_smooth, +/obj/structure/platform/metal/kutjevo_smooth/east, +/turf/open/space, +/area/fiorina/oob) "eyO" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison/blue_plate/east, /area/fiorina/station/botany) +"eyT" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/item/clothing/gloves/botanic_leather, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/botany) "ezd" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/prison/whitepurple/northwest, -/area/fiorina/station/research_cells) -"eze" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/turf/open/space/basic, -/area/fiorina/oob) +/area/fiorina/station/research_cells/west) "ezn" = ( /obj/structure/sign/prop3{ desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." @@ -5931,12 +5878,14 @@ /obj/structure/bed/chair, /turf/open/floor/prison/floor_plate, /area/fiorina/station/power_ring) -"eBr" = ( -/obj/structure/platform_decoration{ - dir = 4 +"eBH" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_sn_full_cap" }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/transit_hub) +/turf/open/floor/prison, +/area/fiorina/station/flight_deck) "eBO" = ( /obj/structure/machinery/door/airlock/almayer/marine, /turf/open/floor/prison/yellowfull, @@ -5969,7 +5918,13 @@ pixel_y = 10 }, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) +"eDU" = ( +/obj/structure/platform/metal/almayer/east, +/obj/item/stool, +/obj/item/clothing/shoes/slippers_worn, +/turf/open/floor/prison/bluefull, +/area/fiorina/station/civres_blue) "eEx" = ( /obj/item/circuitboard/machine/rdserver, /turf/open/floor/prison/darkpurplefull2, @@ -5982,7 +5937,7 @@ pixel_y = 22 }, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "eED" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/paper_bin{ @@ -6012,12 +5967,6 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison/kitchen, /area/fiorina/station/power_ring) -"eEX" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/prison/darkbrown2, -/area/fiorina/station/park) "eFa" = ( /obj/structure/barricade/metal{ dir = 1; @@ -6056,26 +6005,26 @@ /obj/item/storage/firstaid/regular, /turf/open/floor/prison/floor_plate, /area/fiorina/tumor/ice_lab) -"eGm" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_sn_full_cap" +"eGF" = ( +/obj/structure/barricade/wooden{ + dir = 4 }, -/obj/structure/platform{ - dir = 8 +/obj/item/tool/crowbar/red, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_ew_full_cap" }, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) +/obj/structure/platform/metal/stair_cut/platform_right, +/turf/open/floor/prison/cell_stripe/east, +/area/fiorina/station/medbay) "eGO" = ( /obj/item/storage/toolbox/electrical, /obj/structure/surface/rack, /turf/open/floor/prison/floor_plate, /area/fiorina/tumor/civres) -"eHa" = ( -/obj/structure/lattice, -/obj/structure/platform/kutjevo/smooth, -/turf/open/space, -/area/fiorina/oob) +"eGT" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/floor/prison/darkbrown2, +/area/fiorina/station/park) "eHk" = ( /obj/structure/machinery/door/morgue{ dir = 2; @@ -6157,18 +6106,15 @@ "eJy" = ( /obj/structure/inflatable/popped/door, /turf/open/floor/prison/yellow/southeast, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "eJK" = ( /obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison/floor_plate, /area/fiorina/station/civres_blue) -"eJQ" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/lattice, -/turf/open/space/basic, -/area/fiorina/oob) +"eKa" = ( +/obj/structure/platform/metal/almayer, +/turf/open/floor/prison/cell_stripe/east, +/area/fiorina/station/security) "eLu" = ( /turf/closed/wall/prison, /area/fiorina/maintenance) @@ -6183,7 +6129,7 @@ icon_state = "pottedplant_22" }, /turf/open/floor/prison/yellow/southeast, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "eLB" = ( /obj/structure/machinery/landinglight/ds1/delaytwo{ dir = 1 @@ -6203,18 +6149,7 @@ pixel_y = 21 }, /turf/open/floor/prison, -/area/fiorina/station/disco) -"eLX" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = 13 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/central_ring) +/area/fiorina/station/disco/east_disco) "eME" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/paper, @@ -6233,6 +6168,14 @@ }, /turf/open/floor/prison/floor_plate, /area/fiorina/station/central_ring) +"eMN" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = 13 + }, +/turf/open/floor/prison/yellowfull, +/area/fiorina/station/lowsec/east) "eMU" = ( /turf/closed/shuttle/ert{ icon_state = "rightengine_1"; @@ -6254,7 +6197,7 @@ /obj/structure/surface/table/reinforced/prison, /obj/item/storage/surgical_tray/empty, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "eNv" = ( /obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison/darkyellowfull2/east, @@ -6265,21 +6208,6 @@ }, /turf/open/floor/prison/whitegreen, /area/fiorina/station/medbay) -"eOy" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/prison/whitegreenfull/southwest, -/area/fiorina/station/medbay) -"eOF" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/turf/open/space, -/area/fiorina/oob) "eOI" = ( /obj/item/shard{ icon_state = "large" @@ -6290,6 +6218,13 @@ /obj/item/reagent_container/food/snacks/eat_bar, /turf/open/floor/prison/whitegreen/east, /area/fiorina/station/medbay) +"eOQ" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/reagent_dispensers/fueltank/oxygentank{ + layer = 2.6 + }, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) "ePq" = ( /obj/item/trash/cigbutt/ucigbutt, /obj/item/trash/cigbutt/ucigbutt{ @@ -6321,7 +6256,7 @@ "eQb" = ( /obj/item/clothing/gloves/boxing/green, /turf/open/floor/prison/yellow/north, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "eQk" = ( /obj/structure/machinery/light/double/blue{ dir = 4; @@ -6330,6 +6265,12 @@ }, /turf/open/floor/wood, /area/fiorina/station/civres_blue) +"eQs" = ( +/obj/structure/machinery/door/airlock/prison_hatch/autoname{ + dir = 1 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/lowsec/east) "eQz" = ( /obj/structure/machinery/gibber, /obj/effect/decal/cleanable/blood{ @@ -6347,10 +6288,6 @@ }, /turf/open/floor/prison/darkyellow2/west, /area/fiorina/station/flight_deck) -"eQY" = ( -/obj/structure/platform_decoration, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/transit_hub) "eRl" = ( /obj/item/stack/sheet/metal, /turf/open/floor/prison/floor_plate, @@ -6391,6 +6328,10 @@ }, /turf/open/floor/prison, /area/fiorina/tumor/servers) +"eSI" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/prison/darkpurplefull2, +/area/fiorina/station/research_cells/west) "eSO" = ( /obj/structure/largecrate/random/case/double, /obj/structure/machinery/light/double/blue, @@ -6399,7 +6340,7 @@ "eTa" = ( /obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/prison/yellow/northwest, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "eTb" = ( /turf/closed/shuttle/ert{ icon_state = "rightengine_1"; @@ -6451,16 +6392,6 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) -"eVj" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/prison, -/area/fiorina/station/telecomm/lz1_tram) "eVm" = ( /obj/structure/machinery/newscaster, /turf/closed/wall/r_wall/prison_unmeltable, @@ -6469,6 +6400,9 @@ /obj/structure/machinery/computer/arcade, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) +"eVD" = ( +/turf/open/floor/prison/yellow/northeast, +/area/fiorina/station/lowsec/east) "eVK" = ( /obj/structure/prop/structure_lattice{ dir = 4; @@ -6545,13 +6479,6 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/botany) -"eXY" = ( -/obj/structure/platform, -/obj/structure/reagent_dispensers/fueltank/oxygentank{ - layer = 2.6 - }, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) "eYr" = ( /obj/structure/inflatable, /obj/structure/barricade/handrail/type_b, @@ -6591,6 +6518,10 @@ }, /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/security/wardens) +"eYW" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/transit_hub) "eZi" = ( /obj/structure/machinery/power/apc/power/west, /turf/open/floor/prison, @@ -6600,6 +6531,10 @@ /obj/structure/machinery/landinglight/ds2/delayone, /turf/open/floor/prison, /area/fiorina/lz/near_lzII) +"eZK" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/central_ring) "eZQ" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/box/handcuffs{ @@ -6623,20 +6558,14 @@ "eZW" = ( /obj/item/stack/rods/plasteel, /turf/open/floor/prison/floor_plate/southwest, -/area/fiorina/station/disco) -"fac" = ( -/obj/structure/platform/shiva{ - dir = 1 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/central_ring) +/area/fiorina/station/disco/east_disco) "faw" = ( /obj/structure/barricade/metal{ health = 250; icon_state = "metal_1" }, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "faD" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_ew_full_cap" @@ -6647,6 +6576,9 @@ /obj/item/reagent_container/food/drinks/cans/waterbottle, /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/station/medbay) +"fbn" = ( +/turf/closed/wall/prison, +/area/fiorina/station/power_ring/reactor) "fbo" = ( /obj/structure/barricade/plasteel, /obj/structure/barricade/metal{ @@ -6686,7 +6618,11 @@ dir = 1 }, /turf/open/floor/prison/yellow/north, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) +"fcH" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/prison/chapel_carpet/doubleside, +/area/fiorina/station/chapel) "fdf" = ( /obj/structure/closet, /obj/item/stack/cable_coil, @@ -6709,26 +6645,10 @@ }, /turf/open/floor/prison, /area/fiorina/station/flight_deck) -"fdR" = ( -/obj/structure/platform_decoration, -/turf/open/floor/prison/darkbrowncorners2, -/area/fiorina/station/park) -"fdV" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/turf/open/space/basic, -/area/fiorina/oob) -"fer" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison, -/area/fiorina/station/medbay) +"ffx" = ( +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison/yellow, +/area/fiorina/station/lowsec/east) "ffA" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison/greenfull/northwest, @@ -6740,19 +6660,15 @@ "fgq" = ( /obj/effect/landmark/corpsespawner/engineer, /turf/open/floor/prison/bluefull, -/area/fiorina/station/power_ring) -"fgM" = ( -/obj/structure/platform, -/obj/item/ammo_casing{ - dir = 2; - icon_state = "casing_5" - }, -/turf/open/gm/river/red_pool, -/area/fiorina/station/park) +/area/fiorina/station/power_ring/reactor) "fgN" = ( /obj/item/device/flashlight/flare, /turf/open/floor/prison/floor_plate, /area/fiorina/lz/near_lzI) +"fgT" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/floor/prison/whitegreen, +/area/fiorina/tumor/ice_lab) "fgU" = ( /obj/structure/surface/table/reinforced/prison, /turf/open/floor/plating/prison, @@ -6770,6 +6686,16 @@ /obj/item/storage/toolbox/emergency, /turf/open/floor/prison/floor_plate, /area/fiorina/tumor/aux_engi) +"fhS" = ( +/obj/structure/platform/metal/almayer, +/obj/item/fuel_cell, +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = 13 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/lowsec/showers_laundry) "fic" = ( /obj/structure/bed/sofa/south/grey/right, /obj/structure/machinery/cm_vending/sorted/medical/wall_med/souto{ @@ -6790,7 +6716,7 @@ }, /obj/structure/blocker/invisible_wall, /turf/open/ice/noweed, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "fiw" = ( /obj/structure/machinery/vending/coffee, /turf/open/floor/prison/bluefull, @@ -6807,23 +6733,12 @@ "fjd" = ( /turf/closed/wall/prison, /area/fiorina/lz/near_lzI) -"fje" = ( -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = -3 - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/prison/yellow/northeast, -/area/fiorina/station/disco) "fjg" = ( /obj/structure/machinery/light/double/blue{ pixel_y = -1 }, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "fjo" = ( /obj/item/ammo_casing{ icon_state = "casing_5_1" @@ -6862,15 +6777,9 @@ }, /turf/open/floor/prison/redfull, /area/fiorina/station/security) -"fkH" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/decal/medical_decals{ - icon_state = "triagedecalbottomleft" - }, -/turf/open/floor/prison/whitegreenfull/southwest, -/area/fiorina/station/medbay) +"flG" = ( +/turf/open/floor/prison/yellow/northeast, +/area/fiorina/station/disco/east_disco) "fmb" = ( /obj/item/storage/firstaid/toxin, /turf/open/floor/prison/floor_plate, @@ -6890,17 +6799,17 @@ /obj/item/device/cassette_tape/ocean, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) +"fna" = ( +/obj/structure/toilet{ + dir = 4; + pixel_y = 8 + }, +/turf/open/floor/prison/whitepurple/northwest, +/area/fiorina/station/research_cells/east) "fnn" = ( /obj/structure/machinery/vending/cigarette/colony, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) -"fno" = ( -/obj/structure/machinery/space_heater, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/prison/whitegreen/east, -/area/fiorina/tumor/ice_lab) "fnD" = ( /turf/closed/shuttle/elevator{ dir = 4 @@ -6910,14 +6819,6 @@ /obj/structure/machinery/vending/cola, /turf/open/floor/prison/floor_plate, /area/fiorina/station/park) -"fob" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/filingcabinet, -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) "fop" = ( /obj/structure/surface/rack, /obj/effect/landmark/objective_landmark/science, @@ -6929,17 +6830,12 @@ }, /turf/open/floor/prison, /area/fiorina/station/security) -"fpg" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = 13 - }, +"foR" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/southwest, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) +/area/fiorina/station/park) "fpn" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/tumor/aux_engi) @@ -6990,7 +6886,7 @@ "fqI" = ( /obj/structure/machinery/space_heater, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "frc" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/prison/blue/west, @@ -7011,6 +6907,10 @@ }, /turf/open/floor/prison/sterile_white/southwest, /area/fiorina/station/medbay) +"fse" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/prison/bluecorner/west, +/area/fiorina/station/power_ring) "fsk" = ( /obj/structure/machinery/space_heater, /turf/open/floor/plating/prison, @@ -7019,16 +6919,6 @@ /obj/effect/landmark/monkey_spawn, /turf/open/floor/prison/floor_plate, /area/fiorina/tumor/civres) -"ftd" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform, -/obj/structure/platform_decoration{ - dir = 6 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/botany) "fth" = ( /obj/effect/landmark/monkey_spawn, /turf/open/floor/prison/floor_plate, @@ -7074,12 +6964,16 @@ /obj/item/clipboard, /turf/open/floor/prison/darkpurplefull2, /area/fiorina/tumor/servers) -"fvr" = ( -/obj/structure/platform_decoration{ - dir = 4 +"fvn" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" }, -/turf/open/floor/prison/cell_stripe/west, -/area/fiorina/station/park) +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/prison, +/area/fiorina/station/medbay) +"fvx" = ( +/turf/open/floor/prison/whitepurple/northwest, +/area/fiorina/station/research_cells/east) "fvH" = ( /turf/open/floor/prison/cell_stripe/east, /area/fiorina/oob) @@ -7112,13 +7006,6 @@ /obj/item/poster, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) -"fwt" = ( -/obj/effect/decal/cleanable/blood/oil, -/obj/effect/decal/medical_decals{ - icon_state = "triagedecaldir" - }, -/turf/open/floor/prison/whitegreenfull/southwest, -/area/fiorina/station/medbay) "fwY" = ( /obj/structure/barricade/metal/wired{ health = 250; @@ -7149,10 +7036,10 @@ /obj/structure/surface/table/reinforced/prison, /obj/item/clothing/mask/surgical, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "fyi" = ( /turf/open/floor/wood, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "fyt" = ( /obj/structure/flora/bush/ausbushes/grassybush{ icon_state = "ywflowers_3" @@ -7165,17 +7052,6 @@ }, /turf/open/floor/carpet, /area/fiorina/station/civres_blue) -"fyC" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/turf/open/space, -/area/fiorina/oob) -"fyL" = ( -/obj/structure/platform_decoration, -/turf/open/floor/prison, -/area/fiorina/station/disco) "fyO" = ( /obj/item/stack/rods, /turf/open/floor/plating/prison, @@ -7251,10 +7127,16 @@ /obj/structure/closet/secure_closet/engineering_materials, /turf/open/floor/prison/floor_plate, /area/fiorina/tumor/civres) +"fBA" = ( +/turf/open/floor/prison/yellow/east, +/area/fiorina/station/lowsec/showers_laundry) "fBD" = ( /obj/structure/largecrate/random/case/small, /turf/open/floor/prison, /area/fiorina/lz/near_lzI) +"fBK" = ( +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/lowsec/east) "fCf" = ( /obj/structure/bed/roller, /obj/structure/machinery/iv_drip{ @@ -7336,10 +7218,15 @@ "fDW" = ( /obj/structure/machinery/power/reactor/colony, /turf/open/floor/prison, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "fEn" = ( /turf/open/floor/prison, /area/fiorina/tumor/ice_lab) +"fEt" = ( +/obj/structure/platform_decoration/metal/almayer, +/obj/item/reagent_container/food/drinks/sillycup, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/flight_deck) "fEv" = ( /obj/item/fuel_cell, /obj/item/fuel_cell, @@ -7350,7 +7237,7 @@ /obj/item/fuel_cell, /obj/structure/surface/rack, /turf/open/floor/prison/bluefull, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "fEH" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/station_alert, @@ -7359,7 +7246,7 @@ "fEY" = ( /obj/structure/machinery/power/apc/power/south, /turf/open/floor/delivery, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "fFv" = ( /obj/structure/barricade/sandbags{ icon_state = "sandbag_0"; @@ -7367,7 +7254,7 @@ pixel_y = -14 }, /turf/open/floor/prison/yellow/northwest, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "fFw" = ( /obj/structure/largecrate/random, /turf/open/floor/prison/floor_marked/southwest, @@ -7376,12 +7263,6 @@ /obj/item/tool/screwdriver, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) -"fGi" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/prison/darkbrown2/southeast, -/area/fiorina/station/park) "fGA" = ( /obj/item/explosive/grenade/high_explosive/frag, /turf/open/floor/prison, @@ -7402,12 +7283,6 @@ "fHo" = ( /turf/open/floor/prison/yellow, /area/fiorina/station/lowsec) -"fHI" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) "fHK" = ( /obj/structure/ice/thin/indestructible{ dir = 8; @@ -7415,7 +7290,7 @@ }, /obj/structure/blocker/invisible_wall, /turf/open/ice/noweed, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "fIn" = ( /obj/effect/landmark/corpsespawner/ua_riot, /turf/open/floor/prison/redfull, @@ -7429,6 +7304,12 @@ }, /turf/open/floor/prison, /area/fiorina/station/medbay) +"fII" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform/metal/almayer, +/obj/structure/platform_decoration/metal/almayer/southwest, +/turf/open/gm/river/desert/deep, +/area/fiorina/lz/near_lzII) "fIL" = ( /obj/item/clothing/accessory/armband/cargo{ desc = "Sworn to the shrapnel and the shards therein. So sayeth her command when the first detonation occured."; @@ -7462,12 +7343,6 @@ /obj/item/clothing/accessory/storage/webbing, /turf/open/floor/almayer, /area/fiorina/tumor/ship) -"fKm" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/prison/chapel_carpet/doubleside/north, -/area/fiorina/station/chapel) "fKn" = ( /obj/item/stock_parts/manipulator/pico, /turf/open/floor/prison/darkpurple2, @@ -7476,6 +7351,21 @@ /obj/item/device/flashlight/flare, /turf/open/floor/prison/darkyellow2/west, /area/fiorina/station/telecomm/lz1_cargo) +"fKE" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/botany) +"fKO" = ( +/obj/structure/bed{ + icon_state = "abed" + }, +/obj/effect/landmark/corpsespawner/prisoner, +/turf/open/floor/prison/yellow/southeast, +/area/fiorina/station/lowsec) "fKP" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_21" @@ -7489,11 +7379,11 @@ }, /obj/item/trash/syndi_cakes, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "fLb" = ( /obj/effect/decal/cleanable/blood/gibs, /turf/open/floor/prison/yellow/north, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "fLu" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison/bluefull, @@ -7503,7 +7393,7 @@ dir = 4 }, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "fLS" = ( /obj/structure/bed/chair, /turf/open/floor/wood, @@ -7518,16 +7408,6 @@ }, /turf/open/floor/prison/floor_plate, /area/fiorina/station/transit_hub) -"fMc" = ( -/obj/structure/platform{ - dir = 8; - layer = 2.5 - }, -/obj/structure/machinery/door/airlock/prison_hatch/autoname{ - dir = 1 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/tumor/ice_lab) "fMn" = ( /obj/structure/machinery/photocopier{ pixel_y = 4 @@ -7549,7 +7429,7 @@ /obj/structure/surface/table/reinforced/prison, /obj/item/device/flashlight/lamp, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "fOg" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 8 @@ -7604,21 +7484,6 @@ /obj/effect/spawner/random/gun/shotgun/highchance, /turf/open/floor/wood, /area/fiorina/station/park) -"fQI" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/effect/decal/medical_decals{ - icon_state = "triagedecaldir" - }, -/turf/open/floor/prison/whitegreenfull/southwest, -/area/fiorina/station/medbay) -"fQV" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/turf/open/space, -/area/fiorina/oob) "fQY" = ( /obj/structure/machinery/portable_atmospherics/powered/pump, /turf/open/floor/prison, @@ -7630,7 +7495,7 @@ }, /obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison/whitepurple/northeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "fRo" = ( /obj/structure/bed/chair, /turf/open/floor/plating/prison, @@ -7658,7 +7523,7 @@ icon = 'icons/obj/structures/doors/prepdoor_charlie.dmi' }, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "fSz" = ( /turf/closed/shuttle/ert{ icon_state = "stan25" @@ -7684,13 +7549,6 @@ "fTd" = ( /turf/open/floor/prison/green/southwest, /area/fiorina/tumor/aux_engi) -"fTn" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_ew_full_cap" - }, -/obj/structure/platform/stair_cut/alt, -/turf/open/floor/plating/prison, -/area/fiorina/station/chapel) "fTs" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/plating/plating_catwalk/prison, @@ -7765,16 +7623,6 @@ "fWr" = ( /turf/open/floor/prison/red/east, /area/fiorina/lz/near_lzII) -"fWs" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/prison, -/area/fiorina/station/telecomm/lz1_tram) "fWy" = ( /turf/open/floor/prison/floor_marked/southwest, /area/fiorina/station/power_ring) @@ -7790,13 +7638,13 @@ /area/fiorina/oob) "fWV" = ( /turf/open/floor/prison/damaged1/southwest, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "fXo" = ( /obj/structure/machinery/light/double/blue{ pixel_y = -1 }, /turf/open/floor/prison/floor_plate/southwest, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "fXB" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/security) @@ -7818,10 +7666,17 @@ }, /turf/closed/wall/mineral/bone_resin, /area/fiorina/tumor/servers) +"fXV" = ( +/obj/structure/powerloader_wreckage, +/obj/effect/decal/cleanable/blood/gibs/robot/limb, +/obj/effect/landmark/corpsespawner/scientist, +/obj/effect/decal/cleanable/blood, +/turf/open/organic/grass/astroturf, +/area/fiorina/station/research_cells/basketball) "fXW" = ( /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison/bluecorner/west, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "fYa" = ( /obj/structure/inflatable, /turf/open/floor/prison/whitegreenfull/southwest, @@ -7847,7 +7702,7 @@ icon_state = "casing_6" }, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "fZc" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/fancy/cigarettes/arcturian_ace{ @@ -7855,7 +7710,7 @@ pixel_y = 9 }, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "fZd" = ( /obj/structure/machinery/landinglight/ds2/delayone{ dir = 1 @@ -7906,6 +7761,11 @@ "gbf" = ( /turf/open/floor/prison/floor_plate, /area/fiorina/station/power_ring) +"gbg" = ( +/obj/structure/platform/metal/kutjevo_smooth/west, +/obj/structure/platform/metal/kutjevo_smooth, +/turf/open/space, +/area/fiorina/oob) "gbh" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/spawner/random/toolbox, @@ -7914,7 +7774,7 @@ "gbk" = ( /obj/item/trash/burger, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "gbv" = ( /obj/structure/machinery/light/double/blue{ dir = 8; @@ -7927,13 +7787,6 @@ /obj/item/clothing/gloves/botanic_leather, /turf/open/floor/prison/greenblue/west, /area/fiorina/station/botany) -"gbO" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/item/trash/used_stasis_bag, -/turf/open/floor/prison/whitegreen/northwest, -/area/fiorina/station/medbay) "gbR" = ( /obj/structure/machinery/light/double/blue{ dir = 8; @@ -7972,7 +7825,7 @@ pixel_y = 13 }, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "gec" = ( /obj/structure/prop/structure_lattice{ dir = 8; @@ -7982,19 +7835,12 @@ }, /turf/open/floor/corsat/squares, /area/fiorina/station/civres_blue) -"gef" = ( -/obj/structure/lattice, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/turf/open/space, -/area/fiorina/oob) "ger" = ( /obj/item/ammo_magazine/rifle/m16{ current_rounds = 0 }, /turf/open/floor/prison/yellow, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "geF" = ( /obj/structure/lattice, /turf/open/floor/almayer_hull, @@ -8053,20 +7899,14 @@ /obj/item/clothing/glasses/sunglasses/sechud, /turf/open/floor/prison/redfull, /area/fiorina/station/security) -"ghg" = ( -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 +"ghe" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_ew_full_cap" }, -/turf/open/space, -/area/fiorina/oob) +/obj/structure/platform/metal/stair_cut/platform_left, +/turf/open/floor/plating/prison, +/area/fiorina/station/flight_deck) "ghw" = ( /obj/structure/bed/chair/dropship/pilot, /obj/effect/landmark/objective_landmark/close, @@ -8083,12 +7923,6 @@ "gir" = ( /turf/open/floor/prison/greenfull/northwest, /area/fiorina/tumor/servers) -"giw" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/prison, -/area/fiorina/station/transit_hub) "giA" = ( /obj/structure/bed/sofa/south/grey/left, /turf/open/floor/prison/redfull, @@ -8099,10 +7933,14 @@ }, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) +"gjm" = ( +/obj/structure/platform/metal/kutjevo_smooth, +/turf/open/space, +/area/fiorina/oob) "gjr" = ( /obj/effect/landmark/static_comms/net_one, /turf/open/floor/prison, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "gjs" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -8118,12 +7956,6 @@ /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/prison/bluecorner, /area/fiorina/station/chapel) -"gkv" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/tumor/ice_lab) "gkC" = ( /obj/structure/machinery/vending/cola, /obj/structure/prop/souto_land/streamer{ @@ -8139,13 +7971,13 @@ "glj" = ( /obj/structure/window/framed/prison, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "glD" = ( /obj/structure/bed{ icon_state = "abed" }, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "glG" = ( /obj/structure/window/framed/prison/reinforced, /turf/open/floor/plating/prison, @@ -8176,7 +8008,7 @@ "gmG" = ( /obj/structure/machinery/constructable_frame, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "gmN" = ( /obj/structure/closet/secure_closet/engineering_materials, /obj/effect/spawner/random/gun/smg, @@ -8211,10 +8043,13 @@ }, /obj/item/storage/bible/hefa, /turf/open/floor/prison/whitepurple/southeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "goo" = ( /turf/open/floor/prison/yellow/west, /area/fiorina/lz/near_lzII) +"gos" = ( +/turf/open/floor/prison/yellow/east, +/area/fiorina/station/lowsec/east) "goG" = ( /obj/structure/window/framed/prison/reinforced, /turf/open/floor/plating/prison, @@ -8242,10 +8077,15 @@ }, /turf/open/floor/prison/darkyellowfull2/east, /area/fiorina/tumor/servers) -"gqM" = ( -/obj/structure/platform_decoration, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/park) +"gqo" = ( +/obj/structure/machinery/power/apc/power/north, +/turf/open/floor/prison/yellow/north, +/area/fiorina/station/lowsec/showers_laundry) +"gqC" = ( +/obj/structure/platform/metal/almayer/west, +/obj/item/prop/almayer/flight_recorder, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) "gqU" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/paper/janitor, @@ -8255,6 +8095,16 @@ /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/prison/floor_plate/southwest, /area/fiorina/station/telecomm/lz1_cargo) +"grn" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/space, +/area/fiorina/oob) +"grz" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/northeast, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) "grA" = ( /obj/structure/machinery/landinglight/ds2/delaythree{ dir = 4 @@ -8267,16 +8117,14 @@ }, /turf/open/floor/prison, /area/fiorina/lz/near_lzII) -"gsL" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 6 +"gsx" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_ew_full_cap" }, +/obj/structure/platform/metal/stair_cut/platform_left, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/botany) "gsN" = ( /obj/structure/closet, /obj/effect/spawner/random/gun/shotgun/midchance, @@ -8295,14 +8143,6 @@ }, /turf/open/floor/prison, /area/fiorina/lz/near_lzI) -"gtf" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/turf/open/floor/prison/darkbrown2, -/area/fiorina/station/park) "gtg" = ( /obj/structure/barricade/sandbags{ dir = 4; @@ -8318,7 +8158,11 @@ "gtr" = ( /obj/structure/bedsheetbin, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) +"gtD" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/prison/whitegreenfull/southwest, +/area/fiorina/tumor/ice_lab) "gtH" = ( /obj/structure/safe, /obj/item/storage/beer_pack, @@ -8355,10 +8199,14 @@ "gux" = ( /obj/effect/landmark/corpsespawner/ua_riot, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "guz" = ( /turf/open/floor/prison/greenfull/northwest, /area/fiorina/station/transit_hub) +"guH" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/prison, +/area/fiorina/station/medbay) "guU" = ( /obj/structure/prop/structure_lattice{ dir = 4 @@ -8380,27 +8228,14 @@ /obj/item/storage/pill_bottle/inaprovaline/skillless, /turf/open/floor/prison/blue_plate/north, /area/fiorina/station/botany) -"gvz" = ( -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = 13 - }, -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 9 - }, -/turf/open/floor/prison/yellowfull, -/area/fiorina/station/disco) +"gvs" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison/whitegreen, +/area/fiorina/station/medbay) +"gvy" = ( +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/disco/east_disco) "gvZ" = ( /obj/item/stack/sheet/wood{ pixel_x = 1; @@ -8417,6 +8252,14 @@ "gws" = ( /turf/open/floor/plating, /area/fiorina/oob) +"gwt" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/decal/medical_decals{ + icon_state = "triagedecaldir" + }, +/obj/effect/landmark/corpsespawner/doctor, +/turf/open/floor/prison/whitegreenfull/southwest, +/area/fiorina/station/medbay) "gwH" = ( /turf/closed/wall/strata_ice/jungle{ desc = "It is made of Fiberbush(tm). It contains asbestos."; @@ -8467,12 +8310,6 @@ /obj/effect/landmark/monkey_spawn, /turf/open/floor/prison/darkbrown2/north, /area/fiorina/station/park) -"gyy" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/prison, -/area/fiorina/station/transit_hub) "gyA" = ( /obj/structure/machinery/disposal, /turf/open/floor/prison/floor_plate, @@ -8514,12 +8351,12 @@ "gzu" = ( /obj/item/clothing/mask/cigarette/bcigarette, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "gzN" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/toy/handcard/aceofspades, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "gAh" = ( /obj/structure/prop/structure_lattice{ dir = 4 @@ -8535,6 +8372,14 @@ /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison, /area/fiorina/station/park) +"gAs" = ( +/obj/structure/platform/metal/almayer, +/obj/item/ammo_casing{ + dir = 2; + icon_state = "casing_5" + }, +/turf/open/gm/river/red_pool, +/area/fiorina/station/park) "gAA" = ( /obj/item/stack/sheet/metal/medium_stack, /turf/open/floor/plating/prison, @@ -8543,6 +8388,9 @@ /obj/structure/machinery/light/double/blue, /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/station/medbay) +"gAD" = ( +/turf/open/floor/prison/whitepurple/east, +/area/fiorina/station/research_cells/east) "gAQ" = ( /obj/structure/machinery/landinglight/ds2/delaytwo{ dir = 8 @@ -8556,7 +8404,7 @@ "gBw" = ( /obj/item/trash/chunk, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "gBx" = ( /obj/structure/prop/structure_lattice{ dir = 4 @@ -8578,16 +8426,6 @@ /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison/darkyellowfull2/east, /area/fiorina/lz/near_lzI) -"gBR" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/barricade/handrail/type_b{ - dir = 4; - layer = 3.5 - }, -/turf/open/floor/prison, -/area/fiorina/station/medbay) "gBY" = ( /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/prison/redfull, @@ -8623,7 +8461,7 @@ "gCK" = ( /obj/effect/landmark/survivor_spawner, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "gDx" = ( /obj/structure/surface/table/woodentable, /obj/item/newspaper{ @@ -8646,25 +8484,10 @@ /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, /area/fiorina/station/botany) -"gEX" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/turf/open/floor/prison, -/area/fiorina/station/disco) "gFg" = ( /obj/effect/landmark/xeno_spawn, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) -"gFj" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/item/fuel_cell, -/turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) "gFp" = ( /obj/structure/inflatable/door, /turf/open/floor/prison/sterile_white/southwest, @@ -8672,7 +8495,7 @@ "gFN" = ( /obj/item/stack/sheet/metal, /turf/open/floor/prison/whitepurple/north, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "gFW" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/prison/green/southeast, @@ -8683,12 +8506,12 @@ }, /turf/open/floor/prison/darkyellow2/east, /area/fiorina/station/telecomm/lz1_cargo) -"gGc" = ( -/obj/structure/platform{ - dir = 4 +"gGn" = ( +/turf/closed/wall/r_wall/prison_unmeltable{ + desc = "A huge chunk of metal used to seperate rooms."; + name = "metal wall" }, -/turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/research_cells/east) "gGx" = ( /obj/effect/landmark/queen_spawn, /turf/open/floor/plating/prison, @@ -8699,7 +8522,7 @@ pixel_y = 21 }, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "gHn" = ( /obj/structure/filingcabinet{ pixel_x = 8; @@ -8734,15 +8557,6 @@ }, /turf/open/floor/wood, /area/fiorina/station/security/wardens) -"gHC" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/prison, -/area/fiorina/station/medbay) "gIa" = ( /obj/item/stool, /obj/item/reagent_container/food/drinks/bottle/bluecuracao{ @@ -8750,7 +8564,7 @@ pixel_y = 25 }, /turf/open/floor/prison/yellow/north, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "gIo" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/box/cups{ @@ -8775,6 +8589,16 @@ /obj/effect/alien/weeds/node, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) +"gJv" = ( +/obj/structure/platform/metal/kutjevo_smooth/east, +/obj/structure/platform/metal/kutjevo_smooth, +/obj/structure/lattice, +/turf/open/space/basic, +/area/fiorina/oob) +"gJM" = ( +/obj/structure/barricade/wooden, +/turf/open/floor/prison/whitepurple/east, +/area/fiorina/station/research_cells/east) "gKg" = ( /obj/effect/landmark/survivor_spawner, /turf/open/floor/prison/floor_plate, @@ -8802,6 +8626,9 @@ /obj/item/stool, /turf/open/floor/prison, /area/fiorina/station/power_ring) +"gLq" = ( +/turf/closed/wall/prison, +/area/fiorina/station/disco/east_disco) "gLu" = ( /turf/closed/shuttle/ert{ icon_state = "stan_leftengine" @@ -8814,6 +8641,10 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) +"gLC" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/gm/river/pool, +/area/fiorina/station/park) "gLK" = ( /obj/structure/tunnel/maint_tunnel, /turf/open/floor/prison/greenblue/southwest, @@ -8822,33 +8653,16 @@ /obj/item/clothing/head/welding, /turf/open/floor/prison/greenfull/northwest, /area/fiorina/tumor/civres) -"gNx" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 5 - }, -/obj/effect/decal/medical_decals{ - icon_state = "triagedecalbottomright" - }, -/turf/open/floor/prison/whitegreenfull/southwest, -/area/fiorina/station/medbay) +"gMl" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/power_ring) "gNJ" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" }, /turf/open/floor/prison/floor_plate, /area/fiorina/tumor/servers) -"gNU" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/disco) "gNY" = ( /obj/structure/flora/bush/ausbushes/grassybush{ icon_state = "ppflowers_2" @@ -8880,7 +8694,7 @@ "gOU" = ( /obj/item/bodybag, /turf/open/floor/prison/yellow/west, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "gPk" = ( /obj/structure/barricade/metal/wired{ dir = 4 @@ -8900,12 +8714,6 @@ /obj/structure/surface/table/woodentable/fancy, /turf/open/floor/wood, /area/fiorina/station/security/wardens) -"gPE" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/prison/yellow/southwest, -/area/fiorina/station/disco) "gPS" = ( /obj/item/stack/rods, /turf/open/floor/prison/chapel_carpet/doubleside/north, @@ -8919,7 +8727,7 @@ "gQc" = ( /obj/item/stack/sheet/metal, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "gQz" = ( /obj/structure/bed/chair, /turf/open/floor/prison/whitegreenfull/southwest, @@ -8950,7 +8758,7 @@ /area/fiorina/station/flight_deck) "gRA" = ( /turf/open/floor/prison/floor_plate/southwest, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "gRT" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/sign/poster{ @@ -8978,11 +8786,6 @@ }, /turf/open/floor/prison/floor_plate, /area/fiorina/station/lowsec) -"gSg" = ( -/obj/structure/platform, -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) "gSC" = ( /obj/item/prop/helmetgarb/gunoil, /turf/open/floor/prison, @@ -9000,12 +8803,6 @@ }, /turf/open/floor/prison/chapel_carpet, /area/fiorina/station/chapel) -"gSX" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/prison, -/area/fiorina/station/park) "gTc" = ( /obj/item/storage/belt/shotgun/full/quackers, /obj/effect/spawner/gibspawner/human, @@ -9019,13 +8816,13 @@ /obj/structure/surface/rack, /turf/open/floor/prison/darkyellow2/northeast, /area/fiorina/lz/near_lzI) +"gTI" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/central_ring) "gTN" = ( /turf/open/floor/prison/darkpurple2/northeast, /area/fiorina/tumor/ice_lab) -"gTW" = ( -/obj/structure/platform, -/turf/open/floor/prison/greenfull/northwest, -/area/fiorina/station/transit_hub) "gUj" = ( /turf/closed/shuttle/ert{ icon_state = "stan3" @@ -9047,7 +8844,7 @@ }, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "gVs" = ( /obj/structure/largecrate/random/barrel/blue, /turf/open/floor/plating/prison, @@ -9069,11 +8866,6 @@ }, /turf/open/floor/prison/floor_plate/southwest, /area/fiorina/station/flight_deck) -"gWg" = ( -/obj/structure/powerloader_wreckage, -/obj/effect/decal/cleanable/blood/gibs/robot/limb, -/turf/open/organic/grass/astroturf, -/area/fiorina/station/research_cells) "gWq" = ( /obj/item/ammo_casing{ icon_state = "casing_1" @@ -9083,7 +8875,14 @@ }, /obj/effect/spawner/random/gun/rifle/midchance, /turf/open/floor/wood, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) +"gWA" = ( +/turf/open/floor/prison/bluecorner/east, +/area/fiorina/station/power_ring/reactor) +"gXa" = ( +/obj/structure/platform/metal/almayer, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/park) "gXd" = ( /obj/structure/prop/almayer/computers/mission_planning_system{ density = 0; @@ -9104,11 +8903,11 @@ "gXI" = ( /obj/item/book/manual/atmospipes, /turf/open/floor/prison/whitepurple/northwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "gYD" = ( /obj/item/tool/wrench, /turf/open/floor/prison/whitepurple, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "gYH" = ( /obj/structure/closet/secure_closet/security_empty, /obj/structure/window/reinforced{ @@ -9182,7 +8981,7 @@ "haQ" = ( /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "hbn" = ( /obj/structure/bed/chair{ dir = 8 @@ -9219,14 +9018,6 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) -"hbp" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/turf/open/floor/prison, -/area/fiorina/station/disco) "hbt" = ( /obj/item/tool/screwdriver, /turf/open/floor/prison/darkpurplefull2, @@ -9259,12 +9050,6 @@ }, /turf/open/floor/prison/floor_plate/southwest, /area/fiorina/station/flight_deck) -"hcY" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/park) "hds" = ( /obj/structure/cable/heavyduty{ icon_state = "1-2-8" @@ -9306,12 +9091,6 @@ "heO" = ( /turf/closed/shuttle/elevator, /area/fiorina/station/civres_blue) -"heT" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/prison/greenblue/southeast, -/area/fiorina/station/botany) "hfc" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/window/reinforced{ @@ -9324,12 +9103,15 @@ /obj/item/storage/briefcase/inflatable, /turf/open/floor/plating/prison, /area/fiorina/station/security/wardens) -"hfd" = ( -/obj/structure/platform{ - dir = 1 +"hfJ" = ( +/obj/structure/platform/metal/kutjevo_smooth/north, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" }, -/turf/open/floor/plating/prison, -/area/fiorina/station/power_ring) +/turf/open/space, +/area/fiorina/oob) "hfT" = ( /turf/closed/wall/r_wall/prison, /area/fiorina/station/flight_deck) @@ -9349,6 +9131,12 @@ /obj/effect/alien/weeds/node, /turf/open/floor/prison/darkbrowncorners2/east, /area/fiorina/tumor/aux_engi) +"hgF" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/northwest, +/turf/open/gm/river/desert/deep, +/area/fiorina/lz/near_lzII) "hgP" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/prison/darkbrowncorners2/north, @@ -9383,6 +9171,10 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) +"hhX" = ( +/obj/structure/extinguisher_cabinet, +/turf/closed/wall/prison, +/area/fiorina/station/lowsec/east) "hil" = ( /obj/structure/surface/rack, /obj/item/tool/plantspray/pests, @@ -9402,24 +9194,21 @@ /obj/item/stack/rods, /turf/open/floor/prison/whitegreen/north, /area/fiorina/station/medbay) +"hjg" = ( +/turf/closed/wall/r_wall/prison_unmeltable, +/area/fiorina/station/lowsec/showers_laundry) "hjp" = ( /obj/structure/bed/chair/office/dark, /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/tumor/ice_lab) +"hjA" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/prison/greenfull/northwest, +/area/fiorina/station/botany) "hjB" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) -"hjC" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_ew_half_cap" - }, -/turf/open/floor/plating/prison, -/area/fiorina/lz/near_lzI) +/area/fiorina/station/research_cells/west) "hjE" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/window/reinforced, @@ -9428,6 +9217,13 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/security) +"hjI" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison/yellow/north, +/area/fiorina/station/lowsec/east) "hjM" = ( /obj/structure/filingcabinet, /obj/effect/landmark/objective_landmark/close, @@ -9468,7 +9264,7 @@ "hkH" = ( /obj/item/stack/sheet/wood, /turf/open/floor/prison/whitepurple/southeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "hkM" = ( /obj/effect/decal/cleanable/blood/gibs/xeno/body, /turf/open/floor/prison/whitegreenfull/southwest, @@ -9482,10 +9278,14 @@ }, /turf/open/floor/prison/floor_plate, /area/fiorina/tumor/aux_engi) +"hlx" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/prison/darkpurple2, +/area/fiorina/tumor/servers) "hlB" = ( /obj/item/tool/kitchen/knife, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "hlT" = ( /obj/structure/machinery/light/double/blue{ dir = 4; @@ -9512,6 +9312,16 @@ /obj/item/reagent_container/food/drinks/sillycup, /turf/open/floor/prison, /area/fiorina/station/power_ring) +"hnq" = ( +/obj/item/fuel_cell, +/obj/structure/platform/metal/almayer, +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = 13 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/lowsec/showers_laundry) "hnK" = ( /obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison/floor_plate, @@ -9522,6 +9332,13 @@ }, /turf/open/floor/prison/floor_plate, /area/fiorina/station/security) +"hoa" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/effect/decal/medical_decals{ + icon_state = "triagedecalleft" + }, +/turf/open/floor/prison/whitegreen/north, +/area/fiorina/station/medbay) "hob" = ( /obj/item/phone{ pixel_y = 7 @@ -9537,6 +9354,12 @@ }, /turf/open/floor/prison/floor_plate, /area/fiorina/station/central_ring) +"hoz" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform/metal/almayer, +/obj/structure/platform_decoration/metal/almayer/southwest, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/botany) "hoC" = ( /obj/item/trash/popcorn, /turf/open/floor/prison/floor_plate, @@ -9573,7 +9396,7 @@ }, /obj/structure/blocker/invisible_wall, /turf/open/ice/noweed, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "hpW" = ( /obj/item/stack/cable_coil/orange, /turf/open/floor/plating/prison, @@ -9581,7 +9404,7 @@ "hpX" = ( /obj/effect/spawner/random/toolbox, /turf/open/floor/prison/bluefull, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "hqb" = ( /obj/structure/stairs/perspective{ dir = 8; @@ -9598,19 +9421,7 @@ dir = 4 }, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) -"hqG" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 5 - }, -/turf/open/floor/prison/whitegreen/northwest, -/area/fiorina/tumor/ice_lab) +/area/fiorina/station/research_cells/west) "hqO" = ( /turf/open/floor/prison/cell_stripe/west, /area/fiorina/lz/near_lzII) @@ -9624,14 +9435,7 @@ pixel_y = 13 }, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) -"hre" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/item/device/flashlight, -/turf/open/floor/plating/prison, -/area/fiorina/station/central_ring) +/area/fiorina/station/lowsec/east) "hrl" = ( /obj/structure/bed/sofa/vert/grey, /turf/open/floor/prison, @@ -9677,7 +9481,7 @@ dir = 8 }, /turf/open/floor/prison/kitchen, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "hsc" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" @@ -9700,7 +9504,7 @@ pixel_y = 21 }, /turf/open/floor/prison/yellow/northeast, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "hsC" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/door/window/southleft, @@ -9749,7 +9553,7 @@ "htT" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/prison/bluecorner/east, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "htX" = ( /turf/open/floor/prison/green/southwest, /area/fiorina/station/chapel) @@ -9762,7 +9566,7 @@ "hul" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "huB" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/recharger{ @@ -9777,13 +9581,23 @@ "huG" = ( /obj/item/tool/wirecutters, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "huJ" = ( /obj/structure/prop/almayer/computers/sensor_computer1{ name = "computer" }, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) +"huZ" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/obj/structure/barricade/handrail/type_b{ + dir = 1 + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/prison, +/area/fiorina/station/medbay) "hva" = ( /obj/structure/bed/chair/office/light{ dir = 4 @@ -9823,7 +9637,7 @@ "hwN" = ( /obj/structure/inflatable/popped/door, /turf/open/floor/prison/yellow/east, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "hwS" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -9831,28 +9645,19 @@ }, /turf/open/floor/prison/floor_plate, /area/fiorina/station/security/wardens) -"hxj" = ( -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = 13 +"hxp" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform/metal/almayer, +/obj/structure/platform_decoration/metal/almayer/southwest, +/obj/structure/reagent_dispensers/fueltank{ + layer = 2.6 }, -/obj/structure/platform_decoration, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/disco) +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) "hxq" = ( /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, /area/fiorina/station/telecomm/lz1_cargo) -"hxG" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/turf/open/space/basic, -/area/fiorina/oob) "hxJ" = ( /obj/structure/sign/poster{ icon_state = "poster12"; @@ -9868,7 +9673,7 @@ }, /obj/structure/blocker/invisible_wall, /turf/open/ice/noweed, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "hyc" = ( /turf/open/floor/prison/darkbrowncorners2, /area/fiorina/maintenance) @@ -9890,6 +9695,18 @@ /obj/structure/grille, /turf/open/floor/plating/prison, /area/fiorina/station/central_ring) +"hyM" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/prison/bluefull, +/area/fiorina/station/power_ring/reactor) +"hyR" = ( +/obj/structure/platform/metal/kutjevo_smooth/west, +/obj/structure/platform/metal/kutjevo_smooth, +/obj/structure/lattice, +/turf/open/space/basic, +/area/fiorina/oob) "hyT" = ( /turf/closed/shuttle/ert{ icon_state = "stan_leftengine" @@ -9960,14 +9777,14 @@ pixel_y = 13 }, /turf/open/floor/prison/kitchen, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "hAX" = ( /turf/open/floor/prison/darkpurple2/northwest, /area/fiorina/tumor/ice_lab) "hBc" = ( /obj/structure/inflatable, /turf/open/floor/prison/whitepurple, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "hBf" = ( /obj/effect/spawner/random/tool, /turf/open/floor/prison/darkbrown2/north, @@ -9978,7 +9795,15 @@ pixel_y = 5 }, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) +"hBK" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/prison, +/area/fiorina/station/botany) "hCc" = ( /obj/item/reagent_container/food/snacks/meat, /turf/open/floor/plating/plating_catwalk/prison, @@ -10001,11 +9826,20 @@ /obj/structure/blocker/invisible_wall, /turf/open/floor/prison/floor_plate, /area/fiorina/tumor/servers) +"hCG" = ( +/turf/closed/wall/r_wall/prison_unmeltable, +/area/fiorina/station/research_cells/east) "hCR" = ( /obj/item/stack/sheet/wood, /obj/structure/machinery/light/double/blue, /turf/open/floor/prison/whitepurple, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) +"hCX" = ( +/obj/structure/machinery/door/airlock/prison/horizontal{ + dir = 4 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/lowsec/east) "hDb" = ( /obj/structure/closet/secure_closet/freezer/fridge, /obj/effect/landmark/objective_landmark/close, @@ -10020,17 +9854,9 @@ /obj/effect/landmark/monkey_spawn, /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/tumor/ice_lab) -"hDS" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = -3 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) +"hDF" = ( +/turf/open/floor/prison/yellow/northeast, +/area/fiorina/station/lowsec/showers_laundry) "hDV" = ( /obj/effect/decal/medical_decals{ icon_state = "docdecal1" @@ -10049,14 +9875,22 @@ "hEs" = ( /obj/structure/extinguisher_cabinet, /turf/closed/wall/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "hEv" = ( /obj/structure/stairs/perspective{ dir = 8; icon_state = "p_stair_full" }, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) +"hEW" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/prison, +/area/fiorina/station/transit_hub) "hEZ" = ( /turf/open/floor/prison/platingdmg3, /area/fiorina/station/security) @@ -10075,7 +9909,11 @@ "hFW" = ( /obj/effect/spawner/random/tool, /turf/open/floor/prison/whitepurple/north, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) +"hFX" = ( +/obj/structure/platform/metal/almayer, +/turf/open/floor/prison/chapel_carpet, +/area/fiorina/station/chapel) "hGg" = ( /obj/structure/sign/poster{ desc = "You are becoming hysterical."; @@ -10150,7 +9988,7 @@ }, /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison/yellow/northwest, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "hIO" = ( /obj/structure/largecrate/random/barrel/green, /turf/open/floor/prison/floor_plate, @@ -10159,6 +9997,14 @@ /obj/structure/machinery/power/apc/power/north, /turf/open/floor/prison/green/north, /area/fiorina/station/chapel) +"hJd" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/turf/open/floor/plating/prison, +/area/fiorina/station/disco/east_disco) "hJo" = ( /obj/structure/sink{ dir = 8; @@ -10166,17 +10012,19 @@ }, /obj/item/reagent_container/food/drinks/flask/barflask, /turf/open/floor/prison/whitepurple/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) +"hJu" = ( +/obj/structure/bed/chair, +/turf/open/floor/prison/bluefull, +/area/fiorina/station/power_ring/reactor) +"hJV" = ( +/obj/structure/platform/metal/almayer/west, +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/prison/whitegreen/west, +/area/fiorina/tumor/ice_lab) "hKN" = ( /turf/open/floor/prison/sterile_white, /area/fiorina/station/civres_blue) -"hKP" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/item/tool/shovel/spade, -/turf/open/floor/prison/greenfull/northwest, -/area/fiorina/station/botany) "hLz" = ( /turf/closed/wall/prison, /area/fiorina/lz/near_lzII) @@ -10196,7 +10044,7 @@ current_rounds = 0 }, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "hMA" = ( /obj/item/tool/crowbar, /turf/open/floor/prison/whitegreen, @@ -10224,6 +10072,15 @@ }, /turf/open/floor/prison/floor_plate, /area/fiorina/station/power_ring) +"hNt" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = 13 + }, +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/prison, +/area/fiorina/station/disco/east_disco) "hNU" = ( /obj/structure/janitorialcart, /turf/open/floor/prison, @@ -10243,20 +10100,6 @@ /obj/structure/inflatable/popped/door, /turf/open/floor/prison/whitegreen/northwest, /area/fiorina/station/medbay) -"hOQ" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/central_ring) -"hPi" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_ew_full_cap" - }, -/obj/structure/platform/stair_cut, -/turf/open/floor/plating/prison, -/area/fiorina/station/park) "hPq" = ( /obj/structure/machinery/power/apc/power/south, /turf/open/floor/prison/blue_plate/east, @@ -10264,7 +10107,7 @@ "hPu" = ( /obj/effect/spawner/random/tool, /turf/open/floor/prison/bluecorner/north, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "hPL" = ( /obj/item/tool/wrench, /turf/open/floor/prison/darkpurple2/southeast, @@ -10306,19 +10149,6 @@ }, /turf/open/floor/plating/prison, /area/fiorina/oob) -"hQv" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/item/fuel_cell, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 9 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) "hQM" = ( /obj/structure/bed/chair{ dir = 4 @@ -10341,7 +10171,7 @@ }, /obj/item/stack/barbed_wire, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "hRb" = ( /obj/structure/machinery/light/double/blue{ dir = 4; @@ -10360,21 +10190,6 @@ /obj/structure/toilet, /turf/open/floor/prison/sterile_white, /area/fiorina/station/civres_blue) -"hSl" = ( -/obj/structure/platform, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/disco) -"hSo" = ( -/obj/structure/barricade/wooden{ - dir = 4 - }, -/obj/item/tool/crowbar/red, -/obj/structure/stairs/perspective{ - icon_state = "p_stair_ew_full_cap" - }, -/obj/structure/platform/stair_cut/alt, -/turf/open/floor/prison/cell_stripe/east, -/area/fiorina/station/medbay) "hSA" = ( /obj/item/reagent_container/food/drinks/bottle/tomatojuice, /turf/open/floor/prison/floor_plate, @@ -10464,7 +10279,7 @@ "hVA" = ( /obj/structure/largecrate/random/case, /turf/open/floor/prison/whitepurple/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "hVG" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; @@ -10475,11 +10290,6 @@ "hVI" = ( /turf/closed/wall/prison, /area/fiorina/station/medbay) -"hVS" = ( -/obj/structure/platform_decoration/kutjevo, -/obj/structure/lattice, -/turf/open/space/basic, -/area/fiorina/oob) "hWb" = ( /obj/structure/machinery/photocopier{ pixel_y = 4 @@ -10506,12 +10316,6 @@ /obj/item/storage/pill_bottle/inaprovaline/skillless, /turf/open/floor/prison, /area/fiorina/tumor/servers) -"hWz" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/botany) "hWF" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname{ dir = 1 @@ -10524,18 +10328,25 @@ pixel_y = 8 }, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "hXF" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/spawner/random/toolbox, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "hXG" = ( /obj/structure/barricade/metal/wired{ dir = 1 }, /turf/open/floor/prison/darkyellow2, /area/fiorina/lz/near_lzI) +"hXJ" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/disco/east_disco) "hXN" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/ashtray/plastic, @@ -10548,6 +10359,14 @@ /obj/structure/machinery/light/double/blue, /turf/open/floor/prison, /area/fiorina/station/medbay) +"hXP" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/turf/open/floor/plating/prison, +/area/fiorina/station/power_ring/reactor) "hXX" = ( /obj/structure/stairs/perspective{ dir = 8; @@ -10571,7 +10390,7 @@ pixel_y = -14 }, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "hYx" = ( /obj/item/tool/wet_sign, /obj/item/tool/mop{ @@ -10606,6 +10425,12 @@ /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, /area/fiorina/station/lowsec) +"hZU" = ( +/obj/structure/machinery/door/airlock/prison/horizontal{ + dir = 4 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/research_cells/east) "iaa" = ( /turf/open/floor/prison/cell_stripe/west, /area/fiorina/station/disco) @@ -10672,17 +10497,7 @@ /obj/structure/surface/table/reinforced/prison, /obj/item/storage/briefcase/inflatable, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) -"idP" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison/whitegreenfull/southwest, -/area/fiorina/tumor/ice_lab) +/area/fiorina/station/lowsec/east) "idS" = ( /obj/structure/largecrate/random, /turf/open/floor/prison, @@ -10690,20 +10505,6 @@ "iea" = ( /turf/open/floor/prison/whitegreencorner/north, /area/fiorina/station/medbay) -"ieu" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/barricade/handrail/type_b{ - dir = 4; - layer = 3.5 - }, -/obj/structure/morgue{ - dir = 8; - layer = 2.6 - }, -/turf/open/floor/corsat/squares, -/area/fiorina/station/medbay) "ieA" = ( /obj/structure/barricade/handrail/type_b, /turf/open/floor/prison, @@ -10716,12 +10517,6 @@ /obj/item/stack/sheet/metal, /turf/open/floor/prison/kitchen/southwest, /area/fiorina/tumor/civres) -"ifk" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/prison/chapel_carpet/doubleside, -/area/fiorina/station/chapel) "ifm" = ( /turf/open/floor/prison/greencorner, /area/fiorina/tumor/civres) @@ -10739,6 +10534,12 @@ /obj/structure/bed/chair/comfy, /turf/open/floor/prison, /area/fiorina/tumor/servers) +"ifB" = ( +/obj/structure/platform/metal/kutjevo_smooth, +/obj/structure/platform/metal/kutjevo_smooth/east, +/obj/structure/platform/metal/kutjevo_smooth/east, +/turf/open/space/basic, +/area/fiorina/oob) "ifJ" = ( /obj/structure/bed/chair/dropship/pilot{ dir = 1 @@ -10823,6 +10624,10 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/plating/plating_catwalk, /area/fiorina/tumor/ship) +"ihA" = ( +/obj/structure/platform/metal/kutjevo_smooth/north, +/turf/open/space, +/area/fiorina/oob) "ihB" = ( /turf/open/floor/prison/redfull, /area/fiorina/station/security) @@ -10852,12 +10657,6 @@ /obj/structure/machinery/gibber, /turf/open/floor/prison/blue_plate/west, /area/fiorina/station/botany) -"iiY" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/central_ring) "ijd" = ( /obj/item/trash/cigbutt, /turf/open/floor/prison, @@ -10878,7 +10677,7 @@ icon_state = "abed" }, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "ikt" = ( /obj/structure/closet/bodybag, /turf/open/floor/prison/whitegreen/northwest, @@ -10937,14 +10736,14 @@ /obj/item/trash/chunk, /turf/open/floor/prison/floor_plate/southwest, /area/fiorina/station/telecomm/lz1_cargo) -"imI" = ( +"imH" = ( /obj/structure/stairs/perspective{ dir = 8; - icon_state = "p_stair_ew_full_cap" + icon_state = "p_stair_full" }, -/obj/structure/platform/stair_cut, +/obj/structure/platform/metal/almayer, /turf/open/floor/plating/prison, -/area/fiorina/station/central_ring) +/area/fiorina/station/civres_blue) "imN" = ( /obj/structure/filingcabinet/disk, /turf/open/floor/prison, @@ -10953,6 +10752,14 @@ /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/prison/floor_plate, /area/fiorina/tumor/aux_engi) +"inv" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = 13 + }, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/power_ring/reactor) "inA" = ( /obj/structure/surface/table/reinforced/prison{ flipped = 1 @@ -10967,12 +10774,6 @@ "ioc" = ( /turf/open/floor/prison/yellowfull, /area/fiorina/station/lowsec) -"iox" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) "ioE" = ( /obj/structure/machinery/vending/cola, /turf/open/floor/prison/floor_plate, @@ -10980,20 +10781,14 @@ "ioM" = ( /turf/closed/wall/r_wall/prison, /area/fiorina/station/medbay) +"ioN" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/prison/whitegreen, +/area/fiorina/tumor/ice_lab) "ioS" = ( /obj/item/storage/briefcase, /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/station/medbay) -"ioV" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/prison/whitegreenfull/southwest, -/area/fiorina/tumor/ice_lab) "ioW" = ( /obj/structure/bed/chair{ dir = 8 @@ -11012,6 +10807,10 @@ /obj/structure/window/framed/prison, /turf/open/floor/plating/prison, /area/fiorina/station/botany) +"ipy" = ( +/obj/structure/window/framed/prison/reinforced/hull, +/turf/open/floor/plating/prison, +/area/fiorina/station/lowsec/showers_laundry) "ipz" = ( /obj/item/device/flashlight, /turf/open/floor/prison, @@ -11066,6 +10865,14 @@ }, /turf/open/floor/prison/floor_plate, /area/fiorina/station/civres_blue) +"isw" = ( +/turf/open/floor/prison/yellow/southwest, +/area/fiorina/station/disco/east_disco) +"isI" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/obj/item/tool/pickaxe, +/turf/open/floor/prison/whitegreen, +/area/fiorina/tumor/ice_lab) "itd" = ( /obj/item/tool/lighter/random, /turf/open/floor/plating/plating_catwalk/prison, @@ -11091,7 +10898,7 @@ "iuC" = ( /obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "iuN" = ( /obj/structure/barricade/handrail/type_b{ layer = 3.5 @@ -11125,6 +10932,15 @@ /obj/effect/landmark/corpsespawner/prison_security, /turf/open/floor/wood, /area/fiorina/station/park) +"ivA" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = 13 + }, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/central_ring) "ivD" = ( /obj/item/tool/weldingtool{ pixel_x = 6; @@ -11169,7 +10985,7 @@ }, /obj/structure/blocker/invisible_wall, /turf/open/ice/noweed, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "iwZ" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 2; @@ -11190,6 +11006,14 @@ /obj/item/reagent_container/food/snacks/meat, /turf/open/floor/prison/greenblue, /area/fiorina/station/botany) +"ixU" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/turf/open/floor/plating/prison, +/area/fiorina/station/park) "iyc" = ( /obj/item/stack/rods/plasteel, /turf/open/auto_turf/sand/layer1, @@ -11198,21 +11022,6 @@ /obj/structure/machinery/door/airlock/prison_hatch/autoname, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"iyk" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/prop/souto_land/pole, -/obj/structure/prop/souto_land/pole{ - dir = 4; - pixel_y = 24 - }, -/turf/open/floor/prison/darkbrown2/west, -/area/fiorina/station/park) "iys" = ( /obj/effect/spawner/random/sentry/midchance, /turf/open/floor/prison/kitchen, @@ -11236,16 +11045,6 @@ }, /turf/open/floor/prison/greenfull/east, /area/fiorina/station/chapel) -"izh" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison/cell_stripe, -/area/fiorina/station/lowsec) "izN" = ( /obj/structure/machinery/computer/secure_data, /obj/structure/surface/table/reinforced/prison, @@ -11257,22 +11056,6 @@ "izZ" = ( /turf/closed/wall/prison, /area/fiorina/station/disco) -"iAq" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/turf/open/floor/plating/prison, -/area/fiorina/station/civres_blue) -"iAr" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/turf/open/floor/plating/prison, -/area/fiorina/station/power_ring) "iAA" = ( /obj/effect/decal/cleanable/blood/splatter{ icon_state = "gib5" @@ -11285,6 +11068,9 @@ "iBr" = ( /turf/open/floor/prison, /area/fiorina/station/flight_deck) +"iBI" = ( +/turf/open/floor/prison/yellowfull, +/area/fiorina/station/lowsec/showers_laundry) "iBM" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/prison/greenblue/northeast, @@ -11299,7 +11085,11 @@ /obj/item/clothing/gloves/boxing/blue, /obj/item/clothing/gloves/boxing/blue, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) +"iCC" = ( +/obj/item/tool/warning_cone, +/turf/open/floor/prison, +/area/fiorina/station/disco/east_disco) "iCE" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -11313,11 +11103,11 @@ "iCN" = ( /obj/item/tool/wrench, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "iCU" = ( /obj/structure/sign/nosmoking_1, /turf/closed/wall/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "iDg" = ( /obj/structure/barricade/sandbags{ dir = 8; @@ -11367,9 +11157,10 @@ /obj/effect/spawner/random/gun/rifle, /turf/open/floor/prison/greenfull/east, /area/fiorina/station/chapel) -"iEl" = ( -/obj/structure/platform_decoration, -/turf/open/floor/prison, +"iDR" = ( +/obj/structure/largecrate/supply, +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/medbay) "iEA" = ( /obj/structure/closet/crate/miningcar{ @@ -11393,6 +11184,11 @@ }, /turf/open/floor/prison/yellow/southwest, /area/fiorina/station/lowsec) +"iES" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/item/device/flashlight, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) "iFg" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -11411,7 +11207,7 @@ pixel_y = 8 }, /turf/open/floor/prison/whitepurple/northeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "iFC" = ( /obj/structure/surface/rack, /obj/item/storage/toolbox/mechanical, @@ -11422,7 +11218,7 @@ dir = 4 }, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "iFZ" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/snacks/hugemushroomslice, @@ -11431,6 +11227,25 @@ }, /turf/open/floor/prison/kitchen, /area/fiorina/station/power_ring) +"iGe" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/prop/almayer/computers/mission_planning_system{ + density = 0; + desc = "Its a telephone, and a computer. Woah."; + name = "\improper funny telephone booth"; + pixel_x = 2; + pixel_y = 21 + }, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/disco) +"iGh" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/wood, +/area/fiorina/station/park) "iGw" = ( /obj/item/stack/tile/plasteel, /turf/open/floor/prison/greenfull/northwest, @@ -11439,10 +11254,20 @@ /obj/structure/closet/crate/trashcart, /turf/open/floor/prison/floor_plate, /area/fiorina/tumor/servers) +"iGI" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_ew_full_cap" + }, +/obj/structure/platform/metal/stair_cut/platform_right, +/turf/open/floor/plating/prison, +/area/fiorina/station/civres_blue) "iGX" = ( /obj/effect/landmark/queen_spawn, /turf/open/floor/plating/prison, /area/fiorina/tumor/fiberbush) +"iHi" = ( +/turf/open/floor/prison/yellow/southwest, +/area/fiorina/station/lowsec/showers_laundry) "iHu" = ( /obj/item/newspaper, /turf/open/floor/prison, @@ -11465,18 +11290,10 @@ /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/prison/greenblue/east, /area/fiorina/station/botany) -"iIl" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_ew_full_cap" - }, -/obj/structure/platform/stair_cut, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/plating/prison, -/area/fiorina/lz/near_lzI) +"iIw" = ( +/obj/structure/platform_decoration/metal/kutjevo, +/turf/open/space/basic, +/area/fiorina/oob) "iIx" = ( /obj/effect/decal/cleanable/blood{ desc = "Watch your step."; @@ -11506,7 +11323,7 @@ pixel_y = -3 }, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "iIS" = ( /obj/structure/machinery/constructable_frame, /turf/open/floor/plating/prison, @@ -11541,7 +11358,7 @@ }, /obj/effect/spawner/random/gun/pistol, /turf/open/floor/prison/yellow/southwest, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "iKF" = ( /obj/structure/inflatable, /turf/open/floor/prison/floor_plate, @@ -11563,7 +11380,11 @@ pixel_y = 13 }, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) +"iLE" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/prison/chapel_carpet, +/area/fiorina/station/chapel) "iLJ" = ( /obj/effect/spawner/random/tool, /turf/open/floor/plating/prison, @@ -11592,6 +11413,14 @@ /obj/structure/largecrate/random, /turf/open/floor/prison/floor_plate, /area/fiorina/tumor/civres) +"iNs" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/prison, +/area/fiorina/station/transit_hub) "iNt" = ( /obj/item/device/whistle, /turf/open/floor/prison/whitegreenfull/southwest, @@ -11671,6 +11500,14 @@ }, /turf/open/floor/prison/darkbrown2/west, /area/fiorina/tumor/aux_engi) +"iRA" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/prison, +/area/fiorina/station/disco) "iRG" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/trash/chunk, @@ -11720,16 +11557,7 @@ /obj/item/storage/pill_bottle/tramadol/skillless, /obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) -"iTs" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/botany) +/area/fiorina/station/research_cells/west) "iTt" = ( /obj/structure/machinery/landinglight/ds2, /turf/open/floor/prison/floor_plate, @@ -11767,6 +11595,13 @@ }, /turf/open/floor/prison/whitegreen, /area/fiorina/tumor/ice_lab) +"iUz" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_ew_full_cap" + }, +/obj/structure/platform/metal/stair_cut/platform_right, +/turf/open/floor/plating/prison, +/area/fiorina/station/disco/east_disco) "iUB" = ( /obj/structure/machinery/light/double/blue{ dir = 8; @@ -11775,12 +11610,19 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/central_ring) -"iUO" = ( -/obj/structure/platform{ - dir = 8 +"iUR" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_sn_full_cap" }, -/turf/open/floor/plating/prison, -/area/fiorina/lz/near_lzI) +/obj/structure/platform/metal/almayer/west, +/obj/structure/prop/souto_land/pole, +/obj/structure/prop/souto_land/pole{ + dir = 4; + pixel_y = 24 + }, +/turf/open/floor/prison/darkbrown2/west, +/area/fiorina/station/park) "iUS" = ( /obj/structure/barricade/handrail/type_b, /obj/structure/barricade/handrail/type_b{ @@ -11822,17 +11664,6 @@ }, /turf/open/floor/prison/yellow/northeast, /area/fiorina/station/lowsec) -"iWq" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/turf/open/space, -/area/fiorina/oob) "iWP" = ( /obj/structure/stairs/perspective{ dir = 1; @@ -11840,18 +11671,27 @@ }, /turf/open/floor/prison/whitegreen/west, /area/fiorina/station/central_ring) +"iWX" = ( +/obj/structure/barricade/wooden{ + dir = 8 + }, +/turf/open/floor/prison/whitepurple/north, +/area/fiorina/station/research_cells/east) +"iXn" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/civres_blue) "iXq" = ( /obj/item/stool, /turf/open/floor/prison/yellow/east, -/area/fiorina/station/lowsec) -"iXs" = ( -/obj/structure/stairs/perspective{ +/area/fiorina/station/lowsec/showers_laundry) +"iXB" = ( +/obj/structure/toilet{ dir = 8; - icon_state = "p_stair_full" + pixel_y = 8 }, -/obj/structure/platform, -/turf/open/floor/plating/prison, -/area/fiorina/station/medbay) +/turf/open/floor/prison/whitepurple/northeast, +/area/fiorina/station/research_cells/east) "iXJ" = ( /obj/structure/bed/chair/comfy{ dir = 4 @@ -11868,7 +11708,7 @@ "iYe" = ( /obj/item/tool/wirecutters, /turf/open/floor/prison/bluecorner/north, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "iYw" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/central_ring) @@ -11890,25 +11730,16 @@ }, /turf/open/floor/prison/greenfull/northwest, /area/fiorina/tumor/servers) -"jaB" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/turf/open/space/basic, -/area/fiorina/oob) "jbg" = ( /obj/structure/holohoop{ dir = 1 }, /turf/open/floor/prison/yellow/north, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "jbm" = ( /obj/item/clothing/under/color/orange, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "jbq" = ( /turf/open/floor/prison/whitegreen/east, /area/fiorina/station/medbay) @@ -11942,7 +11773,7 @@ icon_state = "large" }, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "jci" = ( /obj/structure/machinery/cm_vending/sorted/medical/blood, /obj/structure/window/reinforced{ @@ -11981,22 +11812,10 @@ /obj/item/storage/fancy/crayons, /turf/open/floor/prison/floor_plate/southwest, /area/fiorina/station/telecomm/lz1_cargo) -"jeL" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 5 - }, -/turf/open/floor/prison/bluefull, -/area/fiorina/station/chapel) "jfc" = ( /obj/item/stack/rods, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "jfd" = ( /turf/open/gm/river/pool, /area/fiorina/station/park) @@ -12006,7 +11825,7 @@ dir = 8 }, /turf/open/organic/grass/astroturf, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "jft" = ( /obj/structure/barricade/sandbags{ icon_state = "sandbag_0"; @@ -12017,16 +11836,6 @@ "jfO" = ( /turf/open/floor/prison/yellow/southeast, /area/fiorina/station/central_ring) -"jfT" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_sn_full_cap" - }, -/turf/open/floor/prison, -/area/fiorina/station/flight_deck) "jgu" = ( /turf/closed/wall/prison, /area/fiorina/station/park) @@ -12066,27 +11875,19 @@ /obj/item/clothing/suit/armor/bulletproof/badge, /turf/open/floor/prison/yellow/southeast, /area/fiorina/station/lowsec) +"jii" = ( +/turf/open/floor/prison/sterile_white/southwest, +/area/fiorina/station/research_cells/east) "jiq" = ( /obj/structure/lz_sign/prison_sign, /turf/open/floor/prison, /area/fiorina/lz/near_lzI) -"jis" = ( -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = 13 - }, -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/prison, -/area/fiorina/station/disco) "jiz" = ( /obj/structure/bed/chair{ dir = 8 }, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "jiA" = ( /obj/item/storage/firstaid/regular, /turf/open/floor/prison/sterile_white/southwest, @@ -12118,13 +11919,16 @@ pixel_y = 4 }, /turf/open/floor/prison/whitepurple/northwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "jjs" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ req_one_access = null }, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) +"jjx" = ( +/turf/closed/wall/r_wall/prison_unmeltable, +/area/fiorina/station/disco/east_disco) "jjH" = ( /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/prison, @@ -12182,12 +11986,6 @@ /obj/item/stack/nanopaste, /turf/open/floor/prison/blue/north, /area/fiorina/station/civres_blue) -"jlH" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/turf/open/space, -/area/fiorina/oob) "jlI" = ( /obj/structure/bed/sofa/south/grey, /turf/open/floor/prison, @@ -12204,29 +12002,18 @@ }, /turf/open/organic/grass/astroturf, /area/fiorina/tumor/aux_engi) -"jmr" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = 13 - }, -/turf/open/floor/plating/prison, -/area/fiorina/lz/near_lzI) "jmv" = ( /obj/structure/machinery/shower{ dir = 4 }, /turf/open/floor/prison/kitchen, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "jmG" = ( /turf/closed/wall/r_wall/prison_unmeltable, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "jna" = ( /turf/open/floor/prison/whitepurplecorner/west, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "jnd" = ( /obj/structure/machinery/light/double/blue{ dir = 8; @@ -12253,7 +12040,7 @@ "jnX" = ( /obj/item/storage/pill_bottle/spaceacillin/skillless, /turf/open/floor/prison/whitepurple/northeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "jor" = ( /obj/effect/spawner/random/attachment, /obj/structure/disposalpipe/segment{ @@ -12275,11 +12062,19 @@ }, /turf/open/organic/grass/astroturf, /area/fiorina/station/park) +"joB" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison/whitegreenfull/southwest, +/area/fiorina/tumor/ice_lab) "joJ" = ( /obj/structure/bed/roller, /obj/effect/decal/cleanable/blood/gibs/core, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "joU" = ( /obj/structure/largecrate/random/secure, /turf/open/floor/prison, @@ -12314,7 +12109,7 @@ desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." }, /turf/closed/wall/r_wall/prison_unmeltable, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "jpQ" = ( /obj/structure/bed/chair{ dir = 4 @@ -12360,6 +12155,10 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/floor/prison/blue_plate/east, /area/fiorina/station/botany) +"jqN" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison/sterile_white/southwest, +/area/fiorina/station/research_cells/west) "jri" = ( /obj/structure/closet/secure_closet/freezer/fridge/groceries, /obj/structure/machinery/light/double/blue{ @@ -12372,12 +12171,6 @@ "jrN" = ( /turf/open/floor/prison/platingdmg1, /area/fiorina/tumor/aux_engi) -"jrO" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/prison/blue/northwest, -/area/fiorina/station/power_ring) "jrT" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/recharger, @@ -12403,7 +12196,7 @@ pixel_y = 7 }, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "jsU" = ( /obj/item/stack/tile/plasteel{ pixel_x = 3; @@ -12428,6 +12221,31 @@ /obj/effect/alien/weeds/node, /turf/open/floor/prison/floor_plate, /area/fiorina/tumor/aux_engi) +"jtW" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/prison, +/area/fiorina/station/transit_hub) +"juL" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/almayer/east, +/obj/structure/prop/souto_land/pole{ + dir = 1 + }, +/obj/structure/prop/souto_land/pole{ + dir = 8; + pixel_y = 24 + }, +/turf/open/floor/prison/darkbrown2/east, +/area/fiorina/station/park) +"juV" = ( +/obj/structure/prop/structure_lattice{ + dir = 4 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/research_cells/east) "juX" = ( /obj/structure/machinery/door/poddoor/almayer{ density = 0; @@ -12435,18 +12253,10 @@ }, /turf/open/floor/prison/floor_plate, /area/fiorina/station/park) -"jva" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_ew_full_cap" - }, -/obj/structure/platform/stair_cut, -/turf/open/floor/plating/prison, -/area/fiorina/station/disco) "jvi" = ( /obj/structure/closet/wardrobe/orange, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "jvm" = ( /obj/item/storage/surgical_tray, /obj/structure/surface/table/reinforced/prison, @@ -12481,6 +12291,15 @@ /obj/item/trash/hotdog, /turf/open/floor/prison/floor_plate, /area/fiorina/station/medbay) +"jxS" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/bed/chair{ + dir = 1; + layer = 2.7 + }, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison/whitegreen, +/area/fiorina/station/medbay) "jyo" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/prison/cell_stripe/west, @@ -12522,6 +12341,16 @@ "jzP" = ( /turf/open/floor/prison/bluecorner, /area/fiorina/station/power_ring) +"jAw" = ( +/obj/structure/platform/metal/kutjevo_smooth/north, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/obj/structure/platform/metal/kutjevo_smooth/west, +/turf/open/space, +/area/fiorina/oob) "jAF" = ( /obj/effect/decal/cleanable/blood/drip, /obj/effect/decal/medical_decals{ @@ -12529,10 +12358,18 @@ }, /turf/open/floor/prison/sterile_white/southwest, /area/fiorina/station/medbay) +"jAP" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/plating/prison, +/area/fiorina/station/disco/east_disco) "jAW" = ( /obj/structure/largecrate/supply/ammo, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "jBn" = ( /obj/structure/closet/secure_closet/medical3, /obj/structure/machinery/light/double/blue{ @@ -12574,22 +12411,19 @@ /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /turf/open/organic/grass/astroturf, /area/fiorina/tumor/fiberbush) -"jCO" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_sn_full_cap" - }, -/turf/open/floor/prison, -/area/fiorina/station/flight_deck) "jDe" = ( /obj/structure/bed/chair/comfy{ dir = 4 }, /turf/open/floor/prison/yellow/northeast, /area/fiorina/station/disco) +"jDl" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/effect/decal/medical_decals{ + icon_state = "triagedecaldir" + }, +/turf/open/floor/prison/whitegreenfull/southwest, +/area/fiorina/station/medbay) "jDR" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -12600,7 +12434,14 @@ "jEa" = ( /obj/effect/landmark/corpsespawner/engineer, /turf/open/floor/prison/bluecorner/north, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) +"jEq" = ( +/obj/structure/monorail{ + name = "launch track" + }, +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/telecomm/lz1_tram) "jEr" = ( /obj/structure/machinery/vending/snack, /turf/open/floor/prison, @@ -12618,7 +12459,7 @@ dir = 8 }, /turf/open/floor/wood, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "jEQ" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/shuttle/dropship/flight/lz2, @@ -12629,17 +12470,14 @@ dir = 4 }, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) -"jFh" = ( -/obj/structure/stairs/perspective{ +/area/fiorina/station/lowsec/east) +"jEY" = ( +/obj/effect/decal/cleanable/blood{ dir = 4; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 4 + icon_state = "gib6" }, -/turf/open/floor/plating/prison, -/area/fiorina/station/botany) +/turf/open/floor/prison/floor_marked/west, +/area/fiorina/station/research_cells/west) "jFl" = ( /obj/effect/landmark/xeno_spawn, /turf/open/floor/plating/prison, @@ -12684,13 +12522,11 @@ /obj/effect/spawner/random/tool, /obj/item/clothing/gloves/combat, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) -"jGC" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) +/area/fiorina/station/research_cells/west) +"jGK" = ( +/obj/structure/platform/metal/kutjevo_smooth, +/turf/open/space/basic, +/area/fiorina/oob) "jHj" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/prison/floor_plate, @@ -12707,14 +12543,6 @@ /obj/item/tool/lighter, /turf/open/floor/prison, /area/fiorina/tumor/servers) -"jHD" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/botany) "jHU" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/prison/sterile_white/southwest, @@ -12723,7 +12551,7 @@ /obj/item/paper, /obj/structure/inflatable/door, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "jIw" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/cameras{ @@ -12783,20 +12611,11 @@ }, /turf/open/floor/prison/darkyellowfull2/east, /area/fiorina/lz/near_lzI) -"jKI" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/turf/open/space, -/area/fiorina/oob) +"jKJ" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/item/trash/used_stasis_bag, +/turf/open/floor/prison/whitegreen/northwest, +/area/fiorina/station/medbay) "jKR" = ( /obj/structure/machinery/shower{ dir = 4 @@ -12806,7 +12625,7 @@ "jLe" = ( /obj/structure/machinery/constructable_frame, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "jLC" = ( /obj/item/ammo_casing{ dir = 8; @@ -12814,22 +12633,13 @@ }, /turf/open/floor/prison/darkyellowcorners2/west, /area/fiorina/station/telecomm/lz1_cargo) -"jLD" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/machinery/cm_vending/sorted/tech/comp_storage{ - layer = 3.5 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) "jMf" = ( /obj/item/stack/tile/plasteel{ pixel_x = 5; pixel_y = 5 }, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "jMh" = ( /turf/open/floor/prison/cell_stripe/east, /area/fiorina/station/medbay) @@ -12860,20 +12670,10 @@ }, /obj/structure/blocker/invisible_wall, /turf/open/ice/noweed, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "jNw" = ( /turf/open/floor/prison/blue/northwest, /area/fiorina/tumor/servers) -"jOb" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/prison, -/area/fiorina/station/disco) "jOd" = ( /obj/effect/decal{ icon = 'icons/obj/items/policetape.dmi'; @@ -12883,12 +12683,6 @@ }, /turf/open/floor/prison/darkyellow2/west, /area/fiorina/station/flight_deck) -"jOv" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/prison/blue/northeast, -/area/fiorina/station/power_ring) "jOY" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/window/reinforced{ @@ -12907,7 +12701,7 @@ icon_state = "S" }, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "jPY" = ( /obj/structure/machinery/door/airlock/almayer/generic{ name = "Residential Apartment" @@ -12925,6 +12719,14 @@ "jQy" = ( /turf/open/floor/prison/kitchen/southwest, /area/fiorina/tumor/civres) +"jQF" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/turf/open/floor/plating/prison, +/area/fiorina/station/flight_deck) "jQS" = ( /obj/structure/closet/secure_closet/guncabinet{ req_access = null @@ -12953,16 +12755,6 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/civres) -"jRC" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform, -/obj/structure/platform_decoration{ - dir = 6 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/transit_hub) "jRF" = ( /obj/item/stack/sheet/metal, /turf/open/floor/plating/prison, @@ -12977,7 +12769,11 @@ }, /obj/item/reagent_container/food/drinks/flask/marine, /turf/open/floor/prison/whitepurple/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) +"jSx" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) "jSD" = ( /obj/item/storage/toolbox/mechanical, /turf/open/floor/plating/prison, @@ -13011,7 +12807,7 @@ /area/fiorina/station/medbay) "jTJ" = ( /turf/closed/wall/r_wall/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "jTN" = ( /obj/structure/filingcabinet{ pixel_x = 8; @@ -13023,12 +12819,6 @@ }, /turf/open/floor/prison/bluefull, /area/fiorina/station/power_ring) -"jUa" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/prison/whitegreenfull/southwest, -/area/fiorina/tumor/ice_lab) "jUs" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -13091,7 +12881,7 @@ dir = 4 }, /turf/open/organic/grass/astroturf, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "jWE" = ( /obj/item/trash/used_stasis_bag{ desc = "Wow, instant sand. They really have everything in space."; @@ -13101,14 +12891,14 @@ /area/fiorina/station/civres_blue) "jWI" = ( /turf/open/floor/prison/whitepurple/northwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "jWY" = ( /obj/structure/bed{ icon_state = "abed" }, /obj/item/storage/fancy/cigar/tarbacks, /turf/open/floor/prison/whitepurple/southeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "jXj" = ( /obj/item/stack/rods, /turf/open/floor/plating/prison, @@ -13117,9 +12907,16 @@ /obj/structure/girder/reinforced, /turf/open/floor/almayer, /area/fiorina/tumor/ship) +"jXr" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/prison/cell_stripe/west, +/area/fiorina/station/park) "jXz" = ( /turf/closed/wall/prison, /area/fiorina/tumor/servers) +"jXU" = ( +/turf/open/floor/prison/yellowcorner/east, +/area/fiorina/station/lowsec/showers_laundry) "jXV" = ( /obj/effect/decal/cleanable/blood/gibs/xeno, /turf/open/floor/plating/plating_catwalk/prison, @@ -13130,17 +12927,13 @@ "jYm" = ( /obj/structure/machinery/constructable_frame, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) -"jYn" = ( -/obj/structure/platform, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/transit_hub) +/area/fiorina/station/lowsec/east) "jYs" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname{ dir = 1 }, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "jYt" = ( /obj/structure/barricade/metal/wired{ dir = 8 @@ -13154,7 +12947,7 @@ "jYM" = ( /obj/item/trash/chips, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "jYU" = ( /obj/structure/stairs/perspective{ dir = 1; @@ -13162,16 +12955,6 @@ }, /turf/open/floor/prison/darkyellow2/east, /area/fiorina/station/telecomm/lz1_tram) -"jYV" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) "jZc" = ( /obj/structure/disposalpipe/segment{ icon_state = "delivery_outlet"; @@ -13185,20 +12968,31 @@ /obj/structure/largecrate/random/case/double, /turf/open/floor/prison/darkyellowfull2/east, /area/fiorina/station/telecomm/lz1_tram) +"jZF" = ( +/obj/structure/platform/metal/kutjevo_smooth/north, +/obj/structure/platform/metal/kutjevo_smooth/east, +/obj/structure/platform/metal/kutjevo_smooth, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/turf/open/space/basic, +/area/fiorina/oob) +"kab" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/turf/open/floor/prison, +/area/fiorina/station/transit_hub) "kag" = ( /turf/open/floor/prison/cell_stripe/east, /area/fiorina/station/power_ring) "kat" = ( /turf/open/floor/prison/green/north, /area/fiorina/station/botany) -"kaw" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/security) "kaF" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/drinks/bottle/sake, @@ -13222,7 +13016,7 @@ "kbh" = ( /obj/item/explosive/grenade/incendiary/molotov, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "kbi" = ( /obj/item/ammo_casing{ dir = 6; @@ -13272,6 +13066,13 @@ /obj/structure/largecrate/random/case/small, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/lz/near_lzI) +"keb" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 12 + }, +/turf/open/floor/prison/whitepurple/southeast, +/area/fiorina/station/research_cells/east) "kfL" = ( /obj/structure/machinery/photocopier, /turf/open/floor/prison, @@ -13298,7 +13099,22 @@ "kgp" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison/yellow, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) +"kgu" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = 13 + }, +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/northwest, +/turf/open/floor/prison/yellowfull, +/area/fiorina/station/disco/east_disco) "kgG" = ( /turf/open/floor/prison/darkyellow2/east, /area/fiorina/station/telecomm/lz1_cargo) @@ -13309,7 +13125,7 @@ "kgQ" = ( /obj/item/stool, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "kgT" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/paper/carbon, @@ -13339,7 +13155,7 @@ "khw" = ( /obj/effect/spawner/random/gun/rifle/midchance, /turf/open/floor/prison/blue/west, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "khY" = ( /obj/structure/closet/secure_closet/medical3, /turf/open/floor/prison/whitegreenfull/southwest, @@ -13369,10 +13185,14 @@ "kiT" = ( /obj/item/stack/sheet/metal, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) +"kjs" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/prison, +/area/fiorina/station/disco/east_disco) "kjt" = ( /turf/open/floor/prison/whitepurple/north, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "kjP" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/door/window/northleft, @@ -13407,22 +13227,18 @@ }, /turf/open/space/basic, /area/fiorina/oob) -"kle" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 5 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/botany) "klh" = ( /obj/structure/machinery/vending/security, /turf/open/floor/prison/floor_plate, /area/fiorina/station/security) +"kll" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/turf/open/floor/plating/prison, +/area/fiorina/station/medbay) "klp" = ( /turf/closed/shuttle/ert{ icon_state = "rightengine_1"; @@ -13469,7 +13285,7 @@ icon = 'icons/obj/structures/doors/2x1prepdoor_charlie.dmi' }, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "kmN" = ( /obj/structure/machinery/computer/cameras{ dir = 1; @@ -13481,7 +13297,7 @@ "knb" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "knh" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /turf/open/floor/plating/prison, @@ -13548,12 +13364,6 @@ /obj/structure/closet/bombcloset, /turf/open/floor/prison/floor_plate/southwest, /area/fiorina/station/flight_deck) -"koY" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/prison/whitegreenfull/southwest, -/area/fiorina/station/medbay) "kpe" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison/whitegreen/west, @@ -13574,7 +13384,7 @@ /obj/effect/spawner/random/gun/smg, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "kpv" = ( /obj/structure/pipes/standard/simple/visible{ dir = 4 @@ -13634,15 +13444,7 @@ "ksE" = ( /obj/structure/inflatable, /turf/open/floor/prison/yellow, -/area/fiorina/station/lowsec) -"ksL" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_ew_full_cap" - }, -/obj/structure/platform/stair_cut, -/turf/open/floor/plating/prison, -/area/fiorina/station/security) +/area/fiorina/station/lowsec/showers_laundry) "ksV" = ( /obj/structure/barricade/handrail/type_b{ dir = 4; @@ -13673,6 +13475,14 @@ }, /turf/open/floor/prison/darkpurplefull2, /area/fiorina/tumor/servers) +"kuQ" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_ew_full_cap" + }, +/obj/structure/platform/metal/stair_cut/platform_left, +/turf/open/floor/plating/prison, +/area/fiorina/station/security) "kvg" = ( /obj/structure/machinery/light/double/blue{ dir = 4; @@ -13756,12 +13566,6 @@ /obj/structure/machinery/vending/cola, /turf/open/floor/prison/floor_plate, /area/fiorina/station/security/wardens) -"kyh" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) "kyF" = ( /turf/open/floor/prison/blue/west, /area/fiorina/station/civres_blue) @@ -13773,7 +13577,7 @@ pixel_y = -1 }, /turf/open/floor/prison/whitepurple/northwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "kyW" = ( /obj/item/stack/sandbags/large_stack, /turf/open/floor/plating/prison, @@ -13793,7 +13597,7 @@ dir = 4 }, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "kzs" = ( /obj/item/stack/sandbags/large_stack, /turf/open/floor/prison/green/east, @@ -13828,7 +13632,7 @@ dir = 4 }, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "kAc" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/processor{ @@ -13856,16 +13660,19 @@ /obj/item/toy/bikehorn/rubberducky, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) -"kBX" = ( +"kBW" = ( /obj/structure/stairs/perspective{ dir = 4; - icon_state = "p_stair_sn_full_cap" + icon_state = "p_stair_full" }, -/obj/structure/platform_decoration{ - dir = 8 +/obj/structure/platform/metal/almayer, +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = -3 }, /turf/open/floor/plating/prison, -/area/fiorina/tumor/ice_lab) +/area/fiorina/station/flight_deck) "kCj" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -13895,17 +13702,11 @@ "kCT" = ( /obj/effect/spawner/random/gun/smg, /turf/open/floor/prison/yellow/northeast, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "kCY" = ( /obj/item/tool/weldingtool, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) -"kDa" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/park) "kDw" = ( /turf/open/floor/prison/darkyellowcorners2, /area/fiorina/station/telecomm/lz1_cargo) @@ -13956,50 +13757,29 @@ "kGd" = ( /obj/structure/barricade/wooden, /turf/open/floor/prison/whitepurple/west, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "kGo" = ( /obj/structure/machinery/power/apc/power/south, /turf/open/floor/prison/whitepurple, -/area/fiorina/station/research_cells) -"kGB" = ( -/obj/structure/platform, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/security) +/area/fiorina/station/research_cells/west) "kGD" = ( /obj/structure/largecrate/random/mini/med, /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/station/medbay) -"kGZ" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 5 - }, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) "kHa" = ( /obj/item/storage/toolbox, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) -"kHc" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/prison, -/area/fiorina/station/medbay) -"kHf" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/prison/chapel_carpet/doubleside/north, -/area/fiorina/station/chapel) "kHv" = ( /turf/open/floor/prison/bluecorner/north, /area/fiorina/station/power_ring) +"kHx" = ( +/obj/structure/platform/metal/almayer/north, +/obj/item/fuel_cell, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/northwest, +/turf/open/floor/plating/prison, +/area/fiorina/station/lowsec/showers_laundry) "kHF" = ( /turf/open/floor/prison/floor_plate, /area/fiorina/station/telecomm/lz1_cargo) @@ -14010,7 +13790,7 @@ "kHH" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "kHI" = ( /obj/item/stack/sheet/metal, /turf/open/floor/prison/darkpurplefull2, @@ -14030,7 +13810,7 @@ "kIb" = ( /obj/structure/inflatable, /turf/open/floor/prison/yellow/west, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "kIg" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison/floor_plate, @@ -14059,7 +13839,7 @@ "kIO" = ( /obj/structure/machinery/vending/snack/packaged, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "kJd" = ( /obj/item/tool/warning_cone, /turf/open/floor/prison/darkbrown2/east, @@ -14068,6 +13848,10 @@ /obj/item/tool/wrench, /turf/open/floor/plating/prison, /area/fiorina/station/transit_hub) +"kJg" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/prison/bluecorner/east, +/area/fiorina/station/power_ring) "kJz" = ( /obj/effect/decal/cleanable/blood/oil, /obj/structure/machinery/fuelcell_recycler, @@ -14100,6 +13884,12 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison/floor_plate, /area/fiorina/station/chapel) +"kKh" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/southwest, +/turf/open/floor/prison/whitegreen/southwest, +/area/fiorina/tumor/ice_lab) "kKs" = ( /obj/structure/bed/chair/comfy{ dir = 4 @@ -14111,19 +13901,14 @@ /obj/item/weapon/baton, /turf/open/floor/prison/greenfull/east, /area/fiorina/tumor/civres) -"kKP" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/prison/blue/west, -/area/fiorina/station/power_ring) -"kKQ" = ( -/obj/structure/platform/stair_cut/alt, +"kKy" = ( /obj/structure/stairs/perspective{ - icon_state = "p_stair_ew_full_cap" + dir = 8; + icon_state = "p_stair_sn_full_cap" }, -/turf/open/floor/plating/prison, -/area/fiorina/station/power_ring) +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/prison, +/area/fiorina/station/telecomm/lz1_tram) "kLs" = ( /obj/vehicle/powerloader{ dir = 8 @@ -14146,6 +13931,10 @@ }, /turf/open/organic/grass/astroturf, /area/fiorina/station/civres_blue) +"kMf" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/prison/floor_plate, +/area/fiorina/tumor/ice_lab) "kMm" = ( /obj/structure/barricade/handrail, /turf/open/floor/prison/floor_plate, @@ -14153,6 +13942,14 @@ "kMq" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/civres_blue) +"kMA" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/park) "kMC" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/objective, @@ -14221,6 +14018,13 @@ "kOB" = ( /turf/open/organic/grass/astroturf, /area/fiorina/station/civres_blue) +"kOM" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_ew_full_cap" + }, +/obj/structure/platform/metal/stair_cut/platform_right, +/turf/open/floor/plating/prison, +/area/fiorina/station/chapel) "kOV" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/folder/black_random, @@ -14238,6 +14042,15 @@ /obj/structure/lattice, /turf/open/space, /area/fiorina/oob) +"kPG" = ( +/obj/structure/blocker/invisible_wall, +/obj/structure/platform/metal/almayer/north, +/obj/structure/ice/thin/indestructible{ + dir = 1; + icon_state = "Corner" + }, +/turf/open/ice/noweed, +/area/fiorina/tumor/ice_lab) "kPY" = ( /turf/closed/wall/prison, /area/fiorina/tumor/fiberbush) @@ -14271,6 +14084,13 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) +"kRl" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/plating/prison, +/area/fiorina/station/medbay) "kRO" = ( /obj/item/tool/warning_cone{ pixel_x = -4; @@ -14296,7 +14116,7 @@ /area/fiorina/station/medbay) "kSe" = ( /turf/open/floor/prison/yellow, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "kSh" = ( /turf/closed/shuttle/elevator{ dir = 9 @@ -14306,25 +14126,9 @@ /obj/structure/closet/firecloset, /turf/open/floor/prison/darkbrownfull2, /area/fiorina/maintenance) -"kSD" = ( -/obj/structure/monorail{ - name = "launch track" - }, -/obj/structure/platform{ - dir = 8; - layer = 2.5 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/telecomm/lz1_tram) "kTs" = ( /turf/open/floor/prison/floor_plate, /area/fiorina/maintenance) -"kTD" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/prison/blue/southwest, -/area/fiorina/station/power_ring) "kTL" = ( /obj/item/stack/rods, /obj/item/shard{ @@ -14353,12 +14157,6 @@ }, /turf/open/floor/prison/bluefull, /area/fiorina/station/power_ring) -"kUR" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/flight_deck) "kVg" = ( /obj/item/stack/cable_coil/blue, /turf/open/floor/plating/prison, @@ -14386,7 +14184,7 @@ pixel_y = 4 }, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "kWL" = ( /turf/open/floor/prison/floor_marked/southwest, /area/fiorina/lz/near_lzII) @@ -14394,9 +14192,13 @@ /obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison/sterile_white/southwest, /area/fiorina/tumor/ice_lab) +"kWT" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) "kXk" = ( /turf/open/floor/prison/whitepurple/northeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "kXm" = ( /obj/structure/surface/rack, /obj/item/weapon/gun/pistol/heavy, @@ -14426,6 +14228,9 @@ }, /turf/open/floor/plating/plating_catwalk, /area/fiorina/tumor/ship) +"kXT" = ( +/turf/open/floor/prison/yellow/northwest, +/area/fiorina/station/lowsec/showers_laundry) "kYd" = ( /obj/structure/bed/chair/office/light{ dir = 8 @@ -14501,13 +14306,19 @@ "laK" = ( /obj/item/stool, /turf/open/floor/prison/yellow/southwest, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "laX" = ( /obj/structure/toilet{ dir = 8 }, /turf/open/floor/prison/sterile_white, /area/fiorina/station/civres_blue) +"lbg" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform/metal/almayer/east, +/obj/vehicle/powerloader/ft, +/turf/open/floor/plating/prison, +/area/fiorina/station/power_ring) "lbt" = ( /obj/structure/disposalpipe/segment{ color = "#c4c4c4"; @@ -14525,25 +14336,11 @@ }, /turf/open/floor/prison/floor_plate, /area/fiorina/station/power_ring) -"lbK" = ( -/obj/structure/platform, -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/power_ring) "lbL" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/trash/cigbutt, /turf/open/floor/prison/floor_plate/southwest, -/area/fiorina/station/disco) -"lbZ" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/prison/whitegreenfull/southwest, -/area/fiorina/station/medbay) +/area/fiorina/station/disco/east_disco) "lcm" = ( /obj/structure/machinery/landinglight/ds2/delayone{ dir = 4 @@ -14557,21 +14354,18 @@ /obj/item/stack/sandbags/large_stack, /turf/open/floor/prison/floor_plate/southwest, /area/fiorina/station/flight_deck) -"lcq" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/turf/open/space/basic, -/area/fiorina/oob) "lcE" = ( /obj/structure/inflatable, /turf/open/floor/prison/whitepurple/northeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "lcJ" = ( /obj/effect/landmark/queen_spawn, /turf/open/floor/prison/whitegreencorner/east, /area/fiorina/tumor/ice_lab) +"lcO" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/prison/darkbrown2/east, +/area/fiorina/station/park) "ldd" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/stack/rods, @@ -14601,7 +14395,7 @@ "ldF" = ( /obj/structure/machinery/fuelcell_recycler/full, /turf/open/floor/prison/blue/southwest, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "ldW" = ( /obj/item/stack/sandbags, /turf/open/floor/prison/kitchen, @@ -14627,7 +14421,7 @@ dir = 8 }, /turf/open/floor/prison/yellow/east, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "leZ" = ( /obj/item/trash/cigbutt, /turf/open/floor/prison/whitegreenfull/southwest, @@ -14636,10 +14430,14 @@ /obj/structure/pipes/standard/manifold/visible, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) +"lfx" = ( +/obj/item/stack/sheet/cardboard, +/turf/open/floor/prison, +/area/fiorina/station/disco/east_disco) "lfX" = ( /obj/structure/inflatable/door, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "lge" = ( /turf/open/floor/prison/blue/northeast, /area/fiorina/station/civres_blue) @@ -14704,17 +14502,11 @@ "ljc" = ( /obj/structure/barricade/wooden, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "ljd" = ( /obj/item/stack/cable_coil, /turf/open/floor/plating/prison, /area/fiorina/maintenance) -"ljx" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/civres_blue) "ljV" = ( /obj/effect/landmark/corpsespawner/ua_riot, /turf/open/floor/prison, @@ -14723,7 +14515,7 @@ /obj/item/tool/kitchen/knife, /obj/structure/bed/roller, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "lkr" = ( /turf/open/floor/prison/whitegreen/northwest, /area/fiorina/tumor/ice_lab) @@ -14756,6 +14548,13 @@ "lld" = ( /turf/open/floor/prison/red/west, /area/fiorina/station/security) +"llf" = ( +/obj/structure/monorail{ + name = "launch track" + }, +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/telecomm/lz1_tram) "lls" = ( /obj/structure/barricade/handrail/type_b{ layer = 3.5 @@ -14781,27 +14580,6 @@ }, /turf/open/floor/prison/platingdmg3, /area/fiorina/station/security) -"llQ" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/turf/open/floor/almayer_hull, -/area/fiorina/oob) -"lml" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/space/basic, -/area/fiorina/oob) -"lmn" = ( -/obj/structure/machinery/shower{ - pixel_y = 13 - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/plating/plating_catwalk/prison, -/area/fiorina/station/medbay) "lmu" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -14809,6 +14587,20 @@ }, /turf/open/floor/prison/floor_plate/southwest, /area/fiorina/station/flight_deck) +"lmC" = ( +/turf/open/floor/prison/yellowfull, +/area/fiorina/station/lowsec/east) +"lmJ" = ( +/obj/structure/machinery/light/double/blue{ + pixel_y = -1 + }, +/obj/structure/platform_decoration/metal/almayer, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/disco) +"lny" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/prison, +/area/fiorina/station/disco/east_disco) "lnK" = ( /turf/closed/wall/r_wall/prison, /area/fiorina/station/telecomm/lz1_tram) @@ -14823,6 +14615,10 @@ }, /turf/open/floor/prison/floor_plate, /area/fiorina/station/telecomm/lz1_cargo) +"low" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/prison/greenblue/southwest, +/area/fiorina/station/botany) "loE" = ( /obj/structure/window/reinforced{ dir = 8 @@ -14867,16 +14663,6 @@ "lpH" = ( /turf/open/floor/prison/green/northwest, /area/fiorina/station/chapel) -"lpS" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/disco) "lpW" = ( /obj/structure/largecrate/random/barrel/white, /turf/open/floor/prison/floor_plate/southwest, @@ -14884,11 +14670,11 @@ "lpX" = ( /obj/structure/machinery/door/airlock/prison/horizontal, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "lpZ" = ( /obj/item/trash/boonie, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "lqa" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -14961,7 +14747,7 @@ dir = 4 }, /turf/open/floor/prison/kitchen, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "lsZ" = ( /obj/item/tool/soap, /obj/structure/machinery/shower{ @@ -14972,7 +14758,7 @@ dir = 8 }, /turf/open/floor/prison/kitchen, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "ltd" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison/sterile_white/southwest, @@ -14996,6 +14782,10 @@ "ltQ" = ( /turf/open/floor/prison/cell_stripe/east, /area/fiorina/station/security) +"lud" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/space/basic, +/area/fiorina/oob) "luf" = ( /obj/effect/decal/medical_decals{ icon_state = "docdecal1" @@ -15006,14 +14796,22 @@ /obj/effect/spawner/random/tool, /turf/open/floor/prison/floor_plate, /area/fiorina/tumor/servers) +"lur" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/central_ring) "lux" = ( /obj/structure/inflatable/door, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "luy" = ( /obj/item/trash/candle, /turf/open/floor/prison/chapel_carpet/doubleside/north, /area/fiorina/maintenance) +"luR" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/floor/prison, +/area/fiorina/station/transit_hub) "luZ" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison/whitegreenfull/southwest, @@ -15131,7 +14929,7 @@ /obj/structure/surface/table/reinforced/prison, /obj/structure/window/reinforced/tinted, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "lzn" = ( /obj/structure/machinery/portable_atmospherics/canister/phoron, /turf/open/floor/corsat/squares, @@ -15150,7 +14948,7 @@ }, /obj/item/storage/fancy/crayons, /turf/open/floor/prison/whitepurple/southeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "lzB" = ( /obj/structure/closet/crate/miningcar{ name = "\improper materials storage bin" @@ -15190,7 +14988,7 @@ pixel_y = 5 }, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "lAN" = ( /obj/structure/machinery/light/double/blue{ dir = 4; @@ -15259,17 +15057,14 @@ /obj/structure/largecrate/random/barrel/green, /turf/open/floor/almayer/plate, /area/fiorina/tumor/ship) +"lCG" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) "lDo" = ( /obj/item/storage/fancy/cigar, /turf/open/floor/prison, /area/fiorina/station/medbay) -"lDC" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/turf/open/space/basic, -/area/fiorina/oob) "lDG" = ( /obj/structure/machinery/computer/drone_control, /obj/structure/window/reinforced{ @@ -15285,7 +15080,7 @@ "lEd" = ( /obj/structure/inflatable/popped/door, /turf/open/floor/prison/whitepurple/northwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "lEg" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/prison/floor_plate, @@ -15298,16 +15093,6 @@ }, /turf/open/floor/prison, /area/fiorina/tumor/servers) -"lEp" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/almayer_hull, -/area/fiorina/station/medbay) "lEy" = ( /obj/structure/bed/chair/dropship/pilot{ dir = 1 @@ -15346,7 +15131,7 @@ "lFg" = ( /obj/item/paper, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "lFm" = ( /obj/structure/bed/roller, /obj/item/trash/used_stasis_bag, @@ -15365,11 +15150,18 @@ /area/fiorina/station/disco) "lFB" = ( /turf/open/floor/prison/whitepurple/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "lFD" = ( /obj/item/tool/crowbar/red, /turf/open/floor/prison/darkbrown2/east, /area/fiorina/tumor/aux_engi) +"lFK" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison/yellow/northwest, +/area/fiorina/station/disco/east_disco) "lFM" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/landmark/objective_landmark/close, @@ -15407,6 +15199,21 @@ }, /turf/open/floor/prison, /area/fiorina/station/security) +"lHH" = ( +/obj/structure/window/framed/prison/reinforced, +/turf/open/floor/plating/prison, +/area/fiorina/station/lowsec/east) +"lHJ" = ( +/obj/structure/platform/metal/kutjevo_smooth/north, +/obj/structure/platform_decoration/metal/kutjevo/north, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/fiorina/oob) "lIj" = ( /obj/structure/prop/ice_colony/surveying_device, /turf/open/floor/prison/blue/east, @@ -15425,18 +15232,6 @@ }, /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/station/medbay) -"lIl" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 9 - }, -/turf/open/floor/prison/whitegreen/northeast, -/area/fiorina/tumor/ice_lab) "lIt" = ( /obj/structure/disposalpipe/segment{ color = "#c4c4c4"; @@ -15469,7 +15264,7 @@ "lIG" = ( /obj/structure/extinguisher_cabinet, /turf/closed/wall/r_wall/prison_unmeltable, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "lIH" = ( /obj/structure/machinery/processor, /turf/open/floor/prison/blue_plate/west, @@ -15477,7 +15272,19 @@ "lIJ" = ( /obj/item/stack/rods, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) +"lIN" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/turf/open/floor/plating/prison, +/area/fiorina/tumor/servers) +"lJb" = ( +/obj/structure/platform/metal/kutjevo_smooth/west, +/turf/open/floor/almayer_hull, +/area/fiorina/oob) "lJf" = ( /obj/structure/reagent_dispensers/fueltank/gas/hydrogen{ layer = 2.6 @@ -15518,10 +15325,22 @@ /obj/item/stack/sheet/metal, /turf/open/floor/plating/prison, /area/fiorina/tumor/civres) +"lLk" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/prison, +/area/fiorina/station/park) "lLE" = ( /obj/item/bedsheet/blue, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) +"lLN" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" + }, +/turf/open/floor/plating/prison, +/area/fiorina/tumor/ice_lab) "lLQ" = ( /turf/open/floor/prison, /area/fiorina/tumor/servers) @@ -15538,7 +15357,7 @@ "lMi" = ( /obj/structure/largecrate/random, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "lMq" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/microwave{ @@ -15547,13 +15366,21 @@ }, /turf/open/floor/prison/kitchen/southwest, /area/fiorina/station/civres_blue) +"lMJ" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/turf/open/floor/prison/darkbrown2, +/area/fiorina/station/park) "lMV" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/communications{ dir = 1 }, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "lNc" = ( /obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison/redfull, @@ -15565,11 +15392,14 @@ pixel_y = 21 }, /turf/open/floor/prison/yellow/north, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "lNv" = ( /obj/item/restraint/adjustable/cable/pink, /turf/open/floor/prison/chapel_carpet/doubleside/north, /area/fiorina/station/chapel) +"lNC" = ( +/turf/open/floor/prison/yellowcorner, +/area/fiorina/station/lowsec/east) "lNP" = ( /obj/structure/bed/roller, /turf/open/floor/prison, @@ -15604,6 +15434,11 @@ /obj/structure/machinery/light/double/blue, /turf/open/floor/prison/darkyellow2, /area/fiorina/lz/near_lzI) +"lOX" = ( +/obj/structure/platform/metal/kutjevo_smooth, +/obj/structure/platform/metal/kutjevo_smooth/west, +/turf/open/space/basic, +/area/fiorina/oob) "lPA" = ( /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/prison, @@ -15625,13 +15460,6 @@ /obj/effect/landmark/objective_landmark/far, /turf/open/floor/prison/darkbrown2/southwest, /area/fiorina/maintenance) -"lQL" = ( -/obj/structure/machinery/space_heater, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/prison/whitegreen/west, -/area/fiorina/tumor/ice_lab) "lRk" = ( /obj/item/stack/rods/plasteel, /turf/open/floor/prison/damaged3, @@ -15662,24 +15490,21 @@ icon = 'icons/obj/structures/doors/2x1prepdoor_charlie.dmi' }, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "lSq" = ( /obj/item/ammo_magazine/shotgun/buckshot, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) -"lSS" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/obj/structure/lattice, -/turf/open/space/basic, -/area/fiorina/oob) +/area/fiorina/station/research_cells/west) "lTp" = ( /obj/structure/sink{ pixel_y = 15 }, /turf/open/floor/almayer/plate, /area/fiorina/tumor/ship) +"lTs" = ( +/obj/effect/spawner/random/tool, +/turf/open/floor/prison/sterile_white/southwest, +/area/fiorina/station/research_cells/east) "lTW" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_29"; @@ -15703,7 +15528,7 @@ }, /obj/structure/blocker/invisible_wall, /turf/open/ice/noweed, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "lUu" = ( /obj/structure/machinery/light/double/blue{ dir = 8; @@ -15713,12 +15538,6 @@ /obj/item/clothing/suit/storage/hazardvest, /turf/open/floor/corsat/plate, /area/fiorina/station/civres_blue) -"lUv" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) "lUE" = ( /obj/structure/barricade/metal/wired{ dir = 4 @@ -15730,7 +15549,7 @@ icon_state = "pottedplant_22" }, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "lVA" = ( /turf/open/floor/prison/cell_stripe/east, /area/fiorina/lz/near_lzII) @@ -15754,7 +15573,7 @@ /obj/item/fuel_cell, /obj/structure/surface/rack, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "lXs" = ( /obj/item/book/manual/marine_law, /obj/item/book/manual/marine_law{ @@ -15766,18 +15585,6 @@ }, /turf/open/floor/prison/chapel_carpet, /area/fiorina/maintenance) -"lXO" = ( -/obj/structure/ice/thin/indestructible{ - dir = 4; - icon_state = "Corner" - }, -/obj/structure/blocker/invisible_wall, -/obj/structure/platform{ - dir = 1; - layer = 2.1 - }, -/turf/open/ice/noweed, -/area/fiorina/tumor/ice_lab) "lYj" = ( /obj/structure/sink{ pixel_y = 15 @@ -15806,7 +15613,7 @@ /area/fiorina/tumor/fiberbush) "lZp" = ( /turf/open/floor/prison/kitchen, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "lZs" = ( /obj/structure/disposalpipe/segment{ color = "#c4c4c4"; @@ -15827,7 +15634,7 @@ icon = 'icons/obj/structures/doors/2x1prepdoor_charlie.dmi' }, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "maA" = ( /obj/item/stack/tile/plasteel, /turf/open/floor/prison/whitegreenfull/southwest, @@ -15854,11 +15661,25 @@ /obj/item/clipboard, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) +"mbU" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/turf/open/floor/prison/bright_clean_marked/southwest, +/area/fiorina/station/power_ring) "mcr" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/stock_parts/matter_bin/super, /turf/open/floor/wood, /area/fiorina/station/park) +"mcy" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform/metal/almayer, +/obj/structure/platform_decoration/metal/almayer/southwest, +/turf/open/floor/prison/bluefull, +/area/fiorina/station/chapel) "mcH" = ( /turf/open/floor/prison/blue, /area/fiorina/tumor/servers) @@ -15910,13 +15731,6 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison/redfull, /area/fiorina/station/security) -"mdJ" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/platform/kutjevo/smooth, -/turf/open/space, -/area/fiorina/oob) "mdS" = ( /turf/open/floor/prison/greenbluecorner/west, /area/fiorina/station/botany) @@ -15942,6 +15756,13 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) +"met" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) +"meE" = ( +/turf/open/floor/prison/whitepurple/southwest, +/area/fiorina/station/research_cells/east) "mfe" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/weapon/twohanded/sledgehammer{ @@ -15969,7 +15790,7 @@ /area/fiorina/tumor/ice_lab) "mgz" = ( /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "mgE" = ( /obj/structure/machinery/light/double/blue{ pixel_y = -1 @@ -16022,13 +15843,29 @@ "mjx" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/tumor/servers) -"mjB" = ( -/obj/structure/platform, -/turf/open/gm/river/pool, -/area/fiorina/station/park) +"mjW" = ( +/obj/structure/platform/metal/kutjevo_smooth/north, +/obj/structure/platform/metal/kutjevo_smooth/east, +/turf/open/space, +/area/fiorina/oob) +"mke" = ( +/obj/item/tool/wirecutters, +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) "mkn" = ( /turf/open/floor/prison/darkyellow2/southeast, /area/fiorina/station/power_ring) +"mkr" = ( +/obj/structure/platform/metal/kutjevo_smooth/north, +/obj/structure/platform/metal/kutjevo_smooth/west, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/turf/open/space/basic, +/area/fiorina/oob) "mkI" = ( /obj/structure/machinery/microwave{ desc = "So uh yeah, about that cat..."; @@ -16046,10 +15883,6 @@ /obj/structure/machinery/photocopier, /turf/open/floor/prison/floor_plate, /area/fiorina/station/security) -"mlg" = ( -/obj/effect/landmark/corpsespawner/ua_riot/burst, -/turf/open/floor/prison/whitepurple/north, -/area/fiorina/station/research_cells) "mlu" = ( /obj/structure/prop/invuln/minecart_tracks/bumper{ dir = 1 @@ -16060,6 +15893,13 @@ /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, /area/fiorina/station/disco) +"mlE" = ( +/turf/open/floor/prison/yellowcorner, +/area/fiorina/station/lowsec/showers_laundry) +"mlG" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/disco) "mlU" = ( /obj/structure/machinery/shower{ pixel_y = 13 @@ -16100,7 +15940,7 @@ "mns" = ( /obj/item/stool, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "mny" = ( /turf/closed/wall/prison, /area/fiorina/station/flight_deck) @@ -16125,7 +15965,7 @@ /obj/structure/surface/table/reinforced/prison, /obj/item/tool/surgery/surgicaldrill, /turf/open/floor/prison/yellowcorner, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "moK" = ( /obj/item/clothing/under/shorts/red, /turf/open/floor/prison/yellowfull, @@ -16137,7 +15977,7 @@ }, /obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison/whitepurple/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "moW" = ( /obj/effect/landmark/corpsespawner/ua_riot/burst, /turf/open/floor/plating/prison, @@ -16152,21 +15992,6 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/lz/near_lzII) -"mpB" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/platform/kutjevo/smooth, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/turf/open/space/basic, -/area/fiorina/oob) "mpE" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -16181,23 +16006,18 @@ "mpR" = ( /obj/structure/machinery/vending/cigarette/colony, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) -"mpY" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" - }, -/obj/structure/barricade/handrail/type_b{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/prison, -/area/fiorina/station/medbay) +/area/fiorina/station/research_cells/west) "mqB" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/prison/red, /area/fiorina/station/security) +"mqF" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/northwest, +/obj/structure/largecrate/random, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/power_ring) "mqJ" = ( /obj/structure/barricade/metal/wired{ dir = 8 @@ -16205,6 +16025,10 @@ /obj/item/stack/sheet/metal, /turf/open/floor/plating/prison, /area/fiorina/station/central_ring) +"mqL" = ( +/obj/item/stack/sheet/metal/medium_stack, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/power_ring/reactor) "mqM" = ( /obj/item/stack/sandbags_empty/half, /turf/open/floor/prison/darkyellow2/east, @@ -16220,7 +16044,7 @@ /obj/structure/extinguisher_cabinet, /obj/structure/window/framed/prison, /turf/open/floor/plating/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "mrI" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med, /turf/closed/wall/prison, @@ -16229,22 +16053,20 @@ /obj/structure/closet/secure_closet/medical2, /turf/open/floor/prison/floor_plate, /area/fiorina/station/telecomm/lz1_cargo) +"mrP" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/prison/chapel_carpet/doubleside, +/area/fiorina/station/chapel) "mrW" = ( /obj/item/stack/rods, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "mrX" = ( /obj/structure/bed/chair{ dir = 8 }, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) -"msd" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/prison/whitegreen, -/area/fiorina/tumor/ice_lab) "msj" = ( /obj/item/toy/crayon/orange, /turf/open/floor/plating/prison, @@ -16289,6 +16111,10 @@ "mtG" = ( /turf/open/floor/prison/darkbrowncorners2, /area/fiorina/station/park) +"mtM" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, +/turf/open/space, +/area/fiorina/oob) "mtP" = ( /obj/structure/window/reinforced{ dir = 8; @@ -16302,7 +16128,7 @@ pixel_y = 18 }, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "muD" = ( /obj/structure/tunnel, /turf/open/organic/grass/astroturf, @@ -16316,10 +16142,15 @@ "mvl" = ( /obj/structure/window/framed/prison/reinforced, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "mvp" = ( /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/tumor/ice_lab) +"mvt" = ( +/obj/structure/platform_decoration/metal/kutjevo, +/obj/structure/lattice, +/turf/open/space/basic, +/area/fiorina/oob) "mvF" = ( /obj/structure/monorail{ name = "launch track" @@ -16330,19 +16161,16 @@ }, /turf/open/floor/plating/prison, /area/fiorina/oob) -"mvV" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison/whitegreen/east, -/area/fiorina/tumor/ice_lab) "mvY" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/spawner/random/tool, /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison/darkbrownfull2, /area/fiorina/tumor/aux_engi) +"mwi" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/prison/darkbrown2/west, +/area/fiorina/station/park) "mwu" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/spacecash/c10, @@ -16356,7 +16184,7 @@ pixel_y = -3 }, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "mwK" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/window/reinforced{ @@ -16377,7 +16205,7 @@ icon_state = "abed" }, /turf/open/floor/prison/yellow/southwest, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "mxc" = ( /obj/effect/spawner/random/tool, /turf/open/floor/prison, @@ -16396,6 +16224,11 @@ /obj/effect/spawner/gibspawner/human, /turf/open/gm/river/darkred_pool, /area/fiorina/station/park) +"mxN" = ( +/obj/structure/platform/metal/kutjevo_smooth/west, +/obj/structure/platform/metal/kutjevo_smooth/north, +/turf/open/space/basic, +/area/fiorina/oob) "mxQ" = ( /turf/closed/wall/prison, /area/fiorina/station/power_ring) @@ -16529,20 +16362,11 @@ "mCF" = ( /obj/structure/extinguisher_cabinet, /turf/closed/wall/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "mCH" = ( /obj/item/newspaper, /turf/open/floor/prison, /area/fiorina/station/civres_blue) -"mCR" = ( -/obj/structure/platform, -/obj/structure/bed/chair{ - dir = 1; - layer = 2.7 - }, -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/whitegreen, -/area/fiorina/station/medbay) "mDn" = ( /turf/open/floor/prison/green/northeast, /area/fiorina/tumor/servers) @@ -16559,12 +16383,18 @@ }, /turf/open/floor/carpet, /area/fiorina/station/civres_blue) -"mDO" = ( -/obj/structure/bed{ - icon_state = "abed" +"mDC" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" }, -/turf/open/floor/prison/yellow/southeast, -/area/fiorina/station/lowsec) +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/prison/floor_plate, +/area/fiorina/tumor/ice_lab) +"mDG" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/prison/blue/northeast, +/area/fiorina/station/power_ring) "mDS" = ( /obj/structure/bed/chair/comfy{ dir = 1 @@ -16612,14 +16442,6 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/central_ring) -"mGN" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/item/prop/almayer/handheld1, -/obj/structure/surface/rack, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) "mGX" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison/floor_plate, @@ -16651,21 +16473,13 @@ /obj/item/frame/rack, /turf/open/floor/prison/redfull, /area/fiorina/station/security) -"mIf" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/turf/open/floor/plating/prison, -/area/fiorina/tumor/servers) "mIr" = ( /obj/structure/bed{ icon_state = "abed" }, /obj/item/reagent_container/food/snacks/wrapped/barcardine, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "mIu" = ( /obj/effect/spawner/random/sentry/midchance, /turf/open/floor/plating/prison, @@ -16702,6 +16516,13 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) +"mJp" = ( +/obj/structure/monorail{ + name = "launch track" + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/plating/prison, +/area/fiorina/station/telecomm/lz1_tram) "mJq" = ( /obj/item/trash/kepler, /turf/open/floor/plating/prison, @@ -16710,10 +16531,23 @@ /obj/item/device/flashlight/flare/on, /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/tumor/ice_lab) +"mKa" = ( +/obj/structure/machinery/power/apc/power/north, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/lowsec/east) "mKd" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison/yellow/east, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) +"mKh" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = 13 + }, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/power_ring) "mKo" = ( /obj/structure/closet/secure_closet/engineering_personal, /obj/effect/landmark/objective_landmark/close, @@ -16726,26 +16560,6 @@ "mKx" = ( /turf/open/floor/prison/blue_plate, /area/fiorina/station/botany) -"mKS" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/turf/open/space, -/area/fiorina/oob) -"mLm" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/botany) "mLL" = ( /obj/item/tool/mop, /turf/open/floor/prison/floor_plate, @@ -16807,35 +16621,19 @@ /obj/structure/largecrate/random/barrel/blue, /turf/open/floor/prison/floor_plate/southwest, /area/fiorina/station/telecomm/lz1_cargo) +"mOc" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/prison/whitegreenfull/southwest, +/area/fiorina/station/medbay) "mOf" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/ashtray/plastic, /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/station/medbay) -"mOm" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 9 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/transit_hub) -"mOE" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/turf/open/floor/prison/bright_clean_marked/southwest, -/area/fiorina/station/power_ring) "mOI" = ( /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "mOU" = ( /obj/structure/barricade/handrail/type_b{ dir = 4 @@ -16910,6 +16708,10 @@ }, /turf/open/space, /area/fiorina/oob) +"mRR" = ( +/obj/structure/platform/metal/almayer, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/disco) "mRS" = ( /turf/open/floor/prison/darkpurple2/northeast, /area/fiorina/station/central_ring) @@ -16945,7 +16747,7 @@ }, /obj/structure/blocker/invisible_wall, /turf/open/ice/noweed, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "mTl" = ( /obj/item/storage/box/gloves, /turf/open/floor/prison/greenfull/northwest, @@ -16966,7 +16768,7 @@ }, /obj/effect/decal/cleanable/blood/oil/streak, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "mUA" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating/prison, @@ -17013,6 +16815,9 @@ /obj/structure/largecrate/random, /turf/open/floor/prison/darkyellowfull2/east, /area/fiorina/station/telecomm/lz1_tram) +"mVE" = ( +/turf/open/floor/prison/whitepurple/northeast, +/area/fiorina/station/research_cells/east) "mVO" = ( /obj/item/tool/extinguisher, /turf/open/floor/prison, @@ -17040,12 +16845,6 @@ /obj/item/stack/rods, /turf/open/floor/prison/floor_plate, /area/fiorina/station/security) -"mWX" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/prison/chapel_carpet/doubleside, -/area/fiorina/station/chapel) "mWY" = ( /obj/item/coin/uranium{ anchored = 1; @@ -17076,6 +16875,11 @@ /obj/effect/landmark/monkey_spawn, /turf/open/floor/prison/darkbrown2/north, /area/fiorina/tumor/aux_engi) +"mYz" = ( +/obj/structure/platform/metal/almayer/east, +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/prison/whitegreen/east, +/area/fiorina/tumor/ice_lab) "mYG" = ( /turf/open/floor/prison/floor_plate, /area/fiorina/tumor/ship) @@ -17091,7 +16895,7 @@ }, /obj/effect/spawner/random/gun/smg/lowchance, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "mZH" = ( /obj/structure/stairs/perspective{ dir = 1; @@ -17102,10 +16906,14 @@ "naf" = ( /turf/closed/shuttle/ert, /area/fiorina/oob) +"naj" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/power_ring) "naI" = ( /obj/item/clothing/under/color/orange, /turf/open/floor/prison/yellow, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "naW" = ( /turf/closed/wall/r_wall/prison, /area/fiorina/tumor/civres) @@ -17164,6 +16972,11 @@ /obj/effect/spawner/random/pills/lowchance, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) +"ndC" = ( +/obj/structure/machinery/space_heater, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/prison/whitegreen/west, +/area/fiorina/tumor/ice_lab) "ndD" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison/floor_plate, @@ -17171,7 +16984,7 @@ "ndQ" = ( /obj/structure/machinery/recharge_station, /turf/open/floor/prison/whitepurple/northeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "ndZ" = ( /obj/structure/machinery/constructable_frame{ icon_state = "box_1" @@ -17238,11 +17051,6 @@ }, /turf/open/floor/prison/whitegreen/north, /area/fiorina/station/medbay) -"nfA" = ( -/obj/structure/platform, -/obj/item/stack/sheet/metal, -/turf/open/floor/plating/prison, -/area/fiorina/station/security) "nfF" = ( /obj/structure/prop/structure_lattice{ dir = 4 @@ -17263,26 +17071,32 @@ "ngg" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison/bluefull, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "ngn" = ( /obj/structure/machinery/deployable/barrier, /turf/open/floor/prison/redfull, /area/fiorina/station/security) +"ngo" = ( +/obj/structure/platform/metal/kutjevo_smooth/north, +/obj/structure/platform/metal/kutjevo_smooth/west, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/turf/open/space, +/area/fiorina/oob) "ngF" = ( /obj/item/device/flashlight/lamp/tripod, /obj/structure/machinery/light/double/blue, /turf/open/floor/prison/whitepurple, -/area/fiorina/station/research_cells) -"nho" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/wood, -/area/fiorina/station/park) +/area/fiorina/station/research_cells/west) +"nhm" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/northeast, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/power_ring) "nhM" = ( /obj/structure/barricade/handrail/type_b{ layer = 3.5 @@ -17325,7 +17139,13 @@ dir = 8 }, /turf/open/organic/grass/astroturf, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) +"niZ" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform_decoration/metal/almayer/northwest, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) "njg" = ( /obj/effect/spawner/random/gun/rifle/lowchance, /turf/open/floor/prison/darkyellow2/west, @@ -17379,7 +17199,15 @@ /obj/structure/surface/table/reinforced/prison, /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) +"nkw" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_ew_full_cap" + }, +/obj/structure/platform/metal/stair_cut/platform_left, +/turf/open/floor/plating/prison, +/area/fiorina/station/disco/east_disco) "nkF" = ( /turf/open/floor/prison/cell_stripe/west, /area/fiorina/station/park) @@ -17402,6 +17230,19 @@ }, /turf/open/organic/grass/astroturf, /area/fiorina/tumor/fiberbush) +"nlT" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/northwest, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/power_ring) +"nlX" = ( +/obj/structure/bed{ + icon_state = "abed" + }, +/obj/effect/landmark/corpsespawner/prisoner, +/turf/open/floor/prison/whitepurple/southeast, +/area/fiorina/station/research_cells/east) "nmh" = ( /obj/structure/window{ dir = 1 @@ -17414,10 +17255,10 @@ icon = 'icons/obj/structures/doors/prepdoor_charlie.dmi' }, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "nmm" = ( /turf/open/organic/grass/astroturf, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "nmy" = ( /obj/structure/machinery/space_heater, /turf/open/floor/prison/sterile_white/southwest, @@ -17432,12 +17273,6 @@ }, /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/station/medbay) -"nmM" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/prison/bluefull, -/area/fiorina/station/power_ring) "nmT" = ( /obj/item/toy/crayon/blue, /turf/open/floor/plating/prison, @@ -17447,7 +17282,7 @@ icon_state = "p_stair_full" }, /turf/open/floor/plating/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "nny" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/trash/cigbutt/bcigbutt, @@ -17458,17 +17293,6 @@ /obj/effect/spawner/random/tool, /turf/open/floor/prison/floor_plate, /area/fiorina/station/power_ring) -"nnG" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform, -/obj/structure/platform_decoration{ - dir = 6 - }, -/obj/structure/closet/emcloset, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) "noa" = ( /obj/structure/largecrate/supply/supplies/plasteel, /turf/open/floor/plating/prison, @@ -17484,12 +17308,6 @@ }, /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/station/medbay) -"noz" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/prison, -/area/fiorina/station/transit_hub) "npx" = ( /obj/structure/barricade/handrail/type_b{ dir = 4; @@ -17506,16 +17324,6 @@ "nqN" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/security) -"nrd" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform, -/obj/structure/platform_decoration{ - dir = 10 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/botany) "nre" = ( /obj/item/stack/rods, /turf/open/floor/plating/prison, @@ -17549,7 +17357,7 @@ icon_state = "p_stair_sn_full_cap" }, /turf/open/floor/plating/plating_catwalk/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "nsD" = ( /obj/structure/prop/structure_lattice{ dir = 4; @@ -17565,6 +17373,12 @@ "ntc" = ( /turf/open/floor/prison/green/east, /area/fiorina/tumor/civres) +"nte" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform/metal/almayer, +/obj/structure/platform_decoration/metal/almayer/southeast, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/botany) "ntf" = ( /obj/item/implanter/compressed, /obj/structure/safe, @@ -17574,33 +17388,28 @@ "ntv" = ( /obj/structure/window/framed/prison, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "ntw" = ( /turf/open/floor/prison/cell_stripe/west, /area/fiorina/lz/near_lzI) "ntx" = ( /turf/open/floor/prison/yellow/north, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "ntE" = ( /obj/structure/barricade/handrail/type_b, /turf/open/floor/prison/floor_plate, /area/fiorina/station/disco) -"ntH" = ( -/obj/structure/ice/thin/indestructible{ - dir = 8; - icon_state = "Straight" - }, -/obj/structure/blocker/invisible_wall, -/obj/structure/platform{ - dir = 1; - layer = 2.1 - }, -/turf/open/ice/noweed, -/area/fiorina/tumor/ice_lab) "ntM" = ( /obj/structure/machinery/space_heater, /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/station/medbay) +"ntW" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/machinery/autolathe/full{ + layer = 2.98 + }, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) "ntZ" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -17634,14 +17443,6 @@ }, /turf/open/floor/prison/sterile_white/southwest, /area/fiorina/station/medbay) -"nuX" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/turf/open/floor/plating/prison, -/area/fiorina/station/telecomm/lz1_tram) "nvi" = ( /obj/structure/barricade/wooden{ dir = 1 @@ -17652,15 +17453,13 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/prison/bluecorner/north, /area/fiorina/station/chapel) -"nvs" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/effect/decal/medical_decals{ - icon_state = "triagedecaldir" +"nvx" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, -/turf/open/floor/prison/whitegreenfull/southwest, -/area/fiorina/station/medbay) +/turf/open/floor/prison, +/area/fiorina/station/disco/east_disco) "nvD" = ( /turf/closed/wall/r_wall/prison, /area/fiorina/station/botany) @@ -17672,10 +17471,29 @@ "nvX" = ( /turf/open/floor/prison/blue/west, /area/fiorina/station/power_ring) +"nvZ" = ( +/obj/structure/barricade/handrail/type_b{ + dir = 4; + layer = 3.5 + }, +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/disco) "nwv" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /turf/open/floor/prison/darkbrown2/west, /area/fiorina/tumor/aux_engi) +"nwA" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/obj/structure/barricade/handrail/type_b{ + layer = 3.4 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/medbay) "nwS" = ( /obj/structure/largecrate/random/barrel/green, /turf/open/floor/prison/darkyellowfull2/east, @@ -17707,6 +17525,9 @@ }, /turf/open/floor/prison, /area/fiorina/station/chapel) +"nxC" = ( +/turf/closed/wall/r_wall/prison_unmeltable, +/area/fiorina/station/power_ring/reactor) "nxW" = ( /obj/structure/machinery/light/double/blue{ pixel_y = -1 @@ -17725,11 +17546,6 @@ /obj/item/clothing/gloves/latex, /turf/open/floor/prison/redfull, /area/fiorina/station/medbay) -"nyq" = ( -/obj/structure/platform, -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/whitegreen, -/area/fiorina/station/medbay) "nyC" = ( /obj/item/stack/rods/plasteel, /turf/open/floor/prison/floorscorched2, @@ -17739,7 +17555,7 @@ icon_state = "pottedplant_22" }, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "nyO" = ( /obj/structure/machinery/light/double/blue{ dir = 8; @@ -17748,16 +17564,6 @@ }, /turf/open/floor/prison, /area/fiorina/lz/near_lzII) -"nyS" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/item/tool/extinguisher/mini, -/turf/open/floor/plating/prison, -/area/fiorina/station/security) "nzf" = ( /obj/structure/machinery/processor, /obj/effect/decal/cleanable/blood{ @@ -17805,14 +17611,14 @@ "nAs" = ( /obj/structure/inflatable, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "nAK" = ( /turf/open/floor/prison/yellowcorner/north, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "nAV" = ( /obj/structure/machinery/fuelcell_recycler/full, /turf/open/floor/prison/bluecorner/west, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "nBb" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -17853,6 +17659,18 @@ /obj/item/stack/rods, /turf/open/floor/prison/yellow/northeast, /area/fiorina/station/disco) +"nCS" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_ew_full_cap" + }, +/obj/structure/platform/metal/stair_cut/platform_left, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/plating/prison, +/area/fiorina/lz/near_lzI) "nCV" = ( /obj/item/ammo_casing{ icon_state = "casing_7_1" @@ -17874,6 +17692,13 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) +"nDu" = ( +/obj/structure/toilet{ + dir = 4; + pixel_y = 8 + }, +/turf/open/floor/prison/yellow/northwest, +/area/fiorina/station/lowsec/east) "nDI" = ( /obj/item/stack/tile/plasteel, /turf/open/floor/prison/floor_plate, @@ -17894,13 +17719,13 @@ /obj/item/clothing/glasses/material, /obj/structure/barricade/handrail, /turf/open/organic/grass/astroturf, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "nEP" = ( /obj/structure/closet, /obj/item/reagent_container/spray/cleaner, /obj/item/stack/sheet/plasteel/small_stack, /turf/open/floor/prison, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "nEW" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/communications{ @@ -17933,12 +17758,14 @@ }, /turf/open/floor/prison, /area/fiorina/lz/near_lzI) -"nGp" = ( -/obj/structure/platform_decoration{ - dir = 1 +"nGf" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_ew_full_cap" }, -/turf/open/floor/prison, -/area/fiorina/station/disco) +/obj/structure/platform/metal/stair_cut/platform_left, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) "nGy" = ( /obj/item/newspaper, /turf/open/floor/wood, @@ -17946,21 +17773,21 @@ "nGB" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/prison/yellow/southeast, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "nGO" = ( /obj/structure/largecrate/random/barrel/yellow, /obj/structure/machinery/light/double/blue{ pixel_y = -1 }, /turf/open/floor/prison/yellow/southwest, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "nGV" = ( /obj/structure/machinery/light/double/blue{ dir = 1; pixel_y = 21 }, /turf/open/floor/prison/whitepurple/northeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "nGZ" = ( /turf/open/floor/prison, /area/fiorina/lz/near_lzI) @@ -18006,12 +17833,17 @@ }, /turf/open/floor/prison/darkredfull2, /area/fiorina/station/security) -"nJq" = ( -/obj/structure/platform{ - dir = 1 +"nIJ" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/transit_hub) +/turf/open/floor/plating/prison, +/area/fiorina/station/power_ring) +"nIU" = ( +/obj/structure/machinery/door/airlock/prison_hatch/autoname, +/turf/open/floor/plating/prison, +/area/fiorina/station/lowsec/east) "nJu" = ( /obj/item/stack/rods, /turf/open/floor/prison, @@ -18025,19 +17857,7 @@ dir = 1 }, /turf/open/floor/prison/bluefull, -/area/fiorina/station/power_ring) -"nKl" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 9 - }, -/turf/open/gm/river/desert/deep, -/area/fiorina/lz/near_lzII) +/area/fiorina/station/power_ring/reactor) "nKo" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/microwave{ @@ -18062,6 +17882,18 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) +"nKZ" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/turf/open/floor/plating/prison, +/area/fiorina/station/security) +"nLO" = ( +/obj/structure/window/framed/prison/reinforced/hull, +/turf/open/floor/plating/prison, +/area/fiorina/station/research_cells/east) "nLS" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/condiment/saltshaker{ @@ -18099,16 +17931,6 @@ "nMp" = ( /turf/open/floor/prison/greenblue/east, /area/fiorina/station/botany) -"nMz" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/prison/whitegreenfull/southwest, -/area/fiorina/station/central_ring) "nMI" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -18240,34 +18062,13 @@ }, /turf/open/floor/prison/darkyellowfull2/east, /area/fiorina/station/flight_deck) -"nRT" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = 13 - }, -/turf/open/floor/prison/whitegreen/southwest, -/area/fiorina/station/medbay) "nRU" = ( /obj/structure/closet/emcloset, /turf/open/floor/prison/whitegreen/southeast, /area/fiorina/station/medbay) -"nSh" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/prison, -/area/fiorina/station/transit_hub) "nSx" = ( /turf/closed/wall/r_wall/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "nSS" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/dropper, @@ -18301,6 +18102,9 @@ }, /turf/open/floor/prison, /area/fiorina/station/park) +"nUh" = ( +/turf/open/floor/prison/yellow/west, +/area/fiorina/station/lowsec/east) "nUm" = ( /obj/structure/barricade/wooden, /turf/open/floor/prison/floor_plate, @@ -18345,11 +18149,14 @@ }, /obj/structure/largecrate/random/case/double, /turf/open/floor/prison/whitepurple/southeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "nVE" = ( /obj/item/stack/tile/plasteel, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) +"nVK" = ( +/turf/open/floor/prison/whitepurple/north, +/area/fiorina/station/research_cells/east) "nVN" = ( /obj/item/trash/cigbutt, /turf/open/floor/prison/floor_plate, @@ -18430,20 +18237,10 @@ /obj/item/tool/wrench, /turf/open/floor/prison/floor_plate, /area/fiorina/tumor/aux_engi) -"nYT" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/turf/open/space/basic, -/area/fiorina/oob) +"nYQ" = ( +/obj/structure/platform/metal/almayer, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/power_ring) "nZB" = ( /turf/open/floor/prison/floor_plate, /area/fiorina/lz/near_lzII) @@ -18468,16 +18265,14 @@ "oaa" = ( /turf/open/floor/prison/floor_plate/southwest, /area/fiorina/station/flight_deck) +"oaD" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/prison/whitegreen/north, +/area/fiorina/station/medbay) "obh" = ( /obj/structure/window/framed/prison/reinforced, /turf/open/floor/prison, /area/fiorina/station/security) -"oby" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/prison/greenfull/northwest, -/area/fiorina/station/botany) "obz" = ( /obj/structure/machinery/computer/arcade, /turf/open/floor/plating/prison, @@ -18492,6 +18287,14 @@ }, /turf/closed/wall/prison, /area/fiorina/tumor/civres) +"obQ" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/prison, +/area/fiorina/station/telecomm/lz1_tram) "occ" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/drinks/cans/souto/lime{ @@ -18519,6 +18322,16 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) +"ocW" = ( +/obj/structure/platform/metal/kutjevo_smooth/north, +/obj/structure/platform/metal/kutjevo_smooth/east, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/turf/open/space, +/area/fiorina/oob) "ode" = ( /obj/structure/stairs/perspective{ dir = 8; @@ -18544,7 +18357,14 @@ "odQ" = ( /obj/structure/largecrate/supply, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) +"oeh" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 12 + }, +/turf/open/floor/prison/yellow/southeast, +/area/fiorina/station/lowsec/east) "oer" = ( /turf/open/floor/prison/darkbrown2, /area/fiorina/station/park) @@ -18589,19 +18409,6 @@ /obj/structure/machinery/newscaster, /turf/closed/wall/prison, /area/fiorina/station/transit_hub) -"ofA" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_ew_full_cap" - }, -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/power_ring) "ofQ" = ( /obj/structure/machinery/power/apc/power/north, /turf/open/floor/plating/plating_catwalk/prison, @@ -18612,6 +18419,10 @@ }, /turf/open/floor/prison/whitegreen/northeast, /area/fiorina/station/medbay) +"ogc" = ( +/obj/item/reagent_container/food/drinks/cans/aspen, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/lowsec/east) "ogf" = ( /obj/structure/monorail{ name = "launch track" @@ -18630,14 +18441,14 @@ /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/prison/darkpurple2/north, /area/fiorina/station/central_ring) +"oht" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/plating/prison, +/area/fiorina/lz/near_lzI) "ohx" = ( /obj/item/tool/match, /turf/open/floor/prison/redfull, /area/fiorina/station/security) -"ohF" = ( -/obj/structure/platform/kutjevo/smooth, -/turf/closed/wall/mineral/bone_resin, -/area/fiorina/tumor/ice_lab) "ohY" = ( /obj/item/circuitboard/machine/pacman/super, /obj/structure/machinery/constructable_frame{ @@ -18771,13 +18582,13 @@ pixel_y = -10 }, /turf/open/ice/noweed, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "okG" = ( /obj/structure/barricade/deployable{ dir = 4 }, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "okJ" = ( /obj/structure/machinery/shower{ pixel_y = 13 @@ -18786,7 +18597,15 @@ dir = 8 }, /turf/open/floor/prison/kitchen, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) +"okQ" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/turf/open/floor/prison/bright_clean_marked/southwest, +/area/fiorina/station/power_ring) "okT" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/plating/prison, @@ -18829,6 +18648,13 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/telecomm/lz2_maint) +"olB" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" + }, +/turf/open/floor/plating/prison, +/area/fiorina/tumor/ice_lab) "omb" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/machinery/computer/guestpass, @@ -18851,12 +18677,6 @@ /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/plating/prison, /area/fiorina/station/transit_hub) -"omN" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/botany) "omO" = ( /obj/structure/barricade/wooden, /turf/open/floor/prison/cell_stripe, @@ -18881,12 +18701,6 @@ }, /turf/open/floor/prison/redfull, /area/fiorina/station/security) -"ont" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/prison/bluefull, -/area/fiorina/station/power_ring) "onB" = ( /obj/structure/closet/secure_closet/engineering_personal, /obj/item/device/multitool, @@ -18903,13 +18717,7 @@ pixel_y = 13 }, /turf/open/floor/prison/kitchen, -/area/fiorina/station/research_cells) -"ooq" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/prison/yellow/northeast, -/area/fiorina/station/disco) +/area/fiorina/station/research_cells/west) "oou" = ( /obj/structure/closet/emcloset, /obj/item/clothing/head/cmcap{ @@ -18924,7 +18732,7 @@ "oox" = ( /obj/structure/bed/chair, /turf/open/floor/prison/bluecorner, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "ooF" = ( /obj/structure/machinery/power/apc/power/south, /turf/open/floor/wood, @@ -18932,7 +18740,15 @@ "ooO" = ( /obj/item/storage/briefcase/inflatable, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) +"ope" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/plating/prison, +/area/fiorina/station/power_ring) "oph" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/reagent_container/food/drinks/bottle/holywater, @@ -18942,7 +18758,7 @@ "opj" = ( /obj/effect/decal/cleanable/blood/gibs, /turf/open/floor/prison/yellow/east, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "opM" = ( /obj/structure/bed/chair, /turf/open/floor/prison/bluefull, @@ -18974,12 +18790,6 @@ /obj/effect/spawner/random/tool, /turf/open/floor/prison/green/west, /area/fiorina/station/chapel) -"orB" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/prison/darkpurple2, -/area/fiorina/tumor/servers) "orC" = ( /obj/structure/machinery/vending/sovietsoda, /turf/open/floor/prison/greenfull/northwest, @@ -18996,17 +18806,18 @@ /obj/item/tool/weldingtool, /turf/open/auto_turf/sand/layer1, /area/fiorina/tumor/civres) -"osv" = ( -/obj/structure/platform_decoration{ - dir = 1 +"osu" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_ew_full_cap" }, -/turf/open/floor/prison/darkbrowncorners2/west, -/area/fiorina/station/park) +/obj/structure/platform/metal/stair_cut/platform_right, +/turf/open/floor/plating/prison, +/area/fiorina/station/transit_hub) "osN" = ( /obj/structure/closet/bodybag, /obj/effect/decal/cleanable/blood/gibs/limb, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "osQ" = ( /obj/structure/bed{ icon_state = "abed" @@ -19014,6 +18825,14 @@ /obj/item/bedsheet/green, /turf/open/floor/prison/yellow/southwest, /area/fiorina/station/lowsec) +"osS" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/security) "osX" = ( /obj/structure/cable/heavyduty{ icon_state = "0-4" @@ -19046,6 +18865,10 @@ "otK" = ( /turf/open/floor/prison/floor_marked/west, /area/fiorina/tumor/servers) +"otS" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/plating/prison, +/area/fiorina/lz/near_lzI) "ouH" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/med_data/laptop{ @@ -19053,12 +18876,10 @@ }, /turf/open/floor/plating/plating_catwalk, /area/fiorina/tumor/ship) -"ove" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/prison, -/area/fiorina/station/park) +"ovb" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/floor/prison/whitegreen, +/area/fiorina/station/medbay) "ovk" = ( /obj/effect/spawner/random/tool, /turf/open/floor/prison/whitegreencorner/east, @@ -19079,6 +18900,10 @@ }, /turf/open/floor/prison/chapel_carpet/doubleside/north, /area/fiorina/station/chapel) +"owc" = ( +/obj/structure/window/framed/prison, +/turf/open/floor/plating/prison, +/area/fiorina/station/disco/east_disco) "owd" = ( /obj/item/storage/backpack/souto, /turf/open/floor/prison, @@ -19087,6 +18912,16 @@ /obj/effect/landmark/static_comms/net_two, /turf/open/floor/prison/floor_plate, /area/fiorina/lz/near_lzII) +"owz" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/prison/greenblue/southeast, +/area/fiorina/station/botany) +"owI" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/northeast, +/turf/open/floor/prison/bluefull, +/area/fiorina/station/chapel) "owS" = ( /obj/structure/machinery/light/double/blue{ dir = 8; @@ -19094,17 +18929,7 @@ pixel_y = 13 }, /turf/open/floor/prison/whitepurple/west, -/area/fiorina/station/research_cells) -"oxp" = ( -/obj/structure/platform{ - dir = 4; - layer = 2 - }, -/obj/structure/machinery/door/airlock/prison_hatch/autoname{ - dir = 1 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/tumor/ice_lab) +/area/fiorina/station/research_cells/west) "oxv" = ( /obj/effect/alien/weeds/node, /turf/open/floor/prison/floor_plate, @@ -19118,6 +18943,14 @@ /obj/structure/largecrate/random/case/small, /turf/open/floor/corsat/plate, /area/fiorina/tumor/aux_engi) +"oxR" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/turf/open/floor/prison, +/area/fiorina/tumor/servers) "oxS" = ( /obj/item/paper/crumpled/bloody, /turf/open/floor/prison/chapel_carpet/doubleside, @@ -19129,18 +18962,6 @@ /obj/item/stack/sheet/metal, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"oyk" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 5 - }, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) "oyo" = ( /obj/structure/flora/pottedplant/random, /turf/open/floor/prison/kitchen/southwest, @@ -19150,7 +18971,7 @@ icon_state = "abed" }, /turf/open/floor/prison/whitepurple/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "oyC" = ( /obj/structure/bed/sofa/south/grey/right, /turf/open/floor/wood, @@ -19162,14 +18983,6 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) -"oyO" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/turf/open/floor/prison/bright_clean_marked/southwest, -/area/fiorina/station/power_ring) "oyS" = ( /obj/structure/bed/sofa/south/grey/left, /turf/open/floor/prison, @@ -19184,6 +18997,11 @@ }, /turf/open/floor/prison/sterile_white/southwest, /area/fiorina/station/medbay) +"ozB" = ( +/obj/structure/platform/metal/kutjevo_smooth/north, +/obj/structure/platform/metal/kutjevo_smooth/west, +/turf/open/space, +/area/fiorina/oob) "ozC" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_29"; @@ -19201,6 +19019,10 @@ }, /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/station/medbay) +"oBc" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/power_ring) "oBj" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/plating/prison, @@ -19212,22 +19034,30 @@ }, /obj/structure/blocker/invisible_wall, /turf/open/ice/noweed, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "oCe" = ( /turf/closed/wall/r_wall/prison, /area/fiorina/station/park) -"oCn" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 9 +"oCf" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/machinery/light/double/blue{ + pixel_y = -1 }, /turf/open/floor/prison/floor_plate, +/area/fiorina/station/disco) +"oCH" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/floor/prison, /area/fiorina/station/park) +"oCM" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/prison/yellow/northeast, +/area/fiorina/station/disco/east_disco) "oDe" = ( /obj/effect/landmark/monkey_spawn, /turf/open/floor/plating/prison, @@ -19257,7 +19087,7 @@ pixel_y = 21 }, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "oDV" = ( /obj/item/stack/rods, /turf/open/floor/prison/whitegreen/west, @@ -19275,18 +19105,16 @@ }, /turf/open/organic/grass/astroturf, /area/fiorina/station/civres_blue) -"oEu" = ( -/obj/structure/platform_decoration, -/obj/item/shard{ - icon_state = "medium"; - name = "ice shard" - }, -/turf/open/floor/prison/whitegreen, -/area/fiorina/tumor/ice_lab) "oED" = ( /obj/effect/landmark/monkey_spawn, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) +"oEE" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/northeast, +/turf/open/gm/river/desert/deep, +/area/fiorina/lz/near_lzII) "oEH" = ( /obj/structure/stairs/perspective{ dir = 4; @@ -19368,16 +19196,6 @@ /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /turf/open/floor/prison/darkbrown2/east, /area/fiorina/tumor/aux_engi) -"oGy" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/tumor/ice_lab) "oGR" = ( /obj/structure/machinery/landinglight/ds1/delaythree{ dir = 1 @@ -19391,10 +19209,14 @@ }, /turf/open/floor/carpet, /area/fiorina/station/civres_blue) +"oHe" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/wood, +/area/fiorina/station/park) "oHi" = ( /obj/item/stool, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "oHm" = ( /turf/open/floor/prison/darkbrown2/northeast, /area/fiorina/tumor/aux_engi) @@ -19406,18 +19228,6 @@ /obj/structure/blocker/invisible_wall, /turf/open/ice/noweed, /area/fiorina/tumor/ice_lab) -"oIq" = ( -/obj/structure/ice/thin/indestructible{ - dir = 1; - icon_state = "Corner" - }, -/obj/structure/blocker/invisible_wall, -/obj/structure/platform{ - dir = 1; - layer = 2.1 - }, -/turf/open/ice/noweed, -/area/fiorina/tumor/ice_lab) "oIz" = ( /obj/structure/surface/rack, /obj/item/storage/toolbox/mechanical/green, @@ -19473,14 +19283,6 @@ /obj/item/stack/sandbags/large_stack, /turf/open/floor/prison/green/southeast, /area/fiorina/tumor/civres) -"oKf" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/turf/open/floor/plating/prison, -/area/fiorina/station/park) "oKn" = ( /obj/structure/holohoop{ dir = 4; @@ -19491,7 +19293,7 @@ dir = 8 }, /turf/open/organic/grass/astroturf, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "oKq" = ( /obj/effect/landmark/objective_landmark/close, /turf/open/floor/plating/prison, @@ -19500,6 +19302,9 @@ /obj/structure/machinery/door/airlock/multi_tile/elevator/freight, /turf/open/floor/corsat/plate, /area/fiorina/station/civres_blue) +"oLE" = ( +/turf/open/floor/prison, +/area/fiorina/station/lowsec/showers_laundry) "oLF" = ( /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison/darkbrown2, @@ -19517,7 +19322,7 @@ /obj/structure/surface/rack, /obj/item/tank/emergency_oxygen/engi, /turf/open/floor/prison/bluecorner, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "oMf" = ( /obj/structure/bed/chair/comfy, /turf/open/floor/prison/floor_plate, @@ -19538,7 +19343,23 @@ pixel_y = -1 }, /turf/open/floor/prison/whitepurple/northeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) +"oMI" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/east, +/obj/effect/decal/cleanable/blood/splatter{ + icon_state = "gibup1" + }, +/turf/open/floor/prison/whitegreen/north, +/area/fiorina/station/medbay) +"oMW" = ( +/turf/open/floor/prison/yellow, +/area/fiorina/station/lowsec/showers_laundry) +"oNn" = ( +/obj/structure/platform/metal/almayer, +/obj/item/stack/sheet/metal, +/turf/open/floor/plating/prison, +/area/fiorina/station/security) "oNu" = ( /obj/structure/barricade/handrail/type_b{ layer = 3.4 @@ -19550,21 +19371,11 @@ dir = 4 }, /turf/open/organic/grass/astroturf, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "oNC" = ( /obj/structure/inflatable, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) -"oOg" = ( -/obj/structure/barricade/handrail/type_b{ - dir = 4; - layer = 3.5 - }, -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/disco) +/area/fiorina/station/research_cells/west) "oOh" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/cameras{ @@ -19580,14 +19391,6 @@ /obj/effect/decal/hefa_cult_decals/d32, /turf/open/floor/prison/chapel_carpet/doubleside/north, /area/fiorina/maintenance) -"oOk" = ( -/obj/structure/platform, -/obj/structure/bed/chair{ - dir = 1; - layer = 2.7 - }, -/turf/open/floor/prison/whitegreen, -/area/fiorina/station/medbay) "oOp" = ( /obj/structure/machinery/power/smes/buildable{ capacity = 1e+006; @@ -19606,7 +19409,7 @@ pixel_y = 16 }, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "oOV" = ( /obj/structure/machinery/filtration/console{ pixel_y = 22 @@ -19617,10 +19420,14 @@ /obj/structure/bed/roller, /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/station/medbay) +"oPH" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/prison/yellow/northeast, +/area/fiorina/station/disco/east_disco) "oPN" = ( /obj/structure/inflatable/popped/door, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "oPR" = ( /turf/open/floor/prison/floor_plate, /area/fiorina/station/disco) @@ -19635,6 +19442,14 @@ /obj/structure/inflatable/popped, /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/station/medbay) +"oQp" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_ew_full_cap" + }, +/obj/structure/platform/metal/stair_cut/platform_left, +/turf/open/floor/plating/prison, +/area/fiorina/station/power_ring/reactor) "oQI" = ( /obj/item/prop/helmetgarb/spacejam_tickets{ desc = "Low security prisoners would smuggle in arcade tickets after visitations. The tickets act as a stand in for paper currency in the prison economy, they're backed by the cigarette standard, since one ticket nets one cigarette at the prize booth. The cigarettes also get smuggled back in."; @@ -19650,7 +19465,7 @@ pixel_y = 21 }, /turf/open/floor/prison/floor_plate/southwest, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "oRg" = ( /turf/open/floor/prison/darkyellow2/north, /area/fiorina/station/telecomm/lz1_cargo) @@ -19661,7 +19476,7 @@ "oSn" = ( /obj/structure/inflatable/door, /turf/open/floor/prison/yellow/northeast, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "oSz" = ( /obj/item/shard{ icon_state = "medium" @@ -19680,6 +19495,13 @@ "oTi" = ( /turf/open/floor/prison/whitegreen, /area/fiorina/station/medbay) +"oTx" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/prison/bright_clean2/southwest, +/area/fiorina/station/power_ring/reactor) "oTy" = ( /obj/structure/prop/structure_lattice{ health = 300 @@ -19700,25 +19522,16 @@ }, /turf/open/organic/grass/astroturf, /area/fiorina/station/civres_blue) +"oTL" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison/yellow/north, +/area/fiorina/station/lowsec/showers_laundry) "oTP" = ( /turf/open/floor/prison/darkyellow2/southwest, /area/fiorina/station/telecomm/lz1_tram) -"oTS" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/central_ring) -"oTT" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/prison, -/area/fiorina/station/park) "oUg" = ( /turf/closed/wall/prison, /area/fiorina/station/telecomm/lz1_cargo) @@ -19739,7 +19552,7 @@ "oWC" = ( /obj/item/stack/sandbags/large_stack, /turf/open/floor/prison/yellow/northeast, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "oWF" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname, /turf/open/floor/plating/prison, @@ -19775,15 +19588,6 @@ /obj/item/reagent_container/food/drinks/cans/aspen, /turf/open/floor/prison/yellow/southwest, /area/fiorina/station/lowsec) -"oXI" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/decal/medical_decals{ - icon_state = "docdecal1" - }, -/turf/open/floor/prison/whitegreenfull/southwest, -/area/fiorina/station/medbay) "oXR" = ( /obj/structure/ice/thin/indestructible{ dir = 8; @@ -19825,6 +19629,12 @@ }, /turf/open/floor/prison/darkpurplefull2, /area/fiorina/tumor/servers) +"oYX" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/northwest, +/turf/open/floor/prison/whitegreen/northeast, +/area/fiorina/tumor/ice_lab) "oZf" = ( /obj/structure/surface/rack, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, @@ -19837,7 +19647,7 @@ "oZj" = ( /obj/effect/landmark/survivor_spawner, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "oZk" = ( /turf/open/floor/prison/darkpurple2/southwest, /area/fiorina/tumor/ice_lab) @@ -19848,12 +19658,6 @@ }, /turf/open/floor/prison, /area/fiorina/station/flight_deck) -"oZy" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/security) "oZz" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/door/window/eastright, @@ -19872,7 +19676,7 @@ "oZU" = ( /obj/structure/largecrate/random/case, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "pab" = ( /obj/item/tool/weldpack{ pixel_x = 6 @@ -19889,19 +19693,17 @@ }, /turf/open/floor/prison/whitegreen, /area/fiorina/station/medbay) -"pah" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) "pai" = ( /obj/structure/machinery/cm_vending/sorted/marine_food{ desc = "Prison meal vendor, containing preprepared meals fit for the dregs of society."; name = "\improper Fiorina Green Block Canteen Vendor" }, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) +"pak" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/prison/whitegreenfull/southwest, +/area/fiorina/tumor/ice_lab) "paF" = ( /obj/item/tool/shovel/etool, /turf/open/floor/prison/floor_plate, @@ -19919,6 +19721,10 @@ }, /turf/open/floor/prison/darkredfull2, /area/fiorina/station/security) +"pbo" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/prison/chapel_carpet/doubleside, +/area/fiorina/station/chapel) "pbp" = ( /obj/structure/machinery/door/airlock/multi_tile/elevator/freight, /turf/open/floor/corsat/plate, @@ -19934,20 +19740,6 @@ }, /turf/open/floor/prison/floor_plate, /area/fiorina/tumor/servers) -"pbV" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/turf/open/space, -/area/fiorina/oob) "pbX" = ( /turf/open/floor/prison/red, /area/fiorina/station/security) @@ -19971,7 +19763,13 @@ /obj/structure/surface/table/reinforced/prison, /obj/effect/spawner/random/tool, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) +"pdq" = ( +/obj/vehicle/powerloader, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/plating/prison, +/area/fiorina/station/power_ring) "pdB" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -20035,7 +19833,7 @@ "pho" = ( /obj/item/stack/sheet/wood, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "phz" = ( /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) @@ -20043,28 +19841,22 @@ /obj/item/newspaper, /turf/open/floor/prison/whitegreen/north, /area/fiorina/tumor/ice_lab) -"phQ" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/prison/whitegreen/west, -/area/fiorina/tumor/ice_lab) "pim" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname, /turf/open/floor/prison/redfull, -/area/fiorina/station/lowsec) -"piw" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform_decoration{ - dir = 9 - }, -/obj/structure/platform{ - dir = 4 +/area/fiorina/station/lowsec/east) +"piC" = ( +/obj/structure/platform/metal/kutjevo_smooth, +/turf/closed/wall/mineral/bone_resin, +/area/fiorina/tumor/ice_lab) +"piV" = ( +/obj/item/shard{ + icon_state = "large"; + name = "ice shard" }, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/prison/whitegreen/west, +/area/fiorina/tumor/ice_lab) "pjf" = ( /obj/item/ammo_magazine/rifle/m16, /obj/item/clothing/head/helmet/marine/veteran/ua_riot, @@ -20156,6 +19948,10 @@ "pnh" = ( /turf/open/floor/prison/darkyellowfull2/east, /area/fiorina/tumor/servers) +"pnn" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) "pnx" = ( /obj/effect/landmark/xeno_spawn, /turf/open/floor/prison, @@ -20163,15 +19959,26 @@ "pnP" = ( /obj/effect/landmark/corpsespawner/ua_riot, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "pnS" = ( /obj/structure/surface/table/reinforced/prison, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/tumor/servers) +"pom" = ( +/obj/structure/platform/metal/kutjevo_smooth/east, +/obj/structure/platform/metal/kutjevo_smooth/north, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/fiorina/oob) "poC" = ( /obj/structure/machinery/photocopier, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "ppq" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/flora/pottedplant{ @@ -20212,7 +20019,7 @@ "pqz" = ( /obj/item/clothing/suit/storage/labcoat, /turf/open/organic/grass/astroturf, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "pqC" = ( /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, @@ -20237,15 +20044,6 @@ /obj/structure/machinery/autolathe/medilathe/full, /turf/open/floor/prison/floor_plate, /area/fiorina/station/medbay) -"prG" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/surface/rack, -/obj/item/stack/flag/yellow, -/obj/item/stack/flag/yellow, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) "prL" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/space_heater{ @@ -20272,10 +20070,12 @@ }, /turf/open/floor/prison/floor_plate, /area/fiorina/station/central_ring) -"psx" = ( -/obj/structure/platform, -/turf/open/floor/prison/cell_stripe/west, -/area/fiorina/station/botany) +"psG" = ( +/obj/structure/machinery/light/double/blue{ + pixel_y = -1 + }, +/turf/open/floor/prison/darkpurplefull2, +/area/fiorina/station/research_cells/east) "psL" = ( /obj/structure/machinery/optable{ desc = "This maybe could be used for advanced medical procedures."; @@ -20315,6 +20115,14 @@ /obj/item/clothing/gloves/latex, /turf/open/floor/prison/redfull, /area/fiorina/station/medbay) +"pud" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/plating/prison, +/area/fiorina/station/medbay) "puw" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/plating/prison, @@ -20346,7 +20154,7 @@ "pvE" = ( /obj/item/clothing/under/color/orange, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "pvF" = ( /turf/open/floor/prison/whitegreencorner, /area/fiorina/tumor/ice_lab) @@ -20385,20 +20193,20 @@ }, /turf/open/floor/prison/redfull, /area/fiorina/station/security) +"pxu" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/plating/prison, +/area/fiorina/station/transit_hub) "pxL" = ( /turf/open/floor/prison/darkbrown2/east, /area/fiorina/maintenance) -"pxW" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/obj/item/tool/pickaxe, -/turf/open/floor/prison/whitegreen, -/area/fiorina/tumor/ice_lab) "pxX" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/prison/whitepurple/southeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "pyK" = ( /obj/structure/machinery/door/airlock/multi_tile/elevator/freight, /turf/open/floor/corsat/plate, @@ -20432,6 +20240,18 @@ /obj/effect/spawner/random/tool, /turf/open/floor/prison/green/east, /area/fiorina/station/chapel) +"pBj" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/stair_cut/platform_right, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison/floor_plate/southwest, +/area/fiorina/station/disco/east_disco) "pBq" = ( /obj/structure/largecrate/random/barrel/white, /turf/open/floor/plating/prison, @@ -20487,7 +20307,7 @@ pixel_y = 6 }, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "pCX" = ( /obj/item/stack/sheet/metal, /turf/open/floor/plating/prison, @@ -20497,7 +20317,7 @@ icon = 'icons/obj/structures/doors/2x1prepdoor_charlie.dmi' }, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "pDQ" = ( /obj/structure/bed/sofa/south/grey/right, /turf/open/floor/prison/redfull, @@ -20509,16 +20329,18 @@ /obj/structure/machinery/vending/snack, /turf/open/floor/prison/floor_plate, /area/fiorina/station/medbay) -"pFi" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/plating/plating_catwalk/prison, -/area/fiorina/station/telecomm/lz1_tram) "pFA" = ( /obj/item/storage/toolbox/emergency, /turf/open/organic/grass/astroturf, /area/fiorina/tumor/fiberbush) +"pFB" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/gm/river/red_pool, +/area/fiorina/station/park) +"pFE" = ( +/obj/structure/platform/metal/kutjevo_smooth/east, +/turf/open/floor/almayer_hull, +/area/fiorina/oob) "pFP" = ( /obj/structure/ice/thin/indestructible{ dir = 4; @@ -20538,32 +20360,18 @@ }, /turf/open/floor/prison, /area/fiorina/station/power_ring) -"pGy" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_ew_full_cap" - }, -/obj/structure/platform/stair_cut, -/turf/open/floor/plating/prison, -/area/fiorina/station/botany) "pGH" = ( /turf/closed/shuttle/ert{ icon_state = "stan_white_t_up" }, /area/fiorina/tumor/ship) -"pGK" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/gm/river/pool, -/area/fiorina/station/park) "pGS" = ( /obj/structure/machinery/light/double/blue{ dir = 1; pixel_y = 21 }, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "pHh" = ( /obj/structure/ice/thin/indestructible{ dir = 4; @@ -20589,7 +20397,7 @@ }, /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "pIs" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 4 @@ -20665,6 +20473,14 @@ }, /turf/open/floor/prison/floor_plate, /area/fiorina/tumor/servers) +"pKV" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_ew_full_cap" + }, +/obj/structure/platform/metal/stair_cut/platform_left, +/turf/open/floor/plating/prison, +/area/fiorina/station/park) "pKY" = ( /obj/structure/cable/heavyduty{ icon_state = "2-4" @@ -20685,7 +20501,7 @@ pixel_y = 15 }, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "pLM" = ( /obj/item/trash/cigbutt, /turf/open/floor/prison/blue/west, @@ -20698,10 +20514,26 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/prison/greencorner/west, /area/fiorina/tumor/aux_engi) +"pMr" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/box/cups, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/power_ring/reactor) "pNj" = ( /obj/structure/bookcase, /turf/open/floor/carpet, /area/fiorina/station/civres_blue) +"pNp" = ( +/obj/structure/platform/metal/kutjevo_smooth/north, +/obj/structure/platform/metal/kutjevo_smooth/west, +/obj/structure/platform/metal/kutjevo_smooth, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/turf/open/space/basic, +/area/fiorina/oob) "pNG" = ( /obj/structure/closet/crate/science{ density = 0; @@ -20751,7 +20583,14 @@ /obj/structure/closet/basketball, /obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) +"pQm" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_ew_full_cap" + }, +/obj/structure/platform/metal/stair_cut/platform_right, +/turf/open/floor/plating/prison, +/area/fiorina/station/telecomm/lz1_tram) "pQs" = ( /turf/open/floor/prison, /area/fiorina/station/civres_blue) @@ -20763,12 +20602,7 @@ icon_state = "abed" }, /turf/open/floor/prison/whitepurple/northwest, -/area/fiorina/station/research_cells) -"pRp" = ( -/obj/structure/platform, -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/transit_hub) +/area/fiorina/station/research_cells/west) "pRx" = ( /obj/structure/largecrate/random/barrel/white, /turf/open/floor/prison, @@ -20787,6 +20621,10 @@ /obj/item/weapon/wirerod, /turf/open/floor/plating/prison, /area/fiorina/tumor/fiberbush) +"pRM" = ( +/obj/structure/platform/metal/almayer, +/turf/open/floor/prison, +/area/fiorina/station/park) "pSr" = ( /obj/structure/pipes/standard/manifold/visible, /turf/open/floor/prison/sterile_white/southwest, @@ -20819,24 +20657,14 @@ dir = 5 }, /area/fiorina/station/telecomm/lz1_cargo) -"pUf" = ( -/obj/structure/machinery/light/double/blue{ - pixel_y = -1 - }, -/obj/structure/platform_decoration, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/disco) -"pUo" = ( -/obj/structure/platform, -/obj/structure/machinery/light/double/blue{ - pixel_y = -1 - }, +"pUD" = ( +/obj/structure/platform_decoration/metal/almayer, /turf/open/floor/prison/floor_plate, /area/fiorina/station/disco) "pUG" = ( /obj/item/stack/rods, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "pUO" = ( /obj/item/trash/boonie, /turf/open/floor/prison/whitegreenfull/southwest, @@ -20869,7 +20697,7 @@ "pVY" = ( /obj/item/stack/sheet/mineral/plastic, /turf/open/floor/prison/yellow/northwest, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "pWc" = ( /obj/item/tool/crowbar/red, /turf/open/floor/prison/floor_plate, @@ -20922,6 +20750,21 @@ }, /turf/open/floor/wood, /area/fiorina/station/chapel) +"pYe" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform/metal/almayer, +/obj/structure/platform_decoration/metal/almayer/southeast, +/obj/structure/platform_decoration/metal/almayer/southwest, +/turf/open/floor/plating/prison, +/area/fiorina/lz/near_lzI) +"pYl" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) "pYz" = ( /obj/structure/closet/emcloset, /turf/open/floor/prison/darkbrownfull2, @@ -20959,14 +20802,14 @@ /area/fiorina/oob) "pZn" = ( /turf/open/floor/prison/yellowcorner/west, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "pZp" = ( /obj/item/tool/soap, /obj/structure/machinery/shower{ dir = 8 }, /turf/open/floor/prison/kitchen, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "qaA" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/clipboard, @@ -21077,6 +20920,13 @@ /obj/structure/window/framed/prison/reinforced, /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) +"qeq" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform/metal/almayer, +/obj/structure/platform_decoration/metal/almayer/southeast, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison, +/area/fiorina/station/transit_hub) "qes" = ( /obj/structure/stairs/perspective{ dir = 1; @@ -21125,25 +20975,32 @@ /obj/item/device/cassette_tape/hiphop, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) -"qfc" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform, -/obj/structure/platform_decoration{ - dir = 6 - }, -/turf/open/gm/river/desert/deep, -/area/fiorina/lz/near_lzII) "qfg" = ( /obj/effect/landmark/monkey_spawn, /turf/open/floor/prison, /area/fiorina/station/civres_blue) +"qfh" = ( +/obj/item/stack/sheet/metal, +/turf/open/floor/plating/prison, +/area/fiorina/station/disco/east_disco) "qfi" = ( /obj/structure/closet/secure_closet/personal, /obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/telecomm/lz1_cargo) +/area/fiorina/station/research_cells/east) +"qfK" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/northeast, +/turf/open/floor/prison/whitegreen/northwest, +/area/fiorina/tumor/ice_lab) +"qfR" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/plating/prison, +/area/fiorina/station/disco/east_disco) "qgd" = ( /obj/item/explosive/grenade/incendiary/molotov{ pixel_x = 8; @@ -21186,6 +21043,24 @@ /obj/item/reagent_container/food/drinks/golden_cup, /turf/open/space, /area/fiorina/oob) +"qgY" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/decal/cleanable/blood/oil, +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = 13 + }, +/turf/open/floor/plating/prison, +/area/fiorina/lz/near_lzI) +"qhh" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/plating/prison, +/area/fiorina/tumor/ice_lab) "qhk" = ( /turf/open/floor/prison/darkbrown2/southeast, /area/fiorina/station/park) @@ -21208,6 +21083,10 @@ }, /turf/open/floor/prison/redcorner/west, /area/fiorina/station/power_ring) +"qhL" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/park) "qhN" = ( /turf/open/floor/prison/redcorner/east, /area/fiorina/station/security) @@ -21220,6 +21099,15 @@ "qhZ" = ( /turf/open/floor/prison/platingdmg3, /area/fiorina/station/transit_hub) +"qib" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = -3 + }, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/power_ring) "qif" = ( /obj/item/inflatable, /obj/structure/surface/table/reinforced/prison, @@ -21229,15 +21117,6 @@ /obj/item/trash/cigbutt, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"qiK" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/decal/medical_decals{ - icon_state = "triagedecalbottomleft" - }, -/turf/open/floor/prison/whitegreen/northwest, -/area/fiorina/station/medbay) "qjb" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/toolbox, @@ -21297,6 +21176,20 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) +"qlz" = ( +/obj/structure/machinery/shower{ + pixel_y = 13 + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/plating/plating_catwalk/prison, +/area/fiorina/station/medbay) +"qlC" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_ew_full_cap" + }, +/obj/structure/platform/metal/stair_cut/platform_right, +/turf/open/floor/plating/prison, +/area/fiorina/station/botany) "qmj" = ( /obj/structure/closet/emcloset, /obj/item/weapon/nullrod{ @@ -21322,6 +21215,14 @@ /obj/item/tool/wirecutters/clippers, /turf/open/floor/prison/greenfull/northwest, /area/fiorina/tumor/civres) +"qnL" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/turf/open/floor/prison, +/area/fiorina/station/disco/east_disco) "qob" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -21360,6 +21261,10 @@ /obj/item/stack/cable_coil/blue, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) +"qpF" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/prison/yellow/southeast, +/area/fiorina/station/disco/east_disco) "qpM" = ( /turf/closed/shuttle/ert{ icon_state = "stan_leftengine" @@ -21397,12 +21302,20 @@ }, /turf/open/floor/prison, /area/fiorina/station/security) +"qqm" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/prison, +/area/fiorina/station/botany) "qqC" = ( /obj/structure/machinery/light/double/blue{ pixel_y = -1 }, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "qqQ" = ( /turf/open/floor/prison/green/northeast, /area/fiorina/station/transit_hub) @@ -21410,10 +21323,6 @@ /obj/item/trash/cigbutt/cigarbutt, /turf/open/floor/prison/whitegreen/north, /area/fiorina/station/medbay) -"qre" = ( -/obj/structure/platform_decoration, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/central_ring) "qrn" = ( /turf/open/floor/prison/floor_plate, /area/fiorina/station/medbay) @@ -21426,6 +21335,10 @@ /obj/item/explosive/plastic, /turf/open/floor/plating/prison, /area/fiorina/station/telecomm/lz1_cargo) +"qrB" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/prison/blue/southwest, +/area/fiorina/station/power_ring) "qrI" = ( /obj/structure/bed/sofa/south/grey/left, /obj/item/reagent_container/food/snacks/sandwich{ @@ -21433,10 +21346,18 @@ }, /turf/open/floor/prison/floor_plate, /area/fiorina/station/security) +"qrN" = ( +/obj/item/shard{ + icon_state = "medium"; + name = "ice shard" + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/prison/whitegreen/west, +/area/fiorina/tumor/ice_lab) "qrU" = ( /obj/effect/landmark/monkey_spawn, /turf/open/floor/prison/whitepurple, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "qsc" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/prison, @@ -21453,19 +21374,20 @@ /obj/structure/flora/pottedplant/random, /turf/open/floor/prison/floor_plate, /area/fiorina/tumor/civres) -"qsE" = ( -/obj/item/shard{ - icon_state = "large"; - name = "ice shard" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/prison/whitegreen/west, -/area/fiorina/tumor/ice_lab) "qsF" = ( /turf/open/floor/prison/darkbrown2/north, /area/fiorina/maintenance) +"qsV" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_ew_full_cap" + }, +/obj/structure/platform/metal/stair_cut/platform_right, +/turf/open/floor/plating/prison, +/area/fiorina/station/flight_deck) +"qtp" = ( +/obj/structure/window/framed/prison, +/turf/open/floor/plating/prison, +/area/fiorina/station/power_ring/reactor) "qtP" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/prop/helmetgarb/raincover, @@ -21498,7 +21420,7 @@ dir = 2 }, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "qvN" = ( /obj/structure/prop/resin_prop{ icon_state = "rack" @@ -21517,14 +21439,14 @@ /area/fiorina/maintenance) "qwH" = ( /turf/open/floor/prison/floor_plate/southwest, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "qwK" = ( /turf/open/floor/prison/floorscorched2, /area/fiorina/station/civres_blue) "qxx" = ( /obj/item/ammo_magazine/smg/mp5, /turf/open/floor/prison/whitepurple/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "qxy" = ( /obj/item/stack/sheet/metal, /turf/open/floor/prison/greenfull/northwest, @@ -21540,6 +21462,14 @@ "qxP" = ( /turf/open/floor/prison/darkbrown2/southwest, /area/fiorina/tumor/aux_engi) +"qxW" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_ew_half_cap" + }, +/turf/open/floor/plating/prison, +/area/fiorina/lz/near_lzI) "qxZ" = ( /obj/structure/machinery/light/double/blue{ dir = 8; @@ -21547,7 +21477,7 @@ pixel_y = -3 }, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "qya" = ( /obj/structure/closet{ density = 0; @@ -21556,7 +21486,7 @@ /obj/item/clothing/gloves/combat, /obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison/whitepurple/north, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "qyq" = ( /obj/structure/closet/secure_closet/engineering_personal, /obj/structure/machinery/light/double/blue{ @@ -21565,20 +21495,10 @@ }, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "qyM" = ( /turf/open/floor/prison/darkyellowfull2/east, -/area/fiorina/station/disco) -"qzb" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/power_ring) +/area/fiorina/station/disco/east_disco) "qzo" = ( /obj/structure/largecrate/random/barrel/green, /turf/open/floor/prison, @@ -21594,7 +21514,7 @@ pixel_y = 2 }, /turf/open/floor/prison/yellow/southeast, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "qAe" = ( /obj/item/trash/eat, /turf/open/floor/prison/floor_plate, @@ -21609,6 +21529,10 @@ /obj/structure/reagent_dispensers/water_cooler/stacks, /turf/open/floor/prison/sterile_white/southwest, /area/fiorina/station/medbay) +"qAO" = ( +/obj/structure/platform/metal/almayer, +/turf/open/floor/prison, +/area/fiorina/station/botany) "qAQ" = ( /turf/open/floor/prison/cell_stripe/east, /area/fiorina/tumor/aux_engi) @@ -21625,6 +21549,9 @@ /obj/item/storage/briefcase, /turf/open/floor/prison/floor_plate, /area/fiorina/station/security/wardens) +"qBw" = ( +/turf/open/floor/prison/darkpurplefull2, +/area/fiorina/station/research_cells/east) "qBB" = ( /obj/item/prop/helmetgarb/spacejam_tickets{ desc = "A ticket to Souto Man's raffle!"; @@ -21645,7 +21572,7 @@ /obj/structure/surface/table/reinforced/prison, /obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "qBT" = ( /obj/structure/sink{ dir = 4; @@ -21653,7 +21580,7 @@ }, /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison/whitepurple/southeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "qCa" = ( /obj/structure/prop/resin_prop{ dir = 1; @@ -21677,7 +21604,7 @@ "qCx" = ( /obj/item/reagent_container/food/drinks/sillycup, /turf/open/floor/prison/bluefull, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "qCE" = ( /obj/structure/machinery/computer/emails{ dir = 1; @@ -21688,7 +21615,7 @@ /area/fiorina/station/medbay) "qCK" = ( /turf/open/floor/prison/damaged1/southwest, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "qCW" = ( /turf/closed/shuttle/elevator{ dir = 6 @@ -21726,13 +21653,25 @@ /obj/structure/closet/bodybag, /turf/open/floor/prison/floor_plate, /area/fiorina/station/medbay) +"qEp" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) "qEs" = ( /turf/open/floor/prison/yellowcorner/east, /area/fiorina/station/lowsec) +"qEt" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/prison, +/area/fiorina/station/power_ring/reactor) "qEC" = ( /obj/structure/largecrate/random/barrel/blue, /turf/open/floor/prison/yellow/southeast, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "qFf" = ( /obj/item/tool/kitchen/rollingpin, /turf/open/floor/prison/kitchen, @@ -21759,18 +21698,18 @@ }, /turf/open/floor/prison, /area/fiorina/tumor/servers) -"qFE" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/turf/open/space/basic, -/area/fiorina/oob) "qFO" = ( /obj/structure/barricade/wooden{ dir = 8 }, /turf/open/floor/prison/floor_plate/southwest, /area/fiorina/station/telecomm/lz1_cargo) +"qFW" = ( +/obj/structure/bed{ + icon_state = "abed" + }, +/turf/open/floor/prison/yellow/southeast, +/area/fiorina/station/lowsec/east) "qGe" = ( /obj/structure/machinery/landinglight/ds1/delaytwo{ dir = 4 @@ -21795,7 +21734,7 @@ "qGB" = ( /obj/structure/barricade/wooden, /turf/open/floor/prison/whitepurple/east, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "qGO" = ( /obj/structure/machinery/photocopier, /obj/structure/machinery/light/double/blue, @@ -21805,12 +21744,25 @@ /obj/effect/spawner/random/tool, /turf/open/floor/prison, /area/fiorina/station/civres_blue) +"qGW" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/southeast, +/turf/open/floor/plating/prison, +/area/fiorina/station/security) "qHi" = ( /obj/effect/landmark/nightmare{ insert_tag = "riot_control" }, /turf/open/floor/prison, /area/fiorina/station/security) +"qHl" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/plating/prison, +/area/fiorina/station/power_ring) "qHG" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited{ pixel_y = 25 @@ -21867,7 +21819,7 @@ icon_state = "linenbin-empty" }, /turf/open/floor/prison/yellow/west, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "qJr" = ( /turf/open/floor/prison, /area/fiorina/tumor/fiberbush) @@ -21912,6 +21864,9 @@ /obj/item/disk/data, /turf/open/floor/prison/darkpurplefull2, /area/fiorina/tumor/servers) +"qJY" = ( +/turf/open/floor/prison/yellow, +/area/fiorina/station/lowsec/east) "qKq" = ( /obj/structure/machinery/computer/arcade, /obj/item/toy/syndicateballoon{ @@ -21946,10 +21901,6 @@ }, /turf/open/floor/prison/yellow/northeast, /area/fiorina/station/lowsec) -"qLv" = ( -/obj/structure/platform_decoration, -/turf/open/floor/prison, -/area/fiorina/station/transit_hub) "qLH" = ( /obj/item/trash/used_stasis_bag, /turf/open/floor/prison/floor_plate, @@ -21967,13 +21918,10 @@ /obj/item/storage/toolbox/mechanical/green, /turf/open/floor/corsat/plate, /area/fiorina/tumor/aux_engi) -"qMi" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/prison/whitegreen/west, -/area/fiorina/tumor/ice_lab) +"qMk" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/prison, +/area/fiorina/station/park) "qMs" = ( /obj/item/stack/cable_coil/green, /turf/open/floor/prison/floor_plate, @@ -21981,17 +21929,6 @@ "qMI" = ( /turf/open/floor/prison/damaged3, /area/fiorina/station/security) -"qNj" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 10 - }, -/obj/structure/closet/firecloset/full, -/turf/open/floor/prison/whitegreenfull/southwest, -/area/fiorina/station/medbay) "qNu" = ( /obj/structure/closet/secure_closet/security_empty, /obj/item/clothing/accessory/storage/holster, @@ -22018,16 +21955,10 @@ "qNF" = ( /turf/open/floor/prison/yellow/northeast, /area/fiorina/station/lowsec) -"qOk" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/turf/open/floor/almayer_hull, -/area/fiorina/oob) "qOq" = ( /obj/structure/grille, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "qOu" = ( /turf/open/floor/prison/damaged3, /area/fiorina/station/disco) @@ -22047,6 +21978,15 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) +"qOZ" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = 13 + }, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/power_ring) "qPa" = ( /obj/item/device/motiondetector, /turf/open/floor/prison/yellow/north, @@ -22066,7 +22006,7 @@ pixel_y = 8 }, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "qQa" = ( /turf/open/floor/prison/darkpurple2/north, /area/fiorina/station/central_ring) @@ -22107,7 +22047,7 @@ dir = 1 }, /turf/open/floor/prison/blue/northwest, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "qQA" = ( /obj/item/reagent_container/food/drinks/bottle/holywater{ desc = "A flask of the holy HEFA grenade oil."; @@ -22115,27 +22055,17 @@ }, /turf/open/floor/prison/chapel_carpet/doubleside, /area/fiorina/station/chapel) -"qQM" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/prison, -/area/fiorina/station/disco) "qRa" = ( /obj/effect/decal/cleanable/blood/gibs/core, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "qRf" = ( /obj/structure/bed{ icon_state = "abed" }, /obj/item/toy/beach_ball/holoball, /turf/open/floor/prison/whitepurple/southeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "qRg" = ( /obj/structure/sign/prop3{ desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." @@ -22153,7 +22083,7 @@ dir = 4 }, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "qRK" = ( /turf/open/floor/prison/darkpurple2/southeast, /area/fiorina/station/central_ring) @@ -22182,7 +22112,7 @@ /obj/structure/closet/wardrobe/orange, /obj/item/clothing/gloves/boxing/yellow, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "qSA" = ( /obj/item/trash/candy, /turf/open/floor/prison/whitegreen/east, @@ -22194,22 +22124,22 @@ "qTt" = ( /obj/item/stack/tile/plasteel, /turf/open/floor/prison/yellow/southwest, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "qTx" = ( /obj/structure/surface/rack, /obj/item/storage/firstaid/regular, /obj/item/storage/firstaid/regular, /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/station/medbay) -"qTQ" = ( -/obj/structure/platform_decoration, -/obj/item/reagent_container/food/drinks/sillycup, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/flight_deck) "qTW" = ( /obj/effect/landmark/survivor_spawner, /turf/open/floor/prison/blue/east, /area/fiorina/station/power_ring) +"qUb" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/effect/spawner/random/tool, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) "qUo" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 @@ -22230,7 +22160,7 @@ "qUw" = ( /obj/item/device/multitool, /turf/open/floor/prison/yellow/southwest, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "qUC" = ( /obj/item/ammo_casing{ dir = 2; @@ -22238,10 +22168,19 @@ }, /turf/open/floor/prison/darkbrown2/north, /area/fiorina/station/park) +"qVb" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/park) "qVW" = ( /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison, /area/fiorina/station/park) +"qWe" = ( +/obj/effect/decal/cleanable/blood, +/obj/effect/landmark/corpsespawner/prisoner, +/turf/open/floor/prison, +/area/fiorina/station/security) "qXj" = ( /obj/structure/machinery/shower{ dir = 1; @@ -22249,7 +22188,7 @@ }, /obj/structure/machinery/light/double/blue, /turf/open/floor/prison/kitchen, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "qXM" = ( /obj/item/stack/tile/plasteel, /turf/open/floor/plating/prison, @@ -22269,6 +22208,10 @@ }, /turf/open/floor/prison/floor_plate, /area/fiorina/station/telecomm/lz1_cargo) +"qZp" = ( +/obj/structure/platform/metal/almayer, +/turf/open/gm/river/pool, +/area/fiorina/station/park) "qZv" = ( /obj/structure/stairs/perspective{ dir = 1; @@ -22276,10 +22219,20 @@ }, /turf/open/floor/prison/whitegreen/east, /area/fiorina/station/central_ring) +"qZz" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform/metal/almayer, +/obj/structure/platform_decoration/metal/almayer/southeast, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/transit_hub) "raC" = ( /obj/effect/landmark/corpsespawner/ua_riot, /turf/open/floor/prison/darkyellow2/west, /area/fiorina/lz/near_lzI) +"raJ" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/prison/whitegreenfull/southwest, +/area/fiorina/station/medbay) "raL" = ( /turf/open/floor/prison/bluefull, /area/fiorina/station/civres_blue) @@ -22329,7 +22282,7 @@ pixel_y = 11 }, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "rcg" = ( /turf/open/floor/plating/prison, /area/fiorina/station/central_ring) @@ -22342,6 +22295,10 @@ }, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) +"rcy" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, +/turf/open/space, +/area/fiorina/oob) "rcE" = ( /obj/structure/inflatable/popped/door, /obj/item/stack/barbed_wire, @@ -22359,12 +22316,6 @@ "rdo" = ( /turf/open/floor/prison/greenbluecorner/north, /area/fiorina/station/botany) -"rdt" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) "red" = ( /obj/structure/barricade/metal/wired{ dir = 8 @@ -22378,7 +22329,7 @@ dir = 4 }, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "reZ" = ( /obj/structure/barricade/sandbags{ dir = 8; @@ -22398,6 +22349,17 @@ "rft" = ( /turf/open/floor/prison/greenblue, /area/fiorina/station/botany) +"rfy" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/decal/medical_decals{ + icon_state = "triagedecalbottomleft" + }, +/turf/open/floor/prison/whitegreen/northwest, +/area/fiorina/station/medbay) +"rfI" = ( +/obj/structure/platform_decoration/metal/kutjevo, +/turf/open/space, +/area/fiorina/oob) "rfQ" = ( /obj/effect/spawner/random/tech_supply, /obj/structure/machinery/light/double/blue{ @@ -22413,7 +22375,7 @@ pixel_y = 21 }, /turf/open/floor/prison/yellow/north, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "rgg" = ( /obj/item/tool/candle{ pixel_x = -2 @@ -22422,7 +22384,7 @@ /area/fiorina/station/chapel) "rhf" = ( /turf/open/floor/prison/cell_stripe, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "rhh" = ( /obj/structure/monorail{ dir = 4; @@ -22435,7 +22397,11 @@ icon_state = "abed" }, /turf/open/floor/prison/whitepurple/southeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) +"rhR" = ( +/obj/structure/platform/metal/kutjevo_smooth/west, +/turf/open/space, +/area/fiorina/oob) "rie" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison/whitegreen/west, @@ -22447,10 +22413,19 @@ "rja" = ( /turf/closed/wall/prison, /area/fiorina/station/civres_blue) +"rjw" = ( +/turf/closed/wall/prison, +/area/fiorina/station/lowsec/showers_laundry) "rjy" = ( /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison/kitchen/southwest, /area/fiorina/tumor/civres) +"rjD" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic/autoname{ + icon = 'icons/obj/structures/doors/2x1prepdoor_charlie.dmi' + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/research_cells/west) "rjP" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -22461,10 +22436,6 @@ /obj/item/stack/tile/plasteel, /turf/open/floor/prison/floor_plate, /area/fiorina/tumor/civres) -"rko" = ( -/obj/structure/platform_decoration, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) "rkp" = ( /obj/structure/toilet{ dir = 4; @@ -22472,14 +22443,14 @@ }, /obj/effect/decal/cleanable/blood/gibs, /turf/open/floor/prison/yellow/northwest, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "rkv" = ( /turf/open/floor/prison/greencorner/west, /area/fiorina/station/chapel) "rkF" = ( /obj/structure/closet/secure_closet/personal, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/telecomm/lz1_cargo) +/area/fiorina/station/research_cells/east) "rkH" = ( /obj/structure/grille, /obj/structure/lattice, @@ -22489,6 +22460,10 @@ /obj/item/clothing/glasses/science, /turf/open/space, /area/fiorina/oob) +"rkX" = ( +/obj/effect/landmark/survivor_spawner, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/power_ring/reactor) "rle" = ( /obj/item/stack/cable_coil/green, /turf/open/floor/wood, @@ -22506,25 +22481,6 @@ /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) -"rmJ" = ( -/obj/structure/platform, -/obj/item/fuel_cell, -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = 13 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) -"rmX" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/disco) "rmZ" = ( /obj/structure/barricade/metal/wired{ dir = 4 @@ -22555,7 +22511,7 @@ "rnE" = ( /obj/structure/inflatable, /turf/open/floor/prison/yellow/southeast, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "rnM" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/fancy/crayons, @@ -22574,15 +22530,17 @@ }, /turf/open/floor/prison/darkpurple2/southeast, /area/fiorina/tumor/ice_lab) -"roE" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/effect/decal/medical_decals{ - icon_state = "triagedecalleft" +"rov" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" }, -/turf/open/floor/prison/whitegreen/north, -/area/fiorina/station/medbay) +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/prison/bright_clean2/southwest, +/area/fiorina/station/park) +"roC" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/prison/darkbrown2/northeast, +/area/fiorina/station/park) "roF" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/window/reinforced{ @@ -22605,7 +22563,7 @@ "rpf" = ( /obj/structure/grille, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "rpt" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/prison/floor_plate, @@ -22620,14 +22578,12 @@ }, /turf/open/floor/prison/darkyellow2/west, /area/fiorina/lz/near_lzI) -"rqh" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_ew_full_cap" - }, -/obj/structure/platform/stair_cut, +"rqd" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/southeast, /turf/open/floor/plating/prison, -/area/fiorina/station/power_ring) +/area/fiorina/station/lowsec/showers_laundry) "rqq" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -22660,17 +22616,13 @@ "rru" = ( /obj/effect/spawner/random/goggles/midchance, /turf/open/organic/grass/astroturf, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "rrD" = ( /obj/structure/machinery/landinglight/ds1{ dir = 1 }, /turf/open/floor/prison/darkyellowfull2/east, /area/fiorina/lz/near_lzI) -"rsg" = ( -/obj/structure/platform_decoration, -/turf/open/floor/prison, -/area/fiorina/station/park) "rsp" = ( /obj/item/toy/crayon/purple, /turf/open/floor/plating/prison, @@ -22680,16 +22632,6 @@ /obj/item/reagent_container/food/drinks/coffee, /turf/open/floor/prison, /area/fiorina/station/medbay) -"rsQ" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 10 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) "rsR" = ( /turf/open/floor/prison/blue/northeast, /area/fiorina/station/power_ring) @@ -22752,7 +22694,7 @@ pixel_x = -12 }, /turf/open/floor/prison/whitepurple/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "rwu" = ( /obj/structure/bed/chair{ dir = 1 @@ -22771,7 +22713,7 @@ /obj/item/clothing/under/color/orange, /obj/structure/surface/rack, /turf/open/floor/prison/yellow/east, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "rwQ" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/prison/greenblue/west, @@ -22785,27 +22727,11 @@ }, /turf/open/floor/almayer_hull, /area/fiorina/oob) -"rxL" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/obj/structure/lattice, -/turf/open/space/basic, +"ryp" = ( +/obj/structure/platform/metal/kutjevo_smooth/east, +/obj/structure/platform/metal/kutjevo_smooth, +/turf/open/space, /area/fiorina/oob) -"rxM" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) "ryJ" = ( /obj/structure/machinery/door/airlock/prison/horizontal{ dir = 4 @@ -22824,7 +22750,15 @@ pixel_y = 25 }, /turf/open/floor/prison/yellow, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) +"rzZ" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/bed/chair{ + dir = 1; + layer = 2.7 + }, +/turf/open/floor/prison/whitegreen, +/area/fiorina/station/medbay) "rAm" = ( /obj/structure/surface/rack, /obj/effect/landmark/objective_landmark/medium, @@ -22833,7 +22767,7 @@ "rAw" = ( /obj/structure/bed/chair, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "rAK" = ( /obj/structure/barricade/metal{ dir = 4; @@ -22859,6 +22793,12 @@ /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/prison, /area/fiorina/station/security) +"rBh" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/southeast, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/park) "rBr" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/plating/prison, @@ -22878,36 +22818,52 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) +"rBE" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/prison/whitegreenfull/southwest, +/area/fiorina/tumor/ice_lab) "rBF" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/flight_deck) -"rCe" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/prison/yellow/southeast, -/area/fiorina/station/disco) "rCq" = ( /obj/structure/largecrate/supply/supplies/flares, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "rCt" = ( /obj/structure/bed/chair/comfy{ dir = 4 }, /turf/open/floor/wood, -/area/fiorina/station/lowsec) -"rDu" = ( -/obj/structure/stairs/perspective{ +/area/fiorina/station/lowsec/east) +"rDf" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) +"rEk" = ( +/obj/structure/lattice, +/obj/structure/platform/metal/kutjevo_smooth/east, +/turf/open/space, +/area/fiorina/oob) +"rEr" = ( +/obj/structure/blocker/invisible_wall, +/obj/structure/platform/metal/almayer/north, +/obj/structure/ice/thin/indestructible{ dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/obj/structure/barricade/handrail/type_b{ - layer = 3.4 + icon_state = "Straight" }, -/turf/open/floor/plating/prison, -/area/fiorina/station/medbay) +/turf/open/ice/noweed, +/area/fiorina/tumor/ice_lab) +"rEx" = ( +/turf/open/floor/prison/whitepurplecorner/east, +/area/fiorina/station/research_cells/east) +"rEG" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/park) "rFu" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/prison/chapel_carpet/doubleside, @@ -22931,7 +22887,7 @@ /area/fiorina/station/medbay) "rGf" = ( /turf/open/auto_turf/sand/layer1, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "rGq" = ( /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) @@ -22939,6 +22895,14 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/telecomm/lz1_tram) +"rGB" = ( +/obj/structure/platform/metal/almayer/east, +/obj/item/shard{ + icon_state = "medium"; + name = "ice shard" + }, +/turf/open/floor/prison/whitegreen/east, +/area/fiorina/tumor/ice_lab) "rGK" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 @@ -22986,7 +22950,7 @@ pixel_y = -3 }, /turf/open/floor/prison/whitepurple/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "rIy" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/phone{ @@ -23036,16 +23000,6 @@ /obj/item/stack/cable_coil/green, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"rKa" = ( -/obj/structure/stairs/perspective, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/medbay) "rKd" = ( /obj/item/stool, /obj/structure/sign/poster{ @@ -23053,7 +23007,7 @@ pixel_y = 32 }, /turf/open/floor/prison/yellow/north, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "rKm" = ( /obj/structure/machinery/vending/coffee, /turf/open/floor/prison/redfull, @@ -23074,17 +23028,13 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/prison/blue_plate/west, /area/fiorina/station/botany) -"rLA" = ( -/obj/structure/platform, -/turf/open/floor/prison, -/area/fiorina/station/botany) "rLG" = ( /turf/open/floor/prison/whitepurple, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "rLJ" = ( /obj/item/clothing/gloves/boxing, /turf/open/floor/prison/yellow/southwest, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "rMo" = ( /obj/effect/landmark/objective_landmark/far, /obj/structure/closet/secure_closet/engineering_personal, @@ -23098,7 +23048,7 @@ "rMw" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison/yellow/northeast, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "rMT" = ( /obj/structure/prop/almayer/computers/mission_planning_system{ density = 0; @@ -23151,6 +23101,10 @@ }, /turf/open/floor/prison/floor_plate, /area/fiorina/station/central_ring) +"rOV" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/prison/chapel_carpet/doubleside/north, +/area/fiorina/station/chapel) "rPd" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/stack/sheet/metal/medium_stack, @@ -23166,6 +23120,18 @@ }, /turf/open/floor/prison/floor_plate, /area/fiorina/station/transit_hub) +"rPj" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/plating/plating_catwalk/prison, +/area/fiorina/station/transit_hub) +"rPs" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) "rPD" = ( /obj/item/stack/sheet/metal, /turf/open/floor/prison/floor_plate, @@ -23197,10 +23163,15 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) +"rPM" = ( +/obj/structure/platform/metal/kutjevo_smooth/west, +/obj/structure/platform/metal/kutjevo_smooth/east, +/turf/open/floor/almayer_hull, +/area/fiorina/station/medbay) "rPS" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "rPW" = ( /obj/effect/spawner/random/gun/rifle/lowchance, /turf/open/floor/prison/floor_plate, @@ -23217,6 +23188,14 @@ /obj/effect/landmark/objective_landmark/far, /turf/open/floor/plating/prison, /area/fiorina/maintenance) +"rQi" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/plating/prison, +/area/fiorina/station/power_ring) +"rQt" = ( +/obj/structure/platform/metal/kutjevo_smooth/east, +/turf/open/space, +/area/fiorina/oob) "rQu" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/stack/cable_coil/orange, @@ -23224,7 +23203,7 @@ /area/fiorina/maintenance) "rQB" = ( /turf/open/floor/prison/sterile_white/west, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "rQK" = ( /obj/item/bananapeel{ name = "tactical banana peel" @@ -23234,6 +23213,14 @@ "rQN" = ( /turf/open/floor/prison/darkbrown2/southeast, /area/fiorina/station/power_ring) +"rRd" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/barricade/handrail/type_b{ + dir = 4; + layer = 3.5 + }, +/turf/open/floor/prison, +/area/fiorina/station/medbay) "rRg" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/stack/sheet/mineral/plastic, @@ -23254,16 +23241,7 @@ req_one_access = null }, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) -"rSN" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/machinery/autolathe/full{ - layer = 2.98 - }, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) +/area/fiorina/station/research_cells/west) "rSU" = ( /obj/structure/barricade/sandbags{ dir = 4; @@ -23289,21 +23267,12 @@ }, /turf/open/floor/carpet, /area/fiorina/station/security/wardens) -"rTV" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/effect/decal/cleanable/blood/splatter{ - icon_state = "gibup1" - }, -/turf/open/floor/prison/whitegreen/north, -/area/fiorina/station/medbay) +"rTY" = ( +/turf/open/floor/prison/bluecorner, +/area/fiorina/station/power_ring/reactor) "rTZ" = ( /turf/open/floor/prison/whitepurplecorner/north, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "rUf" = ( /turf/open/floor/prison/darkyellow2/northwest, /area/fiorina/tumor/servers) @@ -23393,13 +23362,13 @@ pixel_y = 32 }, /turf/open/floor/prison/yellow/north, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "rYK" = ( /obj/structure/machinery/light/double/blue{ pixel_y = -1 }, /turf/open/floor/prison/yellow, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "rYY" = ( /obj/structure/bed/roller, /obj/structure/machinery/filtration/console{ @@ -23418,6 +23387,11 @@ icon_state = "stan_rightengine" }, /area/fiorina/station/power_ring) +"rZF" = ( +/obj/effect/decal/cleanable/blood/gibs, +/obj/effect/spawner/random/gun/rifle, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/lowsec/east) "rZI" = ( /obj/structure/surface/rack, /obj/effect/landmark/objective_landmark/close, @@ -23457,7 +23431,7 @@ pixel_y = 8 }, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "sbf" = ( /obj/effect/landmark/corpsespawner/prisoner, /turf/open/gm/river/darkred_pool, @@ -23481,6 +23455,14 @@ "sbW" = ( /turf/open/floor/prison/greenbluecorner/east, /area/fiorina/station/botany) +"scb" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/floor/prison/darkbrowncorners2, +/area/fiorina/station/park) +"sce" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/prison, +/area/fiorina/station/park) "scp" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/trash/uscm_mre, @@ -23504,16 +23486,6 @@ }, /turf/open/floor/prison/floor_plate, /area/fiorina/station/disco) -"scZ" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 6 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/security) "sda" = ( /obj/structure/largecrate/supply/supplies/mre, /turf/open/floor/prison, @@ -23526,6 +23498,12 @@ /obj/item/storage/wallet/random, /turf/open/floor/prison/kitchen/southwest, /area/fiorina/tumor/civres) +"sdG" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/northwest, +/turf/open/floor/plating/prison, +/area/fiorina/station/power_ring) "sdK" = ( /obj/structure/surface/table/woodentable, /obj/item/device/flashlight/lamp{ @@ -23581,12 +23559,6 @@ }, /turf/open/floor/prison/darkyellow2/west, /area/fiorina/station/telecomm/lz1_cargo) -"sfi" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/prison/chapel_carpet/doubleside, -/area/fiorina/station/chapel) "sfn" = ( /obj/structure/disposalpipe/segment{ icon_state = "delivery_outlet"; @@ -23614,12 +23586,6 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"sfW" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/power_ring) "sfZ" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/weapon/baton, @@ -23628,7 +23594,7 @@ pixel_y = 12 }, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "sga" = ( /obj/effect/decal{ icon = 'icons/obj/items/policetape.dmi'; @@ -23642,11 +23608,14 @@ "sgt" = ( /obj/structure/inflatable/popped/door, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "sgw" = ( /obj/structure/window_frame/prison, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) +"sgI" = ( +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/power_ring/reactor) "sgJ" = ( /obj/structure/surface/rack, /obj/item/storage/belt/gun/flaregun/full, @@ -23668,7 +23637,11 @@ pixel_y = -1 }, /turf/open/floor/prison/kitchen, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) +"shC" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/lowsec) "shH" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/prison, @@ -23684,11 +23657,11 @@ "siy" = ( /obj/item/stack/cable_coil, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "siB" = ( /obj/item/poster, /turf/open/floor/prison/whitepurple/northwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "siE" = ( /obj/structure/machinery/cm_vending/sorted/tech/electronics_storage, /turf/open/floor/prison/darkbrownfull2, @@ -23705,7 +23678,7 @@ /obj/structure/closet/bodybag, /obj/effect/decal/cleanable/blood/gibs/up, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "sjd" = ( /obj/structure/stairs/perspective{ dir = 8; @@ -23766,14 +23739,14 @@ pixel_y = -3 }, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "skj" = ( /obj/structure/closet/crate/miningcar{ name = "\improper materials storage bin" }, /obj/item/reagent_container/food/snacks/meat, /turf/open/floor/prison/yellow, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "skG" = ( /turf/open/floor/prison/blue/southwest, /area/fiorina/tumor/servers) @@ -23828,13 +23801,6 @@ }, /turf/open/floor/prison/floor_plate, /area/fiorina/lz/near_lzI) -"snr" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/item/stool, -/turf/open/floor/prison/bluefull, -/area/fiorina/station/civres_blue) "snW" = ( /obj/structure/prop/resin_prop{ icon_state = "rack" @@ -23870,7 +23836,7 @@ dir = 4 }, /turf/open/organic/grass/astroturf, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "spm" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/flora/pottedplant{ @@ -23879,23 +23845,6 @@ /obj/structure/machinery/light/double/blue, /turf/open/floor/prison, /area/fiorina/station/security) -"spA" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/prop/souto_land/pole{ - dir = 1 - }, -/obj/structure/prop/souto_land/pole{ - dir = 8; - pixel_y = 24 - }, -/turf/open/floor/prison/darkbrown2/east, -/area/fiorina/station/park) "spH" = ( /obj/structure/disposalpipe/segment{ icon_state = "delivery_outlet"; @@ -23905,10 +23854,14 @@ }, /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/tumor/ice_lab) +"spI" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/disco) "spR" = ( /obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "sqx" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ density = 0; @@ -23919,21 +23872,16 @@ "sqC" = ( /obj/structure/extinguisher_cabinet, /turf/closed/wall/r_wall/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) +"sqL" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/prison/yellow/southwest, +/area/fiorina/station/disco/east_disco) "sqR" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/spawner/random/supply_kit, /turf/open/floor/prison, /area/fiorina/station/power_ring) -"srp" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/central_ring) "srt" = ( /obj/item/reagent_container/food/drinks/bottle/sake, /turf/open/floor/prison/floor_plate, @@ -23945,7 +23893,7 @@ "srQ" = ( /obj/structure/barricade/handrail, /turf/open/floor/prison/whitepurple/northeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "ssb" = ( /turf/open/floor/prison, /area/fiorina/station/telecomm/lz1_tram) @@ -23964,13 +23912,6 @@ /obj/structure/largecrate/supply/supplies/tables_racks, /turf/open/floor/prison, /area/fiorina/lz/near_lzI) -"ssJ" = ( -/obj/structure/lattice, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/turf/open/space, -/area/fiorina/oob) "ssM" = ( /obj/structure/janitorialcart, /turf/open/floor/prison/floor_plate, @@ -23988,7 +23929,7 @@ icon = 'icons/obj/structures/doors/prepdoor_charlie.dmi' }, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "stf" = ( /obj/effect/spawner/random/tool, /turf/open/floor/prison, @@ -24025,7 +23966,7 @@ "suq" = ( /obj/item/stool, /turf/open/floor/prison/damaged2/southwest, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "suX" = ( /turf/open/floor/prison, /area/fiorina/station/central_ring) @@ -24058,19 +23999,18 @@ dir = 4 }, /turf/open/floor/prison/kitchen, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "svP" = ( /turf/open/floor/prison/floor_plate, /area/fiorina/tumor/aux_engi) +"svS" = ( +/turf/open/floor/prison/yellow/northwest, +/area/fiorina/station/disco/east_disco) "svW" = ( /obj/structure/surface/rack, /obj/item/clothing/gloves/latex, /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/station/medbay) -"swg" = ( -/obj/structure/platform_decoration/kutjevo, -/turf/open/space, -/area/fiorina/oob) "swj" = ( /turf/open/floor/prison/floor_plate, /area/fiorina/tumor/civres) @@ -24080,12 +24020,6 @@ /obj/structure/surface/rack, /turf/open/floor/prison/sterile_white/southwest, /area/fiorina/tumor/ice_lab) -"swT" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/tumor/ice_lab) "sxc" = ( /obj/item/weapon/gun/rifle/mar40, /turf/open/floor/prison/floor_plate, @@ -24097,15 +24031,14 @@ "sxE" = ( /turf/open/floor/prison/redcorner, /area/fiorina/station/power_ring) -"sxH" = ( -/obj/structure/platform{ - dir = 8 - }, +"sxY" = ( /obj/structure/stairs/perspective{ + dir = 4; icon_state = "p_stair_sn_full_cap" }, +/obj/structure/platform/metal/almayer/east, /turf/open/floor/plating/prison, -/area/fiorina/tumor/ice_lab) +/area/fiorina/station/park) "syj" = ( /obj/item/clothing/under/color/orange, /turf/open/floor/prison/redfull, @@ -24114,6 +24047,14 @@ /obj/item/tool/wirecutters/clippers, /turf/open/organic/grass/astroturf, /area/fiorina/tumor/fiberbush) +"syM" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_sn_full_cap" + }, +/turf/open/floor/prison, +/area/fiorina/station/flight_deck) "syU" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 8 @@ -24132,6 +24073,10 @@ "sze" = ( /turf/open/floor/prison/greencorner/north, /area/fiorina/tumor/civres) +"szn" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/floor/prison/blue/southeast, +/area/fiorina/station/power_ring) "szs" = ( /obj/item/clothing/accessory/armband/cargo{ desc = "Sworn to the shrapnel and the shards therein. So sayeth her command when the first detonation occured."; @@ -24154,6 +24099,10 @@ /obj/item/stack/sandbags_empty/half, /turf/open/floor/prison, /area/fiorina/lz/near_lzI) +"sAg" = ( +/obj/structure/platform/metal/almayer, +/turf/open/floor/prison/whitegreen, +/area/fiorina/station/medbay) "sAp" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison, @@ -24161,17 +24110,7 @@ "sAF" = ( /obj/item/inflatable, /turf/open/floor/prison/yellow/north, -/area/fiorina/station/lowsec) -"sBf" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/park) +/area/fiorina/station/lowsec/showers_laundry) "sBj" = ( /obj/structure/barricade/metal{ health = 85; @@ -24194,12 +24133,6 @@ /obj/structure/machinery/power/apc/power/south, /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/station/medbay) -"sBW" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) "sBY" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/spawner/random/goggles/lowchance, @@ -24223,6 +24156,15 @@ /obj/structure/machinery/light/double/blue, /turf/open/floor/prison/whitegreen, /area/fiorina/station/medbay) +"sDp" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/filingcabinet, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) +"sDw" = ( +/turf/open/floor/prison, +/area/fiorina/station/lowsec/east) "sDL" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; @@ -24236,12 +24178,18 @@ icon_state = "human2" }, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "sDS" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/ammo_magazine/rifle/m16, /turf/open/floor/prison/darkyellow2, /area/fiorina/lz/near_lzI) +"sEK" = ( +/obj/structure/bed{ + icon_state = "abed" + }, +/turf/open/floor/prison/whitepurple/southeast, +/area/fiorina/station/research_cells/east) "sEO" = ( /turf/closed/wall/r_wall/prison, /area/fiorina/lz/near_lzII) @@ -24271,7 +24219,7 @@ }, /obj/item/tool/stamp, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "sFY" = ( /obj/structure/barricade/metal/wired{ dir = 4 @@ -24279,17 +24227,6 @@ /obj/structure/largecrate/random/secure, /turf/open/floor/plating/prison, /area/fiorina/station/central_ring) -"sGa" = ( -/obj/structure/platform_decoration, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/disco) -"sGg" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/item/stack/cable_coil, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) "sGk" = ( /obj/structure/bed/roller, /obj/structure/machinery/iv_drip{ @@ -24314,6 +24251,11 @@ /obj/structure/largecrate/random/case/double, /turf/open/floor/wood, /area/fiorina/station/park) +"sGS" = ( +/obj/structure/platform/metal/kutjevo_smooth/west, +/obj/structure/lattice, +/turf/open/space/basic, +/area/fiorina/oob) "sGX" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/snacks/mre_pack/meal4{ @@ -24321,7 +24263,7 @@ pixel_y = 9 }, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "sHe" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/stock_parts/subspace/amplifier{ @@ -24333,7 +24275,7 @@ pixel_y = 8 }, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "sHj" = ( /obj/structure/machinery/light/double/blue{ dir = 4; @@ -24341,7 +24283,7 @@ pixel_y = -3 }, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "sHL" = ( /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison/greenfull/east, @@ -24352,15 +24294,6 @@ }, /turf/open/floor/prison/whitegreen, /area/fiorina/station/medbay) -"sHO" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/turf/open/space, -/area/fiorina/oob) "sIg" = ( /obj/item/device/pinpointer, /turf/open/floor/prison/floor_plate/southwest, @@ -24379,7 +24312,7 @@ pixel_y = 13 }, /turf/open/floor/prison/kitchen, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "sIs" = ( /obj/item/weapon/gun/smg/nailgun, /obj/structure/surface/rack, @@ -24422,6 +24355,9 @@ /obj/item/stack/folding_barricade, /turf/open/floor/prison, /area/fiorina/station/security) +"sJH" = ( +/turf/open/floor/prison/whitepurple/southeast, +/area/fiorina/station/research_cells/east) "sJN" = ( /obj/structure/sign/prop3{ desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." @@ -24432,27 +24368,30 @@ /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison/floor_plate, /area/fiorina/station/lowsec) +"sJX" = ( +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/obj/structure/platform/metal/kutjevo_smooth/west, +/obj/structure/platform/metal/kutjevo_smooth/north, +/turf/open/space, +/area/fiorina/oob) "sKr" = ( /obj/item/storage/secure/briefcase{ pixel_x = 9; pixel_y = 18 }, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "sKt" = ( /obj/structure/bed/chair{ dir = 1; layer = 2.7 }, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) -"sKu" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_ew_full_cap" - }, -/obj/structure/platform/stair_cut/alt, -/turf/open/floor/plating/prison, -/area/fiorina/station/medbay) +/area/fiorina/station/lowsec/east) "sKY" = ( /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, @@ -24477,6 +24416,11 @@ }, /turf/closed/wall/r_wall/prison, /area/fiorina/tumor/civres) +"sLF" = ( +/obj/structure/lattice, +/obj/structure/platform/metal/kutjevo_smooth/west, +/turf/open/space, +/area/fiorina/oob) "sMe" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/book/manual/security_space_law{ @@ -24485,6 +24429,10 @@ }, /turf/open/floor/prison/darkredfull2, /area/fiorina/station/security) +"sMq" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/transit_hub) "sMX" = ( /obj/structure/machinery/cm_vending/sorted/tech/comp_storage, /turf/open/floor/prison/darkbrownfull2, @@ -24505,7 +24453,7 @@ "sNi" = ( /obj/item/device/flashlight, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "sNj" = ( /obj/structure/barricade/metal/wired{ dir = 8 @@ -24515,19 +24463,6 @@ }, /turf/open/floor/prison/floor_plate/southwest, /area/fiorina/station/telecomm/lz1_cargo) -"sNN" = ( -/obj/structure/platform, -/turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) -"sNQ" = ( -/obj/structure/monorail{ - name = "launch track" - }, -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/telecomm/lz1_tram) "sNU" = ( /turf/open/floor/prison/red/north, /area/fiorina/station/security) @@ -24576,14 +24511,6 @@ "sPi" = ( /turf/open/floor/prison/darkyellowcorners2/west, /area/fiorina/station/telecomm/lz1_cargo) -"sPt" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform/shiva, -/turf/open/floor/plating/prison, -/area/fiorina/station/central_ring) "sPJ" = ( /obj/structure/bed/chair{ dir = 4 @@ -24598,6 +24525,11 @@ }, /turf/open/floor/prison, /area/fiorina/station/disco) +"sQv" = ( +/obj/structure/platform/metal/almayer, +/obj/item/clothing/gloves/botanic_leather, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/botany) "sQy" = ( /obj/effect/decal/cleanable/blood, /obj/effect/spawner/random/gun/pistol/midchance, @@ -24612,19 +24544,10 @@ /obj/item/restraint/handcuffs, /turf/open/floor/prison/darkredfull2, /area/fiorina/station/security) -"sQL" = ( -/obj/structure/platform, -/turf/open/gm/river/red_pool, -/area/fiorina/station/park) "sRv" = ( /obj/item/clothing/shoes/marine/upp/knife, /turf/open/floor/prison, -/area/fiorina/station/lowsec) -"sRE" = ( -/obj/structure/platform, -/obj/structure/machinery/light/double/blue, -/turf/open/floor/prison/darkbrown2, -/area/fiorina/station/park) +/area/fiorina/station/lowsec/showers_laundry) "sRJ" = ( /obj/structure/machinery/constructable_frame, /obj/structure/machinery/light/double/blue{ @@ -24632,16 +24555,14 @@ pixel_y = 21 }, /turf/open/floor/prison/damaged2/southwest, -/area/fiorina/station/lowsec) -"sSM" = ( +/area/fiorina/station/lowsec/east) +"sSv" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_ew_full_cap" }, -/obj/structure/platform{ - dir = 1 - }, +/obj/structure/platform/metal/stair_cut/platform_right, /turf/open/floor/plating/prison, -/area/fiorina/station/park) +/area/fiorina/station/medbay) "sSY" = ( /obj/structure/disposalpipe/segment{ color = "#c4c4c4"; @@ -24692,22 +24613,16 @@ /obj/structure/barricade/wooden, /turf/open/floor/prison/darkyellow2/east, /area/fiorina/station/telecomm/lz1_cargo) -"sTU" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 6 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/park) "sUc" = ( /obj/structure/bed/chair/office/light{ dir = 1 }, /turf/open/floor/prison, /area/fiorina/station/transit_hub) +"sUd" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/prison/yellow/southwest, +/area/fiorina/station/disco/east_disco) "sUe" = ( /obj/structure/bed/chair{ dir = 8 @@ -24737,27 +24652,11 @@ "sUX" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/organic/grass/astroturf, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "sUY" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/corsat/squares, /area/fiorina/station/civres_blue) -"sVd" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/prison, -/area/fiorina/station/botany) -"sVv" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/turf/open/space, -/area/fiorina/oob) "sVS" = ( /obj/item/trash/pistachios, /turf/open/floor/prison/whitegreenfull/southwest, @@ -24812,20 +24711,24 @@ /obj/item/storage/bag/trash, /turf/open/floor/prison, /area/fiorina/station/disco) +"sWR" = ( +/obj/structure/platform/metal/almayer, +/turf/open/floor/prison/cell_stripe/west, +/area/fiorina/station/security) "sWX" = ( /obj/structure/stairs/perspective{ dir = 1; icon_state = "p_stair_full" }, /turf/open/floor/plating/plating_catwalk/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "sXa" = ( /obj/structure/machinery/filtration/console, /turf/open/floor/prison, /area/fiorina/station/power_ring) "sXe" = ( /turf/open/floor/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "sXi" = ( /turf/open/floor/corsat/plate, /area/fiorina/tumor/aux_engi) @@ -24861,6 +24764,11 @@ /obj/item/stack/sheet/metal, /turf/open/floor/plating/prison, /area/fiorina/station/security) +"sYX" = ( +/obj/structure/lattice, +/obj/structure/platform/metal/kutjevo_smooth, +/turf/open/space, +/area/fiorina/oob) "sZt" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison, @@ -24872,7 +24780,7 @@ "tad" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/prison/yellow/northwest, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "tai" = ( /obj/structure/bed/chair, /obj/structure/prop/souto_land/pole, @@ -24897,7 +24805,7 @@ "taI" = ( /obj/structure/machinery/vending/coffee, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "taL" = ( /obj/item/clothing/under/color/orange, /turf/open/floor/prison/floor_plate, @@ -24905,7 +24813,7 @@ "taS" = ( /obj/item/stack/cable_coil, /turf/open/floor/prison/blue/northeast, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "taY" = ( /obj/structure/window/framed/prison/reinforced/hull, /turf/open/space/basic, @@ -24928,6 +24836,10 @@ }, /turf/open/floor/prison/greenfull/east, /area/fiorina/tumor/servers) +"tcd" = ( +/obj/structure/platform/metal/almayer, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/botany) "tco" = ( /obj/item/paper/crumpled/bloody/csheet, /turf/open/floor/prison/floor_plate, @@ -24942,16 +24854,6 @@ }, /turf/open/floor/prison/whitegreen, /area/fiorina/station/medbay) -"tcL" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform, -/obj/structure/platform_decoration{ - dir = 10 - }, -/turf/open/floor/prison/bluefull, -/area/fiorina/station/chapel) "tcW" = ( /obj/structure/monorail{ name = "launch track" @@ -24967,12 +24869,6 @@ /obj/structure/largecrate/random, /turf/open/floor/prison/floor_plate, /area/fiorina/station/central_ring) -"tdq" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) "tdr" = ( /obj/structure/prop/resin_prop{ dir = 4; @@ -24981,6 +24877,10 @@ }, /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/tumor/ice_lab) +"tdY" = ( +/obj/structure/platform/metal/almayer, +/turf/open/floor/plating/prison, +/area/fiorina/station/central_ring) "tel" = ( /turf/closed/wall/mineral/bone_resin, /area/fiorina/station/medbay) @@ -24999,6 +24899,14 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/floor/prison/floor_plate, /area/fiorina/tumor/servers) +"teE" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_ew_full_cap" + }, +/obj/structure/platform/metal/stair_cut/platform_left, +/turf/open/floor/plating/prison, +/area/fiorina/station/power_ring) "teI" = ( /obj/structure/largecrate/supply/supplies/tables_racks, /turf/open/floor/prison/floor_plate, @@ -25025,6 +24933,13 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) +"tfy" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/effect/decal/medical_decals{ + icon_state = "triagedecaldir" + }, +/turf/open/floor/prison/whitegreenfull/southwest, +/area/fiorina/station/medbay) "tfP" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/tumor/fiberbush) @@ -25066,7 +24981,7 @@ pixel_y = 4 }, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "thI" = ( /obj/structure/machinery/light/double/blue{ dir = 8; @@ -25085,14 +25000,14 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) -"til" = ( -/obj/structure/platform{ - dir = 4 +"tim" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_sn_full_cap" }, -/obj/item/stool, -/obj/item/clothing/shoes/slippers_worn, -/turf/open/floor/prison/bluefull, -/area/fiorina/station/civres_blue) +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/prison/whitegreenfull/southwest, +/area/fiorina/tumor/ice_lab) "tir" = ( /obj/item/ammo_magazine/rifle/m16, /turf/open/floor/prison, @@ -25105,20 +25020,14 @@ }, /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/station/medbay) -"tiM" = ( -/obj/item/shard{ - icon_state = "medium"; - name = "ice shard" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/prison/whitegreen/west, -/area/fiorina/tumor/ice_lab) +"tiP" = ( +/obj/structure/barricade/wooden, +/turf/open/floor/prison/whitepurple/west, +/area/fiorina/station/research_cells/west) "tiX" = ( /obj/item/stack/sheet/mineral/plastic, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "tiY" = ( /turf/open/floor/prison/floorscorched2, /area/fiorina/tumor/civres) @@ -25128,6 +25037,13 @@ "tja" = ( /turf/open/floor/prison/sterile_white/southwest, /area/fiorina/station/medbay) +"tjh" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = -12 + }, +/turf/open/floor/prison/yellow/southwest, +/area/fiorina/station/lowsec/east) "tji" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -25144,11 +25060,6 @@ }, /turf/open/floor/prison, /area/fiorina/station/telecomm/lz1_cargo) -"tjw" = ( -/obj/structure/platform_decoration, -/obj/structure/inflatable, -/turf/open/floor/prison/whitegreen, -/area/fiorina/station/medbay) "tjR" = ( /obj/structure/machinery/shower{ pixel_y = 13 @@ -25158,7 +25069,7 @@ pixel_y = -1 }, /turf/open/floor/prison/kitchen, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "tkd" = ( /obj/structure/filingcabinet, /obj/structure/filingcabinet{ @@ -25170,16 +25081,12 @@ /obj/structure/machinery/door/airlock/prison_hatch/autoname, /turf/open/floor/prison/floor_plate, /area/fiorina/station/park) +"tkh" = ( +/turf/open/floor/prison/yellow/southeast, +/area/fiorina/station/disco/east_disco) "tkj" = ( /turf/open/floor/prison/darkbrown2/north, /area/fiorina/station/park) -"tkP" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_ew_full_cap" - }, -/obj/structure/platform/stair_cut/alt, -/turf/open/floor/plating/prison, -/area/fiorina/station/botany) "tkZ" = ( /obj/structure/machinery/light/double/blue{ dir = 8; @@ -25187,7 +25094,7 @@ pixel_y = -3 }, /turf/open/floor/prison/whitepurple/west, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "tle" = ( /obj/structure/filingcabinet{ pixel_x = 8; @@ -25205,7 +25112,7 @@ dir = 4 }, /turf/open/floor/prison/bluecorner, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "tlq" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/flashlight/lamp{ @@ -25222,31 +25129,6 @@ }, /turf/open/floor/almayer, /area/fiorina/tumor/ship) -"tlC" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 5 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) -"tlF" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = -3 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/flight_deck) "tlJ" = ( /obj/item/shard{ icon_state = "medium" @@ -25309,10 +25191,14 @@ /obj/effect/landmark/queen_spawn, /turf/open/floor/prison/darkbrown2/north, /area/fiorina/tumor/aux_engi) -"tnY" = ( -/obj/structure/platform_decoration, +"tnx" = ( +/obj/structure/platform_decoration/metal/almayer, +/obj/item/shard{ + icon_state = "medium"; + name = "ice shard" + }, /turf/open/floor/prison/whitegreen, -/area/fiorina/station/medbay) +/area/fiorina/tumor/ice_lab) "tob" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 2; @@ -25320,9 +25206,35 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) +"tok" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/central_ring) "toE" = ( /turf/open/floor/carpet, /area/fiorina/station/civres_blue) +"toG" = ( +/obj/structure/platform/metal/kutjevo_smooth/north, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/obj/structure/platform/metal/kutjevo_smooth/east, +/turf/open/space, +/area/fiorina/oob) +"toN" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/power_ring) "tpa" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ req_one_access = null @@ -25392,21 +25304,6 @@ /obj/item/storage/toolbox, /turf/open/floor/prison/darkyellowfull2/east, /area/fiorina/tumor/servers) -"tqP" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/platform/kutjevo/smooth, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/turf/open/space/basic, -/area/fiorina/oob) "trl" = ( /obj/item/trash/buritto, /turf/open/floor/plating/prison, @@ -25425,7 +25322,7 @@ }, /obj/item/storage/fancy/cigarettes/blackpack, /turf/open/floor/prison/whitepurple/southeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "trS" = ( /obj/structure/barricade/wooden{ dir = 8 @@ -25483,6 +25380,10 @@ }, /turf/open/floor/prison/darkredfull2, /area/fiorina/station/security) +"ttU" = ( +/obj/structure/platform/metal/almayer, +/turf/open/gm/river/red_pool, +/area/fiorina/station/park) "tuf" = ( /obj/item/clothing/shoes/jackboots{ name = "Awesome Guy" @@ -25501,18 +25402,6 @@ "tuA" = ( /turf/open/floor/prison/cell_stripe/west, /area/fiorina/station/telecomm/lz1_tram) -"tuX" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 9 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/power_ring) "tvi" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, @@ -25543,7 +25432,7 @@ pixel_y = 21 }, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "txh" = ( /obj/structure/bed/sofa/vert/grey, /turf/open/floor/prison, @@ -25585,21 +25474,7 @@ pixel_y = 29 }, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) -"tzM" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/prison, -/area/fiorina/station/disco) -"tzN" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/platform/kutjevo/smooth, -/obj/structure/lattice, -/turf/open/space/basic, -/area/fiorina/oob) +/area/fiorina/station/research_cells/west) "tzU" = ( /obj/structure/machinery/vending/snack, /turf/open/floor/prison/bluefull, @@ -25626,7 +25501,7 @@ "tAE" = ( /obj/structure/barricade/handrail, /turf/open/floor/prison/whitepurple/north, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "tAR" = ( /obj/structure/surface/rack, /obj/item/tool/extinguisher, @@ -25642,7 +25517,11 @@ dir = 1 }, /turf/open/floor/interior/plastic, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) +"tCm" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/flight_deck) "tCv" = ( /obj/effect/landmark/corpsespawner/ua_riot/burst, /turf/open/floor/prison/greenfull/east, @@ -25651,12 +25530,6 @@ /obj/item/stack/folding_barricade, /turf/open/floor/prison/floor_plate, /area/fiorina/station/security) -"tCZ" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/turf/open/floor/almayer_hull, -/area/fiorina/oob) "tDB" = ( /obj/structure/surface/table/woodentable, /obj/item/device/flashlight/lamp{ @@ -25684,6 +25557,14 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) +"tDK" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/central_ring) +"tDO" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/civres_blue) "tDQ" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -25706,6 +25587,9 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/transit_hub) +"tEU" = ( +/turf/open/floor/prison/bluefull, +/area/fiorina/station/power_ring/reactor) "tEX" = ( /obj/structure/machinery/vending/cigarette, /turf/open/floor/prison/floor_plate, @@ -25722,22 +25606,12 @@ }, /turf/open/floor/prison/floor_plate, /area/fiorina/lz/near_lzII) -"tFA" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/plating/prison, -/area/fiorina/lz/near_lzI) -"tFY" = ( -/obj/structure/platform, -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/firstaid/regular, -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = -3 +"tFB" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/decal/medical_decals{ + icon_state = "cryomid" }, -/turf/open/floor/prison/whitegreen/southeast, +/turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/station/medbay) "tGU" = ( /obj/structure/closet/crate/medical, @@ -25758,17 +25632,16 @@ "tHl" = ( /obj/structure/inflatable, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) +"tHp" = ( +/obj/structure/machinery/space_heater, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/prison/whitegreen/east, +/area/fiorina/tumor/ice_lab) "tHw" = ( /obj/item/stack/rods, /turf/open/floor/prison/darkbrown2/east, /area/fiorina/tumor/aux_engi) -"tHF" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/prison/whitegreenfull/southwest, -/area/fiorina/station/medbay) "tHJ" = ( /obj/structure/closet/firecloset, /obj/effect/landmark/objective_landmark/medium, @@ -25793,15 +25666,6 @@ /obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/prison, /area/fiorina/station/chapel) -"tIp" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/turf/open/space/basic, -/area/fiorina/oob) "tIC" = ( /obj/structure/flora/bush/ausbushes/ausbush{ desc = "Fiberbush(tm) infestations are the leading cause in asbestos related deaths for 3 years in a row."; @@ -25810,6 +25674,10 @@ }, /turf/open/organic/grass/astroturf, /area/fiorina/tumor/fiberbush) +"tIN" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/prison/sterile_white/southwest, +/area/fiorina/station/research_cells/west) "tIU" = ( /obj/item/tool/candle, /turf/open/floor/prison/chapel_carpet, @@ -25850,6 +25718,13 @@ }, /turf/open/organic/grass/astroturf, /area/fiorina/tumor/fiberbush) +"tKh" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/machinery/door/airlock/prison_hatch/autoname{ + dir = 1 + }, +/turf/open/floor/prison/floor_plate, +/area/fiorina/tumor/ice_lab) "tKk" = ( /obj/structure/bed{ icon_state = "abed" @@ -25885,6 +25760,14 @@ }, /turf/open/floor/prison/darkbrown2, /area/fiorina/station/park) +"tMr" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/central_ring) "tMs" = ( /obj/item/weapon/gun/smg/mp5, /obj/effect/decal/cleanable/blood, @@ -25909,6 +25792,12 @@ /obj/structure/closet/firecloset/full, /turf/open/floor/prison/floor_plate, /area/fiorina/station/medbay) +"tMW" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/open/floor/prison/blue/southeast, +/area/fiorina/station/power_ring/reactor) "tNf" = ( /obj/structure/stairs/perspective{ dir = 1; @@ -25933,11 +25822,11 @@ /area/fiorina/station/park) "tOc" = ( /turf/open/floor/wood, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "tOp" = ( /obj/structure/window/framed/prison/cell, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "tOG" = ( /obj/structure/surface/table/woodentable, /obj/item/storage/pill_bottle/kelotane/skillless, @@ -25946,11 +25835,6 @@ "tOM" = ( /turf/open/floor/prison, /area/fiorina/station/power_ring) -"tOP" = ( -/obj/structure/platform, -/obj/structure/closet/radiation, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) "tOS" = ( /obj/structure/flora/grass/tallgrass/jungle, /obj/item/reagent_container/food/snacks/grown/eggplant{ @@ -25974,7 +25858,7 @@ /area/fiorina/station/telecomm/lz1_cargo) "tPB" = ( /turf/open/floor/prison/whitepurple/southeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "tPC" = ( /turf/open/floor/prison/darkyellowcorners2, /area/fiorina/station/flight_deck) @@ -25982,6 +25866,11 @@ /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, /area/fiorina/maintenance) +"tPR" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/surface/rack, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) "tQk" = ( /obj/item/shard{ icon_state = "medium" @@ -26003,23 +25892,10 @@ /obj/structure/surface/table/reinforced/prison, /obj/item/stack/sheet/mineral/plastic, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "tSm" = ( /turf/open/floor/prison/greenblue/west, /area/fiorina/station/botany) -"tSL" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 9 - }, -/obj/structure/largecrate/random, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) "tSY" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/prison, @@ -26030,7 +25906,7 @@ pixel_y = 12 }, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "tTv" = ( /obj/item/stack/sandbags/large_stack, /turf/open/floor/prison/darkyellow2/west, @@ -26076,18 +25952,30 @@ /obj/item/explosive/grenade/high_explosive/frag, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) +"tVp" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/closet/crate/bravo, +/obj/item/stack/sheet/plasteel, +/obj/item/tool/wirecutters, +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = 13 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/lowsec/showers_laundry) "tVI" = ( /obj/structure/inflatable/popped/door, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "tVV" = ( /obj/effect/landmark/corpsespawner/ua_riot, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "tVY" = ( /obj/structure/machinery/power/smes/buildable, /turf/open/floor/prison, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "tWf" = ( /obj/structure/inflatable/popped, /turf/open/floor/plating/plating_catwalk/prison, @@ -26096,22 +25984,19 @@ /obj/structure/closet/secure_closet/hydroponics, /turf/open/floor/prison/greenfull/northwest, /area/fiorina/station/botany) +"tWo" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/prison/greenblue/west, +/area/fiorina/station/botany) "tWs" = ( /obj/item/toy/deck, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "tWz" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/tool/pen/blue/clicky, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) -"tWI" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/turf/open/space, -/area/fiorina/oob) +/area/fiorina/station/power_ring/reactor) "tXt" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -26119,16 +26004,6 @@ }, /turf/open/floor/prison/greenfull/northwest, /area/fiorina/station/transit_hub) -"tXD" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/park) "tXT" = ( /obj/structure/machinery/vending/cola, /turf/open/floor/prison/redfull, @@ -26152,10 +26027,13 @@ "tYw" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/tumor/civres) -"tYD" = ( -/obj/structure/platform_decoration, -/turf/open/floor/prison/blue/southeast, -/area/fiorina/station/power_ring) +"tYz" = ( +/obj/structure/bed/roller, +/obj/item/bedsheet/green, +/obj/effect/landmark/corpsespawner/scientist, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison/whitepurple/north, +/area/fiorina/station/research_cells/west) "tYQ" = ( /obj/structure/bed/chair, /turf/open/floor/prison/blue_plate/east, @@ -26170,7 +26048,7 @@ icon_state = "pottedplant_22" }, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "tZk" = ( /turf/open/floor/prison/greenfull/northwest, /area/fiorina/tumor/aux_engi) @@ -26178,6 +26056,10 @@ /obj/structure/prop/almayer/computers/sensor_computer1, /turf/open/floor/prison/darkredfull2, /area/fiorina/lz/near_lzI) +"tZE" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/prison, +/area/fiorina/station/medbay) "tZO" = ( /obj/item/frame/rack, /turf/open/floor/plating/prison, @@ -26212,12 +26094,15 @@ pixel_y = 21 }, /turf/open/floor/prison/kitchen, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "ubo" = ( /obj/item/stack/sheet/metal/medium_stack, /obj/structure/surface/rack, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) +"ubx" = ( +/turf/open/floor/plating/prison, +/area/fiorina/station/disco/east_disco) "ubA" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/emails{ @@ -26241,7 +26126,7 @@ }, /obj/structure/blocker/invisible_wall, /turf/open/ice/noweed, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "ubX" = ( /turf/open/floor/prison/whitegreen/northeast, /area/fiorina/tumor/ice_lab) @@ -26273,6 +26158,10 @@ /obj/structure/machinery/light/double/blue, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/telecomm/lz1_tram) +"udd" = ( +/obj/structure/platform/metal/almayer, +/turf/open/floor/prison/darkbrown2, +/area/fiorina/station/park) "udj" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/prison/floor_plate, @@ -26312,6 +26201,14 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) +"ueD" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/prison, +/area/fiorina/station/disco) "ueI" = ( /obj/structure/filingcabinet, /turf/open/floor/prison/whitegreenfull/southwest, @@ -26329,7 +26226,7 @@ "ufE" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "ufL" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_sn_full_cap" @@ -26346,14 +26243,14 @@ /area/fiorina/tumor/aux_engi) "ufR" = ( /turf/open/floor/prison/whitepurplecorner/east, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "ugg" = ( /obj/structure/closet/crate/miningcar{ name = "\improper materials storage bin" }, /obj/item/reagent_container/food/snacks/meat, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "ugk" = ( /turf/open/floor/prison/darkbrowncorners2, /area/fiorina/tumor/aux_engi) @@ -26369,16 +26266,6 @@ }, /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/station/medbay) -"ugv" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/turf/open/space/basic, -/area/fiorina/oob) "ugI" = ( /obj/item/fuel_cell, /turf/open/floor/prison, @@ -26405,11 +26292,11 @@ "uhm" = ( /obj/structure/window_frame/prison/reinforced, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "uhA" = ( /obj/structure/closet/bodybag, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "uhX" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/prison/whitegreen/northeast, @@ -26427,18 +26314,6 @@ }, /turf/open/floor/prison/darkbrown2, /area/fiorina/station/park) -"uiV" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/decal/cleanable/blood/oil, -/obj/structure/machinery/light/double/blue{ - dir = 4; - pixel_x = 10; - pixel_y = 13 - }, -/turf/open/floor/plating/prison, -/area/fiorina/lz/near_lzI) "ujb" = ( /turf/open/floor/prison/darkyellowcorners2/north, /area/fiorina/station/telecomm/lz1_cargo) @@ -26452,7 +26327,7 @@ name = "ice shard" }, /turf/open/organic/grass/astroturf, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "ujz" = ( /obj/item/paper/prison_station/inmate_handbook, /turf/open/floor/prison/floor_plate/southwest, @@ -26467,20 +26342,14 @@ }, /turf/open/organic/grass/astroturf, /area/fiorina/station/park) -"uky" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 10 - }, -/turf/open/floor/prison/whitegreen/southwest, -/area/fiorina/tumor/ice_lab) "ulc" = ( /obj/item/paper, /turf/open/floor/prison/whitepurple/west, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) +"ulN" = ( +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/power_ring/reactor) "ume" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/drinks/coffee{ @@ -26500,6 +26369,12 @@ "umm" = ( /turf/open/floor/prison/yellow/north, /area/fiorina/station/central_ring) +"umu" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + icon = 'icons/obj/structures/doors/2x1prepdoor.dmi' + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/lowsec/east) "umy" = ( /obj/structure/prop/resin_prop{ dir = 4; @@ -26516,6 +26391,9 @@ /obj/item/clothing/gloves/boxing/blue, /turf/open/floor/prison/yellow/northwest, /area/fiorina/station/central_ring) +"umN" = ( +/turf/closed/wall/prison, +/area/fiorina/station/lowsec/east) "umW" = ( /obj/structure/bed/sofa/pews, /turf/open/floor/wood, @@ -26553,13 +26431,6 @@ "unA" = ( /turf/open/floor/prison/platingdmg1, /area/fiorina/station/civres_blue) -"unF" = ( -/obj/item/tool/wirecutters, -/obj/structure/platform/shiva{ - dir = 1 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/central_ring) "uou" = ( /obj/structure/barricade/sandbags{ dir = 8; @@ -26568,7 +26439,15 @@ }, /obj/item/storage/toolbox/syndicate, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) +"uow" = ( +/obj/structure/machinery/light/double/blue{ + dir = 8; + pixel_x = -10; + pixel_y = -3 + }, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/power_ring/reactor) "uoH" = ( /obj/structure/barricade/sandbags{ dir = 4; @@ -26577,15 +26456,11 @@ }, /obj/item/storage/pouch/tools/full, /turf/open/floor/prison/yellow/southwest, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "upf" = ( /obj/structure/closet/toolcloset, /turf/open/floor/prison/darkbrown2/west, /area/fiorina/maintenance) -"upr" = ( -/obj/structure/platform, -/turf/open/floor/prison/whitegreen, -/area/fiorina/station/medbay) "upw" = ( /turf/open/floor/prison/red/west, /area/fiorina/lz/near_lzII) @@ -26602,7 +26477,7 @@ "upM" = ( /obj/structure/disposalpipe/broken, /turf/open/floor/plating/prison, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "upX" = ( /obj/structure/sign/nosmoking_1, /turf/closed/wall/prison, @@ -26615,31 +26490,38 @@ /obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/station/medbay) -"uqj" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/prison/bright_clean2/southwest, -/area/fiorina/station/park) "uqV" = ( /obj/structure/inflatable, /turf/open/floor/prison/whitepurple/north, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "urv" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison, /area/fiorina/station/flight_deck) -"urJ" = ( -/obj/structure/platform/kutjevo/smooth, -/turf/open/floor/almayer_hull, -/area/fiorina/oob) +"urw" = ( +/obj/structure/machinery/power/apc/power/north, +/turf/open/floor/prison/whitepurple/north, +/area/fiorina/station/research_cells/east) "usg" = ( /obj/effect/spawner/random/attachment, /turf/open/floor/plating/prison, /area/fiorina/maintenance) +"utl" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/northwest, +/obj/structure/platform_decoration/metal/almayer/northeast, +/turf/open/floor/plating/prison, +/area/fiorina/lz/near_lzI) +"utm" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison, +/area/fiorina/station/medbay) "uts" = ( /obj/structure/surface/rack, /obj/item/storage/toolbox/mechanical/green, @@ -26651,7 +26533,7 @@ dir = 4 }, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "utL" = ( /obj/structure/bed/chair, /turf/open/floor/prison/darkbrown2/north, @@ -26663,7 +26545,7 @@ "uud" = ( /obj/structure/bed/chair/office/dark, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "uuk" = ( /obj/item/reagent_container/food/drinks/cans/waterbottle, /turf/open/floor/prison/floor_plate, @@ -26675,7 +26557,7 @@ }, /obj/structure/machinery/light/double/blue, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "uuJ" = ( /obj/structure/holohoop{ dir = 8; @@ -26686,7 +26568,7 @@ dir = 4 }, /turf/open/organic/grass/astroturf, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "uuL" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ density = 0; @@ -26742,14 +26624,7 @@ "uwk" = ( /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) -"uws" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_ew_full_cap" - }, -/obj/structure/platform/stair_cut/alt, -/turf/open/floor/plating/prison, -/area/fiorina/station/civres_blue) +/area/fiorina/station/research_cells/west) "uwT" = ( /obj/structure/sign/poster{ icon_state = "poster10"; @@ -26783,6 +26658,10 @@ /obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/prison/bluefull, /area/fiorina/station/power_ring) +"uyA" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/botany) "uyC" = ( /obj/structure/machinery/shower{ pixel_y = 13 @@ -26791,7 +26670,7 @@ dir = 4 }, /turf/open/floor/prison/kitchen, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "uyM" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating/prison, @@ -26848,26 +26727,23 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/power_ring) -"uBV" = ( -/obj/structure/platform_decoration{ - dir = 4 +"uBX" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 }, -/turf/open/floor/prison/bluefull, -/area/fiorina/station/power_ring) +/turf/open/floor/prison/darkpurplefull2, +/area/fiorina/station/research_cells/west) "uCO" = ( /obj/structure/bed/chair/comfy{ dir = 4 }, /turf/open/floor/prison/floor_plate, /area/fiorina/station/power_ring) -"uCX" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform, +"uDF" = ( +/obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, -/area/fiorina/station/park) +/area/fiorina/station/disco/east_disco) "uDX" = ( /obj/structure/prop/structure_lattice{ health = 300 @@ -26889,6 +26765,10 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating/prison, /area/fiorina/station/transit_hub) +"uEl" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, +/turf/open/space/basic, +/area/fiorina/oob) "uEy" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison/cell_stripe/east, @@ -26922,19 +26802,32 @@ }, /turf/open/floor/prison/floor_plate, /area/fiorina/station/power_ring) -"uFs" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_ew_full_cap" - }, -/obj/structure/platform{ - dir = 1 +"uFr" = ( +/obj/structure/platform_decoration/metal/almayer, +/obj/structure/barricade/handrail/type_b{ + dir = 4; + layer = 3.5 }, -/turf/open/floor/plating/prison, -/area/fiorina/station/telecomm/lz1_tram) +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/disco) +"uFx" = ( +/obj/structure/platform/metal/kutjevo_smooth/north, +/obj/structure/platform/metal/kutjevo_smooth/east, +/turf/open/space/basic, +/area/fiorina/oob) "uFC" = ( /obj/structure/barricade/metal/wired, /turf/open/floor/prison/floor_plate/southwest, /area/fiorina/station/telecomm/lz1_cargo) +"uFL" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/disco) +"uFW" = ( +/obj/effect/landmark/corpsespawner/scientist, +/turf/open/floor/prison/whitepurple/north, +/area/fiorina/station/research_cells/west) "uGu" = ( /obj/effect/decal/hefa_cult_decals/d32{ icon_state = "3" @@ -26953,7 +26846,7 @@ name = "Insta-Sand! bag" }, /turf/open/floor/prison/yellow/northeast, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "uGT" = ( /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, @@ -26965,6 +26858,14 @@ /obj/item/tool/weldingtool, /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) +"uHv" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/turf/open/floor/prison, +/area/fiorina/station/botany) "uIg" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/toolbox/mechanical{ @@ -27009,7 +26910,7 @@ "uJp" = ( /obj/structure/inflatable, /turf/open/floor/prison/yellow/northwest, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "uJG" = ( /obj/item/ammo_casing{ icon_state = "casing_10_1" @@ -27041,32 +26942,18 @@ /obj/structure/bed/roller, /obj/item/bedsheet/green, /turf/open/floor/prison/whitepurple/north, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "uKX" = ( /turf/open/floor/prison/redfull, /area/fiorina/station/security/wardens) -"uLf" = ( -/obj/structure/platform, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/park) "uLj" = ( /obj/effect/decal/cleanable/blood/gibs/robot/limb, /turf/open/floor/prison/whitepurple/northeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "uLq" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/prison/cell_stripe/east, /area/fiorina/station/telecomm/lz1_tram) -"uLr" = ( -/obj/vehicle/powerloader, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/power_ring) "uLJ" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/station_alert, @@ -27080,7 +26967,7 @@ "uLV" = ( /obj/item/bedsheet, /turf/open/floor/prison/kitchen, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "uMc" = ( /obj/structure/largecrate/random/barrel/white, /turf/open/floor/prison, @@ -27098,6 +26985,12 @@ /obj/structure/surface/rack, /turf/open/floor/plating/plating_catwalk, /area/fiorina/tumor/ship) +"uMt" = ( +/obj/structure/platform/metal/kutjevo_smooth, +/obj/structure/platform/metal/kutjevo_smooth/west, +/obj/structure/lattice, +/turf/open/space/basic, +/area/fiorina/oob) "uMw" = ( /turf/open/floor/wood, /area/fiorina/station/security/wardens) @@ -27123,6 +27016,12 @@ }, /turf/open/floor/prison, /area/fiorina/tumor/servers) +"uNh" = ( +/obj/structure/stairs/perspective, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/plating/prison, +/area/fiorina/station/medbay) "uNm" = ( /obj/effect/decal/cleanable/blood, /obj/effect/spawner/random/gun/rifle/highchance, @@ -27138,6 +27037,14 @@ /obj/structure/machinery/landinglight/ds1, /turf/open/floor/prison/darkyellowfull2/east, /area/fiorina/lz/near_lzI) +"uNB" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/machinery/light/double/blue{ + dir = 1; + pixel_y = 21 + }, +/turf/open/floor/prison/cell_stripe, +/area/fiorina/station/lowsec) "uNG" = ( /obj/structure/machinery/power/apc/power/north, /turf/open/floor/prison, @@ -27180,18 +27087,6 @@ "uPl" = ( /turf/open/floor/prison/darkyellowcorners2/east, /area/fiorina/station/telecomm/lz1_cargo) -"uPA" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 5 - }, -/turf/open/gm/river/desert/deep, -/area/fiorina/lz/near_lzII) "uPX" = ( /turf/open/floor/prison/green/northeast, /area/fiorina/tumor/civres) @@ -27213,6 +27108,15 @@ /obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, /turf/open/floor/prison/whitegreen/southeast, /area/fiorina/tumor/ice_lab) +"uRh" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = 13 + }, +/obj/structure/platform_decoration/metal/almayer, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/disco) "uRv" = ( /obj/structure/machinery/light/double/blue{ dir = 4; @@ -27255,22 +27159,19 @@ /obj/item/tool/kitchen/utensil/pknife, /turf/open/floor/prison, /area/fiorina/station/power_ring) -"uSY" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/vehicle/powerloader/ft, -/turf/open/floor/plating/prison, -/area/fiorina/station/power_ring) "uTb" = ( /obj/structure/machinery/light/double/blue{ pixel_y = -1 }, /turf/open/floor/prison/darkyellow2/southwest, /area/fiorina/station/telecomm/lz1_cargo) +"uTq" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = -12 + }, +/turf/open/floor/prison/whitepurple/southwest, +/area/fiorina/station/research_cells/east) "uTr" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, /turf/open/floor/prison/whitegreen/west, @@ -27283,10 +27184,14 @@ /obj/item/device/flashlight/flare, /turf/open/floor/prison/darkyellowcorners2/north, /area/fiorina/station/telecomm/lz1_cargo) +"uTv" = ( +/obj/structure/window/framed/prison/reinforced/hull, +/turf/open/floor/plating/prison, +/area/fiorina/station/lowsec/east) "uTw" = ( /obj/item/weapon/gun/rifle/mar40, /turf/open/floor/prison/bluefull, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "uTA" = ( /obj/structure/bed/chair{ dir = 8 @@ -27331,6 +27236,12 @@ }, /turf/open/floor/prison, /area/fiorina/station/power_ring) +"uVM" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/closet/firecloset/full, +/obj/item/paper/prison_station/inmate_handbook, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) "uVO" = ( /obj/structure/prop/souto_land/pole{ dir = 1 @@ -27360,6 +27271,12 @@ }, /turf/open/floor/prison/blue_plate/east, /area/fiorina/station/botany) +"uWk" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/east, +/obj/item/tool/extinguisher/mini, +/turf/open/floor/plating/prison, +/area/fiorina/station/security) "uWA" = ( /obj/structure/closet/secure_closet/engineering_electrical, /obj/structure/machinery/light/double/blue{ @@ -27370,20 +27287,6 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison/greenfull/east, /area/fiorina/tumor/civres) -"uWO" = ( -/obj/structure/platform_decoration, -/turf/open/floor/prison/darkbrown2, -/area/fiorina/station/park) -"uWQ" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform, -/obj/structure/platform_decoration{ - dir = 10 - }, -/turf/open/gm/river/desert/deep, -/area/fiorina/lz/near_lzII) "uXn" = ( /obj/structure/flora/bush/ausbushes/ausbush{ desc = "Fiberbush(tm) infestations have been the leading cause in asbestos related deaths in spacecraft for 3 years in a row now."; @@ -27423,14 +27326,6 @@ "uYi" = ( /turf/open/floor/prison/darkyellow2, /area/fiorina/lz/near_lzI) -"uYo" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/turf/open/floor/plating/prison, -/area/fiorina/station/flight_deck) "uYx" = ( /obj/structure/prop/resin_prop{ icon_state = "coolanttank" @@ -27485,7 +27380,7 @@ "vao" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/prison, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "vaC" = ( /obj/structure/closet/bombcloset, /obj/item/clothing/suit/armor/bulletproof, @@ -27498,6 +27393,11 @@ /obj/structure/machinery/vending/coffee, /turf/open/floor/prison, /area/fiorina/tumor/aux_engi) +"vce" = ( +/obj/structure/platform/metal/almayer/east, +/obj/item/tool/shovel/spade, +/turf/open/floor/prison/greenfull/northwest, +/area/fiorina/station/botany) "vcf" = ( /turf/closed/shuttle/ert{ icon_state = "stan5" @@ -27507,20 +27407,22 @@ /obj/effect/spawner/random/toolbox, /turf/open/floor/prison/floor_plate, /area/fiorina/station/medbay) +"vcn" = ( +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 + }, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/power_ring/reactor) "vcq" = ( /obj/effect/decal/cleanable/blood/xeno, /turf/open/floor/prison/blue_plate/west, /area/fiorina/station/botany) -"vcu" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/disco) "vcv" = ( /obj/item/tool/screwdriver, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "vcC" = ( /obj/item/stack/rods, /turf/open/space, @@ -27560,6 +27462,11 @@ }, /turf/open/floor/prison/floor_plate, /area/fiorina/station/disco) +"vej" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/transit_hub) "vel" = ( /obj/structure/machinery/vending/coffee, /turf/open/floor/prison/floor_plate, @@ -27591,13 +27498,10 @@ /obj/structure/inflatable, /turf/open/floor/prison/whitegreen/southwest, /area/fiorina/station/medbay) -"veW" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_ew_full_cap" - }, -/obj/structure/platform/stair_cut/alt, +"vft" = ( +/obj/structure/platform/metal/almayer/west, /turf/open/floor/plating/prison, -/area/fiorina/station/flight_deck) +/area/fiorina/station/power_ring) "vfz" = ( /obj/item/storage/box/donkpockets, /obj/structure/surface/table/reinforced/prison, @@ -27619,7 +27523,7 @@ /area/fiorina/station/power_ring) "vfO" = ( /turf/open/floor/prison/floor_marked/west, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "vgi" = ( /obj/item/stack/rods, /turf/open/floor/prison/floor_plate, @@ -27628,6 +27532,13 @@ /obj/item/storage/toolbox/antag, /turf/open/floor/prison/green/west, /area/fiorina/tumor/civres) +"vgA" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform/metal/almayer, +/obj/structure/platform_decoration/metal/almayer/southeast, +/obj/structure/closet/emcloset, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) "vgC" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -27635,6 +27546,16 @@ }, /turf/open/floor/prison/darkyellow2/northwest, /area/fiorina/lz/near_lzI) +"vgG" = ( +/obj/structure/machinery/power/apc/power/west, +/turf/open/floor/plating/prison, +/area/fiorina/station/disco) +"vgK" = ( +/obj/structure/platform/metal/kutjevo_smooth/west, +/obj/structure/platform/metal/kutjevo_smooth/east, +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/almayer_hull, +/area/fiorina/station/medbay) "vgL" = ( /obj/structure/closet/secure_closet/guncabinet{ req_access = null @@ -27653,14 +27574,6 @@ /obj/structure/machinery/recharger, /turf/open/floor/prison/darkredfull2, /area/fiorina/lz/near_lzI) -"vhk" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/turf/open/floor/plating/prison, -/area/fiorina/station/power_ring) "vhy" = ( /obj/item/reagent_container/food/drinks/cans/waterbottle, /turf/open/floor/prison/floor_plate/southwest, @@ -27675,20 +27588,6 @@ /obj/item/stock_parts/micro_laser/ultra, /turf/open/floor/prison, /area/fiorina/tumor/servers) -"viX" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/turf/open/space/basic, -/area/fiorina/oob) "vja" = ( /obj/structure/machinery/light/double/blue{ pixel_y = -1 @@ -27713,7 +27612,7 @@ "vjR" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating/prison, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "vjT" = ( /obj/effect/alien/weeds/node, /turf/open/floor/plating/prison, @@ -27739,14 +27638,6 @@ }, /turf/open/floor/prison/whitegreen/east, /area/fiorina/station/medbay) -"vkt" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/turf/open/floor/plating/prison, -/area/fiorina/station/central_ring) "vlK" = ( /obj/structure/surface/rack, /turf/open/floor/prison/whitegreen/northwest, @@ -27840,7 +27731,7 @@ "voh" = ( /obj/item/tool/warning_cone, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "voi" = ( /turf/open/floor/prison/darkbrownfull2, /area/fiorina/station/park) @@ -27851,25 +27742,16 @@ /obj/structure/surface/table/woodentable/fancy, /turf/open/floor/wood, /area/fiorina/station/security/wardens) -"vov" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/prison, -/area/fiorina/station/transit_hub) +"vor" = ( +/obj/item/weapon/gun/rifle/m16, +/obj/effect/decal/cleanable/blood, +/obj/effect/landmark/corpsespawner/prisoner, +/turf/open/floor/prison/damaged3, +/area/fiorina/station/security) "voI" = ( /obj/item/tool/wrench, /turf/open/floor/prison/bluefull, -/area/fiorina/station/power_ring) -"voK" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/medbay) +/area/fiorina/station/power_ring/reactor) "voO" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/prison/yellow, @@ -27884,14 +27766,6 @@ }, /turf/open/floor/prison/floor_plate, /area/fiorina/station/lowsec) -"vpN" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_ew_full_cap" - }, -/obj/structure/platform/stair_cut, -/turf/open/floor/plating/prison, -/area/fiorina/lz/near_lzII) "vql" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/spawner/random/tool, @@ -27904,18 +27778,18 @@ "vqs" = ( /obj/item/paper/prison_station/inmate_handbook, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "vqW" = ( /obj/item/stack/sheet/cardboard, /turf/open/floor/prison/whitepurple/west, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "vrp" = ( /obj/structure/ice/thin/indestructible{ icon_state = "Corner" }, /obj/structure/blocker/invisible_wall, /turf/open/ice/noweed, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "vrA" = ( /obj/structure/machinery/landinglight/ds1/delaythree{ dir = 8 @@ -27930,33 +27804,19 @@ /obj/item/stack/sheet/metal, /obj/item/stack/sheet/metal, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "vrO" = ( /obj/structure/closet/secure_closet/engineering_materials, /turf/open/floor/prison/darkbrownfull2, /area/fiorina/tumor/aux_engi) -"vrR" = ( -/obj/structure/platform_decoration, -/obj/structure/barricade/handrail/type_b{ - dir = 4; - layer = 3.5 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/disco) "vrS" = ( /obj/item/reagent_container/food/snacks/donkpocket, /turf/open/floor/prison/greenfull/northwest, /area/fiorina/station/transit_hub) -"vrT" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/prison/chapel_carpet, -/area/fiorina/station/chapel) "vsr" = ( /obj/structure/barricade/handrail, /turf/open/floor/prison/whitepurple/northwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "vsL" = ( /obj/structure/prop/dam/crane, /turf/open/floor/prison/floor_marked/west, @@ -27967,7 +27827,7 @@ }, /obj/item/ammo_magazine/smg/mp5, /turf/open/floor/prison/whitepurple/north, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "vsT" = ( /obj/structure/cable/heavyduty{ icon_state = "1-8" @@ -28018,6 +27878,19 @@ }, /turf/open/floor/prison/yellow/northwest, /area/fiorina/station/disco) +"vui" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/machinery/cm_vending/sorted/tech/comp_storage{ + layer = 3.5 + }, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/power_ring) +"vuq" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/northeast, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/botany) "vuK" = ( /obj/structure/filingcabinet/chestdrawer, /turf/open/floor/prison, @@ -28026,15 +27899,6 @@ /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/prison, /area/fiorina/station/civres_blue) -"vuT" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/prison/bright_clean2/southwest, -/area/fiorina/station/power_ring) "vuV" = ( /obj/structure/stairs/perspective{ dir = 1; @@ -28042,12 +27906,6 @@ }, /turf/open/floor/prison, /area/fiorina/station/power_ring) -"vuX" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/park) "vvp" = ( /obj/item/tool/candle{ pixel_x = 5; @@ -28077,12 +27935,6 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/plating/prison, /area/fiorina/tumor/civres) -"vwx" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) "vwD" = ( /obj/item/stack/cable_coil, /turf/open/floor/prison/darkpurplefull2, @@ -28105,13 +27957,7 @@ dir = 8 }, /turf/open/floor/prison/whitepurple, -/area/fiorina/station/research_cells) -"vxm" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/prison/greenblue/east, -/area/fiorina/station/botany) +/area/fiorina/station/research_cells/east) "vxs" = ( /turf/closed/shuttle/ert{ icon_state = "stan_inner_w_2" @@ -28136,13 +27982,6 @@ /obj/item/clothing/suit/storage/hazardvest, /turf/open/floor/wood, /area/fiorina/station/civres_blue) -"vyv" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/obj/structure/inflatable/popped, -/turf/open/floor/prison/whitegreen, -/area/fiorina/station/medbay) "vyw" = ( /turf/open/floor/prison/darkyellow2/northwest, /area/fiorina/station/telecomm/lz1_cargo) @@ -28153,6 +27992,9 @@ }, /turf/open/floor/prison/darkyellow2/east, /area/fiorina/station/telecomm/lz1_cargo) +"vza" = ( +/turf/open/floor/prison/yellow/southeast, +/area/fiorina/station/lowsec/showers_laundry) "vzh" = ( /obj/structure/foamed_metal, /turf/open/floor/plating/prison, @@ -28176,6 +28018,11 @@ }, /turf/open/floor/prison, /area/fiorina/lz/near_lzI) +"vzu" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/power_ring) "vzB" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ explo_proof = 1; @@ -28200,7 +28047,7 @@ }, /obj/structure/barricade/wooden, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "vAX" = ( /turf/open/floor/prison/blue_plate/west, /area/fiorina/station/botany) @@ -28209,7 +28056,7 @@ dir = 4 }, /turf/open/floor/prison/kitchen, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "vBF" = ( /obj/structure/machinery/light/double/blue{ dir = 8; @@ -28222,35 +28069,13 @@ /obj/item/storage/firstaid/regular, /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/station/medbay) -"vBP" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/lattice, -/turf/open/space/basic, -/area/fiorina/oob) "vBX" = ( /turf/open/floor/prison, /area/fiorina/station/transit_hub) -"vBZ" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/obj/structure/machinery/light/double/blue{ - pixel_y = -1 - }, -/turf/open/floor/plating/prison, -/area/fiorina/lz/near_lzI) "vCl" = ( /obj/item/tool/shovel/spade, /turf/open/floor/prison/blue_plate/north, /area/fiorina/station/botany) -"vCm" = ( -/obj/structure/platform, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/botany) "vCu" = ( /obj/item/storage/bible/hefa, /turf/open/floor/prison/green/north, @@ -28265,6 +28090,10 @@ }, /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/station/medbay) +"vCM" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/transit_hub) "vCQ" = ( /obj/item/prop/helmetgarb/spacejam_tickets{ desc = "A ticket to Souto Man's raffle!"; @@ -28295,12 +28124,6 @@ /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/corsat/plate, /area/fiorina/station/civres_blue) -"vEi" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/power_ring) "vEK" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/power_ring) @@ -28351,11 +28174,15 @@ "vFV" = ( /obj/structure/inflatable, /turf/open/floor/prison/yellow/southwest, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "vFY" = ( /obj/item/reagent_container/glass/bucket, /turf/open/floor/plating/prison, /area/fiorina/tumor/fiberbush) +"vGf" = ( +/obj/structure/largecrate/random/barrel/white, +/turf/open/floor/prison, +/area/fiorina/station/power_ring/reactor) "vGM" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/paper_bin{ @@ -28366,6 +28193,13 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison/darkyellowfull2/east, /area/fiorina/station/flight_deck) +"vHk" = ( +/obj/structure/platform/metal/almayer/west, +/obj/item/prop/almayer/comp_open{ + pixel_y = 6 + }, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) "vHo" = ( /turf/open/floor/prison/blue/northeast, /area/fiorina/tumor/servers) @@ -28398,22 +28232,24 @@ "vIG" = ( /turf/open/floor/prison/platingdmg2, /area/fiorina/station/security) +"vIH" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/floor/plating/plating_catwalk/prison, +/area/fiorina/station/telecomm/lz1_tram) "vJh" = ( /obj/effect/spawner/random/sentry/midchance, /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) -"vJn" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk/prison, -/area/fiorina/station/transit_hub) +/area/fiorina/station/research_cells/east) "vJo" = ( /obj/structure/bed/chair/office/dark{ dir = 4 }, /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/station/medbay) +"vJw" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/prison, +/area/fiorina/station/transit_hub) "vJL" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -28429,6 +28265,10 @@ /obj/item/storage/toolbox/mechanical, /turf/open/floor/almayer, /area/fiorina/tumor/ship) +"vJR" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/plating/prison, +/area/fiorina/station/security) "vKz" = ( /obj/item/stack/sheet/metal{ amount = 5 @@ -28449,12 +28289,6 @@ /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/wood, /area/fiorina/station/park) -"vLO" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/central_ring) "vLX" = ( /obj/effect/landmark/corpsespawner/ua_riot/burst, /turf/open/floor/prison/greenfull/northwest, @@ -28470,12 +28304,11 @@ "vMK" = ( /turf/closed/wall/r_wall/prison, /area/fiorina/station/power_ring) -"vMN" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/prison/darkbrown2/northeast, -/area/fiorina/station/park) +"vMR" = ( +/obj/effect/decal/cleanable/blood, +/obj/effect/landmark/corpsespawner/prisoner, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/lowsec) "vMT" = ( /turf/open/floor/prison/darkyellowfull2/east, /area/fiorina/station/flight_deck) @@ -28490,16 +28323,6 @@ "vNq" = ( /turf/closed/wall/r_wall/prison, /area/fiorina/station/telecomm/lz1_cargo) -"vNQ" = ( -/obj/item/fuel_cell, -/obj/structure/platform, -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = 13 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) "vOm" = ( /turf/open/floor/prison/cell_stripe/west, /area/fiorina/station/botany) @@ -28536,13 +28359,6 @@ /obj/structure/barricade/handrail/type_b, /turf/open/floor/prison/floor_plate, /area/fiorina/station/flight_deck) -"vPM" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/obj/structure/lattice, -/turf/open/space/basic, -/area/fiorina/oob) "vPR" = ( /turf/closed/shuttle/ert{ icon_state = "stan1" @@ -28558,6 +28374,10 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison, /area/fiorina/station/park) +"vQD" = ( +/obj/structure/platform/metal/almayer, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/security) "vQJ" = ( /obj/structure/machinery/cm_vending/sorted/tech/electronics_storage{ density = 0; @@ -28565,10 +28385,16 @@ }, /turf/open/floor/prison/darkbrown2/north, /area/fiorina/maintenance) +"vQK" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/northwest, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/park) "vRk" = ( /obj/structure/machinery/recharge_station, /turf/open/floor/prison/blue/northwest, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "vRu" = ( /obj/structure/sink{ dir = 4; @@ -28579,7 +28405,7 @@ /area/fiorina/oob) "vRA" = ( /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "vRF" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/pamphlet/skill/powerloader, @@ -28593,6 +28419,12 @@ /obj/item/trash/cigbutt/cigarbutt, /turf/open/floor/prison, /area/fiorina/station/power_ring) +"vSn" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/southeast, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/power_ring) "vSC" = ( /obj/item/reagent_container/food/condiment/saltshaker{ pixel_x = -5; @@ -28617,12 +28449,6 @@ "vTA" = ( /turf/open/floor/prison/darkyellow2/southwest, /area/fiorina/station/flight_deck) -"vTI" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/transit_hub) "vTL" = ( /obj/item/trash/hotdog, /turf/open/floor/prison/floor_plate, @@ -28640,10 +28466,6 @@ }, /turf/open/floor/prison/sterile_white/southwest, /area/fiorina/station/medbay) -"vUf" = ( -/obj/structure/platform, -/turf/open/floor/plating/prison, -/area/fiorina/lz/near_lzI) "vUl" = ( /obj/structure/machinery/washing_machine, /obj/structure/machinery/washing_machine{ @@ -28654,7 +28476,7 @@ pixel_y = 21 }, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "vUv" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/window/reinforced, @@ -28667,25 +28489,11 @@ /area/fiorina/tumor/civres) "vUP" = ( /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) -"vUZ" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) +/area/fiorina/station/research_cells/west) "vVi" = ( /obj/structure/window/framed/prison, /turf/open/floor/plating/prison, /area/fiorina/station/civres_blue) -"vVx" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_ew_full_cap" - }, -/obj/structure/platform/stair_cut, -/turf/open/floor/plating/prison, -/area/fiorina/station/flight_deck) "vVN" = ( /obj/structure/stairs/perspective{ dir = 8; @@ -28732,7 +28540,7 @@ "vYX" = ( /obj/item/roller, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "vYY" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_29"; @@ -28744,7 +28552,7 @@ "vZe" = ( /obj/structure/closet/emcloset, /turf/open/floor/prison/bluecorner, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "vZs" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison/floor_plate, @@ -28756,7 +28564,7 @@ "vZL" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "vZV" = ( /turf/closed/wall/strata_ice/jungle{ desc = "It is made of Fiberbush(tm). It contains asbestos."; @@ -28769,19 +28577,10 @@ "wam" = ( /obj/item/stack/medical/bruise_pack, /turf/open/floor/prison, -/area/fiorina/station/lowsec) -"waN" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 5 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/power_ring) +/area/fiorina/station/lowsec/showers_laundry) +"wat" = ( +/turf/open/floor/prison/yellow/west, +/area/fiorina/station/lowsec/showers_laundry) "waQ" = ( /turf/open/floor/prison/darkyellow2/southwest, /area/fiorina/station/power_ring) @@ -28817,15 +28616,6 @@ "wbI" = ( /turf/open/floor/wood, /area/fiorina/station/park) -"wbL" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/item/prop/almayer/comp_open{ - pixel_y = 6 - }, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) "wbP" = ( /obj/item/storage/toolbox, /turf/open/floor/prison, @@ -28833,7 +28623,7 @@ "wbW" = ( /obj/item/reagent_container/food/snacks/meat, /turf/open/floor/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "wcB" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/spawner/random/gun/pistol/midchance, @@ -28844,7 +28634,7 @@ /obj/item/storage/pill_bottle/bicaridine/skillless, /obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "wcP" = ( /obj/effect/landmark/queen_spawn, /turf/open/floor/plating/prison, @@ -28862,20 +28652,33 @@ "wdo" = ( /obj/structure/closet, /turf/open/floor/prison/bluecorner/east, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) +"wdv" = ( +/obj/structure/bed/chair, +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "2" + }, +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "4" + }, +/obj/item/prop/helmetgarb/flair_initech, +/obj/effect/landmark/corpsespawner/scientist, +/turf/open/floor/prison, +/area/fiorina/station/medbay) "wdL" = ( /obj/structure/barricade/wooden{ dir = 8 }, /turf/open/floor/prison/whitepurple/north, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "wdU" = ( /obj/structure/foamed_metal, /turf/open/floor/prison/floor_plate, /area/fiorina/station/civres_blue) "wef" = ( /turf/open/floor/plating/prison, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "wet" = ( /obj/item/stack/sandbags/large_stack, /turf/open/floor/prison/darkyellow2/north, @@ -28958,6 +28761,15 @@ /obj/item/device/flashlight/flare/on, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) +"wge" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/northeast, +/obj/effect/decal/medical_decals{ + icon_state = "triagedecalbottomright" + }, +/turf/open/floor/prison/whitegreenfull/southwest, +/area/fiorina/station/medbay) "wgi" = ( /obj/effect/landmark/nightmare{ insert_tag = "scavshipholder" @@ -28982,6 +28794,10 @@ "wgO" = ( /turf/open/floor/prison/floor_plate, /area/fiorina/station/park) +"whc" = ( +/obj/structure/platform/metal/kutjevo_smooth, +/turf/open/floor/almayer_hull, +/area/fiorina/oob) "whf" = ( /turf/closed/shuttle/elevator{ dir = 4 @@ -28998,12 +28814,6 @@ "whu" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/tumor/civres) -"wis" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/disco) "wiR" = ( /obj/structure/surface/rack, /obj/item/key, @@ -29017,7 +28827,7 @@ "wjH" = ( /obj/item/stack/barbed_wire, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "wjO" = ( /obj/structure/bed/chair, /obj/effect/decal/cleanable/blood, @@ -29056,7 +28866,7 @@ "wlv" = ( /obj/item/trash/barcardine, /turf/open/floor/prison/whitepurple/north, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "wly" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/lz/near_lzII) @@ -29108,22 +28918,6 @@ /obj/structure/machinery/light/double/blue, /turf/open/floor/prison/darkbrown2, /area/fiorina/maintenance) -"woh" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/prison/whitegreen/north, -/area/fiorina/station/medbay) -"wol" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/item/shard{ - icon_state = "medium"; - name = "ice shard" - }, -/turf/open/floor/prison/whitegreen/east, -/area/fiorina/tumor/ice_lab) "wou" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/prison/whitegreenfull/southwest, @@ -29164,7 +28958,7 @@ dir = 1 }, /turf/open/floor/plating/prison, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "wpW" = ( /obj/structure/sign/kiddieplaque{ desc = "It is a warning sign that describes the process by which fiberbush expands in humid environments, behaving similar to kudzu vines."; @@ -29177,7 +28971,7 @@ /obj/structure/surface/table/reinforced/prison, /obj/item/poster, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "wqz" = ( /obj/structure/closet{ density = 0; @@ -29185,14 +28979,14 @@ }, /obj/item/clothing/gloves/combat, /turf/open/floor/prison/whitepurple/northwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "wqY" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; pixel_y = 1 }, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "wrR" = ( /turf/closed/wall/prison, /area/fiorina/station/botany) @@ -29205,7 +28999,7 @@ "wsw" = ( /obj/effect/spawner/random/tool, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "wsz" = ( /turf/open/floor/prison/darkbrown2/west, /area/fiorina/tumor/aux_engi) @@ -29218,6 +29012,15 @@ }, /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/tumor/ice_lab) +"wsR" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = -3 + }, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/power_ring) "wtm" = ( /obj/structure/monorail{ name = "launch track" @@ -29237,24 +29040,9 @@ /obj/item/weapon/classic_baton, /turf/open/floor/prison/redfull, /area/fiorina/station/security) -"wua" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/prison/bluecorner/west, -/area/fiorina/station/power_ring) "wun" = ( /turf/open/floor/prison/whitegreencorner/west, /area/fiorina/tumor/ice_lab) -"wuz" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/power_ring) "wuA" = ( /obj/structure/surface/rack, /obj/item/weapon/gun/smg/nailgun, @@ -29312,6 +29100,10 @@ }, /turf/open/floor/prison/bluefull, /area/fiorina/station/power_ring) +"wws" = ( +/obj/structure/platform/metal/almayer, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/transit_hub) "wxl" = ( /obj/structure/machinery/recharge_station, /turf/open/floor/prison/darkbrown2/northeast, @@ -29319,7 +29111,7 @@ "wxW" = ( /obj/structure/prop/almayer/computers/mapping_computer, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "wxX" = ( /obj/structure/machinery/computer/cameras{ dir = 8; @@ -29343,18 +29135,10 @@ /obj/structure/machinery/computer/cameras, /turf/open/floor/plating/prison, /area/fiorina/station/security/wardens) -"wyd" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 9 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/botany) +"wyb" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison/whitepurple/north, +/area/fiorina/station/research_cells/west) "wyl" = ( /obj/structure/machinery/power/port_gen/pacman, /turf/open/floor/plating/prison, @@ -29374,7 +29158,7 @@ "wyQ" = ( /obj/structure/largecrate/supply/supplies/mre, /turf/open/floor/prison/yellowfull, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "wyT" = ( /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, @@ -29382,7 +29166,7 @@ "wyU" = ( /obj/effect/decal/cleanable/blood/gibs/robot/up, /turf/open/organic/grass/astroturf, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "wzd" = ( /obj/structure/stairs/perspective{ dir = 10; @@ -29400,26 +29184,10 @@ "wzH" = ( /turf/open/floor/prison/blue/northeast, /area/fiorina/station/chapel) -"wzK" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/item/prop/almayer/flight_recorder, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) -"wzT" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform, -/obj/structure/platform_decoration{ - dir = 10 - }, -/obj/structure/reagent_dispensers/fueltank{ - layer = 2.6 - }, -/turf/open/floor/prison, -/area/fiorina/lz/near_lzI) +"wzN" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/plating/plating_catwalk/prison, +/area/fiorina/station/telecomm/lz1_tram) "wAn" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname{ dir = 1 @@ -29461,6 +29229,13 @@ /obj/item/stack/tile/plasteel, /turf/open/floor/plating/prison, /area/fiorina/station/security) +"wBV" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/surface/rack, +/obj/item/stack/flag/yellow, +/obj/item/stack/flag/yellow, +/turf/open/floor/prison, +/area/fiorina/lz/near_lzI) "wBX" = ( /obj/structure/largecrate/supply/supplies, /turf/open/floor/plating/prison, @@ -29532,6 +29307,13 @@ /obj/item/stack/cable_coil/pink, /turf/open/floor/prison/whitegreen/north, /area/fiorina/station/medbay) +"wFs" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_ew_full_cap" + }, +/obj/structure/platform/metal/stair_cut/platform_right, +/turf/open/floor/plating/prison, +/area/fiorina/station/security) "wFB" = ( /obj/structure/machinery/light/double/blue{ dir = 4; @@ -29539,7 +29321,7 @@ pixel_y = 13 }, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "wFM" = ( /obj/structure/machinery/power/apc/power/west, /turf/open/floor/prison/floor_plate/southwest, @@ -29586,12 +29368,6 @@ }, /turf/open/floor/prison/darkyellow2/west, /area/fiorina/station/telecomm/lz1_cargo) -"wHl" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/wood, -/area/fiorina/station/park) "wHq" = ( /obj/effect/landmark/static_comms/net_two, /turf/open/floor/plating/prison, @@ -29602,17 +29378,19 @@ }, /turf/open/floor/prison/red/west, /area/fiorina/station/security) +"wHu" = ( +/obj/structure/machinery/door/airlock/prison_hatch/autoname{ + dir = 1 + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/lowsec/showers_laundry) "wHw" = ( /obj/structure/machinery/door/airlock/prison_hatch/autoname, /turf/open/floor/plating/prison, /area/fiorina/station/security/wardens) -"wHC" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/item/clothing/gloves/botanic_leather, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/botany) +"wHV" = ( +/turf/open/floor/plating/prison, +/area/fiorina/station/research_cells/east) "wId" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating/prison, @@ -29635,18 +29413,6 @@ /obj/structure/machinery/door/airlock/prison_hatch/autoname, /turf/open/floor/prison/floor_plate, /area/fiorina/tumor/servers) -"wIG" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform_decoration/kutjevo, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/turf/open/space/basic, -/area/fiorina/oob) "wIJ" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer{ @@ -29668,7 +29434,7 @@ "wJd" = ( /obj/structure/barricade/handrail, /turf/open/organic/grass/astroturf, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/basketball) "wJw" = ( /obj/structure/closet/crate/trashcart, /obj/item/weapon/gun/rifle/m16, @@ -29682,6 +29448,9 @@ /obj/effect/spawner/random/gun/rifle/midchance, /turf/open/floor/wood, /area/fiorina/station/park) +"wKi" = ( +/turf/open/floor/prison/yellow/north, +/area/fiorina/station/lowsec/east) "wKl" = ( /obj/structure/bed/sofa/south/grey/right, /turf/open/floor/prison/floor_plate, @@ -29751,6 +29520,10 @@ }, /turf/open/floor/plating/prison, /area/fiorina/station/chapel) +"wMp" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/prison/bluefull, +/area/fiorina/station/power_ring) "wMv" = ( /obj/item/shard{ icon_state = "medium" @@ -29770,6 +29543,13 @@ /obj/effect/landmark/yautja_teleport, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) +"wNo" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/southwest, +/obj/structure/closet/firecloset/full, +/turf/open/floor/prison/whitegreenfull/southwest, +/area/fiorina/station/medbay) "wNr" = ( /obj/structure/barricade/wooden{ dir = 8 @@ -29800,10 +29580,20 @@ "wNX" = ( /turf/open/floor/prison/green/west, /area/fiorina/station/chapel) +"wOq" = ( +/obj/structure/platform/metal/kutjevo_smooth/north, +/obj/structure/platform/metal/kutjevo_smooth/east, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/turf/open/space/basic, +/area/fiorina/oob) "wOG" = ( /obj/structure/largecrate/random, /turf/open/floor/prison/floor_plate/southwest, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "wPz" = ( /turf/closed/shuttle/elevator, /area/fiorina/station/telecomm/lz1_cargo) @@ -29825,6 +29615,14 @@ /obj/item/weapon/gun/energy/taser, /turf/open/floor/prison/floor_plate, /area/fiorina/station/security) +"wQF" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/prison/whitegreenfull/southwest, +/area/fiorina/station/central_ring) "wQN" = ( /obj/structure/machinery/floodlight/landing/floor, /turf/open/floor/plating/prison, @@ -29870,6 +29668,10 @@ }, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) +"wRS" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/floor/prison, +/area/fiorina/station/disco/east_disco) "wSb" = ( /obj/structure/machinery/gibber, /turf/open/floor/prison/kitchen, @@ -29894,12 +29696,6 @@ "wSm" = ( /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzII) -"wSo" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/prison/darkbrown2/east, -/area/fiorina/station/park) "wSt" = ( /obj/structure/monorail{ dir = 9; @@ -29915,7 +29711,7 @@ }, /obj/effect/landmark/objective_landmark/science, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "wSD" = ( /obj/item/reagent_container/food/drinks/cans/waterbottle, /turf/open/floor/prison, @@ -29924,7 +29720,7 @@ /obj/structure/surface/table/reinforced/prison, /obj/item/storage/firstaid/regular, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "wSU" = ( /turf/open/floor/prison/floor_plate, /area/fiorina/station/transit_hub) @@ -29942,10 +29738,17 @@ "wUs" = ( /turf/open/floor/prison/floorscorched1, /area/fiorina/station/civres_blue) +"wUv" = ( +/obj/effect/decal/cleanable/blood{ + dir = 4; + icon_state = "gib6" + }, +/turf/open/floor/prison/kitchen, +/area/fiorina/station/research_cells/west) "wUz" = ( /obj/item/frame/toolbox_tiles, /turf/open/floor/prison/whitepurple/northwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "wVc" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/drinks/coffee{ @@ -29954,24 +29757,22 @@ }, /turf/open/floor/prison/floor_plate, /area/fiorina/tumor/fiberbush) +"wWm" = ( +/turf/open/floor/prison/yellowcorner/north, +/area/fiorina/station/lowsec/east) "wWs" = ( /turf/open/floor/greengrid, /area/fiorina/station/security) -"wWW" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/turf/open/floor/almayer_hull, -/area/fiorina/station/medbay) "wXe" = ( /obj/structure/machinery/computer/cameras{ dir = 1 }, /turf/open/floor/prison/redfull, /area/fiorina/station/security) +"wXo" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/prison, +/area/fiorina/station/transit_hub) "wXy" = ( /obj/structure/largecrate/random, /obj/structure/machinery/light/double/blue{ @@ -29994,25 +29795,33 @@ pixel_y = -3 }, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) +"wXR" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/machinery/light/double/blue{ + dir = 4; + pixel_x = 10; + pixel_y = 13 + }, +/turf/open/floor/plating/prison, +/area/fiorina/lz/near_lzI) +"wXY" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/prison/darkbrown2/southeast, +/area/fiorina/station/park) "wYq" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/chem_dispenser/soda, /turf/open/floor/prison/floor_plate, /area/fiorina/station/power_ring) -"wYP" = ( -/obj/structure/platform, -/obj/item/clothing/gloves/botanic_leather, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/botany) "wYT" = ( /obj/structure/surface/rack, /obj/item/tank/emergency_oxygen/engi, /turf/open/floor/prison/blue/southeast, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "wZt" = ( /turf/open/floor/prison/floor_marked/west, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "wZv" = ( /obj/item/stack/sheet/metal, /turf/open/floor/wood, @@ -30060,7 +29869,7 @@ pixel_y = 2 }, /turf/open/floor/prison/yellow/northeast, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "xbp" = ( /obj/item/card/id/silver/clearance_badge/cl{ desc = "Wow sorry, didn't mean to drop that in front of you, it's real, btw."; @@ -30078,6 +29887,12 @@ /obj/item/reagent_container/food/drinks/cans/waterbottle, /turf/open/floor/prison/yellowfull, /area/fiorina/station/disco) +"xbG" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/southwest, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/power_ring) "xbM" = ( /turf/open/floor/prison/floor_plate, /area/fiorina/station/lowsec) @@ -30085,6 +29900,9 @@ /obj/structure/largecrate/random/case/small, /turf/open/floor/plating/plating_catwalk/prison, /area/fiorina/station/park) +"xct" = ( +/turf/open/floor/prison/blue/north, +/area/fiorina/station/power_ring/reactor) "xcz" = ( /obj/structure/closet/secure_closet/engineering_personal, /obj/structure/machinery/light/double/blue{ @@ -30093,32 +29911,19 @@ }, /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) -"xcS" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/machinery/light/double/blue{ - dir = 8; - pixel_x = -10; - pixel_y = -3 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) +/area/fiorina/station/power_ring/reactor) "xdb" = ( /obj/structure/closet/bodybag, /obj/effect/decal/cleanable/blood/gibs/body, /turf/open/floor/prison, -/area/fiorina/station/lowsec) -"xdt" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 +/area/fiorina/station/lowsec/showers_laundry) +"xdz" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" }, -/turf/open/space/basic, -/area/fiorina/oob) +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/plating/prison, +/area/fiorina/station/botany) "xdE" = ( /obj/structure/window/framed/prison/reinforced/hull, /turf/open/floor/plating/prison, @@ -30138,7 +29943,7 @@ pixel_y = -3 }, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "xei" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/organic/grass/astroturf, @@ -30146,7 +29951,7 @@ "xel" = ( /obj/effect/landmark/survivor_spawner, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "xew" = ( /turf/closed/shuttle/ert{ icon_state = "stan_leftengine" @@ -30193,7 +29998,7 @@ pixel_y = 21 }, /turf/open/floor/prison/yellow/northwest, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "xgF" = ( /obj/structure/machinery/light/double/blue, /turf/open/floor/plating/prison, @@ -30201,7 +30006,7 @@ "xgH" = ( /obj/item/toy/handcard/uno_reverse_blue, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "xgU" = ( /obj/item/circuitboard/machine/rdserver, /turf/open/floor/prison/floorscorched1, @@ -30216,10 +30021,21 @@ /obj/structure/curtain/red, /turf/open/floor/prison/sterile_white, /area/fiorina/station/civres_blue) +"xhV" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) "xia" = ( /obj/item/ammo_magazine/smg/mp5, /turf/open/floor/prison/floor_plate/southwest, /area/fiorina/station/telecomm/lz1_cargo) +"xig" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/decal/medical_decals{ + icon_state = "docdecal1" + }, +/turf/open/floor/prison/whitegreenfull/southwest, +/area/fiorina/station/medbay) "xiF" = ( /obj/structure/largecrate/random/case/double, /obj/structure/machinery/light/double/blue{ @@ -30235,6 +30051,9 @@ /obj/structure/machinery/vending/cigarette/free, /turf/open/floor/prison/darkbrownfull2, /area/fiorina/tumor/aux_engi) +"xiZ" = ( +/turf/open/floor/prison/yellowcorner/west, +/area/fiorina/station/lowsec/east) "xja" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ req_one_access = null @@ -30248,20 +30067,14 @@ "xjM" = ( /turf/open/floor/prison/redcorner/west, /area/fiorina/station/security) +"xkg" = ( +/obj/structure/platform/metal/almayer, +/turf/open/floor/prison, +/area/fiorina/station/transit_hub) "xkm" = ( /obj/effect/landmark/static_comms/net_two, /turf/open/floor/prison/bluefull, /area/fiorina/station/power_ring) -"xkq" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 6 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) "xkv" = ( /turf/closed/wall/prison, /area/fiorina/station/telecomm/lz1_tram) @@ -30282,12 +30095,16 @@ dir = 8 }, /turf/open/floor/wood, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "xlx" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/snacks/tomatosoup, /turf/open/floor/prison/blue, /area/fiorina/station/power_ring) +"xlC" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/power_ring/reactor) "xlZ" = ( /obj/structure/surface/table/woodentable, /obj/item/storage/box/pillbottles, @@ -30326,11 +30143,19 @@ }, /obj/item/clothing/gloves/combat, /turf/open/floor/prison/whitepurple/north, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "xnU" = ( /obj/structure/machinery/camera/autoname/lz_camera, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzII) +"xoh" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/prison, +/area/fiorina/station/power_ring/reactor) "xoi" = ( /obj/item/reagent_container/food/drinks/cans/waterbottle, /turf/open/floor/plating/prison, @@ -30350,6 +30175,12 @@ /obj/structure/machinery/computer/atmos_alert, /turf/open/floor/prison/bluefull, /area/fiorina/station/power_ring) +"xpd" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/northwest, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/botany) "xpj" = ( /obj/structure/flora/bush/ausbushes/grassybush{ icon_state = "lavendergrass_4" @@ -30364,16 +30195,32 @@ /obj/item/storage/belt/marine, /turf/open/floor/prison, /area/fiorina/station/security) -"xpM" = ( -/obj/structure/platform, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/power_ring) +"xpy" = ( +/obj/structure/toilet{ + dir = 8; + pixel_y = 8 + }, +/turf/open/floor/prison/yellow/northeast, +/area/fiorina/station/lowsec/east) +"xpF" = ( +/obj/structure/platform/metal/kutjevo_smooth/east, +/obj/structure/platform/metal/kutjevo_smooth/north, +/turf/open/space/basic, +/area/fiorina/oob) "xpO" = ( /obj/structure/machinery/power/terminal{ dir = 1 }, /turf/open/floor/prison/darkbrownfull2, /area/fiorina/tumor/aux_engi) +"xqi" = ( +/obj/item/tool/wrench, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/power_ring/reactor) +"xql" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/prison, +/area/fiorina/station/disco/east_disco) "xqP" = ( /obj/structure/surface/rack, /obj/item/tool/plantspray/weeds, @@ -30397,6 +30244,16 @@ }, /turf/open/floor/prison/bluefull, /area/fiorina/station/power_ring) +"xrw" = ( +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/obj/structure/platform/metal/kutjevo_smooth/east, +/obj/structure/platform/metal/kutjevo_smooth/north, +/turf/open/space, +/area/fiorina/oob) "xrz" = ( /obj/item/clothing/head/cmcap, /turf/open/floor/prison/green, @@ -30421,10 +30278,6 @@ /obj/item/bedsheet/green, /turf/open/floor/prison/whitegreen/east, /area/fiorina/station/medbay) -"xst" = ( -/obj/structure/platform, -/turf/open/floor/prison/chapel_carpet, -/area/fiorina/station/chapel) "xsC" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/prison/whitegreenfull/southwest, @@ -30444,27 +30297,18 @@ /obj/item/key/cargo_train, /turf/open/floor/prison, /area/fiorina/tumor/aux_engi) -"xte" = ( -/obj/structure/platform_decoration, -/turf/open/floor/plating/plating_catwalk/prison, -/area/fiorina/station/telecomm/lz1_tram) "xtm" = ( /obj/effect/landmark/xeno_spawn, /turf/open/floor/prison/darkbrownfull2, /area/fiorina/tumor/aux_engi) -"xtP" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/turf/open/space, +"xts" = ( +/obj/effect/landmark/corpsespawner/prisoner, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison/kitchen, +/area/fiorina/station/research_cells/west) +"xtI" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, +/turf/open/space/basic, /area/fiorina/oob) "xuQ" = ( /obj/effect/decal/medical_decals{ @@ -30495,6 +30339,14 @@ /obj/item/trash/eat, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) +"xwc" = ( +/obj/structure/platform/metal/almayer/north, +/obj/item/fuel_cell, +/turf/open/floor/plating/prison, +/area/fiorina/station/lowsec/showers_laundry) +"xwm" = ( +/turf/open/floor/prison, +/area/fiorina/station/power_ring/reactor) "xwo" = ( /obj/structure/surface/rack, /obj/item/storage/box/sprays, @@ -30507,6 +30359,9 @@ "xwC" = ( /turf/closed/wall/mineral/bone_resin, /area/fiorina/tumor/fiberbush) +"xxg" = ( +/turf/closed/wall/r_wall/prison_unmeltable, +/area/fiorina/station/lowsec/east) "xxD" = ( /turf/open/floor/wood, /area/fiorina/station/civres_blue) @@ -30522,6 +30377,10 @@ }, /turf/open/floor/prison/whitegreen/north, /area/fiorina/tumor/ice_lab) +"xxW" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/transit_hub) "xxX" = ( /obj/effect/decal/cleanable/blood/splatter{ icon_state = "gib4" @@ -30554,6 +30413,9 @@ }, /turf/open/space, /area/fiorina/oob) +"xAn" = ( +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/lowsec/showers_laundry) "xAo" = ( /obj/item/trash/cigbutt/bcigbutt, /obj/item/device/flashlight/lamp/tripod, @@ -30562,7 +30424,7 @@ "xAq" = ( /obj/effect/spawner/random/tool, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "xAs" = ( /obj/item/device/reagent_scanner, /turf/open/organic/grass/astroturf, @@ -30578,7 +30440,7 @@ "xBc" = ( /obj/structure/barricade/wooden, /turf/open/floor/prison/whitepurple, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "xBl" = ( /obj/structure/surface/table/woodentable, /obj/item/circuitboard/apc, @@ -30593,13 +30455,9 @@ }, /turf/open/floor/carpet, /area/fiorina/station/civres_blue) -"xBu" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/effect/spawner/random/tool, -/turf/open/floor/prison, -/area/fiorina/station/power_ring) +"xBF" = ( +/turf/open/floor/prison/yellow/northwest, +/area/fiorina/station/lowsec/east) "xBN" = ( /obj/item/prop/helmetgarb/spacejam_tickets{ desc = "Low security prisoners would smuggle in arcade tickets after visitations. The tickets act as a stand in for paper currency in the prison economy, they're backed by the cigarette standard, since one ticket nets one cigarette at the prize booth. The cigarettes also get smuggled back in."; @@ -30608,7 +30466,7 @@ pixel_y = -1 }, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "xCa" = ( /obj/item/toy/crayon/rainbow, /turf/open/floor/plating/prison, @@ -30616,13 +30474,13 @@ "xCg" = ( /obj/item/stack/sheet/metal, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "xCh" = ( /obj/structure/bed/chair{ dir = 8 }, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "xCp" = ( /obj/structure/inflatable/popped, /turf/open/floor/prison/whitegreen, @@ -30631,12 +30489,10 @@ /obj/structure/curtain/shower, /turf/open/floor/prison/kitchen/southwest, /area/fiorina/tumor/civres) -"xCv" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/prison, -/area/fiorina/station/medbay) +"xCR" = ( +/obj/structure/machinery/light/double/blue, +/turf/open/floor/prison/whitepurple, +/area/fiorina/station/research_cells/east) "xCV" = ( /obj/item/reagent_container/food/drinks/bottle/orangejuice, /turf/open/floor/prison, @@ -30689,7 +30545,7 @@ "xFJ" = ( /obj/item/tool/soap, /turf/open/floor/prison/kitchen, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "xFL" = ( /obj/effect/decal{ icon = 'icons/obj/items/policetape.dmi'; @@ -30714,7 +30570,7 @@ icon_state = "ucigoff" }, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "xGi" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -30754,21 +30610,18 @@ }, /turf/open/floor/wood, /area/fiorina/station/park) -"xIq" = ( -/obj/effect/decal/cleanable/blood/oil, -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/prison/floor_plate, -/area/fiorina/station/disco) "xIx" = ( /obj/structure/largecrate/random, /turf/open/floor/plating/prison, /area/fiorina/station/chapel) +"xID" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/prison/chapel_carpet/doubleside/north, +/area/fiorina/station/chapel) "xJn" = ( /obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "xJw" = ( /turf/closed/wall/r_wall/prison_unmeltable, /area/fiorina/station/civres_blue) @@ -30783,21 +30636,6 @@ /obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, /turf/open/floor/plating/prison, /area/fiorina/tumor/aux_engi) -"xKA" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/obj/structure/lattice, -/turf/open/space/basic, -/area/fiorina/oob) "xKE" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/taperecorder{ @@ -30805,11 +30643,11 @@ pixel_y = 8 }, /turf/open/floor/prison/darkredfull2, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/east) "xKP" = ( /obj/structure/barricade/handrail, /turf/open/floor/prison/darkpurplefull2, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "xKX" = ( /turf/open/floor/plating/prison, /area/fiorina/station/disco) @@ -30841,7 +30679,7 @@ "xLx" = ( /obj/item/bedsheet, /turf/open/floor/prison/floor_plate, -/area/fiorina/station/lowsec) +/area/fiorina/station/lowsec/showers_laundry) "xLD" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -30866,20 +30704,6 @@ /obj/item/stack/sandbags_empty/half, /turf/open/floor/prison, /area/fiorina/station/flight_deck) -"xMW" = ( -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/turf/open/space, -/area/fiorina/oob) "xMX" = ( /obj/structure/inflatable/door, /turf/open/floor/prison/whitegreen/west, @@ -30894,15 +30718,6 @@ /obj/structure/extinguisher_cabinet, /turf/closed/wall/r_wall/prison, /area/fiorina/station/security) -"xNn" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/plating/prison, -/area/fiorina/station/transit_hub) "xNG" = ( /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, /obj/effect/decal/cleanable/blood, @@ -30914,7 +30729,7 @@ }, /obj/item/frame/rack, /turf/open/floor/prison/yellow/southeast, -/area/fiorina/station/disco) +/area/fiorina/station/disco/east_disco) "xNU" = ( /obj/structure/bed/chair/comfy{ dir = 4 @@ -30956,14 +30771,14 @@ "xQx" = ( /turf/open/floor/prison/floor_plate, /area/fiorina/station/security/wardens) -"xQC" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 +"xRa" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" }, -/obj/structure/lattice, -/turf/open/space/basic, -/area/fiorina/oob) +/obj/structure/platform/metal/almayer, +/turf/open/floor/plating/prison, +/area/fiorina/station/disco) "xRl" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -30988,7 +30803,14 @@ }, /obj/item/card/id/visa, /turf/open/floor/prison/whitepurple, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) +"xSj" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/prison, +/area/fiorina/station/transit_hub) +"xSw" = ( +/turf/open/floor/plating/prison, +/area/fiorina/station/lowsec/east) "xSz" = ( /obj/structure/barricade/metal/wired{ dir = 8 @@ -31043,7 +30865,15 @@ pixel_y = 21 }, /turf/open/floor/prison/whitepurple/north, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) +"xVC" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/turf/open/floor/prison, +/area/fiorina/station/disco/east_disco) "xVJ" = ( /obj/structure/surface/rack, /obj/item/storage/toolbox/mechanical/green, @@ -31075,7 +30905,7 @@ "xWG" = ( /obj/item/weapon/twohanded/spear, /turf/open/floor/prison/sterile_white/southwest, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "xWV" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/window/reinforced{ @@ -31116,6 +30946,14 @@ }, /turf/open/floor/prison, /area/fiorina/station/power_ring) +"xXP" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/turf/open/floor/plating/prison, +/area/fiorina/station/telecomm/lz1_tram) "xXY" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison/floor_plate, @@ -31137,7 +30975,12 @@ icon_state = "abed" }, /turf/open/floor/prison/whitepurple/east, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) +"xYM" = ( +/obj/structure/platform_decoration/metal/almayer, +/obj/effect/spawner/random/toolbox, +/turf/open/floor/prison, +/area/fiorina/station/power_ring) "xYN" = ( /obj/item/device/t_scanner, /turf/open/floor/prison/floor_plate, @@ -31221,6 +31064,13 @@ /obj/structure/machinery/vending/sovietsoda, /turf/open/floor/plating/prison, /area/fiorina/station/medbay) +"yaS" = ( +/obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ + dir = 1; + req_one_access = null + }, +/turf/open/floor/plating/prison, +/area/fiorina/station/lowsec/showers_laundry) "yaY" = ( /obj/item/stack/sheet/metal, /turf/open/space, @@ -31245,14 +31095,6 @@ /obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, /turf/open/floor/plating/prison, /area/fiorina/tumor/fiberbush) -"ybx" = ( -/obj/structure/platform, -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" - }, -/turf/open/floor/prison, -/area/fiorina/station/botany) "ybU" = ( /obj/structure/prop/resin_prop{ icon_state = "sheater0" @@ -31311,22 +31153,14 @@ /obj/item/reagent_container/food/drinks/cans/waterbottle, /turf/open/floor/prison, /area/fiorina/station/medbay) +"yeI" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/prison/greenblue/east, +/area/fiorina/station/botany) "yeX" = ( /obj/structure/bed/sofa/vert/grey/top, /turf/open/floor/prison, /area/fiorina/station/transit_hub) -"yfp" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform/stair_cut/alt, -/obj/structure/machinery/light/double/blue{ - dir = 1; - pixel_y = 21 - }, -/turf/open/floor/prison/floor_plate/southwest, -/area/fiorina/station/disco) "yfA" = ( /obj/structure/machinery/light/double/blue{ dir = 1; @@ -31359,21 +31193,7 @@ current_rounds = 0 }, /turf/open/floor/prison/yellowcorner, -/area/fiorina/station/lowsec) -"ygr" = ( -/obj/structure/platform, -/turf/open/floor/prison/cell_stripe/west, -/area/fiorina/station/security) -"ygs" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_sn_full_cap" - }, -/turf/open/floor/plating/prison, -/area/fiorina/tumor/ice_lab) +/area/fiorina/station/lowsec/showers_laundry) "ygw" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer{ @@ -31388,6 +31208,13 @@ }, /turf/open/floor/plating/prison, /area/fiorina/oob) +"ygL" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison/floor_plate, +/area/fiorina/station/lowsec/east) +"ygS" = ( +/turf/open/floor/prison/yellow/east, +/area/fiorina/station/disco/east_disco) "yhs" = ( /obj/structure/surface/rack, /obj/item/storage/firstaid/regular, @@ -31410,7 +31237,7 @@ pixel_y = -1 }, /turf/open/floor/prison/whitepurple/southeast, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/west) "yhR" = ( /obj/structure/sign/prop3{ desc = "Enlist in the Penal Battalions today! The USCM 3rd Fleet features a subset of UA sanctioned penal battalions, drawing from inmate popualtions across the colonies. Mostly New Argentina though." @@ -31421,6 +31248,10 @@ /obj/structure/machinery/disposal, /turf/open/floor/prison, /area/fiorina/tumor/aux_engi) +"yin" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/prison, +/area/fiorina/station/medbay) "yio" = ( /turf/closed/shuttle/ert, /area/fiorina/tumor/aux_engi) @@ -31430,6 +31261,14 @@ }, /turf/open/floor/plating/prison, /area/fiorina/tumor/civres) +"yiG" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/turf/open/floor/prison, +/area/fiorina/station/disco) "yiL" = ( /obj/item/trash/cigbutt/bcigbutt, /turf/open/floor/prison/darkredfull2, @@ -31444,6 +31283,11 @@ }, /turf/open/floor/prison/floor_plate/southwest, /area/fiorina/lz/near_lzI) +"yjV" = ( +/obj/structure/platform/metal/kutjevo_smooth/east, +/obj/structure/lattice, +/turf/open/space/basic, +/area/fiorina/oob) "yjW" = ( /obj/effect/landmark/corpsespawner/ua_riot, /turf/open/floor/prison/floor_plate, @@ -31478,11 +31322,15 @@ pixel_y = 13 }, /turf/open/floor/prison/whitepurple/east, -/area/fiorina/station/research_cells) +/area/fiorina/station/research_cells/east) "ylu" = ( /obj/item/tool/wrench, /turf/open/floor/plating/prison, /area/fiorina/lz/near_lzI) +"ylU" = ( +/obj/structure/platform/metal/kutjevo_smooth/east, +/turf/open/space/basic, +/area/fiorina/oob) "ylW" = ( /obj/effect/decal/medical_decals{ icon_state = "cryomid" @@ -37608,7 +37456,7 @@ baC baC baC pcu -iWq +hfJ bQM bQM bQM @@ -37818,9 +37666,9 @@ baC baC baC baC -bTo +gjm pcu -iWq +hfJ bQM bQM bQM @@ -38030,9 +37878,9 @@ baC baC baC bQM -bTo +gjm pcu -iWq +hfJ bQM bQM bQM @@ -38239,15 +38087,15 @@ bfF rGq rZP baC -swg -fQV -fQV -fyC -qOk -mKS -fQV -fQV -erT +rfI +rQt +rQt +eyB +pFE +ocW +rQt +rQt +grn bQM bQM bQM @@ -38451,7 +38299,7 @@ bfF rGq lHx bQM -bTo +gjm afk afk afk @@ -38459,7 +38307,7 @@ hkh afk afk afk -iWq +hfJ bQM bQM bQM @@ -38663,7 +38511,7 @@ vsT rGq lHx bQM -bTo +gjm afk afk afk @@ -38671,7 +38519,7 @@ pcu afk afk afk -iWq +hfJ bQM bQM bQM @@ -38875,7 +38723,7 @@ rGq rGq lHx bQM -bTo +gjm afk afk afk @@ -38883,7 +38731,7 @@ hkh afk afk afk -iWq +hfJ bQM bQM bQM @@ -39087,15 +38935,15 @@ osX rGq rZP baC -aKA -jlH -jlH -tWI -llQ -jKI -jlH -jlH -bUB +rcy +rhR +rhR +dfw +lJb +ngo +rhR +rhR +mtM bQM bQM bQM @@ -39302,9 +39150,9 @@ baC baC baC bQM -bTo +gjm pcu -iWq +hfJ bQM bQM bQM @@ -39516,7 +39364,7 @@ baC baC baC pcu -iWq +hfJ bQM bQM bQM @@ -43594,7 +43442,7 @@ bQM bQM bQM cAW -bTo +gjm aaa bQM cAW @@ -43806,9 +43654,9 @@ bQM bQM bQM cAW -bTo +gjm pcu -iWq +hfJ cAW cAW cAW @@ -43963,10 +43811,10 @@ irB irB irB tkj -uWO -gSX -gSX -oTT +eGT +qMk +qMk +amg oPU oPU oPU @@ -44169,21 +44017,21 @@ oer oPU uKE oPU -rsg -kDa +oCH +bKO irB jgu jgu -cPL -uCX +ebx +byn jgu jgu -hcY +dGF wgO -gqM -gSX -gSX -oTT +rEG +qMk +qMk +amg tkj oer vLH @@ -44379,9 +44227,9 @@ jgu tkj oer oPU -rsg -kDa -sTU +oCH +bKO +rBh jgu kXD jgu @@ -44390,12 +44238,12 @@ mWs dCK chT jgu -cPL +ebx sTm -uCX +byn jgu jgu -hcY +dGF tkj oer xVW @@ -44442,9 +44290,9 @@ bQM bQM bQM cAW -bTo +gjm pcu -iWq +hfJ cAW cAW cAW @@ -44591,7 +44439,7 @@ jgu bxm oer oPU -uLf +gXa jgu kXD jgu @@ -44607,7 +44455,7 @@ wnu dqE tNV kXD -hcY +dGF tkj oer lzJ @@ -44654,9 +44502,9 @@ bQM bQM bQM cAW -bTo +gjm pcu -iWq +hfJ cAW cAW cAW @@ -44802,8 +44650,8 @@ vhB wgO tkj oer -rsg -sTU +oCH +rBh kXD oRR dLq @@ -44819,7 +44667,7 @@ wbI wbI lzJ kXD -hcY +dGF tkj lzJ irB @@ -44866,9 +44714,9 @@ bQM bQM bQM cAW -bTo +gjm pcu -iWq +hfJ cAW cAW cAW @@ -44886,17 +44734,17 @@ agi agi aWV aWV -cYV +cDO fUz -edu +oxR aWV jXz jXz jXz aWV -cYV +cDO fUz -mIf +lIN jXz otg dLL @@ -45014,7 +44862,7 @@ vhB wgO tkj oer -uLf +gXa jgu jgu wbI @@ -45031,7 +44879,7 @@ wbI wbI wbI kXD -hcY +dGF mPX tiZ irB @@ -45098,17 +44946,17 @@ aWV aWV jXz jXz -eim +bDf lLQ -orB +hlx jXz pgx pgx pgx jXz -eim +bDf lLQ -orB +hlx gKi lLQ oiV @@ -45225,26 +45073,26 @@ jgu jgu jgu bxm -uWO -sTU +eGT +rBh kXD wbI jcv djf tkj oer -hPi +pKV jUG jUG -oKf +ixU lxT alP wbI jcv wbI kXD -oCn -wHl +vQK +oHe wbI irB irB @@ -45292,7 +45140,7 @@ bQM cAW bQM aaa -iWq +hfJ cAW cAW cAW @@ -45437,7 +45285,7 @@ jgu itN jgu tkj -bcT +udd jgu jgu jBQ @@ -45445,10 +45293,10 @@ bvK dLq tkj oer -pGK +gLC jfd hRX -mjB +qZp tkj oer jBQ @@ -45456,7 +45304,7 @@ oRR dLq jgu jgu -hcY +dGF wbI tkj oer @@ -45502,9 +45350,9 @@ bQM bQM bQM cAW -bTo +gjm pcu -iWq +hfJ cAW cAW cAW @@ -45649,7 +45497,7 @@ jgu itN jgu tkj -sRE +cRk jgu anu wbI @@ -45657,10 +45505,10 @@ rBz wbI tkj oer -pGK +gLC hRX pzh -sQL +ttU nez oer wbI @@ -45668,7 +45516,7 @@ rBz wbI qkg jgu -sBf +kMA wbI tkj oer @@ -45714,9 +45562,9 @@ bQM bQM bQM cAW -bTo +gjm pcu -iWq +hfJ cAW cAW cAW @@ -45861,26 +45709,26 @@ jgu jgu jgu tkj -osv -iyk +ecz +iUR oyT oyT oyT oyT oWw oer -pGK +gLC mxs vhI -fgM +gAs tkj lzP oyT oyT oyT eNn -uqj -bFi +rov +mwi oyT oWw oer @@ -45926,9 +45774,9 @@ bQM bQM bQM cAW -bTo +gjm pcu -iWq +hfJ cAW cAW agi @@ -46073,26 +45921,26 @@ itN itN oPU tkj -fdR -spA +scb +juL tiZ tiZ tiZ tiZ wCI lAn -dqa +pFB sbf vhI -sQL +ttU oWG mtG tiZ tiZ tiZ uVO -tXD -wSo +sxY +lcO tiZ tiZ qhk @@ -46138,9 +45986,9 @@ bQM bQM bQM cAW -bTo +gjm pcu -iWq +hfJ cAW cAW agi @@ -46285,7 +46133,7 @@ itN itN oPU tkj -sRE +cRk jgu anu wbI @@ -46293,10 +46141,10 @@ jcv wbI tkj oer -pGK +gLC uxN gTc -sQL +ttU nWk oer wbI @@ -46304,7 +46152,7 @@ jcv wbI qkg jgu -nho +iGh wbI wbI wbI @@ -46350,9 +46198,9 @@ bQM bQM bQM cAW -bTo +gjm pcu -iWq +hfJ cAW cAW agi @@ -46497,7 +46345,7 @@ itN sIz oPU tkj -bcT +udd jgu jgu jBQ @@ -46505,10 +46353,10 @@ nAf dLq tkj oer -pGK +gLC hRX sbf -sQL +ttU tkj oer jBQ @@ -46562,9 +46410,9 @@ bQM bQM bQM cAW -bTo +gjm pcu -iWq +hfJ agi aWV aWV @@ -46709,18 +46557,18 @@ itN kMC oPU tkj -eEX -aBD +aOp +foR kXD wbI rBz wbI qUC oer -sSM +ebx sTm sTm -uCX +byn tkj oer wbI @@ -46774,9 +46622,9 @@ bQM bQM bQM cAW -bTo +gjm pcu -pbV +toG agi aWV aPD @@ -46922,7 +46770,7 @@ wgO oPU tkj oer -uLf +gXa kXD wbI wbI @@ -46986,7 +46834,7 @@ bQM cAW cAW cAW -bTo +gjm pcu pcu agi @@ -47134,7 +46982,7 @@ vhB oPU gyt oer -ckZ +pRM kXD aBJ wKb @@ -47198,9 +47046,9 @@ bQM cAW cAW cAW -bTo +gjm pcu -xtP +jAw agi aWV aPD @@ -47346,7 +47194,7 @@ vhB oPU tkj oer -ckZ +pRM kXD lvt tas @@ -47410,7 +47258,7 @@ cAW cAW cAW cAW -bTo +gjm pcu agi agi @@ -47558,12 +47406,12 @@ vhB oPU tkj oer -ckZ +pRM jgu jgu -hPi +pKV jUG -oKf +ixU jgu wuC roi @@ -47622,7 +47470,7 @@ bQM cAW cAW cAW -bTo +gjm pcu agi agi @@ -47770,16 +47618,16 @@ wgO dmT tkj oer -ove -dJe -dJe -vuX +sce +lLk +lLk +qVb wgO -uLf +gXa jgu jgu -hPi -gtf +pKV +lMJ jgu itN jBQ @@ -47987,12 +47835,12 @@ oPU oPU gAn oPU -ove -dbr -dbr -vMN -fGi -dbr +sce +dOI +dOI +roC +wXY +dOI itN wbI qJL @@ -48368,7 +48216,7 @@ frM bnA wSU wSU -nJq +xxW guz iiw awL @@ -48580,7 +48428,7 @@ vBX wAn wSU wSU -nJq +xxW guz gcx okv @@ -48792,7 +48640,7 @@ vBX bnA wSU wSU -nJq +xxW guz gcx okv @@ -49004,7 +48852,7 @@ guz bnA vDf wSU -nJq +xxW guz gcx pLQ @@ -49013,7 +48861,7 @@ guz guz guz guz -gTW +eaH cEw cEw cEw @@ -49216,7 +49064,7 @@ bgc bnA wSU kok -nJq +xxW guz gcx okv @@ -49225,7 +49073,7 @@ guz wSU uSA uSA -pRp +vej bnA wps guz @@ -49234,17 +49082,17 @@ wrR mpE vOm vOm -psx +dHE ipd soj iTJ kbo tSm tSm -iTs -bqC -art -fvr +xdz +tWo +low +jXr nkF nkF nkF @@ -49427,8 +49275,8 @@ fXI guz xvB aAA -xNn -eBr +pxu +enn guz gcx pLQ @@ -49437,7 +49285,7 @@ guz wSU yeX pen -byT +xkg bnA mSo guz @@ -49446,7 +49294,7 @@ wrR xvv xvv xvv -rLA +qAO ipd soj rKy @@ -49649,26 +49497,26 @@ guz wSU uSA uSA -giw -noz -nSh +cQB +wXo +iNs vBX guz eMG xvv xvv xvv -rLA +qAO ipd spb rKy xiL mAt nMp -jFh -vxm -heT -aZW +atb +yeI +owz +qhL wgO wgO wgO @@ -49870,7 +49718,7 @@ bPG xvv xvv xvv -rLA +qAO ipd spb rKy @@ -49880,7 +49728,7 @@ wrR ipd ipd nvD -hcY +dGF vhB vhB wgO @@ -50082,17 +49930,17 @@ bPG xvv xvv xvv -rLA +qAO ipd kdq rKy xiL mdS tSm -iTs -bqC -art -vuX +xdz +tWo +low +qVb wgO wgO bRs @@ -50285,16 +50133,16 @@ guz wSU uSA uSA -qLv -gyy -dpn +luR +vJw +hEW vBX guz bPG xvv xvv xvv -rLA +qAO ipd vMs sFd @@ -50497,26 +50345,26 @@ guz wSU yeX pen -byT +xkg bnA jHp myH jHp wrR -tkP +qlC pYL pYL -jHD +fKE wrR wrR wrR wrR rKy mAt -jFh -vxm -heT -aZW +atb +yeI +owz +qhL wgO lAN wgO @@ -50706,10 +50554,10 @@ gcx okv gcx guz -eQY -vJn -vJn -asE +sMq +rPj +rPj +qeq bnA kzL guz @@ -50918,7 +50766,7 @@ gcx okv gcx guz -jYn +wws wrR ipd ipd @@ -51130,7 +50978,7 @@ gcx okv gcx guz -byT +xkg pVD mKx iTJ @@ -51335,14 +51183,14 @@ fXI guz okv aAA -aje -vTI +alk +vCM guz gcx okv gcx ffA -jYn +wws pVD mKx iBM @@ -51548,22 +51396,22 @@ tSY bnA vDf kok -nJq +xxW guz gcx okv gcx vrS -jYn +wws wrR wrR tql xiL iOX -pGy +gsx eYN eYN -ybx +uHv jqM xiL rKy @@ -51760,23 +51608,23 @@ vBX bnA vBX wSU -nJq +xxW guz gcx okv gcx ffA -jYn +wws wrR nhX anT vcq -kle -wHC +vuq +eyT kat jVM -omN -nrd +cgo +hoz vAX rKy rft @@ -51972,23 +51820,23 @@ guz vBX vBX kok -bem +jtW guz gcx okv gcx guz -byT +xkg wrR nzf dpZ vAX -hWz +uyA bSM bSM bSM bSM -vCm +tcd pAl rKy rft @@ -52184,23 +52032,23 @@ guz vBX vBX wSU -bem +jtW rdi gcx tER gcx guz -byT +xkg wrR eQz ixK rKG -wyd -oby -oby -oby -oby -ftd +xpd +hjA +hjA +hjA +hjA +nte vAX rKy oEX @@ -52339,13 +52187,13 @@ rty cui mzn eXp -til -ljx +eDU +iXn raL raL raL -bpe -snr +tDO +dzs eXp raL rty @@ -52396,13 +52244,13 @@ guz vBX vBX wSU -nJq +xxW rhh kJf okv gcx guz -jYn +wws wrR wrR iFg @@ -52552,11 +52400,11 @@ bxg jlB xrZ xGc -uws +iGI uzy uzy uzy -iAq +imH xGc bNE rKA @@ -52608,13 +52456,13 @@ wSX iuz vBX wSU -nJq +xxW rhh uEj okv gcx guz -jYn +wws pVD mKx iTJ @@ -52820,13 +52668,13 @@ wSU oVk vBX wSU -bem +jtW rhh jji vjG gcx guz -byT +xkg pVD mKx dBt @@ -53032,13 +52880,13 @@ wSU oVk vBX kok -bem +jtW guz gcx okv gcx guz -byT +xkg wrR vdH eyv @@ -53054,10 +52902,10 @@ qjX wDe xiL iOX -pGy +gsx eYN eYN -ybx +uHv iOX xiL rKy @@ -53244,13 +53092,13 @@ wSU eys vBX wSU -nJq +xxW guz gcx kEj gcx guz -jYn +wws pVD iQH mKx @@ -53265,12 +53113,12 @@ ipd rKy rft vAX -kle -mLm +vuq +dJc kat jVM -omN -nrd +cgo +hoz vAX rKy rft @@ -53427,13 +53275,13 @@ bis nOz mCp gTi -xst +hFX lqq lqq lqq lqq lqq -vrT +iLE mCp gTi nOz @@ -53456,13 +53304,13 @@ wSU wSU vBX kok -nJq +xxW guz gcx okv gcx guz -jYn +wws pVD mKx mKx @@ -53477,12 +53325,12 @@ ipd rKy iEA vAX -hWz +uyA bSM bSM bSM bSM -vCm +tcd vAX rKy rft @@ -53599,17 +53447,17 @@ tel ioM ioM ioM -sKu -iXs +sSv +kll ioM ioM ioM ioM ioM -sKu +sSv chx chx -iXs +kll ioM ioM ioM @@ -53619,10 +53467,10 @@ ioM ioM ioM ioM -sKu +sSv chx chx -iXs +kll ioM ioM hVI @@ -53639,13 +53487,13 @@ sJu lqq mCp gTi -kHf -tcL +rOV +mcy nOz pVR nOz -jeL -fKm +owI +xID mCp gTi lqq @@ -53667,14 +53515,14 @@ wSU wSU wSU vBX -xNn -eBr +pxu +enn guz gcx okv gcx guz -jYn +wws pVD mKx mKx @@ -53689,12 +53537,12 @@ ipd rKy rft vAX -wyd -oby -oby -oby -oby -ftd +xpd +hjA +hjA +hjA +hjA +nte vAX rKy mdS @@ -53852,11 +53700,11 @@ nOz mCp gTi eTc -sfi -mWX -mWX -mWX -ifk +mrP +pbo +pbo +pbo +fcH eTc mCp gTi @@ -53886,7 +53734,7 @@ gcx okv gcx guz -jYn +wws wrR vdH eyv @@ -54023,8 +53871,8 @@ ioM ioM ioM ioM -sKu -iXs +sSv +kll ioM hVI fCr @@ -54098,8 +53946,8 @@ gcx okv gcx guz -bxA -cKU +eYW +hBK xiL iTJ tSm @@ -54303,8 +54151,8 @@ ppS hGn lit vBX -aje -vTI +alk +vCM guz gcx okv @@ -54516,14 +54364,14 @@ wSU wSU vBX kok -nJq +xxW guz gcx okv gcx guz -eQY -sVd +sMq +qqm xiL sFd nMp @@ -54728,32 +54576,32 @@ wSU wSU vBX bnA -bem +jtW guz pCH awL wSt guz -jYn +wws wrR mKx rft xiL iOX -pGy +gsx eYN eYN -ybx +uHv iOX xiL gmx rft kgY mxm -pGy +gsx eYN eYN -ybx +uHv jqM xiL rKy @@ -54940,33 +54788,33 @@ hGn lit tSY bnA -nJq +xxW guz guz guz guz guz -jYn +wws wrR mKx rft aYf -kle -mLm +vuq +dJc kat jVM -omN -nrd +cgo +hoz vAX rKy rft oeV -kle -mLm +vuq +dJc kat jVM -omN -nrd +cgo +hoz vAX rKy mAt @@ -55152,33 +55000,33 @@ wSU wSU vBX bnA -mOm -cZP -vov +aIT +dzh +xSj vBX -qLv -cZP -jRC +luR +dzh +qZz wrR vdH rft vAX -hWz +uyA bSM bSM bSM bSM -wYP +sQv vAX rKy rft lIH -hWz +uyA bSM bSM bSM bSM -vCm +tcd vAX rKy rft @@ -55366,31 +55214,31 @@ lNP bnA bnA eOI -aqj +osu fpN -bQj +kab oxU wrR wrR mKx rft vAX -wyd -oby -oby -oby -oby -ftd +xpd +hjA +hjA +hjA +hjA +nte vAX rKy rft iiz -wyd -oby -oby -oby -hKP -ftd +xpd +hjA +hjA +hjA +vce +nte vAX rKy rft @@ -55414,18 +55262,18 @@ voi voi xUr itN -swg -fQV -fQV -fyC -qOk -mKS -fyC -qOk -mKS -fQV -fQV -erT +rfI +rQt +rQt +eyB +pFE +ocW +eyB +pFE +ocW +rQt +rQt +grn twb chE kMU @@ -55626,7 +55474,7 @@ voi voi lwA uGT -bTo +gjm afk afk afk @@ -55637,7 +55485,7 @@ hkh afk afk afk -iWq +hfJ tPN rMo kTs @@ -55838,7 +55686,7 @@ hpd fXB fXB dCM -bTo +gjm afk afk afk @@ -55849,7 +55697,7 @@ pcu afk afk afk -iWq +hfJ tPN fmE dKX @@ -55941,8 +55789,8 @@ bFA rYY ePq mzS -lEp -wWW +vgK +rPM xXh xuQ gjz @@ -56050,7 +55898,7 @@ ubP ubP ubP dCM -bTo +gjm afk afk afk @@ -56061,7 +55909,7 @@ hkh afk afk afk -iWq +hfJ tPN mKo kTs @@ -56160,8 +56008,8 @@ xuQ tja tja hVI -ieu -ieu +dUm +dUm hVI hVI qEl @@ -56262,18 +56110,18 @@ ubP ubP ubP nqN -aKA -jlH -jlH -tWI -llQ -jKI -tWI -llQ -jKI -jlH -jlH -bUB +rcy +rhR +rhR +dfw +lJb +ngo +dfw +lJb +ngo +rhR +rhR +mtM twb ifP gfo @@ -56572,9 +56420,9 @@ xUn xUn xUn aFZ -fQV -fQV -fQV +rQt +rQt +rQt aFZ tQB tQB @@ -56977,7 +56825,7 @@ xLi cGa cer kpq -fMc +bpH qkt nEW ddL @@ -56996,9 +56844,9 @@ tja bLM jMh tQB -jlH -jlH -jlH +rhR +rhR +rhR tQB qrn qrn @@ -57189,7 +57037,7 @@ hae hae iRI kpq -oxp +tKh rHX tvi ddL @@ -57254,10 +57102,10 @@ tyj dtS bFr bis -fTn +kOM hXX hXX -byc +aYX bFr bFr bFr @@ -57715,7 +57563,7 @@ ngn wWs wWs gag -aej +vor wWs wWs ihB @@ -57857,7 +57705,7 @@ tja yhs hVI kYi -aFQ +elr xxX iAA aRt @@ -58028,11 +57876,11 @@ cer kpq wou xLi -hqG -lQL -qsE -qMi -uky +qfK +ndC +piV +hJV +kKh nmy luZ cer @@ -58240,12 +58088,12 @@ cer kpq mvp ddL -lXO +dMT nId ykO pCc -pxW -ioV +isI +tim mvp cer wun @@ -58278,8 +58126,8 @@ bLM gbv bLM fYa -voK -koY +kRl +mOc bLM hOG jQs @@ -58338,8 +58186,8 @@ uGY uGY uGY nqN -ksL -eip +kuQ +nKZ gpG ihB ohx @@ -58452,7 +58300,7 @@ cer kpq mvp ddL -ntH +rEr nMZ oHX pFP @@ -58550,8 +58398,8 @@ fdf rQd rOu twb -oZy -nfA +vJR +oNn gpG lkP ihB @@ -58664,12 +58512,12 @@ cer kpq aUA ddL -oIq +kPG nOw oXR pHh -oEu -cKB +tnx +rBE mvp cer kpq @@ -58762,8 +58610,8 @@ cME cME cME liA -nyS -scZ +uWk +qGW ceC bQW fiG @@ -58876,11 +58724,11 @@ cer kpq wou xLi -lIl -cEG -mvV -fno -byF +oYX +eor +mYz +tHp +emo swJ mvp cer @@ -58914,8 +58762,8 @@ bLM tja bLM fYa -cbF -eOy +pud +bCv bLM dOO uRF @@ -59127,7 +58975,7 @@ tja bLM fYa kCN -oXI +xig hko eUN pae @@ -59150,16 +58998,16 @@ fIq mEO oou aFZ -wIG -ugv -qOk -tIp -lml -hVS -lDC -qOk -nYT -vPM +blI +ifB +pFE +uFx +lud +mvt +axW +pFE +wOq +biz bQM tPN ecL @@ -59183,14 +59031,14 @@ mCp rHu rJu uzw -kqC -rzp -vds -vds -elO +rjw +kXT +wat +wat +iHi abJ -ioc -ioc +iBI +iBI abJ ubP ubP @@ -59339,7 +59187,7 @@ tja dTg qCE eYr -lbZ +raJ bLM dOO oTi @@ -59362,17 +59210,17 @@ lyJ nBt kwT tQB -tqP +jZF afk afk afk -xdt -tzN +xpF +gJv afk afk afk -rxL -fQV +pom +rQt tPN ecL cME @@ -59395,14 +59243,14 @@ eLu eLu kfW cME -kqC -dHD +rjw +btJ lkb -upY -fHo +oLE +oMW vRA -ioc -ioc +iBI +iBI vRA ubP nXX @@ -59551,7 +59399,7 @@ tja dTg slh eYr -lbZ +raJ bLM dOO oTi @@ -59574,16 +59422,16 @@ mEO lLE xoi tQB -urJ +whc afk hkh afk -tCZ -urJ +deC +whc afk hkh afk -tCZ +deC pcu tPN jSE @@ -59607,15 +59455,15 @@ eLu cME cME cME -oFI -dHD +wHu +btJ qRa -upY -voO -kqC +oLE +blt +rjw pGS -kgN -kqC +cas +rjw sOj uye ubP @@ -59763,7 +59611,7 @@ bLM dTg slh eYr -lbZ +raJ oeN dOO oTi @@ -59786,17 +59634,17 @@ mNB byY fUX tQB -mpB +pNp afk afk afk -eze -bHU +aWY +hyR afk afk afk -hxG -jlH +mxN +rhR twb twb twb @@ -59819,14 +59667,14 @@ uvF cME ljd cME -oFI -dHD -upY -upY +wHu +btJ +oLE +oLE ger abJ -ioc -ioc +iBI +iBI abJ aUg ubP @@ -59975,7 +59823,7 @@ ueX qjM qjM tis -eca +tFB xlk nfu kpH @@ -59995,19 +59843,19 @@ fgY vWe hVI hVI -erD +iDR wyl aFZ -xKA -xQC -llQ -viX -bsk -lSS -lcq -llQ -jaB -bsk +lHJ +uMt +lJb +mkr +uEl +atD +lOX +lJb +bjA +uEl bQM bQM kPz @@ -60031,14 +59879,14 @@ cME cME cME eLu -kqC -dHD -upY -eNa -efW +rjw +btJ +oLE +mlE +vza vRA -ioc -ioc +iBI +iBI vRA ubP ubP @@ -60184,10 +60032,10 @@ tja ltd ueX aSS -gNx -tHF -tHF -gbO +wge +czx +czx +jKJ jQs afq uRF @@ -60207,7 +60055,7 @@ svW hVI hVI hVI -hSo +eGF hVI aFZ sKY @@ -60243,11 +60091,11 @@ cME cME cME eLu -kqC -dHD -upY +rjw +btJ +oLE skj -uGY +rjw ceC xGt xGt @@ -60360,11 +60208,11 @@ cer kpq wou xLi -hqG -qMi -phQ -tiM -uky +qfK +hJV +aQA +qrN +kKh bzU mvp cer @@ -60395,8 +60243,8 @@ otz tja tja fYa -voK -fQI +kRl +jDl bLM hkM dOO @@ -60455,11 +60303,11 @@ uvF cME cME cME -kqC -dHD -upY -fHo -uGY +rjw +btJ +oLE +oMW +rjw jIw cRl sQC @@ -60572,12 +60420,12 @@ cer kpq mvp ddL -lXO +dMT nId ykO pCc -msd -ioV +ioN +tim mvp cer kpq @@ -60608,7 +60456,7 @@ tja mMh gFp ikL -fwt +gwt vBH bLM dOO @@ -60667,11 +60515,11 @@ eLu cYP qso gsN -kqC -dHD -upY -fHo -hVG +rjw +btJ +oLE +oMW +yaS yiL cZV wNG @@ -60784,7 +60632,7 @@ cer kpq mvp ddL -ntH +rEr nUr oHX pFP @@ -60879,11 +60727,11 @@ kqC kqC kqC kqC -kqC +rjw oSn hwN eJy -uGY +rjw lEF tsN tsN @@ -60996,12 +60844,12 @@ cer kpq ajw ddL -oIq +kPG nOw oXR pHh -apO -cKB +fgT +rBE mvp cer pvF @@ -61091,11 +60939,11 @@ bjt kqC sfu jyF -kqC -ioc -ioc -ioc -uGY +rjw +iBI +iBI +iBI +rjw xGt xGt xGt @@ -61120,7 +60968,7 @@ tir sCH ceC kIA -psm +qWe ubP pTj ubP @@ -61208,11 +61056,11 @@ cer kpq azZ xLi -lIl -wol -mvV -fno -byF +oYX +rGB +mYz +tHp +emo nmy luZ cer @@ -61243,8 +61091,8 @@ eCy cTE njm fYa -cbF -nvs +pud +tfy bLM ddB rcI @@ -61303,11 +61151,11 @@ bjt kqC qNF ctW -kqC -rzp -vds -vds -vds +rjw +kXT +wat +wat +wat car gOU gOU @@ -61456,7 +61304,7 @@ hVI hVI hVI yhR -qiK +rfy jQs afq tja @@ -61467,8 +61315,8 @@ aWI jQs jQs jQs -nRT -qNj +dul +wNo hVI vlK oWY @@ -61515,14 +61363,14 @@ kgN kqC ryJ end -kqC -dHD +rjw +btJ wbW -upY +oLE ufE ugg -upY -upY +oLE +oLE gmG ksE xGt @@ -61648,7 +61496,7 @@ mgh azZ azZ azZ -ohF +piC pcu tQB kZu @@ -61668,7 +61516,7 @@ kZV bLM hVI hVI -woh +oaD tja tja wCJ @@ -61679,8 +61527,8 @@ gjz tja tja tja -tnY -ciy +ovb +aFH hVI wNB oTi @@ -61728,13 +61576,13 @@ vds vds elO nAs -dHD -upY -upY +btJ +oLE +oLE hMj -upY +oLE dQe -upY +oLE ygk rnE xGt @@ -61860,7 +61708,7 @@ uQT azZ azZ azZ -bTo +gjm pcu aFZ hUL @@ -61879,8 +61727,8 @@ bsR hGu bLM aif -rKa -rTV +uNh +oMI pWX bDJ rtP @@ -61891,7 +61739,7 @@ tja tja nMi tja -upr +sAg hVI hVI mMa @@ -61941,14 +61789,14 @@ xRI efW nAs fcB -upY +oLE hlB -upY -upY +oLE +oLE vYX ugg ksE -ceC +jTJ ceC sIh ihB @@ -61981,7 +61829,7 @@ uGY sEO sEO sEO -vpN +ctj sXt sXt sXt @@ -62072,7 +61920,7 @@ mvp azZ bQM bQM -bTo +gjm pcu aFZ wDK @@ -62092,7 +61940,7 @@ bLM njm hVI hVI -woh +oaD hYl tja tja @@ -62103,7 +61951,7 @@ ltd tja set tja -nyq +gvs bLJ bLJ bLJ @@ -62141,7 +61989,7 @@ sKY sKY iYw iYw -izh +uNB dHD xbM voO @@ -62151,13 +61999,13 @@ end kqC ryJ end -kqC +rjw lNf -upY -upY +oLE +oLE elc -upY -upY +oLE +oLE eNr ksE xGt @@ -62173,7 +62021,7 @@ gag hCk tCH wBK -kGB +vQD ceC dBO dBO @@ -62284,7 +62132,7 @@ azZ azZ bQM bQM -bTo +gjm pcu aFZ hVI @@ -62304,7 +62152,7 @@ hVI hVI hVI hVI -woh +oaD tja tja tja @@ -62315,14 +62163,14 @@ cgx tja tja tja -vyv -nMz +dgg +wQF nQu wRz fqg fqg -eLX -edy +ivA +tMr nQu nQu suX @@ -62346,14 +62194,14 @@ aeI aeI nQu nQu -srp -hOQ +pYl +gTI fqg fqg fqg nQu -srp -bqD +pYl +shC cAJ xbM hTN @@ -62363,11 +62211,11 @@ tKk kqC rzp osQ -kqC -dHD -upY -upY -upY +rjw +btJ +oLE +oLE +oLE ufE wbW fxS @@ -62385,7 +62233,7 @@ gKg dFB hrB sYP -kGB +vQD uGY xLd ihB @@ -62496,7 +62344,7 @@ azZ azZ bQM bQM -bTo +gjm pcu aFZ chZ @@ -62514,9 +62362,9 @@ mEO mEO ddD hVI -lmn -fkH -roE +qlz +bnW +hoa tpZ jAF tpZ @@ -62575,13 +62423,13 @@ dpe kqC qLi dpe -kqC -dHD -upY +rjw +btJ +oLE sRv -upY +oLE wam -upY +oLE mom rnE xGt @@ -62597,7 +62445,7 @@ aIm aIm gag gag -kGB +vQD cCB ihB ubP @@ -62708,7 +62556,7 @@ azZ azZ azZ bQM -bTo +gjm pcu aFZ bRo @@ -62789,11 +62637,11 @@ kqC kqC mCF sAF -upY -upY +oLE +oLE vRA -upY -upY +oLE +oLE ksE ceC ceC @@ -62809,7 +62657,7 @@ ltQ ltQ uGY ltQ -ayo +eKa uGY eZQ kyZ @@ -62920,7 +62768,7 @@ azZ azZ azZ tuf -bTo +gjm pcu tQB kSd @@ -62999,10 +62847,10 @@ ioc kqC sfu iEG -kqC -dHD -upY -upY +rjw +btJ +oLE +oLE vRA cKH joJ @@ -63021,7 +62869,7 @@ fRq fRq uGY fRq -ygr +sWR xGt ihB ubP @@ -63163,14 +63011,14 @@ cgx tja tja tja -tjw -cYS +aJm +dar nQu pzL vDL eWf -qre -diL +lur +tok nQu nQu aeI @@ -63194,14 +63042,14 @@ aeI aeI nQu nQu -oTS -vLO +dYB +eZK eWf eWf eWf nQu -oTS -iox +dYB +bVm dHD xbM fHo @@ -63210,14 +63058,14 @@ ioc ioc kqC qNF -mDO -kqC -dHD -upY +fKO +rjw +btJ +oLE vRA vZL -upY -upY +oLE +oLE ksE xGt mEJ @@ -63233,7 +63081,7 @@ gag gag gag gag -kGB +vQD xGt ihB ubP @@ -63324,9 +63172,9 @@ xLi dqX fEn fEn -oGy -oGy -cLy +mDC +mDC +gtD rHX dqX rHX @@ -63375,7 +63223,7 @@ tja hYl tja tja -mCR +jxS iYw egk sKY @@ -63413,7 +63261,7 @@ sKY sKY iYw iYw -izh +uNB dHD xbM fHo @@ -63423,12 +63271,12 @@ kgN kqC ryJ end -kqC -nBb -upY +rjw +oTL +oLE vRA -upY -upY +oLE +oLE ejf ksE xGt @@ -63445,7 +63293,7 @@ gag gag gag gag -kGB +vQD xGt gwm ubP @@ -63538,7 +63386,7 @@ dqX dqX xLi xLi -idP +joB rHX dqX rHX @@ -63587,7 +63435,7 @@ tja tja tja tja -oOk +rzZ aFZ aFZ fPB @@ -63638,10 +63486,10 @@ elO nAs fcB gQc -upY -upY -upY -upY +oLE +oLE +oLE +oLE ksE ceC ceC @@ -63655,9 +63503,9 @@ uGY uxv ceC ceC -aPr +wFs jyv -kaw +osS uGY ilr ubP @@ -63750,7 +63598,7 @@ mvp irD iMN oNu -aQY +pak rHX dqX rHX @@ -63799,7 +63647,7 @@ fCf jTo jbq tja -tFY +aoG aFZ aFZ fPB @@ -63849,15 +63697,15 @@ xRI efW nAs fcB -upY -upY +oLE +oLE vRA osN xdb pZn kIb vFV -hZR +ipy kPz kPz kPz @@ -63962,7 +63810,7 @@ mvp sVS dwZ wsM -aQY +pak rHX dqX rHX @@ -63980,13 +63828,13 @@ dqX fEn mvp mvp -dvB -mpY -xCv -xCv -xCv -gHC -kHc +bCM +huZ +yin +yin +yin +fvn +tZE fbc bLM bLM @@ -64059,17 +63907,17 @@ kgN kqC ryJ end -kqC -nBb -upY -upY -upY -upY +rjw +oTL +oLE +oLE +oLE +oLE siW bEm -upY +oLE ksE -hZR +ipy kPz bQM kPz @@ -64174,7 +64022,7 @@ mvp mvp bgD wsM -aQY +pak pjW dqX rHX @@ -64192,13 +64040,13 @@ beW fEn maA mvp -ckA +dOf jmG mvl mvl mvl jmG -fer +utm byY byY byY @@ -64271,17 +64119,17 @@ ioc kqC rzp ldz -kqC -qNF -xRI -xRI -xRI -xRI -xRI -xRI -xRI +rjw +hDF +fBA +fBA +fBA +fBA +fBA +fBA +fBA rnE -hZR +ipy kPz kPz kPz @@ -64386,7 +64234,7 @@ mvp mvp twR oNu -aQY +pak rHX nDI rHX @@ -64404,17 +64252,17 @@ dqX fEn mvp mvp -ckA +dOf lIG spR kzR qBI mvl -eqJ +guH byY -iEl -gBR -gBR +eni +rRd +rRd jmG wUz jWI @@ -64483,20 +64331,20 @@ ioc kqC qLi dpe -kqC +rjw okG -ioc +iBI okG -kqC -kqC +rjw +rjw dbI dbI dbI -kqC -wzE -hZR -hZR -hZR +rjw +hjg +ipy +ipy +ipy nqN xGt xGt @@ -64598,7 +64446,7 @@ xLi dqX xLi xLi -idP +joB rHX dqX rHX @@ -64616,16 +64464,16 @@ dqX dqX mvp mvp -gkv +kMf cKa lUZ xlp poC mvl -sKu +sSv chx -rDu -dCg +nwA +wdv hXN jmG xVw @@ -64645,7 +64493,7 @@ wqs dVA cKa awU -mgz +jqN rLG aLX cKa @@ -64699,19 +64547,19 @@ mCF uJp kIb vFV -kqC +rjw lsR lZp lZp lZp svN -kqC -rzp -vds -elO +rjw +kXT +wat +iHi abJ -ioc -ioc +iBI +iBI abJ goo goo @@ -64810,7 +64658,7 @@ phz kEZ phz xLi -jUa +cHi rHX dqX rHX @@ -64856,7 +64704,7 @@ vUP dVA vUP cKa -uKK +tYz hjB rLG vUP @@ -64907,23 +64755,23 @@ ioc kqC sfu jyF -kqC -dHD +rjw +btJ xLx -voO -kqC +blt +rjw ubh xFJ eao lZp qXj -kqC -nBb -xbM -fHo +rjw +oTL +xAn +oMW vRA -ioc -ioc +iBI +iBI vRA fAf fAf @@ -65068,8 +64916,8 @@ eow eow lFB oNC -kjt -mgz +wyb +tIN rLG vUP lcE @@ -65119,24 +64967,24 @@ ioc kqC qNF eub -kqC -dHD -xbM -fHo -kqC +rjw +btJ +xAn +oMW +rjw sIk dzE -kqC +rjw sIk dzE -kqC -dHD -xbM -fHo -kqC -ioc -ioc -kqC +rjw +btJ +xAn +oMW +rjw +iBI +iBI +rjw nAm nAm fAf @@ -65245,25 +65093,25 @@ mvp xxU kpq jNi -ygs -ygs -kBX +lLN +lLN +qhh dqX loE eIx mvp mvp -lZA +rjD vUP vUP vUP -lZA +rjD byY byY byY byY byY -lZA +rjD kjt kjt rLG @@ -65294,17 +65142,17 @@ jWI lFB jmG kPz -eHa +sYX pcu iYw sKY sKY iYw -imI +nGf oEH oEH oEH -vkt +rPs bLJ rcg xZN @@ -65331,10 +65179,10 @@ kgN kqC ryJ end -kqC +rjw rgc -xbM -fHo +xAn +oMW vfO lZp lZp @@ -65342,12 +65190,12 @@ jmv uLV lZp vfO -dHD -xbM -fHo +btJ +xAn +oMW abJ -ioc -ioc +iBI +iBI abJ fAf fAf @@ -65355,13 +65203,13 @@ nZB nZB nZB owp -uPA -uWQ +oEE +fII nZB ghz nZB -uPA -uWQ +oEE +fII nZB nZB fAf @@ -65459,7 +65307,7 @@ kpq mvp lIC kxl -swT +dKO fEn gDI agh @@ -65505,18 +65353,18 @@ cKa kjt rLG uwk -swg -fyC -qOk -sHO -erT +rfI +eyB +pFE +mjW +grn kPz iYw -hre +iES wfw jRF bvp -iiY +tDK bLJ bLJ frv @@ -65543,10 +65391,10 @@ lvV vds vds elO -ioc -dHD -xbM -fHo +iBI +btJ +xAn +oMW vfO lZp lZp @@ -65554,12 +65402,12 @@ eao lZp lZp vfO -dHD -xbM -fHo +btJ +xAn +oMW vRA -ioc -ioc +iBI +iBI vRA fAf fAf @@ -65567,13 +65415,13 @@ nZB nZB nZB nZB -nKl -qfc +hgF +cNU nZB fAf nZB -nKl -qfc +hgF +cNU nZB nZB nZB @@ -65671,7 +65519,7 @@ kpq mvp mMP wsM -swT +dKO fEn fEn ciM @@ -65717,12 +65565,12 @@ cKa kjt rLG uwk -daD +ryp afk afk afk -ghg -gef +xrw +rEk sKY qTe red @@ -65755,24 +65603,24 @@ eNa xRI xRI efW -ioc -dHD -xbM -fHo -kqC +iBI +btJ +xAn +oMW +rjw hAP dzE -kqC +rjw sIk dzE -kqC -dHD -xbM -fHo -kqC -ioc -ioc -kqC +rjw +btJ +xAn +oMW +rjw +iBI +iBI +rjw goo goo fAf @@ -65883,17 +65731,17 @@ kpq hjp dsS dXN -swT +dKO fEn gDI agh mvp mvp -lZA +rjD vUP vUP vUP -lZA +rjD jWI eow eow @@ -65929,11 +65777,11 @@ cKa kjt rLG uwk -urJ +whc afk hkh afk -tCZ +deC pcu sKY aso @@ -65943,11 +65791,11 @@ aso aso rtc idS -imI -sPt +nGf +rPs hys -imI -sPt +nGf +rPs sKY bce bce @@ -65957,7 +65805,7 @@ wzE dHD voV sxc -cxA +vMR xbM xbM xbM @@ -65967,23 +65815,23 @@ jlq kqC ryJ end -kqC -nBb -xbM -voO -kqC +rjw +oTL +xAn +blt +rjw ubh lZp jmv lZp qXj -kqC -nBb -xbM -fHo +rjw +oTL +xAn +oMW abJ -ioc -ioc +iBI +iBI abJ fAf fAf @@ -66093,9 +65941,9 @@ mvp cer kpq mvp -sxH -sxH -aaR +cia +cia +olB dqX pHi eFX @@ -66141,12 +65989,12 @@ cKa kjt rLG uwk -mdJ +gbg afk afk afk -xMW -ssJ +sJX +sLF sKY cvc gPk @@ -66155,11 +66003,11 @@ sFY neY rtc fOi -fac -ehO +qEp +tdY hys -unF -ehO +mke +tdY sKY cAW bce @@ -66179,23 +66027,23 @@ rzp kqC rzp jln -kqC +rjw eQb -xbM +xAn kgp -kqC +rjw erU lZp lZp xFJ hrL -kqC -dHD -xbM -fHo +rjw +btJ +xAn +oMW vRA -ioc -ioc +iBI +iBI vRA nAm nAm @@ -66353,11 +66201,11 @@ cKa kXk tPB uwk -aKA -tWI -llQ -eOF -bUB +rcy +dfw +lJb +ozB +mtM kPz iYw nQu @@ -66391,20 +66239,20 @@ dHD kqC qLi jhN -kqC +rjw rYy -xbM -fHo -kqC -kqC +xAn +oMW +rjw +rjw vfO vfO vfO -kqC -kqC -dHD -xbM -fHo +rjw +rjw +btJ +xAn +oMW vMK goG goG @@ -66530,7 +66378,7 @@ wSN kzR wSC mvl -knb +eSI vUP vUP kjt @@ -66572,13 +66420,13 @@ mlC mlC ecM iYw -imI +nGf oEH oEH oEH -vkt +rPs bLJ -xKX +vgG iaa iaa tZO @@ -66586,37 +66434,37 @@ iaa iaa ecM mlC -wzE -wzE -wzE -wzE +xxg +xxg +xxg +xxg rzF -fHo -xbM -xbM +qJY +fBK +fBK xel -xbM -xbM -xbM -dHD +fBK +fBK +fBK +wKi jbg -kqC -kqC -kqC -kqC +umN +umN +umN +umN rKd -xbM +xAn pZn atY atY -vds -vds -vds +wat +wat +wat qJl atY -qEs -xbM -fHo +jXU +xAn +oMW goG dYq chg @@ -66798,37 +66646,37 @@ oPR oPR jnQ oPR -kqC -ioc -ioc -ioc -ioc -ioc -xbM -xbM -xbM -xbM +umN +lmC +lmC +lmC +lmC +lmC +fBK +fBK +fBK +fBK bkQ -xbM -qNF -dHD -kqC +fBK +eVD +wKi +umN rkp iKy -kqC -dHD -xbM +umN +gqo +xAn jbm -xbM +xAn xLx -xbM +xAn jbm -xbM -xbM -xbM -xbM -xbM -fHo +xAn +xAn +xAn +xAn +xAn +oMW goG xoR ioW @@ -66966,7 +66814,7 @@ uwk uwk uwk aSz -cIt +uBX vUP vUP cKa @@ -67011,36 +66859,36 @@ qBe qBe eFQ wpO -ioc -ioc -ioc -efW -xbM -cxA -cZh -xbM -oFf -voV -xbM -xbM -qNF -kqC -qNF -efW -kqC -qNF -xRI +lmC +lmC +lmC +duL +fBK +ygL +rZF +fBK +ogc +eja +fBK +fBK +eVD +umN +eVD +duL +umN +hDF +fBA iXq -xRI -xRI -xRI -xRI -xRI +fBA +fBA +fBA +fBA +fBA mKd -xRI -xRI -xRI -efW +fBA +fBA +fBA +vza goG egd pYB @@ -67223,32 +67071,32 @@ qBe lFv eFQ wpO -ioc -ioc -ioc -dHD +lmC +lmC +lmC +wKi kbh -xbM -xbM -cxA +fBK +fBK +ygL jET -xbM -cZh +fBK +rZF fYY -voO -kqC +ffx +umN qRi -end -wzE -wzE -wzE -kqC -ioc -ioc -ioc -ioc +elm +xxg +hjg +hjg +rjw +iBI +iBI +iBI +iBI pvE -kqC +rjw jTJ goG goG @@ -67435,30 +67283,30 @@ qBe qBe oPR wpO -ioc -ioc -ioc -qNF -nAK -xbM -xbM -xbM -xbM +lmC +lmC +lmC +eVD +wWm +fBK +fBK +fBK +fBK jET -xbM -xbM -pZn -vds -vds -elO -hZR -bQM -hZR +fBK +fBK +xiZ +nUh +nUh +bhC +uTv +bQM +ipy iCf -rzp -vds -vds -vds +kXT +wat +wat +wat rLJ jvi duF @@ -67575,7 +67423,7 @@ lAh bQM bQM bQM -jmG +lAh cAW cAW jmG @@ -67642,36 +67490,36 @@ qBe qBe oPR oPR -hxj -wis -sGa -gNU -kqC -kqC -ecd -kqC -kqC -dHD -xbM -xbM +uRh +mlG +pUD +dIu +umN +umN +nIU +umN +umN +wKi +fBK +fBK pHx -xbM -eNa -xRI -xRI -xRI -xRI -xRI -efW -hZR +fBK +lNC +gos +gos +gos +gos +gos +duL +uTv kPz -hZR +ipy auS -dHD +btJ jbm -xbM -xbM -fHo +xAn +xAn +oMW jvi duF fEH @@ -67785,7 +67633,7 @@ bQM bQM lAh lAh -jmG +lAh cAW cAW cAW @@ -67821,7 +67669,7 @@ bOx cKa cKa wZt -wZt +jEY cKa jmG gHh @@ -67853,37 +67701,37 @@ qBe eXz qBe oPR -kqC -kqC -dAd -hbp -kqC -kqC +umN +umN +cee +yiG +umN +umN rCq -vRA -vRA -kqC +xSw +xSw +umN fLb ayW -xbM -xbM -xbM +fBK +fBK +fBK rYK -kqC +umN cRB -end -kqC +elm +umN cRB -end -wzE +elm +xxg bQM -hZR +ipy qSz -dHD -eNa +btJ +mlE rwK nAK -fHo +oMW kpu duF fAU @@ -68027,13 +67875,13 @@ cKa oMw yhJ cKa -mlg +uFW mgz rLG cKa uyC dzB -dzB +wUv aYg cKa kjt @@ -68064,38 +67912,38 @@ ccZ qBe qBe qBe -sGa -kqC -kqC -vRA +pUD +umN +umN +xSw blG -kqC -kqC -kqC +umN +umN +umN tVV arl -oFI +eQs kCT opj -xRI -nAK -xbM -fHo -kqC -rzp +gos +wWm +fBK +qJY +umN +xBF bIP -kqC -rzp +umN +xBF mwP -wzE +xxg kPz jTJ vUl -dHD -fHo +btJ +oMW pLE -dHD -fHo +btJ +oMW uuG jTJ gHn @@ -68139,12 +67987,12 @@ ckm wly bQM bQM -bTo +gjm pcu -iWq -bTo +hfJ +gjm pcu -iWq +hfJ bQM bQM bQM @@ -68245,7 +68093,7 @@ rLG cKa onW pZp -dzB +xts shh cKa kjt @@ -68276,38 +68124,38 @@ sQr qBe qBe qBe -vcu -qQM -abJ -rzp -vds -elO +spI +ueD +umu +xBF +nUh +bhC sKt -kqC -vRA +umN +xSw tiX -kqC -kqC -kqC -kqC -dHD -xbM -fHo -kqC -qLi -dpe -kqC -qLi -dpe -wzE -bQM -hZR +umN +umN +umN +umN +wKi +fBK +qJY +umN +xpy +oeh +umN +xpy +oeh +xxg +bQM +ipy pLE -dHD -fHo +btJ +oMW pLE -dHD -fHo +btJ +oMW pLE duF mWR @@ -68348,18 +68196,18 @@ bQM kPz bQM bQM -dhi -qFE -qFE -fyC -qOk -pbV -fyC -qOk -pbV -qFE -qFE -lml +iIw +ylU +ylU +eyB +pFE +toG +eyB +pFE +toG +ylU +ylU +lud bQM bQM bQM @@ -68481,44 +68329,44 @@ qBe qof qBe qof -sGa -gNU -oOg +pUD +dIu +nvZ bno bno bno bno -vrR -jOb -vRA -dHD +uFr +iRA +xSw +wKi bAM -fHo +qJY sKt -oFI -vRA +eQs +xSw glD -kqC +umN pVY mwP -kqC -dHD -xbM +umN +wKi +fBK rYK -mCF -kqC -kqC -kqC -kqC -kqC -wzE +hhX +umN +umN +umN +umN +umN +xxg kPz -hZR +ipy pLE -dHD -fHo +btJ +oMW pLE -dHD +btJ naI pLE duF @@ -68560,7 +68408,7 @@ bQM kPz bQM bQM -bTo +gjm afk afk afk @@ -68571,7 +68419,7 @@ hkh afk afk afk -iWq +hfJ bQM bQM bQM @@ -68693,7 +68541,7 @@ qBe qBe qBe qBe -hSl +mRR ecM jVj gqU @@ -68701,37 +68549,37 @@ eac dPe mcJ uIL -kqC -kqC -nBb -xbM -fHo +umN +umN +hjI +fBK +qJY sKt -kqC -kqC -kqC -kqC -ryJ -end -kqC -nBb -xbM -fHo -kqC -sfu -jyF -kqC +umN +umN +umN +umN +hCX +elm +umN +hjI +fBK +qJY +umN +nDu +tjh +umN hHX -jyF -wzE +tjh +xxg bQM -hZR +ipy pLE -qNF -efW +hDF +vza pLE -qNF -efW +hDF +vza pLE duF chg @@ -68772,7 +68620,7 @@ bQM kPz bQM bQM -bTo +gjm afk afk afk @@ -68783,7 +68631,7 @@ pcu afk afk afk -iWq +hfJ bQM bQM bQM @@ -68846,11 +68694,11 @@ bQM cAW bQM bce -swg -fQV -vBP -fQV -erT +rfI +rQt +yjV +rQt +grn uwk wcC kXk @@ -68905,7 +68753,7 @@ qBe qof qBe qof -pUo +oCf ecM vNd fWH @@ -68913,38 +68761,38 @@ fWH fWH fWH fWH -kqC +umN mue bbI -xbM +fBK rYK -kqC -kqC +umN +umN wyQ eTa -vds -vds -vds -elO -dHD -xbM -fHo -kqC -qNF -mDO -kqC -qNF -mDO -wzE -wzE -wzE -kqC +nUh +nUh +nUh +bhC +wKi +fBK +qJY +umN +eVD +qFW +umN +eVD +qFW +xxg +hjg +hjg +rjw ecd ecd -kqC +rjw ecd ecd -kqC +rjw jTJ vMK mGZ @@ -68984,7 +68832,7 @@ bQM kPz bQM bQM -bTo +gjm afk afk afk @@ -68995,7 +68843,7 @@ hkh afk afk afk -iWq +hfJ bQM bQM bQM @@ -69058,11 +68906,11 @@ bQM cAW bQM bce -bTo +gjm afk afk afk -ghg +xrw uwk aoZ vUP @@ -69073,7 +68921,7 @@ vUP pDo jWI bXz -kGd +tiP ufR sNi jna @@ -69082,7 +68930,7 @@ eow lFB vUP pRa -kGd +tiP eow eow lFB @@ -69110,14 +68958,14 @@ mvl mvl uhm cKa -dnj -wis +iGe +mlG qBe qBe qBe qBe oPR -hSl +mRR ecM bEX bEX @@ -69125,39 +68973,39 @@ izZ oPR oPR oPR -kqC +umN pCQ -dHD -xbM -fHo -abJ -ioc -rzp -vds -vds -vds -elO -efW -dHD -xbM +wKi +fBK +qJY +umu +lmC +xBF +nUh +nUh +nUh +bhC +duL +wKi +fBK rYK -kqC -ryJ -end -kqC -ryJ -end -kqC -wzE -pah -vNQ -xbM +umN +hCX +elm +umN +hCX +elm +umN +hjg +aWR +hnq +xAn iCN qOq -xbM -xbM -pah -bhu +xAn +xAn +aWR +tVp goG tOM tOM @@ -69196,18 +69044,18 @@ bzO bzO bzO bQM -aKA -jlH -jlH -tWI -llQ -jKI -tWI -llQ -jKI -jlH -jlH -bUB +rcy +rhR +rhR +dfw +lJb +ngo +dfw +lJb +ngo +rhR +rhR +mtM bQM bQM bQM @@ -69270,11 +69118,11 @@ bQM cAW bQM bce -ajx +jGK afk hkh afk -tCZ +deC uwk rce vUP @@ -69323,13 +69171,13 @@ fWH mBG sue wBB -dAd +cee ode ode ode ode ode -cry +xRa qBe qBe qBe @@ -69337,39 +69185,39 @@ wKm qBe qBe oPR -kqC +umN cRI -dHD -xbM -fHo -vRA -ioc -qNF -xRI -xRI -xRI -efW -elO +wKi +fBK +qJY +xSw +lmC +eVD +gos +gos +gos +duL +bhC cHC -xbM -fHo -ioc -rzp -vds -vds -vds -elO -ioc +fBK +qJY +lmC +xBF +nUh +nUh +nUh +bhC +lmC duF -hQv -gsL +kHx +rqd mOI -xbM +xAn qOq -xbM -xbM -gFj -sNN +xAn +xAn +xwc +csW goG tOM tOM @@ -69395,13 +69243,13 @@ gbf vEK mxQ mxQ -kGZ -sBW -sBW -sBW -sBW -sBW -sBW +enU +rDf +rDf +rDf +rDf +rDf +rDf bzO bzO bzO @@ -69411,12 +69259,12 @@ bQM bQM bQM bQM -aKA -jlH -bUB -aKA -jlH -bUB +rcy +rhR +mtM +rcy +rhR +mtM bQM bQM bQM @@ -69482,11 +69330,11 @@ bQM cAW bQM bce -bTo +gjm afk afk afk -xMW +sJX uwk rce vUP @@ -69503,7 +69351,7 @@ wef wef xgH vUP -knb +eSI wef wef tOp @@ -69549,39 +69397,39 @@ qBe qBe qBe oPR -kqC +umN mue gIa -xbM +fBK rYK -kqC -kqC -ioc -qNF -xRI -xRI -xRI -efW -dHD -xbM -fHo -ioc -qNF -xRI -xRI -xRI -efW +umN +umN +lmC +eVD +gos +gos +gos +duL +wKi +fBK +qJY +lmC +eVD +gos +gos +gos +duL sDR hBF vcv iLl -xbM -xbM +xAn +xAn qOq huG -xbM -pah -rmJ +xAn +aWR +fhS goG tOM tOM @@ -69606,8 +69454,8 @@ apu gbf vEK fFw -kGZ -fHI +enU +naj pYB eBS pYB @@ -69694,11 +69542,11 @@ bQM cAW bQM bce -aKA -jlH -eJQ -jlH -bUB +rcy +rhR +sGS +rhR +mtM uwk iTr jWI @@ -69725,11 +69573,11 @@ oyy cKa kjt mgz -rLG -vUP -cKa +apg +qBw +cIa sXe -wef +wHV sXe aSz jmG @@ -69760,39 +69608,39 @@ qBe qBe qBe qBe -pUf -kqC -kqC -nBb -xbM -fHo +lmJ +umN +umN +hjI +fBK +qJY sKt -kqC -ryJ -end -kqC -ryJ -end -kqC -dHD -xbM +umN +hCX +elm +umN +hCX +elm +umN +wKi +fBK rYK -kqC -ryJ -end -kqC -ryJ -end -kqC -wzE -kqC -kqC +umN +hCX +elm +umN +hCX +elm +umN +hjg +rjw +rjw ecd ecd -kqC +rjw ecd ecd -kqC +rjw jTJ vMK pFW @@ -69818,15 +69666,15 @@ epB gbf gbf fWy -vUZ -waN -sfW -sfW -sfW -sfW -sfW +gMl +dOc +vft +vft +vft +vft +vft qRW -mOE +mbU bzO tan tan @@ -69936,15 +69784,15 @@ iFB qBT cKa kjt -mgz -rLG -vUP +jii +apg +qBw glj sXe -wef +wHV sXe odQ -uwk +nLO bQM bQM bQM @@ -69972,30 +69820,30 @@ mlC ecM okE qBe -vcu -qQM -abJ -dHD -xbM -fHo +spI +ueD +umu +wKi +fBK +qJY sKt -kqC -qNF -mDO -kqC -qNF -mDO -kqC -nBb -xbM -fHo -kqC -rzp +umN +eVD +qFW +umN +eVD +qFW +umN +hjI +fBK +qJY +umN +xBF mwP -kqC -rzp +umN +xBF mwP -kqC +umN rKs tOM wGA @@ -70029,9 +69877,9 @@ fOT nBw nvX nvX -wuz -fHI -hfd +qHl +naj +rQi fIW htt htt @@ -70147,16 +69995,16 @@ cKa cKa cKa cKa -xVw -mgz -rLG -vUP +apm +jii +apg +qBw glj sXe -wef +wHV sXe vJh -uwk +nLO kPz kPz kPz @@ -70184,30 +70032,30 @@ kPz mlC qBe eUP -sGa -jOb -vRA -qNF +pUD +iRA +xSw +eVD eux -efW -ioc -kqC -kqC -kqC -mCF -kqC -kqC -kqC -dHD -xbM -fHo -kqC -qLi -dpe -kqC -qLi -dpe -kqC +duL +lmC +umN +umN +umN +hhX +umN +umN +umN +wKi +fBK +qJY +umN +xpy +oeh +umN +xpy +oeh +umN lbz gLk gbf @@ -70243,7 +70091,7 @@ gbf gbf arT tOM -hfd +rQi vfM oEK lEy @@ -70345,30 +70193,30 @@ dbh eov doe cAW -eov -bqu -rwm -cKa +gGn +fna +uTq +cIa gzN -vUP -vUP -cKa -bqu -rwm -cKa -bqu -rwm -cKa -kjt -xAq -rLG -vUP -cKa +qBw +qBw +cIa +fna +uTq +cIa +fna +uTq +cIa +nVK +lTs +apg +qBw +cIa dcv -wef +wHV sXe lMi -uwk +nLO bQM bQM bQM @@ -70396,30 +70244,30 @@ bQM mlC eUP qBe -xIq -kqC -kqC -vRA +uFL +umN +umN +xSw blG -kqC -kqC -kqC -xbM -xbM -xbM +umN +umN +umN +mKa +fBK +fBK kgQ -xbM -xbM -dHD -xbM +fBK +fBK +wKi +fBK rYK -kqC -kqC -kqC -kqC -kqC -kqC -kqC +umN +umN +umN +umN +umN +umN +umN mxQ tOM gbf @@ -70453,9 +70301,9 @@ fOT jzP ydK ydK -qzb -tdq -hfd +ope +dzq +rQi ucj bBA bBA @@ -70557,30 +70405,30 @@ taI eov ivb cAW -eov -kXk -tPB -cKa +gGn +mVE +sJH +cIa fLH gCK -vUP -cKa -kXk -rhH -cKa -kXk -rhH -cKa -kjt -mgz -rLG -cKa -cKa -cKa -hul -cKa -cKa -jmG +qBw +cIa +mVE +sEK +cIa +mVE +sEK +cIa +nVK +jii +apg +cIa +cIa +cIa +aNY +cIa +cIa +hCG vnr hxq hxq @@ -70601,37 +70449,37 @@ oPR qBe vtX dYo -mlC +uDF kPz kPz kPz -mlC -qBe -qBe -qBe -kqC -kqC -jva -gEX -wzE -kqC +uDF +aCw +aCw +aCw +umN +umN +nkw +xVC +xxg +umN pai kgQ tSl diJ ddt -ioc +lmC kgQ diF -xbM -fHo -kqC -sfu -jyF -kqC -sfu -jyF -kqC +fBK +qJY +umN +nDu +tjh +umN +nDu +tjh +umN hNj ijd gbf @@ -70666,15 +70514,15 @@ apu gbf gbf fFw -vUZ -tuX -vEi -vEi -vEi -vEi -vEi +gMl +sdG +cZv +cZv +cZv +cZv +cZv faD -oyO +okQ bzO tan tan @@ -70769,28 +70617,28 @@ mpR eov hxJ qgd -eov -kzh -tOp -cKa +gGn +hZU +dZM +cIa oDH -vUP -dFI -cKa -kzh -tOp -cKa -kzh -tOp -cKa -xVw -mgz -bOx -cKa -vUP -vUP -vUP -cKa +qBw +psG +cIa +hZU +dZM +cIa +hZU +dZM +cIa +apm +jii +xCR +cIa +qBw +qBw +qBw +cIa xRl cPz ixl @@ -70806,44 +70654,44 @@ mlC kPz kPz kPz -mlC +uDF hdR oPR oPR qBe aZL nGB -ecM -mlC -mlC -mlC -ecM +jjx +uDF +uDF +uDF +jjx eLU -qBe -qBe -qBe -jis -dQV -nGp -dQV -kqC +aCw +aCw +aCw +hNt +bNW +lny +bNW +umN pai kgQ nkg diJ iuC -ioc +lmC pnP -dHD -xbM -fHo -kqC -qNF -mDO -kqC -qNF -mDO -kqC +wKi +fBK +qJY +umN +eVD +qFW +umN +eVD +qFW +umN lbz hnh gbf @@ -70878,7 +70726,7 @@ apu gbf vEK fWy -lUv +xhV gbf pYB eBS @@ -70977,31 +70825,31 @@ jmG jmG jmG jmG -jmG -eov -eov -eov -eov -vUP -wef -vUP +hCG +gGn +gGn +gGn +gGn +qBw +wHV +qBw ika -vUP -vUP +qBw +qBw bjZ -jWI -eow +fvx +aYR aiv kGd -lFB -vUP -kjt -mgz -rLG +meE +qBw +nVK +jii +apg lZA -jWI -eow -lFB +fvx +aYR +meE lZA ixl ixl @@ -71009,60 +70857,60 @@ ghS hHH hHH ixl -rmX -qBe -oPR -oPR -roQ -mlC +qfR +aCw +gvy +gvy +isw +uDF bQM kPz bQM -mlC -aZL -oPR -oPR -qBe -qBe +uDF +flG +gvy +gvy +aCw +aCw gbk -qBe -eUP -qBe -qBe -qBe -qBe -qBe -hdR -roQ -qBe -qBe -qBe +aCw +iCC +aCw +aCw +aCw +aCw +aCw +svS +isw +aCw +aCw +aCw fjg -kqC +umN pai kgQ tTm diJ aga diJ -xbM -dHD -xbM +fBK +wKi +fBK rYK -kqC -ryJ -end -kqC -ryJ -end -kqC -kqC +umN +hCX +elm +umN +hCX +elm +umN +umN pFW cTy fOT -wua -kKP -eqw +fse +esY +kJg nBw nvX nvX @@ -71090,15 +70938,15 @@ apu gbf gbf fFw -vUZ -waN -sfW -sfW -sfW -sfW -sfW +gMl +dOc +vft +vft +vft +vft +vft qRW -mOE +mbU bzO tan tan @@ -71189,32 +71037,32 @@ cAW cAW cAW cAW -jmG -cKa -cKa -cKa +hCG +cIa +cIa +cIa rpf -vUP -vUP -vUP -vUP +qBw +qBw +qBw +qBw mIr -vUP +qBw knb -kXk -xYJ -qGB -amn +mVE +bVO +gJM +gAD hkH -vUP -kjt -mgz -rLG -wef -kjt -mgz -rLG -wef +qBw +nVK +jii +apg +wHV +nVK +jii +apg +wHV ixl ixl ixl @@ -71222,52 +71070,52 @@ ixl ixl gpr nnr -oPR -oPR -oPR -kJJ -ecM -mlC -mlC -mlC -ecM -iCE -oPR -oPR -qBe -qBe -qBe -qBe -qBe -qBe -qBe -qBe -qBe -qBe +gvy +gvy +gvy +lFK +jjx +uDF +uDF +uDF +jjx +cYY +gvy +gvy +aCw +aCw +aCw +aCw +aCw +aCw +aCw +aCw +aCw +aCw rMw -mEU -qBe -qBe -qBe +tkh +aCw +aCw +aCw jLe -kqC -kqC +umN +umN sRJ iuC coj -ioc -ioc -xbM -dHD -xbM -fHo -ioc -rzp -vds -vds -vds -elO -ioc +lmC +lmC +fBK +wKi +fBK +qJY +lmC +xBF +nUh +nUh +nUh +bhC +lmC ntv tOM gbf @@ -71301,9 +71149,9 @@ fOT nBw nvX nvX -wuz -fHI -hfd +qHl +naj +rQi fIW htt htt @@ -71401,31 +71249,31 @@ jmG jmG jmG jmG -jmG -cKa -cKa -cKa -cKa -vUP -vUP -vUP +hCG +cIa +cIa +cIa +cIa +qBw +qBw +qBw jfc -wef -wef -wef -wef -wef +wHV +wHV +wHV +wHV +wHV rPS -wef -wef +wHV +wHV jfc -kjt -mgz -rLG +nVK +jii +apg lZA -kjt -mgz -rLG +nVK +jii +apg lZA ixl ixl @@ -71434,52 +71282,52 @@ ixl ixl ixl nnr -oPR -oPR -oPR -aZL +gvy +gvy +gvy +flG eLy -roQ -qBe -aZL +isw +aCw +flG eLy -roQ -oPR -oPR -hdR -roQ -qBe -qBe -hdR -roQ -qBe -qBe -qBe -qBe +isw +gvy +gvy +svS +isw +aCw +aCw +svS +isw +aCw +aCw +aCw +aCw hYs uou -qBe +aCw mrW -qBe +aCw fWV tHl qCK lIJ qCK -ioc +lmC idj -ioc -xbM -qNF -xRI -efW -ioc -qNF -xRI -xRI -xRI -efW -ioc +lmC +fBK +eVD +gos +duL +lmC +eVD +gos +gos +gos +duL +lmC ntv tOM gbf @@ -71515,7 +71363,7 @@ gbf gbf arT tOM -hfd +rQi vfM oEK lEy @@ -71613,86 +71461,86 @@ cAW cAW cAW cAW -jmG -cKa -cKa -cKa +hCG +cIa +cIa +cIa rpf -jWI -eow -lFB -hqD -jWI +fvx +aYR +meE +juV +fvx clA -wef -jWI -lFB +wHV +fvx +meE jfc -jWI -lFB +fvx +meE rPS -kjt -mgz -rLG -wef -kXk -amn -tPB -wef +nVK +jii +apg +wHV +mVE +gAD +sJH +wHV ixl ixl ixl ixl ghS ixl -lpS -ooq -oPR -oPR -oPR -oPR -oPR -oPR -oPR -oPR -oPR -oPR -oPR -aZL -mEU -qBe -eUP -aZL -mEU -qBe -qBe -qBe -qBe +jAP +aBX +gvy +gvy +gvy +gvy +gvy +gvy +gvy +gvy +gvy +gvy +gvy +flG +tkh +aCw +iCC +flG +tkh +aCw +aCw +aCw +aCw hYs -qBe -qBe -qBe +aCw +aCw +aCw oHi -miU +qfh sgt -vRA -upY -vRA -vRA -ioc +xSw +sDw +xSw +xSw +lmC diJ -xbM -vRA -xbM -xbM -kqC -ryJ -end -kqC -kqC -ecd -kqC -kqC +fBK +xSw +fBK +fBK +umN +hCX +elm +umN +umN +nIU +umN +umN pFW gbf gbf @@ -71725,9 +71573,9 @@ fOT jzP ydK ydK -qzb -tdq -hfd +ope +dzq +rQi ucj bBA bBA @@ -71825,32 +71673,32 @@ cAW cAW cAW cAW -jmG -cKa -cKa -cKa -cKa -kjt -mgz -rLG -hqD +hCG +cIa +cIa +cIa +cIa +nVK +jii +apg +juV fRc -dUx -hqD -iFB -dUx +keb +juV +iXB +keb jfc -iFB -dUx -wef -kjt -mgz -rLG -cKa -vUP -vUP -vUP -cKa +iXB +keb +wHV +nVK +jii +apg +cIa +qBw +qBw +qBw +cIa xRl ixl ixl @@ -71858,47 +71706,47 @@ ixl ixl bjf vNq -gvz -ooq -mEU -roQ -fyL -fje -rCe -etq -gGc -dIx -rCe -gPE -qBe -qBe -fyL -gGc -gGc -tzM -hdR -roQ -qBe +kgu +aBX +tkh +isw +wRS +oCM +qpF +sqL +kjs +oPH +qpF +sUd +aCw +aCw +wRS +kjs +kjs +xql +svS +isw +aCw kHH fFv uoH -qBe -qBe -qBe -qBe +aCw +aCw +aCw +aCw oPN -vRA +xSw aXC -vRA +xSw qCK lIJ -vRA -upY -upY -upY +xSw +sDw +sDw +sDw tZe -kqC -rzp +umN +xBF mwP mxQ fCZ @@ -71938,15 +71786,15 @@ apu tOM tOM fFw -vUZ -tuX -vEi -vEi -vEi -vEi -vEi +gMl +sdG +cZv +cZv +cZv +cZv +cZv faD -oyO +okQ bzO tan tan @@ -72037,32 +71885,32 @@ cAW cAW cAW cAW -jmG -cKa -cKa -cKa -cKa -wdL -mgz -rLG -hEs -cKa -cKa -cKa -cKa -cKa -cKa -cKa -cKa -cKa -xVw -mgz -rLG -jmG -uwk -uwk -uwk -jmG +hCG +cIa +cIa +cIa +cIa +iWX +jii +apg +asF +cIa +cIa +cIa +cIa +cIa +cIa +cIa +cIa +cIa +apm +jii +apg +hCG +nLO +nLO +nLO +hCG vnr ixl ixl @@ -72071,31 +71919,31 @@ ixl ixl vNq vNq -dAd -ode -ode -cry +iUz +hXJ +hXJ +hJd vNq vNq vnr -mlC -mlC -ecM -yfp +uDF +uDF +jjx +pBj hEv hEv -hbp -ecM +qnL +jjx nSx gVc xbo qzZ -qBe -qBe -aZL -mEU -qBe -qBe +aCw +aCw +flG +tkh +aCw +aCw ooO faw lux @@ -72104,14 +71952,14 @@ cqW ckS voh dtg -ioc -upY -upY -upY +lmC +sDw +sDw +sDw tZe -kqC -qLi -dpe +umN +xpy +oeh mxQ gRW ssO @@ -72150,7 +71998,7 @@ apu tOM aRk fFw -lUv +xhV gbf pYB eBS @@ -72249,28 +72097,28 @@ cAW cAW cAW cAW -jmG -cKa -bqu +hCG +cIa +fna moQ -cKa -kjt -mgz +cIa +urw +jii vwX -cKa -bqu -rwm -cKa -bqu -rwm -cKa -bqu +cIa +fna +uTq +cIa +fna +uTq +cIa +fna aLC -cKa -kjt -mgz -rLG -uwk +cIa +nVK +jii +apg +nLO bQM kPz kPz @@ -72297,33 +72145,33 @@ ovq vyw bix uTb -ecM +jjx nSx gux eio -qBe -qBe -qBe -qBe -qBe -wKm -qBe -qBe +aCw +aCw +aCw +aCw +aCw +lfx +aCw +aCw faw tHl jYm -xbM +fBK thz suq -xbM +fBK wFB -xbM -xbM +fBK +fBK xdZ -xbM -kqC -kqC -kqC +fBK +umN +umN +umN mxQ tUs tUs @@ -72354,23 +72202,23 @@ hvF mxQ mxQ mxQ -fob -rxM +sDp +met gbf fOT apu tOM rbW voP -vUZ -waN -sfW -sfW -sfW -sfW -sfW +gMl +dOc +vft +vft +vft +vft +vft qRW -mOE +mbU bzO tan tan @@ -72461,28 +72309,28 @@ cAW cAW cAW cAW -jmG -cKa -kXk +hCG +cIa +mVE qRf -cKa -kjt -mgz -rLG -cKa -kXk +cIa +nVK +jii +apg +cIa +mVE jWY -cKa -kXk +cIa +mVE lzz -cKa -kXk -rhH -cKa -kXk -amn -tPB -uwk +cIa +mVE +nlX +cIa +mVE +gAD +sJH +nLO bQM kPz kPz @@ -72509,31 +72357,31 @@ lOx oRg ixl uvn -ecM +jjx nSx ayG laK gRA -qBe -hdR -roQ +aCw +svS +isw gRA -qBe -qBe -qBe +aCw +aCw +aCw hQT -jTJ -jTJ -kqC -kqC -kqC -jTJ -jTJ -vRA +axz +axz +umN +umN +umN +axz +axz +xSw blG -jTJ -jTJ -jTJ +axz +axz +axz bMG anl ffZ @@ -72567,15 +72415,15 @@ mxQ pRx tOM xbp -lUv +xhV gbf fOT nBw nvX nvX -wuz -fHI -hfd +qHl +naj +rQi fIW htt htt @@ -72673,28 +72521,28 @@ cAW cAW cAW cAW -jmG -cKa -kzh -tOp -cKa -kjt -mgz -rLG -cKa -kzh -tOp -cKa -kzh -tOp -cKa -kzh -tOp -cKa +hCG +cIa +hZU +dZM +cIa +nVK +jii +apg +cIa +hZU +dZM +cIa +hZU +dZM +cIa +hZU +dZM +cIa cIt -vUP -vUP -uwk +qBw +qBw +nLO bQM kPz kPz @@ -72724,27 +72572,27 @@ kGc nSx cVV oWC -xKX +ubx qTt gRA -aZL -hdR -roQ +flG +svS +isw gRA -qBe -qBe +aCw +aCw uud wXQ ntv hqX -vds -vds +nUh +nUh rQB gdS -ioc -ioc +lmC +lmC qxZ -duF +lHH sFH rCt xGd @@ -72776,10 +72624,10 @@ mxQ mxQ mxQ mxQ -uLr +pdq tUs -brl -kyh +nIJ +jSx gbf fOT gbf @@ -72787,7 +72635,7 @@ gbf gbf arT tOM -hfd +rQi vfM oEK lEy @@ -72885,28 +72733,28 @@ cAW cAW cAW cAW -jmG -cKa -jWI -eow -eow -ufR -mgz -jna -eow -eow +hCG +cIa +fvx +aYR +aYR +rEx +jii +deg +aYR +aYR kGd -wef -eow -eow -eow -eow -lFB -vUP -jWI -eow -lFB -uwk +wHV +aYR +aYR +aYR +aYR +meE +qBw +fvx +aYR +meE +nLO bQM kPz kPz @@ -72935,28 +72783,28 @@ ovq uvn nSx nSx -xKX +ubx rGf -xKX +ubx qUw gRA -aZL -mEU -roQ -qBe -qBe -qBe -kqC -kqC -kqC +flG +tkh +isw +aCw +aCw +aCw +umN +umN +umN fKX -upY +sDw rQB -iLl -ioc -ioc +eMN +lmC +lmC sjZ -kqC +umN huJ caF xKE @@ -72997,9 +72845,9 @@ fOT jzP ydK ydK -qzb -tdq -hfd +ope +dzq +rQi ucj bBA bBA @@ -73097,28 +72945,28 @@ cAW cAW cAW cAW -jmG -cKa -kjt -mgz -mgz -mgz -mgz -mgz -mgz -mgz -mgz -wef -mgz -mgz -mgz -mgz -rLG -vUP -kjt -mgz -rLG -uwk +hCG +cIa +nVK +jii +jii +jii +jii +jii +jii +jii +jii +wHV +jii +jii +jii +jii +apg +qBw +nVK +jii +apg +nLO bQM kPz kPz @@ -73148,30 +72996,30 @@ uvn cVV nSx nVE -xKX +ubx uGL -mEU -qBe +tkh +aCw gRA -aZL -mEU -qBe -qBe +flG +tkh +aCw +aCw uud mwu ntv hqX -vds -vds -jTJ -jTJ -vRA +nUh +nUh +axz +axz +xSw blG -jTJ -jTJ -kqC +axz +axz +umN pim -kqC +umN mxQ tUs mxQ @@ -73183,14 +73031,14 @@ gbf ekx tOM tOM -dXT -egz -fpg -nmM -aMr -hDS -egz -xBu +xYM +cfX +mKh +wMp +dRF +wsR +cfX +qUb tOM tOM beB @@ -73200,25 +73048,25 @@ tOM pYB mxQ mxQ -uSY +lbg tUs -qzb -rxM +ope +met uMN fOT apu gbf gbf fWy -vUZ -tuX -vEi -vEi -vEi -vEi -vEi +gMl +sdG +cZv +cZv +cZv +cZv +cZv faD -oyO +okQ bzO tan tan @@ -73309,28 +73157,28 @@ cAW cAW cAW cAW -jmG -cKa +hCG +cIa ndQ -amn -amn -amn -amn -amn -amn -amn -amn +gAD +gAD +gAD +gAD +gAD +gAD +gAD +gAD ljc -amn -amn -amn -amn -tPB -vUP -kXk +gAD +gAD +gAD +gAD +sJH +qBw +mVE ylr -tPB -uwk +sJH +nLO bQM kPz kPz @@ -73360,26 +73208,26 @@ peP nSx nSx xgC -roQ +isw gRA -qBe -hdR +aCw +svS dVu nSx -okE -qBe -qBe -qBe -kqC -kqC -kqC -xbM -upY +nvx +aCw +aCw +aCw +umN +umN +umN +fBK +sDw sqC -vVx +ghe qQb qQb -tlF +kBW hfT ecU iSg @@ -73393,18 +73241,18 @@ gbf tOM tOM tOM -tYD -egz -xkq -mxQ -mxQ -kKQ -vhk -mxQ -mxQ -tSL -egz -jOv +szn +cfX +vSn +fbn +fbn +cqZ +ckl +fbn +fbn +mqF +cfX +mDG tOM tOM tOM @@ -73415,14 +73263,14 @@ mxQ rQN tOM rTD -lUv +xhV gbf fOT apu gbf vEK fWy -lUv +xhV gbf pYB eBS @@ -73521,28 +73369,28 @@ cAW cAW cAW cAW -jmG -cKa -cKa -cKa -cKa +hCG +cIa +cIa +cIa +cIa wsw -dVA -vUP -dVA -vUP -mgz -mgz -mgz -vUP -dVA +doc +qBw +doc +qBw +jii +jii +jii +qBw +doc gtr gtr gtr -cKa -cKa -cKa -jmG +cIa +cIa +cIa +hCG bQM kPz kPz @@ -73571,28 +73419,28 @@ vdN uvn uFC qyM -aZL -hdR -roQ +flG +svS +isw gRA -aZL -hdR +flG +svS dhc nSx -okE -qBe +nvx +aCw uud wXQ ntv hqX -vds -vds +nUh +nUh ntv -kUR +bcO sIj hkA -bDv -jCO +tCm +syM fOK iSg vTA @@ -73603,22 +73451,22 @@ pYB tOM gbf tOM -rko -egz -xkq -mxQ -jjg -mxQ -wGA -pYB -pYB -cwM -mxQ -jjg -mxQ -cBn -egz -sGg +pnn +cfX +vSn +fbn +qtp +fbn +inv +tEU +tEU +uow +fbn +qtp +fbn +nlT +cfX +bKT tOM gbf tOM @@ -73626,8 +73474,8 @@ pYB mxQ mxQ mxQ -sBW -kyh +rDf +jSx gbf fOT apu @@ -73732,26 +73580,26 @@ cAW cAW cAW cAW -jmG -jmG -cKa -cKa -cKa +hCG +hCG +cIa +cIa +cIa pQc -mgz -mgz -mgz -mgz -vUP -mgz -mgz -mgz -vUP -mgz -mgz +jii +jii +jii +jii +qBw +jii +jii +jii +qBw +jii +jii mns -vUP -vUP +qBw +qBw tBP vNq vnr @@ -73784,23 +73632,23 @@ uvn ovq qyM gRA -aZL -mEU -roQ +flG +tkh +isw gRA -aZL +flG qEC -roQ +isw gRA -qBe -qBe -kqC -kqC -kqC +aCw +aCw +umN +umN +umN sKr -upY +sDw ntv -kUR +bcO sIj hkA nZI @@ -73815,22 +73663,22 @@ eTr gbf ekx tOM -xpM -mxQ -jjg -mxQ +nYQ +fbn +qtp +fbn tVY -jzP -gbf -pYB -pYB -gbf +rTY +sgI +tEU +tEU +sgI blf fDW -mxQ -jjg -mxQ -vUZ +fbn +qtp +fbn +gMl tOM beB jMv @@ -73944,13 +73792,13 @@ cAW cAW cAW cAW -jmG -jmG -cKa -cKa -cKa -cKa -mgz +hCG +hCG +cIa +cIa +cIa +cIa +jii rAw rAw xKP @@ -73960,10 +73808,10 @@ oKn niw jfp pho -mgz -mgz -vUP -vUP +jii +jii +qBw +qBw tBP vNq vnr @@ -73995,28 +73843,28 @@ jUP uvn ovq qyM -roQ +isw gRA -aZL -hdR +flG +svS dVu nSx asf -hdR -roQ +svS +isw gRA uud iIG ntv hqX -vds -vds +nUh +nUh ntv -kUR +bcO sIj hkA -qTQ -jfT +fEt +eBH drd hEk myJ @@ -74026,24 +73874,24 @@ pYB tOM gbf tOM -tYD -xkq -jjg +szn +vSn +qtp vRk -pRD +gWA bTC -apu -gbf -pYB +aZA +sgI +tEU voI -gbf -fOT -nBw +sgI +xct +emE fXW ldF -jjg -cBn -jOv +qtp +nlT +mDG tOM gbf tOM @@ -74156,26 +74004,26 @@ cAW cAW cAW cAW -jmG -jmG -jmG -jmG +hCG +hCG +hCG +hCG pcN -vUP -mgz +qBw +jii rAw rAw vsr nmm -gWg +fXV nmm nmm wJd -lFB +meE mns -mgz -vUP -vUP +jii +qBw +qBw tBP vNq vnr @@ -74207,27 +74055,27 @@ xHi uvn ovq qyM -mEU -roQ +tkh +isw gRA -aZL -mEU +flG +tkh nGO nSx hsz -mEU -roQ +tkh +isw gRA -kqC -kqC -kqC -xbM -upY -jTJ -veW +umN +umN +umN +fBK +sDw +axz +qsV vVN vVN -uYo +jQF rBF rBF nhY @@ -74238,24 +74086,24 @@ tOM gbf tOM tOM -xpM -mxQ -mxQ -pRD -gbf -gbf -jzP -gbf -pYB -pYB -gbf +nYQ +fbn +fbn +gWA +sgI +sgI +rTY +sgI +tEU +tEU +sgI iYe -bnx +mqL siy nAV -mxQ -mxQ -vUZ +fbn +fbn +gMl tOM tOM gbf @@ -74371,10 +74219,10 @@ cAW cAW bQM fwn -jmG +hCG dVC -vUP -mgz +qBw +jii rAw vrH tAE @@ -74383,9 +74231,9 @@ pqz nmm nmm wJd -rLG -mgz -mgz +apg +jii +jii rkF qfi vNq @@ -74420,22 +74268,22 @@ uvn vja nSx oQS -aZL -roQ +flG +isw gRA -aZL -hdR -roQ +flG +svS +isw gRA -aZL -hdR -roQ +flG +svS +isw cfa qwH qwH -rzp -elO -jTJ +xBF +bhC +axz lmu sIj hkA @@ -74449,26 +74297,26 @@ gbf tOM gbf tOM -rko -xkq -jjg +pnn +vSn +qtp tVY bxv -gbf -gbf +sgI +sgI oox lMV -pYB -pYB +tEU +tEU vjR doQ upM vjR -nBw +emE fDW -jjg -cBn -rxM +qtp +nlT +met tOM gbf tOM @@ -74583,10 +74431,10 @@ cAW cAW tan geF -jmG +hCG qPL -vUP -mgz +qBw +jii rAw rAw uLj @@ -74595,8 +74443,8 @@ rru nmm djB wJd -tPB -mgz +sJH +jii uhA oUg oUg @@ -74632,22 +74480,22 @@ iHB reZ qyM gRA -aZL -mEU +flG +tkh dVu nSx hsz -mEU -roQ +tkh +isw gRA -aZL -mEU +flG +tkh cfa -upY +sDw qwH -qNF -efW -jTJ +eVD +duL +axz hcB sIj hkA @@ -74661,26 +74509,26 @@ gbf gbf tOM tOM -xpM -mxQ -mxQ +nYQ +fbn +fbn vZe -ydK -jzP +dIp +rTY tlj -ekW -rKs +tMW +pMr ngg -pYB -bnx +tEU +mqL taS jEa hPu -ydK +dIp blf -mxQ -mxQ -jLD +fbn +fbn +vui tOM tOM gbf @@ -74795,10 +74643,10 @@ cAW cAW kPz cAW -jmG -uwk -jmG -mgz +hCG +nLO +hCG +jii xCg iFP kiT @@ -74807,9 +74655,9 @@ nmm nmm nmm wJd -vUP -mgz -mgz +qBw +jii +jii oUg oUg oUg @@ -74843,23 +74691,23 @@ ovq uvn uFC qyM -roQ +isw gRA -aZL -hdR +flG +svS dVu nSx hsz tad -izZ +gLq oQS vao -kqC +umN cYj qwH -mCF -kqC -jTJ +hhX +umN +axz oaa sIj hkA @@ -74873,26 +74721,26 @@ fWy dxW gbf gbf -gSg -mxQ +vzu +fbn qyq -gbf -gbf -gbf +sgI +sgI +sgI eEC -rKs +pMr saL qCx fEY -bzO -gbf +nxC +sgI drk -gbf -gbf -gbf -jHj -mxQ -aNz +sgI +sgI +sgI +ulN +fbn +ecj gbf gbf dxW @@ -75009,10 +74857,10 @@ bQM cAW cAW cAW -uwk -mgz -mgz -mgz +nLO +jii +jii +jii jPM oBC jNl @@ -75020,8 +74868,8 @@ vrp mTa bsm wqY -mgz -mgz +jii +jii oUg kSh wPz @@ -75055,14 +74903,14 @@ xZV uvn ovq qyM -mEU -roQ +tkh +isw gRA -aZL -mEU -roQ +flG +tkh +isw gRA -aZL +flG xNJ gRA gRA @@ -75085,26 +74933,26 @@ waQ pYB pYB pYB -ont -eGm -pYB -pYB -pYB -pYB +cvf +xoh +tEU +tEU +tEU +tEU qCx -pYB -pYB -pYB -pYB -pYB -pYB -pYB +tEU +tEU +tEU +tEU +tEU +tEU +tEU hpX -pYB -pYB -pYB -vuT -uBV +tEU +tEU +tEU +oTx +cnU pYB pYB pYB @@ -75221,10 +75069,10 @@ tan cAW cAW cAW -jmG -mgz -mgz -mgz +hCG +jii +jii +jii mUd ubQ okF @@ -75232,8 +75080,8 @@ fis lUs pqz wqY -mgz -mgz +jii +jii mPW cpP aFK @@ -75267,10 +75115,10 @@ xFL pmC xFL gRA -aZL -mEU -cGS -mEU +flG +tkh +ygS +tkh gRA gRA wOG @@ -75297,26 +75145,26 @@ mkn pYB pYB pYB -aMr -jYV -pYB -pYB +dRF +qEt +tEU +tEU ngg -pYB -pYB -pYB -pYB -pYB -pYB -pYB -pYB -pYB -pYB -pYB -pYB -pYB -qzb -nmM +tEU +tEU +tEU +tEU +tEU +tEU +tEU +tEU +tEU +tEU +tEU +tEU +tEU +aIG +wMp pYB pYB pYB @@ -75433,10 +75281,10 @@ eeI cAW cAW cAW -uwk -mgz +nLO +jii xCh -mgz +jii mUd hpz hxM @@ -75445,7 +75293,7 @@ iwT nmm wqY pUG -mgz +jii puE hTf qGn @@ -75480,13 +75328,13 @@ lAE vja nSx hsz -mEU +tkh gRA dJt -izZ -bEX -bEX -bEX +gLq +owc +owc +owc iCU gRA gRA @@ -75509,26 +75357,26 @@ fWy gbf dxW gbf -gSg -mxQ +vzu +fbn xcz -gbf -gbf -gbf +sgI +sgI +sgI ubo ubo -mxQ -opM -pYB +fbn +hJu +tEU tWz duV lAM -gbf -gbf -gbf -jHj -mxQ -dNc +sgI +sgI +sgI +ulN +fbn +toN gbf dxW gbf @@ -75645,9 +75493,9 @@ kPz cAW cAW cAW -jmG -mgz -mgz +hCG +jii +jii rAw kiT wyU @@ -75655,9 +75503,9 @@ ujs nmm nmm wJd -vUP -mgz -wef +qBw +jii +wHV puE cJv eqQ @@ -75690,16 +75538,16 @@ uVH xFL pmC xFL -hdR +svS ntx kSe leN -mEU -izZ +tkh +gLq fOe rez xJn -bEX +owc cRM gRA bhX @@ -75721,26 +75569,26 @@ gbf gbf tOM tOM -xpM -mxQ -mxQ +nYQ +fbn +fbn fEv uTw -pYB -pYB +tEU +tEU nKf -gbf -pYB -pYB +sgI +tEU +tEU hWG qQy -pRD -pRD +gWA +gWA khw htT -mxQ -mxQ -vUZ +fbn +fbn +gMl tOM tOM gbf @@ -75857,8 +75705,8 @@ emC cAW cAW cAW -uwk -mgz +nLO +jii rAw rAw vsr @@ -75867,9 +75715,9 @@ nmm cYT nmm wJd -lFB -wef -mgz +meE +wHV +jii qrz puE lzn @@ -75902,18 +75750,18 @@ oRg ovq uvn uZP -aZL -aZL -mEU +flG +flG +tkh gRA gRA -izZ +gLq bIR gWq xJn -bEX +owc lbL -xKX +ubx iyc bhX iBr @@ -75933,26 +75781,26 @@ gbf tOM gbf tOM -rdt -rsQ -mxQ +kWT +xbG +fbn lWy -gbf -gbf -jMv -pYB -gbf -pYB -ioW +sgI +sgI +xqi +tEU +sgI +tEU +hyM hXF -pRD -ota -gbf -jzP -pRx -jjg -tlC -kyh +gWA +rkX +sgI +rTY +vGf +qtp +nhm +jSx tOM gbf tOM @@ -76069,8 +75917,8 @@ bQM cAW cAW cAW -jmG -mgz +hCG +jii rAw rAw gFN @@ -76079,8 +75927,8 @@ nmm nmm nmm wJd -rLG -mgz +apg +jii pUG puE eqQ @@ -76119,7 +75967,7 @@ ntx kSe gRA gRA -izZ +gLq nyF tOc tOc @@ -76146,24 +75994,24 @@ tOM gbf tOM tOM -xpM -mxQ -mxQ -tOM +nYQ +fbn +fbn +xwm gjr -gbf +sgI fgq drk -pYB -pYB -gbf -pRD -gbf -gbf +tEU +tEU +sgI +gWA +sgI +sgI oLX -mxQ -mxQ -vUZ +fbn +fbn +gMl tOM tOM gbf @@ -76281,8 +76129,8 @@ cAW bQM cAW cAW -uwk -mgz +nLO +jii rAw rAw srQ @@ -76291,9 +76139,9 @@ sUX nmm nmm nEN -tPB -mgz -mgz +sJH +jii +jii mPW vvM tet @@ -76327,15 +76175,15 @@ ovq uvn ovq ovq -aZL -mEU +flG +tkh gRA fXo -izZ -bEX +gLq +owc mrG -bEX -izZ +owc +gLq oQS lco oZx @@ -76358,24 +76206,24 @@ pYB tOM gbf tOM -kTD -rsQ -mxQ -tOM -tOM -gbf -pYB -gbf -pYB -pYB -gbf -fOT -jzP +qrB +xbG +fbn +xwm +xwm +sgI +tEU +sgI +tEU +tEU +sgI +xct +rTY oLX wYT -jjg -tlC -jrO +qtp +nhm +aFL tOM gbf tOM @@ -76493,8 +76341,8 @@ bce kPz bce cAW -jmG -mgz +hCG +jii rAw xCg xKP @@ -76503,9 +76351,9 @@ oNx uuJ oNx jWy -vUP -mgz -mgz +qBw +jii +jii jqt pTU wPz @@ -76571,22 +76419,22 @@ eTr gbf rsR tOM -xpM -mxQ -mxQ -mxQ +nYQ +fbn +fbn +fbn sHe -pYB -kBt -pYB -pYB -gbf +tEU +xlC +tEU +tEU +sgI wdo nEP -mxQ -jjg -mxQ -vUZ +fbn +qtp +fbn +gMl tOM oEQ gbf @@ -76705,19 +76553,19 @@ cAW fiq cAW cAW -uwk -mgz -mgz -mgz -mgz -mgz -mgz -mgz -mgz -mgz -mgz -mgz -mgz +nLO +jii +jii +jii +jii +jii +jii +jii +jii +jii +jii +jii +jii oUg oUg oUg @@ -76783,22 +76631,22 @@ pYB tOM gbf tOM -rdt -jGC -rsQ -mxQ -mxQ -mxQ +kWT +oBc +xbG +fbn +fbn +fbn aLz -pYB -pYB -mPn -mxQ -jjg -mxQ -tlC -jGC -kyh +tEU +tEU +vcn +fbn +qtp +fbn +nhm +oBc +jSx tOM gbf tOM @@ -76917,19 +76765,19 @@ cAW fiq fiq tan -jmG -mgz -mgz -mgz -mgz -mgz -vUP -vUP -vUP -vUP -mgz -mgz -mgz +hCG +jii +jii +jii +jii +jii +qBw +qBw +qBw +qBw +jii +jii +jii oUg oUg oUg @@ -76997,18 +76845,18 @@ gbf tOM tOM tOM -kTD -jGC -rsQ -mxQ -mxQ -rqh -iAr -mxQ -mxQ -tlC -jGC -jrO +qrB +oBc +xbG +fbn +fbn +oQp +hXP +fbn +fbn +nhm +oBc +aFL tOM tOM tOM @@ -77129,19 +76977,19 @@ tan tan tan tan -jmG -jmG -uwk -jmG -uwk -jmG -wef +hCG +hCG +nLO +hCG +nLO +hCG +wHV kmL -wef +wHV kmL -jmG -jmG -jmG +hCG +hCG +hCG vnr vnr vnr @@ -77211,14 +77059,14 @@ gbf rsR tOM tOM -rdt -jGC -dOZ -uBV -ont -xcS -jGC -kyh +kWT +oBc +qOZ +cnU +cvf +qib +oBc +jSx tOM tOM oEQ @@ -77604,9 +77452,9 @@ uYi xDw cAW bQM -bTo +gjm pcu -sVv +ihA bQM rBF dzl @@ -77814,13 +77662,13 @@ bec uYi sDS xDw -dhi -fQV -fyC -qOk -sHO -fQV -erT +iIw +rQt +eyB +pFE +mjW +rQt +grn dzl mQV iBr @@ -78026,13 +77874,13 @@ mfF uYi lOy lRT -ajx +jGK afk afk hkh afk afk -iWq +hfJ dzl iBr iBr @@ -78238,13 +78086,13 @@ hXG uYi sgJ xDw -ajx +jGK afk afk pcu afk afk -iWq +hfJ dzl iBr iBr @@ -78450,13 +78298,13 @@ ncb uYi qhP xDw -ajx +jGK afk afk hkh afk afk -iWq +hfJ dzl ksY iBr @@ -78662,13 +78510,13 @@ cUd ncb sXP xDw -fdV -jlH -tWI -llQ -eOF -jlH -bUB +xtI +rhR +dfw +lJb +ozB +rhR +mtM rBF lwn iBr @@ -78876,9 +78724,9 @@ wBE xDw cAW bQM -bTo +gjm pcu -sVv +ihA bQM bQM rBF @@ -79286,14 +79134,14 @@ hir hir hir dOX -iIl +nCS cEb cEb cEb cEb cEb cEb -vBZ +dlg dOX sIJ dOX @@ -80807,10 +80655,10 @@ bQM cAW bzO bzO -ofA +teE axx axx -lbK +aDj bzO bzO bzO @@ -81018,12 +80866,12 @@ ogf ogf ogf tsc -kSD -sNQ +mJp +jEq aeo aeo -dPr -cUU +llf +mJp mvF kkU kkU @@ -82503,10 +82351,10 @@ scM scM scM scM -pFi +wzN qQl qQl -xte +vIH scM scM scM @@ -82715,10 +82563,10 @@ jZk akZ lOe lnK -uFs +pQm hqb hqb -nuX +xXP lnK vJL eZi @@ -82913,7 +82761,7 @@ nGZ hjW hjW nGZ -eVj +obQ sYB oTP qQl @@ -83518,25 +83366,25 @@ nGZ hjW hjW nGZ -oyk -wzK -wbL -rSN -mGN -prG -cpv +grz +gqC +vHk +ntW +aKs +wBV +tPR sjd cEb nFJ cEb cEb -hjC -iUO -iUO -iUO -iUO -iUO -wzT +qxW +oht +oht +oht +oht +oht +hxp bxy cUd cUd @@ -83549,7 +83397,7 @@ nGZ hjW hjW nGZ -fWs +kKy aic ckr qQl @@ -83730,7 +83578,7 @@ nGZ hjW hjW nGZ -vwx +lCG xeO xeO xeO @@ -83748,7 +83596,7 @@ xeO xfb yat xeO -eXY +eOQ nGZ nGZ rJW @@ -83942,7 +83790,7 @@ ntZ nGZ nGZ nGZ -vwx +lCG bym uKx uKx @@ -83960,18 +83808,18 @@ xeO cAU uyp xeO -vUf +esy nGZ lRT lRT -atl -aZD +utl +pYe lRT -atl -aZD +utl +pYe lRT -atl -aZD +utl +pYe lRT scM scM @@ -83979,9 +83827,9 @@ scM scM scM bQM -bTo +gjm pcu -iWq +hfJ bQM scM aOC @@ -84154,7 +84002,7 @@ lRT lRT lRT hTo -vwx +lCG lpl jVE vzn @@ -84172,7 +84020,7 @@ xeO mQB aTE xeO -aRv +uVM nGZ lRT lRT @@ -84191,9 +84039,9 @@ bQM bQM bQM bQM -bTo +gjm pcu -iWq +hfJ bQM scM eNv @@ -84366,7 +84214,7 @@ bQM bQM xDw oEN -vwx +lCG fSz lIv lIv @@ -84384,7 +84232,7 @@ xeO fCW myf xeO -tOP +dTQ nGZ xDw bQM @@ -84403,9 +84251,9 @@ bQM bQM bQM bQM -bTo +gjm pcu -iWq +hfJ bQM scM xdE @@ -84578,25 +84426,25 @@ bQM bQM lRT lRT -piw -tFA -tFA -tFA -tFA -tFA -uiV -tFA -tFA -tFA -tFA -tFA -tFA -jmr -tFA -tFA -tFA -tFA -nnG +niZ +otS +otS +otS +otS +otS +qgY +otS +otS +otS +otS +otS +otS +wXR +otS +otS +otS +otS +vgA lRT lRT bQM @@ -84612,18 +84460,18 @@ bQM bQM bQM bQM -swg -fQV -fQV -fyC -qOk -mKS -fyC -qOk -mKS -fQV -fQV -erT +rfI +rQt +rQt +eyB +pFE +ocW +eyB +pFE +ocW +rQt +rQt +grn bQM bQM bQM @@ -84824,7 +84672,7 @@ bQM bQM bQM bQM -bTo +gjm afk afk afk @@ -84835,7 +84683,7 @@ hkh afk afk afk -iWq +hfJ bQM bQM bQM @@ -85036,7 +84884,7 @@ bQM bQM bQM bQM -bTo +gjm afk afk afk @@ -85047,7 +84895,7 @@ pcu afk afk afk -iWq +hfJ bQM bQM bQM @@ -85248,7 +85096,7 @@ bQM bQM bQM bQM -bTo +gjm afk afk afk @@ -85259,7 +85107,7 @@ hkh afk afk afk -iWq +hfJ bQM bQM bQM @@ -85460,18 +85308,18 @@ bQM bQM bQM bQM -aKA -jlH -jlH -tWI -llQ -jKI -tWI -llQ -jKI -jlH -jlH -bUB +rcy +rhR +rhR +dfw +lJb +ngo +dfw +lJb +ngo +rhR +rhR +mtM bQM bQM bQM diff --git a/maps/map_files/FOP_v3_Sciannex/sprinkles/10.podholder.dmm b/maps/map_files/FOP_v3_Sciannex/sprinkles/10.podholder.dmm index 916fe313fb33..a2305e214b44 100644 --- a/maps/map_files/FOP_v3_Sciannex/sprinkles/10.podholder.dmm +++ b/maps/map_files/FOP_v3_Sciannex/sprinkles/10.podholder.dmm @@ -114,12 +114,8 @@ }, /area/template_noop) "T" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, +/obj/structure/platform/metal/kutjevo_smooth/west, +/obj/structure/platform/metal/kutjevo_smooth/east, /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/almayer_hull, /area/template_noop) diff --git a/maps/map_files/FOP_v3_Sciannex/sprinkles/20.poolparty.dmm b/maps/map_files/FOP_v3_Sciannex/sprinkles/20.poolparty.dmm index ce8071106172..82ac4eede517 100644 --- a/maps/map_files/FOP_v3_Sciannex/sprinkles/20.poolparty.dmm +++ b/maps/map_files/FOP_v3_Sciannex/sprinkles/20.poolparty.dmm @@ -48,7 +48,7 @@ /turf/open/floor/wood, /area/template_noop) "cK" = ( -/obj/structure/platform_decoration, +/obj/structure/platform_decoration/metal/almayer, /turf/open/floor/prison/darkbrown2, /area/template_noop) "cU" = ( @@ -91,9 +91,7 @@ /turf/open/floor/prison/darkbrowncorners2/west, /area/template_noop) "fN" = ( -/obj/structure/platform{ - dir = 4 - }, +/obj/structure/platform/metal/almayer/east, /turf/open/floor/prison/floor_plate, /area/template_noop) "fX" = ( @@ -110,9 +108,7 @@ /turf/open/gm/river/pool, /area/template_noop) "hP" = ( -/obj/structure/platform{ - dir = 4 - }, +/obj/structure/platform/metal/almayer/east, /turf/open/floor/prison, /area/template_noop) "hY" = ( @@ -139,9 +135,7 @@ /turf/open/floor/prison/darkbrown2/east, /area/template_noop) "is" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, +/obj/structure/platform_decoration/metal/almayer/north, /turf/open/floor/prison/darkbrown2/southeast, /area/template_noop) "iC" = ( @@ -191,9 +185,7 @@ /turf/open/gm/river/pool, /area/template_noop) "kA" = ( -/obj/structure/platform{ - dir = 1 - }, +/obj/structure/platform/metal/almayer/north, /turf/open/floor/prison/floor_plate, /area/template_noop) "lc" = ( @@ -213,9 +205,7 @@ /turf/open/floor/wood, /area/template_noop) "ly" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, +/obj/structure/platform_decoration/metal/almayer/west, /turf/open/floor/prison, /area/template_noop) "lS" = ( @@ -278,15 +268,6 @@ "ni" = ( /turf/closed/wall/prison, /area/template_noop) -"nC" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_ew_full_cap" - }, -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/plating/prison, -/area/template_noop) "nS" = ( /obj/structure/prop/souto_land/pole, /turf/open/floor/wood, @@ -298,7 +279,7 @@ /turf/open/floor/wood, /area/template_noop) "ou" = ( -/obj/structure/platform, +/obj/structure/platform/metal/almayer, /turf/open/floor/prison/darkbrown2, /area/template_noop) "oL" = ( @@ -315,9 +296,7 @@ /obj/structure/stairs/perspective{ icon_state = "p_stair_sn_full_cap" }, -/obj/structure/platform{ - dir = 8 - }, +/obj/structure/platform/metal/almayer/west, /turf/open/floor/prison/bright_clean2/southwest, /area/template_noop) "pG" = ( @@ -325,13 +304,11 @@ dir = 8; icon_state = "p_stair_ew_full_cap" }, -/obj/structure/platform/stair_cut, +/obj/structure/platform/metal/stair_cut/platform_left, /turf/open/floor/plating/prison, /area/template_noop) "pH" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, +/obj/structure/platform_decoration/metal/almayer/east, /turf/open/floor/prison/darkbrown2/west, /area/template_noop) "ql" = ( @@ -347,7 +324,7 @@ dir = 4; icon_state = "p_stair_full" }, -/obj/structure/platform, +/obj/structure/platform/metal/almayer, /turf/open/floor/plating/prison, /area/template_noop) "qG" = ( @@ -369,9 +346,7 @@ /turf/open/floor/wood, /area/template_noop) "ro" = ( -/obj/structure/platform{ - dir = 8 - }, +/obj/structure/platform/metal/almayer/west, /turf/open/floor/prison/floor_plate, /area/template_noop) "rp" = ( @@ -431,9 +406,7 @@ /turf/open/floor/wood, /area/template_noop) "ty" = ( -/obj/structure/platform{ - dir = 8 - }, +/obj/structure/platform/metal/almayer/west, /turf/open/floor/prison, /area/template_noop) "tz" = ( @@ -457,9 +430,7 @@ /turf/open/floor/wood, /area/template_noop) "uw" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, +/obj/structure/platform_decoration/metal/almayer/north, /turf/open/floor/prison/darkbrowncorners2/west, /area/template_noop) "vd" = ( @@ -476,9 +447,7 @@ /turf/open/floor/prison/darkbrown2/west, /area/template_noop) "vf" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, +/obj/structure/platform_decoration/metal/almayer/east, /turf/open/floor/prison/floor_plate, /area/template_noop) "vU" = ( @@ -540,9 +509,7 @@ /turf/open/floor/prison/darkbrown2/southeast, /area/template_noop) "wV" = ( -/obj/structure/platform{ - dir = 1 - }, +/obj/structure/platform/metal/almayer/north, /obj/structure/machinery/light/double/blue{ dir = 1; pixel_y = 21 @@ -560,9 +527,7 @@ /turf/open/floor/prison/darkbrown2, /area/template_noop) "xS" = ( -/obj/structure/platform{ - dir = 1 - }, +/obj/structure/platform/metal/almayer/north, /obj/structure/machinery/light/double/blue{ dir = 1; pixel_y = 21 @@ -578,9 +543,7 @@ dir = 4; icon_state = "p_stair_sn_full_cap" }, -/obj/structure/platform{ - dir = 4 - }, +/obj/structure/platform/metal/almayer/east, /turf/open/floor/plating/prison, /area/template_noop) "zc" = ( @@ -588,7 +551,7 @@ dir = 4; icon_state = "p_stair_full" }, -/obj/structure/platform, +/obj/structure/platform/metal/almayer, /turf/open/floor/prison/darkbrown2, /area/template_noop) "zR" = ( @@ -692,17 +655,15 @@ /turf/open/gm/river/pool, /area/template_noop) "DN" = ( -/obj/structure/platform_decoration, +/obj/structure/platform_decoration/metal/almayer, /turf/open/floor/prison/darkbrowncorners2, /area/template_noop) "DT" = ( -/obj/structure/platform, +/obj/structure/platform/metal/almayer, /turf/open/gm/river/pool, /area/template_noop) "Fj" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, +/obj/structure/platform_decoration/metal/almayer/west, /turf/open/floor/wood, /area/template_noop) "Fl" = ( @@ -794,15 +755,9 @@ /turf/open/floor/prison/darkbrown2/north, /area/template_noop) "Hn" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 9 - }, +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/northwest, /turf/open/floor/prison/floor_plate, /area/template_noop) "HP" = ( @@ -904,9 +859,7 @@ /turf/open/floor/wood, /area/template_noop) "La" = ( -/obj/structure/platform{ - dir = 1 - }, +/obj/structure/platform/metal/almayer/north, /turf/open/gm/river/pool, /area/template_noop) "Ls" = ( @@ -948,29 +901,19 @@ /turf/open/floor/wood, /area/template_noop) "LW" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, +/obj/structure/platform_decoration/metal/almayer/west, /turf/open/floor/prison/darkbrown2/east, /area/template_noop) "Mn" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 10 - }, +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/southwest, /turf/open/floor/prison/floor_plate, /area/template_noop) "MS" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 6 - }, +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/southeast, /turf/open/floor/prison/floor_plate, /area/template_noop) "ND" = ( @@ -988,9 +931,7 @@ /turf/open/gm/river/pool, /area/template_noop) "PA" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, +/obj/structure/platform_decoration/metal/almayer/east, /turf/open/floor/prison/darkbrown2/northeast, /area/template_noop) "PR" = ( @@ -1076,9 +1017,7 @@ dir = 1; icon_state = "p_stair_sn_full_cap" }, -/obj/structure/platform{ - dir = 8 - }, +/obj/structure/platform/metal/almayer/west, /obj/structure/prop/souto_land/pole, /obj/structure/prop/souto_land/pole{ dir = 4; @@ -1108,7 +1047,7 @@ dir = 8; icon_state = "p_stair_full" }, -/obj/structure/platform, +/obj/structure/platform/metal/almayer, /turf/open/floor/plating/prison, /area/template_noop) "Us" = ( @@ -1154,7 +1093,7 @@ /turf/open/floor/wood, /area/template_noop) "VV" = ( -/obj/structure/platform_decoration, +/obj/structure/platform_decoration/metal/almayer, /turf/open/floor/prison, /area/template_noop) "Wa" = ( @@ -1167,16 +1106,14 @@ /turf/open/floor/wood, /area/template_noop) "We" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, +/obj/structure/platform_decoration/metal/almayer/north, /turf/open/floor/prison, /area/template_noop) "Wh" = ( /turf/open/floor/prison/darkbrown2/north, /area/template_noop) "Wx" = ( -/obj/structure/platform, +/obj/structure/platform/metal/almayer, /obj/item/trash/crushed_cup{ pixel_y = 13; pixel_x = 45 @@ -1184,9 +1121,7 @@ /turf/open/gm/river/pool, /area/template_noop) "WY" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, +/obj/structure/platform_decoration/metal/almayer/north, /turf/open/floor/prison/darkbrown2, /area/template_noop) "Xn" = ( @@ -1204,7 +1139,7 @@ /turf/open/gm/river/pool, /area/template_noop) "Xu" = ( -/obj/structure/platform, +/obj/structure/platform/metal/almayer, /obj/structure/machinery/light/double/blue, /turf/open/floor/prison/darkbrown2, /area/template_noop) @@ -1227,9 +1162,7 @@ dir = 8; icon_state = "p_stair_sn_full_cap" }, -/obj/structure/platform{ - dir = 4 - }, +/obj/structure/platform/metal/almayer/east, /obj/structure/prop/souto_land/pole{ dir = 1 }, @@ -1244,7 +1177,7 @@ /turf/open/floor/prison/darkbrown2/east, /area/template_noop) "XX" = ( -/obj/structure/platform_decoration, +/obj/structure/platform_decoration/metal/almayer, /turf/open/floor/prison/floor_plate, /area/template_noop) "Yd" = ( @@ -1266,14 +1199,14 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/template_noop) "YG" = ( -/obj/structure/platform, +/obj/structure/platform/metal/almayer, /turf/open/floor/prison, /area/template_noop) "YP" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_ew_full_cap" }, -/obj/structure/platform/stair_cut/alt, +/obj/structure/platform/metal/stair_cut/platform_right, /turf/open/floor/plating/prison, /area/template_noop) "Zr" = ( @@ -1281,7 +1214,7 @@ /turf/open/floor/wood, /area/template_noop) "ZB" = ( -/obj/structure/platform, +/obj/structure/platform/metal/almayer, /turf/open/floor/prison/floor_plate, /area/template_noop) @@ -1606,7 +1539,7 @@ rW nf rq Rs -nC +YP Rr Rr TS diff --git a/maps/map_files/FOP_v3_Sciannex/sprinkles/30.repairpanelslz.dmm b/maps/map_files/FOP_v3_Sciannex/sprinkles/30.repairpanelslz.dmm index bba4398e4d95..1c48f127722b 100644 --- a/maps/map_files/FOP_v3_Sciannex/sprinkles/30.repairpanelslz.dmm +++ b/maps/map_files/FOP_v3_Sciannex/sprinkles/30.repairpanelslz.dmm @@ -1,8 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, +/obj/structure/platform/metal/kutjevo_smooth/west, /obj/item/stack/sheet/metal, /turf/open/space, /area/template_noop) @@ -33,9 +31,7 @@ /turf/open/floor/prison, /area/template_noop) "g" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, +/obj/structure/platform/metal/kutjevo_smooth/north, /obj/structure/barricade/handrail{ dir = 1; icon_state = "hr_kutjevo"; @@ -44,14 +40,12 @@ /turf/open/space, /area/template_noop) "h" = ( -/obj/structure/platform/kutjevo/smooth, +/obj/structure/platform/metal/kutjevo_smooth, /obj/item/stack/sheet/metal, /turf/open/space, /area/template_noop) "i" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, +/obj/structure/platform_decoration/metal/kutjevo/west, /turf/open/space, /area/template_noop) "j" = ( @@ -63,9 +57,7 @@ pixel_x = -9; icon_state = "scandinavian_head_m" }, -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, +/obj/structure/platform_decoration/metal/kutjevo/north, /turf/open/space/basic, /area/template_noop) "m" = ( @@ -84,23 +76,19 @@ /turf/open/floor/plating/prison, /area/template_noop) "s" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, +/obj/structure/platform/metal/kutjevo_smooth/east, /turf/open/space, /area/template_noop) "t" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, +/obj/structure/platform/metal/kutjevo_smooth, +/obj/structure/platform/metal/kutjevo_smooth/east, /turf/open/space, /area/template_noop) "u" = ( /turf/open/space, /area/template_noop) "v" = ( -/obj/structure/platform/kutjevo/smooth, +/obj/structure/platform/metal/kutjevo_smooth, /obj/item/book/manual/engineering_construction, /turf/open/space/basic, /area/template_noop) @@ -120,20 +108,16 @@ /turf/open/floor/prison/darkyellow2/west, /area/template_noop) "z" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, +/obj/structure/platform/metal/kutjevo_smooth/north, /obj/item/clothing/head/cardborg, /turf/open/space, /area/template_noop) "A" = ( -/obj/structure/platform_decoration/kutjevo, +/obj/structure/platform_decoration/metal/kutjevo, /turf/open/space/basic, /area/template_noop) "B" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, +/obj/structure/platform_decoration/metal/kutjevo/east, /turf/open/space, /area/template_noop) "D" = ( @@ -162,9 +146,7 @@ /turf/open/space, /area/template_noop) "I" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, +/obj/structure/platform/metal/kutjevo_smooth/east, /obj/effect/spawner/random/tool{ pixel_x = -8; pixel_y = 7 @@ -175,12 +157,8 @@ /turf/open/space, /area/template_noop) "J" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, +/obj/structure/platform/metal/kutjevo_smooth/north, +/obj/structure/platform/metal/kutjevo_smooth/east, /obj/item/stack/sheet/metal, /turf/open/space, /area/template_noop) @@ -188,30 +166,26 @@ /turf/open/floor/prison/darkyellow2/west, /area/template_noop) "M" = ( -/obj/structure/platform/kutjevo/smooth, +/obj/structure/platform/metal/kutjevo_smooth, /turf/open/space, /area/template_noop) "N" = ( /turf/open/floor/solarpanel, /area/template_noop) "O" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, +/obj/structure/platform/metal/kutjevo_smooth, +/obj/structure/platform/metal/kutjevo_smooth/west, /turf/open/space, /area/template_noop) "P" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, +/obj/structure/platform/metal/kutjevo_smooth/west, /turf/open/floor/almayer_hull, /area/template_noop) "Q" = ( /turf/open/auto_turf/sand/layer1, /area/template_noop) "R" = ( -/obj/structure/platform/kutjevo/smooth, +/obj/structure/platform/metal/kutjevo_smooth, /turf/open/space/basic, /area/template_noop) "S" = ( @@ -226,34 +200,24 @@ /turf/open/space, /area/template_noop) "V" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, +/obj/structure/platform/metal/kutjevo_smooth/west, /obj/item/circuitboard/solar_tracker, /turf/open/space, /area/template_noop) "W" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, +/obj/structure/platform/metal/kutjevo_smooth/east, /turf/open/floor/almayer_hull, /area/template_noop) "X" = ( /turf/open/floor/prison/darkyellow2/northwest, /area/template_noop) "Y" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, +/obj/structure/platform/metal/kutjevo_smooth/north, +/obj/structure/platform/metal/kutjevo_smooth/west, /turf/open/space, /area/template_noop) "Z" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, +/obj/structure/platform/metal/kutjevo_smooth/north, /turf/open/space, /area/template_noop) diff --git a/maps/map_files/FOP_v3_Sciannex/sprinkles/unused/20.medicalhold.dmm b/maps/map_files/FOP_v3_Sciannex/sprinkles/unused/20.medicalhold.dmm index 8ec3365773a2..c57875f98318 100644 --- a/maps/map_files/FOP_v3_Sciannex/sprinkles/unused/20.medicalhold.dmm +++ b/maps/map_files/FOP_v3_Sciannex/sprinkles/unused/20.medicalhold.dmm @@ -38,9 +38,7 @@ dir = 4; icon_state = "p_stair_sn_full_cap" }, -/obj/structure/platform{ - dir = 4 - }, +/obj/structure/platform/metal/almayer/east, /turf/open/floor/plating/prison, /area/template_noop) "bN" = ( @@ -161,9 +159,7 @@ /turf/open/floor/prison/sterile_white/southwest, /area/template_noop) "nR" = ( -/obj/structure/platform{ - dir = 1 - }, +/obj/structure/platform/metal/almayer/north, /obj/effect/decal/cleanable/blood/drip, /obj/structure/largecrate/random/barrel, /turf/open/floor/prison/whitegreen/north, @@ -332,9 +328,7 @@ /turf/open/floor/prison/sterile_white/southwest, /area/template_noop) "ES" = ( -/obj/structure/platform{ - dir = 8 - }, +/obj/structure/platform/metal/almayer/west, /obj/effect/decal/medical_decals{ icon_state = "triagedecalbottomleft" }, @@ -363,12 +357,8 @@ /area/template_noop) "GI" = ( /obj/structure/stairs/perspective, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform{ - dir = 4 - }, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform/metal/almayer/east, /obj/structure/inflatable/door, /turf/open/floor/plating/prison, /area/template_noop) @@ -382,9 +372,7 @@ /turf/open/floor/plating/plating_catwalk/prison, /area/template_noop) "Hq" = ( -/obj/structure/platform{ - dir = 1 - }, +/obj/structure/platform/metal/almayer/north, /obj/effect/decal/medical_decals{ icon_state = "triagedecalbottomleft" }, @@ -402,39 +390,29 @@ /turf/open/floor/prison/whitegreen/east, /area/template_noop) "IK" = ( -/obj/structure/platform{ - dir = 1; - layer = 2.8 - }, +/obj/structure/platform/metal/almayer/north, /obj/structure/largecrate/random/barrel{ pixel_x = -8; - layer = 2.9 + layer = 3.1 }, /obj/structure/largecrate/random/barrel{ pixel_x = 13; - layer = 2.9 + layer = 3.1 }, /obj/structure/largecrate/random/barrel{ pixel_x = 3; - layer = 2.9; - pixel_y = -8 + pixel_y = -8; + layer = 3.1 }, /turf/open/floor/prison/whitegreen/north, /area/template_noop) "JJ" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 4; - layer = 2.8 - }, +/obj/structure/platform_decoration/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/east, /turf/open/floor/prison/whitegreen/north, /area/template_noop) "JL" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, +/obj/structure/platform_decoration/metal/almayer/north, /obj/structure/inflatable, /turf/open/floor/prison/whitegreen, /area/template_noop) @@ -552,9 +530,7 @@ /obj/structure/machinery/shower{ pixel_y = 13 }, -/obj/structure/platform{ - dir = 8 - }, +/obj/structure/platform/metal/almayer/west, /turf/open/floor/plating/plating_catwalk/prison, /area/template_noop) "RG" = ( @@ -562,9 +538,7 @@ /turf/open/floor/prison/sterile_white/southwest, /area/template_noop) "Sz" = ( -/obj/structure/platform{ - dir = 1 - }, +/obj/structure/platform/metal/almayer/north, /obj/structure/largecrate/random/barrel, /obj/structure/largecrate/random/barrel{ pixel_x = 16; @@ -581,9 +555,7 @@ /turf/open/floor/prison/sterile_white/southwest, /area/template_noop) "TF" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, +/obj/structure/platform_decoration/metal/almayer/east, /obj/effect/decal/medical_decals{ icon_state = "triagedecalleft" }, @@ -615,9 +587,7 @@ /turf/open/floor/prison/whitegreen, /area/template_noop) "WP" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, +/obj/structure/platform_decoration/metal/almayer/west, /obj/effect/decal/medical_decals{ icon_state = "triagedecaldir" }, diff --git a/maps/map_files/FOP_v3_Sciannex/standalone/riot_in_progress.dmm b/maps/map_files/FOP_v3_Sciannex/standalone/riot_in_progress.dmm index 98b92955e2dd..694369ae8f0f 100644 --- a/maps/map_files/FOP_v3_Sciannex/standalone/riot_in_progress.dmm +++ b/maps/map_files/FOP_v3_Sciannex/standalone/riot_in_progress.dmm @@ -31,7 +31,7 @@ dir = 8; icon_state = "p_stair_full" }, -/obj/structure/platform, +/obj/structure/platform/metal/almayer, /turf/open/floor/prison/floor_plate, /area/fiorina/station/security) "bl" = ( @@ -82,7 +82,7 @@ /turf/closed/wall/prison, /area/fiorina/station/security) "cI" = ( -/obj/structure/platform, +/obj/structure/platform/metal/almayer, /turf/open/floor/prison/cell_stripe/east, /area/fiorina/station/security) "cZ" = ( @@ -338,7 +338,7 @@ /turf/open/floor/prison, /area/fiorina/lz/near_lzII) "nD" = ( -/obj/structure/platform, +/obj/structure/platform/metal/almayer, /obj/effect/decal/cleanable/blood/gibs/xeno, /turf/open/floor/prison/floor_plate, /area/fiorina/station/security) @@ -951,7 +951,7 @@ /turf/open/floor/prison/redfull, /area/fiorina/station/security) "NL" = ( -/obj/structure/platform, +/obj/structure/platform/metal/almayer, /turf/open/floor/prison/cell_stripe/west, /area/fiorina/station/security) "NN" = ( @@ -959,7 +959,7 @@ /turf/open/floor/prison/floor_plate, /area/fiorina/station/security) "Ox" = ( -/obj/structure/platform, +/obj/structure/platform/metal/almayer, /turf/open/floor/prison/floor_plate, /area/fiorina/station/security) "OA" = ( @@ -1065,7 +1065,7 @@ /obj/structure/stairs/perspective{ icon_state = "p_stair_ew_full_cap" }, -/obj/structure/platform/stair_cut/alt, +/obj/structure/platform/metal/stair_cut/platform_right, /turf/open/floor/plating/prison, /area/fiorina/station/security) "Tn" = ( diff --git a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm index 6c1c5460a935..20b96cfc3da1 100644 --- a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm +++ b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm @@ -51,10 +51,6 @@ }, /turf/open/auto_turf/ice/layer1, /area/shiva/interior/caves/medseceng_caves) -"aam" = ( -/obj/structure/platform/strata, -/turf/open/auto_turf/ice/layer1, -/area/shiva/exterior/cp_lz2) "aan" = ( /obj/structure/prop/ice_colony/dense/planter_box{ dir = 8 @@ -76,34 +72,10 @@ }, /turf/open/auto_turf/ice/layer1, /area/shiva/exterior/cp_lz2) -"aap" = ( -/obj/structure/platform/strata{ - dir = 4 - }, -/obj/structure/stairs/perspective/ice{ - dir = 8; - icon_state = "p_stair_sn_full_cap" - }, -/turf/open/auto_turf/ice/layer1, -/area/shiva/exterior/cp_lz2) -"aaq" = ( -/obj/structure/platform/strata, -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/auto_turf/ice/layer1, -/area/shiva/exterior/cp_lz2) "aar" = ( /obj/structure/machinery/camera/autoname/lz_camera, /turf/open/floor/shiva/north, /area/shiva/exterior/lz2_fortress) -"aas" = ( -/obj/structure/platform/strata, -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/auto_turf/ice/layer1, -/area/shiva/exterior/cp_lz2) "aat" = ( /obj/item/tool/shovel/snow{ pixel_y = 8 @@ -119,15 +91,6 @@ "aav" = ( /turf/open/auto_turf/ice/layer1, /area/shiva/exterior/telecomm/lz1_north) -"aax" = ( -/obj/structure/prop/ice_colony/surveying_device{ - layer = 3.01; - pixel_x = -7; - pixel_y = 16 - }, -/obj/structure/platform_decoration/strata, -/turf/open/auto_turf/ice/layer1, -/area/shiva/exterior/cp_lz2) "aay" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/auto_turf/ice/layer0, @@ -159,38 +122,12 @@ }, /turf/open/auto_turf/ice/layer1, /area/shiva/interior/caves/right_spiders) -"aaF" = ( -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/auto_turf/snow/layer3, -/area/shiva/exterior/cp_lz2) "aaG" = ( /obj/structure/prop/ice_colony/surveying_device{ dir = 8 }, /turf/open/auto_turf/ice/layer1, /area/shiva/exterior/cp_lz2) -"aaH" = ( -/obj/structure/stairs/perspective/ice{ - dir = 1; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/auto_turf/ice/layer1, -/area/shiva/exterior/cp_lz2) -"aaI" = ( -/obj/structure/stairs/perspective/ice{ - dir = 8; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/auto_turf/ice/layer1, -/area/shiva/exterior/cp_lz2) "aaJ" = ( /obj/structure/surface/rack, /obj/item/ammo_magazine/flamer_tank{ @@ -205,13 +142,6 @@ /obj/item/tool/pickaxe/drill, /turf/open/auto_turf/ice/layer1, /area/shiva/exterior/cp_colony_grounds) -"aaM" = ( -/obj/structure/platform/strata{ - dir = 4 - }, -/obj/structure/platform/strata, -/turf/open/auto_turf/ice/layer1, -/area/shiva/exterior/cp_lz2) "aaN" = ( /obj/item/weapon/gun/flamer, /obj/structure/surface/rack, @@ -237,12 +167,6 @@ /obj/effect/spider/cocoon, /turf/open/auto_turf/ice/layer1, /area/shiva/interior/caves/right_spiders) -"aaT" = ( -/obj/structure/platform_decoration/strata{ - dir = 1 - }, -/turf/open/auto_turf/ice/layer1, -/area/shiva/exterior/cp_lz2) "aaV" = ( /obj/effect/spider/stickyweb, /obj/effect/spider/cocoon{ @@ -250,10 +174,6 @@ }, /turf/open/auto_turf/ice/layer1, /area/shiva/interior/caves/right_spiders) -"aaW" = ( -/obj/structure/platform_decoration/strata, -/turf/open/auto_turf/ice/layer1, -/area/shiva/exterior/cp_lz2) "aaX" = ( /obj/item/tool/warning_cone{ pixel_x = -12 @@ -298,64 +218,11 @@ }, /turf/open/auto_turf/ice/layer1, /area/shiva/interior/caves/cp_camp) -"abf" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/oob/dev_room) -"abg" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/turf/open/auto_turf/ice/layer1, -/area/shiva/exterior/junkyard/cp_bar) "abh" = ( /turf/closed/shuttle/elevator{ dir = 9 }, /area/shiva/interior/colony/central) -"abi" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 8 - }, -/obj/structure/platform_decoration/strata, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/oob/dev_room) -"abj" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/oob/dev_room) -"abk" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 4 - }, -/obj/structure/platform_decoration/strata{ - dir = 1 - }, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/oob/dev_room) -"abl" = ( -/obj/structure/platform/strata{ - dir = 8 - }, -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/oob/dev_room) "abm" = ( /obj/structure/target/alien{ desc = "Cope, seethe. Ledges are eternal. But alas, you are not." @@ -367,45 +234,9 @@ dir = 9 }, /area/shiva/interior/colony/research_hab) -"abo" = ( -/obj/structure/platform/strata{ - dir = 4 - }, -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/oob/dev_room) "abp" = ( /turf/closed/shuttle/elevator/gears, /area/shiva/interior/colony/research_hab) -"abq" = ( -/obj/structure/platform/strata, -/obj/structure/platform/strata{ - dir = 8 - }, -/obj/structure/platform_decoration/strata{ - dir = 8 - }, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/oob/dev_room) -"abr" = ( -/obj/structure/platform/strata, -/obj/structure/platform/strata{ - dir = 1 - }, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/oob/dev_room) -"abs" = ( -/obj/structure/platform/strata, -/obj/structure/platform/strata{ - dir = 4 - }, -/obj/structure/platform_decoration/strata{ - dir = 4 - }, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/oob/dev_room) "abt" = ( /obj/structure/prop/ice_colony/surveying_device/measuring_device{ pixel_y = 16 @@ -612,12 +443,6 @@ /obj/effect/landmark/hunter_secondary, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_lz2) -"acn" = ( -/obj/structure/platform/shiva/catwalk{ - dir = 8 - }, -/turf/open/floor/shiva/north, -/area/shiva/exterior/lz2_fortress) "aco" = ( /obj/structure/stairs/perspective/ice{ icon_state = "p_stair_full" @@ -796,6 +621,13 @@ }, /turf/open/floor/shiva/floor3, /area/shiva/interior/colony/central) +"adK" = ( +/obj/structure/cable/heavyduty{ + icon_state = "1-2-4-8" + }, +/obj/structure/platform/metal/shiva, +/turf/open/floor/plating/plating_catwalk/shiva, +/area/shiva/exterior/junkyard/fortbiceps) "adR" = ( /obj/structure/machinery/disposal, /turf/open/floor/shiva/redfull/west, @@ -967,21 +799,6 @@ }, /turf/open/auto_turf/snow/layer0, /area/shiva/interior/colony/central) -"aeG" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/auto_turf/ice/layer0, -/area/shiva/interior/caves/cp_camp) -"aeH" = ( -/obj/structure/platform_decoration/strata{ - dir = 4 - }, -/turf/open/auto_turf/ice/layer0, -/area/shiva/interior/caves/cp_camp) "aeM" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/stack/rods{ @@ -1202,6 +1019,11 @@ /obj/effect/landmark/crap_item, /turf/open/floor/shiva/north, /area/shiva/interior/colony/medseceng) +"agf" = ( +/obj/structure/platform_decoration/stone/strata/north, +/obj/structure/platform_decoration/stone/strata, +/turf/open/gm/river, +/area/shiva/interior/caves/research_caves) "agg" = ( /obj/structure/machinery/vending/cola, /turf/open/floor/shiva/bluefull, @@ -1312,6 +1134,10 @@ }, /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/cp_colony_grounds) +"agU" = ( +/obj/structure/platform_decoration/metal/shiva/east, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/valley) "agY" = ( /obj/structure/surface/table, /obj/effect/spawner/random/tool, @@ -1337,12 +1163,6 @@ /obj/structure/machinery/space_heater, /turf/open/floor/shiva/bluefull/west, /area/shiva/interior/aerodrome) -"ahh" = ( -/obj/structure/platform/shiva/catwalk{ - dir = 1 - }, -/turf/open/gm/river/no_overlay, -/area/shiva/interior/colony/central) "ahl" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/spawner/random/tool, @@ -1547,14 +1367,6 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/shiva/yellowfull, /area/shiva/interior/colony/research_hab) -"aiE" = ( -/obj/item/ammo_magazine/flamer_tank, -/obj/structure/machinery/light/double{ - dir = 1; - pixel_y = 9 - }, -/turf/open/floor/shiva/north, -/area/shiva/interior/colony/central) "aiF" = ( /obj/structure/flora/bush/snow, /turf/open/auto_turf/snow/layer2, @@ -1641,14 +1453,6 @@ /obj/structure/bed/chair/wheelchair, /turf/open/floor/shiva/wred/northeast, /area/shiva/interior/colony/medseceng) -"ajd" = ( -/obj/item/stack/snow{ - pixel_x = 8; - pixel_y = 9 - }, -/obj/item/stack/snow, -/turf/open/auto_turf/snow/layer3, -/area/shiva/exterior/junkyard) "aje" = ( /obj/structure/machinery/light/double{ dir = 4; @@ -1699,13 +1503,6 @@ /obj/structure/machinery/vending/snack, /turf/open/floor/shiva/bluefull, /area/shiva/interior/colony/central) -"ajE" = ( -/obj/item/stack/snow{ - pixel_x = -7 - }, -/obj/item/tool/shovel/snow, -/turf/open/auto_turf/snow/layer3, -/area/shiva/exterior/junkyard) "ajF" = ( /obj/item/tool/shovel/etool, /turf/open/auto_turf/snow/layer3, @@ -1980,6 +1777,10 @@ "alA" = ( /turf/open/auto_turf/ice/layer2, /area/shiva/exterior/junkyard) +"alG" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/auto_turf/snow/layer0, +/area/shiva/exterior/cp_colony_grounds) "alJ" = ( /obj/item/device/flashlight/lamp/tripod/grey, /turf/open/auto_turf/ice/layer1, @@ -2423,6 +2224,10 @@ }, /turf/open/floor/shiva/redfull, /area/shiva/interior/colony/medseceng) +"aoR" = ( +/obj/structure/platform/stone/strata/west, +/turf/open/gm/river/no_overlay, +/area/shiva/interior/caves/cp_camp) "aoX" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -2637,6 +2442,14 @@ }, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_lz2) +"aqz" = ( +/obj/structure/machinery/light/double{ + dir = 4; + pixel_y = -5 + }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/shiva/north, +/area/shiva/interior/colony/medseceng) "aqC" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -3087,16 +2900,6 @@ }, /turf/open/floor/interior/plastic, /area/shiva/interior/warehouse) -"aui" = ( -/obj/structure/platform/strata, -/obj/structure/platform/strata{ - dir = 8 - }, -/obj/structure/barricade/handrail/wire{ - layer = 3.5 - }, -/turf/open/gm/river/no_overlay, -/area/shiva/interior/caves/cp_camp) "aut" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -3179,12 +2982,6 @@ }, /turf/open/floor/shiva/floor3, /area/shiva/interior/bar) -"avx" = ( -/obj/structure/platform/shiva/catwalk{ - dir = 1 - }, -/turf/open/auto_turf/snow/layer3, -/area/shiva/exterior/junkyard) "avz" = ( /obj/structure/surface/rack, /obj/item/bodybag/tarp/snow{ @@ -3195,6 +2992,13 @@ }, /turf/open/floor/interior/plastic, /area/shiva/interior/warehouse) +"avR" = ( +/obj/structure/stairs/perspective/ice{ + dir = 8; + icon_state = "p_stair_sn_full_cap" + }, +/turf/open/auto_turf/snow/layer1, +/area/shiva/exterior/southwest_valley) "avU" = ( /obj/structure/prop/invuln/ice_prefab{ icon_state = "fab_2" @@ -3273,6 +3077,11 @@ "axf" = ( /turf/open/floor/shiva/greenfull, /area/shiva/interior/colony/n_admin) +"axg" = ( +/obj/structure/platform_decoration/stone/strata, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/auto_turf/snow/layer3, +/area/shiva/exterior/junkyard) "axq" = ( /obj/item/ammo_magazine/rifle/boltaction{ pixel_x = -5; @@ -3510,6 +3319,14 @@ /obj/effect/decal/cleanable/blood, /turf/open/asphalt/cement, /area/shiva/interior/warehouse) +"aza" = ( +/obj/structure/platform/stone/strata, +/obj/structure/platform/stone/strata/west, +/obj/structure/barricade/handrail/wire{ + layer = 3.5 + }, +/turf/open/gm/river/no_overlay, +/area/shiva/interior/caves/cp_camp) "azc" = ( /obj/effect/decal/warning_stripes{ icon_state = "NS-center" @@ -3676,12 +3493,6 @@ /obj/effect/landmark/corpsespawner/security, /turf/open/floor/wood, /area/shiva/interior/colony/s_admin) -"aAn" = ( -/obj/structure/machinery/firealarm{ - pixel_y = 24 - }, -/turf/open/floor/shiva/north, -/area/shiva/interior/colony/central) "aAp" = ( /obj/structure/closet/secure_closet/engineering_electrical, /turf/open/floor/shiva/north, @@ -3892,6 +3703,13 @@ }, /turf/open/auto_turf/snow/layer3, /area/shiva/interior/caves/cp_camp) +"aDa" = ( +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/effect/spawner/gibspawner/human, +/turf/open/floor/wood, +/area/shiva/interior/colony/botany) "aDm" = ( /obj/structure/machinery/colony_floodlight, /turf/open/auto_turf/snow/layer1, @@ -4040,15 +3858,6 @@ }, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/valley) -"aED" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/gm/river/no_overlay, -/area/shiva/interior/caves/cp_camp) "aEH" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 9 @@ -4078,14 +3887,6 @@ /obj/structure/flora/bush/ausbushes/lavendergrass, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_lz2) -"aFb" = ( -/obj/structure/platform_decoration/strata, -/turf/open/auto_turf/snow/layer4, -/area/shiva/exterior/cp_lz2) -"aFc" = ( -/obj/structure/platform/strata, -/turf/open/auto_turf/snow/layer2, -/area/shiva/interior/caves/cp_camp) "aFd" = ( /obj/structure/prop/invuln/ice_prefab/standalone/trim{ icon_state = "white_trim" @@ -4236,6 +4037,13 @@ /obj/structure/flora/bush/ausbushes/lavendergrass, /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/cp_s_research) +"aGH" = ( +/obj/structure/platform/metal/shiva/north, +/obj/structure/prop/ice_colony/flamingo{ + dir = 9 + }, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/southwest_valley) "aGI" = ( /obj/structure/flora/tree/dead/tree_2, /turf/open/auto_turf/snow/layer1, @@ -4315,6 +4123,9 @@ /obj/item/frame/table, /turf/open/floor/shiva/wred, /area/shiva/interior/colony/medseceng) +"aJt" = ( +/turf/open/auto_turf/snow/layer1, +/area/shiva/exterior/southwest_valley) "aJy" = ( /obj/structure/flora/tree/dead/tree_5, /turf/open/auto_turf/snow/layer3, @@ -4660,15 +4471,6 @@ /obj/item/stool, /turf/open/floor/shiva/floor3, /area/shiva/interior/aerodrome) -"aNy" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/gm/river, -/area/shiva/interior/caves/cp_camp) "aNE" = ( /obj/effect/decal/cleanable/blood/oil/streak, /obj/effect/decal/cleanable/blood/drip, @@ -4861,6 +4663,10 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating, /area/shiva/interior/colony/medseceng) +"aRa" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/auto_turf/ice/layer2, +/area/shiva/exterior/valley) "aRb" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ name = "\improper Panic Room Shutters" @@ -4901,15 +4707,6 @@ /obj/structure/blocker/invisible_wall, /turf/open/ice/noweed, /area/shiva/interior/colony/research_hab) -"aRL" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/gm/river/no_overlay, -/area/shiva/interior/caves/cp_camp) "aRS" = ( /obj/effect/decal/warning_stripes{ icon_state = "E-corner" @@ -5306,11 +5103,6 @@ /obj/item/stack/sheet/metal, /turf/open/shuttle/can_surgery/black, /area/shiva/interior/aerodrome) -"aWb" = ( -/obj/structure/foamed_metal, -/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, -/turf/open/floor/shiva/north, -/area/shiva/exterior/lz2_fortress) "aWs" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out" @@ -5453,6 +5245,10 @@ /obj/structure/blocker/invisible_wall, /turf/open/ice/noweed, /area/shiva/interior/colony/research_hab) +"aXp" = ( +/obj/structure/platform_decoration/stone/strata, +/turf/open/auto_turf/snow/layer1, +/area/shiva/exterior/lz1_valley) "aXw" = ( /obj/vehicle/train/cargo/engine, /obj/effect/decal/warning_stripes{ @@ -5460,6 +5256,11 @@ }, /turf/open/floor/shiva/purplefull/east, /area/shiva/interior/colony/research_hab) +"aXD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/shiva/purplefull/west, +/area/shiva/interior/colony/research_hab) "aXH" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -5514,12 +5315,6 @@ /obj/structure/largecrate/random/case/double, /turf/open/floor/plating, /area/shiva/interior/colony/medseceng) -"aZh" = ( -/obj/structure/platform_decoration/strata{ - dir = 1 - }, -/turf/open/auto_turf/snow/layer3, -/area/shiva/exterior/cp_lz2) "aZp" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/sink{ @@ -5658,7 +5453,7 @@ dir = 8 }, /turf/open/floor/shiva/multi_tiles/east, -/area/shiva/interior/colony/deck) +/area/shiva/interior/colony/central) "bbG" = ( /obj/structure/ice/thin/indestructible{ dir = 4; @@ -5687,34 +5482,17 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/auto_turf/snow/layer0, /area/shiva/interior/bar) -"bcE" = ( -/obj/structure/platform/strata{ - dir = 8 - }, -/obj/structure/platform/strata, -/obj/structure/barricade/handrail/wire{ - layer = 3.5 - }, -/turf/open/gm/river/no_overlay, -/area/shiva/interior/caves/cp_camp) "bcJ" = ( /turf/closed/shuttle/ert{ icon_state = "leftengine_1"; opacity = 0 }, /area/shiva/interior/aerodrome) -"bcV" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/gm/river, -/area/shiva/interior/warehouse/caves) -"bdT" = ( -/turf/open/floor/shiva/radiator_tile2, -/area/shiva/interior/colony/medseceng) +"bdt" = ( +/obj/structure/platform/stone/strata/east, +/obj/structure/platform/stone/strata, +/turf/open/auto_turf/ice/layer1, +/area/shiva/interior/oob/dev_room) "ben" = ( /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/telecomm/lz1_north) @@ -5804,10 +5582,6 @@ "bhI" = ( /turf/open/floor/shiva/wred/southeast, /area/shiva/interior/colony/medseceng) -"bhN" = ( -/obj/structure/flora/grass/tallgrass/ice/corner, -/turf/open/auto_turf/snow/layer2, -/area/shiva/exterior/junkyard) "bhS" = ( /turf/open/floor/shiva/wred/north, /area/shiva/interior/colony/medseceng) @@ -5818,19 +5592,24 @@ }, /turf/open/floor/shiva/floor3, /area/shiva/interior/lz2_habs) +"bir" = ( +/obj/structure/stairs/perspective/ice{ + dir = 1; + icon_state = "p_stair_sn_full_cap" + }, +/turf/open/auto_turf/snow/layer0, +/area/shiva/exterior/southwest_valley) "biM" = ( /turf/open/floor/carpet, /area/shiva/interior/colony/research_hab) -"bjb" = ( -/obj/structure/prop/ice_colony/dense/planter_box{ - dir = 5 - }, -/obj/structure/flora/bush/snow{ - icon_state = "snowbush_2"; - pixel_y = 10 +"biR" = ( +/obj/structure/platform_decoration/stone/strata/north, +/obj/item/lightstick/red/variant/planted{ + pixel_x = -7; + pixel_y = -5 }, /turf/open/auto_turf/snow/layer0, -/area/shiva/interior/colony/deck) +/area/shiva/exterior/southwest_valley) "bjv" = ( /turf/open/auto_turf/ice/layer1, /area/shiva/exterior/cp_colony_grounds) @@ -5902,6 +5681,10 @@ /obj/structure/bed/chair, /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/junkyard) +"bof" = ( +/obj/structure/platform/metal/shiva, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/valley) "boA" = ( /obj/item/tool/crowbar, /turf/open/auto_turf/snow/layer1, @@ -5923,6 +5706,10 @@ "boW" = ( /turf/open/auto_turf/snow/layer0, /area/shiva/exterior/cp_s_research) +"boY" = ( +/obj/structure/platform/stone/strata/east, +/turf/open/auto_turf/ice/layer0, +/area/shiva/interior/caves/s_lz2) "bpH" = ( /turf/open/floor/shiva/red/southeast, /area/shiva/interior/colony/medseceng) @@ -5930,6 +5717,10 @@ /obj/structure/closet/firecloset, /turf/open/floor/shiva/redfull, /area/shiva/interior/colony/research_hab) +"bqz" = ( +/obj/effect/sentry_landmark/lz_1/top_right, +/turf/open/auto_turf/snow/layer3, +/area/shiva/interior/caves/cp_camp) "bqN" = ( /obj/structure/machinery/door/airlock/almayer/generic, /turf/open/shuttle/can_surgery/black, @@ -5938,9 +5729,11 @@ /obj/effect/decal/cleanable/blood, /turf/open/asphalt/cement, /area/shiva/interior/warehouse) -"bsp" = ( -/turf/open/floor/shiva/bluefull, -/area/shiva/interior/colony/deck) +"bsb" = ( +/obj/structure/platform_decoration/stone/strata, +/obj/structure/flora/bush/snow, +/turf/open/auto_turf/snow/layer3, +/area/shiva/exterior/cp_lz2) "bsw" = ( /obj/effect/landmark/corpsespawner/bridgeofficer, /turf/open/auto_turf/snow/layer0, @@ -5983,15 +5776,19 @@ /obj/structure/surface/table, /turf/open/floor/shiva/red/northwest, /area/shiva/interior/colony/central) +"buB" = ( +/obj/structure/platform_decoration/stone/strata/east, +/obj/structure/platform_decoration/stone/strata/west, +/turf/open/gm/river, +/area/shiva/interior/caves/research_caves) "buJ" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/closed/wall/shiva/prefabricated/reinforced, /area/shiva/interior/colony/medseceng) -"bvb" = ( -/obj/structure/platform_decoration/strata, -/obj/structure/flora/bush/snow, -/turf/open/auto_turf/snow/layer3, -/area/shiva/exterior/cp_lz2) +"buP" = ( +/obj/structure/platform_decoration/stone/strata, +/turf/open/auto_turf/snow/layer4, +/area/shiva/exterior/junkyard/cp_bar) "bvC" = ( /obj/structure/surface/table, /obj/item/inflatable, @@ -6012,17 +5809,6 @@ /obj/item/stack/sheet/wood, /turf/open/floor/shiva/floor3, /area/shiva/interior/bar) -"bwk" = ( -/obj/structure/platform/shiva/catwalk{ - dir = 1 - }, -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_ew_full_cap"; - layer = 3.5 - }, -/turf/open/floor/plating, -/area/shiva/interior/aerodrome) "bws" = ( /obj/structure/surface/rack, /obj/item/fuel_cell, @@ -6081,12 +5867,6 @@ }, /turf/open/floor/shiva/north, /area/shiva/exterior/cp_colony_grounds) -"bzh" = ( -/obj/structure/platform_decoration/shiva/catwalk{ - dir = 4 - }, -/turf/open/floor/shiva/floor3, -/area/shiva/interior/aerodrome) "bzK" = ( /obj/effect/landmark/hunter_secondary, /turf/open/auto_turf/snow/layer0, @@ -6115,16 +5895,16 @@ }, /turf/open/floor/plating, /area/shiva/interior/colony/n_admin) -"bAX" = ( -/obj/structure/platform_decoration/shiva/catwalk{ - dir = 8 - }, -/turf/open/floor/shiva/floor3, -/area/shiva/interior/aerodrome) "bBs" = ( /obj/item/reagent_container/food/drinks/cans/beer, /turf/open/floor/prison/kitchen, /area/shiva/interior/bar) +"bBx" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/auto_turf/snow/layer0, +/area/shiva/interior/colony/research_hab) "bBB" = ( /obj/structure/largecrate/random/barrel, /turf/open/floor/plating, @@ -6163,16 +5943,6 @@ }, /turf/open/floor/shiva/north, /area/shiva/exterior/lz2_fortress) -"bFS" = ( -/obj/structure/platform/shiva/catwalk{ - dir = 1 - }, -/obj/structure/stairs/perspective{ - icon_state = "p_stair_ew_full_cap"; - layer = 3.5 - }, -/turf/open/floor/plating, -/area/shiva/interior/aerodrome) "bGU" = ( /obj/structure/prop/invuln/ice_prefab{ dir = 9 @@ -6193,12 +5963,6 @@ }, /turf/open/floor/shiva/floor3, /area/shiva/interior/bar) -"bHC" = ( -/obj/structure/platform/shiva/catwalk{ - dir = 8 - }, -/turf/open/auto_turf/snow/layer2, -/area/shiva/exterior/junkyard) "bHN" = ( /obj/item/ammo_magazine/rifle/boltaction{ pixel_x = -7; @@ -6209,20 +5973,14 @@ }, /turf/open/floor/shiva/floor3, /area/shiva/exterior/lz2_fortress) -"bHZ" = ( -/obj/structure/platform/strata{ - dir = 8 - }, -/obj/structure/stairs/perspective/ice{ - dir = 1; - icon_state = "p_stair_sn_full_cap" - }, -/turf/open/auto_turf/ice/layer1, -/area/shiva/exterior/cp_lz2) "bIh" = ( /obj/item/device/motiondetector/hacked, /turf/open/floor/shiva, /area/shiva/interior/colony/research_hab) +"bIl" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/shiva/yellow/west, +/area/shiva/interior/colony/research_hab) "bIV" = ( /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/junkyard/cp_bar) @@ -6272,6 +6030,12 @@ }, /turf/open/floor/plating, /area/shiva/interior/colony/central) +"bLV" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W-corner" + }, +/turf/open/floor/plating, +/area/shiva/exterior/southwest_valley) "bMn" = ( /obj/structure/surface/table/woodentable, /obj/item/reagent_container/food/drinks/bottle/holywater, @@ -6349,10 +6113,19 @@ }, /turf/open/floor/plating, /area/shiva/interior/colony/n_admin) +"bRS" = ( +/obj/structure/platform/stone/strata, +/obj/structure/platform/stone/strata/east, +/obj/structure/platform_decoration/stone/strata/east, +/turf/open/auto_turf/ice/layer1, +/area/shiva/interior/oob/dev_room) "bRU" = ( /obj/structure/flora/tree/dead/tree_5, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/junkyard) +"bSu" = ( +/turf/closed/wall/shiva/ice, +/area/shiva/exterior/southwest_valley) "bSB" = ( /obj/structure/prop/invuln{ desc = "big pile energy."; @@ -6367,6 +6140,11 @@ /obj/structure/machinery/colony_floodlight, /turf/open/auto_turf/snow/layer0, /area/shiva/exterior/cp_colony_grounds) +"bSG" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/east, +/turf/open/gm/river, +/area/shiva/exterior/valley) "bTC" = ( /obj/structure/machinery/power/port_gen/pacman, /turf/open/floor/plating/plating_catwalk/shiva, @@ -6415,11 +6193,10 @@ /obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/wood, /area/shiva/interior/colony/medseceng) -"bVS" = ( -/obj/structure/machinery/light/double, -/obj/effect/decal/cleanable/vomit, -/turf/open/floor/plating, -/area/shiva/interior/colony/medseceng) +"bWk" = ( +/obj/structure/platform/stone/strata, +/turf/open/auto_turf/snow/layer1, +/area/shiva/exterior/cp_lz2) "bWB" = ( /obj/structure/surface/rack, /obj/item/tank/emergency_oxygen/double, @@ -6429,6 +6206,15 @@ }, /turf/open/floor/interior/plastic/alt, /area/shiva/interior/warehouse) +"bXc" = ( +/obj/structure/platform/metal/shiva/north, +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_ew_full_cap"; + layer = 3.5 + }, +/turf/open/floor/plating, +/area/shiva/interior/aerodrome) "bXl" = ( /obj/structure/flora/bush/snow{ icon_state = "snowgrassbb_3"; @@ -6531,6 +6317,10 @@ /obj/effect/spawner/random/tool, /turf/open/auto_turf/snow/layer0, /area/shiva/interior/caves/cp_camp) +"cbV" = ( +/obj/vehicle/train/cargo/engine, +/turf/open/floor/plating/plating_catwalk/shiva, +/area/shiva/exterior/southwest_valley) "cbW" = ( /obj/structure/largecrate/random/mini/med, /turf/open/floor/plating, @@ -6594,10 +6384,6 @@ /obj/structure/surface/table/reinforced/prison, /turf/open/floor/shiva/red/north, /area/shiva/interior/colony/medseceng) -"cgR" = ( -/obj/structure/platform_decoration/strata, -/turf/open/auto_turf/snow/layer4, -/area/shiva/exterior/junkyard/cp_bar) "chq" = ( /obj/item/device/analyzer/plant_analyzer, /turf/open/floor/shiva/north, @@ -6605,13 +6391,6 @@ "chU" = ( /turf/open/floor/shiva/multi_tiles/north, /area/shiva/interior/colony/research_hab) -"cid" = ( -/obj/structure/platform/strata{ - dir = 4 - }, -/obj/structure/platform/strata, -/turf/open/gm/river, -/area/shiva/exterior/cp_s_research) "cio" = ( /turf/open/floor/shiva/floor3, /area/shiva/interior/warehouse) @@ -6619,10 +6398,6 @@ /obj/structure/inflatable/popped, /turf/open/auto_turf/ice/layer0, /area/shiva/interior/caves/research_caves) -"cko" = ( -/obj/structure/platform_decoration/strata, -/turf/open/auto_turf/snow/layer1, -/area/shiva/exterior/lz1_valley) "ckH" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/auto_turf/ice/layer1, @@ -6654,10 +6429,6 @@ }, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/junkyard/cp_bar) -"cnk" = ( -/obj/item/stack/sheet/metal, -/turf/open/floor/shiva/wred/east, -/area/shiva/interior/colony/medseceng) "cnt" = ( /obj/structure/largecrate/random/secure, /turf/open/auto_turf/snow/layer2, @@ -6694,6 +6465,14 @@ }, /turf/open/floor/shiva/red/north, /area/shiva/interior/colony/medseceng) +"cpc" = ( +/obj/structure/platform/stone/strata/west, +/turf/open/auto_turf/ice/layer1, +/area/shiva/interior/oob/dev_room) +"cpr" = ( +/obj/structure/platform_decoration/stone/strata/north, +/turf/open/auto_turf/ice/layer1, +/area/shiva/exterior/cp_lz2) "cps" = ( /obj/effect/decal/cleanable/blood{ dir = 4; @@ -6730,6 +6509,10 @@ "crF" = ( /turf/open/floor/plating/plating_catwalk/shiva, /area/shiva/interior/colony/research_hab) +"crJ" = ( +/obj/effect/sentry_landmark/lz_1/bottom_right, +/turf/open/auto_turf/snow/layer0, +/area/shiva/exterior/lz1_valley) "crN" = ( /obj/structure/filingcabinet, /obj/effect/landmark/objective_landmark/far, @@ -6769,6 +6552,10 @@ /obj/structure/machinery/space_heater, /turf/open/floor/plating, /area/shiva/interior/caves/research_caves) +"cux" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/auto_turf/ice/layer0, +/area/shiva/interior/caves/research_caves) "cuJ" = ( /obj/structure/prop/ice_colony/ground_wire{ dir = 1 @@ -6791,6 +6578,25 @@ }, /turf/open/auto_turf/snow/layer4, /area/shiva/exterior/cp_lz2) +"cwx" = ( +/obj/structure/machinery/light/double{ + dir = 1; + pixel_y = 9 + }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/shiva/radiator_tile2, +/area/shiva/interior/colony/medseceng) +"cwz" = ( +/obj/structure/platform_decoration/stone/strata/west, +/turf/open/auto_turf/snow/layer2, +/area/shiva/interior/caves/cp_camp) +"cwG" = ( +/obj/structure/barricade/handrail/strata{ + dir = 8 + }, +/obj/structure/barricade/handrail/strata, +/turf/open/floor/shiva/north, +/area/shiva/interior/colony/central) "cwU" = ( /obj/effect/decal/warning_stripes{ icon_state = "W-corner" @@ -6803,12 +6609,6 @@ "cxr" = ( /turf/open/gm/river/no_overlay, /area/shiva/interior/caves/cp_camp) -"cxJ" = ( -/obj/structure/platform_decoration/strata{ - dir = 4 - }, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/caves/cp_camp) "cyd" = ( /obj/structure/machinery/light/double{ dir = 1; @@ -6890,6 +6690,12 @@ }, /turf/open/auto_turf/ice/layer1, /area/shiva/interior/caves/s_lz2) +"cEf" = ( +/obj/structure/platform/stone/strata/west, +/obj/structure/platform/stone/strata/east, +/obj/structure/platform/stone/strata, +/turf/open/gm/river, +/area/shiva/interior/caves/research_caves) "cEj" = ( /obj/structure/bed/chair/comfy/beige{ dir = 1 @@ -6907,6 +6713,10 @@ }, /turf/open/floor/shiva/floor3, /area/shiva/interior/bar) +"cFJ" = ( +/obj/structure/platform/stone/strata/west, +/turf/open/auto_turf/ice/layer2, +/area/shiva/interior/caves/cp_camp) "cFQ" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 4 @@ -6974,10 +6784,6 @@ }, /turf/closed/wall/shiva/ice, /area/shiva/interior/caves/cp_camp) -"cIV" = ( -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/warehouse/caves) "cIZ" = ( /obj/structure/surface/rack, /obj/item/stack/cable_coil/blue, @@ -6993,15 +6799,6 @@ /obj/structure/surface/table, /turf/open/floor/shiva/yellow/north, /area/shiva/interior/colony/medseceng) -"cJC" = ( -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/caves/cp_camp) -"cKb" = ( -/turf/closed/wall/shiva/prefabricated/reinforced, -/area/shiva/interior/colony/deck) "cKB" = ( /obj/structure/machinery/light/double, /turf/open/floor/shiva/yellowfull/west, @@ -7032,17 +6829,6 @@ }, /turf/open/floor/plating, /area/shiva/interior/colony/central) -"cLQ" = ( -/obj/structure/platform_decoration/strata{ - dir = 8 - }, -/obj/structure/prop/ice_colony/dense/planter_box/hydro{ - density = 0; - pixel_x = -17; - pixel_y = -19 - }, -/turf/open/gm/river/no_overlay, -/area/shiva/interior/caves/cp_camp) "cMr" = ( /obj/structure/flora/tree/dead/tree_6, /turf/open/auto_turf/snow/layer1, @@ -7110,6 +6896,10 @@ /obj/structure/machinery/disposal, /turf/open/floor/shiva/red/northwest, /area/shiva/interior/colony/medseceng) +"cRF" = ( +/obj/structure/platform_decoration/stone/strata, +/turf/open/auto_turf/snow/layer4, +/area/shiva/exterior/cp_lz2) "cRP" = ( /obj/structure/surface/table/woodentable, /turf/open/floor/carpet, @@ -7130,6 +6920,10 @@ /obj/item/clothing/suit/armor/riot/marine, /turf/open/floor/shiva/redfull/west, /area/shiva/interior/colony/research_hab) +"cTe" = ( +/obj/item/lightstick/red/variant, +/turf/open/auto_turf/snow/layer1, +/area/shiva/exterior/southwest_valley) "cTh" = ( /obj/item/lightstick/red/spoke/planted{ pixel_x = 11; @@ -7181,6 +6975,10 @@ }, /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/junkyard) +"cVU" = ( +/obj/structure/platform_decoration/stone/strata, +/turf/open/auto_turf/snow/layer3, +/area/shiva/exterior/cp_lz2) "cWG" = ( /obj/effect/decal/warning_stripes{ icon_state = "S-corner" @@ -7190,6 +6988,14 @@ }, /turf/open/floor/plating, /area/shiva/exterior/valley) +"cWI" = ( +/obj/item/stack/snow{ + pixel_x = 8; + pixel_y = 9 + }, +/obj/item/stack/snow, +/turf/open/auto_turf/snow/layer3, +/area/shiva/exterior/southwest_valley) "cWN" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 4 @@ -7228,15 +7034,6 @@ /obj/structure/prop/ice_colony/surveying_device, /turf/open/auto_turf/snow/layer2, /area/shiva/interior/caves/cp_camp) -"cXU" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/gm/river, -/area/shiva/exterior/cp_s_research) "cYa" = ( /turf/open/floor/shiva/yellow/west, /area/shiva/interior/colony/medseceng) @@ -7320,10 +7117,23 @@ "daD" = ( /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/junkyard/cp_bar) +"daY" = ( +/obj/structure/stairs/perspective/ice{ + dir = 1; + icon_state = "p_stair_full" + }, +/turf/open/auto_turf/snow/layer1, +/area/shiva/exterior/southwest_valley) "dbv" = ( /obj/structure/largecrate/random/case, /turf/open/auto_turf/ice/layer1, -/area/shiva/interior/aerodrome) +/area/shiva/exterior/junkyard/cp_bar) +"dbA" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/east, +/obj/structure/platform/stone/strata/west, +/turf/open/gm/river, +/area/shiva/interior/caves/research_caves) "dbH" = ( /turf/closed/shuttle/ert{ icon_state = "stan1" @@ -7354,6 +7164,11 @@ /obj/structure/flora/tree/dead/tree_4, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_lz2) +"dcD" = ( +/obj/structure/platform_decoration/stone/strata/north, +/obj/structure/platform_decoration/stone/strata, +/turf/open/gm/river, +/area/shiva/interior/warehouse/caves) "dcG" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 1 @@ -7465,6 +7280,10 @@ }, /turf/open/floor/plating/plating_catwalk/shiva, /area/shiva/exterior/lz2_fortress) +"dkY" = ( +/obj/effect/sentry_landmark/lz_2/top_left, +/turf/open/floor/shiva/north, +/area/shiva/exterior/lz2_fortress) "dlk" = ( /obj/effect/decal/warning_stripes{ icon_state = "E-corner" @@ -7534,17 +7353,6 @@ /obj/item/device/flashlight/lamp, /turf/open/floor/carpet, /area/shiva/interior/colony/central) -"dro" = ( -/obj/structure/platform/strata, -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/auto_turf/snow/layer1, -/area/shiva/exterior/cp_s_research) -"drx" = ( -/obj/structure/bed/chair/comfy/black{ - dir = 4 - }, -/turf/open/floor/shiva/multi_tiles/north, -/area/shiva/interior/colony/research_hab) "drM" = ( /obj/effect/spawner/random/toolbox, /obj/structure/surface/rack, @@ -7608,6 +7416,10 @@ }, /turf/open/auto_turf/snow/layer2, /area/shiva/interior/colony/central) +"dvw" = ( +/obj/structure/flora/tree/dead/tree_1, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/southwest_valley) "dwf" = ( /obj/item/clothing/shoes/snow, /obj/structure/surface/rack, @@ -7645,12 +7457,27 @@ }, /turf/open/auto_turf/snow/layer0, /area/shiva/exterior/junkyard) +"dzm" = ( +/obj/structure/platform/stone/strata, +/obj/structure/platform/stone/strata/west, +/obj/structure/platform_decoration/stone/strata/west, +/turf/open/auto_turf/ice/layer1, +/area/shiva/interior/oob/dev_room) "dzn" = ( /obj/effect/decal/warning_stripes{ icon_state = "E-corner" }, /turf/open/auto_turf/snow/layer0, /area/shiva/exterior/junkyard) +"dzC" = ( +/obj/structure/platform_decoration/stone/strata/east, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/lz1_valley) +"dAg" = ( +/obj/structure/platform/stone/strata/west, +/obj/structure/platform/stone/strata, +/turf/open/auto_turf/ice/layer1, +/area/shiva/interior/oob/dev_room) "dAi" = ( /obj/structure/machinery/cm_vending/sorted/boozeomat/chess, /turf/open/floor/shiva/snow_mat/north, @@ -7677,6 +7504,10 @@ /obj/structure/cargo_container/horizontal/blue/bottom, /turf/open/floor/shiva/floor3, /area/shiva/interior/bar) +"dCB" = ( +/obj/item/lightstick/red/variant/planted, +/turf/open/auto_turf/snow/layer3, +/area/shiva/exterior/southwest_valley) "dCS" = ( /turf/closed/shuttle/ert{ icon_state = "stan2" @@ -7690,6 +7521,15 @@ /obj/structure/machinery/landinglight/ds1/spoke, /turf/open/floor/shiva/multi_tiles/southeast, /area/shiva/interior/colony/botany) +"dDy" = ( +/obj/structure/platform/stone/strata/east, +/obj/structure/platform/stone/strata/west, +/turf/open/auto_turf/ice/layer1, +/area/shiva/interior/oob/dev_room) +"dEh" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/shiva/redfull/west, +/area/shiva/interior/colony/medseceng) "dEH" = ( /obj/structure/surface/rack, /obj/item/storage/toolbox/electrical, @@ -7707,6 +7547,10 @@ /obj/effect/landmark/crap_item, /turf/open/floor/shiva/north, /area/shiva/interior/colony/central) +"dIE" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/auto_turf/ice/layer2, +/area/shiva/interior/caves/research_caves) "dIF" = ( /obj/structure/machinery/photocopier, /turf/open/floor/shiva/wred/east, @@ -7719,6 +7563,9 @@ /obj/item/powerloader_clamp, /turf/open/auto_turf/ice/layer1, /area/shiva/interior/colony/research_hab) +"dKD" = ( +/turf/open/auto_turf/snow/layer4, +/area/shiva/exterior/southwest_valley) "dKL" = ( /obj/structure/flora/bush/snow{ icon_state = "snowgrassbb_1" @@ -7765,10 +7612,7 @@ dir = 8 }, /turf/open/floor/strata/floor3/east, -/area/shiva/interior/colony/deck) -"dOf" = ( -/turf/open/floor/shiva/yellowcorners/east, -/area/shiva/interior/colony/deck) +/area/shiva/interior/colony/central) "dOo" = ( /obj/structure/machinery/door_control/brbutton{ id = "nlz_shutters"; @@ -7829,6 +7673,13 @@ /obj/structure/fence, /turf/open/auto_turf/snow/layer3, /area/shiva/interior/caves/cp_camp) +"dSn" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/shiva/west, +/turf/open/floor/plating, +/area/shiva/interior/colony/central) "dTj" = ( /obj/structure/machinery/space_heater, /turf/open/floor/shiva, @@ -7891,6 +7742,10 @@ "dXp" = ( /turf/open/floor/shiva/radiator_tile, /area/shiva/interior/bar) +"dYh" = ( +/obj/structure/platform_decoration/stone/strata/west, +/turf/open/gm/river/no_overlay, +/area/shiva/interior/caves/cp_camp) "dYi" = ( /obj/item/lightstick/red/spoke/planted{ pixel_x = 12; @@ -7944,6 +7799,10 @@ }, /turf/closed/wall/shiva/ice, /area/shiva/interior/caves/s_lz2) +"ean" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/auto_turf/ice/layer1, +/area/shiva/interior/caves/research_caves) "eaz" = ( /obj/structure/surface/table, /obj/item/stock_parts/matter_bin/adv{ @@ -7998,16 +7857,14 @@ /obj/effect/landmark/hunter_primary, /turf/open/floor/shiva/wredfull, /area/shiva/interior/colony/medseceng) -"eeD" = ( -/obj/structure/platform_decoration/strata{ - dir = 1 - }, -/turf/open/auto_turf/ice/layer2, -/area/shiva/interior/caves/cp_camp) "efD" = ( /obj/structure/largecrate/random/barrel/white, /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/junkyard) +"efO" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/auto_turf/ice/layer1, +/area/shiva/interior/caves/research_caves) "egf" = ( /obj/structure/machinery/door/airlock/almayer/medical/colony{ name = "\improper Underground Sports Center" @@ -8026,12 +7883,10 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/closed/wall/shiva/prefabricated/blue, /area/shiva/interior/colony/research_hab) -"ehV" = ( -/obj/structure/platform/shiva/catwalk{ - dir = 1 - }, +"ehU" = ( +/obj/structure/platform/stone/strata, /turf/open/auto_turf/snow/layer2, -/area/shiva/exterior/junkyard) +/area/shiva/interior/caves/cp_camp) "eit" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/auto_turf/ice/layer1, @@ -8053,6 +7908,14 @@ /obj/item/lightstick/planted, /turf/open/auto_turf/snow/layer0, /area/shiva/exterior/cp_colony_grounds) +"ekw" = ( +/obj/structure/platform/stone/strata/east, +/obj/structure/stairs/perspective/ice{ + dir = 8; + icon_state = "p_stair_sn_full_cap" + }, +/turf/open/auto_turf/ice/layer1, +/area/shiva/exterior/cp_lz2) "ekH" = ( /obj/structure/largecrate/random/case/double, /turf/open/auto_turf/snow/layer2, @@ -8183,13 +8046,6 @@ }, /turf/open/floor/plating, /area/shiva/interior/colony/central) -"etl" = ( -/obj/structure/largecrate/random/secure, -/obj/item/ashtray/bronze{ - pixel_y = 7 - }, -/turf/open/auto_turf/snow/layer2, -/area/shiva/exterior/junkyard) "etm" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited{ pixel_y = 28 @@ -8243,12 +8099,6 @@ "exX" = ( /turf/open/floor/shiva/bluefull/west, /area/shiva/interior/warehouse) -"eyx" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/auto_turf/snow/layer1, -/area/shiva/exterior/junkyard) "eAZ" = ( /turf/open/auto_turf/snow/layer2, /area/shiva/interior/colony/medseceng) @@ -8267,10 +8117,6 @@ }, /turf/open/floor/shiva/purplefull/west, /area/shiva/interior/lz2_habs) -"eBG" = ( -/obj/structure/barricade/wooden, -/turf/open/floor/plating, -/area/shiva/interior/colony/research_hab) "eBU" = ( /obj/effect/landmark/survivor_spawner, /turf/open/floor/shiva/north, @@ -8293,10 +8139,18 @@ /obj/item/reagent_container/food/condiment/coldsauce, /turf/open/floor/prison/kitchen, /area/shiva/interior/bar) +"eCo" = ( +/obj/structure/platform/stone/strata, +/turf/open/auto_turf/snow/layer3, +/area/shiva/exterior/cp_lz2) "eCr" = ( /obj/structure/flora/tree/dead/tree_3, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_lz2) +"eDi" = ( +/obj/structure/platform/stone/strata, +/turf/open/auto_turf/snow/layer4, +/area/shiva/interior/caves/cp_camp) "eET" = ( /turf/open/auto_turf/ice/layer0, /area/shiva/interior/caves/s_lz2) @@ -8326,13 +8180,6 @@ /obj/item/tool/warning_cone, /turf/open/floor/shiva/floor3, /area/shiva/interior/colony/research_hab) -"eGq" = ( -/obj/structure/platform/strata, -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/oob/dev_room) "eGs" = ( /obj/item/frame/bucket_sensor, /turf/open/floor/shiva, @@ -8402,6 +8249,10 @@ /obj/effect/landmark/crap_item, /turf/open/floor/shiva/north, /area/shiva/interior/colony/central) +"eLT" = ( +/obj/structure/platform_decoration/stone/strata/east, +/turf/open/auto_turf/ice/layer0, +/area/shiva/interior/caves/cp_camp) "eMh" = ( /obj/structure/prop/ice_colony/flamingo{ dir = 9 @@ -8422,6 +8273,16 @@ /obj/item/tool/kitchen/knife/butcher, /turf/open/floor/prison/kitchen, /area/shiva/interior/bar) +"eNI" = ( +/obj/structure/platform/metal/shiva, +/turf/open/auto_turf/snow/layer1, +/area/shiva/exterior/junkyard/fortbiceps) +"eOF" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "gib6" + }, +/turf/open/floor/plating, +/area/shiva/interior/colony/central) "eOG" = ( /obj/structure/closet/secure_closet/guncabinet, /obj/structure/machinery/light/double{ @@ -8464,6 +8325,11 @@ /obj/item/reagent_container/food/drinks/bottle/vodka/chess/w_rook, /turf/open/floor/shiva/radiator_tile, /area/shiva/exterior/cp_lz2) +"eQr" = ( +/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, +/obj/effect/sentry_landmark/lz_2/bottom_right, +/turf/open/floor/shiva/north, +/area/shiva/exterior/lz2_fortress) "eRk" = ( /obj/structure/barricade/sandbags/wired{ dir = 8; @@ -8491,6 +8357,10 @@ }, /turf/open/auto_turf/snow/layer1, /area/shiva/interior/caves/cp_camp) +"eSo" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/auto_turf/ice/layer1, +/area/shiva/interior/colony/research_hab) "eSt" = ( /obj/effect/landmark/xeno_spawn, /turf/open/floor/shiva/multi_tiles/east, @@ -8499,10 +8369,6 @@ /obj/item/lightstick/red/spoke/planted, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_colony_grounds) -"eSN" = ( -/obj/vehicle/train/cargo/engine, -/turf/open/floor/plating/plating_catwalk/shiva, -/area/shiva/exterior/junkyard) "eTV" = ( /obj/structure/flora/bush/ausbushes/lavendergrass{ icon_state = "lavendergrass_2" @@ -8551,6 +8417,10 @@ "eWB" = ( /turf/open/floor/plating, /area/shiva/interior/garage) +"eWF" = ( +/obj/structure/flora/bush/ausbushes/lavendergrass, +/turf/open/auto_turf/snow/layer3, +/area/shiva/exterior/southwest_valley) "eXL" = ( /obj/structure/surface/table, /obj/item/stack/cable_coil, @@ -8622,6 +8492,10 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/shiva/floor3, /area/shiva/interior/colony/central) +"fcx" = ( +/obj/item/weapon/baseballbat/metal, +/turf/open/floor/shiva/floor3, +/area/shiva/interior/aerodrome) "fcy" = ( /obj/structure/prop/ice_colony/dense/planter_box{ dir = 9 @@ -8635,6 +8509,10 @@ "fcL" = ( /turf/open/floor/shiva/snow_mat, /area/shiva/exterior/cp_colony_grounds) +"fdo" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/plating, +/area/shiva/interior/colony/research_hab) "fel" = ( /obj/structure/machinery/light/double{ dir = 8; @@ -8677,6 +8555,10 @@ /obj/effect/landmark/xeno_spawn, /turf/open/floor/shiva/multi_tiles, /area/shiva/interior/colony/research_hab) +"fgj" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/shiva/redfull, +/area/shiva/interior/colony/medseceng) "fgB" = ( /obj/item/stack/sheet/metal, /obj/effect/decal/cleanable/dirt, @@ -8785,6 +8667,10 @@ }, /turf/open/floor/shiva/north, /area/shiva/interior/lz2_habs) +"fkR" = ( +/obj/structure/platform/stone/strata/east, +/turf/open/auto_turf/snow/layer3, +/area/shiva/exterior/cp_lz2) "flN" = ( /turf/open/auto_turf/ice/layer1, /area/shiva/interior/colony/research_hab) @@ -8801,13 +8687,6 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/floor/wood, /area/shiva/interior/colony/botany) -"fmo" = ( -/obj/structure/platform/strata{ - dir = 4 - }, -/obj/structure/platform/strata, -/turf/open/gm/river, -/area/shiva/interior/caves/research_caves) "fnw" = ( /obj/structure/stairs/perspective/ice{ dir = 1; @@ -8828,10 +8707,6 @@ /obj/item/storage/toolbox/electrical, /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/junkyard/fortbiceps) -"foc" = ( -/obj/structure/platform_decoration/shiva/catwalk, -/turf/open/auto_turf/snow/layer3, -/area/shiva/exterior/valley) "fof" = ( /obj/structure/prop/invuln{ desc = "The mounting points are ground down from heavy use. They'll need some maintenance work before they can be used again."; @@ -8842,13 +8717,10 @@ /obj/item/storage/firstaid/fire, /turf/open/shuttle/can_surgery/black, /area/shiva/interior/aerodrome) -"fpF" = ( -/obj/structure/stairs/perspective/ice{ - dir = 8; - icon_state = "p_stair_sn_full_cap" - }, -/turf/open/auto_turf/snow/layer1, -/area/shiva/interior/warehouse/caves) +"fpp" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/auto_turf/ice/layer0, +/area/shiva/interior/caves/medseceng_caves) "fqJ" = ( /obj/structure/bed/chair/office/dark{ dir = 1 @@ -8906,6 +8778,14 @@ }, /turf/open/auto_turf/snow/layer0, /area/shiva/interior/caves/cp_camp) +"fvf" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/shiva/west, +/turf/open/floor/plating, +/area/shiva/interior/aerodrome) "fwv" = ( /obj/structure/bed/chair/comfy/beige{ dir = 4 @@ -8998,16 +8878,16 @@ /obj/structure/bed/chair, /turf/open/floor/shiva/red/north, /area/shiva/interior/colony/medseceng) -"fCs" = ( -/obj/structure/flora/grass/tallgrass/ice, -/turf/open/auto_turf/snow/layer2, -/area/shiva/exterior/junkyard) "fDd" = ( /obj/structure/surface/table, /obj/item/storage/box/donkpockets, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/shiva/north, /area/shiva/interior/colony/botany) +"fDx" = ( +/obj/effect/sentry_landmark/lz_1/bottom_left, +/turf/open/auto_turf/snow/layer0, +/area/shiva/exterior/lz1_valley) "fDH" = ( /obj/structure/machinery/colony_floodlight, /turf/open/auto_turf/snow/layer0, @@ -9016,12 +8896,6 @@ /obj/structure/machinery/vending/snack, /turf/open/floor/shiva/red/southeast, /area/shiva/interior/colony/medseceng) -"fEl" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/caves/cp_camp) "fEC" = ( /obj/structure/window/framed/shiva, /turf/open/floor/shiva, @@ -9180,15 +9054,6 @@ /obj/structure/machinery/light/double, /turf/open/floor/shiva/floor3, /area/shiva/interior/colony/central) -"fLi" = ( -/obj/item/tool/shovel/snow, -/obj/item/storage/fancy/cigarettes/arcturian_ace{ - layer = 3.1; - pixel_x = -8; - pixel_y = 23 - }, -/turf/open/auto_turf/snow/layer2, -/area/shiva/exterior/junkyard) "fLk" = ( /obj/item/clothing/shoes/snow, /obj/structure/surface/rack, @@ -9239,15 +9104,10 @@ /obj/structure/bed/chair/office/dark, /turf/open/floor/carpet, /area/shiva/interior/colony/medseceng) -"fNf" = ( -/obj/structure/platform/strata{ - dir = 8 - }, -/obj/structure/platform/strata{ - dir = 1 - }, -/turf/open/gm/river, -/area/shiva/interior/warehouse/caves) +"fNz" = ( +/obj/structure/platform_decoration/metal/shiva/east, +/turf/open/auto_turf/snow/layer1, +/area/shiva/exterior/southwest_valley) "fNE" = ( /obj/structure/window/framed/shiva, /turf/open/floor/plating, @@ -9441,6 +9301,12 @@ /obj/structure/machinery/smartfridge, /turf/open/floor/prison/kitchen, /area/shiva/interior/colony/central) +"gci" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata, +/obj/structure/platform/stone/strata/east, +/turf/open/gm/river/no_overlay, +/area/shiva/interior/caves/cp_camp) "gcF" = ( /obj/structure/closet/coffin, /obj/effect/landmark/objective_landmark/far, @@ -9466,6 +9332,10 @@ /obj/effect/decal/cleanable/blood/gibs/xeno/up, /turf/open/floor/shiva/bluefull, /area/shiva/interior/colony/central) +"gdI" = ( +/obj/item/lightstick/red/variant/planted, +/turf/open/auto_turf/snow/layer1, +/area/shiva/exterior/southwest_valley) "gdU" = ( /obj/structure/barricade/wooden{ dir = 4; @@ -9486,6 +9356,12 @@ "geE" = ( /turf/closed/wall/shiva/prefabricated, /area/shiva/exterior/junkyard) +"geQ" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/auto_turf/snow/layer1, +/area/shiva/exterior/southwest_valley) "geS" = ( /obj/structure/machinery/iv_drip, /turf/open/floor/shiva/wred/northwest, @@ -9534,9 +9410,6 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/floor/shiva/redfull/west, /area/shiva/interior/colony/research_hab) -"gik" = ( -/turf/open/auto_turf/snow/layer0, -/area/shiva/interior/aerodrome) "giH" = ( /obj/structure/machinery/door/airlock/almayer/security/glass/colony, /turf/open/floor/plating, @@ -9558,12 +9431,6 @@ "gkv" = ( /turf/open/auto_turf/ice/layer1, /area/shiva/interior/caves/right_spiders) -"gkG" = ( -/obj/structure/platform_decoration/shiva/catwalk{ - dir = 4 - }, -/turf/open/auto_turf/snow/layer0, -/area/shiva/exterior/cp_colony_grounds) "gkK" = ( /obj/structure/machinery/landinglight/ds2/delaythree, /turf/open/floor/shiva/floor3, @@ -9584,19 +9451,11 @@ /obj/item/device/flashlight, /turf/open/auto_turf/ice/layer1, /area/shiva/interior/caves/s_lz2) -"gmV" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/shiva/floor3, -/area/shiva/interior/colony/research_hab) "gnZ" = ( /turf/closed/shuttle/elevator{ dir = 8 }, /area/shiva/interior/colony/central) -"goe" = ( -/turf/open/auto_turf/ice/layer2, -/area/shiva/interior/aerodrome) "goh" = ( /obj/effect/decal/cleanable/blood{ icon_state = "gib6" @@ -9607,6 +9466,11 @@ "goj" = ( /turf/open/floor/shiva/yellowfull, /area/shiva/interior/colony/research_hab) +"goC" = ( +/obj/structure/platform/stone/strata/west, +/obj/structure/platform/stone/strata, +/turf/open/gm/river, +/area/shiva/interior/caves/research_caves) "goS" = ( /obj/structure/flora/bush/ausbushes/lavendergrass{ icon_state = "lavendergrass_2" @@ -9677,20 +9541,6 @@ /obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/shiva/north, /area/shiva/interior/caves/s_lz2) -"grk" = ( -/obj/structure/platform/strata{ - dir = 8 - }, -/obj/structure/stairs/perspective/ice{ - dir = 1; - icon_state = "p_stair_sn_full_cap" - }, -/turf/open/auto_turf/snow/layer0, -/area/shiva/interior/warehouse/caves) -"gso" = ( -/obj/structure/platform/strata, -/turf/open/gm/river, -/area/shiva/interior/caves/cp_camp) "gss" = ( /turf/closed/wall/shiva/ice, /area/shiva/exterior/junkyard) @@ -9789,12 +9639,6 @@ /obj/effect/landmark/hunter_secondary, /turf/open/auto_turf/ice/layer1, /area/shiva/exterior/valley) -"gzb" = ( -/obj/structure/flora/grass/tallgrass/ice/corner{ - dir = 6 - }, -/turf/open/auto_turf/snow/layer2, -/area/shiva/exterior/junkyard) "gzc" = ( /obj/structure/machinery/portable_atmospherics/powered/scrubber{ icon_state = "psiphon:1" @@ -9836,6 +9680,11 @@ }, /turf/open/floor/plating, /area/shiva/interior/colony/botany) +"gCe" = ( +/obj/item/ammo_magazine/rifle/m41aMK1, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/shiva, +/area/shiva/interior/colony/research_hab) "gCx" = ( /obj/structure/machinery/landinglight/ds1/spoke, /turf/open/auto_turf/snow/layer1, @@ -9845,21 +9694,14 @@ /obj/item/device/flashlight, /turf/open/floor/shiva/yellow/southeast, /area/shiva/interior/garage) -"gCL" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/blood/drip, -/turf/open/floor/shiva, -/area/shiva/interior/colony/research_hab) -"gCW" = ( -/obj/structure/platform/shiva/catwalk{ - dir = 8 - }, -/turf/open/auto_turf/snow/layer3, -/area/shiva/exterior/cp_colony_grounds) "gDz" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/shiva/snow_mat, /area/shiva/interior/colony/botany) +"gEh" = ( +/obj/structure/platform/stone/strata/north, +/turf/open/auto_turf/ice/layer2, +/area/shiva/interior/caves/cp_camp) "gEk" = ( /obj/structure/prop/invuln/ice_prefab/roof_greeble{ icon_state = "vent4"; @@ -9904,6 +9746,10 @@ /obj/item/ammo_magazine/rifle/m41aMK1, /turf/open/floor/shiva, /area/shiva/interior/colony/research_hab) +"gGq" = ( +/obj/item/lightstick/red/variant/planted, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/southwest_valley) "gGB" = ( /obj/effect/decal/cleanable/blood{ icon_state = "xgibdown1" @@ -9987,6 +9833,9 @@ /obj/item/trash/cigbutt, /turf/open/floor/shiva/floor3, /area/shiva/interior/colony/research_hab) +"gKF" = ( +/turf/open/auto_turf/ice/layer1, +/area/shiva/exterior/southwest_valley) "gKQ" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -10019,12 +9868,6 @@ "gNF" = ( /turf/open/floor/shiva/multi_tiles/west, /area/shiva/interior/colony/central) -"gNJ" = ( -/obj/structure/platform/shiva/catwalk{ - dir = 1 - }, -/turf/open/auto_turf/snow/layer2, -/area/shiva/exterior/valley) "gNM" = ( /obj/item/lightstick/red/spoke/planted{ layer = 2.99; @@ -10081,16 +9924,6 @@ dir = 10 }, /area/shiva/interior/aerodrome) -"gQK" = ( -/obj/structure/platform/strata{ - dir = 8 - }, -/obj/structure/platform/strata{ - dir = 4 - }, -/obj/structure/platform/strata, -/turf/open/gm/river, -/area/shiva/interior/caves/research_caves) "gQL" = ( /obj/structure/closet/cabinet, /obj/item/clothing/under/darkred, @@ -10146,6 +9979,13 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/shiva/north, /area/shiva/interior/colony/n_admin) +"gSe" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "gib6"; + pixel_y = -8 + }, +/turf/open/floor/shiva, +/area/shiva/interior/aerodrome) "gSG" = ( /obj/effect/decal/cleanable/blood/drip, /obj/effect/landmark/objective_landmark/close, @@ -10188,10 +10028,17 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/shiva/green/northwest, /area/shiva/interior/colony/botany) +"gWc" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/plating, +/area/shiva/interior/caves/research_caves) "gWk" = ( /obj/structure/window/framed/shiva, /turf/open/floor/plating, /area/shiva/interior/bar) +"gWx" = ( +/turf/closed/wall/shiva/prefabricated/reinforced, +/area/shiva/exterior/southwest_valley) "gWF" = ( /obj/structure/machinery/light/double{ dir = 1; @@ -10227,6 +10074,14 @@ /obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/layer0, /area/shiva/exterior/cp_colony_grounds) +"gYQ" = ( +/obj/structure/platform/metal/shiva/north, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_ew_full_cap"; + layer = 3.5 + }, +/turf/open/floor/plating, +/area/shiva/interior/aerodrome) "gZi" = ( /obj/structure/closet/toolcloset, /turf/open/auto_turf/snow/layer3, @@ -10235,6 +10090,10 @@ /obj/effect/landmark/hunter_primary, /turf/open/auto_turf/ice/layer1, /area/shiva/interior/caves/cp_camp) +"gZn" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/auto_turf/snow/layer1, +/area/shiva/exterior/southwest_valley) "gZG" = ( /obj/structure/machinery/door/airlock/almayer/medical/colony{ dir = 2; @@ -10254,17 +10113,6 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/shiva/north, /area/shiva/interior/colony/central) -"hbo" = ( -/obj/structure/platform/strata, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/oob/dev_room) -"hbp" = ( -/obj/structure/stairs/perspective/ice{ - dir = 1; - icon_state = "p_stair_full" - }, -/turf/open/auto_turf/snow/layer4, -/area/shiva/exterior/junkyard) "hbu" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/snacks/flour{ @@ -10282,12 +10130,23 @@ }, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/lz1_valley) +"hbY" = ( +/turf/open/auto_turf/snow/layer0, +/area/shiva/exterior/southwest_valley) +"hcE" = ( +/obj/structure/platform/metal/shiva/east, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/valley) "hcH" = ( /turf/closed/wall/shiva/prefabricated/reinforced, /area/shiva/interior/bar) "hcJ" = ( /turf/closed/wall/shiva/prefabricated/reinforced/hull, /area/shiva/interior/telecomm/lz1_biceps) +"hdF" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/shiva/redfull, +/area/shiva/interior/colony/medseceng) "hfm" = ( /obj/item/paper/research_notes/good, /turf/open/floor/shiva/floor3, @@ -10303,6 +10162,12 @@ /obj/structure/surface/table, /turf/open/floor/shiva/wred/west, /area/shiva/interior/colony/medseceng) +"hfT" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/east, +/obj/structure/platform_decoration/stone/strata/north, +/turf/open/auto_turf/ice/layer1, +/area/shiva/interior/oob/dev_room) "hgI" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, /turf/open/auto_turf/snow/layer2, @@ -10313,18 +10178,6 @@ /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/plating/plating_catwalk/shiva, /area/shiva/interior/telecomm/lz1_biceps) -"hhT" = ( -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/auto_turf/snow/layer3, -/area/shiva/exterior/lz1_valley) -"hic" = ( -/obj/structure/platform_decoration/strata{ - dir = 4 - }, -/turf/open/auto_turf/snow/layer2, -/area/shiva/exterior/lz1_valley) "hif" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -10338,13 +10191,11 @@ /obj/structure/machinery/disposal, /turf/open/floor/wood, /area/shiva/interior/colony/central) -"hip" = ( -/obj/structure/platform/strata, -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/gm/river, -/area/shiva/interior/warehouse/caves) +"hit" = ( +/obj/structure/platform/stone/strata, +/obj/item/lightstick/variant/planted, +/turf/open/auto_turf/ice/layer1, +/area/shiva/exterior/cp_lz2) "hju" = ( /turf/open/floor/shiva/multi_tiles/west, /area/shiva/interior/colony/botany) @@ -10352,6 +10203,14 @@ /obj/item/stack/sheet/metal, /turf/open/floor/shiva/north, /area/shiva/exterior/lz2_fortress) +"hkp" = ( +/obj/structure/platform/metal/shiva/east, +/obj/structure/prop/ice_colony/dense/planter_box/hydro{ + pixel_x = -17; + pixel_y = -19 + }, +/turf/open/gm/river/no_overlay, +/area/shiva/interior/colony/central) "hkC" = ( /obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/layer2, @@ -10382,11 +10241,6 @@ /obj/effect/decal/cleanable/ash, /turf/open/floor/shiva/north, /area/shiva/exterior/lz2_fortress) -"hmo" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/weapon/gun/rifle/m41a, -/turf/open/asphalt/cement, -/area/shiva/interior/warehouse) "hms" = ( /turf/open/floor/shiva/wred/east, /area/shiva/interior/colony/medseceng) @@ -10455,16 +10309,6 @@ }, /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/junkyard) -"hpn" = ( -/obj/structure/platform/shiva/catwalk{ - dir = 4 - }, -/obj/structure/prop/ice_colony/dense/planter_box/hydro{ - pixel_x = -17; - pixel_y = -19 - }, -/turf/open/gm/river/no_overlay, -/area/shiva/interior/colony/central) "hpN" = ( /obj/structure/machinery/landinglight/ds2/delayone{ dir = 4 @@ -10505,6 +10349,10 @@ }, /turf/open/floor/shiva/wredfull, /area/shiva/interior/colony/medseceng) +"hst" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/shiva/wred/southeast, +/area/shiva/interior/colony/medseceng) "hsw" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/circuitboard, @@ -10554,6 +10402,16 @@ /obj/structure/flora/tree/dead/tree_3, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_s_research) +"hvd" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/shiva/radiator_tile2, +/area/shiva/interior/colony/medseceng) +"hvH" = ( +/obj/structure/flora/bush/snow{ + icon_state = "snowgrassbb_1" + }, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/southwest_valley) "hvZ" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ id = "hangar_ice_3"; @@ -10591,15 +10449,6 @@ /obj/structure/flora/tree/dead/tree_2, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_s_research) -"hye" = ( -/obj/structure/prop/ice_colony/flamingo{ - dir = 1 - }, -/obj/structure/platform_decoration/shiva/catwalk{ - dir = 8 - }, -/turf/open/auto_turf/snow/layer2, -/area/shiva/exterior/junkyard) "hyu" = ( /turf/open/floor/shiva/bluefull, /area/shiva/interior/colony/s_admin) @@ -10623,6 +10472,11 @@ }, /turf/open/floor/shiva/multi_tiles, /area/shiva/interior/colony/research_hab) +"hzk" = ( +/obj/structure/platform/stone/strata, +/obj/structure/platform/stone/strata/west, +/turf/open/gm/river, +/area/shiva/interior/warehouse/caves) "hzJ" = ( /turf/closed/wall/shiva/prefabricated/reinforced, /area/shiva/exterior/lz1_valley) @@ -10679,6 +10533,12 @@ }, /turf/open/floor/shiva/north, /area/shiva/interior/colony/s_admin) +"hCE" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/west, +/obj/structure/platform_decoration/stone/strata, +/turf/open/auto_turf/ice/layer1, +/area/shiva/interior/oob/dev_room) "hCX" = ( /obj/item/storage/box/donkpockets, /obj/structure/surface/table/reinforced/prison, @@ -10734,25 +10594,6 @@ /obj/item/reagent_container/food/drinks/bottle/vodka/chess/b_rook, /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/cp_lz2) -"hDW" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform/shiva/catwalk{ - dir = 4 - }, -/turf/open/floor/plating, -/area/shiva/interior/aerodrome) -"hEa" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform/shiva/catwalk{ - dir = 4 - }, -/turf/open/floor/plating, -/area/shiva/interior/colony/deck) "hEx" = ( /obj/item/lightstick/red/spoke/planted{ pixel_x = 12; @@ -10776,6 +10617,10 @@ "hFj" = ( /turf/open/auto_turf/snow/layer4, /area/shiva/exterior/junkyard/fortbiceps) +"hFk" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/shiva/yellowfull, +/area/shiva/interior/colony/research_hab) "hFl" = ( /turf/open/auto_turf/ice/layer0, /area/shiva/interior/oob/dev_room) @@ -10807,15 +10652,6 @@ }, /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/junkyard/fortbiceps) -"hHR" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W-corner" - }, -/obj/structure/barricade/metal{ - dir = 4 - }, -/turf/open/floor/plating, -/area/shiva/exterior/junkyard) "hHV" = ( /obj/structure/surface/table, /obj/structure/machinery/cell_charger, @@ -10849,6 +10685,13 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/shiva/north, /area/shiva/interior/garage) +"hII" = ( +/obj/structure/platform/stone/strata, +/obj/structure/barricade/handrail/wire{ + layer = 3.5 + }, +/turf/open/gm/river/no_overlay, +/area/shiva/interior/caves/cp_camp) "hIM" = ( /obj/structure/flora/tree/dead/tree_4, /turf/open/auto_turf/snow/layer3, @@ -10890,10 +10733,19 @@ }, /turf/open/floor/shiva/wred/east, /area/shiva/interior/colony/medseceng) +"hMs" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/east, +/turf/open/gm/river/no_overlay, +/area/shiva/interior/caves/cp_camp) "hMY" = ( /obj/structure/machinery/vending/cigarette/colony, /turf/open/floor/shiva/multi_tiles, /area/shiva/interior/colony/research_hab) +"hPe" = ( +/obj/structure/platform_decoration/metal/shiva/west, +/turf/open/floor/shiva/floor3, +/area/shiva/interior/aerodrome) "hPp" = ( /turf/closed/wall/shiva/prefabricated/orange, /area/shiva/interior/caves/cp_camp) @@ -10993,6 +10845,10 @@ }, /turf/open/floor/shiva/floor3, /area/shiva/interior/colony/research_hab) +"hTd" = ( +/obj/structure/platform/metal/shiva/west, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/valley) "hTk" = ( /obj/structure/bookcase/manuals/medical, /obj/structure/machinery/light/double{ @@ -11038,6 +10894,11 @@ }, /turf/open/floor/wood, /area/shiva/interior/colony/medseceng) +"hUS" = ( +/obj/item/stack/sheet/metal, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/shiva/wredfull, +/area/shiva/interior/colony/medseceng) "hVs" = ( /obj/structure/surface/table, /obj/item/evidencebag{ @@ -11045,9 +10906,6 @@ }, /turf/open/floor/shiva, /area/shiva/interior/colony/research_hab) -"hWh" = ( -/turf/open/floor/shiva/floor3, -/area/shiva/interior/colony/deck) "hWK" = ( /obj/structure/prop/ice_colony/dense/planter_box{ dir = 1 @@ -11069,6 +10927,10 @@ /obj/structure/flora/grass/tallgrass/ice, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/lz1_valley) +"hXE" = ( +/obj/structure/platform/stone/strata/north, +/turf/open/auto_turf/snow/layer3, +/area/shiva/exterior/cp_lz2) "hXH" = ( /obj/structure/prop/ice_colony/ground_wire{ dir = 8 @@ -11129,6 +10991,11 @@ /obj/structure/bed/chair/comfy/beige, /turf/open/floor/shiva, /area/shiva/interior/colony/research_hab) +"iaP" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/east, +/turf/open/gm/river, +/area/shiva/interior/caves/cp_camp) "ibN" = ( /obj/structure/machinery/light/double, /turf/open/floor/shiva/north, @@ -11141,19 +11008,6 @@ }, /turf/open/floor/shiva/floor3, /area/shiva/interior/aerodrome) -"icC" = ( -/obj/structure/machinery/light/double{ - dir = 8; - pixel_y = -5 - }, -/turf/open/floor/shiva/north, -/area/shiva/interior/colony/deck) -"idR" = ( -/obj/structure/platform_decoration/strata{ - dir = 1 - }, -/turf/open/gm/river/no_overlay, -/area/shiva/interior/caves/cp_camp) "iek" = ( /obj/structure/prop/souto_land/streamer{ dir = 9 @@ -11183,6 +11037,10 @@ /obj/effect/landmark/xeno_spawn, /turf/open/floor/shiva/redfull/west, /area/shiva/interior/colony/research_hab) +"ifI" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/wood, +/area/shiva/interior/colony/medseceng) "ifN" = ( /obj/structure/surface/rack, /obj/item/lightstick, @@ -11212,15 +11070,16 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/floor/plating, /area/shiva/interior/caves/research_caves) -"igN" = ( -/turf/open/floor/shiva/yellow/east, -/area/shiva/interior/colony/deck) "ihh" = ( /obj/structure/surface/table, /obj/item/clipboard, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/shiva/north, /area/shiva/interior/colony/medseceng) +"ihk" = ( +/obj/effect/sentry_landmark/lz_2/bottom_right, +/turf/open/floor/shiva/radiator_tile, +/area/shiva/exterior/lz2_fortress) "ihp" = ( /obj/structure/surface/table/woodentable, /obj/item/reagent_container/food/drinks/bottle/sake, @@ -11233,6 +11092,10 @@ }, /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/junkyard) +"iip" = ( +/obj/structure/platform_decoration/stone/strata/north, +/turf/open/auto_turf/snow/layer2, +/area/shiva/interior/caves/cp_camp) "iiy" = ( /obj/item/stool{ pixel_x = 4; @@ -11245,10 +11108,6 @@ /obj/effect/landmark/corpsespawner/wygoon, /turf/open/auto_turf/ice/layer1, /area/shiva/interior/colony/central) -"ijm" = ( -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/auto_turf/ice/layer2, -/area/shiva/interior/warehouse/caves) "ijq" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/shiva/north, @@ -11260,13 +11119,6 @@ /obj/structure/fence, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_lz2) -"ijE" = ( -/obj/structure/platform/strata, -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/gm/river, -/area/shiva/interior/caves/research_caves) "ijP" = ( /obj/structure/machinery/door/airlock/almayer/engineering/colony{ dir = 1; @@ -11393,13 +11245,6 @@ /obj/item/reagent_container/food/snacks/cheeseburger, /turf/open/floor/prison/kitchen, /area/shiva/interior/colony/central) -"irT" = ( -/obj/structure/platform/strata{ - dir = 4 - }, -/obj/structure/platform/strata, -/turf/open/gm/river, -/area/shiva/exterior/cp_lz2) "isr" = ( /obj/structure/bed/chair/office/light{ dir = 4 @@ -11410,6 +11255,10 @@ /obj/structure/machinery/vending/snack, /turf/open/floor/shiva/floor3, /area/shiva/interior/colony/central) +"itu" = ( +/obj/structure/flora/tree/dead/tree_2, +/turf/open/auto_turf/snow/layer3, +/area/shiva/exterior/southwest_valley) "itG" = ( /obj/structure/closet/secure_closet/security, /obj/effect/landmark/objective_landmark/medium, @@ -11439,6 +11288,12 @@ "itW" = ( /turf/open/floor/shiva/red/north, /area/shiva/interior/colony/central) +"iub" = ( +/obj/structure/flora/grass/tallgrass/ice/corner{ + dir = 10 + }, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/southwest_valley) "iuz" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/shiva/floor3, @@ -11462,13 +11317,6 @@ /obj/structure/dispenser, /turf/open/floor/shiva/yellowfull, /area/shiva/interior/colony/medseceng) -"iuX" = ( -/obj/structure/platform/shiva/catwalk{ - dir = 8 - }, -/obj/structure/largecrate/random/mini/med, -/turf/open/floor/shiva/north, -/area/shiva/exterior/lz2_fortress) "ivl" = ( /obj/structure/machinery/alarm{ dir = 4; @@ -11489,15 +11337,6 @@ }, /turf/open/floor/shiva/red/north, /area/shiva/interior/colony/medseceng) -"ivE" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/auto_turf/snow/layer1, -/area/shiva/exterior/lz1_valley) "ivS" = ( /obj/structure/filingcabinet, /obj/effect/landmark/objective_landmark/medium, @@ -11544,7 +11383,7 @@ "ixX" = ( /obj/structure/closet/toolcloset, /turf/open/floor/shiva/yellow/southwest, -/area/shiva/interior/colony/deck) +/area/shiva/interior/colony/medseceng) "iyk" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/snacks/sliceable/cheesecake{ @@ -11555,6 +11394,11 @@ }, /turf/open/floor/prison/kitchen, /area/shiva/interior/bar) +"iyF" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/east, +/turf/open/auto_turf/ice/layer1, +/area/shiva/interior/oob/dev_room) "iyP" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/drinks/cans/ale{ @@ -11651,16 +11495,6 @@ /obj/item/weapon/ice_axe/red, /turf/open/floor/shiva/multi_tiles/southeast, /area/shiva/interior/colony/botany) -"iDW" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform/shiva/catwalk{ - dir = 8 - }, -/turf/open/floor/plating, -/area/shiva/interior/aerodrome) "iEi" = ( /obj/structure/machinery/alarm{ pixel_y = 24 @@ -11682,12 +11516,11 @@ }, /turf/open/floor/shiva/multi_tiles/east, /area/shiva/interior/colony/botany) -"iHu" = ( -/obj/structure/platform_decoration/shiva/catwalk{ - dir = 8 - }, -/turf/open/auto_turf/snow/layer4, -/area/shiva/exterior/junkyard) +"iFC" = ( +/obj/structure/platform/stone/strata/east, +/obj/structure/platform/stone/strata, +/turf/open/gm/river, +/area/shiva/exterior/valley) "iHN" = ( /obj/effect/landmark/survivor_spawner, /turf/open/floor/shiva/green/east, @@ -11729,6 +11562,14 @@ /obj/structure/flora/bush/ausbushes/lavendergrass, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_s_research) +"iJn" = ( +/obj/structure/platform/stone/strata/west, +/obj/structure/platform/stone/strata, +/obj/structure/barricade/handrail/wire{ + layer = 3.5 + }, +/turf/open/gm/river/no_overlay, +/area/shiva/interior/caves/cp_camp) "iJr" = ( /obj/effect/decal/cleanable/blood{ icon_state = "gib6" @@ -11743,15 +11584,13 @@ /obj/structure/machinery/space_heater, /turf/open/floor/shiva/yellow/west, /area/shiva/interior/colony/medseceng) +"iJE" = ( +/obj/structure/platform/stone/strata/east, +/turf/open/auto_turf/snow/layer4, +/area/shiva/exterior/cp_lz2) "iJY" = ( /turf/open/floor/shiva/red/north, /area/shiva/interior/colony/medseceng) -"iKW" = ( -/obj/structure/platform_decoration/shiva/catwalk{ - dir = 4 - }, -/turf/open/auto_turf/snow/layer1, -/area/shiva/exterior/junkyard) "iLf" = ( /obj/item/lightstick/red/spoke/planted{ pixel_x = 12; @@ -11759,10 +11598,6 @@ }, /turf/open/floor/shiva/radiator_tile, /area/shiva/exterior/lz2_fortress) -"iLS" = ( -/obj/item/stack/cable_coil/cut, -/turf/open/floor/shiva/north, -/area/shiva/interior/colony/deck) "iMb" = ( /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/valley) @@ -11770,14 +11605,15 @@ /obj/structure/window/framed/shiva, /turf/open/floor/plating, /area/shiva/interior/aerodrome) -"iMC" = ( -/obj/item/tool/shovel/snow, -/turf/open/auto_turf/snow/layer1, -/area/shiva/exterior/junkyard) "iMW" = ( /obj/item/stack/cable_coil/cut, /turf/open/auto_turf/snow/layer0, /area/shiva/interior/caves/cp_camp) +"iNt" = ( +/obj/structure/desertdam/decals/road_stop, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/shiva/floor3, +/area/shiva/interior/colony/research_hab) "iNS" = ( /obj/effect/decal/cleanable/blood{ dir = 4; @@ -11808,13 +11644,6 @@ /obj/item/lightstick/red/variant/planted, /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/lz1_valley) -"iOA" = ( -/obj/structure/machinery/door_control/brbutton{ - id = "hangar_ice_3"; - pixel_y = 28 - }, -/turf/open/auto_turf/snow/layer0, -/area/shiva/exterior/junkyard) "iPg" = ( /turf/open/floor/shiva/multi_tiles/west, /area/shiva/interior/colony/n_admin) @@ -11895,7 +11724,7 @@ pixel_y = 7 }, /turf/open/floor/shiva/north, -/area/shiva/interior/colony/deck) +/area/shiva/interior/colony/medseceng) "iWu" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med/souto{ pixel_y = 26 @@ -12027,12 +11856,6 @@ /obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/shiva, /area/shiva/interior/bar) -"jac" = ( -/obj/structure/platform/shiva/catwalk{ - dir = 4 - }, -/turf/open/auto_turf/snow/layer3, -/area/shiva/exterior/junkyard) "jay" = ( /turf/open/floor/shiva/yellowcorners/north, /area/shiva/interior/colony/medseceng) @@ -12048,24 +11871,30 @@ /obj/item/device/whistle, /turf/open/floor/shiva/floor3, /area/shiva/interior/colony/research_hab) +"jbr" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/carpet, +/area/shiva/interior/colony/medseceng) "jbE" = ( /turf/open/floor/shiva/floor3, /area/shiva/interior/colony/medseceng) "jbK" = ( /turf/open/floor/plating, /area/shiva/exterior/valley) -"jbY" = ( -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/auto_turf/snow/layer4, -/area/shiva/exterior/cp_lz2) +"jbT" = ( +/obj/structure/platform/stone/strata/east, +/turf/open/auto_turf/snow/layer1, +/area/shiva/exterior/lz1_valley) "jcv" = ( /obj/structure/surface/table, /obj/item/clothing/suit/armor/hos, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/shiva/redfull/west, /area/shiva/interior/colony/research_hab) +"jcR" = ( +/obj/structure/platform/stone/strata/east, +/turf/open/gm/river/no_overlay, +/area/shiva/interior/caves/cp_camp) "jeg" = ( /obj/structure/barricade/wooden{ dir = 1 @@ -12100,12 +11929,6 @@ }, /turf/open/floor/shiva/multi_tiles/west, /area/shiva/interior/colony/botany) -"jhm" = ( -/obj/structure/platform/shiva/catwalk{ - dir = 8 - }, -/turf/open/auto_turf/snow/layer4, -/area/shiva/exterior/junkyard) "jhq" = ( /turf/open/floor/shiva/radiator_tile, /area/shiva/interior/colony/n_admin) @@ -12118,6 +11941,11 @@ /obj/item/clothing/suit/storage/snow_suit, /turf/open/floor/wood, /area/shiva/interior/bar) +"jhY" = ( +/obj/structure/platform/metal/shiva/north, +/obj/item/lightstick/red/spoke/planted, +/turf/open/auto_turf/snow/layer0, +/area/shiva/exterior/cp_colony_grounds) "jis" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 8 @@ -12133,12 +11961,6 @@ }, /turf/open/floor/shiva/north, /area/shiva/interior/colony/s_admin) -"jjX" = ( -/obj/structure/platform/shiva/catwalk{ - dir = 4 - }, -/turf/open/auto_turf/snow/layer2, -/area/shiva/exterior/valley) "jkH" = ( /obj/item/lightstick/red/spoke/planted{ layer = 3.1; @@ -12160,18 +11982,16 @@ }, /turf/open/floor/shiva, /area/shiva/interior/bar) +"jlD" = ( +/obj/structure/platform_decoration/metal/shiva/west, +/turf/open/auto_turf/snow/layer4, +/area/shiva/exterior/southwest_valley) "jlQ" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1 }, /turf/open/floor/plating, /area/shiva/interior/bar) -"jlY" = ( -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/auto_turf/ice/layer2, -/area/shiva/interior/caves/cp_camp) "jmq" = ( /turf/open/floor/shiva/multi_tiles, /area/shiva/interior/colony/central) @@ -12202,13 +12022,6 @@ /obj/structure/machinery/computer/prisoner, /turf/open/floor/shiva/red/northwest, /area/shiva/interior/colony/medseceng) -"joF" = ( -/obj/structure/platform_decoration/strata, -/turf/open/auto_turf/ice/layer0, -/area/shiva/interior/caves/s_lz2) -"joP" = ( -/turf/open/floor/shiva/yellowfull/west, -/area/shiva/interior/colony/deck) "jph" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 6 @@ -12232,10 +12045,6 @@ /obj/effect/decal/cleanable/blood/drip, /turf/open/auto_turf/snow/layer3, /area/shiva/interior/caves/cp_camp) -"jqx" = ( -/obj/structure/platform/strata, -/turf/open/auto_turf/snow/layer1, -/area/shiva/exterior/lz1_valley) "jqT" = ( /obj/structure/closet/firecloset, /obj/item/explosive/grenade/high_explosive/pmc, @@ -12248,6 +12057,10 @@ "jrg" = ( /turf/closed/wall/shiva/ice, /area/shiva/interior/caves/research_caves) +"jrk" = ( +/obj/structure/platform/stone/strata/west, +/turf/open/auto_turf/snow/layer4, +/area/shiva/exterior/lz1_valley) "jru" = ( /turf/open/floor/shiva/multi_tiles, /area/shiva/interior/colony/n_admin) @@ -12266,6 +12079,10 @@ /obj/structure/closet/secure_closet/security, /turf/open/floor/shiva/red/southwest, /area/shiva/interior/colony/central) +"jtc" = ( +/obj/effect/sentry_landmark/lz_1/bottom_left, +/turf/open/auto_turf/snow/layer1, +/area/shiva/exterior/lz1_valley) "jtp" = ( /obj/structure/prop/invuln/ice_prefab, /turf/open/auto_turf/ice/layer0, @@ -12276,13 +12093,6 @@ }, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_lz2) -"jvz" = ( -/obj/structure/platform/strata{ - dir = 8 - }, -/obj/structure/platform/strata, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/oob/dev_room) "jvT" = ( /obj/structure/machinery/light/double{ dir = 4; @@ -12320,6 +12130,15 @@ /obj/structure/machinery/power/port_gen/pacman, /turf/open/floor/plating/warnplate/northwest, /area/shiva/interior/colony/medseceng) +"jyk" = ( +/obj/structure/platform/metal/shiva/west, +/turf/open/auto_turf/snow/layer3, +/area/shiva/exterior/southwest_valley) +"jzh" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata, +/turf/open/auto_turf/ice/layer1, +/area/shiva/interior/oob/dev_room) "jzs" = ( /obj/structure/largecrate/random/mini/wooden{ pixel_x = -16; @@ -12327,6 +12146,11 @@ }, /turf/open/auto_turf/ice/layer1, /area/shiva/interior/warehouse/caves) +"jzM" = ( +/obj/structure/platform/metal/shiva/north, +/obj/structure/platform/metal/shiva/east, +/turf/open/gm/river/no_overlay, +/area/shiva/interior/colony/central) "jAg" = ( /turf/open/floor/shiva/snow_mat, /area/shiva/exterior/cp_lz2) @@ -12432,6 +12256,10 @@ /obj/structure/window/framed/shiva, /turf/open/floor/plating, /area/shiva/interior/colony/central) +"jFz" = ( +/obj/structure/platform/stone/strata, +/turf/open/auto_turf/snow/layer1, +/area/shiva/exterior/lz1_valley) "jGW" = ( /obj/structure/cargo_container/horizontal/blue/middle, /obj/structure/largecrate/random/mini/small_case/b{ @@ -12444,12 +12272,6 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/shiva/bluefull, /area/shiva/interior/colony/central) -"jHg" = ( -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/gm/river/no_overlay, -/area/shiva/interior/caves/cp_camp) "jIF" = ( /obj/structure/machinery/light/double, /turf/open/floor/shiva/green/southwest, @@ -12457,13 +12279,6 @@ "jIK" = ( /turf/open/floor/shiva/floor3, /area/shiva/interior/colony/n_admin) -"jIP" = ( -/obj/structure/platform/strata{ - dir = 4 - }, -/obj/structure/platform/strata, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/oob/dev_room) "jIR" = ( /turf/open/floor/shiva/multi_tiles/west, /area/shiva/interior/colony/s_admin) @@ -12474,16 +12289,6 @@ }, /turf/open/auto_turf/snow/layer0, /area/shiva/exterior/valley) -"jJv" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata, -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/gm/river/no_overlay, -/area/shiva/interior/caves/cp_camp) "jJZ" = ( /obj/structure/largecrate/random/mini/small_case/b{ pixel_x = -5; @@ -12518,6 +12323,10 @@ /obj/item/tool/pickaxe, /turf/open/auto_turf/ice/layer1, /area/shiva/interior/oob/dev_room) +"jLT" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/auto_turf/ice/layer1, +/area/shiva/interior/caves/medseceng_caves) "jLX" = ( /obj/structure/machinery/door/airlock/almayer/generic{ name = "\improper Anti-Freeze Lounge" @@ -12527,10 +12336,18 @@ "jMf" = ( /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/junkyard) +"jMB" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/auto_turf/ice/layer0, +/area/shiva/interior/caves/research_caves) "jMD" = ( /obj/structure/foamed_metal, /turf/open/floor/shiva/north, /area/shiva/exterior/lz2_fortress) +"jMK" = ( +/obj/effect/landmark/monkey_spawn, +/turf/open/auto_turf/snow/layer0, +/area/shiva/exterior/southwest_valley) "jMZ" = ( /turf/open/floor/chapel/east, /area/shiva/interior/colony/central) @@ -12567,15 +12384,6 @@ "jPj" = ( /turf/open/floor/shiva/multi_tiles/southeast, /area/shiva/interior/bar) -"jPo" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/oob/dev_room) "jPU" = ( /obj/structure/filingcabinet{ pixel_x = 8; @@ -12604,6 +12412,12 @@ }, /turf/open/auto_turf/snow/layer0, /area/shiva/exterior/junkyard) +"jQi" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/shiva, +/area/shiva/interior/colony/research_hab) "jQy" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/colony{ dir = 1; @@ -12611,17 +12425,22 @@ }, /turf/open/floor/plating, /area/shiva/interior/colony/medseceng) +"jQB" = ( +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/auto_turf/ice/layer2, +/area/shiva/interior/caves/research_caves) "jQS" = ( /obj/structure/prop/invuln/ice_prefab/trim{ dir = 6 }, /turf/closed/wall/shiva/ice, /area/shiva/interior/caves/s_lz2) -"jQW" = ( -/obj/structure/platform_decoration/strata, -/obj/item/lightstick/variant/planted, -/turf/open/auto_turf/snow/layer3, -/area/shiva/exterior/cp_lz2) +"jRa" = ( +/obj/structure/bed, +/obj/effect/landmark/corpsespawner/colonist/burst, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/wood, +/area/shiva/interior/colony/botany) "jRI" = ( /obj/structure/ice/thin/single{ opacity = 1; @@ -12646,6 +12465,13 @@ }, /turf/open/floor/shiva/floor3, /area/shiva/exterior/lz2_fortress) +"jTl" = ( +/obj/structure/machinery/firealarm{ + pixel_y = 24 + }, +/obj/effect/landmark/corpsespawner/colonist, +/turf/open/floor/shiva/north, +/area/shiva/interior/colony/central) "jTT" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 6 @@ -12668,9 +12494,6 @@ /obj/effect/decal/cleanable/blood/drip, /turf/open/auto_turf/snow/layer2, /area/shiva/interior/caves/cp_camp) -"jVp" = ( -/turf/open/floor/shiva/yellow/west, -/area/shiva/interior/colony/deck) "jVx" = ( /obj/structure/girder/reinforced, /turf/open/floor/plating, @@ -12684,13 +12507,6 @@ }, /turf/open/auto_turf/snow/layer0, /area/shiva/interior/colony/medseceng) -"jWh" = ( -/obj/structure/stairs/perspective/ice{ - dir = 1; - icon_state = "p_stair_full" - }, -/turf/open/auto_turf/snow/layer0, -/area/shiva/interior/warehouse/caves) "jWL" = ( /obj/structure/machinery/light/double{ dir = 1; @@ -12718,6 +12534,10 @@ }, /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/cp_colony_grounds) +"jYX" = ( +/obj/effect/sentry_landmark/lz_1/top_right, +/turf/open/auto_turf/snow/layer0, +/area/shiva/interior/caves/cp_camp) "jZF" = ( /obj/item/tool/wirecutters/clippers, /turf/open/floor/shiva/floor3, @@ -12728,9 +12548,6 @@ }, /turf/open/floor/shiva/floor3, /area/shiva/interior/colony/research_hab) -"kaC" = ( -/turf/closed/wall/shiva/ice, -/area/shiva/interior/aerodrome) "kaL" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out" @@ -12758,13 +12575,6 @@ }, /turf/open/floor/shiva/floor3, /area/shiva/interior/aux_power) -"kbJ" = ( -/obj/structure/machinery/light/double{ - dir = 4; - pixel_y = -5 - }, -/turf/open/floor/shiva/north, -/area/shiva/interior/colony/medseceng) "kbK" = ( /obj/item/reagent_container/glass/bucket{ pixel_x = 4; @@ -12904,12 +12714,6 @@ }, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_colony_grounds) -"khx" = ( -/obj/structure/platform/shiva/catwalk{ - dir = 4 - }, -/turf/open/auto_turf/snow/layer2, -/area/shiva/exterior/junkyard) "khz" = ( /obj/item/device/flashlight, /turf/open/floor/shiva, @@ -12946,7 +12750,7 @@ }, /obj/structure/barricade/handrail/strata, /turf/open/floor/shiva/north, -/area/shiva/interior/colony/deck) +/area/shiva/interior/colony/medseceng) "kjt" = ( /obj/structure/surface/table, /turf/open/floor/shiva/north, @@ -12958,13 +12762,10 @@ }, /turf/open/floor/plating, /area/shiva/interior/aerodrome) -"kjX" = ( -/obj/structure/stairs/perspective/ice{ - dir = 1; - icon_state = "p_stair_full" - }, -/turf/open/auto_turf/snow/layer4, -/area/shiva/interior/warehouse/caves) +"kkw" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/shiva/wred/northeast, +/area/shiva/interior/colony/medseceng) "klF" = ( /obj/structure/bed/chair{ dir = 4 @@ -13027,6 +12828,14 @@ "kop" = ( /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/junkyard) +"koP" = ( +/obj/structure/stairs/perspective/ice{ + dir = 1; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/stone/strata/west, +/turf/open/auto_turf/ice/layer1, +/area/shiva/exterior/cp_lz2) "kqb" = ( /obj/structure/machinery/colony_floodlight, /turf/open/auto_turf/snow/layer2, @@ -13043,6 +12852,10 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/shiva/floor3, /area/shiva/interior/colony/s_admin) +"kqO" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/auto_turf/ice/layer1, +/area/shiva/interior/caves/medseceng_caves) "kri" = ( /obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/layer2, @@ -13088,6 +12901,11 @@ }, /turf/open/floor/shiva, /area/shiva/interior/colony/research_hab) +"ktM" = ( +/obj/structure/platform/stone/strata/east, +/obj/structure/platform/stone/strata, +/turf/open/gm/river, +/area/shiva/interior/warehouse/caves) "kue" = ( /turf/open/auto_turf/ice/layer2, /area/shiva/interior/colony/research_hab) @@ -13100,7 +12918,7 @@ /area/shiva/interior/bar) "kuM" = ( /turf/open/floor/shiva/yellow/northwest, -/area/shiva/interior/colony/deck) +/area/shiva/interior/colony/medseceng) "kuS" = ( /obj/structure/flora/tree/dead/tree_1, /turf/open/auto_turf/snow/layer3, @@ -13142,6 +12960,10 @@ /obj/structure/prop/invuln/ice_prefab/roof_greeble, /turf/closed/wall/shiva/ice, /area/shiva/exterior/junkyard) +"kvI" = ( +/obj/structure/platform_decoration/stone/strata/east, +/turf/open/auto_turf/ice/layer1, +/area/shiva/interior/caves/cp_camp) "kvQ" = ( /obj/structure/fence, /turf/open/auto_turf/snow/layer1, @@ -13165,6 +12987,14 @@ /obj/structure/machinery/light/double, /turf/open/floor/shiva/multi_tiles/west, /area/shiva/interior/colony/central) +"kxk" = ( +/obj/structure/machinery/door_control/brbutton{ + id = "hangar_ice_2"; + pixel_y = 28 + }, +/obj/structure/platform/metal/shiva/east, +/turf/open/auto_turf/snow/layer1, +/area/shiva/exterior/southwest_valley) "kxv" = ( /obj/effect/landmark/objective_landmark/science, /turf/open/floor/shiva/floor3, @@ -13301,6 +13131,11 @@ /obj/item/stack/rods, /turf/open/floor/shiva/multi_tiles/north, /area/shiva/exterior/lz2_fortress) +"kEr" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/west, +/turf/open/gm/river, +/area/shiva/exterior/cp_s_research) "kEs" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/shiva, @@ -13344,6 +13179,12 @@ /obj/effect/landmark/static_comms/net_one, /turf/open/floor/wood, /area/shiva/interior/aerodrome) +"kGH" = ( +/obj/structure/machinery/optable, +/obj/effect/landmark/corpsespawner/colonist/burst, +/obj/effect/spawner/gibspawner/human, +/turf/open/floor/plating, +/area/shiva/interior/colony/central) "kGW" = ( /obj/structure/flora/tree/dead/tree_2, /turf/open/auto_turf/snow/layer2, @@ -13423,6 +13264,12 @@ }, /turf/open/floor/interior/plastic/alt, /area/shiva/interior/warehouse) +"kLk" = ( +/obj/structure/flora/grass/tallgrass/ice/corner{ + dir = 6 + }, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/southwest_valley) "kLv" = ( /obj/item/tool/wirecutters/clippers, /turf/open/floor/shiva/north, @@ -13441,6 +13288,12 @@ /obj/structure/flora/grass/tallgrass/ice, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_lz2) +"kLL" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/shiva/floor3, +/area/shiva/interior/colony/research_hab) "kLM" = ( /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/lz1_valley) @@ -13580,15 +13433,6 @@ /obj/structure/flora/tree/dead/tree_6, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_colony_grounds) -"kSO" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/gm/river, -/area/shiva/interior/caves/cp_camp) "kTd" = ( /turf/open/auto_turf/ice/layer0, /area/shiva/interior/colony/research_hab) @@ -13603,10 +13447,22 @@ /obj/structure/flora/bush/ausbushes/lavendergrass, /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/lz1_valley) +"kTQ" = ( +/obj/structure/platform/stone/strata/west, +/turf/open/auto_turf/snow/layer3, +/area/shiva/exterior/lz1_valley) "kTZ" = ( /obj/item/tool/wirecutters, /turf/open/floor/plating, -/area/shiva/interior/colony/deck) +/area/shiva/interior/colony/medseceng) +"kUA" = ( +/obj/structure/stairs/perspective/ice{ + dir = 1; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/stone/strata/west, +/turf/open/auto_turf/snow/layer1, +/area/shiva/interior/caves/research_caves) "kVd" = ( /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_s_research) @@ -13676,6 +13532,19 @@ /obj/structure/machinery/power/port_gen/pacman, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_lz2) +"kXM" = ( +/obj/vehicle/train/cargo/engine, +/turf/open/auto_turf/snow/layer0, +/area/shiva/exterior/southwest_valley) +"kXW" = ( +/obj/structure/platform/stone/strata/west, +/obj/structure/platform/stone/strata, +/turf/open/gm/river, +/area/shiva/interior/warehouse/caves) +"kYf" = ( +/obj/structure/platform/metal/shiva/east, +/turf/open/auto_turf/snow/layer0, +/area/shiva/exterior/cp_colony_grounds) "kZj" = ( /obj/structure/prop/ice_colony/dense/planter_box{ dir = 1 @@ -13767,9 +13636,18 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/plating, /area/shiva/interior/colony/central) +"ldh" = ( +/obj/structure/platform/stone/strata/west, +/obj/structure/platform/stone/strata, +/turf/open/gm/river, +/area/shiva/exterior/valley) "leg" = ( /turf/closed/wall/shiva/prefabricated/reinforced/hull, /area/shiva/exterior/telecomm/lz1_north) +"lel" = ( +/obj/item/lightstick/red/variant, +/turf/open/auto_turf/snow/layer0, +/area/shiva/exterior/southwest_valley) "lfe" = ( /obj/structure/prop/ice_colony/soil_net, /turf/open/auto_turf/snow/layer1, @@ -13823,12 +13701,6 @@ }, /turf/open/auto_turf/snow/layer1, /area/shiva/interior/caves/cp_camp) -"lip" = ( -/obj/structure/flora/grass/tallgrass/ice/corner{ - dir = 10 - }, -/turf/open/auto_turf/snow/layer2, -/area/shiva/exterior/junkyard) "liD" = ( /obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/shiva/floor3, @@ -13840,9 +13712,6 @@ }, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_lz2) -"ljM" = ( -/turf/open/floor/shiva/yellow/northeast, -/area/shiva/interior/colony/deck) "ljS" = ( /obj/structure/surface/table, /obj/item/tool/wrench, @@ -13861,10 +13730,18 @@ "llZ" = ( /turf/open/auto_turf/snow/layer2, /area/shiva/interior/warehouse/caves) +"lmg" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/shiva/wred/north, +/area/shiva/interior/colony/medseceng) "lmt" = ( /obj/structure/largecrate/random/barrel/red, /turf/open/auto_turf/snow/layer0, /area/shiva/exterior/junkyard) +"lmF" = ( +/obj/structure/platform/metal/shiva/east, +/turf/open/auto_turf/snow/layer3, +/area/shiva/exterior/southwest_valley) "lmL" = ( /turf/open/floor/shiva/multi_tiles/east, /area/shiva/interior/colony/botany) @@ -13918,6 +13795,10 @@ /obj/structure/machinery/vending/coffee, /turf/open/floor/shiva/floor3, /area/shiva/interior/aerodrome) +"loK" = ( +/obj/structure/platform/metal/shiva/north, +/turf/open/auto_turf/snow/layer3, +/area/shiva/exterior/valley) "loX" = ( /obj/structure/flora/bush/snow{ icon_state = "snowgrassgb_2" @@ -13984,7 +13865,7 @@ /turf/open/auto_turf/snow/layer0, /area/shiva/interior/bar) "lro" = ( -/obj/structure/machinery/power/apc/no_power/west{ +/obj/structure/machinery/power/apc/no_power/east{ name = "telecomms relay power controller" }, /turf/open/floor/shiva/floor3, @@ -14007,6 +13888,10 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison/kitchen, /area/shiva/interior/colony/central) +"lsR" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/auto_turf/ice/layer2, +/area/shiva/interior/caves/research_caves) "ltA" = ( /obj/structure/surface/rack, /obj/item/tool/shovel/snow, @@ -14032,6 +13917,20 @@ /obj/effect/landmark/objective_landmark/far, /turf/open/floor/shiva/bluefull, /area/shiva/interior/colony/central) +"lvy" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/dark2, +/area/shiva/interior/valley_huts/disposals) +"lvC" = ( +/obj/structure/platform/stone/strata/east, +/obj/structure/platform/stone/strata, +/turf/open/gm/river, +/area/shiva/interior/caves/cp_camp) +"lvU" = ( +/obj/structure/platform/stone/strata, +/obj/structure/platform/stone/strata/east, +/turf/open/gm/river, +/area/shiva/interior/warehouse/caves) "lvW" = ( /obj/structure/machinery/computer/cameras{ dir = 8 @@ -14063,6 +13962,10 @@ "lxn" = ( /turf/open/floor/shiva/floor3, /area/shiva/interior/bar) +"lxD" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/auto_turf/ice/layer1, +/area/shiva/exterior/junkyard/cp_bar) "lyh" = ( /obj/item/lightstick/red/spoke/planted{ layer = 2.99; @@ -14096,6 +13999,10 @@ }, /turf/open/auto_turf/snow/layer3, /area/shiva/interior/caves/cp_camp) +"lAP" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/shiva/yellowfull/west, +/area/shiva/interior/colony/research_hab) "lBC" = ( /obj/structure/machinery/landinglight/ds2/delaythree{ dir = 8 @@ -14113,12 +14020,6 @@ }, /turf/open/auto_turf/snow/layer0, /area/shiva/interior/caves/cp_camp) -"lCB" = ( -/obj/structure/platform/shiva/catwalk{ - dir = 8 - }, -/turf/open/auto_turf/snow/layer2, -/area/shiva/exterior/valley) "lDv" = ( /obj/structure/machinery/computer/crew, /turf/open/floor/shiva/wred/southeast, @@ -14141,6 +14042,10 @@ /obj/effect/spawner/random/technology_scanner, /turf/open/floor/shiva/floor3, /area/shiva/interior/bar) +"lEY" = ( +/obj/structure/platform/metal/shiva/north, +/turf/open/gm/river/no_overlay, +/area/shiva/interior/colony/central) "lFp" = ( /obj/structure/surface/table, /obj/effect/spawner/random/toolbox{ @@ -14163,12 +14068,6 @@ "lGq" = ( /turf/open/auto_turf/snow/layer3, /area/shiva/interior/colony/medseceng) -"lGC" = ( -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/gm/river/no_overlay, -/area/shiva/interior/caves/cp_camp) "lGT" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_sn_full_cap" @@ -14225,6 +14124,16 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_s_research) +"lIA" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/auto_turf/ice/layer1, +/area/shiva/interior/colony/research_hab) +"lJf" = ( +/obj/effect/decal/cleanable/blood, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/shiva/yellowfull, +/area/shiva/interior/colony/research_hab) "lJh" = ( /obj/structure/machinery/vending/snack, /turf/open/floor/shiva/floor3, @@ -14235,6 +14144,10 @@ }, /turf/open/floor/shiva/north, /area/shiva/interior/colony/s_admin) +"lJv" = ( +/obj/effect/sentry_landmark/lz_2/top_right, +/turf/open/floor/shiva/north, +/area/shiva/exterior/lz2_fortress) "lJx" = ( /obj/structure/window/framed/shiva, /turf/open/floor/plating, @@ -14259,6 +14172,10 @@ /obj/structure/machinery/power/port_gen/pacman, /turf/open/floor/plating, /area/shiva/exterior/lz1_valley) +"lMC" = ( +/obj/structure/flora/tree/dead/tree_5, +/turf/open/auto_turf/snow/layer3, +/area/shiva/exterior/southwest_valley) "lMO" = ( /obj/structure/barricade/snow{ dir = 8 @@ -14269,7 +14186,7 @@ /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/communications, /turf/open/floor/shiva/floor3, -/area/shiva/interior/colony/deck) +/area/shiva/interior/colony/central) "lNg" = ( /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/lz1_valley) @@ -14280,12 +14197,6 @@ /obj/structure/surface/table, /turf/open/floor/shiva/redfull/west, /area/shiva/interior/colony/research_hab) -"lNE" = ( -/obj/structure/flora/bush/snow{ - icon_state = "snowgrassbb_1" - }, -/turf/open/auto_turf/snow/layer2, -/area/shiva/exterior/lz1_valley) "lNK" = ( /obj/structure/prop/invuln/ice_prefab{ dir = 5 @@ -14396,28 +14307,12 @@ /obj/item/trash/plate, /turf/open/floor/prison/kitchen, /area/shiva/interior/colony/central) -"lVF" = ( -/obj/structure/platform/shiva/catwalk{ - dir = 4 - }, -/turf/open/gm/river/no_overlay, -/area/shiva/interior/colony/central) "lWr" = ( /obj/structure/barricade/handrail/strata, /obj/structure/surface/table, /obj/effect/spawner/random/toolbox, /turf/open/floor/shiva/north, /area/shiva/interior/colony/central) -"lWC" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W-corner" - }, -/obj/item/lightstick/red/spoke/planted{ - pixel_x = -10; - pixel_y = -1 - }, -/turf/open/floor/plating, -/area/shiva/exterior/junkyard) "lWL" = ( /obj/effect/spider/cocoon{ icon_state = "cocoon_large3" @@ -14463,13 +14358,6 @@ }, /turf/open/floor/shiva/floor3, /area/shiva/interior/bar) -"lXQ" = ( -/obj/structure/stairs/perspective/ice{ - dir = 1; - icon_state = "p_stair_sn_full_cap" - }, -/turf/open/auto_turf/snow/layer0, -/area/shiva/interior/warehouse/caves) "lYf" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 4; @@ -14508,6 +14396,10 @@ /obj/effect/spawner/random/powercell, /turf/open/floor/plating, /area/shiva/interior/colony/central) +"lYV" = ( +/obj/structure/platform_decoration/stone/strata, +/turf/open/auto_turf/ice/layer0, +/area/shiva/interior/caves/s_lz2) "lYX" = ( /obj/structure/surface/table, /obj/item/ammo_magazine/pistol/holdout{ @@ -14518,6 +14410,16 @@ /obj/item/device/flashlight/lamp, /turf/open/floor/shiva/bluefull, /area/shiva/interior/colony/s_admin) +"lZl" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W-corner" + }, +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -11; + pixel_y = 25 + }, +/turf/open/floor/plating, +/area/shiva/exterior/southwest_valley) "mae" = ( /obj/structure/surface/table, /obj/item/paper_bin{ @@ -14542,6 +14444,10 @@ "maW" = ( /turf/open/floor/shiva/redfull, /area/shiva/interior/colony/medseceng) +"mbd" = ( +/obj/effect/sentry_landmark/lz_2/bottom_right, +/turf/open/floor/shiva/floor3, +/area/shiva/exterior/lz2_fortress) "mbj" = ( /obj/structure/prop/invuln/ice_prefab/trim{ dir = 8 @@ -14571,6 +14477,13 @@ "mdx" = ( /turf/open/floor/shiva/north, /area/shiva/interior/colony/n_admin) +"mdz" = ( +/obj/structure/bed/chair/office/dark{ + dir = 1 + }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/shiva/yellowfull, +/area/shiva/interior/colony/research_hab) "mdV" = ( /obj/structure/flora/bush/snow{ icon_state = "snowgrassall_3" @@ -14597,16 +14510,14 @@ /obj/structure/bed/chair, /turf/open/floor/shiva/north, /area/shiva/interior/colony/s_admin) +"meQ" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/carpet, +/area/shiva/interior/colony/research_hab) "mfa" = ( /obj/item/weapon/ice_axe, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/lz1_valley) -"mfc" = ( -/obj/structure/platform_decoration/strata{ - dir = 1 - }, -/turf/open/auto_turf/snow/layer2, -/area/shiva/interior/caves/cp_camp) "mfe" = ( /obj/item/frame/firstaid_arm_assembly, /turf/open/floor/shiva/redfull/west, @@ -14633,6 +14544,11 @@ }, /turf/open/floor/wood, /area/shiva/interior/colony/s_admin) +"mgO" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/west, +/turf/open/auto_turf/snow/layer1, +/area/shiva/exterior/lz1_valley) "mgT" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -14665,11 +14581,34 @@ "miD" = ( /turf/open/floor/shiva/yellow/east, /area/shiva/interior/colony/research_hab) +"miG" = ( +/obj/structure/machinery/door_control/brbutton{ + id = "hangar_ice_3"; + pixel_y = 28 + }, +/turf/open/auto_turf/snow/layer0, +/area/shiva/exterior/southwest_valley) +"miK" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/west, +/turf/open/gm/river/no_overlay, +/area/shiva/interior/caves/cp_camp) "miW" = ( /obj/structure/closet/secure_closet/security, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/shiva/redfull/west, /area/shiva/interior/colony/medseceng) +"mjp" = ( +/obj/structure/platform/stone/strata, +/turf/open/auto_turf/ice/layer1, +/area/shiva/interior/caves/s_lz2) +"mju" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/shiva/east, +/turf/open/floor/plating, +/area/shiva/interior/aerodrome) "mjV" = ( /obj/structure/largecrate/random/case/small, /turf/open/floor/plating, @@ -14696,9 +14635,6 @@ }, /turf/open/floor/plating, /area/shiva/exterior/lz2_fortress) -"mms" = ( -/turf/open/floor/shiva/north, -/area/shiva/interior/colony/deck) "mnD" = ( /turf/open/floor/shiva/radiator_tile2, /area/shiva/exterior/lz2_fortress) @@ -14720,6 +14656,14 @@ /obj/structure/machinery/power/apc/no_power/north, /turf/open/asphalt/cement, /area/shiva/interior/warehouse) +"mpE" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/obj/effect/landmark/corpsespawner/scientist, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/shiva/multi_tiles/north, +/area/shiva/interior/colony/research_hab) "mpI" = ( /obj/structure/fence, /turf/open/auto_turf/ice/layer1, @@ -14786,6 +14730,11 @@ /obj/structure/machinery/vending/cigarette/colony, /turf/open/floor/shiva/bluefull, /area/shiva/interior/colony/central) +"mtM" = ( +/obj/structure/platform/stone/strata/east, +/obj/structure/platform/stone/strata, +/turf/open/gm/river, +/area/shiva/interior/caves/research_caves) "mtU" = ( /obj/structure/prop/invuln/ice_prefab/standalone/trim{ icon_state = "white_trim" @@ -14840,13 +14789,10 @@ /obj/structure/machinery/light/double, /turf/open/floor/shiva/floor3, /area/shiva/interior/bar) -"mxr" = ( -/obj/structure/stairs/perspective/ice{ - dir = 8; - icon_state = "p_stair_sn_full_cap" - }, -/turf/open/auto_turf/snow/layer0, -/area/shiva/exterior/junkyard) +"mxS" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/shiva/yellow/west, +/area/shiva/interior/colony/medseceng) "myR" = ( /obj/structure/prop/invuln/ice_prefab/trim{ dir = 8 @@ -14927,15 +14873,6 @@ }, /turf/open/floor/shiva/bluefull, /area/shiva/interior/colony/s_admin) -"mCG" = ( -/obj/structure/platform_decoration/strata{ - dir = 4 - }, -/obj/structure/platform_decoration/strata{ - dir = 8 - }, -/turf/open/gm/river, -/area/shiva/interior/caves/research_caves) "mCQ" = ( /obj/structure/prop/ice_colony/surveying_device/measuring_device{ dir = 1; @@ -14975,6 +14912,10 @@ }, /turf/closed/wall/shiva/prefabricated, /area/shiva/interior/bar) +"mEQ" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/auto_turf/ice/layer1, +/area/shiva/interior/colony/research_hab) "mEV" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/tool/hand_labeler, @@ -15163,10 +15104,10 @@ "mMK" = ( /turf/open/auto_turf/snow/layer4, /area/shiva/exterior/cp_lz2) -"mNs" = ( -/obj/structure/platform/strata, -/turf/open/auto_turf/snow/layer2, -/area/shiva/exterior/lz1_valley) +"mNr" = ( +/obj/structure/platform/stone/strata/east, +/turf/open/auto_turf/ice/layer1, +/area/shiva/interior/oob/dev_room) "mNK" = ( /obj/structure/dispenser, /turf/open/floor/shiva/north, @@ -15175,12 +15116,6 @@ /obj/structure/machinery/light/double, /turf/open/floor/shiva/yellow, /area/shiva/interior/colony/research_hab) -"mOv" = ( -/obj/structure/platform_decoration/strata{ - dir = 1 - }, -/turf/open/auto_turf/snow/layer4, -/area/shiva/exterior/lz1_valley) "mOY" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/shiva, @@ -15201,16 +15136,10 @@ pixel_y = 9 }, /turf/open/floor/shiva/floor3, -/area/shiva/interior/colony/deck) +/area/shiva/interior/colony/central) "mQL" = ( /turf/open/floor/darkgreen2/northwest, /area/shiva/interior/colony/botany) -"mRa" = ( -/obj/structure/platform_decoration/shiva/catwalk{ - dir = 1 - }, -/turf/open/auto_turf/snow/layer2, -/area/shiva/exterior/valley) "mRc" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -15224,12 +15153,6 @@ /obj/structure/surface/rack, /turf/open/asphalt/cement, /area/shiva/interior/warehouse) -"mRo" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/oob/dev_room) "mRv" = ( /obj/structure/flora/tree/dead/tree_3, /turf/open/auto_turf/snow/layer2, @@ -15237,6 +15160,10 @@ "mRU" = ( /turf/open/floor/shiva/yellowcorners/west, /area/shiva/interior/colony/research_hab) +"mSo" = ( +/obj/structure/platform/metal/shiva/west, +/turf/open/auto_turf/snow/layer3, +/area/shiva/exterior/cp_colony_grounds) "mSv" = ( /obj/item/tool/shovel/spade{ pixel_x = -3; @@ -15362,6 +15289,15 @@ }, /turf/open/floor/shiva/green/east, /area/shiva/interior/colony/botany) +"naG" = ( +/obj/item/ammo_magazine/flamer_tank, +/obj/structure/machinery/light/double{ + dir = 1; + pixel_y = 9 + }, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/shiva/north, +/area/shiva/interior/colony/central) "naN" = ( /obj/structure/airlock_assembly, /turf/open/floor/plating, @@ -15392,17 +15328,16 @@ /obj/item/weapon/gun/flamer, /turf/open/floor/shiva/floor3, /area/shiva/interior/colony/central) -"ndb" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/auto_turf/snow/layer0, -/area/shiva/interior/colony/research_hab) "ndJ" = ( /obj/structure/flora/bush/snow{ icon_state = "snowgrassall_3" }, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/junkyard) +"ndK" = ( +/obj/structure/barricade/handrail/wire, +/turf/open/auto_turf/ice/layer1, +/area/shiva/exterior/valley) "ndR" = ( /turf/open/floor/shiva/floor3, /area/shiva/interior/colony/central) @@ -15506,28 +15441,17 @@ /obj/structure/machinery/space_heater, /turf/open/floor/shiva/floor3, /area/shiva/interior/aux_power) -"niL" = ( -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/auto_turf/snow/layer2, -/area/shiva/exterior/lz1_valley) "njg" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 5 }, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_lz2) -"nlx" = ( -/obj/structure/platform/strata, -/obj/structure/platform/strata{ - dir = 8 - }, -/obj/structure/platform_decoration/strata{ - dir = 8 - }, -/turf/open/gm/river/no_overlay, -/area/shiva/interior/caves/cp_camp) +"nlt" = ( +/obj/structure/barricade/handrail/wire, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/shiva, +/area/shiva/interior/colony/research_hab) "nlG" = ( /obj/structure/machinery/landinglight/ds2/spoke, /obj/structure/machinery/landinglight/ds2/delaytwo{ @@ -15558,6 +15482,11 @@ }, /turf/open/floor/shiva, /area/shiva/interior/colony/research_hab) +"nmU" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/weapon/gun/rifle/m41a/corporate/no_lock, +/turf/open/asphalt/cement, +/area/shiva/interior/warehouse) "nmY" = ( /obj/structure/prop/invuln/ice_prefab/standalone, /turf/open/auto_turf/snow/layer1, @@ -15584,6 +15513,14 @@ }, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/junkyard) +"npd" = ( +/obj/structure/platform/stone/strata/west, +/obj/structure/stairs/perspective/ice{ + dir = 1; + icon_state = "p_stair_sn_full_cap" + }, +/turf/open/auto_turf/snow/layer0, +/area/shiva/exterior/southwest_valley) "npi" = ( /obj/structure/flora/bush/ausbushes/lavendergrass{ icon_state = "lavendergrass_3" @@ -15601,10 +15538,6 @@ "nqu" = ( /turf/open/floor/shiva/snow_mat/north, /area/shiva/interior/colony/central) -"nqK" = ( -/obj/structure/platform/shiva/catwalk, -/turf/open/auto_turf/snow/layer2, -/area/shiva/exterior/valley) "nrf" = ( /obj/structure/machinery/reagentgrinder{ pixel_y = 12 @@ -15623,6 +15556,10 @@ }, /turf/open/floor/shiva, /area/shiva/interior/colony/research_hab) +"nrt" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/plating, +/area/shiva/interior/colony/medseceng) "nrB" = ( /obj/effect/landmark/objective_landmark/science, /turf/open/floor/shiva/north, @@ -15648,12 +15585,6 @@ "ntJ" = ( /turf/open/auto_turf/ice/layer0, /area/shiva/interior/caves/cp_camp) -"nud" = ( -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/auto_turf/ice/layer1, -/area/shiva/exterior/cp_lz2) "nur" = ( /obj/structure/barricade/metal{ dir = 1; @@ -15672,18 +15603,6 @@ }, /turf/open/auto_turf/ice/layer1, /area/shiva/interior/caves/cp_camp) -"nvu" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 4 - }, -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/gm/river, -/area/shiva/interior/caves/research_caves) "nvS" = ( /turf/open/floor/shiva/snow_mat/west, /area/shiva/exterior/cp_colony_grounds) @@ -15698,21 +15617,18 @@ }, /turf/open/floor/shiva/floor3, /area/shiva/interior/colony/research_hab) +"nwi" = ( +/obj/structure/platform/stone/strata/west, +/turf/open/auto_turf/ice/layer1, +/area/shiva/interior/caves/cp_camp) "nxi" = ( /obj/structure/machinery/space_heater, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/junkyard) -"nxt" = ( -/obj/structure/platform_decoration/strata{ - dir = 1 - }, -/obj/item/lightstick/red/variant/planted{ - pixel_x = -7; - pixel_y = -5 - }, -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/auto_turf/snow/layer0, -/area/shiva/exterior/cp_s_research) +"nxp" = ( +/obj/structure/platform/metal/shiva/east, +/turf/open/auto_turf/snow/layer1, +/area/shiva/exterior/cp_colony_grounds) "nxA" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -15723,13 +15639,6 @@ /obj/structure/flora/bush/ausbushes/lavendergrass, /turf/open/auto_turf/snow/layer3, /area/shiva/interior/caves/cp_camp) -"nyS" = ( -/obj/structure/platform/strata{ - dir = 8 - }, -/obj/structure/platform/strata, -/turf/open/gm/river, -/area/shiva/interior/caves/research_caves) "nzf" = ( /obj/structure/surface/table, /obj/structure/noticeboard{ @@ -15764,10 +15673,6 @@ /obj/item/tool/crowbar, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/junkyard) -"nAs" = ( -/obj/effect/decal/cleanable/blood/oil, -/turf/open/auto_turf/snow/layer1, -/area/shiva/exterior/junkyard) "nAY" = ( /turf/open/floor/shiva/yellowcorners, /area/shiva/interior/colony/medseceng) @@ -15882,13 +15787,6 @@ }, /turf/open/floor/shiva, /area/shiva/interior/colony/research_hab) -"nIA" = ( -/obj/item/lightstick/red/variant/planted, -/obj/structure/platform/shiva/catwalk{ - dir = 8 - }, -/turf/open/auto_turf/snow/layer1, -/area/shiva/interior/aerodrome) "nIB" = ( /obj/structure/surface/table, /obj/item/device/taperecorder, @@ -15921,7 +15819,7 @@ pixel_x = -9 }, /turf/open/auto_turf/ice/layer1, -/area/shiva/interior/caves/cp_camp) +/area/shiva/exterior/valley) "nKO" = ( /obj/structure/machinery/light/double, /turf/open/floor/shiva/radiator_tile, @@ -15937,16 +15835,14 @@ }, /turf/open/floor/shiva, /area/shiva/interior/colony/research_hab) +"nMr" = ( +/obj/structure/platform/metal/shiva/east, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/southwest_valley) "nMP" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/shiva/north, /area/shiva/interior/colony/medseceng) -"nMR" = ( -/obj/structure/platform_decoration/strata{ - dir = 8 - }, -/turf/open/auto_turf/snow/layer1, -/area/shiva/exterior/lz1_valley) "nMZ" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/paper_bin, @@ -15981,32 +15877,10 @@ "nOd" = ( /turf/closed/wall/shiva/prefabricated/reinforced, /area/shiva/interior/colony/s_admin) -"nOi" = ( -/obj/structure/platform/shiva/catwalk{ - dir = 4 - }, -/turf/open/auto_turf/snow/layer1, -/area/shiva/exterior/cp_colony_grounds) "nOB" = ( /obj/item/stack/sheet/metal, /turf/open/floor/shiva/purplefull/west, /area/shiva/interior/colony/research_hab) -"nOK" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/gm/river, -/area/shiva/exterior/cp_s_research) -"nPb" = ( -/obj/structure/prop/ice_colony/soil_net, -/obj/structure/platform/strata{ - dir = 1 - }, -/turf/open/auto_turf/snow/layer2, -/area/shiva/exterior/cp_lz2) "nPH" = ( /obj/structure/machinery/microwave{ pixel_y = 6 @@ -16033,13 +15907,6 @@ /obj/item/tool/stamp, /turf/open/floor/shiva/bluefull, /area/shiva/interior/colony/n_admin) -"nRD" = ( -/obj/structure/stairs/perspective/ice{ - dir = 1; - icon_state = "p_stair_full" - }, -/turf/open/auto_turf/snow/layer1, -/area/shiva/interior/warehouse/caves) "nSI" = ( /obj/structure/machinery/light/double{ dir = 1; @@ -16050,6 +15917,15 @@ "nSO" = ( /turf/open/auto_turf/ice/layer1, /area/shiva/interior/caves/medseceng_caves) +"nSZ" = ( +/obj/item/stack/cable_coil/cut, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/shiva/north, +/area/shiva/interior/colony/medseceng) +"nTl" = ( +/obj/structure/platform/stone/strata/north, +/turf/open/auto_turf/snow/layer1, +/area/shiva/exterior/lz1_valley) "nTu" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/interior/plastic, @@ -16069,12 +15945,6 @@ }, /turf/open/floor/wood, /area/shiva/interior/aerodrome) -"nUk" = ( -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/auto_turf/snow/layer1, -/area/shiva/interior/caves/cp_camp) "nUn" = ( /obj/structure/bed/chair{ dir = 8 @@ -16089,6 +15959,11 @@ /obj/item/lightstick/variant/planted, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_lz2) +"nUM" = ( +/obj/effect/landmark/corpsespawner/colonist, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/shiva, +/area/shiva/interior/aerodrome) "nVn" = ( /obj/structure/surface/table, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, @@ -16115,6 +15990,10 @@ }, /turf/open/floor/shiva/floor3, /area/shiva/interior/colony/s_admin) +"nWf" = ( +/obj/structure/platform_decoration/metal/shiva/east, +/turf/open/floor/shiva/floor3, +/area/shiva/interior/aerodrome) "nWI" = ( /obj/structure/flora/bush/snow{ icon_state = "snowgrassall_3" @@ -16165,6 +16044,11 @@ "oaP" = ( /turf/open/auto_turf/ice/layer2, /area/shiva/interior/oob/dev_room) +"oaW" = ( +/obj/structure/blocker/forcefield/multitile_vehicles, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/auto_turf/ice/layer1, +/area/shiva/interior/colony/research_hab) "obb" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/flashlight, @@ -16206,6 +16090,16 @@ }, /turf/open/floor/shiva, /area/shiva/interior/bar) +"ocP" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W-corner" + }, +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -10; + pixel_y = -1 + }, +/turf/open/floor/plating, +/area/shiva/exterior/southwest_valley) "odb" = ( /obj/structure/machinery/light/double{ dir = 8; @@ -16224,12 +16118,6 @@ /obj/effect/decal/cleanable/blood/gibs/xeno, /turf/open/floor/shiva/green, /area/shiva/interior/colony/botany) -"ofl" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/turf/open/auto_turf/snow/layer1, -/area/shiva/exterior/lz1_valley) "ofw" = ( /turf/open/auto_turf/snow/layer4, /area/shiva/exterior/junkyard) @@ -16283,6 +16171,15 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/cp_colony_grounds) +"oij" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/west, +/turf/open/auto_turf/snow/layer3, +/area/shiva/exterior/lz1_valley) +"oiy" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/auto_turf/ice/layer1, +/area/shiva/exterior/valley) "oiH" = ( /obj/structure/flora/tree/dead/tree_1, /turf/open/auto_turf/snow/layer3, @@ -16335,6 +16232,11 @@ /obj/structure/machinery/photocopier, /turf/open/floor/shiva/floor3, /area/shiva/interior/aerodrome) +"omS" = ( +/obj/item/lightstick/red/variant/planted, +/obj/structure/platform/metal/shiva/west, +/turf/open/auto_turf/snow/layer1, +/area/shiva/interior/aerodrome) "onc" = ( /obj/structure/girder/displaced, /turf/open/floor/plating, @@ -16383,12 +16285,6 @@ /obj/structure/window/reinforced, /turf/open/floor/wood, /area/shiva/interior/colony/central) -"oqH" = ( -/obj/structure/platform_decoration/strata{ - dir = 4 - }, -/turf/open/auto_turf/snow/layer1, -/area/shiva/exterior/lz1_valley) "oqQ" = ( /obj/structure/bed/chair/comfy/black{ dir = 4 @@ -16417,10 +16313,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/auto_turf/ice/layer1, /area/shiva/interior/colony/research_hab) -"orO" = ( -/obj/structure/desertdam/decals/road_stop, -/turf/open/floor/shiva/floor3, -/area/shiva/interior/colony/research_hab) "osh" = ( /turf/open/floor/shiva/yellowfull/west, /area/shiva/interior/colony/medseceng) @@ -16458,6 +16350,12 @@ }, /turf/open/floor/shiva/north, /area/shiva/exterior/lz2_fortress) +"ouL" = ( +/obj/structure/platform/stone/strata, +/obj/structure/platform/stone/strata/west, +/obj/structure/platform_decoration/stone/strata/west, +/turf/open/gm/river/no_overlay, +/area/shiva/interior/caves/cp_camp) "ouS" = ( /obj/item/lightstick/red/spoke/planted{ pixel_x = 15; @@ -16465,6 +16363,10 @@ }, /turf/closed/wall/shiva/ice, /area/shiva/interior/caves/cp_camp) +"ouY" = ( +/obj/effect/sentry_landmark/lz_2/bottom_left, +/turf/open/floor/shiva/north, +/area/shiva/exterior/lz2_fortress) "ovc" = ( /turf/open/floor/carpet, /area/shiva/interior/colony/medseceng) @@ -16502,12 +16404,6 @@ }, /turf/open/floor/shiva/north, /area/shiva/interior/colony/s_admin) -"owB" = ( -/obj/structure/platform/shiva/catwalk{ - dir = 4 - }, -/turf/open/auto_turf/snow/layer0, -/area/shiva/exterior/cp_colony_grounds) "owD" = ( /obj/structure/filingcabinet, /turf/open/floor/shiva/floor3, @@ -16522,6 +16418,11 @@ /obj/structure/machinery/power/apc/power/south, /turf/open/floor/plating, /area/shiva/exterior/telecomm/lz2_northeast) +"oxr" = ( +/obj/structure/platform/stone/strata, +/obj/structure/platform/stone/strata/east, +/turf/open/auto_turf/ice/layer1, +/area/shiva/exterior/cp_lz2) "oxP" = ( /obj/structure/flora/tree/dead/tree_6, /turf/open/auto_turf/snow/layer3, @@ -16530,10 +16431,10 @@ /obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/shiva/bluefull, /area/shiva/interior/colony/n_admin) -"oyw" = ( -/obj/structure/platform_decoration/strata, -/turf/open/auto_turf/snow/layer3, -/area/shiva/exterior/cp_lz2) +"ozH" = ( +/obj/structure/platform/stone/strata/north, +/turf/open/auto_turf/ice/layer1, +/area/shiva/interior/oob/dev_room) "oAo" = ( /obj/structure/machinery/door/airlock/almayer/command/colony{ dir = 1; @@ -16554,16 +16455,6 @@ "oCG" = ( /turf/open/floor/plating/plating_catwalk/shiva, /area/shiva/interior/aerodrome) -"oDi" = ( -/obj/structure/platform_decoration/strata{ - dir = 1 - }, -/obj/item/lightstick/red/variant/planted{ - pixel_x = -7; - pixel_y = -5 - }, -/turf/open/auto_turf/snow/layer0, -/area/shiva/exterior/junkyard) "oDH" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 6 @@ -16581,6 +16472,11 @@ /obj/structure/flora/grass/tallgrass/ice/corner, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_lz2) +"oDZ" = ( +/obj/structure/platform/stone/strata/west, +/obj/structure/platform/stone/strata/east, +/turf/open/auto_turf/ice/layer1, +/area/shiva/interior/oob/dev_room) "oEk" = ( /obj/structure/machinery/light/double{ dir = 4; @@ -16589,6 +16485,10 @@ /obj/effect/decal/cleanable/vomit, /turf/open/floor/wood, /area/shiva/interior/colony/s_admin) +"oEA" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/auto_turf/ice/layer1, +/area/shiva/interior/caves/research_caves) "oET" = ( /obj/item/weapon/baseballbat/metal, /turf/open/floor/shiva/floor3, @@ -16601,13 +16501,6 @@ }, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/junkyard/cp_bar) -"oFl" = ( -/obj/structure/platform/strata, -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/gm/river, -/area/shiva/interior/warehouse/caves) "oFG" = ( /obj/structure/machinery/body_scanconsole, /turf/open/floor/shiva/wred/northeast, @@ -16650,6 +16543,10 @@ }, /turf/open/floor/shiva/north, /area/shiva/exterior/lz2_fortress) +"oHV" = ( +/obj/structure/machinery/power/apc/no_power/north, +/turf/open/floor/plating, +/area/shiva/exterior/southwest_valley) "oIh" = ( /obj/item/frame/air_alarm, /turf/open/floor/shiva/wred/north, @@ -16658,6 +16555,11 @@ /obj/structure/largecrate/random/case/small, /turf/open/floor/shiva/floor3, /area/shiva/interior/aerodrome) +"oIT" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/shiva/floor3, +/area/shiva/interior/colony/research_hab) "oJe" = ( /obj/structure/surface/table, /obj/item/tool/hand_labeler, @@ -16693,12 +16595,6 @@ }, /turf/open/floor/shiva/floor3, /area/shiva/interior/colony/s_admin) -"oLu" = ( -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/oob/dev_room) "oMG" = ( /obj/item/lightstick/red/spoke/planted{ layer = 2.99; @@ -16729,6 +16625,10 @@ }, /turf/open/auto_turf/snow/layer4, /area/shiva/exterior/junkyard/fortbiceps) +"oNV" = ( +/obj/structure/platform_decoration/metal/shiva/north, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/valley) "oNZ" = ( /turf/open/floor/wood, /area/shiva/interior/bar) @@ -16748,6 +16648,10 @@ "oQo" = ( /turf/closed/wall/shiva/prefabricated, /area/shiva/exterior/cp_s_research) +"oRc" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/auto_turf/snow/layer0, +/area/shiva/interior/colony/medseceng) "oRH" = ( /turf/open/auto_turf/snow/layer2, /area/shiva/interior/caves/cp_camp) @@ -16755,6 +16659,15 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/auto_turf/snow/layer0, /area/shiva/exterior/valley) +"oSj" = ( +/obj/structure/machinery/light/double{ + dir = 1; + pixel_y = 9 + }, +/obj/effect/landmark/corpsespawner/engineer, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/shiva/yellow/north, +/area/shiva/interior/garage) "oSU" = ( /obj/structure/machinery/disposal, /turf/open/floor/shiva/north, @@ -16779,6 +16692,11 @@ }, /turf/open/floor/shiva/bluefull/west, /area/shiva/interior/warehouse) +"oWA" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/corpsespawner/wygoon, +/turf/open/asphalt/cement, +/area/shiva/interior/warehouse) "oWG" = ( /obj/structure/machinery/portable_atmospherics/powered/scrubber{ icon_state = "psiphon:1" @@ -16812,6 +16730,10 @@ }, /turf/open/asphalt/cement, /area/shiva/interior/warehouse) +"oYt" = ( +/obj/structure/platform/stone/strata, +/turf/open/auto_turf/ice/layer0, +/area/shiva/interior/caves/cp_camp) "oYw" = ( /turf/open/auto_turf/snow/layer1, /area/shiva/interior/colony/medseceng) @@ -16824,13 +16746,6 @@ }, /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/cp_lz2) -"oZq" = ( -/obj/structure/platform/strata{ - dir = 4 - }, -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/auto_turf/snow/layer1, -/area/shiva/exterior/junkyard) "oZs" = ( /obj/effect/decal/warning_stripes{ icon_state = "N" @@ -16841,6 +16756,10 @@ /obj/structure/coatrack, /turf/open/floor/shiva, /area/shiva/interior/bar) +"oZF" = ( +/obj/structure/platform/stone/strata, +/turf/open/auto_turf/ice/layer1, +/area/shiva/interior/oob/dev_room) "oZR" = ( /obj/item/stack/cable_coil/green, /turf/open/floor/shiva/floor3, @@ -16901,6 +16820,10 @@ }, /turf/open/auto_turf/snow/layer0, /area/shiva/exterior/cp_colony_grounds) +"pea" = ( +/obj/structure/platform/stone/strata/west, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/lz1_valley) "peb" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, /turf/open/auto_turf/snow/layer3, @@ -16914,12 +16837,10 @@ }, /turf/open/asphalt/cement, /area/shiva/interior/warehouse) -"pey" = ( -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/auto_turf/snow/layer2, -/area/shiva/interior/caves/s_lz2) +"peF" = ( +/obj/structure/platform_decoration/metal/shiva/west, +/turf/open/auto_turf/snow/layer0, +/area/shiva/exterior/cp_colony_grounds) "peQ" = ( /obj/item/device/flashlight/lamp/tripod/grey, /turf/open/floor/shiva/bluefull, @@ -16933,7 +16854,14 @@ dir = 8 }, /turf/open/floor/shiva/north, -/area/shiva/interior/colony/deck) +/area/shiva/interior/colony/medseceng) +"pfj" = ( +/obj/structure/stairs/perspective/ice{ + dir = 8; + icon_state = "p_stair_sn_full_cap" + }, +/turf/open/auto_turf/snow/layer0, +/area/shiva/exterior/southwest_valley) "pfp" = ( /obj/structure/prop/invuln/ice_prefab{ dir = 9 @@ -16944,6 +16872,10 @@ }, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_lz2) +"pfL" = ( +/obj/structure/platform_decoration/stone/strata/north, +/turf/open/auto_turf/snow/layer3, +/area/shiva/exterior/cp_lz2) "pfP" = ( /obj/structure/surface/table/woodentable, /obj/item/ammo_magazine/handful/shotgun/buckshot, @@ -16959,11 +16891,10 @@ "pgu" = ( /turf/open/auto_turf/ice/layer0, /area/shiva/exterior/telecomm/lz2_southeast) -"pgQ" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/turf/open/auto_turf/snow/layer3, +"phO" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/east, +/turf/open/gm/river, /area/shiva/exterior/cp_lz2) "piW" = ( /obj/structure/machinery/vending/snack, @@ -16991,10 +16922,6 @@ /obj/structure/machinery/light/double, /turf/open/floor/shiva/floor3, /area/shiva/interior/colony/research_hab) -"pkT" = ( -/obj/structure/platform/strata, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/caves/cp_camp) "plm" = ( /obj/structure/bed/chair/office/dark{ dir = 1 @@ -17037,15 +16964,6 @@ /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/shiva/north, /area/shiva/interior/colony/medseceng) -"poz" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/auto_turf/snow/layer3, -/area/shiva/exterior/lz1_valley) "ppb" = ( /obj/structure/prop/invuln/ice_prefab{ dir = 9 @@ -17068,26 +16986,14 @@ "pqj" = ( /turf/open/auto_turf/snow/layer0, /area/shiva/exterior/valley) -"pqq" = ( -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/auto_turf/ice/layer0, -/area/shiva/interior/caves/s_lz2) "prb" = ( /obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/shiva/yellow/north, /area/shiva/interior/garage) -"prO" = ( -/obj/structure/stairs/perspective/ice{ - dir = 1; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/auto_turf/snow/layer1, -/area/shiva/interior/caves/research_caves) +"prx" = ( +/obj/structure/platform/stone/strata, +/turf/open/auto_turf/ice/layer1, +/area/shiva/interior/caves/cp_camp) "prU" = ( /obj/structure/machinery/light/double{ dir = 8; @@ -17129,6 +17035,11 @@ "ptr" = ( /turf/open/floor/shiva/yellow/west, /area/shiva/interior/colony/research_hab) +"pts" = ( +/obj/structure/platform/stone/strata/east, +/obj/structure/platform/stone/strata, +/turf/open/gm/river, +/area/shiva/exterior/cp_s_research) "pue" = ( /obj/item/trash/cigbutt/ucigbutt{ pixel_y = 8 @@ -17243,15 +17154,14 @@ /obj/item/paper, /turf/open/floor/wood, /area/shiva/interior/aerodrome) +"pzr" = ( +/obj/structure/prop/ice_colony/soil_net, +/obj/structure/platform/stone/strata/north, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/cp_lz2) "pzJ" = ( /turf/closed/wall/shiva/prefabricated, /area/shiva/exterior/cp_colony_grounds) -"pAx" = ( -/obj/structure/platform/shiva/catwalk{ - dir = 1 - }, -/turf/open/auto_turf/snow/layer3, -/area/shiva/exterior/valley) "pAE" = ( /obj/structure/machinery/light/double{ dir = 8; @@ -17285,6 +17195,11 @@ /obj/effect/landmark/objective_landmark/far, /turf/open/floor/shiva/north, /area/shiva/interior/colony/botany) +"pBA" = ( +/obj/structure/platform_decoration/stone/strata/east, +/obj/structure/platform_decoration/stone/strata/west, +/turf/open/gm/river, +/area/shiva/interior/warehouse/caves) "pBL" = ( /turf/open/floor/plating/plating_catwalk/shiva, /area/shiva/interior/aux_power) @@ -17295,6 +17210,10 @@ }, /turf/open/auto_turf/snow/layer1, /area/shiva/interior/caves/research_caves) +"pCj" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/shiva/floor3, +/area/shiva/interior/colony/research_hab) "pCw" = ( /obj/item/lightstick/red/spoke/planted{ pixel_x = 12; @@ -17306,10 +17225,6 @@ /obj/item/tool/shovel, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_colony_grounds) -"pCI" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/shiva/floor3, -/area/shiva/interior/colony/research_hab) "pCJ" = ( /obj/item/book/manual/marine_law, /obj/structure/surface/table/reinforced/prison, @@ -17364,7 +17279,7 @@ /area/shiva/interior/colony/s_admin) "pEs" = ( /turf/open/floor/shiva/multi_tiles/north, -/area/shiva/interior/colony/deck) +/area/shiva/interior/colony/central) "pEv" = ( /obj/structure/surface/table, /obj/structure/machinery/computer/emails{ @@ -17384,12 +17299,6 @@ /obj/structure/machinery/light/double, /turf/open/floor/shiva/north, /area/shiva/interior/garage) -"pFg" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/turf/open/gm/river/no_overlay, -/area/shiva/interior/caves/cp_camp) "pFt" = ( /turf/open/floor/shiva/red, /area/shiva/interior/colony/medseceng) @@ -17423,12 +17332,10 @@ }, /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/cp_s_research) -"pGL" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/turf/open/auto_turf/snow/layer4, -/area/shiva/exterior/cp_lz2) +"pHd" = ( +/obj/structure/flora/bush/ausbushes/lavendergrass, +/turf/open/auto_turf/snow/layer1, +/area/shiva/exterior/southwest_valley) "pHz" = ( /obj/structure/closet/secure_closet/personal, /obj/effect/landmark/objective_landmark/close, @@ -17510,10 +17417,11 @@ }, /turf/open/auto_turf/snow/layer0, /area/shiva/exterior/cp_colony_grounds) -"pKK" = ( -/obj/item/lightstick/red/variant, -/turf/open/auto_turf/snow/layer0, -/area/shiva/exterior/junkyard) +"pKJ" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/landmark/corpsespawner/wygoon, +/turf/open/asphalt/cement, +/area/shiva/interior/warehouse) "pKP" = ( /obj/structure/surface/table, /obj/item/device/flashlight/lamp/green{ @@ -17553,13 +17461,6 @@ /obj/structure/surface/rack, /turf/open/floor/plating, /area/shiva/interior/caves/research_caves) -"pMs" = ( -/obj/structure/machinery/light/double{ - dir = 8; - pixel_y = -5 - }, -/turf/open/floor/shiva/floor3, -/area/shiva/interior/colony/deck) "pME" = ( /obj/item/ammo_magazine/revolver/cmb, /turf/open/floor/shiva/floor3, @@ -17615,6 +17516,10 @@ /obj/item/stack/cable_coil/cut, /turf/open/floor/shiva/yellowfull/west, /area/shiva/interior/colony/medseceng) +"pOn" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/auto_turf/ice/layer1, +/area/shiva/interior/colony/research_hab) "pOI" = ( /obj/structure/surface/table, /obj/item/reagent_container/food/drinks/dry_ramen, @@ -17651,13 +17556,6 @@ }, /turf/open/floor/shiva, /area/shiva/interior/colony/research_hab) -"pRM" = ( -/obj/structure/platform_decoration/strata{ - dir = 1 - }, -/obj/structure/platform_decoration/strata, -/turf/open/gm/river, -/area/shiva/interior/caves/research_caves) "pRU" = ( /obj/item/stack/cable_coil/white, /turf/open/auto_turf/ice/layer1, @@ -17754,13 +17652,18 @@ /obj/effect/landmark/good_item, /turf/open/floor/wood, /area/shiva/interior/colony/botany) +"pXi" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/west, +/turf/open/gm/river, +/area/shiva/exterior/cp_lz2) "pXU" = ( /obj/item/lightstick/red/spoke/planted{ pixel_x = -16; pixel_y = -3 }, /turf/open/auto_turf/snow/layer0, -/area/shiva/interior/caves/cp_camp) +/area/shiva/exterior/valley) "pZB" = ( /obj/structure/largecrate/random/mini/ammo{ pixel_x = 3 @@ -17788,6 +17691,11 @@ }, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_lz2) +"qaY" = ( +/obj/structure/platform/stone/strata/east, +/obj/structure/platform/stone/strata, +/turf/open/auto_turf/ice/layer1, +/area/shiva/exterior/cp_lz2) "qbh" = ( /obj/structure/machinery/photocopier, /obj/structure/machinery/firealarm{ @@ -17798,6 +17706,10 @@ "qbF" = ( /turf/open/auto_turf/ice/layer0, /area/shiva/exterior/junkyard/cp_bar) +"qcn" = ( +/obj/structure/flora/grass/tallgrass/ice/corner, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/southwest_valley) "qcT" = ( /obj/structure/largecrate/random, /turf/open/floor/plating/plating_catwalk/shiva, @@ -17807,15 +17719,15 @@ /obj/effect/spawner/random/toolbox, /turf/open/floor/shiva/yellow, /area/shiva/interior/colony/medseceng) -"qdh" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 4 - }, +"qdr" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/west, /turf/open/gm/river, /area/shiva/interior/caves/research_caves) +"qdG" = ( +/obj/structure/platform/stone/strata, +/turf/open/auto_turf/ice/layer1, +/area/shiva/exterior/cp_lz2) "qdH" = ( /turf/closed/wall/shiva/prefabricated/blue, /area/shiva/exterior/junkyard/cp_bar) @@ -17929,7 +17841,7 @@ pixel_y = 9 }, /turf/open/floor/shiva/multi_tiles/east, -/area/shiva/interior/colony/deck) +/area/shiva/interior/colony/central) "qkt" = ( /obj/item/stack/cable_coil/cut, /turf/open/floor/plating/plating_catwalk/shiva, @@ -17937,12 +17849,6 @@ "qkC" = ( /turf/open/shuttle/elevator, /area/shiva/interior/aerodrome) -"qkF" = ( -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/oob/dev_room) "qkI" = ( /obj/structure/machinery/landinglight/ds1/spoke, /turf/open/auto_turf/snow/layer0, @@ -18009,6 +17915,10 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/floor/shiva/floor3, /area/shiva/interior/colony/botany) +"qnj" = ( +/obj/structure/platform/stone/strata, +/turf/open/gm/river, +/area/shiva/exterior/valley) "qnu" = ( /obj/structure/machinery/light/double{ dir = 8; @@ -18119,10 +18029,11 @@ }, /turf/open/floor/shiva/multi_tiles, /area/shiva/interior/colony/research_hab) -"que" = ( -/obj/item/lightstick/red/variant/planted, -/turf/open/auto_turf/snow/layer3, -/area/shiva/exterior/junkyard) +"quL" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/west, +/turf/open/gm/river, +/area/shiva/interior/warehouse/caves) "qvr" = ( /obj/structure/machinery/alarm{ dir = 8; @@ -18176,6 +18087,17 @@ /obj/item/stool, /turf/open/floor/shiva/floor3, /area/shiva/interior/colony/research_hab) +"qyQ" = ( +/obj/structure/prop/ice_colony/flamingo/festive{ + dir = 4 + }, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/southwest_valley) +"qyR" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/west, +/turf/open/gm/river, +/area/shiva/exterior/valley) "qza" = ( /obj/item/device/flashlight/flare, /turf/open/auto_turf/snow/layer2, @@ -18192,13 +18114,6 @@ /obj/effect/spawner/random/toolbox, /turf/open/floor/shiva/yellowfull/west, /area/shiva/interior/colony/medseceng) -"qBM" = ( -/obj/structure/platform/strata{ - dir = 8 - }, -/obj/structure/platform/strata, -/turf/open/gm/river, -/area/shiva/interior/caves/cp_camp) "qCa" = ( /obj/structure/bed/chair{ dir = 4 @@ -18226,21 +18141,15 @@ /obj/structure/barricade/metal, /turf/open/floor/shiva/floor3, /area/shiva/interior/colony/botany) -"qCW" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/gm/river, -/area/shiva/interior/caves/research_caves) "qDg" = ( /obj/structure/bed/chair{ dir = 8 }, /turf/open/floor/plating, /area/shiva/interior/bar) +"qDh" = ( +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/southwest_valley) "qDJ" = ( /obj/structure/morgue{ dir = 8 @@ -18273,22 +18182,27 @@ "qEH" = ( /obj/structure/largecrate/random/case/small, /turf/open/auto_turf/ice/layer1, -/area/shiva/interior/aerodrome) +/area/shiva/exterior/junkyard/cp_bar) "qEK" = ( /obj/structure/prop/invuln/ice_prefab/standalone{ icon_state = "white" }, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_s_research) -"qEQ" = ( -/obj/structure/platform/strata, -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/auto_turf/snow/layer1, -/area/shiva/exterior/junkyard) "qFx" = ( /obj/effect/landmark/static_comms/net_one, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/telecomm/lz1_north) +"qFN" = ( +/obj/effect/decal/cleanable/blood, +/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, +/obj/effect/landmark/corpsespawner/chef, +/turf/open/floor/prison/kitchen, +/area/shiva/interior/bar) +"qFO" = ( +/obj/structure/platform_decoration/metal/shiva/east, +/turf/open/auto_turf/snow/layer0, +/area/shiva/exterior/cp_colony_grounds) "qGq" = ( /obj/item/frame/bucket_sensor, /turf/open/floor/shiva/wredfull, @@ -18298,9 +18212,18 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_colony_grounds) +"qHW" = ( +/obj/structure/platform_decoration/stone/strata/north, +/turf/open/gm/river/no_overlay, +/area/shiva/interior/caves/cp_camp) "qIr" = ( /turf/open/floor/plating/plating_catwalk/shiva, /area/shiva/interior/warehouse) +"qIu" = ( +/obj/structure/platform/stone/strata, +/obj/structure/platform/stone/strata/west, +/turf/open/gm/river, +/area/shiva/exterior/cp_lz2) "qII" = ( /turf/open/floor/shiva/multi_tiles/southeast, /area/shiva/exterior/cp_lz2) @@ -18312,6 +18235,13 @@ /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/shiva/yellow/west, /area/shiva/interior/colony/medseceng) +"qKB" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/shiva/purplefull/north, +/area/shiva/interior/colony/research_hab) "qLA" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 8 @@ -18357,13 +18287,6 @@ }, /turf/open/floor/shiva/floor3, /area/shiva/interior/colony/botany) -"qNB" = ( -/obj/structure/platform/strata, -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/gm/river, -/area/shiva/exterior/cp_lz2) "qNK" = ( /obj/structure/surface/table, /obj/item/reagent_container/glass/beaker/cryopredmix{ @@ -18384,9 +18307,6 @@ }, /turf/open/floor/carpet, /area/shiva/interior/colony/research_hab) -"qOD" = ( -/turf/open/floor/shiva/yellow/north, -/area/shiva/interior/colony/deck) "qOE" = ( /obj/structure/surface/rack, /obj/item/storage/firstaid/rad, @@ -18409,14 +18329,18 @@ }, /turf/open/floor/interior/plastic/alt, /area/shiva/interior/warehouse) +"qQB" = ( +/obj/structure/platform/metal/shiva/west, +/turf/open/auto_turf/snow/layer4, +/area/shiva/exterior/southwest_valley) +"qQT" = ( +/obj/structure/platform_decoration/stone/strata/east, +/turf/open/auto_turf/snow/layer1, +/area/shiva/exterior/lz1_valley) "qRb" = ( /obj/structure/barricade/metal/wired, /turf/open/floor/shiva/north, /area/shiva/exterior/lz2_fortress) -"qRl" = ( -/obj/structure/platform/strata, -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/caves/s_lz2) "qRo" = ( /obj/structure/closet/secure_closet/medical3{ req_access = null @@ -18511,6 +18435,15 @@ }, /turf/open/floor/shiva/radiator_tile, /area/shiva/exterior/lz2_fortress) +"qXe" = ( +/obj/structure/platform_decoration/stone/strata/north, +/obj/item/lightstick/red/variant/planted{ + pixel_x = -7; + pixel_y = -5 + }, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/auto_turf/snow/layer0, +/area/shiva/exterior/cp_s_research) "qXk" = ( /obj/item/clipboard, /turf/open/floor/shiva/floor3, @@ -18528,6 +18461,13 @@ }, /turf/open/floor/plating, /area/shiva/exterior/valley) +"qXQ" = ( +/obj/item/stack/snow{ + pixel_x = -7 + }, +/obj/item/tool/shovel/snow, +/turf/open/auto_turf/snow/layer3, +/area/shiva/exterior/southwest_valley) "qXS" = ( /turf/open/floor/shiva, /area/shiva/interior/bar) @@ -18647,10 +18587,12 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/wood, /area/shiva/interior/aerodrome) -"rfi" = ( -/obj/structure/platform/strata, +"rff" = ( +/obj/structure/flora/bush/snow{ + icon_state = "snowgrassall_1" + }, /turf/open/auto_turf/snow/layer3, -/area/shiva/exterior/cp_lz2) +/area/shiva/exterior/southwest_valley) "rfU" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 9 @@ -18676,6 +18618,15 @@ /obj/item/storage/firstaid/fire, /turf/open/floor/interior/plastic, /area/shiva/interior/warehouse) +"rhL" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W-corner" + }, +/obj/structure/barricade/metal{ + dir = 4 + }, +/turf/open/floor/plating, +/area/shiva/exterior/southwest_valley) "rhS" = ( /obj/structure/surface/table, /obj/item/paper/janitor{ @@ -18738,20 +18689,10 @@ }, /turf/open/auto_turf/snow/layer1, /area/shiva/interior/caves/cp_camp) -"rli" = ( -/obj/structure/flora/tree/dead/tree_1, -/turf/open/auto_turf/snow/layer2, -/area/shiva/exterior/junkyard) "rnz" = ( /obj/structure/flora/pottedplant, /turf/open/floor/wood, /area/shiva/interior/colony/central) -"rnB" = ( -/obj/structure/platform_decoration/shiva/catwalk{ - dir = 8 - }, -/turf/open/auto_turf/snow/layer0, -/area/shiva/exterior/cp_colony_grounds) "rov" = ( /obj/item/lightstick/red/spoke/planted{ layer = 3.1; @@ -18760,6 +18701,14 @@ }, /turf/open/auto_turf/ice/layer1, /area/shiva/interior/caves/cp_camp) +"rpq" = ( +/obj/structure/platform/metal/shiva/north, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/southwest_valley) +"rps" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/shiva/yellowcorners/east, +/area/shiva/interior/colony/medseceng) "rpv" = ( /obj/item/stack/rods, /turf/open/floor/shiva/bluefull, @@ -18855,10 +18804,6 @@ /obj/item/tool/pickaxe/plasmacutter, /turf/open/floor/shiva/yellow/southwest, /area/shiva/interior/aux_power) -"rzw" = ( -/obj/structure/platform_decoration/strata, -/turf/open/auto_turf/snow/layer3, -/area/shiva/interior/caves/cp_camp) "rzz" = ( /obj/structure/flora/pottedplant, /turf/open/floor/shiva/green/southeast, @@ -18892,22 +18837,17 @@ }, /turf/open/floor/wood, /area/shiva/interior/colony/s_admin) +"rAv" = ( +/obj/structure/platform_decoration/metal/shiva/west, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/valley) "rAF" = ( /obj/structure/barricade/handrail/strata, /turf/open/floor/shiva/multi_tiles/north, -/area/shiva/interior/colony/deck) +/area/shiva/interior/colony/central) "rAH" = ( /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_s_research) -"rBk" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/gm/river, -/area/shiva/interior/warehouse/caves) "rBr" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/shiva/north, @@ -18929,15 +18869,17 @@ /obj/item/tool/wirecutters, /turf/open/auto_turf/snow/layer1, /area/shiva/interior/colony/central) -"rDn" = ( -/turf/open/floor/shiva/yellowcorners/west, -/area/shiva/interior/colony/deck) "rEd" = ( /obj/structure/flora/bush/snow{ icon_state = "snowgrassgb_2" }, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/junkyard) +"rEz" = ( +/obj/structure/platform/stone/strata, +/obj/structure/platform/stone/strata/west, +/turf/open/gm/river, +/area/shiva/exterior/cp_s_research) "rEQ" = ( /obj/structure/flora/tree/dead/tree_4, /turf/open/auto_turf/snow/layer2, @@ -18976,12 +18918,6 @@ /obj/structure/largecrate/random/case/double, /turf/open/floor/shiva/floor3, /area/shiva/interior/aerodrome) -"rJI" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/turf/open/gm/river, -/area/shiva/interior/caves/cp_camp) "rKk" = ( /turf/open/auto_turf/snow/layer0, /area/shiva/exterior/junkyard/fortbiceps) @@ -18995,16 +18931,15 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_s_research) +"rKJ" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/east, +/turf/open/gm/river, +/area/shiva/interior/warehouse/caves) "rKW" = ( /obj/structure/machinery/computer3/powermonitor, /turf/open/floor/shiva/north, /area/shiva/interior/colony/medseceng) -"rLu" = ( -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/auto_turf/snow/layer1, -/area/shiva/exterior/lz1_valley) "rLD" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/cameras{ @@ -19049,10 +18984,6 @@ /obj/structure/prop/ice_colony/soil_net, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/junkyard) -"rNY" = ( -/obj/effect/landmark/monkey_spawn, -/turf/open/auto_turf/snow/layer0, -/area/shiva/exterior/junkyard) "rNZ" = ( /obj/structure/prop/ice_colony/dense/planter_box{ dir = 9 @@ -19072,6 +19003,10 @@ }, /turf/open/floor/plating, /area/shiva/interior/colony/medseceng) +"rOL" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/shiva/multi_tiles/north, +/area/shiva/interior/colony/research_hab) "rPa" = ( /obj/structure/bed/chair/dropship/passenger{ dir = 4 @@ -19137,6 +19072,11 @@ }, /turf/open/floor/shiva/bluefull/west, /area/shiva/interior/bar) +"rTR" = ( +/obj/structure/platform/stone/strata/west, +/obj/structure/platform/stone/strata, +/turf/open/gm/river, +/area/shiva/exterior/cp_lz2) "rUD" = ( /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb{ desc = "Shhhh, he's sleeping."; @@ -19184,6 +19124,11 @@ /obj/effect/landmark/static_comms/net_two, /turf/open/auto_turf/ice/layer1, /area/shiva/exterior/telecomm/lz2_northeast) +"rWq" = ( +/obj/structure/platform/stone/strata/west, +/obj/structure/platform/stone/strata, +/turf/open/gm/river, +/area/shiva/interior/caves/cp_camp) "rWt" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -19196,6 +19141,15 @@ }, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_colony_grounds) +"rWN" = ( +/obj/item/tool/shovel/snow, +/obj/item/storage/fancy/cigarettes/arcturian_ace{ + layer = 3.1; + pixel_x = -8; + pixel_y = 23 + }, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/southwest_valley) "rWS" = ( /obj/item/ammo_magazine/rifle/ap, /turf/open/floor/shiva/multi_tiles/north, @@ -19263,10 +19217,6 @@ }, /turf/open/floor/shiva/multi_tiles/north, /area/shiva/interior/colony/research_hab) -"rZP" = ( -/obj/structure/machinery/optable, -/turf/open/floor/plating, -/area/shiva/interior/colony/central) "rZV" = ( /obj/structure/bed, /obj/item/bedsheet/medical, @@ -19290,6 +19240,9 @@ }, /turf/open/auto_turf/snow/layer2, /area/shiva/interior/caves/cp_camp) +"saY" = ( +/turf/open/auto_turf/snow/layer3, +/area/shiva/exterior/southwest_valley) "sbd" = ( /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/shiva/floor3, @@ -19302,18 +19255,21 @@ /obj/structure/largecrate/random/barrel/green, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/junkyard) -"scp" = ( -/obj/structure/platform_decoration/shiva/catwalk{ - dir = 4 - }, -/turf/open/auto_turf/snow/layer2, -/area/shiva/exterior/junkyard) "scN" = ( /obj/structure/surface/table, /obj/item/device/assembly/infra, /obj/item/device/assembly/voice, /turf/open/floor/shiva/yellow/northeast, /area/shiva/interior/colony/medseceng) +"sdu" = ( +/obj/structure/platform/stone/strata, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/auto_turf/snow/layer1, +/area/shiva/exterior/junkyard) +"sdD" = ( +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/auto_turf/ice/layer1, +/area/shiva/interior/caves/research_caves) "sdF" = ( /obj/structure/surface/table, /obj/item/tool/kitchen/knife{ @@ -19329,6 +19285,12 @@ /obj/structure/machinery/message_server, /turf/open/floor/shiva/floor3, /area/shiva/interior/colony/central) +"sdQ" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/east, +/obj/structure/platform/stone/strata/west, +/turf/open/gm/river, +/area/shiva/interior/warehouse/caves) "sef" = ( /obj/structure/barricade/handrail/wire{ dir = 4 @@ -19426,6 +19388,10 @@ "sjo" = ( /turf/open/floor/shiva/green/northwest, /area/shiva/interior/colony/botany) +"sjA" = ( +/obj/item/lightstick/planted, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/southwest_valley) "skl" = ( /obj/effect/decal/cleanable/dirt, /turf/open/auto_turf/snow/layer0, @@ -19468,6 +19434,15 @@ /obj/item/lightstick/red/spoke, /turf/open/floor/shiva, /area/shiva/interior/bar) +"smn" = ( +/obj/structure/prop/ice_colony/surveying_device{ + layer = 3.01; + pixel_x = -7; + pixel_y = 16 + }, +/obj/structure/platform_decoration/stone/strata, +/turf/open/auto_turf/ice/layer1, +/area/shiva/exterior/cp_lz2) "smy" = ( /obj/structure/surface/table, /obj/effect/spawner/random/tool, @@ -19508,7 +19483,7 @@ /obj/item/wrapping_paper, /obj/structure/surface/table/reinforced/prison, /turf/open/floor/shiva/floor3, -/area/shiva/interior/colony/deck) +/area/shiva/interior/colony/central) "srJ" = ( /obj/structure/stairs/perspective/ice{ dir = 4; @@ -19519,12 +19494,6 @@ "ssf" = ( /turf/open/auto_turf/snow/layer3, /area/shiva/interior/colony/central) -"stv" = ( -/obj/structure/platform_decoration/strata{ - dir = 8 - }, -/turf/open/auto_turf/snow/layer4, -/area/shiva/exterior/cp_lz2) "stN" = ( /turf/open/floor/shiva/bluefull, /area/shiva/interior/colony/n_admin) @@ -19550,10 +19519,26 @@ }, /turf/open/auto_turf/snow/layer3, /area/shiva/interior/caves/cp_camp) +"suo" = ( +/obj/structure/platform/stone/strata/north, +/turf/open/auto_turf/ice/layer1, +/area/shiva/exterior/junkyard/cp_bar) "suD" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_core, /turf/open/auto_turf/ice/layer1, /area/shiva/interior/caves/medseceng_caves) +"svp" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/shiva/east, +/turf/open/floor/plating, +/area/shiva/interior/colony/central) +"svT" = ( +/obj/structure/platform/stone/strata/east, +/turf/open/auto_turf/snow/layer2, +/area/shiva/interior/caves/s_lz2) "swF" = ( /obj/structure/machinery/firealarm{ dir = 8; @@ -19591,6 +19576,10 @@ /obj/structure/machinery/landinglight/ds2/spoke, /turf/open/floor/shiva/north, /area/shiva/exterior/lz2_fortress) +"sxS" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/shiva/yellow/east, +/area/shiva/interior/colony/medseceng) "sxT" = ( /obj/structure/flora/grass/tallgrass/ice, /turf/open/auto_turf/snow/layer0, @@ -19608,6 +19597,11 @@ /obj/structure/janitorialcart, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/junkyard) +"syE" = ( +/obj/structure/platform/stone/strata/east, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/auto_turf/snow/layer1, +/area/shiva/exterior/junkyard) "syK" = ( /obj/structure/surface/rack, /obj/item/weapon/ice_axe/green{ @@ -19619,6 +19613,10 @@ }, /turf/open/floor/shiva/multi_tiles/west, /area/shiva/exterior/cp_colony_grounds) +"syU" = ( +/obj/structure/platform/stone/strata/north, +/turf/open/gm/river/no_overlay, +/area/shiva/interior/caves/cp_camp) "syV" = ( /obj/structure/surface/table/reinforced, /obj/item/stack/medical/bruise_pack, @@ -19626,12 +19624,12 @@ /obj/item/clothing/gloves/yellow, /turf/open/floor/shiva/north, /area/shiva/interior/colony/medseceng) -"szU" = ( -/obj/structure/prop/ice_colony/flamingo/festive{ - dir = 4 - }, -/turf/open/auto_turf/snow/layer2, -/area/shiva/exterior/junkyard) +"szL" = ( +/obj/structure/platform/stone/strata/west, +/obj/structure/platform/stone/strata/east, +/obj/structure/platform/stone/strata, +/turf/open/gm/river, +/area/shiva/interior/warehouse/caves) "sAe" = ( /obj/structure/machinery/light/double{ dir = 4; @@ -19685,6 +19683,16 @@ }, /turf/open/auto_turf/snow/layer0, /area/shiva/interior/colony/central) +"sCk" = ( +/obj/structure/platform/stone/strata/east, +/obj/structure/platform_decoration/stone/strata/north, +/obj/structure/prop/ice_colony/dense/planter_box/hydro{ + density = 0; + pixel_x = -10; + pixel_y = 10 + }, +/turf/open/gm/river/no_overlay, +/area/shiva/interior/caves/cp_camp) "sCl" = ( /obj/structure/surface/table, /obj/item/clipboard{ @@ -19719,9 +19727,6 @@ /obj/structure/largecrate/random/case/double, /turf/open/auto_turf/ice/layer1, /area/shiva/interior/caves/cp_camp) -"sFs" = ( -/turf/open/auto_turf/snow/layer1, -/area/shiva/interior/aerodrome) "sFu" = ( /obj/item/tool/mop, /turf/open/floor/wood, @@ -19839,6 +19844,11 @@ }, /turf/open/floor/shiva, /area/shiva/interior/aerodrome) +"sKp" = ( +/obj/structure/platform_decoration/stone/strata, +/obj/item/lightstick/variant/planted, +/turf/open/auto_turf/snow/layer3, +/area/shiva/exterior/cp_lz2) "sKH" = ( /obj/item/lightstick/red/spoke/planted{ pixel_x = 12 @@ -19874,7 +19884,22 @@ icon_state = "p_stair_full" }, /turf/open/floor/plating, -/area/shiva/interior/colony/deck) +/area/shiva/interior/colony/medseceng) +"sNk" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out" + }, +/obj/structure/desertdam/decals/road_stop{ + icon_state = "road_edge_decal5"; + pixel_x = -14 + }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/shiva/purplefull/west, +/area/shiva/interior/colony/research_hab) +"sNv" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/shiva/floor3, +/area/shiva/interior/colony/central) "sNX" = ( /obj/effect/landmark/xeno_spawn, /turf/open/floor/shiva, @@ -19888,6 +19913,10 @@ /obj/structure/surface/table, /turf/open/floor/shiva/yellow/northwest, /area/shiva/interior/colony/medseceng) +"sOw" = ( +/obj/structure/platform_decoration/stone/strata, +/turf/open/auto_turf/snow/layer4, +/area/shiva/interior/caves/cp_camp) "sPn" = ( /obj/structure/surface/table, /obj/effect/spawner/random/toolbox{ @@ -19923,6 +19952,11 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/wood, /area/shiva/interior/colony/central) +"sQz" = ( +/obj/structure/platform/stone/strata, +/obj/structure/platform/stone/strata/west, +/turf/open/auto_turf/ice/layer1, +/area/shiva/interior/oob/dev_room) "sQU" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/shiva/redfull/west, @@ -19936,6 +19970,11 @@ }, /turf/open/floor/wood, /area/shiva/interior/bar) +"sSG" = ( +/obj/structure/platform/stone/strata/west, +/obj/structure/platform/stone/strata/north, +/turf/open/gm/river, +/area/shiva/interior/warehouse/caves) "sTd" = ( /obj/structure/prop/ice_colony/soil_net, /turf/open/auto_turf/snow/layer3, @@ -19962,6 +20001,15 @@ /obj/item/stack/rods, /turf/open/floor/shiva/floor3, /area/shiva/exterior/lz2_fortress) +"sWw" = ( +/obj/vehicle/train/cargo/trolley, +/turf/open/auto_turf/snow/layer0, +/area/shiva/exterior/southwest_valley) +"sWD" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/west, +/turf/open/gm/river, +/area/shiva/interior/caves/cp_camp) "sXr" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/paper_bin{ @@ -19969,7 +20017,7 @@ }, /obj/item/tool/pen/blue, /turf/open/floor/shiva/floor3, -/area/shiva/interior/colony/deck) +/area/shiva/interior/colony/central) "sXt" = ( /obj/structure/machinery/light/double, /turf/open/asphalt/cement, @@ -20024,18 +20072,6 @@ }, /turf/open/floor/shiva/north, /area/shiva/exterior/lz2_fortress) -"tad" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 4 - }, -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/gm/river, -/area/shiva/interior/warehouse/caves) "taq" = ( /obj/item/tool/kitchen/rollingpin, /obj/structure/surface/table/reinforced/prison, @@ -20079,12 +20115,6 @@ }, /turf/open/floor/shiva/bluefull, /area/shiva/interior/colony/s_admin) -"tdG" = ( -/obj/structure/platform_decoration/strata{ - dir = 8 - }, -/turf/open/gm/river/no_overlay, -/area/shiva/interior/caves/cp_camp) "tdR" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/door/window/brigdoor/westleft{ @@ -20100,13 +20130,6 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/shiva/redfull/west, /area/shiva/interior/colony/medseceng) -"tes" = ( -/obj/structure/platform/strata, -/obj/structure/barricade/handrail/wire{ - layer = 3.5 - }, -/turf/open/gm/river/no_overlay, -/area/shiva/interior/caves/cp_camp) "tez" = ( /obj/structure/barricade/snow{ dir = 1 @@ -20135,11 +20158,20 @@ "tfd" = ( /turf/open/floor/wood, /area/shiva/interior/colony/central) +"tfB" = ( +/obj/structure/platform/stone/strata, +/turf/open/gm/river, +/area/shiva/interior/caves/cp_camp) "tfQ" = ( /obj/structure/prop/ice_colony/dense/planter_box/plated, /obj/item/tool/shovel/spade, /turf/open/auto_turf/snow/layer0, /area/shiva/interior/colony/botany) +"tgJ" = ( +/obj/structure/barricade/wooden, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/plating, +/area/shiva/interior/colony/research_hab) "thc" = ( /obj/structure/surface/table, /obj/item/storage/fancy/cigarettes/lucky_strikes{ @@ -20167,9 +20199,6 @@ /obj/structure/fence, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/junkyard) -"tjL" = ( -/turf/open/auto_turf/snow/layer4, -/area/shiva/interior/aerodrome) "tkb" = ( /obj/structure/surface/table, /obj/item/tool/pen/blue, @@ -20190,15 +20219,14 @@ /obj/structure/prop/invuln/ice_prefab/standalone, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/junkyard) -"tlr" = ( -/obj/structure/platform_decoration/strata{ - dir = 4 - }, -/obj/structure/platform_decoration/strata{ - dir = 8 +"tlq" = ( +/obj/structure/stairs/perspective/ice{ + dir = 8; + icon_state = "p_stair_sn_full_cap" }, -/turf/open/gm/river, -/area/shiva/interior/warehouse/caves) +/obj/structure/platform/stone/strata/east, +/turf/open/auto_turf/ice/layer1, +/area/shiva/exterior/cp_lz2) "tlB" = ( /turf/open/auto_turf/snow/layer3, /area/shiva/interior/caves/cp_camp) @@ -20224,7 +20252,7 @@ "tmP" = ( /obj/structure/largecrate/random/case/double, /turf/open/auto_turf/ice/layer1, -/area/shiva/interior/aerodrome) +/area/shiva/exterior/junkyard/cp_bar) "tmV" = ( /obj/structure/machinery/door/airlock/multi_tile/elevator/arrivals, /turf/open/shuttle/elevator/grating, @@ -20239,11 +20267,12 @@ "tnu" = ( /turf/closed/wall/shiva/prefabricated, /area/shiva/interior/bar) -"tnz" = ( -/obj/effect/decal/cleanable/blood, -/obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, -/turf/open/floor/prison/kitchen, -/area/shiva/interior/bar) +"tnw" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/turf/open/floor/plating, +/area/shiva/interior/colony/central) "tnG" = ( /obj/structure/inflatable, /turf/open/auto_turf/ice/layer1, @@ -20294,19 +20323,6 @@ /obj/item/stack/rods, /turf/open/auto_turf/snow/layer1, /area/shiva/interior/caves/cp_camp) -"tpg" = ( -/turf/open/floor/plating/plating_catwalk/shiva, -/area/shiva/exterior/junkyard) -"tpL" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out" - }, -/obj/structure/desertdam/decals/road_stop{ - icon_state = "road_edge_decal5"; - pixel_x = -14 - }, -/turf/open/floor/shiva/purplefull/west, -/area/shiva/interior/colony/research_hab) "tqs" = ( /obj/structure/prop/ice_colony/dense/ice_tray{ pixel_y = 5 @@ -20321,12 +20337,25 @@ /obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/shiva/north, /area/shiva/interior/colony/s_admin) +"trg" = ( +/obj/structure/platform/metal/shiva/north, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/valley) "trj" = ( /obj/structure/prop/invuln/ice_prefab{ dir = 10 }, /turf/open/auto_turf/ice/layer0, /area/shiva/interior/caves/cp_camp) +"trq" = ( +/obj/structure/platform/stone/strata, +/obj/structure/platform/stone/strata/west, +/turf/open/gm/river, +/area/shiva/interior/caves/research_caves) +"trw" = ( +/obj/structure/platform/stone/strata, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/lz1_valley) "trX" = ( /obj/structure/machinery/conveyor, /obj/effect/decal/cleanable/dirt, @@ -20366,13 +20395,6 @@ }, /turf/open/floor/plating, /area/shiva/exterior/valley) -"tuz" = ( -/obj/structure/platform_decoration/strata{ - dir = 1 - }, -/obj/structure/platform_decoration/strata, -/turf/open/gm/river, -/area/shiva/interior/warehouse/caves) "tuA" = ( /obj/structure/largecrate/random/mini/chest{ pixel_x = -6; @@ -20451,6 +20473,10 @@ /obj/item/device/flashlight/lamp/tripod/grey, /turf/open/auto_turf/ice/layer1, /area/shiva/interior/caves/cp_camp) +"tzn" = ( +/obj/structure/platform_decoration/stone/strata/north, +/turf/open/auto_turf/snow/layer4, +/area/shiva/exterior/lz1_valley) "tzo" = ( /turf/open/shuttle/elevator/grating, /area/shiva/interior/aerodrome) @@ -20462,25 +20488,24 @@ /area/shiva/interior/aux_power) "tzH" = ( /turf/open/floor/shiva/multi_tiles/east, -/area/shiva/interior/colony/deck) +/area/shiva/interior/colony/central) "tAc" = ( /obj/structure/flora/bush/ausbushes/lavendergrass{ icon_state = "lavendergrass_4" }, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_lz2) -"tBB" = ( -/obj/structure/platform/strata, -/turf/open/auto_turf/snow/layer4, -/area/shiva/exterior/junkyard/cp_bar) +"tAe" = ( +/obj/structure/largecrate/random/secure, +/obj/item/ashtray/bronze{ + pixel_y = 7 + }, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/southwest_valley) "tCi" = ( /obj/item/stack/cable_coil/cut, /turf/open/floor/shiva/north, /area/shiva/interior/colony/medseceng) -"tDb" = ( -/obj/structure/platform/shiva/catwalk, -/turf/open/auto_turf/snow/layer1, -/area/shiva/exterior/valley) "tDg" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/drinks/cans/waterbottle{ @@ -20496,13 +20521,6 @@ }, /turf/open/floor/plating, /area/shiva/interior/colony/research_hab) -"tDr" = ( -/obj/structure/platform/shiva/catwalk{ - dir = 1 - }, -/obj/item/lightstick/red/spoke/planted, -/turf/open/auto_turf/snow/layer0, -/area/shiva/exterior/cp_colony_grounds) "tEl" = ( /obj/structure/window/framed/shiva, /turf/open/floor/plating, @@ -20518,13 +20536,6 @@ /obj/structure/blocker/invisible_wall, /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/junkyard) -"tFd" = ( -/obj/structure/platform/strata{ - dir = 8 - }, -/obj/structure/platform/strata, -/turf/open/gm/river, -/area/shiva/interior/warehouse/caves) "tFk" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 1; @@ -20538,16 +20549,6 @@ }, /turf/open/auto_turf/snow/layer2, /area/shiva/interior/caves/cp_camp) -"tFy" = ( -/obj/structure/platform/strata{ - dir = 8 - }, -/obj/structure/platform/strata{ - dir = 4 - }, -/obj/structure/platform/strata, -/turf/open/gm/river, -/area/shiva/interior/warehouse/caves) "tGs" = ( /obj/item/lightstick/red/spoke/planted{ pixel_x = 12; @@ -20613,16 +20614,6 @@ /obj/structure/blocker/invisible_wall, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/junkyard) -"tJY" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/obj/structure/desertdam/decals/road_stop{ - icon_state = "road_edge_decal8"; - pixel_x = -14 - }, -/turf/open/floor/shiva/purplefull/west, -/area/shiva/interior/colony/research_hab) "tKd" = ( /obj/structure/bed/chair/comfy/blue, /turf/open/floor/shiva/north, @@ -20644,38 +20635,29 @@ }, /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/junkyard) -"tKV" = ( -/obj/structure/platform_decoration/strata{ - dir = 1 - }, -/turf/open/auto_turf/ice/layer1, -/area/shiva/exterior/telecomm/lz2_southeast) +"tLy" = ( +/obj/structure/platform/stone/strata, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/auto_turf/snow/layer1, +/area/shiva/exterior/cp_s_research) "tLz" = ( /obj/structure/machinery/space_heater, /turf/open/floor/shiva/north, /area/shiva/interior/colony/medseceng) -"tLC" = ( -/obj/item/lightstick/red/variant/planted, -/obj/structure/platform/shiva/catwalk{ - dir = 4 - }, -/turf/open/auto_turf/snow/layer2, -/area/shiva/interior/aerodrome) -"tLP" = ( -/obj/structure/platform/shiva/catwalk{ - dir = 1 - }, -/obj/structure/platform/shiva/catwalk{ - dir = 4 - }, -/turf/open/gm/river/no_overlay, -/area/shiva/interior/colony/central) "tLW" = ( /obj/structure/flora/bush/snow{ icon_state = "snowgrassbb_3" }, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_colony_grounds) +"tMv" = ( +/obj/effect/sentry_landmark/lz_2/top_right, +/turf/open/floor/shiva/floor3, +/area/shiva/exterior/lz2_fortress) +"tMy" = ( +/obj/structure/platform/metal/shiva/west, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/southwest_valley) "tMR" = ( /obj/structure/ice/thin/single{ opacity = 1; @@ -20743,18 +20725,14 @@ }, /turf/open/auto_turf/snow/layer0, /area/shiva/interior/caves/cp_camp) +"tPu" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/shiva/multi_tiles/west, +/area/shiva/interior/colony/research_hab) "tPz" = ( /obj/structure/largecrate/random, /turf/open/floor/shiva/floor3, /area/shiva/interior/valley_huts/no2) -"tPB" = ( -/obj/structure/platform/strata, -/turf/open/auto_turf/snow/layer4, -/area/shiva/interior/caves/cp_camp) -"tPJ" = ( -/obj/structure/platform/shiva/catwalk, -/turf/open/auto_turf/snow/layer1, -/area/shiva/exterior/junkyard/fortbiceps) "tQn" = ( /obj/structure/barricade/handrail/wire, /turf/open/auto_turf/snow/layer2, @@ -20815,6 +20793,10 @@ }, /turf/open/floor/prison/kitchen, /area/shiva/interior/bar) +"tSq" = ( +/obj/structure/flora/tree/dead/tree_4, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/southwest_valley) "tSt" = ( /obj/structure/barricade/handrail/strata, /obj/structure/surface/table, @@ -20863,6 +20845,11 @@ }, /turf/open/auto_turf/snow/layer0, /area/shiva/exterior/cp_colony_grounds) +"tUu" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/west, +/turf/open/auto_turf/ice/layer0, +/area/shiva/interior/caves/cp_camp) "tUN" = ( /obj/effect/landmark/nightmare{ insert_tag = "lz2-southwest" @@ -20881,13 +20868,6 @@ }, /turf/open/floor/shiva/bluefull, /area/shiva/interior/colony/s_admin) -"tWv" = ( -/obj/structure/machinery/light/double{ - dir = 1; - pixel_y = 9 - }, -/turf/open/floor/shiva/radiator_tile2, -/area/shiva/interior/colony/medseceng) "tWz" = ( /obj/structure/machinery/space_heater, /turf/open/floor/shiva, @@ -20986,6 +20966,10 @@ /obj/structure/blocker/invisible_wall, /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/junkyard) +"ubF" = ( +/obj/structure/platform_decoration/stone/strata/west, +/turf/open/auto_turf/snow/layer1, +/area/shiva/exterior/lz1_valley) "ubG" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ density = 0; @@ -20995,6 +20979,10 @@ }, /turf/open/floor/shiva/north, /area/shiva/interior/lz2_habs) +"ubQ" = ( +/obj/structure/platform_decoration/stone/strata, +/turf/open/auto_turf/ice/layer1, +/area/shiva/exterior/cp_lz2) "ucn" = ( /obj/structure/largecrate/random/mini/med{ layer = 3.01; @@ -21025,6 +21013,10 @@ /obj/effect/landmark/queen_spawn, /turf/open/floor/shiva/multi_tiles/west, /area/shiva/interior/colony/research_hab) +"udN" = ( +/obj/structure/platform_decoration/metal/shiva, +/turf/open/auto_turf/snow/layer3, +/area/shiva/exterior/valley) "uee" = ( /obj/item/weapon/gun/revolver/cmb, /turf/open/auto_turf/snow/layer0, @@ -21099,6 +21091,10 @@ "ugC" = ( /turf/open/auto_turf/ice/layer1, /area/shiva/interior/oob) +"ugK" = ( +/obj/structure/platform/stone/strata/north, +/turf/open/gm/river, +/area/shiva/exterior/valley) "ugP" = ( /obj/structure/computerframe, /turf/open/floor/shiva/redfull/west, @@ -21109,9 +21105,21 @@ }, /turf/open/floor/shiva/floor3, /area/shiva/exterior/cp_lz2) +"uhE" = ( +/obj/structure/platform/metal/shiva, +/turf/open/auto_turf/snow/layer1, +/area/shiva/exterior/valley) "uhL" = ( /turf/open/floor/shiva/floor3, /area/shiva/interior/colony/s_admin) +"uhM" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/shiva/east, +/turf/open/floor/plating, +/area/shiva/interior/colony/medseceng) "uhO" = ( /obj/item/lightstick/red/spoke/planted{ pixel_x = 11 @@ -21199,24 +21207,14 @@ /obj/structure/machinery/disposal, /turf/open/floor/shiva/north, /area/shiva/interior/garage) -"ulD" = ( -/obj/structure/cable/heavyduty{ - icon_state = "1-2-4-8" - }, -/obj/structure/platform/shiva/catwalk, -/turf/open/floor/plating/plating_catwalk/shiva, -/area/shiva/exterior/junkyard/fortbiceps) +"ulr" = ( +/obj/item/tool/shovel/snow, +/turf/open/auto_turf/snow/layer1, +/area/shiva/exterior/southwest_valley) "ulI" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, /turf/open/auto_turf/ice/layer1, /area/shiva/interior/caves/cp_camp) -"ulZ" = ( -/obj/structure/platform/shiva/catwalk, -/obj/structure/cable/heavyduty{ - icon_state = "1-2-4-8" - }, -/turf/open/floor/plating/plating_catwalk/shiva, -/area/shiva/exterior/junkyard/fortbiceps) "umj" = ( /obj/structure/foamed_metal, /obj/effect/decal/cleanable/ash, @@ -21289,6 +21287,10 @@ /obj/structure/machinery/space_heater, /turf/open/floor/shiva/redfull/west, /area/shiva/interior/colony/medseceng) +"urH" = ( +/obj/structure/flora/bush/ausbushes/lavendergrass, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/southwest_valley) "urX" = ( /obj/structure/flora/bush/snow{ icon_state = "snowgrassbb_3" @@ -21298,6 +21300,17 @@ "ush" = ( /turf/open/floor/shiva/yellow/northeast, /area/shiva/interior/garage) +"usQ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/obj/structure/desertdam/decals/road_stop{ + icon_state = "road_edge_decal8"; + pixel_x = -14 + }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, +/turf/open/floor/shiva/purplefull/west, +/area/shiva/interior/colony/research_hab) "usZ" = ( /obj/structure/barricade/handrail/wire{ dir = 8; @@ -21362,12 +21375,6 @@ "uxV" = ( /turf/open/floor/shiva/multi_tiles/north, /area/shiva/interior/colony/botany) -"uxZ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W-corner" - }, -/turf/open/floor/plating, -/area/shiva/exterior/junkyard) "uyI" = ( /obj/structure/largecrate/random/mini/small_case/c{ pixel_x = 11; @@ -21423,6 +21430,10 @@ }, /turf/open/auto_turf/snow/layer0, /area/shiva/exterior/cp_colony_grounds) +"uBt" = ( +/obj/effect/sentry_landmark/lz_1/top_left, +/turf/open/auto_turf/snow/layer2, +/area/shiva/interior/caves/cp_camp) "uBz" = ( /obj/structure/machinery/autolathe/full, /turf/open/floor/shiva/floor3, @@ -21450,17 +21461,20 @@ }, /turf/open/floor/shiva/north, /area/shiva/exterior/lz2_fortress) -"uEo" = ( -/obj/structure/platform/strata, -/obj/item/lightstick/variant/planted, -/turf/open/auto_turf/ice/layer1, -/area/shiva/exterior/cp_lz2) "uEx" = ( /obj/effect/decal/warning_stripes{ icon_state = "N" }, /turf/open/floor/shiva/purplefull/north, /area/shiva/interior/colony/research_hab) +"uFi" = ( +/obj/structure/machinery/light/double{ + dir = 1; + pixel_y = 9 + }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/plating, +/area/shiva/interior/colony/medseceng) "uFl" = ( /obj/structure/barricade/snow{ dir = 1 @@ -21513,6 +21527,13 @@ }, /turf/open/floor/prison/kitchen, /area/shiva/interior/colony/central) +"uIx" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/shiva/north, +/area/shiva/interior/colony/medseceng) "uIC" = ( /obj/structure/prop/invuln/minecart_tracks{ dir = 8 @@ -21557,6 +21578,10 @@ }, /turf/open/floor/shiva/multi_tiles/southeast, /area/shiva/interior/colony/central) +"uJi" = ( +/obj/structure/platform/stone/strata/north, +/turf/open/auto_turf/ice/layer1, +/area/shiva/interior/caves/cp_camp) "uJj" = ( /obj/structure/flora/bush/snow{ icon_state = "snowgrassbb_3"; @@ -21618,23 +21643,6 @@ "uKZ" = ( /turf/closed/wall/shiva/prefabricated, /area/shiva/interior/aerodrome) -"uLf" = ( -/obj/structure/platform/strata{ - dir = 4 - }, -/obj/structure/platform_decoration/strata{ - dir = 1 - }, -/obj/structure/prop/ice_colony/dense/planter_box/hydro{ - density = 0; - pixel_x = -10; - pixel_y = 10 - }, -/turf/open/gm/river/no_overlay, -/area/shiva/interior/caves/cp_camp) -"uLi" = ( -/turf/open/auto_turf/ice/layer0, -/area/shiva/interior/aerodrome) "uLn" = ( /obj/structure/closet/secure_closet/medical1{ req_access_txt = "100" @@ -21674,6 +21682,10 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor/plating, /area/shiva/interior/colony/medseceng) +"uOF" = ( +/obj/structure/platform/stone/strata/north, +/turf/open/gm/river, +/area/shiva/interior/caves/cp_camp) "uOR" = ( /obj/effect/landmark/xeno_spawn, /turf/open/floor/shiva/multi_tiles/southeast, @@ -21699,15 +21711,6 @@ }, /turf/open/floor/wood, /area/shiva/interior/bar) -"uQy" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform/shiva/catwalk{ - dir = 8 - }, -/turf/open/floor/plating, -/area/shiva/interior/colony/deck) "uQA" = ( /obj/structure/machinery/firealarm{ dir = 8; @@ -21778,6 +21781,16 @@ /obj/structure/machinery/vending/coffee, /turf/open/floor/shiva/bluefull, /area/shiva/interior/colony/n_admin) +"uUb" = ( +/obj/structure/flora/bush/snow{ + icon_state = "snowgrassbb_1" + }, +/turf/open/auto_turf/snow/layer3, +/area/shiva/exterior/southwest_valley) +"uUO" = ( +/obj/structure/platform/stone/strata/north, +/turf/open/auto_turf/snow/layer4, +/area/shiva/exterior/cp_lz2) "uVa" = ( /obj/structure/machinery/power/terminal{ dir = 1 @@ -21908,6 +21921,11 @@ /obj/structure/flora/pottedplant, /turf/open/floor/shiva/north, /area/shiva/interior/colony/s_admin) +"vdK" = ( +/obj/structure/platform/metal/shiva/west, +/obj/structure/largecrate/random/mini/med, +/turf/open/floor/shiva/north, +/area/shiva/exterior/lz2_fortress) "vdS" = ( /obj/structure/machinery/light/double{ dir = 1; @@ -21915,6 +21933,11 @@ }, /turf/open/floor/shiva/floor3, /area/shiva/interior/colony/research_hab) +"vei" = ( +/obj/item/stack/sheet/metal, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/shiva/wred/east, +/area/shiva/interior/colony/medseceng) "veo" = ( /obj/structure/surface/table, /obj/item/device/defibrillator, @@ -21931,11 +21954,6 @@ /obj/structure/machinery/light/double, /turf/open/floor/prison/kitchen, /area/shiva/interior/colony/central) -"veu" = ( -/obj/structure/platform_decoration/strata, -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/auto_turf/snow/layer3, -/area/shiva/exterior/junkyard) "vey" = ( /turf/open/floor/shiva/red/northeast, /area/shiva/interior/colony/medseceng) @@ -21949,10 +21967,6 @@ "vfd" = ( /turf/open/floor/shiva/multi_tiles/southeast, /area/shiva/interior/colony/central) -"vgR" = ( -/obj/structure/platform_decoration/strata, -/turf/open/auto_turf/snow/layer4, -/area/shiva/interior/caves/cp_camp) "vhp" = ( /obj/structure/surface/table, /obj/effect/landmark/objective_landmark/close, @@ -21976,12 +21990,6 @@ /obj/structure/machinery/space_heater, /turf/open/floor/shiva/north, /area/shiva/interior/garage) -"vip" = ( -/obj/structure/platform_decoration/shiva/catwalk{ - dir = 8 - }, -/turf/open/auto_turf/snow/layer2, -/area/shiva/exterior/valley) "viy" = ( /obj/structure/machinery/disposal, /turf/open/floor/shiva/north, @@ -22022,12 +22030,6 @@ /obj/structure/largecrate/random, /turf/open/floor/shiva/floor3, /area/shiva/interior/valley_huts) -"vlh" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/turf/open/auto_turf/ice/layer2, -/area/shiva/interior/caves/cp_camp) "vlD" = ( /obj/item/device/flashlight/lamp/tripod/grey, /turf/open/auto_turf/ice/layer1, @@ -22035,10 +22037,6 @@ "vmy" = ( /turf/open/floor/shiva/floor3, /area/shiva/interior/colony/botany) -"vnc" = ( -/obj/structure/platform/strata, -/turf/open/auto_turf/ice/layer0, -/area/shiva/interior/caves/cp_camp) "vno" = ( /obj/structure/closet/secure_closet/chemical{ req_access_txt = "100" @@ -22067,12 +22065,12 @@ }, /turf/open/floor/plating/plating_catwalk/shiva, /area/shiva/exterior/lz2_fortress) -"voo" = ( +"vou" = ( /obj/structure/prop/ice_colony/flamingo{ dir = 8 }, /turf/open/auto_turf/snow/layer2, -/area/shiva/exterior/junkyard) +/area/shiva/exterior/southwest_valley) "voH" = ( /obj/structure/machinery/landinglight/ds2/spoke{ pixel_x = 1; @@ -22080,6 +22078,20 @@ }, /turf/closed/wall/shiva/prefabricated/reinforced/hull, /area/shiva/exterior/lz2_fortress) +"vph" = ( +/obj/structure/barricade/handrail/strata{ + dir = 8 + }, +/obj/structure/barricade/handrail/strata{ + dir = 4 + }, +/obj/structure/barricade/handrail/strata, +/obj/structure/machinery/colony_floodlight{ + layer = 2.9; + pixel_y = 7 + }, +/turf/open/floor/shiva/north, +/area/shiva/interior/colony/central) "vpD" = ( /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/telecomm/lz1_north) @@ -22090,23 +22102,10 @@ "vqq" = ( /turf/open/floor/shiva/radiator_tile, /area/shiva/interior/colony/central) -"vqw" = ( -/obj/structure/platform/strata, -/turf/open/auto_turf/snow/layer1, -/area/shiva/exterior/cp_lz2) "vqT" = ( /obj/effect/landmark/monkey_spawn, /turf/open/auto_turf/snow/layer2, /area/shiva/interior/caves/cp_camp) -"vqV" = ( -/obj/structure/platform/shiva/catwalk{ - dir = 1 - }, -/obj/structure/prop/ice_colony/flamingo{ - dir = 9 - }, -/turf/open/auto_turf/snow/layer2, -/area/shiva/exterior/junkyard) "vrm" = ( /obj/structure/bed/chair/office/light{ dir = 4 @@ -22123,11 +22122,19 @@ }, /turf/open/floor/shiva/north, /area/shiva/interior/colony/medseceng) +"vrV" = ( +/obj/structure/platform_decoration/stone/strata, +/turf/open/auto_turf/snow/layer0, +/area/shiva/interior/caves/cp_camp) "vsi" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/box/wy_mre, /turf/open/floor/shiva/bluefull, /area/shiva/interior/colony/n_admin) +"vtf" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/plating, +/area/shiva/interior/caves/research_caves) "vty" = ( /obj/item/shard{ icon_state = "medium"; @@ -22139,6 +22146,13 @@ /obj/effect/decal/cleanable/blood/drip, /turf/open/auto_turf/snow/layer1, /area/shiva/interior/caves/cp_camp) +"vtD" = ( +/obj/structure/stairs/perspective/ice{ + dir = 1; + icon_state = "p_stair_full" + }, +/turf/open/auto_turf/snow/layer0, +/area/shiva/exterior/southwest_valley) "vuj" = ( /obj/structure/bed/roller, /turf/open/floor/shiva/floor3, @@ -22222,6 +22236,10 @@ /obj/structure/fence, /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/valley) +"vAv" = ( +/obj/effect/sentry_landmark/lz_1/top_left, +/turf/open/auto_turf/snow/layer0, +/area/shiva/interior/caves/cp_camp) "vAw" = ( /obj/structure/bed/chair, /obj/structure/machinery/light/double{ @@ -22233,13 +22251,6 @@ "vAT" = ( /turf/open/floor/shiva/green/northeast, /area/shiva/interior/colony/botany) -"vAU" = ( -/obj/structure/platform/strata{ - dir = 4 - }, -/obj/structure/platform/strata, -/turf/open/gm/river, -/area/shiva/interior/warehouse/caves) "vBg" = ( /obj/structure/curtain/black, /turf/open/floor/plating, @@ -22255,6 +22266,10 @@ /obj/item/clipboard, /turf/open/floor/shiva/redfull/west, /area/shiva/interior/colony/medseceng) +"vBE" = ( +/obj/structure/platform/metal/shiva/west, +/turf/open/floor/shiva/north, +/area/shiva/exterior/lz2_fortress) "vCe" = ( /obj/structure/flora/bush/snow{ icon_state = "snowgrassbb_1" @@ -22301,6 +22316,11 @@ /obj/structure/prop/ice_colony/surveying_device, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/junkyard/cp_bar) +"vDG" = ( +/obj/structure/platform/stone/strata, +/obj/structure/platform/stone/strata/north, +/turf/open/auto_turf/ice/layer1, +/area/shiva/interior/oob/dev_room) "vFi" = ( /obj/item/stack/sheet/metal, /turf/open/floor/plating, @@ -22309,6 +22329,11 @@ /obj/item/stack/sheet/metal/small_stack, /turf/open/floor/shiva/multi_tiles/east, /area/shiva/exterior/lz2_fortress) +"vFv" = ( +/obj/item/lightstick/red/variant/planted, +/obj/structure/platform/metal/shiva/east, +/turf/open/auto_turf/snow/layer2, +/area/shiva/interior/aerodrome) "vFR" = ( /obj/structure/machinery/space_heater, /turf/open/floor/shiva, @@ -22360,10 +22385,6 @@ }, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_lz2) -"vIJ" = ( -/obj/structure/platform_decoration/strata, -/turf/open/auto_turf/snow/layer0, -/area/shiva/interior/caves/cp_camp) "vIL" = ( /obj/item/stack/rods, /turf/open/floor/shiva/bluefull, @@ -22371,7 +22392,7 @@ "vJh" = ( /obj/structure/barricade/handrail/strata, /turf/open/floor/shiva/north, -/area/shiva/interior/colony/deck) +/area/shiva/interior/colony/central) "vJu" = ( /turf/closed/wall/shiva/prefabricated/blue, /area/shiva/exterior/valley) @@ -22415,15 +22436,6 @@ "vPr" = ( /turf/open/auto_turf/snow/layer3, /area/shiva/interior/warehouse/caves) -"vPK" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/gm/river, -/area/shiva/exterior/cp_lz2) "vPR" = ( /obj/structure/bed/chair/office/light{ dir = 8 @@ -22438,13 +22450,6 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/closed/wall/shiva/prefabricated/reinforced, /area/shiva/exterior/cp_colony_grounds) -"vRM" = ( -/obj/structure/platform/strata{ - dir = 8 - }, -/obj/structure/platform/strata, -/turf/open/gm/river, -/area/shiva/exterior/cp_lz2) "vRW" = ( /obj/effect/decal/warning_stripes{ icon_state = "N-corner" @@ -22503,6 +22508,10 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_left_to_right, /area/shiva/interior/aerodrome) +"vVS" = ( +/obj/structure/platform/metal/shiva/east, +/turf/open/gm/river/no_overlay, +/area/shiva/interior/colony/central) "vWf" = ( /obj/item/restraint/handcuffs, /turf/open/floor/shiva/redfull/west, @@ -22535,6 +22544,15 @@ /obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/plating, /area/shiva/interior/caves/cp_camp) +"vYc" = ( +/obj/structure/platform_decoration/stone/strata/west, +/obj/structure/prop/ice_colony/dense/planter_box/hydro{ + density = 0; + pixel_x = -17; + pixel_y = -19 + }, +/turf/open/gm/river/no_overlay, +/area/shiva/interior/caves/cp_camp) "vYm" = ( /turf/open/auto_turf/snow/layer0, /area/shiva/exterior/cp_lz2) @@ -22548,12 +22566,17 @@ /obj/structure/machinery/vending/cigarette/colony, /turf/open/floor/shiva/north, /area/shiva/interior/lz2_habs) -"vZS" = ( -/obj/structure/platform/strata{ - dir = 8 - }, +"vZs" = ( +/obj/structure/platform/stone/strata, /turf/open/auto_turf/snow/layer4, -/area/shiva/exterior/lz1_valley) +/area/shiva/exterior/junkyard/cp_bar) +"vZK" = ( +/obj/structure/prop/ice_colony/flamingo{ + dir = 1 + }, +/obj/structure/platform_decoration/metal/shiva/west, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/southwest_valley) "wag" = ( /turf/closed/wall/shiva/prefabricated/reinforced, /area/shiva/interior/colony/n_admin) @@ -22570,6 +22593,11 @@ dir = 6 }, /area/shiva/interior/aerodrome) +"wbS" = ( +/obj/structure/platform/stone/strata, +/obj/structure/platform/stone/strata/west, +/turf/open/auto_turf/ice/layer1, +/area/shiva/exterior/cp_lz2) "wck" = ( /obj/item/ammo_magazine/rifle/boltaction, /turf/open/floor/shiva/floor3, @@ -22582,6 +22610,10 @@ }, /turf/open/auto_turf/snow/layer0, /area/shiva/exterior/valley) +"wcP" = ( +/obj/structure/platform_decoration/stone/strata/north, +/turf/open/auto_turf/ice/layer2, +/area/shiva/interior/caves/cp_camp) "wdy" = ( /obj/item/paper/research_notes{ pixel_x = -7; @@ -22627,12 +22659,6 @@ }, /turf/open/auto_turf/ice/layer1, /area/shiva/interior/caves/cp_camp) -"wfW" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/turf/open/auto_turf/ice/layer0, -/area/shiva/interior/caves/s_lz2) "wgp" = ( /obj/structure/prop/ice_colony/dense/ice_tray{ dir = 1; @@ -22659,6 +22685,10 @@ }, /turf/open/floor/shiva/floor3, /area/shiva/exterior/lz2_fortress) +"whC" = ( +/obj/structure/platform_decoration/stone/strata/north, +/turf/open/auto_turf/ice/layer1, +/area/shiva/exterior/telecomm/lz2_southeast) "whI" = ( /obj/item/weapon/gun/boltaction, /turf/open/auto_turf/snow/layer1, @@ -22718,6 +22748,11 @@ }, /turf/open/floor/shiva/floor3, /area/shiva/interior/colony/research_hab) +"wli" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/shiva/multi_tiles, +/area/shiva/interior/colony/research_hab) "wlj" = ( /turf/open/auto_turf/snow/layer4, /area/shiva/interior/colony/central) @@ -22734,6 +22769,9 @@ }, /turf/open/floor/shiva/floor3, /area/shiva/interior/colony/botany) +"wme" = ( +/turf/open/floor/plating/plating_catwalk/shiva, +/area/shiva/exterior/southwest_valley) "wnK" = ( /turf/open/floor/shiva/floor3, /area/shiva/interior/colony/research_hab) @@ -22749,6 +22787,13 @@ }, /turf/open/floor/shiva/multi_tiles/southeast, /area/shiva/interior/colony/botany) +"woN" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/shiva/west, +/turf/open/floor/plating, +/area/shiva/interior/colony/medseceng) "wpl" = ( /obj/structure/machinery/landinglight/ds2/delaytwo, /obj/structure/machinery/landinglight/ds2/delaythree{ @@ -22927,6 +22972,14 @@ "wCz" = ( /turf/open/floor/chapel/north, /area/shiva/interior/colony/central) +"wCM" = ( +/obj/structure/platform/stone/strata/west, +/obj/structure/stairs/perspective/ice{ + dir = 1; + icon_state = "p_stair_sn_full_cap" + }, +/turf/open/auto_turf/ice/layer1, +/area/shiva/exterior/cp_lz2) "wCP" = ( /turf/closed/wall/shiva/ice, /area/shiva/interior/colony/s_admin) @@ -22937,12 +22990,6 @@ }, /turf/open/floor/prison/kitchen, /area/shiva/interior/bar) -"wCX" = ( -/obj/structure/platform_decoration/strata{ - dir = 8 - }, -/turf/open/auto_turf/ice/layer2, -/area/shiva/interior/caves/s_lz2) "wFa" = ( /obj/structure/machinery/firealarm{ dir = 1; @@ -22997,6 +23044,10 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/plating, /area/shiva/interior/colony/medseceng) +"wIp" = ( +/obj/structure/platform/metal/shiva/north, +/turf/open/auto_turf/snow/layer3, +/area/shiva/exterior/southwest_valley) "wIC" = ( /obj/structure/prop/invuln/minecart_tracks, /turf/open/auto_turf/ice/layer1, @@ -23050,7 +23101,7 @@ "wMC" = ( /obj/structure/closet/toolcloset, /turf/open/floor/shiva/yellow/west, -/area/shiva/interior/colony/deck) +/area/shiva/interior/colony/medseceng) "wMR" = ( /obj/structure/machinery/firealarm{ dir = 4; @@ -23062,16 +23113,6 @@ /obj/structure/window/framed/shiva, /turf/open/floor/plating/icefloor, /area/shiva/interior/telecomm/lz1_biceps) -"wNB" = ( -/obj/structure/machinery/door_control/brbutton{ - id = "hangar_ice_2"; - pixel_y = 28 - }, -/obj/structure/platform/shiva/catwalk{ - dir = 4 - }, -/turf/open/auto_turf/snow/layer1, -/area/shiva/exterior/junkyard) "wOq" = ( /obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/shiva/red/southwest, @@ -23189,15 +23230,13 @@ }, /turf/open/floor/shiva/floor3, /area/shiva/interior/aerodrome) -"wVJ" = ( -/obj/structure/platform_decoration/shiva/catwalk{ - dir = 4 - }, -/turf/open/auto_turf/snow/layer2, -/area/shiva/exterior/valley) "wWu" = ( /turf/open/floor/shiva/wred/northwest, /area/shiva/interior/colony/medseceng) +"wWH" = ( +/obj/structure/platform_decoration/metal/shiva/east, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/southwest_valley) "wWY" = ( /obj/structure/bed/chair/office/light{ dir = 4 @@ -23212,7 +23251,7 @@ "wXs" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/auto_turf/ice/layer1, -/area/shiva/interior/aerodrome) +/area/shiva/exterior/junkyard/cp_bar) "wXQ" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/shiva/floor3, @@ -23276,6 +23315,10 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor/plating, /area/shiva/interior/colony/medseceng) +"xbE" = ( +/obj/structure/platform/stone/strata/east, +/turf/open/auto_turf/ice/layer1, +/area/shiva/exterior/cp_lz2) "xbP" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor/shiva/north, @@ -23354,9 +23397,6 @@ /obj/structure/prop/invuln/ice_prefab, /turf/open/auto_turf/snow/layer0, /area/shiva/interior/caves/cp_camp) -"xjg" = ( -/turf/open/floor/shiva/yellow, -/area/shiva/interior/colony/deck) "xkf" = ( /obj/structure/machinery/light/double{ dir = 4; @@ -23390,6 +23430,10 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/shiva/yellow/west, /area/shiva/interior/colony/medseceng) +"xnV" = ( +/obj/structure/platform_decoration/stone/strata, +/turf/open/auto_turf/snow/layer3, +/area/shiva/interior/caves/cp_camp) "xoi" = ( /obj/structure/machinery/light/double{ dir = 1; @@ -23397,6 +23441,10 @@ }, /turf/open/floor/shiva/wredfull, /area/shiva/interior/colony/medseceng) +"xpd" = ( +/obj/structure/flora/grass/tallgrass/ice, +/turf/open/auto_turf/snow/layer2, +/area/shiva/exterior/southwest_valley) "xqe" = ( /obj/structure/bed/chair/comfy/orange{ dir = 1 @@ -23411,6 +23459,13 @@ }, /turf/open/floor/shiva/bluefull/west, /area/shiva/interior/bar) +"xqX" = ( +/obj/structure/platform/metal/shiva, +/obj/structure/cable/heavyduty{ + icon_state = "1-2-4-8" + }, +/turf/open/floor/plating/plating_catwalk/shiva, +/area/shiva/exterior/junkyard/fortbiceps) "xru" = ( /obj/structure/foamed_metal, /turf/open/floor/plating/plating_catwalk/shiva, @@ -23427,26 +23482,10 @@ /obj/item/tool/warning_cone, /turf/open/floor/shiva/north, /area/shiva/interior/colony/central) -"xtc" = ( -/obj/structure/platform/strata{ - dir = 4 - }, -/obj/structure/platform/strata, -/turf/open/gm/river, -/area/shiva/interior/caves/cp_camp) "xtI" = ( /obj/structure/bed/chair/comfy/beige, /turf/open/floor/carpet, /area/shiva/interior/colony/research_hab) -"xui" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/gm/river, -/area/shiva/exterior/cp_lz2) "xun" = ( /obj/structure/tunnel, /turf/open/auto_turf/ice/layer1, @@ -23455,6 +23494,11 @@ /obj/structure/machinery/space_heater, /turf/open/auto_turf/ice/layer1, /area/shiva/interior/caves/research_caves) +"xuO" = ( +/obj/structure/platform/stone/strata/east, +/obj/structure/platform/stone/strata, +/turf/open/gm/river, +/area/shiva/exterior/cp_lz2) "xvb" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, /turf/open/auto_turf/snow/layer2, @@ -23491,16 +23535,6 @@ /obj/item/device/flashlight/lamp/green, /turf/open/floor/shiva/multi_tiles/southeast, /area/shiva/interior/colony/research_hab) -"xwk" = ( -/obj/item/lightstick/red/variant, -/turf/open/auto_turf/snow/layer1, -/area/shiva/exterior/junkyard) -"xwo" = ( -/obj/structure/platform/shiva/catwalk{ - dir = 8 - }, -/turf/open/auto_turf/snow/layer3, -/area/shiva/exterior/junkyard) "xwL" = ( /obj/structure/filingcabinet, /obj/effect/landmark/objective_landmark/close, @@ -23521,6 +23555,12 @@ }, /turf/open/auto_turf/snow/layer3, /area/shiva/exterior/cp_colony_grounds) +"xyi" = ( +/obj/structure/machinery/light/double, +/obj/effect/decal/cleanable/vomit, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/plating, +/area/shiva/interior/colony/medseceng) "xyY" = ( /obj/structure/prop/invuln{ desc = "The mounting points are ground down from heavy use. They'll need some maintenance work before they can be used again."; @@ -23591,16 +23631,6 @@ }, /turf/open/floor/shiva/north, /area/shiva/interior/colony/medseceng) -"xCz" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W-corner" - }, -/obj/item/lightstick/red/spoke/planted{ - pixel_x = -11; - pixel_y = 25 - }, -/turf/open/floor/plating, -/area/shiva/exterior/junkyard) "xCA" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/prison/kitchen, @@ -23665,12 +23695,6 @@ }, /turf/open/floor/shiva/multi_tiles, /area/shiva/interior/colony/research_hab) -"xFM" = ( -/obj/structure/platform_decoration/strata{ - dir = 8 - }, -/turf/open/auto_turf/snow/layer2, -/area/shiva/interior/caves/cp_camp) "xFN" = ( /obj/effect/landmark/nightmare{ insert_tag = "lz2-south-gate" @@ -23680,6 +23704,15 @@ "xFR" = ( /turf/open/floor/shiva/snow_mat/west, /area/shiva/interior/colony/n_admin) +"xFZ" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/east, +/turf/open/gm/river, +/area/shiva/interior/caves/research_caves) +"xGm" = ( +/obj/structure/platform_decoration/stone/strata/west, +/turf/open/auto_turf/ice/layer2, +/area/shiva/interior/caves/s_lz2) "xGR" = ( /obj/effect/landmark/xeno_spawn, /turf/open/floor/shiva/wred/west, @@ -23688,9 +23721,6 @@ /obj/structure/largecrate/random, /turf/open/floor/shiva/floor3, /area/shiva/interior/aerodrome) -"xHv" = ( -/turf/open/auto_turf/ice/layer1, -/area/shiva/interior/aerodrome) "xIL" = ( /obj/item/powerloader_clamp, /turf/open/floor/shiva/floor3, @@ -23717,13 +23747,6 @@ }, /turf/open/floor/shiva/yellowfull, /area/shiva/interior/colony/research_hab) -"xLy" = ( -/obj/structure/platform/strata, -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/gm/river, -/area/shiva/exterior/cp_s_research) "xMs" = ( /obj/structure/prop/ice_colony/ground_wire{ dir = 4 @@ -23740,10 +23763,6 @@ /obj/item/bananapeel, /turf/open/floor/shiva/north, /area/shiva/interior/bar) -"xMH" = ( -/obj/structure/machinery/power/apc/no_power/north, -/turf/open/floor/shiva/floor3, -/area/shiva/interior/colony/deck) "xMQ" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/shiva/floor3, @@ -23772,6 +23791,11 @@ "xPd" = ( /turf/open/floor/shiva/radiator_tile2, /area/shiva/interior/bar) +"xPD" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/west, +/turf/open/auto_turf/ice/layer1, +/area/shiva/interior/oob/dev_room) "xQa" = ( /obj/structure/largecrate/random/case/small, /turf/open/floor/shiva/bluefull/west, @@ -23827,6 +23851,10 @@ /obj/structure/girder, /turf/open/auto_turf/ice/layer2, /area/shiva/interior/caves/research_caves) +"xTX" = ( +/obj/structure/platform/stone/strata/east, +/turf/open/auto_turf/snow/layer1, +/area/shiva/interior/caves/cp_camp) "xTZ" = ( /obj/structure/surface/rack, /obj/item/weapon/ice_axe, @@ -23846,6 +23874,10 @@ }, /turf/open/auto_turf/snow/layer4, /area/shiva/exterior/cp_lz2) +"xUA" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/auto_turf/ice/layer1, +/area/shiva/exterior/cp_s_research) "xVo" = ( /obj/structure/machinery/photocopier, /turf/open/floor/shiva/blue/west, @@ -23856,6 +23888,13 @@ }, /turf/open/auto_turf/ice/layer1, /area/shiva/interior/caves/cp_camp) +"xXf" = ( +/obj/structure/stairs/perspective/ice{ + dir = 1; + icon_state = "p_stair_full" + }, +/turf/open/auto_turf/snow/layer4, +/area/shiva/exterior/southwest_valley) "xXv" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/trash/plate{ @@ -23872,6 +23911,10 @@ }, /turf/open/floor/prison/kitchen, /area/shiva/interior/bar) +"xXE" = ( +/obj/structure/platform/stone/strata/north, +/turf/open/auto_turf/ice/layer0, +/area/shiva/interior/caves/s_lz2) "xXM" = ( /obj/structure/prop/invuln/minecart_tracks/bumper{ dir = 9 @@ -23934,6 +23977,11 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor/plating, /area/shiva/interior/colony/medseceng) +"yeI" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/east, +/turf/open/gm/river, +/area/shiva/exterior/cp_s_research) "yfE" = ( /obj/structure/surface/table, /turf/open/floor/shiva/wredfull, @@ -23957,6 +24005,14 @@ }, /turf/open/floor/shiva/floor3, /area/shiva/interior/lz2_habs) +"yhi" = ( +/obj/effect/landmark/corpsespawner/colonist, +/obj/effect/decal/cleanable/blood{ + pixel_x = 8; + pixel_y = 10 + }, +/turf/open/floor/shiva, +/area/shiva/interior/aerodrome) "yhA" = ( /obj/structure/fence, /turf/open/auto_turf/snow/layer1, @@ -24014,6 +24070,10 @@ }, /turf/open/floor/shiva/north, /area/shiva/interior/colony/medseceng) +"ylh" = ( +/obj/structure/platform_decoration/stone/strata/west, +/turf/open/auto_turf/snow/layer4, +/area/shiva/exterior/cp_lz2) "ylz" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /obj/structure/blocker/forcefield/multitile_vehicles, @@ -25633,10 +25693,10 @@ mev cQW rbA aDM -cko -rLu -rLu -nMR +aXp +jbT +jbT +ubF uqb uqb uqb @@ -25692,9 +25752,9 @@ mKr mKr aac aac -acn -acn -acn +vBE +vBE +vBE aac aac aac @@ -25795,10 +25855,10 @@ lLv cQW rbA uqb -mNs +trw xMz slO -ofl +nTl uqb uqb aDM @@ -25950,17 +26010,17 @@ puZ slO slO slO -poz -hhT +oij +kTQ puZ bCr cTU iOp qza -mNs +trw slO slO -ofl +nTl uqb xvb kGW @@ -26011,9 +26071,9 @@ lYf lYf aac aac -iuX -acn -acn +vdK +vBE +vBE aac aac mFm @@ -26109,20 +26169,20 @@ puZ puZ puZ puZ -vZS -vZS -niL -hic +jrk +jrk +pea +dzC aDM uqb uqb uqb uqb mfa -jqx +jFz slO -ivE -oqH +mgO +qQT uqb aDM kLM @@ -26281,9 +26341,9 @@ qza kLM hXX kLM -mOv -niL -hic +tzn +pea +dzC kLM uqb uqb @@ -26352,7 +26412,7 @@ mFm mFm uRn mFm -mFm +ouY xYx mFm nNd @@ -26424,7 +26484,7 @@ aFO aFO aFO aFO -aFO +vAv xAS oRH oRH @@ -26516,7 +26576,7 @@ mFm fOE mFm mFm -mFm +ouY mFm xYx mFm @@ -26588,7 +26648,7 @@ elf too xAS oRH -aFO +vAv aFO xAS aFO @@ -26746,7 +26806,7 @@ aFO aFO xAS xAS -oRH +uBt uIO oRH oRH @@ -26842,7 +26902,7 @@ mFm mFm mFm xYx -mFm +ouY mFm caS caS @@ -27075,8 +27135,8 @@ xAS dgG oRH oRH -rzw -nUk +xnV +xTX xMz xMz uqb @@ -27237,7 +27297,7 @@ oRH oRH xAS kRq -aFc +ehU wMh xMz xMz @@ -27399,7 +27459,7 @@ xAS oRH xAS xAS -mfc +iip xMz xMz aDM @@ -27675,8 +27735,8 @@ lnR lnR lnR lnR -pqq -wCX +boY +xGm cOq gmS eET @@ -27753,7 +27813,7 @@ iQq kLM kLM uqb -kLM +jtc uqb puZ puZ @@ -27838,7 +27898,7 @@ lnR lnR lnR lnR -wfW +xXE eET eET eET @@ -28074,7 +28134,7 @@ cQW cQW iQq iQq -iQq +fDx kLM kLM ath @@ -28400,7 +28460,7 @@ kLM cQW iQq kLM -kLM +jtc wgM kLM ath @@ -28482,7 +28542,7 @@ kOV kOV eni kOV -aam +qdG ugl fEU bmv @@ -28623,7 +28683,7 @@ wgX mFm mFm mFm -aWb +eQr hlO jMD caS @@ -28644,8 +28704,8 @@ lop kOV kOV eni -aaT -bHZ +cpr +wCM fEU fEU fEU @@ -28943,7 +29003,7 @@ mhP mFm wMj wMj -iuK +mbd mFm kEh jMD @@ -29081,7 +29141,7 @@ mFm mFm mFm mFm -mFm +dkY mFm mFm mFm @@ -29093,7 +29153,7 @@ iuK mFm mFm mFm -mFm +lJv mFm mFm mFm @@ -29159,8 +29219,8 @@ laz tlB tlB yjM -kSO -qBM +sWD +rWq tlB tlB xAS @@ -29179,10 +29239,10 @@ tlB tlB hBq tlB -tlB +bqz tlB xAS -aFO +jYX tlB xAS tlB @@ -29240,19 +29300,18 @@ caS caS mFm mFm +dkY mFm mFm mFm mFm mFm +dkY mFm mFm mFm -mFm -mFm +tMv iuK -iuK -mFm mFm mFm mFm @@ -29260,6 +29319,7 @@ mFm mFm mFm mFm +lJv mFm mFm mFm @@ -29272,7 +29332,7 @@ ftm umj hjx vOd -slj +ihk mFm hlO kAp @@ -29292,8 +29352,8 @@ vYm vYm kOV eni -aaW -aap +ubQ +ekw fEU fEU eET @@ -29321,8 +29381,8 @@ obH tlB tlB cQY -rJI -gso +uOF +tfB tlB tlB tlB @@ -29454,18 +29514,18 @@ vYm ntc eni kOV -uEo +hit fEU eET fEU fEU eET eET -joF -pqq -pqq -pey -xFM +lYV +boY +boY +svT +cwz aFO aFO xAS @@ -29483,8 +29543,8 @@ pWn tlB tTc cQY -aNy -xtc +iaP +lvC tlB wMh wMh @@ -29616,18 +29676,18 @@ vYm ntc eni kOV -rfi +eCo lnR fEU tTi bmv fEU fEU -qRl +mjp lnR lnR lnR -fEl +uJi wMh aaA aFO @@ -29668,7 +29728,7 @@ aFO aFO xAS tlB -tlB +bqz tlB xAS aFO @@ -29785,7 +29845,7 @@ fEU tTi fEU fEU -qRl +mjp lnR lnR myR @@ -29947,7 +30007,7 @@ fEU fEU tTi fEU -qRl +mjp lnR lnR jQS @@ -30009,11 +30069,11 @@ kLM iQq iQq iQq +crJ iQq iQq iQq -iQq -iQq +crJ kLM kLM qoU @@ -30109,7 +30169,7 @@ fEU tTi fEU fEU -qRl +mjp lnR lnR eal @@ -30168,7 +30228,7 @@ kLM knI iQq iQq -iQq +crJ iQq iQq iQq @@ -30271,7 +30331,7 @@ fEU fEU tTi fEU -qRl +mjp lnR lnR lnR @@ -30280,7 +30340,7 @@ lnR tlB tlB tlB -vIJ +vrV pcY pcY pcY @@ -30442,13 +30502,13 @@ pcY pcY jmW wMh -pkT +prx pcY pcY -aED -jHg -jHg -bcE +miK +aoR +aoR +iJn mbt mbt abt @@ -30488,20 +30548,20 @@ ibP dMo uji uji -kLM -lNE -uqb -iOu -kLM -iQq -iQq -iQq -iQq -kLM -kLM -uqb -uqb -uqb +oHV +hvH +qDh +gdI +aJt +hbY +hbY +hbY +hbY +aJt +aJt +qDh +qDh +qDh hzJ huz huz @@ -30604,15 +30664,15 @@ pcY pcY jmW ntJ -vnc +oYt pcY pcY -pFg +syU fVw cxr -idR -jHg -aui +qHW +aoR +aza gXW mbt abw @@ -30649,22 +30709,22 @@ pvv pvv fRg uji -ofw -kop -kop -kop -tHd -tHd -kyD -kyD -kyD -kyD -tHd -tHd -rtZ -jMf -ofw -ofw +dKD +qDh +qDh +qDh +aJt +aJt +hbY +hbY +hbY +hbY +aJt +aJt +gGq +saY +dKD +dKD huz huz huz @@ -30763,20 +30823,20 @@ toD lnR lnR pcY -fEl +uJi wMh ntJ -vnc +oYt pcY pcY -aRL -lGC -tdG +hMs +jcR +dYh fVw cxr -idR -jHg -aui +qHW +aoR +aza ecz tlB tlB @@ -30811,22 +30871,22 @@ pvv pvv fRg hGj -tHd -xvp -kop -xwk -kop -kyD -kyD -kyD -kyD -tHd -kyD -tHd -kop -tHd -que -ofw +aJt +gdI +qDh +cTe +qDh +hbY +hbY +hbY +hbY +aJt +hbY +aJt +qDh +aJt +dCB +dKD huz kys pef @@ -30923,22 +30983,22 @@ eni eni toD eni -aFc +ehU pcY -vlh +gEh wMh wMh -pkT +prx pcY -aeG -aeH +tUu +eLT ntJ -aRL -lGC -lGC -lGC -cLQ -tes +hMs +jcR +jcR +jcR +vYc +hII sPo wMh tze @@ -30973,22 +31033,22 @@ pvv pvv fRg hGj -tHd -kyD -tHd -kop -tHd -kyD -kyD -kyD -kyD -kyD -tHd -kyD -kyD -tHd -tHd -tHd +aJt +hbY +aJt +qDh +aJt +hbY +hbY +hbY +hbY +hbY +aJt +hbY +hbY +aJt +aJt +aJt huz krU axJ @@ -31085,23 +31145,23 @@ ntc ntc ntc xAS -mfc -cJC -cxJ +iip +nwi +kvI jmW wMh -eeD -jlY -aeH +wcP +cFJ +eLT ntJ ntJ ntJ ntJ ntJ wMh -aRL -uLf -nlx +hMs +sCk +ouL wMh tlB tlB @@ -31135,22 +31195,22 @@ pvv pvv gxK hGj -kyD -kyD -kyD -tHd -kyD -kyD -kyD -kyD -kyD -kyD -kyD -tHd -tHd -kyD -kyD -kyD +hbY +hbY +hbY +aJt +hbY +hbY +hbY +hbY +hbY +hbY +hbY +aJt +aJt +hbY +hbY +hbY huz axJ axJ @@ -31263,7 +31323,7 @@ wMh ntJ wMh wMh -jJv +gci afY tlB tTc @@ -31297,22 +31357,22 @@ dbH fhv fRg hGj -tHd -tHd -kyD -kyD -tHd -fHx -kyD -kyD -kyD -kyD -kyD -kyD -kyD -kyD -kyD -tpg +aJt +aJt +hbY +hbY +aJt +kXM +hbY +hbY +hbY +hbY +hbY +hbY +hbY +hbY +hbY +wme exX qIr axJ @@ -31329,8 +31389,8 @@ kAw kAw kAw kAw -fNf -oFl +sSG +hzk puZ puZ puZ @@ -31459,22 +31519,22 @@ aUA gIQ fRg hGj -kop -kop -kop -tHd -kyD -dyt -kyD -kyD -kyD -rNY -kyD -kyD -kyD -kyD -kyD -eSN +qDh +qDh +qDh +aJt +hbY +sWw +hbY +hbY +hbY +jMK +hbY +hbY +hbY +hbY +hbY +cbV akF alS aMW @@ -31491,8 +31551,8 @@ nZA nZA kAw kAw -rBk -hip +rKJ +lvU puZ puZ puZ @@ -31621,22 +31681,22 @@ deV eVG fRg hGj -kop -tHd -tHd -kyD -kyD -dyt -kyD -tHd -kyD -kyD -kyD -kyD -kyD -kyD -kyD -tpg +qDh +aJt +aJt +hbY +hbY +sWw +hbY +aJt +hbY +hbY +hbY +hbY +hbY +hbY +hbY +wme exX qIr rdS @@ -31715,11 +31775,11 @@ mMK kOV kOV toD -aax -aaF -aaF -jbY -stv +smn +fkR +fkR +iJE +ylh pWf pWf pWf @@ -31783,22 +31843,22 @@ dKR pvv fRg hGj -tHd -kyD -kyD -kyD -kyD -kyD -tHd -tHd -kop -tHd -kyD -kyD -kyD -kyD -kyD -tpg +aJt +hbY +hbY +hbY +hbY +hbY +aJt +aJt +qDh +aJt +hbY +hbY +hbY +hbY +hbY +wme exX qIr aut @@ -31877,11 +31937,11 @@ kOV kOV toD toD -rfi +eCo sUE sUE wAr -pGL +uUO mMK pWf pWf @@ -31945,22 +32005,22 @@ pvv pvv fRg hGj -kyD -kyD -kyD -kyD -kyD -kyD -tHd -ofw -tHd -kyD -kyD -kyD -kyD -kyD -kyD -kyD +hbY +hbY +hbY +hbY +hbY +hbY +aJt +dKD +aJt +hbY +hbY +hbY +hbY +hbY +hbY +hbY huz aut rdS @@ -32039,11 +32099,11 @@ kOV kOV toD toD -rfi +eCo sUE pgu sUE -pgQ +hXE kOV mMK pWf @@ -32107,22 +32167,22 @@ pvv pvv fRg hGj -kyD -xvp -tHd -xvp -tHd -tHd -kyD -tHd -kyD -kyD -kyD -kyD -pKK -kyD -xvp -tHd +hbY +gdI +aJt +gdI +aJt +aJt +hbY +aJt +hbY +hbY +hbY +hbY +lel +hbY +gdI +aJt huz rdS axJ @@ -32197,15 +32257,15 @@ mMK kOV eni kOV -oyw +cVU toD toD toD -vqw -tKV +bWk +whC sUE alJ -nPb +pzr aij mMK pWf @@ -32269,17 +32329,17 @@ pvv pvv gqe uji -wNB -khx -jac -khx -iHu -jXD -tHd -kyD -kyD -tHd -tHd +kxk +nMr +lmF +nMr +jlD +tSq +aJt +hbY +hbY +aJt +aJt huz huz huz @@ -32359,7 +32419,7 @@ mMK eni kOV kOV -aam +qdG toD toD mMK @@ -32369,8 +32429,8 @@ nmt lTr nUq kOV -aFb -nud +cRF +xbE pWf pWf pWf @@ -32424,7 +32484,7 @@ fRg fRg oYH uKZ -bFS +gYQ ail ail ail @@ -32435,13 +32495,13 @@ iMA iMA iMA uKZ -ehV -ofw -aQJ -kyD -kyD -tHd -kop +rpq +dKD +pHd +hbY +hbY +aJt +qDh huz cio ieD @@ -32520,18 +32580,18 @@ eni kOV kOV kOV -bvb -aas +bsb +oxr toD mMK ntc -jQW +sKp toD eYH eYH -oyw -nud -aaM +cVU +xbE +qaY toD pWf pWf @@ -32585,11 +32645,11 @@ nUa bKV bKV bKV -iDW -bzh -fRg +fvf +nWf fRg fRg +fcx fRg aKS fRg @@ -32597,13 +32657,13 @@ ohq mKB cLq iMA -avx -voo -tHd -kyD -kyD -tHd -tpg +wIp +vou +aJt +hbY +hbY +aJt +wme exX qIr azS @@ -32680,20 +32740,20 @@ ntc eni lop kOV -oyw -nud -aas +cVU +xbE +oxr toD toD kOV -oyw -aas +cVU +oxr toD kOV mMK -aam -xui -vRM +qdG +pXi +rTR toD toD pWf @@ -32750,8 +32810,8 @@ bKV bsC pvv pvv -pvv -pvv +gSe +nUM pvv pvv pvv @@ -32759,19 +32819,19 @@ pvv fRg xQa iMA -avx -kop -tHd -kyD -kyD -tHd -tpg +wIp +qDh +aJt +hbY +hbY +aJt +wme exX alW arW anJ -dQq -hmo +pKJ +nmU rdS axJ dQq @@ -32842,20 +32902,20 @@ ntc kOV eni kOV -aam +qdG toD toD toD eni axe -aam +qdG toD toD eni mMK -aam -vPK -irT +qdG +phO +xuO kOV kOV kOV @@ -32921,13 +32981,13 @@ pvv fRg uKZ uKZ -vqV -tHd -tHd -kyD -kyD -kyD -tHd +aGH +aJt +aJt +hbY +hbY +hbY +aJt huz pJM ayZ @@ -32950,8 +33010,8 @@ nZA nZA kAw kAw -fNf -oFl +sSG +hzk puZ puZ puZ @@ -33009,13 +33069,13 @@ toD mCj toD kOV -aFb -aaM +cRF +qaY toD jCk eni -aaW -aaM +ubQ +qaY toD toD aMD @@ -33071,8 +33131,8 @@ ocB bKV bKV bKV -hDW -bAX +mju +hPe fRg fRg fRg @@ -33082,14 +33142,14 @@ pvv khz fRg iMA -nIA -scp -tHd -kyD -kyD -tHd -kyD -kyD +omS +wWH +aJt +hbY +hbY +aJt +hbY +hbY huz aQq axJ @@ -33112,8 +33172,8 @@ kAw kAw kAw kAw -rBk -hip +rKJ +lvU puZ puZ puZ @@ -33170,13 +33230,13 @@ ntc toD toD toD -aFb -aas +cRF +oxr toD toD eni lnH -aam +qdG toD toD kOV @@ -33234,7 +33294,7 @@ fRg fRg oYH uKZ -bwk +bXc cex cex cex @@ -33245,13 +33305,13 @@ pvv oCG kjM oCG -kyD -kyD -kyD -tHd -ofw -tHd -kyD +hbY +hbY +hbY +aJt +dKD +aJt +hbY huz huz avz @@ -33332,13 +33392,13 @@ ntc toD toD eni -aam +qdG toD toD toD -oyw -nud -aaM +cVU +xbE +qaY toD toD kOV @@ -33407,14 +33467,14 @@ pvv oCG wRm oCG -kyD -kyD -kyD -szU -tHd -kyD -kyD -kop +hbY +hbY +hbY +qyQ +aJt +hbY +hbY +qDh ncS pTp pTp @@ -33494,11 +33554,11 @@ eni toD toD eni -aam +qdG toD eni nUq -aam +qdG aaG toD toD @@ -33568,15 +33628,15 @@ fRg dZN fRg iMA -tLC -hye -tHd -kyD -tHd -kyD -kyD -tHd -kop +vFv +vZK +aJt +hbY +aJt +hbY +hbY +aJt +qDh ncS mRc rdS @@ -33653,15 +33713,15 @@ mMK kOV eni toD -aaW +ubQ toD nUq -aam +qdG toD toD toD -aaT -aaH +cpr +koP toD toD vYm @@ -33731,14 +33791,14 @@ iMA iMA uKZ uKZ -ehV -tHd -kyD -kyD -kyD -tHd -tHd -kop +rpq +aJt +hbY +hbY +hbY +aJt +aJt +qDh ncS bWB auh @@ -33815,11 +33875,11 @@ eni mMK kOV kOV -aam +qdG toD toD -aZh -aaq +pfL +wbS toD mCj toD @@ -33893,13 +33953,13 @@ ftr obb vHX iMA -ehV -tHd -kyD -kyD -tHd -kop -kop +rpq +aJt +hbY +hbY +aJt +qDh +qDh huz huz auh @@ -33977,15 +34037,15 @@ kOV eni kOV kOV -aZh -aaq +pfL +wbS toD mMK -aam +qdG toD toD -aaW -aaI +ubQ +tlq toD vYm vYm @@ -34055,13 +34115,13 @@ bKV krm iXx iMA -ehV -kop -tHd -kyD -nAs -kop -ajE +rpq +qDh +aJt +hbY +gZn +qDh +qXQ huz qSW arZ @@ -34140,13 +34200,13 @@ kOV kOV kOV mMK -aZh +pfL pWf pWf pWf pWf mMK -aam +qdG toD toD kOV @@ -34217,13 +34277,13 @@ iMA iMA iMA uKZ -ehV -kop -tHd -kyD -kyD -tHd -ajd +rpq +qDh +aJt +hbY +hbY +aJt +cWI huz fjS anJ @@ -34345,7 +34405,7 @@ pcY pcY wMh xAS -tPB +eDi wMh wMh ntJ @@ -34364,7 +34424,7 @@ pvv kJw pvv pvv -pvv +yhi pvv pvv sYh @@ -34375,16 +34435,16 @@ pvv eGs fRg uji -xwo -jhm -bHC -bHC -iKW -tHd -kyD -kyD -kyD -kyD +jyk +qQB +tMy +tMy +fNz +aJt +hbY +hbY +hbY +hbY qIr oWk qIr @@ -34392,7 +34452,7 @@ anG axJ axJ ggh -rdS +oWA owe axJ rdS @@ -34507,7 +34567,7 @@ pcY jmW wMh aFO -tPB +eDi wMh wMh wMh @@ -34537,16 +34597,16 @@ pvv pvv fRg hvZ -tHd -xvp -tHd -xvp -tHd -kyD -tHd -kyD -kyD -kyD +aJt +gdI +aJt +gdI +aJt +hbY +aJt +hbY +hbY +hbY qIr oWk qIr @@ -34669,7 +34729,7 @@ pcY jmW wMh nuy -vgR +sOw wMh ntJ ntJ @@ -34699,16 +34759,16 @@ aSA pvv fRg hvZ -tHd -kyD -kyD -kyD -kyD -tHd -kyD -kyD -kyD -kyD +aJt +hbY +hbY +hbY +hbY +aJt +hbY +hbY +hbY +hbY qIr akF alS @@ -34839,7 +34899,7 @@ jmW wMh ntJ wMh -fEl +uJi wMh hBq lRJ @@ -34861,16 +34921,16 @@ wTz pvv fRg hvZ -kyD -tHd -kyD -kyD -kyD -kyD -kyD -tHd -kyD -kyD +hbY +aJt +hbY +hbY +hbY +hbY +hbY +aJt +hbY +hbY qIr exX qIr @@ -35001,7 +35061,7 @@ jmW jmW wMh wMh -fEl +uJi upK hBq hBq @@ -35023,16 +35083,16 @@ dbH wvx fRg hvZ -tHd -kyD -tHd -kyD -kyD -kyD -tHd -rli -aQJ -kyD +aJt +hbY +aJt +hbY +hbY +hbY +aJt +dvw +pHd +hbY huz huz kLi @@ -35185,16 +35245,16 @@ dCS eoH fRg hvZ -kyD -kyD -tHd -kyD -kyD -tHd -qLS -ofw -jMf -tHd +hbY +hbY +aJt +hbY +hbY +aJt +eWF +dKD +saY +aJt huz huz dLi @@ -35347,16 +35407,16 @@ deV uyI fRg hvZ -kyD -kyD -kyD -kyD -kyD -kyD -tHd -ofw -kop -kyD +hbY +hbY +hbY +hbY +hbY +hbY +aJt +dKD +qDh +hbY huz huz huz @@ -35509,17 +35569,17 @@ pti pvv fRg hvZ -tHd -kyD -kyD -kyD -kyD -kyD -tHd -jMf -tHd -kyD -kyD +aJt +hbY +hbY +hbY +hbY +hbY +aJt +saY +aJt +hbY +hbY huz huz huz @@ -35671,19 +35731,19 @@ pvv pvv fRg hvZ -tHd -tHd -kyD -kyD -kyD -kyD -kyD -tHd -tHd -kyD -kyD -kyD -lXQ +aJt +aJt +hbY +hbY +hbY +hbY +hbY +aJt +aJt +hbY +hbY +hbY +bir cwZ kAw kAw @@ -35833,19 +35893,19 @@ pvv pvv fRg hvZ -tHd -xvp -tHd -xvp -tHd -tHd -kyD -tHd -kyD -kyD -tHd -kyD -jWh +aJt +gdI +aJt +gdI +aJt +aJt +hbY +aJt +hbY +hbY +aJt +hbY +vtD cwZ kAw kAw @@ -35995,19 +36055,19 @@ hZI pvv fWq uji -iOA -ofw -jMf -tHd -kop -kop -kyD -kyD -tHd -tHd -tHd -tHd -fpF +miG +dKD +saY +aJt +qDh +qDh +hbY +hbY +aJt +aJt +aJt +aJt +avR wSv kAw kAw @@ -36157,18 +36217,18 @@ bxL gGc rzR uji -qrY -qrY -qrY -hHR -hHR -xCz -uxZ -uxZ -uxZ -lWC -hHR -hHR +gWx +gWx +gWx +rhL +rhL +lZl +bLV +bLV +bLV +ocP +rhL +rhL sax sax sax @@ -36319,29 +36379,29 @@ uKZ uKZ uKZ uji -ofw -ofw -jMf -tHd -kop -kop -kyD -kyD -kyD -tHd -kop -gzb +dKD +dKD +saY +aJt +qDh +qDh +hbY +hbY +hbY +aJt +qDh +kLk sax sax sax -bcV -oFl +quL +hzk kAw kAw kAw hrk -bcV -tFd +quL +kXW hrk hrk kAw @@ -36472,39 +36532,39 @@ uKZ jLX uKZ uji -tHd -rtZ -tHd -tHd -rtZ -kop -kop -xvp -tHd -jMf -xvp -kop -kop -kop -tHd -kyD -kyD -kyD -tHd -kop -bhN -fCs +aJt +gGq +aJt +aJt +gGq +qDh +qDh +gdI +aJt +saY +gdI +qDh +qDh +qDh +aJt +hbY +hbY +hbY +aJt +qDh +qcn +xpd sax sax -rBk -vAU +rKJ +ktM kAw kAw kAw -tad -tlr -tuz -tFy +sdQ +pBA +dcD +szL hrk kAw nZA @@ -36634,28 +36694,28 @@ qnJ jOi qnJ mkC -kyD -kyD -kyD -kyD -kyD -kyD -kyD -kyD -tHd -iMC -kyD -kyD -tHd -tHd -kyD -tHd -kyD -kyD -tHd -kop -bhN -fCs +hbY +hbY +hbY +hbY +hbY +hbY +hbY +hbY +aJt +ulr +hbY +hbY +aJt +aJt +hbY +aJt +hbY +hbY +aJt +qDh +qcn +xpd sax sax sax @@ -36664,8 +36724,8 @@ kAw kAw kAw acl -rBk -vAU +rKJ +ktM hrk kAw nZA @@ -36796,27 +36856,27 @@ ajy jOi ajy ppS -kyD -kyD -kyD -kyD -kyD -kyD -kyD -kyD -kyD -kyD -kyD -kyD -kyD -kyD -kyD -kyD -kyD -kyD -tHd -kop -lip +hbY +hbY +hbY +hbY +hbY +hbY +hbY +hbY +hbY +hbY +hbY +hbY +hbY +hbY +hbY +hbY +hbY +hbY +aJt +qDh +iub sax sax sax @@ -36958,27 +37018,27 @@ ajy jOi ajy ppS -kyD -kyD -kyD -kyD -kyD -kyD -tHd -tHd -kyD -tHd -tHd -kyD -kyD -kyD -kyD -kyD -kyD -kyD -kyD -tHd -ofw +hbY +hbY +hbY +hbY +hbY +hbY +aJt +aJt +hbY +aJt +aJt +hbY +hbY +hbY +hbY +hbY +hbY +hbY +hbY +aJt +dKD sax hrk llZ @@ -37120,28 +37180,28 @@ ajy jOi ajy ppS -tHd -tHd -tHd -kop -aQJ -kop -eyx -kop -tHd -kop -kop -tHd -kyD -kyD -kyD -kyD -kyD -kyD -kyD -kyD -kyD -grk +aJt +aJt +aJt +qDh +pHd +qDh +geQ +qDh +aJt +qDh +qDh +aJt +hbY +hbY +hbY +hbY +hbY +hbY +hbY +hbY +hbY +npd hrk kAw qgP @@ -37282,28 +37342,28 @@ ajy jOi ajy lGT -jMf -tHd -kop -jMf -sJo -ofw -etl -fLi -gGT -kop -tHd -xvp -kyD -kyD -kyD -tHd -kyD -kyD -kyD -tHd -oDi -nRD +saY +aJt +qDh +saY +itu +dKD +tAe +rWN +urH +qDh +aJt +gdI +hbY +hbY +hbY +aJt +hbY +hbY +hbY +aJt +biR +daY kAw vPr kAw @@ -37444,28 +37504,28 @@ bni bni bni uir -ofw -jMf -tHd -kop -jMf -gGT -kop -rli -kop -kop -tHd -kyD -kyD -kyD -tHd -kyD -tHd -kyD -kyD -kyD -tHd -kjX +dKD +saY +aJt +qDh +saY +urH +qDh +dvw +qDh +qDh +aJt +hbY +hbY +hbY +aJt +hbY +aJt +hbY +hbY +hbY +aJt +xXf kAw vPr qgP @@ -37609,25 +37669,25 @@ kyD kyD kyD tHd -kyD -kyD -kyD -kyD -kyD -kop -kop -kop -tHd -tHd -jMf -jMf -qLS -ofw -ofw -kop -kyD -kop -hbp +hbY +hbY +hbY +hbY +hbY +qDh +qDh +qDh +aJt +aJt +saY +saY +eWF +dKD +dKD +qDh +hbY +qDh +xXf kAw llZ nZA @@ -37773,23 +37833,23 @@ fDH kyD tHd kyD -kyD -kyD -kop -kop -kop -kop -jMf -jMf -jMf -qLS -bRU -ofw -kop -mwE -ofw -kyD -hbp +hbY +hbY +qDh +qDh +qDh +qDh +saY +saY +saY +eWF +lMC +dKD +qDh +gKF +dKD +hbY +xXf kAw kAw jaT @@ -37936,22 +37996,22 @@ kyD kyD kyD kyD -kyD -kyD -kyD -kyD -jMf -ofw -jMf -jMf -jMf -ofw -qLS -kop -kyD -kop -kyD -mxr +hbY +hbY +hbY +hbY +saY +dKD +saY +saY +saY +dKD +eWF +qDh +hbY +qDh +hbY +pfj kAw vPr vPr @@ -38099,21 +38159,21 @@ kyD kyD kyD kyD -kyD -tHd -kyD -tHd -tHd -jMf -jMf -jMf -ofw -jMf -ofw -bhB -kop -kop -gss +hbY +aJt +hbY +aJt +aJt +saY +saY +saY +dKD +saY +dKD +rff +qDh +qDh +bSu sax sax sax @@ -38262,18 +38322,18 @@ kyD kyD kyD kyD -kyD -kyD -tHd -tHd -jMf -jMf -tHd -jMf -kop -jMf -ofw -ofw +hbY +hbY +aJt +aJt +saY +saY +aJt +saY +qDh +saY +dKD +dKD rgy jMf gss @@ -38385,8 +38445,8 @@ vYm ntc eni toD -xui -qNB +pXi +qIu toD mMK kOV @@ -38425,16 +38485,16 @@ kyD kyD tHd kyD -kop -kop -kop -bnD -kop -kop -rgy -tHd -kop -ofw +qDh +qDh +qDh +sjA +qDh +qDh +uUb +aJt +qDh +dKD oxP ofw ofw @@ -38547,8 +38607,8 @@ vYm ntc eni toD -vPK -irT +phO +xuO toD kOV kOV @@ -38589,13 +38649,13 @@ kyD kyD kyD jMf -jMf -kop -kop -jMf -kop -kop -tHd +saY +qDh +qDh +saY +qDh +qDh +aJt jMf jMf jMf @@ -39340,8 +39400,8 @@ gjY gjY bJF tFk -uCp -wZW +aDa +jRa rBH hYT ejt @@ -40914,7 +40974,7 @@ dkC axz axz axz -ahh +lEY fyC aEY aEY @@ -41059,7 +41119,7 @@ puZ (106,1,1) = {" aad axz -aAn +jTl dEH dHg eKY @@ -41076,7 +41136,7 @@ jqY qrz qxv tSt -ahh +lEY aEY aEY aEY @@ -41238,7 +41298,7 @@ jqY qrz nfe lWr -ahh +lEY aEY aEY aEY @@ -41400,14 +41460,14 @@ jqY qrz qrz tSt -tLP -lVF -hpn -lVF -lVF -lVF -lVF -lVF +jzM +vVS +hkp +vVS +vVS +vVS +vVS +vVS aad lKJ jqY @@ -42198,7 +42258,7 @@ beQ beQ ffj axz -aiE +naG aAg pTG jqY @@ -42525,7 +42585,7 @@ kLz anE anE cTY -jqY +gRG jqY ndR qSe @@ -43010,7 +43070,7 @@ bfc qrz anE anE -ndR +sNv jqY jqY ndR @@ -43495,7 +43555,7 @@ axz axz axz jqY -jqY +gRG ndR jqY vIL @@ -43680,10 +43740,10 @@ djn tfd aeA axz -pMs -bsp -bsp -icC +prU +jqY +jqY +cZb wag wag lJx @@ -43842,9 +43902,9 @@ axz hwJ axz aaY -hWh -bsp -bsp +ndR +jqY +jqY rAF oWG gzc @@ -44004,9 +44064,9 @@ axz ndR iwn axz -hWh -bsp -bsp +ndR +jqY +jqY rAF oWG stT @@ -44166,9 +44226,9 @@ vBg ndR iRh axz -hWh -bsp -bsp +ndR +jqY +jqY rAF eOM eOM @@ -44328,9 +44388,9 @@ vBg ndR lHX axz -xMH -bsp -bsp +ndR +jqY +jqY rAF eOM sYu @@ -44490,9 +44550,9 @@ vBg ndR fJw axz -hWh -bsp -bsp +ndR +jqY +jqY rAF eOM eOM @@ -44653,8 +44713,8 @@ ndR fKT axz mQs -bsp -bsp +jqY +jqY rAF eOM mtU @@ -44733,7 +44793,7 @@ sFu tnu kPZ gTe -tnz +qFN baW tnu ofw @@ -44814,9 +44874,9 @@ vBg ndR ndR ord -bsp -bsp -bsp +jqY +jqY +jqY rAF eOM sYu @@ -44929,10 +44989,10 @@ sGR cXk sod sod -tPJ -ulD -ulZ -ulZ +eNI +adK +xqX +xqX lgN puZ puZ @@ -44977,8 +45037,8 @@ ndR fcq axz mQs -bsp -bsp +jqY +jqY rAF eOM eOM @@ -45130,8 +45190,8 @@ xha bBB axz wTP -xha -xha +eOF +eOF xha xha vBg @@ -45139,13 +45199,13 @@ ndR gcF axz sqy -bsp -bsp -mms +jqY +jqY +qrz bbw bbw bbw -kiS +cwG eOM sYu sYu @@ -45292,7 +45352,7 @@ xha csu axz mru -rZP +kGH hTk nCx gPN @@ -45301,12 +45361,12 @@ ndR sII axz lNf -bsp -bsp -bsp -bsp -bsp -bsp +jqY +jqY +jqY +jqY +jqY +jqY rAF eOM sYu @@ -45464,11 +45524,11 @@ axz aaY sXr dMy -hWh -hWh -hWh -hWh -bsp +ndR +ndR +ndR +ndR +jqY rAF eOM sYu @@ -45629,8 +45689,8 @@ axz axz axz aaY -hWh -bsp +ndR +jqY rAF eOM sYu @@ -45735,7 +45795,7 @@ uFl sod sod sod -sax +jrg sPM vUH sod @@ -45791,8 +45851,8 @@ muN ivl ixo axz -hWh -bsp +ndR +jqY rAF sYu eOM @@ -45893,11 +45953,11 @@ alA tHd fnG rEV -sax -sax +jrg +jrg luD -sax -sax +jrg +jrg sod sod sod @@ -45953,11 +46013,11 @@ kvB djn wFq axz -hWh -bsp +ndR +jqY rAF -nOi -rnB +nxp +peF sYu sYu eOM @@ -46050,15 +46110,15 @@ tHd kop kyD tHd -veu -oZq -ijm -cIV -cIV -sax -sax -sax -sax +axg +syE +jQB +sdD +sdD +jrg +jrg +jrg +jrg wiy wiy wiy @@ -46115,11 +46175,11 @@ tfd djn djn gFe -bsp -bsp -mms -iWg -tDr +jqY +jqY +qrz +vph +jhY sYu sYu sYu @@ -46212,14 +46272,14 @@ kop tHd kyD tHd -qEQ +sdu jrg bJj gpz bJj jrg -qCW -ijE +qdr +trq jrg jrg aaZ @@ -46277,11 +46337,11 @@ jsn tfd hin axz -hWh -bsp +ndR +jqY pEs -uQy -gkG +dSn +qFO sYu sYu sYu @@ -46374,14 +46434,14 @@ xgc boW boW boW -dro +tLy jrg osE osE bJj bJj -qdh -fmo +xFZ +mtM jrg jrg bJj @@ -46440,9 +46500,9 @@ axz axz aaY mQs -bsp +jqY pEs -sNi +tnw sYu sYu sYu @@ -46536,8 +46596,8 @@ boW boW boW xgc -nxt -prO +qXe +kUA bJj osE gpz @@ -46601,10 +46661,10 @@ muN ivl ixo axz -hWh -bsp +ndR +jqY pEs -sNi +tnw sYu sYu sYu @@ -46763,11 +46823,11 @@ kvB djn wFq axz -hWh -bsp +ndR +jqY pEs -hEa -rnB +svp +peF sYu sYu sYu @@ -46925,11 +46985,11 @@ tfd djn djn gFe -bsp -bsp -mms -iWg -tDr +jqY +jqY +qrz +vph +jhY lwo sYu sYu @@ -46961,7 +47021,7 @@ arX arX tVZ ktd -axI +oSj ver ver ver @@ -47087,11 +47147,11 @@ euZ tfd hin axz -hWh -bsp +ndR +jqY rAF -gCW -gkG +mSo +qFO lwo sYu lwo @@ -47194,8 +47254,8 @@ bJj bJj bJj srJ -qCW -nyS +qdr +goC osE bJj gpz @@ -47249,8 +47309,8 @@ axz axz axz aaY -hWh -bsp +ndR +jqY rAF sYu arX @@ -47350,15 +47410,15 @@ fbS qfR jrg jrg -qCW -ijE +qdr +trq bJj bJj bJj -nvu -mCG -pRM -gQK +dbA +buB +agf +cEf osE bJj gpz @@ -47409,10 +47469,10 @@ qrz ibN axz mQs -hWh -hWh -hWh -bsp +ndR +ndR +ndR +jqY rAF arX arX @@ -47512,14 +47572,14 @@ sEC jrg jrg jrg -qdh -fmo +xFZ +mtM bJj bJj bJj osE -qdh -fmo +xFZ +mtM osE osE bJj @@ -47570,11 +47630,11 @@ jqY jqY jqY czH -bsp -bsp -bsp -bsp -bsp +jqY +jqY +jqY +jqY +jqY rAF arX eOM @@ -47732,11 +47792,11 @@ jqY jqY jqY qrz -bsp -bsp -bsp -bsp -bsp +jqY +jqY +jqY +jqY +jqY rAF adZ adZ @@ -48056,12 +48116,12 @@ acT aht acT aDn -cKb -cKb -cKb -cKb -cKb -cKb +aaY +aaY +aaY +aaY +aaY +aaY hDs iXS sLs @@ -48136,10 +48196,10 @@ pLf asz asz asz -ndb -pCI -gmV -vTc +bBx +oIT +kLL +aXD asz asz asz @@ -48173,7 +48233,7 @@ gpz gpz bJj bJj -bJj +efO gpz bJj bJj @@ -48298,11 +48358,11 @@ pLf asz crF aXH -tHD +wli crF crF tHD -uEx +qKB crF fNE qud @@ -48329,7 +48389,7 @@ jrg jrg bJj bJj -gpz +cux gpz gpz gpz @@ -48453,8 +48513,8 @@ bFg ukp qiy sQX -cXU -cid +yeI +pts pLf pLf asz @@ -48500,7 +48560,7 @@ bJj bJj bJj bJj -sax +jrg puZ puZ puZ @@ -48511,7 +48571,7 @@ puZ (152,1,1) = {" acH acT -ajO +nrt ajO acT agt @@ -48615,17 +48675,17 @@ peb ukp qiy wvd -nOK -xLy +kEr +rEz pLf pLf asz asz asz -tpL -orO -orO -tJY +sNk +iNt +iNt +usQ asz asz asz @@ -48662,9 +48722,9 @@ bJj bJj gpz bJj -sax -sax -sax +jrg +jrg +jrg puZ puZ puZ @@ -48771,7 +48831,7 @@ bsV bsV gJo gJo -abg +suo aMl rYj pLf @@ -48814,19 +48874,19 @@ jrg amu amu amu -bJj -fXX -gpz -bJj -bJj +ean +gWc +jMB +ean +oEA +jrg +jrg +ean +jMB +lsR +jrg jrg jrg -bJj -gpz -osE -sax -sax -sax puZ puZ puZ @@ -48933,7 +48993,7 @@ bsV gJo qbF gJo -abg +suo gJo rYj asz @@ -48986,9 +49046,9 @@ jrg bJj bJj bJj -sax -sax -sax +jrg +jrg +jrg puZ puZ puZ @@ -49087,16 +49147,16 @@ bFg cZk cZk xvA -cgR +buP gJo qbF qbF gJo qbF daD -xHv -xHv -xHv +gJo +gJo +gJo wXs asz abn @@ -49140,17 +49200,17 @@ fXX fXX osE osE -gpz +cux gpz jrg jrg bJj bJj +dIE osE -osE -sax -sax -sax +jrg +jrg +jrg puZ puZ puZ @@ -49249,16 +49309,16 @@ bFg fUZ cZk cZk -tBB +vZs gJo bFg qdH qdH qbF bIV -xHv -xHv -xHv +gJo +gJo +gJo wXs asz abp @@ -49270,17 +49330,17 @@ asz aUX aWB gTU -wnK +pCj wnK wnK aXH rZt -rZt +dAt rZt asz asz rZt -rZt +dAt hCY hCY fNE @@ -49310,10 +49370,10 @@ bJj bJj gpz osE -sax -sax -sax -sax +jrg +jrg +jrg +jrg puZ puZ puZ @@ -49411,16 +49471,16 @@ bFg cZk xvA xvA -tBB +vZs gJo bFg qdH qbF qbF gJo -xHv -xHv -xHv +gJo +gJo +gJo wXs asz abp @@ -49472,10 +49532,10 @@ bJj bJj gpz osE -sax -sax -sax -sax +jrg +jrg +jrg +jrg puZ puZ puZ @@ -49573,16 +49633,16 @@ bIV cZk cZk cZk -sFs -xHv -sFs -xHv -xHv -xHv -xHv -xHv -xHv -uLi +bIV +gJo +bIV +gJo +gJo +gJo +gJo +gJo +gJo +qbF wXs asz aNR @@ -49634,10 +49694,10 @@ bJj bJj bJj amu -sax -sax -sax -sax +jrg +jrg +jrg +jrg puZ puZ puZ @@ -49646,7 +49706,7 @@ puZ acH acT aQX -ajO +nrt acT agA aoK @@ -49735,16 +49795,16 @@ cZk cZk cZk cZk -tjL -xHv -xHv -gik -gik -gik +xvA +gJo +gJo +bFg +bFg +bFg dbv -kaC -xHv -xHv +aUd +gJo +gJo wXs asz aNP @@ -49785,20 +49845,20 @@ jrg jrg amu fXX -fXX +vtf amu jrg bJj gpz bJj bJj -bJj +efO osE bJj amu -sax -sax -sax +jrg +jrg +jrg puZ puZ puZ @@ -49811,7 +49871,7 @@ ajO ajO acT aoK -aoK +ifI aoK aoK apj @@ -49897,16 +49957,16 @@ bIV bFg cZk bIV -xHv -sFs -xHv -xHv -gik -xHv +gJo +bIV +gJo +gJo +bFg +gJo tmP -kaC -xHv -goe +aUd +gJo +bsV wXs asz abp @@ -49978,11 +50038,11 @@ aoK aoK acT iJY +aff agh agh agh -agh -kbJ +aqz agh agh xbP @@ -50059,16 +50119,16 @@ bIV fUZ bIV bIV -xHv -xHv -xHv -xHv -xHv -goe -kaC -kaC -kaC -xHv +gJo +gJo +gJo +gJo +gJo +bsV +aUd +aUd +aUd +gJo wXs asz abp @@ -50221,16 +50281,16 @@ bIV bFg bFg bFg -xHv -xHv -uLi -xHv +gJo +gJo +qbF +gJo qEH -kaC -kaC -kaC -xHv -xHv +aUd +aUd +aUd +gJo +gJo wXs asz abx @@ -50272,7 +50332,7 @@ amu lAb fXX fXX -fXX +vtf fXX fXX fXX @@ -50384,15 +50444,15 @@ bFg bFg bFg bIV -xHv -sFs -xHv -xHv -goe -kaC -xHv -gik -xHv +gJo +bIV +gJo +gJo +bsV +aUd +gJo +bFg +gJo wXs asz asz @@ -50404,7 +50464,7 @@ asz rZt rZt rZt -gGf +gCe bDx asz kXt @@ -50546,15 +50606,15 @@ bFg bFg bFg bFg -xHv -xHv -xHv -sFs -xHv -xHv -xHv -gik -gik +gJo +gJo +gJo +bIV +gJo +gJo +gJo +bFg +bFg wXs asz aNN @@ -50576,7 +50636,7 @@ rZt asz asz hLB -rZt +dAt rZt asz asz @@ -50617,7 +50677,7 @@ puZ (165,1,1) = {" acH acT -aKq +uFi ajO acT aim @@ -50708,15 +50768,15 @@ bFg bFg bFg bIV -xHv -xHv -xHv -uLi -xHv -xHv -xHv -gik -xHv +gJo +gJo +gJo +qbF +gJo +gJo +gJo +bFg +gJo wXs bXo kxx @@ -50788,7 +50848,7 @@ agh anR acT iJY -agh +aff agh axG aek @@ -50869,16 +50929,16 @@ bFg bFg bFg bIV -kaC -xHv -xHv -xHv -sFs -xHv -xHv -uLi -xHv -goe +aUd +gJo +gJo +gJo +bIV +gJo +gJo +qbF +gJo +bsV wXs lSU aNL @@ -50919,7 +50979,7 @@ rAH ukp kVd uzu -ukp +xUA ukp jrg amu @@ -51031,16 +51091,16 @@ gJo bFg bFg cZk -kaC -xHv -xHv -xHv -xHv -xHv -goe -xHv -xHv -xHv +aUd +gJo +gJo +gJo +gJo +gJo +bsV +gJo +gJo +gJo wXs lSU lSU @@ -51193,28 +51253,28 @@ oQl acI acI acI -kaC -kaC -kaC -kaC -kaC -kaC -xHv -xHv -xHv -xHv +aUd +aUd +aUd +aUd +aUd +aUd +gJo +gJo +lxD +gJo wXs lSU lSU tSI rZt gLv -rZt +dAt gLv afF wBf wnK -dTU +wFB wnK asz kbZ @@ -51253,7 +51313,7 @@ bJj bJj amu gpz -gpz +cux amu amu fXX @@ -51269,7 +51329,7 @@ ajO ajO aSa maW -maW +hdF agh nfg acT @@ -51436,7 +51496,7 @@ agh nfg acT iJY -agh +aff agh axG acT @@ -51572,7 +51632,7 @@ xgc bJj bJj bJj -bJj +efO bJj fXX osE @@ -51605,12 +51665,12 @@ acT ajO aDn cbt -agh +aff agh bFC umm agh -hqC +uIx hqC agh uXQ @@ -51726,7 +51786,7 @@ uzu ukp xgc ukp -ukp +xUA ukp pLf ukp @@ -51751,7 +51811,7 @@ puZ (172,1,1) = {" acH anq -bVS +xyi acT afx agh @@ -51779,13 +51839,13 @@ uXQ fkb agh agh -agh +aff agh agh fkb sYu sYu -sYu +alG sYu sYu sYu @@ -51855,7 +51915,7 @@ bme lSU twi flN -flN +pOn flN kEs kEs @@ -52017,7 +52077,7 @@ mIL uIE flN flN -flN +eSo flN flN eit @@ -52025,16 +52085,16 @@ kEs kEs flN rMI -dTU +wFB dTU rMI goj chU -goj +hFk chU chU chU -goj +hFk chU aiD asz @@ -52079,11 +52139,11 @@ ajV aDn aDn agh -maW +hdF maW ajO iJY -agh +aff agh agh axG @@ -52176,14 +52236,14 @@ oQl oQl mIL fQX -gaz +aRa uIE flN -flN -gCL +eSo +jQi flN kEs -flN +mEQ flN vTc rMI @@ -52217,7 +52277,7 @@ ukp bJj bJj bJj -gpz +cux bJj bJj bJj @@ -52226,7 +52286,7 @@ fXX osE fXX amu -sax +jrg puZ puZ puZ @@ -52249,7 +52309,7 @@ agh agh agh agh -agh +aff axG acT iEp @@ -52341,7 +52401,7 @@ ood mIL lqu flN -eit +lIA flN kEs kEs @@ -52364,7 +52424,7 @@ goj fNE aud miD -ptr +bIl ptr rZt aCB @@ -52388,9 +52448,9 @@ gpz bJj osE amu -sax -sax -sax +jrg +jrg +puZ puZ puZ puZ @@ -52503,7 +52563,7 @@ ood pqj vwn uIE -flN +pOn kEs flN flN @@ -52550,9 +52610,9 @@ rbq rbq rbq amu -sax -sax -sax +jrg +jrg +puZ puZ puZ puZ @@ -52568,9 +52628,9 @@ amh aly amh acT -bdT -maW -bdT +hvd +fgj +hvd acT acT acT @@ -52659,13 +52719,13 @@ jAL jAL mIL vJu -mIL +oiy ood fQX jAL mIL lSU -uIE +oaW flN kEs agw @@ -52678,11 +52738,11 @@ lSU wOO goj chU -goj +hFk lfk rZt uII -aiD +lJf chU goj fNE @@ -52712,7 +52772,7 @@ rbq rbq rbq amu -sax +jrg puZ puZ puZ @@ -52724,7 +52784,7 @@ puZ acH acT ajO -ajO +nrt aDn acT acT @@ -52874,7 +52934,7 @@ fXX fXX bJj amu -sax +jrg puZ puZ puZ @@ -52893,7 +52953,7 @@ ajO ajO aSa axG -maW +hdF axG aek vhG @@ -53036,7 +53096,7 @@ fXX bJj fXX amu -sax +jrg puZ puZ puZ @@ -53051,7 +53111,7 @@ cbW ajO ajO aQX -ajO +nrt ajO aDn axG @@ -53153,7 +53213,7 @@ oQl oQl lSU dwQ -eBG +tgJ dwQ dwQ elw @@ -53180,7 +53240,7 @@ asz jrg jrg jrg -osE +dIE bJj bJj bJj @@ -53191,14 +53251,14 @@ bJj bJj bJj bJj -bJj +efO gpz bJj bJj fXX fXX iTQ -sax +jrg puZ puZ puZ @@ -53216,14 +53276,14 @@ acT acT acT acT -tWv -axG -bdT +cwx +dEh +hvd aek cJy agh agh -agh +aff agh agh agh @@ -53232,7 +53292,7 @@ agh ahy agh agh -agh +aff uXQ acT agK @@ -53245,7 +53305,7 @@ agh uXQ ajw umm -agh +aff agh uXQ ajw @@ -53336,7 +53396,7 @@ oag asz aud rZt -rZt +dAt tiw asz jrg @@ -53360,8 +53420,8 @@ gpz fXX jrg iTQ -sax -sax +jrg +jrg puZ puZ puZ @@ -53481,7 +53541,7 @@ lSU lSU dwQ oaO -dwQ +fdo dwQ dwQ bXo @@ -53509,7 +53569,7 @@ bJj bJj bJj bJj -bJj +efO bJj bJj gpz @@ -53522,8 +53582,8 @@ gpz bJj jrg jrg -sax -sax +jrg +jrg puZ puZ puZ @@ -53563,7 +53623,7 @@ vKx cBe cBe cBe -mfr +rps agh agh uXQ @@ -53624,11 +53684,11 @@ fIT fQX iMb fQX -wMh -cQY -kSO -qBM -wMh +mIL +ndK +qyR +ldh +mIL mIL mIL ood @@ -53650,11 +53710,11 @@ lSU lQm goj chU -goj +hFk dqH rZt sCl -onM +mdz chU goj fNE @@ -53681,10 +53741,10 @@ osE bJj bJj gpz -bJj +efO +jrg jrg jrg -sax puZ puZ puZ @@ -53703,7 +53763,7 @@ amP amU aoe bhS -amP +aeo amU aek scN @@ -53785,12 +53845,12 @@ tPz fIT fQX iMb -wMh -wMh -cQY -rJI -gso -pcY +mIL +mIL +ndK +ugK +qnj +oQl gaz mIL gaz @@ -53846,7 +53906,7 @@ gpz bJj bJj jrg -sax +jrg puZ puZ puZ @@ -53893,7 +53953,7 @@ agh feR acT aeh -agh +aff agh agh kdW @@ -53947,11 +54007,11 @@ aXZ fIT fQX iMb -wMh -wMh -cQY -aNy -xtc +mIL +mIL +ndK +bSG +iFC nKD mIL mIL @@ -54046,7 +54106,7 @@ agh uyJ acT aia -tCi +nSZ agh mah umm @@ -54110,11 +54170,11 @@ fIT iMb fQX fQX -wMh +mIL pXU -wMh -wMh -aFO +mIL +mIL +pqj gaz mIL mIL @@ -54293,7 +54353,7 @@ dwQ dwQ adI adj -dwQ +fdo adH lSU goj @@ -54491,7 +54551,7 @@ jrg jrg pxA flN -rZt +dAt dwQ pxA puZ @@ -54509,11 +54569,11 @@ adX bhS amP amP -amP +aeo amP aos amP -amP +aeo amP gBr aek @@ -54537,8 +54597,8 @@ acT acT acT kuM -jVp -jVp +cYa +cYa wMC ixX aDn @@ -54582,11 +54642,11 @@ oQl oQl jAL iMb -foc -jjX -jjX -jjX -vip +udN +hcE +hcE +hcE +rAv iMb pqj pqj @@ -54614,7 +54674,7 @@ ors lSU lSU dwQ -dwQ +fdo lSU ada ady @@ -54622,11 +54682,11 @@ adE lSU goj goj +hFk goj goj goj -goj -goj +hFk goj goj wnK @@ -54639,7 +54699,7 @@ bJj osE bJj bJj -gpz +cux gpz bJj bJj @@ -54686,7 +54746,7 @@ vOP mfr agh agh -agh +aff agh agh agh @@ -54698,11 +54758,11 @@ jVI kQF kzE acT -qOD +umm kTZ -iLS -mms -xjg +tCi +agh +uXQ aek vBl itG @@ -54744,11 +54804,11 @@ iMb iMb iMb iMb -nqK +bof vRW cwU wQr -pAx +loK pqj pqj iMb @@ -54791,7 +54851,7 @@ rZt kmO rZt rZt -rZt +dAt rZt rZt rZt @@ -54833,11 +54893,11 @@ adX bhS amP amP +aeo amP amP amP -amP -amP +aeo amP amU aek @@ -54860,11 +54920,11 @@ qbh ovc fMO pji -qOD -iLS -mms -mms -xjg +umm +tCi +agh +agh +uXQ aek iJY ylZ @@ -54906,7 +54966,7 @@ iMb iMb jAL jAL -nqK +bof kxN ttN mgt @@ -55022,11 +55082,11 @@ mLT ovc ovc aVQ -qOD -mms -mms -mms -xjg +umm +agh +aff +agh +uXQ nMZ ivy wFa @@ -55068,7 +55128,7 @@ jAL jAL jAL jAL -nqK +bof kxN jbK mgt @@ -55105,7 +55165,7 @@ fgK lSU chU gAV -gAV +lAP gAV gAV gAV @@ -55184,11 +55244,11 @@ hDw ovc fMO pcC -qOD -mms -mms -mms -xjg +umm +agh +agh +agh +uXQ aek vey txA @@ -55230,11 +55290,11 @@ iMb jAL jAL iMb -tDb +uhE qXx laL cWG -gNJ +trg pqj iMb iMb @@ -55343,14 +55403,14 @@ eAZ qDT acT aoK -ovc +jbr ovc acT -qOD -mms -mms -mms -xjg +umm +agh +agh +agh +uXQ aDn uYg aDn @@ -55392,11 +55452,11 @@ iMb iMb iMb aiz -mRa -lCB -lCB -lCB -wVJ +oNV +hTd +hTd +hTd +agU iMb iMb iMb @@ -55442,11 +55502,11 @@ asz asz rZt flN -rZt +dAt dwQ flN flN -amu +pxA bJj jrg jrg @@ -55497,7 +55557,7 @@ oYw oYw gQR agh -agh +aff agh agh gQR @@ -55508,20 +55568,20 @@ aoK ovc ovc gQR -ljM -dOf -mms -mms -rDn -jVp -joP -mms -mms +vKx +mfr +agh +agh +lXj +mxS +osh +agh +agh pfg pfg kiS -owB -rnB +kYf +peF sYu sYu sYu @@ -55643,12 +55703,12 @@ acT axG maW axG -bhS +lmg qGq amP amP amP -amP +aeo amU knC aSi @@ -55670,20 +55730,20 @@ bVz pkp fuj acT -bjb -ljM -igN -igN -igN -igN -joP -mms -mms -mms -mms -mms +kzE +vKx +cBe +cBe +cBe +sxS +osh +agh +agh +agh +agh +agh iWg -tDr +jhY sYu sYu sYu @@ -55780,14 +55840,14 @@ pxA mWE pJA wnK -mwF +fww mwF mwF mwF vKu bJi bJi -chU +rOL mwF pxA flN @@ -55801,7 +55861,7 @@ puZ (197,1,1) = {" acH axG -axG +tef axG iWa axG @@ -55814,7 +55874,7 @@ amP amU ajO aSi -aSi +oRc aSi aSi eAZ @@ -55839,13 +55899,13 @@ jQy acT acT acT -mms -mms -mms -mms -mms -uQy -gkG +agh +agh +agh +agh +agh +woN +qFO sYu sYu sYu @@ -55914,7 +55974,7 @@ jDv oQl asz chU -gAV +lAP chU adT rZt @@ -56001,11 +56061,11 @@ apv qCa qEC acT -mms -mms -mms -mms -mms +agh +agh +aff +agh +agh sNi sYu sYu @@ -56030,7 +56090,7 @@ jAN asR atD auV -gxN +lvy gxN gxN axV @@ -56094,7 +56154,7 @@ bUe rZt chU rZt -chU +rOL dwQ wnK pxA @@ -56163,13 +56223,13 @@ amP amP amU knC -mms -mms -mms -mms -mms -hEa -rnB +agh +agh +agh +agh +agh +uhM +peF sYu sYu eOM @@ -56291,12 +56351,12 @@ dbQ amP dbQ xBo -bhS +lmg amP sHc acT xoi -amP +aeo amU aek eAZ @@ -56313,25 +56373,25 @@ acT gWF amP iNS -amP +aeo amP amP gcP acT acT wxu -bhI -pNq +hst +kkw amP amU ajO -mms -mms -mms -mms -mms +agh +agh +agh +agh +agh iWg -tDr +jhY sYu lwo lwo @@ -56412,7 +56472,7 @@ goj goj pxA vKu -wnK +pCj wnK cSn pxA @@ -56469,7 +56529,7 @@ oYw aDn aDn axG -axG +tef axG axG bhS @@ -56612,7 +56672,7 @@ puZ acH bhS amP -amP +aeo amP acT bhS @@ -56627,7 +56687,7 @@ eAZ eAZ oYw aSi -aSi +oRc aSi knC maW @@ -56724,13 +56784,13 @@ bgC rZt rZt chU -gAV +lAP chU rZt asz biM biM -biM +meQ goj lpA uWA @@ -56814,7 +56874,7 @@ acT wHZ amP amP -amP +aeo amP amj acT @@ -56907,7 +56967,7 @@ pxA pxA wnK wnK -wnK +pCj wnK wnK pxA @@ -56915,7 +56975,7 @@ rZt vKu vKu wnK -vKu +sQU wnK vKu wnK @@ -57226,7 +57286,7 @@ kQJ vKu wnK vKu -wnK +pCj vKu kap rZt @@ -57279,20 +57339,20 @@ aDn acT acT dWM -amP +aeo amU acT apO amP amP -amP +aeo amP amP amU nKc bhS mCg -pQt +hUS mhx aDn gXS @@ -57304,11 +57364,11 @@ alx amP amP acT -nSO -nSO -nSO -nSO -nSO +jLT +kqO +kqO +kqO +jLT puZ puZ puZ @@ -57401,7 +57461,7 @@ rZt vKu vKu wnK -vKu +sQU wnK vKu wnK @@ -57460,7 +57520,7 @@ aae gXS ajO ajO -ajO +nrt ajO ajO amP @@ -57468,7 +57528,7 @@ amP gXS wje nSO -kPl +fpp nSO nSO puZ @@ -57534,7 +57594,7 @@ eSt wFB dTU rZt -gAV +lAP rZt dTU asz @@ -57542,7 +57602,7 @@ asz asz asz asz -goj +hFk goj fNE chU @@ -57708,7 +57768,7 @@ biM biM fNE chU -vKu +sQU vQm pxA rZt @@ -57746,7 +57806,7 @@ puZ acH acT afm -amP +aeo amU axG axG @@ -57757,7 +57817,7 @@ tef axG okM axG -axG +tef axG axG axG @@ -57861,7 +57921,7 @@ goj goj djO goj -wnK +pCj rZt rZt fNE @@ -57874,10 +57934,10 @@ wnK vFX pxA iQe -qaF +nlt chU kyu -drx +mpE rZt chU rZt @@ -58042,7 +58102,7 @@ gFb sfM oHF wnK -wnK +pCj wnK pxA lYG @@ -58116,7 +58176,7 @@ nSO nSO kPl kPl -nSO +bMW wje kPl puZ @@ -58269,7 +58329,7 @@ nSO aDw kPl kPl -kPl +fpp kPl nSO nSO @@ -58310,13 +58370,13 @@ puZ puZ puZ puZ -abf -qkF -qkF -qkF -qkF -qkF -jvz +xPD +cpc +cpc +cpc +cpc +cpc +dAg puZ puZ puZ @@ -58352,12 +58412,12 @@ rZt vKu vKu vKu -vKu +sQU vKu vKu vKu toN -vKu +sQU vKu dgF hEE @@ -58413,7 +58473,7 @@ axG mKf wje wje -nSO +bMW nSO kPl kPl @@ -58472,13 +58532,13 @@ puZ puZ puZ puZ -mRo -abf -qkF -qkF -qkF -eGq -hbo +ozH +xPD +cpc +cpc +cpc +sQz +oZF puZ puZ puZ @@ -58570,7 +58630,7 @@ amP amP gXS amU -amP +aeo gXS fjs aah @@ -58584,7 +58644,7 @@ aOu nSO kPl kPl -nSO +bMW nSO nSO nSO @@ -58598,7 +58658,7 @@ nSO kPl kPl kPl -nSO +bMW nSO nSO kPl @@ -58634,13 +58694,13 @@ puZ puZ puZ puZ -mRo -mRo -abi -abl -abq -hbo -hbo +ozH +ozH +hCE +oDZ +dzm +oZF +oZF puZ puZ puZ @@ -58667,11 +58727,11 @@ oQl asz tqs rZt -goj +hFk rZt fHM goj -wnK +pCj rZt vKu wnK @@ -58796,13 +58856,13 @@ puZ puZ puZ puZ -mRo -mRo -abj +ozH +ozH +jzh abm -abr -hbo -hbo +vDG +oZF +oZF puZ puZ puZ @@ -58859,13 +58919,13 @@ euA euA bJi euA -euA +tPu euA euA bJi bJi chU -mwF +fww rZt twi kue @@ -58880,7 +58940,7 @@ puZ acH acT aga -amP +aeo amU axG amP @@ -58891,7 +58951,7 @@ hms hms hms hms -cnk +vei amP bhI gXS @@ -58958,13 +59018,13 @@ puZ puZ puZ puZ -mRo -mRo -abk -abo -abs -hbo -hbo +ozH +ozH +hfT +dDy +bRS +oZF +oZF puZ puZ puZ @@ -59015,7 +59075,7 @@ pxA pxA bJi rZt -dTU +wFB dTU dTU dTU @@ -59066,7 +59126,7 @@ nSO nSO nSO nSO -nSO +bMW kPl kPl nSO @@ -59120,13 +59180,13 @@ puZ puZ puZ puZ -mRo -jPo -oLu -oLu -oLu -jIP -hbo +ozH +iyF +mNr +mNr +mNr +bdt +oZF puZ puZ puZ @@ -59282,13 +59342,13 @@ puZ puZ puZ puZ -jPo -oLu -oLu -oLu -oLu -oLu -jIP +iyF +mNr +mNr +mNr +mNr +mNr +bdt puZ puZ puZ diff --git a/maps/map_files/Ice_Colony_v3/sprinkles/unused/35.south-spidercave_cleared.dmm b/maps/map_files/Ice_Colony_v3/sprinkles/unused/35.south-spidercave_cleared.dmm index 6f9f55d9467d..a52bd9780983 100644 --- a/maps/map_files/Ice_Colony_v3/sprinkles/unused/35.south-spidercave_cleared.dmm +++ b/maps/map_files/Ice_Colony_v3/sprinkles/unused/35.south-spidercave_cleared.dmm @@ -28,12 +28,8 @@ /turf/open/auto_turf/ice/layer2, /area/shiva/interior/caves/left_spiders) "dS" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 8 - }, +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/west, /turf/open/gm/river, /area/shiva/interior/caves/left_spiders) "fd" = ( @@ -88,10 +84,8 @@ /turf/open/auto_turf/ice/layer1, /area/shiva/interior/caves/left_spiders) "kW" = ( -/obj/structure/platform/strata{ - dir = 8 - }, -/obj/structure/platform/strata, +/obj/structure/platform/stone/strata/west, +/obj/structure/platform/stone/strata, /turf/open/gm/river, /area/shiva/interior/caves/left_spiders) "lz" = ( @@ -268,12 +262,8 @@ /turf/open/auto_turf/ice/layer1, /area/shiva/interior/caves/left_spiders) "Kx" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 4 - }, +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/east, /turf/open/gm/river, /area/shiva/interior/caves/left_spiders) "MY" = ( @@ -341,10 +331,8 @@ /turf/open/auto_turf/ice/layer2, /area/shiva/interior/caves/left_spiders) "VT" = ( -/obj/structure/platform/strata{ - dir = 4 - }, -/obj/structure/platform/strata, +/obj/structure/platform/stone/strata/east, +/obj/structure/platform/stone/strata, /obj/structure/prop/ice_colony/dense/planter_box/hydro{ density = 0; pixel_x = -16; diff --git a/maps/map_files/Kutjevo/Kutjevo.dmm b/maps/map_files/Kutjevo/Kutjevo.dmm index 1d66a6e0f75c..42197ba4d425 100644 --- a/maps/map_files/Kutjevo/Kutjevo.dmm +++ b/maps/map_files/Kutjevo/Kutjevo.dmm @@ -5,12 +5,12 @@ }, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/construction) -"aaN" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/scrubland) +"aax" = ( +/obj/structure/platform/stone/kutjevo/north, +/obj/structure/platform/stone/kutjevo/east, +/obj/structure/platform/stone/kutjevo, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/interior/colony_north) "aaT" = ( /obj/structure/flora/grass/tallgrass/desert/corner{ dir = 6 @@ -37,6 +37,10 @@ /obj/structure/inflatable/popped, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/complex/med) +"abZ" = ( +/obj/structure/platform/metal/kutjevo/east, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/interior/foremans_office) "acn" = ( /obj/effect/decal/medical_decals{ icon_state = "triagedecaldir" @@ -69,13 +73,15 @@ /obj/structure/machinery/light, /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/power/comms) -"afS" = ( -/obj/structure/monorail, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/interior/power) +"aeE" = ( +/obj/structure/platform/stone/kutjevo/north, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/interior/colony_N_East) +"agl" = ( +/obj/structure/platform/metal/kutjevo/north, +/obj/structure/largecrate/random, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/scrubland) "agG" = ( /turf/open/floor/kutjevo/colors/orange/edge, /area/kutjevo/interior/foremans_office) @@ -99,6 +105,18 @@ }, /turf/open/floor/kutjevo/colors/cyan, /area/kutjevo/interior/complex/med/auto_doc) +"ahE" = ( +/obj/structure/platform/metal/kutjevo_smooth, +/obj/structure/barricade/handrail/kutjevo{ + layer = 3.1 + }, +/obj/structure/machinery/power/port_gen/pacman/super, +/turf/open/floor/kutjevo/multi_tiles/southwest, +/area/kutjevo/interior/colony_South/power2) +"aiJ" = ( +/obj/effect/sentry_landmark/lz_2/top_left, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/lz_pad) "akH" = ( /obj/item/weapon/gun/rifle/mar40/carbine, /turf/open/floor/kutjevo/multi_tiles, @@ -123,6 +141,10 @@ }, /turf/open/floor/kutjevo/colors/purple, /area/kutjevo/interior/construction) +"alG" = ( +/obj/structure/platform_decoration/metal/kutjevo, +/turf/open/auto_turf/sand/layer2, +/area/kutjevo/interior/colony_central) "alL" = ( /obj/structure/flora/grass/tallgrass/desert/corner{ dir = 10 @@ -133,12 +155,13 @@ /obj/structure/machinery/cm_vending/sorted/medical/no_access, /turf/open/floor/kutjevo/colors/cyan, /area/kutjevo/interior/complex/med/auto_doc) -"amu" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 +"amB" = ( +/obj/structure/platform/metal/kutjevo_smooth/east, +/obj/structure/barricade/handrail/kutjevo{ + layer = 3.1 }, -/turf/closed/wall/kutjevo/colony/reinforced, -/area/kutjevo/interior/complex/med/operating) +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/runoff_bridge) "amL" = ( /obj/effect/decal/cleanable/blood/xeno{ icon_state = "xgibleg" @@ -164,13 +187,6 @@ }, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/lz_dunes) -"anE" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/obj/item/stack/sandbags/large_stack, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/complex_border/med_rec) "anF" = ( /obj/structure/closet/fireaxecabinet{ pixel_x = -30 @@ -183,27 +199,9 @@ "aog" = ( /turf/open/desert/desert_shore/shore_edge1/east, /area/kutjevo/exterior/runoff_dunes) -"aoh" = ( -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 4 - }, -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 1 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/interior/colony_N_East) "aor" = ( /turf/open/floor/kutjevo/colors/orange/edge/northeast, /area/kutjevo/interior/power_pt2_electric_boogaloo) -"aoJ" = ( -/obj/structure/stairs/perspective/kutjevo{ - icon_state = "p_stair_ew_full_cap_butt" - }, -/obj/structure/platform/stair_cut/alt{ - icon_state = "kutjevo_platform_sm_stair_alt" - }, -/turf/open/floor/kutjevo/tan/multi_tiles, -/area/kutjevo/interior/colony_South/power2) "apr" = ( /obj/structure/bed/chair, /turf/open/auto_turf/sand/layer1, @@ -211,20 +209,14 @@ "apD" = ( /turf/open/gm/river/desert/shallow_corner/east, /area/kutjevo/exterior/lz_river) +"aqc" = ( +/obj/structure/platform/metal/kutjevo/west, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/scrubland/south) "aqC" = ( /obj/structure/machinery/cm_vending/sorted/medical/no_access, /turf/open/floor/kutjevo/tiles, /area/kutjevo/interior/complex/med/operating) -"aqI" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 4; - name = "\improper Kutjevo Dam Storm Shutters" - }, -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/turf/open/asphalt/cement_sunbleached, -/area/kutjevo/interior/power) "aqO" = ( /obj/structure/machinery/light{ dir = 8 @@ -235,13 +227,6 @@ /obj/item/prop/alien/hugger, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/lz_pad) -"arr" = ( -/obj/structure/blocker/invisible_wall, -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/turf/open/gm/river/desert/deep/toxic, -/area/kutjevo/interior/oob) "arA" = ( /obj/effect/landmark/yautja_teleport, /turf/open/auto_turf/sand/layer1, @@ -283,16 +268,6 @@ /obj/structure/machinery/landinglight/ds1/delaythree, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/exterior/lz_dunes) -"atn" = ( -/obj/structure/stairs/perspective/kutjevo{ - dir = 1; - icon_state = "p_stair_ew_half_cap" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/runoff_dunes) "atz" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -303,6 +278,14 @@ /obj/item/stack/rods, /turf/open/floor/kutjevo/colors/purple/edge/west, /area/kutjevo/interior/construction) +"atL" = ( +/obj/structure/blocker/invisible_wall, +/obj/structure/flora/bush/ausbushes/reedbush, +/obj/structure/flora/bush/ausbushes/grassybush, +/obj/structure/platform/metal/kutjevo/west, +/obj/structure/platform/metal/kutjevo/east, +/turf/open/gm/river/desert/shallow, +/area/kutjevo/interior/construction) "atQ" = ( /obj/item/tank/emergency_oxygen/engi, /turf/open/floor/kutjevo/colors/orange, @@ -311,12 +294,6 @@ /obj/structure/machinery/light, /turf/open/floor/almayer/research/containment/floor2, /area/kutjevo/interior/colony_South/power2) -"aul" = ( -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/turf/open/floor/kutjevo/tan, -/area/kutjevo/interior/colony_north) "avf" = ( /obj/structure/machinery/light{ dir = 4 @@ -342,6 +319,10 @@ }, /turf/open/floor/almayer/research/containment/floor2, /area/kutjevo/interior/power) +"awH" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, +/turf/open/floor/kutjevo/colors/cyan, +/area/kutjevo/interior/complex/med/operating) "awJ" = ( /obj/structure/bed/chair, /turf/open/floor/kutjevo/tan/grey_edge/east, @@ -367,20 +348,27 @@ }, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/runoff_river) +"ayc" = ( +/obj/structure/platform/metal/kutjevo/east, +/turf/open/desert/desert_shore/desert_shore1, +/area/kutjevo/exterior/runoff_river) "ayB" = ( /obj/structure/pipes/standard/tank/oxygen, /turf/open/floor/kutjevo/grey/plate, /area/kutjevo/interior/complex/med/cells) +"ayT" = ( +/obj/structure/platform/metal/kutjevo_smooth/north, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/kutjevo/colors/cyan, +/area/kutjevo/interior/complex/med/cells) "azb" = ( /obj/structure/machinery/chem_dispenser/soda/beer{ icon_state = "dispenser" }, /turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/interior/construction) -"aze" = ( -/obj/structure/platform/kutjevo, -/turf/open/floor/coagulation/icon7_0, -/area/kutjevo/interior/construction) "azo" = ( /obj/structure/largecrate/random/case/small, /obj/structure/sign/nosmoking_1{ @@ -410,6 +398,11 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/floor/kutjevo/colors/cyan/inner_corner, /area/kutjevo/interior/complex/med/auto_doc) +"aCd" = ( +/obj/structure/platform_decoration/stone/kutjevo, +/obj/structure/platform_decoration/stone/kutjevo/west, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/scrubland) "aCn" = ( /obj/structure/sign/safety/hazard{ pixel_x = -32 @@ -424,21 +417,32 @@ "aCD" = ( /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/med/triage) +"aCY" = ( +/obj/structure/platform/metal/kutjevo/east, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/complex_border/med_rec) +"aDW" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, +/turf/open/auto_turf/sand/layer2, +/area/kutjevo/exterior/scrubland/south) +"aEl" = ( +/obj/structure/platform/metal/kutjevo/west, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/complex_border/med_rec) +"aEC" = ( +/obj/structure/stairs/perspective/kutjevo{ + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/kutjevo_smooth, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/interior/power) "aEU" = ( /obj/structure/bed/chair{ dir = 8 }, /turf/open/floor/kutjevo/colors/cyan, /area/kutjevo/interior/complex/med) -"aEZ" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/turf/open/floor/coagulation/icon0_8, -/area/kutjevo/interior/construction) "aFc" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/barricade/handrail/kutjevo{ @@ -471,6 +475,17 @@ /obj/structure/blocker/invisible_wall, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/construction) +"aGR" = ( +/obj/structure/bed/sofa/vert/grey/bot{ + pixel_y = 4 + }, +/obj/structure/barricade/handrail/strata{ + dir = 4 + }, +/obj/structure/barricade/handrail/strata, +/obj/structure/platform_decoration/metal/kutjevo, +/turf/open/floor/mech_bay_recharge_floor, +/area/kutjevo/interior/power) "aHb" = ( /obj/structure/bed/chair/office/light{ dir = 8 @@ -484,12 +499,31 @@ "aHl" = ( /turf/open/floor/kutjevo/colors/cyan, /area/kutjevo/interior/complex/med/cells) +"aHq" = ( +/obj/structure/platform/stone/kutjevo, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/scrubland) +"aHB" = ( +/obj/structure/platform/metal/kutjevo/north, +/obj/structure/platform/metal/kutjevo/east, +/obj/structure/blocker/invisible_wall, +/obj/structure/platform/metal/kutjevo, +/obj/structure/filtration/machine_32x64/indestructible{ + bound_height = 32; + icon_state = "solo_tank_empty" + }, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/exterior/complex_border/med_rec) "aHC" = ( /obj/structure/machinery/light{ dir = 4 }, /turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/interior/complex/botany/east_tech) +"aHI" = ( +/obj/structure/platform_decoration/stone/kutjevo/north, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/lz_dunes) "aHW" = ( /turf/closed/wall/kutjevo/colony/reinforced/hull, /area/kutjevo/interior/power) @@ -515,15 +549,6 @@ }, /turf/open/floor/plating/kutjevo, /area/kutjevo/exterior/runoff_dunes) -"aJU" = ( -/obj/structure/flora/bush/desert{ - icon_state = "tree_3" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/scrubland) "aKg" = ( /obj/structure/tunnel, /turf/open/auto_turf/sand/layer0, @@ -554,26 +579,27 @@ }, /turf/closed/wall/kutjevo/colony, /area/kutjevo/interior/construction) -"aNn" = ( -/turf/open/auto_turf/sand/layer2, -/area/kutjevo/interior/power/comms) "aOh" = ( /obj/structure/largecrate/random/case/small, /turf/open/floor/kutjevo/colors/cyan, /area/kutjevo/interior/complex/med) -"aOj" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 1 - }, -/obj/structure/platform/kutjevo/rock{ - dir = 8 - }, -/turf/open/auto_turf/sand/layer2, -/area/kutjevo/exterior/scrubland) +"aOM" = ( +/obj/structure/platform/metal/kutjevo/north, +/obj/structure/platform/metal/kutjevo/east, +/turf/open/floor/kutjevo/tan, +/area/kutjevo/interior/colony_central) +"aPi" = ( +/obj/structure/platform/metal/kutjevo/east, +/turf/open/gm/river/desert/shallow, +/area/kutjevo/exterior/runoff_river) "aPA" = ( /obj/structure/machinery/cm_vending/sorted/tech/electronics_storage, /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/power_pt2_electric_boogaloo) +"aQd" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/scrubland/south) "aQw" = ( /obj/structure/prop/dam/boulder/boulder2, /turf/open/auto_turf/sand/layer0, @@ -588,14 +614,6 @@ "aRu" = ( /turf/open/floor/kutjevo/tan/alt_edge/north, /area/kutjevo/exterior/lz_dunes) -"aRB" = ( -/obj/item/fuel_cell, -/obj/structure/surface/rack, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/turf/open/floor/kutjevo/multi_tiles/west, -/area/kutjevo/interior/colony_South/power2) "aRS" = ( /obj/structure/bed{ can_buckle = 0; @@ -607,6 +625,12 @@ }, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/complex/botany/east_tech) +"aRZ" = ( +/obj/structure/platform/stone/kutjevo/north, +/obj/structure/platform/stone/kutjevo/west, +/obj/structure/platform/stone/kutjevo, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/interior/colony_central) "aSu" = ( /obj/effect/landmark/yautja_teleport, /turf/open/auto_turf/sand/layer1, @@ -627,6 +651,11 @@ }, /turf/open/gm/dirt2, /area/kutjevo/exterior/complex_border/med_park) +"aVR" = ( +/obj/structure/platform/stone/kutjevo, +/obj/structure/blocker/invisible_wall, +/turf/open/gm/river/desert/deep, +/area/kutjevo/interior/oob) "aWt" = ( /turf/open/desert/desert_shore/shore_corner2/west, /area/kutjevo/exterior/lz_river) @@ -651,6 +680,13 @@ /obj/item/stack/rods, /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/botany) +"aZD" = ( +/obj/structure/stairs/perspective/kutjevo{ + icon_state = "p_stair_ew_full_cap_butt" + }, +/obj/structure/platform/metal/stair_cut/kutjevo_smooth_right, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/exterior/runoff_dunes) "baC" = ( /obj/effect/spawner/random/toolbox{ pixel_x = -2; @@ -658,21 +694,6 @@ }, /turf/open/gm/dirtgrassborder2/wall3, /area/kutjevo/exterior/complex_border/med_park) -"baL" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/platform/kutjevo/smooth, -/obj/structure/filtration/machine_32x64/indestructible{ - bound_height = 32; - icon_state = "solo_tank_empty" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/floor/kutjevo/multi_tiles/southwest, -/area/kutjevo/interior/colony_South/power2) "bbc" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/shuttle/dropship/flight/lz1, @@ -685,25 +706,10 @@ "bbW" = ( /turf/closed/wall/kutjevo/colony/reinforced, /area/kutjevo/interior/foremans_office) -"bcb" = ( -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/turf/open/gm/river/desert/deep, -/area/kutjevo/interior/complex/botany/east_tech) "bcl" = ( /obj/structure/largecrate/random/barrel/red, /turf/open/floor/kutjevo/multi_tiles/east, /area/kutjevo/interior/complex/botany) -"bcG" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/turf/open/floor/coagulation/icon8_8, -/area/kutjevo/interior/construction) "bcO" = ( /obj/item/stack/rods, /turf/open/floor/plating/kutjevo, @@ -725,12 +731,10 @@ /obj/item/card/id/silver/cl, /turf/open/floor/kutjevo/grey/plate, /area/kutjevo/interior/complex/botany/east_tech) -"beo" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/turf/open/floor/kutjevo/tan/multi_tiles, -/area/kutjevo/interior/colony_South/power2) +"bel" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, +/turf/closed/wall/kutjevo/colony/reinforced, +/area/kutjevo/interior/complex/med/operating) "bex" = ( /turf/open/floor/kutjevo/multi_tiles/east, /area/kutjevo/interior/complex/med/auto_doc) @@ -748,15 +752,23 @@ "bfg" = ( /turf/closed/wall/kutjevo/rock, /area/kutjevo/interior/power/comms) -"bhg" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 4 - }, -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 4 +"bgN" = ( +/obj/structure/platform/stone/kutjevo/north, +/obj/structure/platform/stone/kutjevo/east, +/obj/structure/blocker/invisible_wall, +/turf/open/gm/river/desert/shallow_edge/north, +/area/kutjevo/interior/oob) +"bhC" = ( +/obj/structure/platform/metal/kutjevo/north, +/obj/structure/platform/metal/kutjevo/east, +/obj/structure/blocker/invisible_wall, +/obj/structure/platform/metal/kutjevo, +/obj/structure/filtration/machine_32x64/indestructible{ + bound_height = 32; + icon_state = "solo_tank_empty" }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/interior/colony_central) +/turf/open/floor/plating/kutjevo, +/area/kutjevo/interior/colony_north) "bhH" = ( /obj/structure/machinery/chem_master, /turf/open/floor/kutjevo/colors/red/tile, @@ -804,13 +816,6 @@ "bkR" = ( /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_north) -"blY" = ( -/obj/structure/largecrate/random/secure, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/turf/open/floor/kutjevo/colors/cyan, -/area/kutjevo/interior/complex/med/cells) "bmk" = ( /obj/structure/machinery/light{ dir = 1 @@ -832,12 +837,6 @@ }, /turf/open/floor/kutjevo/tan/multi_tiles/north, /area/kutjevo/interior/power/comms) -"bng" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/turf/open/floor/kutjevo/colors/cyan, -/area/kutjevo/interior/complex/med/operating) "bny" = ( /obj/structure/largecrate/random/barrel/blue, /turf/open/auto_turf/sand/layer1, @@ -845,16 +844,6 @@ "bnF" = ( /turf/open/desert/desert_shore/shore_corner2/east, /area/kutjevo/exterior/runoff_bridge) -"bnK" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 1 - }, -/obj/structure/platform/kutjevo/rock{ - dir = 4 - }, -/obj/structure/platform/kutjevo/rock, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/interior/colony_north) "bnQ" = ( /turf/open/gm/river/desert/deep/toxic, /area/kutjevo/interior/complex/botany) @@ -864,12 +853,31 @@ }, /turf/open/floor/kutjevo/multi_tiles/east, /area/kutjevo/interior/power) +"boi" = ( +/obj/structure/stairs/perspective/kutjevo{ + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform_decoration/metal/kutjevo/north, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/complex_border/med_rec) +"bom" = ( +/obj/structure/platform/stone/kutjevo/north, +/obj/structure/platform/stone/kutjevo/west, +/obj/structure/platform/stone/kutjevo/east, +/obj/structure/platform/stone/kutjevo, +/turf/open/gm/river/desert/deep, +/area/kutjevo/interior/colony_central) "boR" = ( /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/power/comms) "bpj" = ( /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_South) +"bpC" = ( +/obj/structure/platform/metal/kutjevo/west, +/turf/open/gm/river/desert/deep, +/area/kutjevo/interior/complex/botany/east_tech) "bpT" = ( /obj/structure/stairs/perspective/kutjevo{ dir = 8; @@ -908,15 +916,6 @@ /obj/structure/tunnel, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/colony_north) -"bsw" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/kutjevo/colors/orange, -/area/kutjevo/interior/colony_South/power2) "bsP" = ( /obj/item/device/flash, /turf/open/floor/kutjevo/tan, @@ -935,6 +934,14 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/kutjevo/colors/cyan, /area/kutjevo/interior/complex/med) +"buJ" = ( +/turf/open/desert/desert_shore/desert_shore1/east, +/area/kutjevo/exterior/scrubland/south) +"bvO" = ( +/obj/structure/platform/metal/kutjevo_smooth/west, +/obj/structure/blocker/invisible_wall, +/turf/open/gm/river/desert/deep/toxic, +/area/kutjevo/interior/oob) "bvT" = ( /obj/structure/machinery/light{ dir = 1 @@ -945,13 +952,10 @@ /obj/structure/prop/dam/truck/cargo, /turf/open/floor/kutjevo/tan/multi_tiles/north, /area/kutjevo/exterior/Northwest_Colony) -"bwT" = ( -/obj/structure/flora/bush/ausbushes/reedbush, -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/turf/open/gm/river/desert/shallow_edge/west, -/area/kutjevo/exterior/runoff_river) +"bxD" = ( +/obj/structure/platform/metal/kutjevo_smooth/north, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/interior/power) "byl" = ( /obj/structure/blocker/invisible_wall, /obj/structure/window/framed/kutjevo/reinforced/hull, @@ -1004,6 +1008,10 @@ }, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/runoff_bridge) +"bCr" = ( +/obj/structure/platform_decoration/stone/kutjevo/west, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/runoff_dunes) "bDg" = ( /obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/kutjevo/multi_tiles/southwest, @@ -1023,6 +1031,10 @@ /obj/item/ammo_magazine/shotgun/buckshot, /turf/open/floor/kutjevo/colors/green/tile, /area/kutjevo/interior/complex/botany) +"bDA" = ( +/obj/structure/platform/stone/kutjevo/east, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/stonyfields) "bDG" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_nest, /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, @@ -1053,6 +1065,14 @@ "bEt" = ( /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/exterior/lz_pad) +"bEu" = ( +/obj/structure/stairs/perspective/kutjevo{ + dir = 4; + icon_state = "p_stair_ew_full_cap" + }, +/obj/structure/platform/metal/kutjevo, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/interior/power/comms) "bEH" = ( /turf/open/auto_turf/sand/layer2, /area/kutjevo/interior/colony_north) @@ -1060,25 +1080,6 @@ /obj/structure/machinery/recharge_station, /turf/open/floor/kutjevo/grey/plate, /area/kutjevo/interior/complex/Northwest_Dorms) -"bFh" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 1 - }, -/obj/structure/platform/kutjevo/rock{ - dir = 4 - }, -/obj/structure/platform/kutjevo/rock{ - dir = 8 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/interior/colony_central) -"bFz" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 1 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/gm/river/desert/shallow_edge/northeast, -/area/kutjevo/interior/oob) "bGg" = ( /obj/structure/flora/bush/desert{ icon_state = "tree_3" @@ -1100,6 +1101,12 @@ "bGD" = ( /turf/open/desert/desert_shore/shore_edge1, /area/kutjevo/exterior/lz_dunes) +"bGS" = ( +/obj/structure/blocker/invisible_wall, +/obj/structure/platform/metal/kutjevo/north, +/obj/structure/platform/metal/kutjevo/east, +/turf/open/gm/river/desert/deep/toxic, +/area/kutjevo/interior/power) "bGV" = ( /obj/structure/bed/chair{ dir = 8 @@ -1117,6 +1124,14 @@ "bHA" = ( /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/interior/power/comms) +"bIq" = ( +/obj/structure/stairs/perspective/kutjevo{ + dir = 8; + icon_state = "p_stair_ew_half_cap" + }, +/obj/structure/platform/metal/kutjevo/west, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/complex_border/med_rec) "bIL" = ( /obj/effect/landmark/objective_landmark/medium, /turf/open/auto_turf/sand/layer1, @@ -1127,12 +1142,6 @@ }, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/colony_South/power2) -"bJc" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/turf/open/floor/kutjevo/tan, -/area/kutjevo/interior/colony_central) "bJe" = ( /obj/structure/largecrate/random/barrel/blue, /turf/open/auto_turf/sand/layer0, @@ -1160,12 +1169,6 @@ "bKH" = ( /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/construction) -"bKJ" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/turf/open/floor/kutjevo/multi_tiles/north, -/area/kutjevo/exterior/complex_border/med_rec) "bKO" = ( /obj/effect/landmark/monkey_spawn, /turf/open/auto_turf/sand/layer2, @@ -1180,10 +1183,18 @@ }, /turf/open/floor/mech_bay_recharge_floor, /area/kutjevo/interior/colony_central/mine_elevator) +"bLW" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, +/turf/open/floor/kutjevo/colors/orange, +/area/kutjevo/interior/colony_South/power2) "bMu" = ( /obj/structure/bed/sofa/south/grey, /turf/open/floor/kutjevo/tan/grey_edge/north, /area/kutjevo/interior/complex/Northwest_Dorms) +"bNk" = ( +/obj/structure/platform/metal/kutjevo/east, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/scrubland) "bNG" = ( /obj/structure/prop/dam/boulder/boulder1, /turf/open/auto_turf/sand/layer0, @@ -1204,11 +1215,6 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_S_East) -"bPf" = ( -/obj/structure/platform_decoration/kutjevo, -/obj/effect/landmark/survivor_spawner, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/interior/foremans_office) "bPV" = ( /obj/item/tool/wirecutters/clippers, /turf/open/floor/kutjevo/tan, @@ -1227,12 +1233,12 @@ }, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/colony_central) -"bQY" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/gm/river/desert/deep, -/area/kutjevo/interior/complex/botany/east_tech) +"bQJ" = ( +/obj/structure/platform/stone/kutjevo/north, +/obj/structure/platform/stone/kutjevo/east, +/obj/structure/blocker/invisible_wall, +/turf/open/desert/desert_shore/desert_shore1/north, +/area/kutjevo/interior/oob) "bRl" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/communications{ @@ -1240,6 +1246,10 @@ }, /turf/open/floor/kutjevo/colors/orange/edge/east, /area/kutjevo/interior/foremans_office) +"bRy" = ( +/obj/structure/platform/metal/kutjevo_smooth, +/turf/open/floor/kutjevo/multi_tiles/east, +/area/kutjevo/interior/colony_South/power2) "bRF" = ( /obj/item/stack/sheet/metal, /turf/open/auto_turf/sand/layer0, @@ -1250,16 +1260,6 @@ }, /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/med) -"bSV" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 1 - }, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/runoff_dunes) -"bTa" = ( -/obj/effect/landmark/hunter_secondary, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/scrubland) "bTt" = ( /obj/structure/bed/chair{ dir = 4 @@ -1309,6 +1309,11 @@ }, /turf/open/floor/almayer/research/containment/floor2, /area/kutjevo/interior/complex/botany) +"bWz" = ( +/obj/structure/platform/stone/kutjevo/north, +/obj/structure/platform/stone/kutjevo/west, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/scrubland) "bWA" = ( /obj/structure/flora/bush/desert{ icon_state = "tree_3" @@ -1333,10 +1338,24 @@ /obj/structure/sign/nosmoking_1, /turf/closed/wall/kutjevo/colony, /area/kutjevo/interior/complex/botany) -"caj" = ( -/obj/structure/platform_decoration/kutjevo, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/lz_dunes) +"bXA" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/gm/river/desert/deep/covered, +/area/kutjevo/interior/colony_central) +"bZm" = ( +/obj/structure/platform/metal/kutjevo/north, +/obj/structure/blocker/invisible_wall, +/turf/open/gm/river/desert/deep/toxic, +/area/kutjevo/interior/power) +"bZM" = ( +/obj/structure/stairs/perspective/kutjevo{ + dir = 1; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform_decoration/metal/kutjevo/north, +/turf/open/floor/kutjevo/tan/multi_tiles, +/area/kutjevo/interior/colony_South/power2) "cal" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/kutjevo/colors/purple/edge/west, @@ -1356,13 +1375,15 @@ "cbg" = ( /turf/open/floor/kutjevo/colors/cyan, /area/kutjevo/interior/complex/med/operating) -"cbv" = ( -/obj/structure/platform_decoration/kutjevo, -/turf/open/floor/kutjevo/multi_tiles/southwest, -/area/kutjevo/interior/colony_South/power2) "cbz" = ( /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/colony_north) +"cbG" = ( +/obj/structure/platform/metal/kutjevo/east, +/obj/structure/platform/metal/kutjevo, +/obj/structure/blocker/invisible_wall, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/exterior/runoff_dunes) "ccs" = ( /obj/structure/machinery/landinglight/ds2/delaytwo{ dir = 4 @@ -1372,6 +1393,11 @@ "ccu" = ( /turf/open/floor/kutjevo/tan/grey_inner_edge/west, /area/kutjevo/interior/complex/med) +"cdz" = ( +/obj/structure/blocker/invisible_wall, +/obj/structure/platform/metal/kutjevo, +/turf/open/gm/river/desert/deep/toxic, +/area/kutjevo/interior/power) "cdE" = ( /obj/structure/barricade/deployable{ dir = 8 @@ -1381,12 +1407,9 @@ }, /turf/open/floor/kutjevo/colors/purple/inner_corner/east, /area/kutjevo/interior/construction) -"cek" = ( -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 8 - }, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/runoff_dunes) +"cen" = ( +/turf/open/desert/desert_shore/shore_edge1/east, +/area/kutjevo/exterior/scrubland/south) "cey" = ( /obj/item/ammo_magazine/shotgun/buckshot, /turf/open/floor/kutjevo/tan, @@ -1401,6 +1424,10 @@ }, /turf/open/floor/kutjevo/colors/cyan, /area/kutjevo/interior/complex/med) +"cgp" = ( +/obj/structure/platform_decoration/stone/kutjevo/north, +/turf/open/auto_turf/sand/layer2, +/area/kutjevo/exterior/scrubland) "cgE" = ( /obj/effect/landmark/yautja_teleport, /turf/open/auto_turf/sand/layer0, @@ -1423,16 +1450,19 @@ /obj/item/prop/alien/hugger, /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/Northwest_Flight_Control) -"ciD" = ( -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 8 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/scrubland) +"ciB" = ( +/obj/structure/platform/metal/kutjevo_smooth, +/obj/structure/platform/metal/kutjevo_smooth/west, +/turf/open/floor/kutjevo/colors/orange, +/area/kutjevo/interior/power) "ciR" = ( /obj/item/ammo_magazine/rifle/m16, /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/power_pt2_electric_boogaloo) +"cjA" = ( +/obj/structure/platform/stone/kutjevo/north, +/turf/open/mars_cave/mars_cave_7, +/area/kutjevo/exterior/scrubland) "cjC" = ( /obj/structure/bed/chair{ dir = 4 @@ -1442,12 +1472,6 @@ "cjO" = ( /turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/interior/complex/med) -"ckC" = ( -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 8 - }, -/turf/open/mars_cave/mars_cave_10, -/area/kutjevo/exterior/scrubland) "ckF" = ( /obj/structure/blocker/invisible_wall, /turf/open/desert/desert_shore/desert_shore1/east, @@ -1455,6 +1479,15 @@ "clo" = ( /turf/open/gm/river/desert/shallow_edge/northwest, /area/kutjevo/exterior/runoff_dunes) +"clp" = ( +/obj/structure/platform/metal/kutjevo_smooth/west, +/obj/structure/filtration/machine_32x64/indestructible{ + bound_height = 32; + icon_state = "solo_tank_empty" + }, +/obj/structure/blocker/invisible_wall, +/turf/open/floor/kutjevo/multi_tiles/southwest, +/area/kutjevo/interior/colony_South/power2) "cmG" = ( /turf/open/floor/kutjevo/colors/cyan/edge/east, /area/kutjevo/interior/complex/med/triage) @@ -1468,6 +1501,10 @@ }, /turf/open/floor/kutjevo/colors/cyan/tile, /area/kutjevo/interior/complex/med/operating) +"coa" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/desert/desert_shore/desert_shore1/west, +/area/kutjevo/exterior/lz_river) "cou" = ( /obj/effect/decal/cleanable/blood/xeno, /turf/open/floor/kutjevo/multi_tiles, @@ -1514,6 +1551,17 @@ }, /turf/open/floor/kutjevo/multi_tiles/southeast, /area/kutjevo/interior/complex/botany) +"cpq" = ( +/obj/structure/bed/sofa/vert/grey/bot{ + pixel_y = 4 + }, +/obj/structure/barricade/handrail/strata{ + dir = 8 + }, +/obj/structure/barricade/handrail/strata, +/obj/structure/platform_decoration/metal/kutjevo/north, +/turf/open/floor/mech_bay_recharge_floor, +/area/kutjevo/interior/power) "cpD" = ( /obj/structure/flora/bush/desert{ icon_state = "tree_3" @@ -1534,6 +1582,12 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/floor/kutjevo/tan/multi_tiles/east, /area/kutjevo/interior/complex/botany/east) +"cql" = ( +/obj/structure/flora/grass/tallgrass/desert/corner{ + dir = 5 + }, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/scrubland/south) "cqX" = ( /obj/structure/stairs/perspective/kutjevo{ icon_state = "p_stair_full" @@ -1556,6 +1610,12 @@ }, /turf/open/gm/grass/grass1/weedable, /area/kutjevo/exterior/complex_border/med_park) +"csx" = ( +/obj/structure/flora/grass/tallgrass/desert/corner{ + dir = 8 + }, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/scrubland/south) "csE" = ( /obj/structure/girder, /turf/open/auto_turf/sand/layer0, @@ -1580,18 +1640,6 @@ }, /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/power/comms) -"ctS" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/obj/structure/blocker/invisible_wall, -/obj/structure/platform/kutjevo, -/obj/structure/filtration/machine_32x64/indestructible{ - bound_height = 32; - icon_state = "solo_tank_empty" - }, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/exterior/complex_border/med_rec) "ctV" = ( /obj/structure/barricade/handrail/kutjevo{ dir = 4 @@ -1603,16 +1651,10 @@ /obj/structure/extinguisher_cabinet, /turf/closed/wall/kutjevo/colony/reinforced, /area/kutjevo/interior/oob) -"cun" = ( -/obj/structure/platform_decoration/kutjevo, -/turf/open/desert/desert_shore/desert_shore1/west, -/area/kutjevo/exterior/lz_river) -"cuF" = ( -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/interior/colony_north) +"cuG" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, +/turf/open/desert/desert_shore/desert_shore1/east, +/area/kutjevo/exterior/scrubland/south) "cvj" = ( /obj/structure/bed/chair{ dir = 1 @@ -1628,6 +1670,10 @@ }, /turf/open/floor/kutjevo/tan/multi_tiles/north, /area/kutjevo/exterior/Northwest_Colony) +"cvU" = ( +/obj/structure/platform/metal/kutjevo, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/scrubland) "cvV" = ( /obj/item/weapon/gun/rifle/mar40, /turf/open/floor/kutjevo/multi_tiles, @@ -1667,12 +1713,6 @@ /obj/structure/machinery/vending/coffee, /turf/open/floor/kutjevo/colors/purple/inner_corner/north, /area/kutjevo/interior/construction) -"cBi" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/turf/open/desert/desert_shore/desert_shore1/east, -/area/kutjevo/exterior/scrubland) "cBq" = ( /obj/structure/flora/bush/ausbushes/ausbush{ icon_state = "pointybush_2"; @@ -1721,13 +1761,6 @@ }, /turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/exterior/runoff_bridge) -"cEo" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/obj/structure/bed/roller, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/complex_border/med_rec) "cEq" = ( /turf/open/gm/dirt2, /area/kutjevo/exterior/complex_border/med_park) @@ -1739,19 +1772,14 @@ /obj/structure/extinguisher_cabinet, /turf/closed/wall/kutjevo/colony/reinforced, /area/kutjevo/interior/complex/botany) +"cFp" = ( +/obj/effect/sentry_landmark/lz_1/bottom_right, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/lz_dunes) "cFJ" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic/autoname, /turf/open/floor/kutjevo/multi_tiles/southeast, /area/kutjevo/interior/complex/botany/east_tech) -"cFT" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/kutjevo/multi_tiles/southwest, -/area/kutjevo/interior/colony_South/power2) "cFY" = ( /obj/item/stool, /obj/item/frame/firstaid_arm_assembly, @@ -1767,14 +1795,6 @@ }, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/interior/power) -"cGz" = ( -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/obj/structure/platform/kutjevo, -/obj/structure/blocker/invisible_wall, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/exterior/complex_border/med_park) "cHb" = ( /obj/structure/filtration/machine_32x64/indestructible{ bound_height = 32; @@ -1782,44 +1802,25 @@ }, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/construction) -"cIE" = ( -/obj/structure/surface/rack, -/obj/effect/landmark/objective_landmark/medium, -/turf/open/floor/kutjevo/colors, -/area/kutjevo/interior/power) -"cIZ" = ( -/obj/structure/stairs/perspective/kutjevo{ - dir = 8; - icon_state = "p_stair_ew_full_cap_butt" - }, -/obj/structure/platform/stair_cut{ - icon_state = "kutjevo_platform_sm_stair" - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/kutjevo/colors/purple, -/area/kutjevo/interior/complex/med/locks) +"cIj" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/runoff_river) "cJn" = ( /obj/structure/girder, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/colony_central) +"cJt" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, +/turf/open/floor/kutjevo/colors/orange, +/area/kutjevo/interior/power) +"cJP" = ( +/obj/structure/platform/metal/kutjevo, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/interior/colony_central) "cKi" = ( /turf/open/gm/river/desert/shallow_edge/west, /area/kutjevo/exterior/runoff_dunes) -"cKH" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/lz_dunes) -"cKI" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/prop/dam/crane/cargo{ - layer = 3.3 - }, -/turf/open/asphalt/cement_sunbleached, -/area/kutjevo/interior/power) "cKY" = ( /obj/structure/prop/brazier/frame/full/campfire, /obj/item/tool/match/paper{ @@ -1842,25 +1843,10 @@ "cLQ" = ( /turf/open/mars_cave/mars_cave_7, /area/kutjevo/exterior/lz_dunes) -"cMc" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/stairs/perspective/kutjevo{ - dir = 4; - icon_state = "p_stair_full" - }, -/obj/effect/landmark/objective_landmark/medium, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/interior/power) "cMv" = ( /obj/effect/decal/kutjevo_decals/catwalk, /turf/open/floor/greengrid, /area/kutjevo/interior/complex/med/operating) -"cMC" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/interior/colony_central) "cMI" = ( /obj/structure/barricade/handrail/kutjevo{ dir = 4 @@ -1869,12 +1855,6 @@ /obj/effect/landmark/objective_landmark/far, /turf/open/floor/kutjevo/multi_tiles/southwest, /area/kutjevo/interior/colony_South/power2) -"cMJ" = ( -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/turf/open/gm/river/desert/shallow, -/area/kutjevo/exterior/runoff_river) "cNE" = ( /obj/structure/filtration/machine_96x96/indestructible{ icon_state = "distribution" @@ -1887,6 +1867,10 @@ }, /turf/open/floor/kutjevo/colors/green, /area/kutjevo/interior/complex/botany) +"cOk" = ( +/obj/effect/sentry_landmark/lz_2/top_right, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/lz_pad) "cOt" = ( /turf/open/gm/river/desert/shallow, /area/kutjevo/exterior/runoff_dunes) @@ -1917,14 +1901,6 @@ /obj/effect/landmark/xeno_spawn, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/colony_South) -"cQt" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/platform/kutjevo/smooth, -/obj/structure/blocker/invisible_wall, -/turf/open/gm/river/desert/deep/toxic, -/area/kutjevo/interior/oob) "cQz" = ( /obj/effect/landmark/objective_landmark/science, /turf/open/floor/kutjevo/colors/green/tile, @@ -1940,28 +1916,31 @@ /obj/structure/largecrate/random/case/small, /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/power/comms) +"cRw" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 4; + name = "\improper Kutjevo Dam Storm Shutters" + }, +/obj/structure/platform_decoration/metal/kutjevo/east, +/turf/open/asphalt/cement_sunbleached, +/area/kutjevo/interior/power) +"cRy" = ( +/obj/structure/platform/metal/kutjevo, +/turf/open/gm/river/desert/shallow_edge/southwest, +/area/kutjevo/exterior/lz_river) "cRI" = ( /turf/closed/wall/kutjevo/colony/reinforced, /area/kutjevo/exterior/runoff_river) -"cRO" = ( -/obj/structure/monorail, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/interior/colony_central/mine_elevator) "cSb" = ( /obj/effect/decal/cleanable/blood/xeno{ icon_state = "xgibhead" }, /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/botany) -"cSz" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/interior/foremans_office) +"cSj" = ( +/obj/structure/platform/metal/kutjevo_smooth/west, +/turf/open/gm/river/desert/shallow_edge/southwest, +/area/kutjevo/exterior/runoff_bridge) "cSJ" = ( /obj/effect/landmark/xeno_hive_spawn, /obj/effect/landmark/ert_spawns/groundside_xeno, @@ -1976,16 +1955,6 @@ "cTz" = ( /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/runoff_dunes) -"cTG" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/gm/river/desert/deep/toxic, -/area/kutjevo/interior/oob) "cTW" = ( /obj/structure/stairs/perspective/kutjevo{ dir = 4; @@ -2011,6 +1980,10 @@ "cUm" = ( /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/construction) +"cUo" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/interior/colony_north) "cUq" = ( /obj/structure/closet/firecloset/full{ desc = "It's a storage unit for fire-fighting supplies. The sequence -4-- is carved into the corner." @@ -2018,12 +1991,6 @@ /obj/effect/landmark/objective_landmark/far, /turf/open/floor/kutjevo/grey/plate, /area/kutjevo/interior/construction) -"cUI" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/complex_border/med_rec) "cVD" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/kutjevo/tan, @@ -2054,12 +2021,6 @@ "cWV" = ( /turf/open/floor/almayer/research/containment/floor2, /area/kutjevo/exterior/lz_dunes) -"cWX" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/turf/open/floor/kutjevo/colors/cyan, -/area/kutjevo/interior/complex/med/cells) "cXA" = ( /obj/structure/flora/bush/ausbushes/ppflowers{ icon_state = "lavendergrass_1" @@ -2145,10 +2106,10 @@ "dcC" = ( /turf/open/desert/desert_shore/shore_edge1/north, /area/kutjevo/exterior/spring) -"ddi" = ( -/obj/structure/platform/kutjevo, -/turf/open/gm/river/desert/deep, -/area/kutjevo/interior/complex/botany/east_tech) +"dcK" = ( +/obj/structure/platform/metal/kutjevo_smooth/north, +/turf/open/floor/kutjevo/colors/cyan, +/area/kutjevo/interior/complex/med/cells) "ddk" = ( /obj/structure/stairs/perspective/kutjevo{ dir = 4; @@ -2160,22 +2121,17 @@ /obj/structure/flora/grass/desert/lightgrass_11, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/lz_river) -"ddx" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 1 - }, -/obj/structure/platform/kutjevo/rock{ - dir = 8 - }, -/obj/structure/platform/kutjevo/rock, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/interior/colony_north) -"ddH" = ( -/obj/structure/platform/kutjevo{ - dir = 1 +"ddZ" = ( +/obj/structure/platform/metal/kutjevo_smooth/west, +/obj/structure/platform/metal/kutjevo_smooth, +/obj/structure/filtration/machine_32x64/indestructible{ + bound_height = 32; + icon_state = "solo_tank_empty" }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/scrubland) +/obj/structure/platform/metal/kutjevo_smooth/west, +/obj/structure/blocker/invisible_wall, +/turf/open/floor/kutjevo/multi_tiles/southwest, +/area/kutjevo/interior/colony_South/power2) "deo" = ( /obj/structure/bookcase{ icon_state = "book-5" @@ -2191,6 +2147,9 @@ }, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/scrubland) +"deM" = ( +/turf/open/gm/river/desert/shallow_edge/east, +/area/kutjevo/exterior/scrubland/south) "dfa" = ( /turf/closed/wall/kutjevo/colony/reinforced, /area/kutjevo/exterior/lz_river) @@ -2198,6 +2157,11 @@ /obj/structure/machinery/vending/cola, /turf/open/floor/kutjevo/grey/plate, /area/kutjevo/interior/complex/Northwest_Dorms) +"dfC" = ( +/obj/structure/platform_decoration/stone/kutjevo/east, +/obj/structure/blocker/invisible_wall, +/turf/open/gm/river/desert/deep, +/area/kutjevo/interior/oob) "dfY" = ( /turf/open/gm/river/desert/shallow_edge/southeast, /area/kutjevo/exterior/lz_river) @@ -2215,10 +2179,11 @@ "dgx" = ( /turf/open/floor/almayer/research/containment/floor1, /area/kutjevo/interior/complex/med/locks) -"dhm" = ( -/obj/structure/platform_decoration/kutjevo, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/interior/colony_north) +"dgB" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, +/obj/structure/barricade/wooden, +/turf/open/floor/kutjevo/multi_tiles, +/area/kutjevo/exterior/runoff_bridge) "dht" = ( /turf/open/floor/almayer/research/containment/floor1, /area/kutjevo/exterior/Northwest_Colony) @@ -2250,47 +2215,41 @@ }, /turf/open/gm/dirtgrassborder2, /area/kutjevo/exterior/complex_border/med_park) +"diY" = ( +/obj/structure/platform_decoration/metal/kutjevo, +/turf/open/desert/desert_shore/desert_shore1/west, +/area/kutjevo/exterior/lz_river) "dkE" = ( /turf/open/floor/kutjevo/grey/plate, /area/kutjevo/interior/complex/botany/east_tech) "dkW" = ( /turf/open/floor/kutjevo/plate, /area/kutjevo/interior/complex/Northwest_Flight_Control) +"dkY" = ( +/obj/structure/platform/metal/kutjevo/north, +/turf/open/floor/kutjevo/tan, +/area/kutjevo/interior/colony_north) +"dlR" = ( +/obj/structure/surface/rack, +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/kutjevo/colors, +/area/kutjevo/interior/power/comms) "dlT" = ( /turf/open/floor/kutjevo/colors/red/tile, /area/kutjevo/interior/complex/med/operating) -"dml" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/turf/open/floor/kutjevo/multi_tiles/southwest, -/area/kutjevo/interior/colony_South/power2) +"dmp" = ( +/turf/open/gm/river/desert/shallow, +/area/kutjevo/exterior/scrubland/south) "dmy" = ( /turf/open/asphalt/cement_sunbleached, /area/kutjevo/exterior/lz_pad) "dnd" = ( /turf/open/gm/river/desert/shallow_edge/west, /area/kutjevo/exterior/spring) -"dnl" = ( -/obj/structure/platform/kutjevo/rock, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/scrubland) "dnF" = ( /obj/item/tool/pickaxe, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/complex/botany/east_tech) -"dnM" = ( -/obj/structure/stairs/perspective/kutjevo{ - icon_state = "p_stair_ew_full_cap_butt" - }, -/obj/structure/platform/stair_cut/alt{ - icon_state = "kutjevo_platform_sm_stair_alt" - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/kutjevo/colors/purple, -/area/kutjevo/interior/complex/med/locks) "dnR" = ( /obj/structure/machinery/light{ dir = 1 @@ -2300,12 +2259,6 @@ "dob" = ( /turf/open/desert/desert_shore/shore_corner2, /area/kutjevo/exterior/lz_river) -"dox" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/gm/river/desert/shallow_edge/northwest, -/area/kutjevo/exterior/runoff_river) "dpt" = ( /obj/structure/machinery/landinglight/ds2/delayone{ dir = 1 @@ -2316,36 +2269,32 @@ /obj/structure/largecrate/random/case/double, /turf/open/floor/kutjevo/tan, /area/kutjevo/exterior/lz_pad) +"dqa" = ( +/obj/structure/machinery/colony_floodlight, +/obj/structure/platform/metal/kutjevo_smooth/east, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/lz_dunes) "dql" = ( /obj/structure/prop/dam/wide_boulder/boulder1, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_north) -"dqp" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/turf/open/gm/river/desert/shallow_edge/southwest, -/area/kutjevo/exterior/runoff_bridge) -"dqH" = ( -/obj/structure/barricade/handrail/kutjevo{ - dir = 4 - }, -/obj/structure/closet/secure_closet/engineering_electrical, -/obj/structure/platform/kutjevo/smooth, -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor/kutjevo/multi_tiles/southwest, -/area/kutjevo/interior/colony_South/power2) "dqK" = ( /obj/structure/flora/grass/desert/lightgrass_1, /obj/structure/blocker/invisible_wall, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/oob/dev_room) +"drg" = ( +/obj/structure/platform/stone/kutjevo, +/obj/structure/platform/stone/kutjevo/west, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/interior/colony_N_East) +"drR" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/floor/kutjevo/colors/orange, +/area/kutjevo/interior/colony_South/power2) "dsi" = ( /turf/open/floor/coagulation/icon7_0, /area/kutjevo/exterior/scrubland) -"dsp" = ( -/turf/open/desert/desert_shore/desert_shore1/north, -/area/kutjevo/exterior/scrubland) "dsN" = ( /obj/structure/flora/grass/tallgrass/desert/corner{ dir = 5 @@ -2363,16 +2312,6 @@ "dte" = ( /turf/open/gm/river/desert/shallow_edge/west, /area/kutjevo/exterior/runoff_river) -"dtM" = ( -/obj/structure/blocker/invisible_wall, -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/turf/open/gm/river/desert/deep/toxic, -/area/kutjevo/interior/oob) "dtV" = ( /obj/structure/machinery/blackbox_recorder, /obj/item/prop/almayer/flight_recorder/colony{ @@ -2381,6 +2320,10 @@ }, /turf/open/floor/kutjevo/grey/plate, /area/kutjevo/interior/complex/botany/east_tech) +"duf" = ( +/obj/structure/platform/metal/kutjevo/east, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/interior/colony_north) "duu" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ name = "\improper South Power Shutters" @@ -2440,16 +2383,14 @@ }, /turf/open/gm/river/desert/shallow_edge/northwest, /area/kutjevo/exterior/runoff_river) +"dyA" = ( +/obj/structure/platform/metal/kutjevo_smooth/east, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/scrubland) "dyB" = ( /obj/effect/landmark/objective_landmark/close, /turf/open/floor/kutjevo/colors/cyan, /area/kutjevo/interior/complex/med/operating) -"dyU" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/turf/open/gm/river/desert/shallow_corner/east, -/area/kutjevo/exterior/lz_river) "dyW" = ( /turf/open/desert/desert_shore/shore_edge1/west, /area/kutjevo/exterior/lz_pad) @@ -2457,16 +2398,6 @@ /obj/item/storage/briefcase, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/construction) -"dzm" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/exterior/complex_border/med_park) "dzD" = ( /obj/structure/barricade/wooden{ dir = 1; @@ -2511,18 +2442,6 @@ /obj/structure/prop/dam/boulder/boulder3, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/runoff_river) -"dCG" = ( -/obj/structure/blocker/invisible_wall, -/obj/structure/flora/bush/ausbushes/reedbush, -/obj/structure/flora/bush/ausbushes/grassybush, -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/turf/open/gm/river/desert/shallow, -/area/kutjevo/interior/construction) "dCP" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor/kutjevo/tan/alt_edge, @@ -2543,15 +2462,36 @@ "dDL" = ( /turf/open/gm/river/desert/shallow, /area/kutjevo/exterior/lz_pad) +"dDT" = ( +/obj/structure/platform_decoration/metal/kutjevo, +/obj/structure/platform_decoration/stone/kutjevo/north, +/obj/structure/blocker/invisible_wall, +/turf/open/gm/river/desert/deep, +/area/kutjevo/interior/oob) "dEI" = ( /obj/effect/decal/cleanable/blood/oil, /obj/structure/machinery/landinglight/ds1/delayone, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/exterior/lz_dunes) +"dEO" = ( +/obj/structure/platform/stone/kutjevo/west, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/stonyfields) "dFc" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/auto_turf/sand/layer2, /area/kutjevo/exterior/Northwest_Colony) +"dFh" = ( +/obj/structure/stairs/perspective/kutjevo{ + dir = 8; + icon_state = "p_stair_ew_full_cap_butt" + }, +/obj/structure/platform/metal/stair_cut/kutjevo_smooth_left, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/kutjevo/colors/purple, +/area/kutjevo/interior/complex/med/locks) "dFk" = ( /turf/open/mars_cave/mars_cave_7, /area/kutjevo/exterior/scrubland) @@ -2559,12 +2499,10 @@ /obj/item/stack/sheet/metal, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/Northwest_Colony) -"dFV" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 4 - }, +"dGb" = ( +/obj/structure/platform/stone/kutjevo/north, /turf/open/auto_turf/sand/layer0, -/area/kutjevo/interior/colony_South) +/area/kutjevo/exterior/lz_dunes) "dGi" = ( /obj/structure/flora/grass/tallgrass/desert/corner{ dir = 1 @@ -2575,13 +2513,6 @@ /obj/structure/window/framed/kutjevo, /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/med/operating) -"dGy" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/desert/desert_shore/shore_edge1/east, -/area/kutjevo/exterior/runoff_river) "dHj" = ( /obj/structure/machinery/door_control/brbutton/alt{ health = null; @@ -2621,13 +2552,16 @@ /obj/effect/spawner/random/tool, /turf/open/floor/kutjevo/colors/green, /area/kutjevo/interior/complex/botany) +"dJh" = ( +/obj/item/tool/wrench, +/obj/item/prop/alien/hugger, +/obj/effect/sentry_landmark/lz_2/bottom_right, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/Northwest_Colony) "dJk" = ( /obj/structure/machinery/light, /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/botany) -"dJs" = ( -/turf/open/gm/river/desert/shallow, -/area/kutjevo/exterior/scrubland) "dJT" = ( /obj/structure/window/framed/kutjevo, /turf/open/floor/plating/kutjevo, @@ -2643,12 +2577,6 @@ "dKu" = ( /turf/open/desert/desert_shore/shore_edge1/north, /area/kutjevo/exterior/runoff_river) -"dKz" = ( -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/turf/open/floor/coagulation/icon0_5, -/area/kutjevo/interior/colony_north) "dKO" = ( /obj/structure/bed/chair{ dir = 4 @@ -2671,17 +2599,6 @@ "dNc" = ( /turf/open/desert/desert_shore/shore_corner2/west, /area/kutjevo/exterior/runoff_river) -"dNg" = ( -/obj/structure/flora/grass/tallgrass/desert/corner{ - dir = 1 - }, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/scrubland) -"dNI" = ( -/obj/structure/platform/kutjevo/rock, -/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/interior/colony_north) "dOj" = ( /turf/open/gm/river/desert/shallow_corner/north, /area/kutjevo/exterior/spring) @@ -2689,18 +2606,21 @@ /obj/structure/barricade/deployable, /turf/open/floor/kutjevo/colors/purple/edge, /area/kutjevo/interior/construction) +"dOS" = ( +/obj/structure/platform/stone/kutjevo/north, +/obj/structure/platform/stone/kutjevo/west, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/lz_dunes) "dOU" = ( /obj/structure/flora/bush/ausbushes/reedbush{ pixel_y = 14 }, /turf/open/desert/desert_shore/desert_shore1, /area/kutjevo/exterior/lz_pad) -"dQq" = ( -/obj/structure/flora/grass/tallgrass/desert/corner{ - dir = 5 - }, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/scrubland) +"dQr" = ( +/obj/structure/platform/metal/kutjevo/east, +/turf/open/desert/desert_shore/desert_shore1/north, +/area/kutjevo/exterior/runoff_river) "dQs" = ( /turf/open/floor/kutjevo/multi_tiles/east, /area/kutjevo/interior/complex/med/locks) @@ -2715,10 +2635,6 @@ }, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/construction) -"dQY" = ( -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor/kutjevo/tan/multi_tiles, -/area/kutjevo/interior/power) "dRj" = ( /turf/open/floor/kutjevo/multi_tiles/east, /area/kutjevo/exterior/runoff_bridge) @@ -2759,29 +2675,14 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/kutjevo/colors/cyan/inner_corner, /area/kutjevo/interior/complex/med/operating) -"dTM" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/turf/open/gm/river/desert/shallow, -/area/kutjevo/exterior/runoff_river) "dUc" = ( /obj/structure/flora/grass/tallgrass/desert, /turf/open/auto_turf/sand/layer2, /area/kutjevo/exterior/spring) -"dUy" = ( -/obj/structure/platform/kutjevo/smooth, -/turf/open/floor/kutjevo/multi_tiles/east, -/area/kutjevo/interior/colony_South/power2) "dUE" = ( /obj/structure/flora/grass/desert/lightgrass_10, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/scrubland) -"dUP" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/largecrate/random, -/turf/open/floor/kutjevo/colors/orange, -/area/kutjevo/interior/colony_South/power2) "dUQ" = ( /obj/item/stack/sandbags/large_stack, /turf/open/auto_turf/sand/layer1, @@ -2799,6 +2700,10 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/floor/kutjevo/colors/green, /area/kutjevo/interior/complex/botany) +"dWj" = ( +/obj/structure/flora/bush/ausbushes/reedbush, +/turf/open/desert/desert_shore/desert_shore1/east, +/area/kutjevo/exterior/scrubland/south) "dWB" = ( /obj/effect/decal/kutjevo_decals/catwalk, /turf/open/floor/greengrid, @@ -2837,25 +2742,23 @@ /obj/structure/girder/displaced, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/Northwest_Colony) +"dXT" = ( +/obj/structure/platform_decoration/stone/kutjevo/north, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/scrubland) +"dYi" = ( +/obj/structure/platform/stone/kutjevo/east, +/obj/structure/platform/stone/kutjevo, +/obj/structure/platform_decoration/stone/kutjevo/east, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/scrubland) +"dYs" = ( +/obj/structure/platform/stone/kutjevo/east, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/lz_dunes) "dYB" = ( /turf/open/floor/kutjevo/plate, /area/kutjevo/interior/colony_central) -"eaB" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/turf/open/floor/kutjevo/colors/orange, -/area/kutjevo/interior/colony_South/power2) -"eaR" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/exterior/runoff_dunes) "eaT" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/auto_turf/sand/layer1, @@ -2866,32 +2769,10 @@ "ebB" = ( /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_S_East) -"ebP" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 1 - }, -/obj/structure/platform/kutjevo/rock{ - dir = 4 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/gm/river/desert/shallow_edge/north, -/area/kutjevo/interior/oob) -"ebZ" = ( -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 4 - }, +"ecJ" = ( +/obj/structure/platform_decoration/stone/kutjevo/north, /turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/lz_dunes) -"ecA" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/reagent_dispensers/water_cooler/walk_past{ - pixel_x = 8; - pixel_y = 24 - }, -/turf/open/floor/kutjevo/colors/cyan, -/area/kutjevo/interior/complex/med/auto_doc) +/area/kutjevo/exterior/scrubland) "ecO" = ( /obj/structure/machinery/light, /turf/open/gm/river/desert/deep/toxic, @@ -2902,19 +2783,18 @@ }, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/construction) -"edn" = ( -/obj/structure/platform/kutjevo, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/interior/foremans_office) +"edt" = ( +/obj/structure/platform/metal/kutjevo/east, +/obj/structure/platform/metal/kutjevo/west, +/turf/open/gm/river/desert/shallow_edge/north, +/area/kutjevo/interior/colony_central) +"edM" = ( +/obj/effect/sentry_landmark/lz_2/bottom_left, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/lz_pad) "eem" = ( /turf/open/desert/desert_shore/shore_edge1/north, /area/kutjevo/exterior/runoff_bridge) -"eeP" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/turf/closed/wall/kutjevo/colony, -/area/kutjevo/interior/complex/botany) "efr" = ( /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/kutjevo/tan/multi_tiles/southeast, @@ -2931,6 +2811,11 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/colony_South) +"efU" = ( +/obj/structure/platform_decoration/stone/kutjevo, +/obj/structure/platform/stone/kutjevo/west, +/turf/open/auto_turf/sand/layer2, +/area/kutjevo/exterior/scrubland) "efW" = ( /obj/structure/surface/table/almayer, /obj/item/spacecash/c200, @@ -2942,21 +2827,10 @@ }, /turf/open/floor/kutjevo/multi_tiles/east, /area/kutjevo/interior/colony_South/power2) -"egu" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/machinery/optable, -/obj/effect/decal/cleanable/blood, -/obj/effect/landmark/corpsespawner/colonist/kutjevo/burst, -/turf/open/floor/kutjevo/colors/cyan/edge/west, -/area/kutjevo/interior/complex/med/operating) -"egx" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/floor/kutjevo/colors/cyan, -/area/kutjevo/interior/complex/med/auto_doc) +"egJ" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/construction) "egL" = ( /obj/structure/bed, /obj/structure/window/reinforced{ @@ -2985,6 +2859,11 @@ "egZ" = ( /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/complex/botany) +"ehq" = ( +/obj/structure/platform/stone/kutjevo/east, +/obj/structure/platform_decoration/stone/kutjevo/east, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/interior/colony_central) "ehC" = ( /obj/structure/largecrate/random/case/small, /turf/open/floor/kutjevo/colors/cyan, @@ -3000,6 +2879,9 @@ }, /turf/open/floor/kutjevo/colors/purple/inner_corner, /area/kutjevo/interior/construction) +"eiG" = ( +/turf/open/floor/kutjevo/multi_tiles/east, +/area/kutjevo/interior/power/comms) "eiX" = ( /obj/structure/flora/grass/tallgrass/desert/corner{ dir = 8 @@ -3056,16 +2938,10 @@ /obj/item/weapon/gun/revolver/cmb, /turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/interior/complex/botany) -"emU" = ( -/obj/structure/machinery/vending/cigarette/colony, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/turf/open/floor/kutjevo/multi_tiles/southeast, -/area/kutjevo/interior/colony_South/power2) +"emq" = ( +/obj/effect/sentry_landmark/lz_1/top_left, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/lz_dunes) "enK" = ( /obj/structure/window{ dir = 1 @@ -3074,32 +2950,10 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/floor/kutjevo/colors, /area/kutjevo/interior/complex/botany) -"eoc" = ( -/obj/structure/stairs/perspective/kutjevo{ - dir = 8; - icon_state = "p_stair_sn_full_cap"; - pixel_y = 16 - }, -/obj/structure/stairs/perspective/kutjevo{ - dir = 8; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/interior/colony_South/power2) "eoA" = ( /obj/structure/machinery/chem_dispenser/medbay, /turf/open/floor/kutjevo/colors/red/tile, /area/kutjevo/interior/complex/med/operating) -"epb" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/barricade/handrail/kutjevo{ - layer = 3.05 - }, -/turf/open/floor/kutjevo/multi_tiles/east, -/area/kutjevo/interior/colony_South/power2) "epd" = ( /obj/item/reagent_container/food/drinks/cans/thirteenloko, /turf/open/auto_turf/sand/layer1, @@ -3120,6 +2974,10 @@ "epR" = ( /turf/open/floor/kutjevo/colors/orange/edge, /area/kutjevo/interior/power_pt2_electric_boogaloo) +"epU" = ( +/obj/structure/platform/metal/kutjevo, +/turf/open/floor/coagulation/icon7_0, +/area/kutjevo/interior/colony_north) "epV" = ( /obj/structure/machinery/light{ dir = 4 @@ -3140,22 +2998,6 @@ /obj/item/defenses/handheld/tesla_coil, /turf/open/floor/kutjevo/colors/purple, /area/kutjevo/interior/construction) -"erv" = ( -/obj/structure/platform/kutjevo, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/interior/colony_central) -"erE" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/turf/closed/wall/kutjevo/colony, -/area/kutjevo/exterior/runoff_bridge) -"erH" = ( -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 8 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/stonyfields) "erX" = ( /obj/structure/prop/dam/boulder/boulder1, /turf/open/auto_turf/sand/layer0, @@ -3203,6 +3045,11 @@ /obj/item/prop/helmetgarb/spent_buckshot, /turf/open/floor/kutjevo/colors/orange/edge/north, /area/kutjevo/interior/complex/Northwest_Security_Checkpoint) +"euz" = ( +/obj/structure/platform/metal/kutjevo/north, +/obj/structure/platform/metal/kutjevo/west, +/turf/open/floor/coagulation/icon0_8, +/area/kutjevo/interior/construction) "euI" = ( /obj/item/clipboard, /turf/open/floor/kutjevo/multi_tiles/southwest, @@ -3236,6 +3083,10 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_South) +"ewX" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/gm/river/desert/shallow, +/area/kutjevo/exterior/runoff_river) "exj" = ( /obj/structure/flora/bush/ausbushes/reedbush, /obj/structure/flora/bush/ausbushes/reedbush{ @@ -3244,6 +3095,10 @@ }, /turf/open/desert/desert_shore/shore_edge1/west, /area/kutjevo/exterior/runoff_bridge) +"ext" = ( +/obj/structure/platform/metal/kutjevo_smooth/west, +/turf/open/floor/kutjevo/multi_tiles, +/area/kutjevo/interior/power) "exD" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /obj/structure/bed{ @@ -3267,12 +3122,9 @@ }, /turf/open/floor/kutjevo/grey/plate, /area/kutjevo/interior/complex/botany/east_tech) -"eyy" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/floor/kutjevo/tan, -/area/kutjevo/interior/colony_north) +"eyP" = ( +/turf/closed/wall/kutjevo/colony/reinforced, +/area/kutjevo/exterior/scrubland/south) "eyU" = ( /turf/open/gm/river/desert/shallow_corner/north, /area/kutjevo/exterior/lz_river) @@ -3294,6 +3146,10 @@ /obj/structure/window/framed/kutjevo, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/power/comms) +"eAA" = ( +/obj/effect/sentry_landmark/lz_2/top_left, +/turf/open/asphalt/cement_sunbleached, +/area/kutjevo/exterior/lz_pad) "eAC" = ( /obj/structure/closet/secure_closet/medical2, /obj/structure/machinery/light{ @@ -3306,16 +3162,6 @@ /obj/item/ammo_magazine/rifle/mar40/extended, /turf/open/floor/kutjevo/tiles, /area/kutjevo/exterior/Northwest_Colony) -"eAS" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - id = "kutjevo_medlock_pan"; - name = "\improper Medical North Shutters" - }, -/turf/open/floor/almayer/research/containment/floor2, -/area/kutjevo/interior/complex/med/auto_doc) "eBH" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/kutjevo/tan, @@ -3324,6 +3170,10 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating/kutjevo, /area/kutjevo/exterior/lz_pad) +"eBY" = ( +/obj/structure/platform/metal/kutjevo_smooth/north, +/turf/open/desert/desert_shore/shore_corner2/west, +/area/kutjevo/exterior/runoff_river) "eCB" = ( /obj/structure/machinery/vending/cigarette/colony, /obj/structure/machinery/light{ @@ -3345,6 +3195,10 @@ /obj/item/paper/crumpled/bloody, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/spring) +"eCI" = ( +/obj/structure/platform_decoration/stone/kutjevo/east, +/turf/open/auto_turf/sand/layer2, +/area/kutjevo/interior/colony_central) "eCY" = ( /obj/structure/machinery/cryo_cell, /turf/open/floor/kutjevo/grey/plate, @@ -3353,21 +3207,11 @@ /obj/structure/blocker/invisible_wall, /turf/open/desert/desert_shore/shore_edge1/east, /area/kutjevo/interior/oob/dev_room) -"eDS" = ( -/obj/structure/prop/dam/boulder/boulder3, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/scrubland) "eEb" = ( /obj/structure/flora/grass/tallgrass/desert, /obj/structure/blocker/invisible_wall, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/oob/dev_room) -"eFf" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/floor/kutjevo/colors/orange, -/area/kutjevo/interior/colony_South/power2) "eFy" = ( /turf/open/desert/desert_shore/desert_shore1/north, /area/kutjevo/exterior/lz_pad) @@ -3376,12 +3220,6 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/colony_South) -"eFZ" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/turf/open/floor/kutjevo/colors/orange, -/area/kutjevo/interior/colony_South/power2) "eGa" = ( /obj/structure/surface/rack, /obj/structure/machinery/light{ @@ -3390,6 +3228,14 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/floor/kutjevo/colors/red, /area/kutjevo/interior/complex/botany) +"eGt" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/reagentgrinder{ + pixel_y = 9 + }, +/obj/structure/platform_decoration/metal/kutjevo, +/turf/open/floor/kutjevo/colors/red/tile, +/area/kutjevo/interior/complex/med/operating) "eGL" = ( /obj/effect/landmark/objective_landmark/close, /turf/open/auto_turf/sand/layer1, @@ -3408,12 +3254,6 @@ /obj/item/stack/rods, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/construction) -"eJg" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/turf/open/floor/kutjevo/multi_tiles/southeast, -/area/kutjevo/interior/complex/botany) "eJi" = ( /obj/structure/blocker/invisible_wall, /turf/open/gm/river/desert/deep/toxic, @@ -3432,14 +3272,6 @@ }, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/scrubland) -"eLT" = ( -/obj/structure/stairs/perspective/kutjevo{ - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform_decoration/kutjevo, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/exterior/runoff_dunes) "eMC" = ( /turf/closed/wall/kutjevo/colony/reinforced, /area/kutjevo/exterior/complex_border/botany_medical_cave) @@ -3458,26 +3290,9 @@ /obj/structure/surface/table/almayer, /turf/open/floor/kutjevo/grey/plate, /area/kutjevo/interior/construction) -"eNK" = ( -/obj/structure/stairs/perspective/kutjevo{ - dir = 8; - icon_state = "p_stair_sn_full_cap"; - pixel_y = 16 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/turf/open/floor/kutjevo/multi_tiles/southeast, -/area/kutjevo/interior/power) "eOc" = ( /turf/open/floor/kutjevo/colors/orange/edge/northwest, /area/kutjevo/interior/power_pt2_electric_boogaloo) -"eOt" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/floor/kutjevo/multi_tiles/southwest, -/area/kutjevo/interior/colony_South/power2) "eOy" = ( /obj/effect/landmark/monkey_spawn, /turf/open/auto_turf/sand/layer1, @@ -3495,25 +3310,14 @@ }, /turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/interior/complex/botany) -"ePn" = ( -/obj/structure/filtration/machine_96x96/indestructible{ - icon_state = "disinfection"; - layer = 3.5 - }, -/obj/structure/platform/kutjevo{ - dir = 8 +"ePr" = ( +/obj/structure/stairs/perspective/kutjevo{ + dir = 8; + icon_state = "p_stair_ew_full_cap_butt" }, -/obj/structure/platform/kutjevo, -/obj/structure/blocker/invisible_wall, +/obj/structure/platform/metal/stair_cut/kutjevo_smooth_left, /turf/open/floor/plating/kutjevo, -/area/kutjevo/exterior/runoff_dunes) -"ePq" = ( -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/obj/structure/platform/kutjevo, -/turf/open/floor/coagulation/icon8_0, -/area/kutjevo/interior/colony_north) +/area/kutjevo/exterior/construction) "ePx" = ( /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/runoff_dunes) @@ -3551,15 +3355,6 @@ }, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/lz_river) -"eRN" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/interior/power) "eRU" = ( /obj/structure/machinery/body_scanconsole, /turf/open/floor/kutjevo/colors/cyan, @@ -3607,6 +3402,10 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/exterior/lz_pad) +"eUX" = ( +/obj/structure/platform/metal/kutjevo, +/turf/open/auto_turf/sand/layer2, +/area/kutjevo/exterior/scrubland/south) "eVv" = ( /obj/structure/machinery/light{ dir = 1 @@ -3645,12 +3444,6 @@ /obj/structure/barricade/wooden, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/interior/power/comms) -"eZw" = ( -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 8 - }, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/stonyfields) "eZP" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor/kutjevo/grey/plate, @@ -3659,12 +3452,6 @@ /obj/effect/landmark/monkey_spawn, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/construction) -"eZV" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 8 - }, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/scrubland) "fbG" = ( /obj/structure/barricade/wooden{ dir = 4; @@ -3686,27 +3473,6 @@ }, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/lz_river) -"fcJ" = ( -/obj/structure/stairs/perspective/kutjevo{ - dir = 8; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform_decoration/kutjevo, -/turf/open/floor/kutjevo/tan/multi_tiles, -/area/kutjevo/interior/colony_South/power2) -"fdr" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/turf/open/floor/kutjevo/multi_tiles/southwest, -/area/kutjevo/interior/colony_South/power2) -"fdF" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/gm/river/desert/deep/toxic, -/area/kutjevo/interior/power) "fdH" = ( /obj/effect/decal/cleanable/blood/splatter, /turf/open/auto_turf/sand/layer0, @@ -3739,12 +3505,6 @@ /obj/item/clothing/head/welding, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/construction) -"feU" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 1 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/runoff_dunes) "feY" = ( /obj/structure/window_frame/kutjevo/reinforced, /turf/open/floor/plating/kutjevo, @@ -3753,10 +3513,6 @@ /obj/item/stack/rods, /turf/open/floor/kutjevo/grey/plate, /area/kutjevo/interior/construction) -"ffu" = ( -/obj/effect/landmark/objective_landmark/medium, -/turf/open/floor/kutjevo/tan/multi_tiles, -/area/kutjevo/interior/power) "ffv" = ( /obj/structure/surface/table/almayer, /obj/item/device/defibrillator, @@ -3782,6 +3538,9 @@ }, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/power) +"fgI" = ( +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/scrubland/south) "fgJ" = ( /turf/closed/wall/kutjevo/colony/reinforced, /area/kutjevo/exterior/stonyfields) @@ -3806,18 +3565,10 @@ }, /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/med/triage) -"fjp" = ( -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 1 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/interior/colony_N_East) -"fjF" = ( -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 4 - }, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/complex_border/botany_medical_cave) +"fjm" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/floor/kutjevo/multi_tiles/north, +/area/kutjevo/exterior/complex_border/med_rec) "fjX" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/emails{ @@ -3825,26 +3576,15 @@ }, /turf/open/floor/kutjevo/grey/plate, /area/kutjevo/interior/complex/botany/east_tech) -"fkK" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/reagentgrinder{ - pixel_y = 9 - }, -/obj/structure/platform_decoration/kutjevo, -/turf/open/floor/kutjevo/colors/red/tile, -/area/kutjevo/interior/complex/med/operating) -"fkP" = ( -/obj/structure/platform/kutjevo, -/turf/open/gm/river/desert/deep, -/area/kutjevo/exterior/lz_river) -"fll" = ( -/obj/structure/platform/kutjevo/rock, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/interior/colony_South) "flp" = ( /obj/effect/landmark/objective_landmark/science, /turf/open/floor/kutjevo/tan/multi_tiles/north, /area/kutjevo/exterior/runoff_bridge) +"fly" = ( +/obj/structure/platform/stone/kutjevo/north, +/obj/structure/blocker/invisible_wall, +/turf/open/gm/river/desert/shallow_corner, +/area/kutjevo/interior/oob) "flP" = ( /obj/structure/blocker/invisible_wall, /obj/structure/blocker/invisible_wall, @@ -3862,6 +3602,10 @@ /obj/structure/flora/grass/tallgrass/desert/corner, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/stonyfields) +"fmx" = ( +/obj/structure/platform_decoration/metal/kutjevo, +/turf/open/gm/river/desert/shallow, +/area/kutjevo/exterior/runoff_river) "fmN" = ( /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/exterior/lz_pad) @@ -3901,12 +3645,6 @@ "fpJ" = ( /turf/open/floor/kutjevo/multi_tiles/west, /area/kutjevo/interior/complex/med/locks) -"fpM" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/turf/open/floor/kutjevo/tan, -/area/kutjevo/interior/colony_central) "fpO" = ( /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/complex_border/botany_medical_cave) @@ -3921,23 +3659,6 @@ }, /turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/interior/power/comms) -"fqR" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 8 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/interior/oob/dev_room) -"frj" = ( -/obj/structure/stairs/perspective/kutjevo{ - dir = 8; - icon_state = "p_stair_ew_full_cap_butt" - }, -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/interior/complex/med/cells) "frx" = ( /obj/structure/extinguisher_cabinet, /turf/closed/wall/kutjevo/colony/reinforced, @@ -3958,18 +3679,6 @@ }, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/complex/botany/east) -"ftY" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/interior/power) -"fui" = ( -/turf/open/desert/desert_shore/shore_edge1/north, -/area/kutjevo/exterior/scrubland) "fuz" = ( /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/power) @@ -3977,6 +3686,10 @@ /obj/structure/surface/rack, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_north) +"fwA" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/gm/river/desert/shallow_edge/north, +/area/kutjevo/exterior/runoff_river) "fwF" = ( /turf/open/floor/kutjevo/tan/alt_edge/north, /area/kutjevo/interior/colony_central) @@ -4013,23 +3726,33 @@ /obj/structure/blocker/invisible_wall, /turf/open/gm/river/desert/shallow_edge/north, /area/kutjevo/interior/oob) +"fAL" = ( +/obj/structure/platform/stone/kutjevo/north, +/obj/structure/platform/stone/kutjevo/west, +/obj/structure/blocker/invisible_wall, +/turf/open/gm/river/desert/deep, +/area/kutjevo/interior/oob) "fAT" = ( /obj/item/device/flashlight/lamp/tripod/grey, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/complex/botany/east_tech) -"fBL" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, +"fBb" = ( +/obj/structure/platform/metal/kutjevo, /turf/open/auto_turf/sand/layer2, -/area/kutjevo/exterior/scrubland) -"fDY" = ( -/obj/structure/platform/kutjevo/smooth/stair_plate, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 +/area/kutjevo/interior/colony_central) +"fCz" = ( +/obj/structure/stairs/perspective/kutjevo{ + dir = 1; + icon_state = "p_stair_full" }, -/turf/open/floor/kutjevo/multi_tiles/east, -/area/kutjevo/interior/colony_South/power2) +/obj/structure/platform_decoration/metal/kutjevo/north, +/obj/effect/decal/cleanable/blood/drip, +/turf/open/floor/kutjevo/multi_tiles, +/area/kutjevo/interior/power) +"fDy" = ( +/obj/structure/platform/metal/kutjevo_smooth, +/turf/open/desert/desert_shore/desert_shore1/east, +/area/kutjevo/exterior/runoff_river) "fEu" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/cameras, @@ -4077,44 +3800,30 @@ }, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/runoff_dunes) -"fIm" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, +"fIh" = ( +/obj/structure/platform/stone/kutjevo/north, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/runoff_dunes) +"fIx" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, /obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/kutjevo/colors/cyan, -/area/kutjevo/interior/complex/med/cells) -"fKf" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 4; - name = "\improper Kutjevo Dam Storm Shutters" - }, -/obj/structure/platform_decoration/kutjevo{ - dir = 4 + dir = 8 }, -/turf/open/asphalt/cement_sunbleached, -/area/kutjevo/interior/power) +/turf/open/floor/kutjevo/colors/green, +/area/kutjevo/interior/complex/botany) +"fIz" = ( +/obj/structure/platform/stone/kutjevo, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/interior/colony_South) +"fJm" = ( +/obj/structure/platform/stone/kutjevo/west, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/lz_dunes) "fKD" = ( /obj/item/stack/sheet/wood, /obj/effect/decal/cleanable/blood/gibs/xeno, /turf/open/floor/kutjevo/tan/alt_edge/north, /area/kutjevo/interior/complex/Northwest_Flight_Control) -"fKJ" = ( -/obj/structure/reagent_dispensers/water_cooler{ - pixel_x = -8 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/reagent_dispensers/water_cooler{ - pixel_x = 8 - }, -/obj/structure/machinery/light, -/obj/structure/platform/kutjevo/smooth, -/turf/open/floor/strata/multi_tiles/west, -/area/kutjevo/interior/complex/med/operating) "fKL" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/drinks/coffeecup{ @@ -4128,12 +3837,10 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_N_East) -"fLE" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/interior/colony_central) +"fLq" = ( +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/kutjevo/tan/multi_tiles/north, +/area/kutjevo/interior/power/comms) "fMd" = ( /obj/effect/landmark/corpsespawner/security/marshal, /turf/open/floor/kutjevo/tan, @@ -4144,43 +3851,28 @@ }, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/spring) -"fNc" = ( -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/turf/open/desert/desert_shore/desert_shore1/north, -/area/kutjevo/exterior/runoff_river) +"fME" = ( +/obj/structure/platform_decoration/stone/kutjevo/east, +/obj/structure/platform_decoration/stone/kutjevo/north, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/interior/colony_central) "fNe" = ( /obj/effect/landmark/nightmare{ insert_tag = "cleaningprog_botany" }, /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/botany) -"fNo" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/desert/desert_shore/shore_corner2, -/area/kutjevo/exterior/runoff_river) +"fOt" = ( +/obj/structure/platform/metal/kutjevo_smooth/east, +/obj/item/device/radio, +/turf/open/floor/kutjevo/multi_tiles/southwest, +/area/kutjevo/interior/colony_South/power2) "fOO" = ( /obj/structure/flora/grass/desert{ icon_state = "heavygrass_6" }, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_north) -"fOU" = ( -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 8 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/interior/oob/dev_room) -"fPH" = ( -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/turf/open/desert/desert_shore/desert_shore1/north, -/area/kutjevo/exterior/runoff_river) "fQg" = ( /turf/open/gm/dirtgrassborder2/west, /area/kutjevo/exterior/complex_border/med_park) @@ -4211,12 +3903,6 @@ }, /turf/open/floor/kutjevo/multi_tiles/west, /area/kutjevo/interior/power/comms) -"fQJ" = ( -/obj/structure/flora/grass/tallgrass/desert/corner{ - dir = 8 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/scrubland) "fRu" = ( /obj/structure/flora/grass/desert/lightgrass_2, /turf/open/auto_turf/sand/layer0, @@ -4231,13 +3917,10 @@ }, /turf/open/gm/grass/grass1/weedable, /area/kutjevo/exterior/complex_border/med_park) -"fRZ" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/gm/river/desert/deep/toxic, -/area/kutjevo/interior/oob) +"fSk" = ( +/obj/structure/flora/bush/ausbushes/reedbush, +/turf/open/desert/desert_shore/shore_edge1/north, +/area/kutjevo/exterior/scrubland/south) "fSm" = ( /obj/structure/sink{ dir = 4; @@ -4248,11 +3931,25 @@ /obj/item/roller, /turf/open/floor/kutjevo/colors/cyan/edge/east, /area/kutjevo/interior/complex/med/operating) +"fSG" = ( +/obj/structure/filtration/machine_96x96/indestructible{ + icon_state = "disinfection"; + layer = 3.5 + }, +/obj/structure/platform/metal/kutjevo/west, +/obj/structure/platform/metal/kutjevo, +/obj/structure/blocker/invisible_wall, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/exterior/runoff_dunes) "fSK" = ( /obj/structure/surface/table/gamblingtable, /obj/item/toy/handcard/aceofspades, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/lz_pad) +"fSL" = ( +/obj/structure/platform_decoration/stone/kutjevo, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/lz_dunes) "fTk" = ( /turf/open/floor/kutjevo/multi_tiles/east, /area/kutjevo/interior/colony_South/power2) @@ -4269,12 +3966,32 @@ /obj/structure/surface/table/almayer, /turf/open/floor/kutjevo/colors/green/tile, /area/kutjevo/interior/complex/botany/east) +"fUw" = ( +/obj/structure/flora/grass/tallgrass/desert/corner{ + dir = 10 + }, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/scrubland/south) +"fUC" = ( +/obj/structure/platform/metal/kutjevo/west, +/turf/open/floor/kutjevo/tan, +/area/kutjevo/interior/colony_central) "fUL" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ req_one_access = null }, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/complex/med) +"fUS" = ( +/obj/structure/platform/metal/kutjevo/north, +/obj/structure/blocker/invisible_wall, +/obj/structure/platform/metal/kutjevo, +/obj/structure/filtration/machine_32x64/indestructible{ + bound_height = 32; + icon_state = "solo_tank_empty" + }, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/exterior/complex_border/med_rec) "fVm" = ( /obj/structure/surface/table/almayer, /obj/item/newspaper, @@ -4284,6 +4001,10 @@ /obj/structure/largecrate/random/secure, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/construction) +"fVH" = ( +/obj/structure/platform/metal/kutjevo_smooth/west, +/turf/open/gm/river/desert/shallow, +/area/kutjevo/exterior/runoff_bridge) "fWl" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/kutjevo/grey/plate, @@ -4320,12 +4041,14 @@ "fYI" = ( /turf/open/gm/river/desert/shallow_corner/east, /area/kutjevo/exterior/runoff_river) -"fZT" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/turf/open/gm/river/desert/shallow_edge/southeast, -/area/kutjevo/exterior/runoff_bridge) +"fZy" = ( +/obj/effect/landmark/hunter_secondary, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/scrubland/south) +"gbm" = ( +/obj/structure/platform/metal/kutjevo, +/turf/open/gm/river/desert/shallow_corner/west, +/area/kutjevo/exterior/lz_river) "gbv" = ( /turf/closed/wall/kutjevo/rock/border, /area/kutjevo/exterior/runoff_dunes) @@ -4343,27 +4066,16 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/interior/power) -"gcB" = ( -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 1 - }, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/stonyfields) +"gcw" = ( +/obj/structure/monorail, +/obj/structure/platform/metal/kutjevo_smooth/west, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/interior/colony_central/mine_elevator) "gdb" = ( /obj/structure/blocker/invisible_wall, /obj/effect/decal/cleanable/blood, /turf/open/floor/carpet, /area/kutjevo/interior/oob) -"gde" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/largecrate/random/barrel, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/kutjevo/multi_tiles/southwest, -/area/kutjevo/interior/colony_South/power2) "gdX" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin{ @@ -4380,13 +4092,11 @@ /obj/structure/surface/table/gamblingtable, /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/construction) -"gfK" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 1 - }, +"geQ" = ( +/obj/structure/platform/metal/kutjevo/west, /obj/structure/blocker/invisible_wall, -/turf/open/desert/desert_shore/shore_edge1/north, -/area/kutjevo/interior/oob/dev_room) +/turf/open/floor/kutjevo/multi_tiles, +/area/kutjevo/interior/power) "ggC" = ( /obj/structure/fence, /turf/open/floor/almayer/research/containment/floor2, @@ -4416,21 +4126,14 @@ /obj/item/device/flashlight/lamp/tripod/grey, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/spring) -"giZ" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited{ - pixel_y = 28 - }, -/obj/structure/stairs/perspective/kutjevo{ - icon_state = "p_stair_ew_full_cap_butt" - }, -/obj/structure/platform/stair_cut/alt{ - icon_state = "kutjevo_platform_sm_stair_alt" - }, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/exterior/construction) "gjK" = ( /turf/open/floor/kutjevo/tiles, /area/kutjevo/interior/complex/med/auto_doc) +"gkL" = ( +/obj/structure/platform/stone/kutjevo, +/obj/structure/platform/stone/kutjevo/north, +/turf/open/auto_turf/sand/layer2, +/area/kutjevo/exterior/scrubland) "gkU" = ( /obj/structure/bed/chair{ dir = 4 @@ -4502,6 +4205,11 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/kutjevo/colors/cyan/edge/north, /area/kutjevo/interior/complex/med/triage) +"gpL" = ( +/obj/structure/platform/metal/kutjevo_smooth, +/obj/structure/machinery/light, +/turf/open/gm/river/desert/deep/covered, +/area/kutjevo/interior/colony_South/power2) "gqQ" = ( /obj/item/weapon/gun/rifle/m16, /turf/open/floor/kutjevo/colors/green, @@ -4524,6 +4232,12 @@ }, /turf/open/desert/desert_shore/desert_shore1/north, /area/kutjevo/exterior/spring) +"gsp" = ( +/obj/structure/blocker/invisible_wall, +/obj/structure/platform/metal/kutjevo/north, +/obj/structure/platform/metal/kutjevo/west, +/turf/open/gm/river/red_pool, +/area/kutjevo/interior/power) "gsq" = ( /obj/structure/filingcabinet, /obj/structure/window/reinforced/tinted{ @@ -4541,20 +4255,11 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/auto_turf/sand/layer2, /area/kutjevo/interior/colony_N_East) -"gtE" = ( +"gts" = ( +/obj/structure/platform/stone/kutjevo, +/obj/structure/platform/stone/kutjevo/west, /obj/structure/blocker/invisible_wall, -/obj/structure/platform/kutjevo, -/turf/open/gm/river/red_pool, -/area/kutjevo/interior/power) -"gtL" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/gm/river/desert/deep/toxic, +/turf/open/gm/river/desert/deep, /area/kutjevo/interior/oob) "gvO" = ( /obj/structure/flora/grass/tallgrass/desert/corner{ @@ -4576,20 +4281,22 @@ }, /turf/open/floor/kutjevo/tan/alt_edge/west, /area/kutjevo/interior/complex/Northwest_Flight_Control) -"gwC" = ( -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/obj/structure/blocker/invisible_wall, -/obj/structure/platform/kutjevo, -/turf/open/gm/river/desert/deep/toxic, -/area/kutjevo/interior/power) "gwY" = ( /turf/closed/wall/kutjevo/colony, /area/kutjevo/interior/complex/med) -"gxs" = ( -/turf/open/desert/desert_shore/shore_edge1/east, -/area/kutjevo/exterior/scrubland) +"gxb" = ( +/obj/structure/stairs/perspective/kutjevo{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/kutjevo_smooth, +/obj/structure/machinery/light, +/turf/open/floor/kutjevo/colors/purple, +/area/kutjevo/interior/complex/med/locks) +"gxB" = ( +/obj/structure/platform_decoration/metal/kutjevo, +/turf/open/floor/kutjevo/multi_tiles/southwest, +/area/kutjevo/interior/colony_South/power2) "gxD" = ( /obj/structure/stairs/perspective/kutjevo{ dir = 1; @@ -4608,20 +4315,14 @@ }, /turf/open/floor/kutjevo/tan/multi_tiles/north, /area/kutjevo/exterior/runoff_bridge) +"gyW" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, +/turf/open/gm/river/desert/shallow_corner/east, +/area/kutjevo/exterior/lz_river) "gzb" = ( /obj/effect/decal/cleanable/blood/xeno, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/exterior/Northwest_Colony) -"gzv" = ( -/obj/structure/platform/kutjevo, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/scrubland) -"gzI" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 8 - }, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/stonyfields) "gAt" = ( /obj/structure/surface/table/almayer, /obj/structure/flora/pottedplant{ @@ -4630,12 +4331,6 @@ }, /turf/open/floor/kutjevo/grey/plate, /area/kutjevo/interior/complex/Northwest_Dorms) -"gAu" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 1 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/scrubland) "gAM" = ( /turf/open/floor/kutjevo/tan/alt_edge/west, /area/kutjevo/exterior/lz_dunes) @@ -4742,20 +4437,26 @@ /obj/item/stack/sheet/metal, /turf/open/floor/kutjevo/tan/alt_edge/west, /area/kutjevo/interior/complex/Northwest_Flight_Control) +"gFz" = ( +/turf/open/floor/plating/kutjevo, +/area/kutjevo/exterior/scrubland/south) "gFA" = ( /turf/open/desert/desert_shore/shore_edge1, /area/kutjevo/exterior/spring) +"gGp" = ( +/obj/structure/platform/stone/kutjevo/north, +/obj/structure/platform/stone/kutjevo/west, +/turf/open/auto_turf/sand/layer2, +/area/kutjevo/exterior/scrubland) +"gGz" = ( +/obj/structure/platform_decoration/stone/kutjevo, +/obj/structure/platform_decoration/stone/kutjevo/north, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/interior/colony_north) "gHh" = ( /obj/structure/flora/grass/desert/lightgrass_9, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/colony_north) -"gHm" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/largecrate/random/case/double, -/turf/open/floor/kutjevo/multi_tiles/southwest, -/area/kutjevo/interior/colony_South/power2) "gHp" = ( /obj/structure/surface/rack, /obj/item/tank/emergency_oxygen/engi, @@ -4788,6 +4489,10 @@ }, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/complex/botany) +"gKN" = ( +/obj/structure/platform_decoration/metal/kutjevo, +/turf/open/floor/kutjevo/colors/cyan, +/area/kutjevo/interior/complex/med/auto_doc) "gKY" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/emails{ @@ -4838,12 +4543,6 @@ }, /turf/open/floor/kutjevo/colors/cyan/tile, /area/kutjevo/interior/complex/med/operating) -"gPW" = ( -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 1 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/lz_dunes) "gQp" = ( /obj/structure/flora/grass/tallgrass/desert/corner{ dir = 6 @@ -4880,12 +4579,6 @@ /obj/structure/blocker/invisible_wall, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/oob/dev_room) -"gSA" = ( -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 4 - }, -/turf/open/auto_turf/sand/layer2, -/area/kutjevo/exterior/lz_dunes) "gTl" = ( /obj/structure/machinery/light{ dir = 1 @@ -4913,23 +4606,10 @@ /obj/structure/surface/rack, /turf/open/floor/kutjevo/plate, /area/kutjevo/exterior/lz_pad) -"gUa" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth, -/turf/open/gm/river/desert/deep/covered, -/area/kutjevo/interior/complex/med/operating) "gUs" = ( /obj/effect/landmark/objective_landmark/science, /turf/open/floor/kutjevo/colors/red, /area/kutjevo/interior/complex/botany) -"gUQ" = ( -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/complex_border/med_rec) "gUS" = ( /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/interior/complex/med/locks) @@ -4974,12 +4654,6 @@ }, /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/power_pt2_electric_boogaloo) -"gYa" = ( -/obj/structure/flora/grass/tallgrass/desert/corner{ - dir = 4 - }, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/scrubland) "gYr" = ( /obj/structure/surface/table/almayer, /obj/item/ammo_magazine/shotgun/buckshot{ @@ -5000,13 +4674,20 @@ /obj/structure/bed/chair, /turf/open/gm/grass/grass1/weedable, /area/kutjevo/exterior/complex_border/med_park) -"han" = ( -/obj/structure/platform_decoration/kutjevo/rock{ +"gZB" = ( +/obj/structure/reagent_dispensers/water_cooler{ + pixel_x = -8 + }, +/obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/blocker/invisible_wall, -/turf/open/gm/river/desert/deep, -/area/kutjevo/interior/oob) +/obj/structure/reagent_dispensers/water_cooler{ + pixel_x = 8 + }, +/obj/structure/machinery/light, +/obj/structure/platform/metal/kutjevo_smooth, +/turf/open/floor/strata/multi_tiles/west, +/area/kutjevo/interior/complex/med/operating) "haz" = ( /obj/item/storage/donut_box, /turf/open/floor/kutjevo/tan, @@ -5033,25 +4714,13 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/kutjevo/tan/alt_edge, /area/kutjevo/interior/complex/Northwest_Flight_Control) -"hds" = ( -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 8 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/interior/colony_central) "hdF" = ( /turf/open/floor/plating/kutjevo/platingdmg1, /area/kutjevo/interior/complex/botany/east_tech) -"hdQ" = ( -/obj/structure/platform/kutjevo/smooth, -/turf/open/floor/kutjevo/colors/orange, -/area/kutjevo/interior/power) -"heL" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/complex_border/med_rec) +"hdP" = ( +/obj/structure/platform/metal/kutjevo/west, +/turf/open/floor/kutjevo/multi_tiles/east, +/area/kutjevo/interior/power/comms) "hfo" = ( /obj/structure/prop/dam/boulder/boulder3, /turf/open/auto_turf/sand/layer1, @@ -5080,6 +4749,10 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/kutjevo/multi_tiles/southwest, /area/kutjevo/interior/colony_South/power2) +"hiI" = ( +/obj/structure/flora/grass/tallgrass/desert, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/scrubland/south) "hiM" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_core, /turf/open/auto_turf/sand/layer1, @@ -5095,6 +4768,10 @@ /obj/item/weapon/gun/revolver/cmb, /turf/open/gm/river/desert/deep/covered, /area/kutjevo/interior/power/comms) +"hlR" = ( +/obj/structure/platform/metal/kutjevo_smooth/north, +/turf/open/floor/kutjevo/colors/orange, +/area/kutjevo/interior/colony_South/power2) "hma" = ( /obj/effect/landmark/objective_landmark/science, /turf/open/floor/kutjevo/tan, @@ -5112,16 +4789,6 @@ }, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/exterior/lz_pad) -"hnE" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 4 - }, -/obj/structure/platform/kutjevo/rock, -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 4 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/scrubland) "hnI" = ( /obj/structure/machinery/bioprinter{ stored_metal = 1000 @@ -5146,16 +4813,25 @@ "hoK" = ( /turf/closed/wall/kutjevo/colony, /area/kutjevo/interior/complex/Northwest_Flight_Control) -"hoW" = ( -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 1 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/gm/river/desert/deep, -/area/kutjevo/interior/oob) +"hpk" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, +/turf/open/floor/almayer/research/containment/floor1, +/area/kutjevo/interior/complex/med/locks) +"hpy" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/complex_border/med_rec) "hpB" = ( /turf/open/floor/kutjevo/grey/plate, /area/kutjevo/exterior/construction) +"hpU" = ( +/obj/structure/platform_decoration/stone/kutjevo/east, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/stonyfields) +"hqi" = ( +/obj/structure/platform/stone/kutjevo, +/turf/open/auto_turf/sand/layer2, +/area/kutjevo/exterior/scrubland) "hqN" = ( /obj/structure/stairs/perspective/kutjevo{ dir = 1; @@ -5167,12 +4843,6 @@ }, /turf/open/floor/kutjevo/tiles, /area/kutjevo/interior/complex/med/triage) -"hqO" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/turf/open/auto_turf/sand/layer2, -/area/kutjevo/exterior/runoff_dunes) "hrv" = ( /obj/structure/sign/safety/medical{ pixel_x = 32 @@ -5210,6 +4880,16 @@ /obj/structure/blocker/invisible_wall, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/colony_South/power2) +"htF" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited{ + pixel_y = 28 + }, +/obj/structure/stairs/perspective/kutjevo{ + icon_state = "p_stair_ew_full_cap_butt" + }, +/obj/structure/platform/metal/stair_cut/kutjevo_smooth_right, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/exterior/construction) "htP" = ( /obj/structure/machinery/light{ dir = 8 @@ -5224,6 +4904,10 @@ /obj/structure/prop/dam/boulder/boulder2, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/runoff_dunes) +"huJ" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/floor/kutjevo/tan, +/area/kutjevo/interior/complex/botany) "huR" = ( /turf/open/asphalt/cement_sunbleached, /area/kutjevo/exterior/Northwest_Colony) @@ -5236,16 +4920,21 @@ /obj/item/device/flashlight/lamp/green, /turf/open/floor/kutjevo/colors/green/tile, /area/kutjevo/interior/complex/botany/east) +"hvr" = ( +/obj/structure/platform_decoration/stone/kutjevo/west, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/lz_dunes) +"hvN" = ( +/obj/structure/platform/metal/kutjevo/west, +/turf/open/floor/coagulation/icon0_5, +/area/kutjevo/interior/construction) +"hwb" = ( +/obj/structure/platform/metal/kutjevo_smooth/east, +/turf/open/gm/river/desert/shallow_edge/southeast, +/area/kutjevo/exterior/runoff_bridge) "hwf" = ( /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/interior/construction) -"hws" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/gm/river/desert/deep/toxic, -/area/kutjevo/interior/oob) "hwA" = ( /turf/open/floor/plating/kutjevo/platingdmg3, /area/kutjevo/interior/complex/botany/east_tech) @@ -5278,10 +4967,6 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/floor/kutjevo/colors/red, /area/kutjevo/interior/complex/botany) -"hzG" = ( -/obj/structure/platform_decoration/kutjevo/rock, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/lz_dunes) "hzN" = ( /turf/open/floor/plating/kutjevo, /area/kutjevo/exterior/lz_pad) @@ -5292,6 +4977,10 @@ /obj/structure/blocker/invisible_wall, /turf/open/floor/kutjevo/colors/red/tile, /area/kutjevo/interior/oob/dev_room) +"hBn" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/interior/colony_central) "hBt" = ( /obj/structure/machinery/door/poddoor/shutters/almayer/open{ name = "\improper North Power Shutters" @@ -5395,6 +5084,10 @@ }, /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/power/comms) +"hFk" = ( +/obj/structure/platform_decoration/stone/kutjevo/north, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/stonyfields) "hFH" = ( /obj/structure/barricade/wooden{ dir = 1; @@ -5402,6 +5095,10 @@ }, /turf/open/floor/kutjevo/colors/red/tile, /area/kutjevo/interior/complex/botany) +"hFN" = ( +/obj/structure/platform/stone/kutjevo/north, +/turf/open/auto_turf/sand/layer2, +/area/kutjevo/exterior/scrubland) "hGB" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, /obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, @@ -5428,26 +5125,6 @@ /obj/item/storage/fancy/cigarettes/lucky_strikes, /turf/open/floor/kutjevo/multi_tiles/north, /area/kutjevo/exterior/runoff_bridge) -"hKE" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/exterior/runoff_dunes) -"hLi" = ( -/obj/structure/platform/kutjevo, -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/turf/open/gm/river/desert/deep, -/area/kutjevo/interior/complex/botany/east_tech) -"hLH" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 1 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/stonyfields) "hMi" = ( /obj/structure/machinery/power/port_gen/pacman{ desc = "A portable generator for emergency backup power. A set of numbers have been crudely etched into the side. The sequence reads --2-." @@ -5481,12 +5158,6 @@ "hQj" = ( /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/interior/power) -"hQl" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/construction) "hQS" = ( /turf/open/auto_turf/sand/layer2, /area/kutjevo/interior/oob/dev_room) @@ -5498,6 +5169,12 @@ /obj/structure/prop/dam/boulder/boulder2, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/spring) +"hRO" = ( +/obj/structure/blocker/invisible_wall, +/obj/structure/platform/metal/kutjevo/north, +/obj/structure/platform/metal/kutjevo/west, +/turf/open/gm/river/desert/deep/toxic, +/area/kutjevo/interior/oob) "hSo" = ( /obj/structure/flora/grass/tallgrass/desert/corner{ dir = 10 @@ -5517,18 +5194,17 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_north) -"hTn" = ( -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/obj/structure/platform/kutjevo, -/obj/structure/filtration/machine_96x96/indestructible{ - icon_state = "disinfection"; - layer = 3.5 - }, +"hTb" = ( +/obj/structure/filtration/coagulation_arm, +/obj/structure/platform/metal/kutjevo_smooth/west, +/obj/structure/platform/metal/kutjevo_smooth, /obj/structure/blocker/invisible_wall, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/exterior/complex_border/med_park) +/turf/open/gm/river/desert/deep/toxic, +/area/kutjevo/interior/oob) +"hTF" = ( +/obj/structure/platform_decoration/metal/kutjevo, +/turf/open/floor/kutjevo/colors/purple/edge/east, +/area/kutjevo/interior/construction) "hUk" = ( /turf/closed/wall/kutjevo/rock, /area/kutjevo/interior/colony_north) @@ -5546,6 +5222,10 @@ }, /turf/open/gm/grass/grass1/weedable, /area/kutjevo/exterior/complex_border/med_park) +"hVt" = ( +/obj/structure/platform_decoration/stone/kutjevo/east, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/complex_border/botany_medical_cave) "hVQ" = ( /obj/structure/machinery/light{ dir = 8 @@ -5576,30 +5256,18 @@ /obj/structure/girder, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/complex/Northwest_Dorms) +"hXJ" = ( +/obj/structure/platform/metal/kutjevo_smooth/east, +/turf/open/floor/kutjevo/multi_tiles/southwest, +/area/kutjevo/interior/colony_South/power2) "hXP" = ( /obj/structure/largecrate/random/secure, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/complex_border/med_rec) -"hYp" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/interior/colony_central) "hYE" = ( /obj/structure/machinery/light, /turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/interior/complex/botany/east_tech) -"hYS" = ( -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/obj/structure/flora/bush/ausbushes/grassybush{ - pixel_x = -10; - pixel_y = 10 - }, -/turf/open/gm/river/desert/shallow, -/area/kutjevo/exterior/runoff_river) "hZq" = ( /obj/structure/stairs/perspective/kutjevo{ dir = 10; @@ -5622,6 +5290,10 @@ /obj/structure/blocker/invisible_wall, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/oob/dev_room) +"ibV" = ( +/obj/structure/platform/metal/kutjevo/north, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/complex_border/med_rec) "ich" = ( /turf/closed/wall/kutjevo/rock/border, /area/kutjevo/exterior/lz_dunes) @@ -5630,13 +5302,6 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/interior/complex/med/locks) -"iem" = ( -/obj/structure/blocker/invisible_wall, -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/turf/open/gm/river/red_pool, -/area/kutjevo/interior/oob) "ieA" = ( /obj/item/tool/weldingtool, /turf/open/floor/kutjevo/tan/alt_edge/northeast, @@ -5664,12 +5329,6 @@ /obj/structure/barricade/wooden, /turf/open/floor/kutjevo/colors, /area/kutjevo/interior/complex/botany) -"igT" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/floor/kutjevo/tan, -/area/kutjevo/interior/complex/med/cells) "iin" = ( /turf/open/auto_turf/sand/layer2, /area/kutjevo/exterior/Northwest_Colony) @@ -5684,9 +5343,23 @@ /obj/item/stack/sheet/metal, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/complex/botany/east_tech) +"ikk" = ( +/obj/structure/platform_decoration/stone/kutjevo/west, +/turf/open/mars_cave/mars_cave_10, +/area/kutjevo/exterior/scrubland) "ikW" = ( /turf/open/floor/kutjevo/colors/purple/edge/east, /area/kutjevo/interior/construction) +"ikZ" = ( +/obj/structure/platform/metal/kutjevo_smooth/north, +/obj/structure/platform/metal/kutjevo_smooth/west, +/obj/structure/platform/metal/kutjevo_smooth, +/turf/open/gm/river/desert/deep/covered, +/area/kutjevo/interior/complex/med/operating) +"ilc" = ( +/obj/structure/platform/metal/kutjevo_smooth, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/interior/power) "imG" = ( /obj/structure/bed/sofa/vert/white/top{ pixel_y = 17 @@ -5694,6 +5367,10 @@ /obj/structure/bed/sofa/vert/white, /turf/open/floor/kutjevo/tan/grey_edge/north, /area/kutjevo/interior/complex/med) +"inc" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/complex_border/med_rec) "inR" = ( /obj/structure/flora/grass/tallgrass/desert/corner{ dir = 6 @@ -5704,6 +5381,19 @@ /obj/structure/blocker/invisible_wall, /turf/open/gm/river/desert/shallow_edge/west, /area/kutjevo/interior/oob) +"ioh" = ( +/obj/structure/stairs/perspective/kutjevo{ + dir = 8; + icon_state = "p_stair_sn_full_cap"; + pixel_y = 16 + }, +/obj/structure/stairs/perspective/kutjevo{ + dir = 8; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/kutjevo_smooth/east, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/interior/colony_South/power2) "ips" = ( /obj/item/bodybag/tarp/reactive, /turf/open/floor/kutjevo/multi_tiles, @@ -5716,6 +5406,12 @@ /obj/structure/machinery/cm_vending/sorted/medical/blood, /turf/open/floor/kutjevo/colors/cyan, /area/kutjevo/interior/complex/med/operating) +"ipD" = ( +/obj/structure/platform/stone/kutjevo/north, +/obj/structure/platform/stone/kutjevo/east, +/obj/structure/platform/stone/kutjevo/west, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/interior/colony_central) "iqw" = ( /obj/structure/surface/table/almayer, /obj/item/toy/handcard/aceofspades, @@ -5735,13 +5431,6 @@ }, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/spring) -"ird" = ( -/obj/structure/blocker/invisible_wall, -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/turf/open/gm/river/darkred, -/area/kutjevo/interior/oob) "irK" = ( /obj/structure/machinery/light/small{ dir = 1; @@ -5753,6 +5442,11 @@ /obj/structure/surface/rack, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/construction) +"itr" = ( +/obj/structure/platform/metal/kutjevo/north, +/obj/structure/machinery/portable_atmospherics/powered/scrubber, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/complex_border/med_rec) "iub" = ( /obj/item/ammo_magazine/rifle/m16, /turf/open/floor/kutjevo/tan, @@ -5773,12 +5467,6 @@ /obj/item/stack/sheet/wood, /turf/open/floor/kutjevo/colors/red/tile, /area/kutjevo/interior/complex/botany) -"iwD" = ( -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/interior/colony_central) "iwF" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, @@ -5803,6 +5491,11 @@ "iyP" = ( /turf/open/floor/coagulation/icon7_8_2, /area/kutjevo/exterior/scrubland) +"izD" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/obj/structure/blocker/invisible_wall, +/turf/open/gm/river/desert/deep/toxic, +/area/kutjevo/interior/power) "izS" = ( /obj/structure/machinery/light, /turf/open/floor/kutjevo/colors/cyan/inner_corner/east, @@ -5826,21 +5519,6 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/kutjevo/grey/plate, /area/kutjevo/interior/complex/botany/east_tech) -"iCh" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/obj/structure/blocker/invisible_wall, -/obj/structure/platform/kutjevo, -/obj/structure/filtration/machine_32x64/indestructible{ - bound_height = 32; - icon_state = "solo_tank_empty" - }, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/interior/colony_north) "iCl" = ( /obj/structure/machinery/light{ dir = 8 @@ -5852,14 +5530,6 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/kutjevo/tan/alt_inner_edge/west, /area/kutjevo/interior/complex/Northwest_Flight_Control) -"iCG" = ( -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/obj/structure/blocker/invisible_wall, -/obj/structure/platform/kutjevo, -/turf/open/gm/river/darkred, -/area/kutjevo/interior/power) "iCQ" = ( /obj/structure/flora/grass/desert/lightgrass_9, /obj/effect/decal/cleanable/blood/oil, @@ -5874,24 +5544,6 @@ /obj/item/tool/pickaxe, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/complex/botany/east_tech) -"iGS" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 8 - }, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/lz_dunes) -"iHk" = ( -/obj/structure/stairs/perspective/kutjevo{ - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform/kutjevo/smooth, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/interior/power) -"iHw" = ( -/obj/structure/platform/kutjevo, -/turf/open/auto_turf/sand/layer2, -/area/kutjevo/interior/colony_central) "iHO" = ( /obj/structure/window/framed/kutjevo, /turf/open/floor/plating/kutjevo, @@ -5900,22 +5552,6 @@ /obj/structure/flora/grass/desert/lightgrass_6, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/runoff_dunes) -"iIz" = ( -/obj/structure/platform_decoration/kutjevo, -/turf/open/gm/river/desert/deep, -/area/kutjevo/interior/complex/botany/east_tech) -"iIT" = ( -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/turf/open/floor/coagulation/icon8_3, -/area/kutjevo/interior/construction) -"iJo" = ( -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/scrubland) "iJq" = ( /turf/open/desert/desert_shore/shore_corner2/north, /area/kutjevo/exterior/runoff_dunes) @@ -5926,15 +5562,6 @@ }, /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/complex/med/locks) -"iKf" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/turf/open/floor/coagulation/icon0_8, -/area/kutjevo/interior/colony_north) "iKE" = ( /obj/structure/surface/table/almayer, /obj/item/clothing/accessory/armband/hydro, @@ -5946,21 +5573,14 @@ }, /turf/open/asphalt/cement_sunbleached, /area/kutjevo/exterior/stonyfields) -"iLE" = ( -/obj/structure/filtration/machine_96x96/indestructible{ - icon_state = "disinfection"; - layer = 3.5 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/platform/kutjevo/smooth, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/interior/power) "iLF" = ( /obj/item/ammo_magazine/rifle/mar40/extended, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/interior/power) +"iLQ" = ( +/obj/effect/sentry_landmark/lz_2/bottom_left, +/turf/open/floor/kutjevo/tan/alt_edge/north, +/area/kutjevo/exterior/lz_pad) "iLU" = ( /obj/structure/machinery/vending/cigarette/colony, /obj/structure/sign/poster{ @@ -5968,6 +5588,15 @@ }, /turf/open/floor/kutjevo/colors/purple/inner_corner/north, /area/kutjevo/interior/construction) +"iMA" = ( +/obj/structure/barricade/handrail/kutjevo{ + dir = 4 + }, +/obj/structure/closet/secure_closet/engineering_electrical, +/obj/structure/platform/metal/kutjevo_smooth, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/kutjevo/multi_tiles/southwest, +/area/kutjevo/interior/colony_South/power2) "iMR" = ( /turf/open/floor/kutjevo/tan/grey_edge/north, /area/kutjevo/interior/colony_central) @@ -6001,6 +5630,10 @@ }, /turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/interior/colony_South/power2) +"iRG" = ( +/obj/structure/platform/metal/kutjevo/north, +/turf/open/gm/river/desert/deep, +/area/kutjevo/interior/complex/botany/east_tech) "iSn" = ( /obj/structure/largecrate/random/secure, /obj/structure/machinery/light{ @@ -6022,6 +5655,22 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/Northwest_Flight_Control) +"iTd" = ( +/obj/structure/platform/metal/kutjevo_smooth/north, +/obj/structure/filingcabinet{ + pixel_x = 8; + pixel_y = 5 + }, +/obj/structure/filingcabinet{ + pixel_x = -8; + pixel_y = 5 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/kutjevo/colors/orange, +/area/kutjevo/interior/complex/med/locks) "iTg" = ( /obj/structure/stairs/perspective/kutjevo{ dir = 1; @@ -6030,13 +5679,6 @@ }, /turf/open/floor/kutjevo/colors/cyan/tile, /area/kutjevo/interior/complex/med/auto_doc) -"iTK" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/obj/structure/machinery/portable_atmospherics/powered/scrubber, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/complex_border/med_rec) "iTX" = ( /obj/effect/landmark/xeno_spawn, /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -6058,12 +5700,6 @@ /obj/item/reagent_container/food/drinks/jar, /turf/open/floor/kutjevo/colors/green, /area/kutjevo/interior/complex/botany) -"iVD" = ( -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/interior/foremans_office) "iWa" = ( /obj/structure/window/framed/kutjevo, /turf/open/floor/kutjevo/colors/cyan, @@ -6091,17 +5727,15 @@ }, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/colony_South/power2) +"iWU" = ( +/obj/structure/platform/metal/kutjevo/north, +/obj/structure/platform/metal/kutjevo/east, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/complex_border/med_rec) "iXh" = ( /obj/structure/surface/table/almayer, /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/Northwest_Dorms) -"iXj" = ( -/obj/structure/blocker/invisible_wall, -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/turf/open/gm/river/desert/deep/toxic, -/area/kutjevo/interior/oob) "iXz" = ( /obj/structure/window/framed/kutjevo/reinforced, /turf/open/floor/plating/kutjevo, @@ -6139,6 +5773,10 @@ }, /turf/open/desert/desert_shore/shore_corner2, /area/kutjevo/exterior/spring) +"jar" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/complex_border/med_rec) "jav" = ( /obj/structure/closet/secure_closet/engineering_welding, /obj/item/ammo_box/magazine/nailgun, @@ -6149,6 +5787,10 @@ /obj/structure/machinery/light, /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/power) +"jbM" = ( +/obj/structure/platform_decoration/metal/kutjevo, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/scrubland) "jcd" = ( /obj/structure/bed/chair{ dir = 4 @@ -6161,6 +5803,11 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/kutjevo/tan/alt_edge/northwest, /area/kutjevo/interior/complex/Northwest_Flight_Control) +"jcH" = ( +/obj/structure/platform/stone/kutjevo/north, +/obj/structure/blocker/invisible_wall, +/turf/open/desert/desert_shore/shore_edge1/north, +/area/kutjevo/interior/oob/dev_room) "jcI" = ( /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/telecomm/lz1_south) @@ -6168,23 +5815,17 @@ /obj/effect/decal/cleanable/blood/xeno, /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/Northwest_Dorms) -"jcX" = ( -/obj/structure/platform/kutjevo, -/obj/structure/blocker/invisible_wall, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/exterior/complex_border/med_park) +"jdu" = ( +/turf/open/desert/desert_shore/desert_shore1/north, +/area/kutjevo/exterior/scrubland/south) "jec" = ( /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/complex/Northwest_Dorms) -"jeO" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/kutjevo/colors/orange, -/area/kutjevo/interior/colony_South/power2) +"jez" = ( +/obj/structure/platform_decoration/metal/kutjevo, +/obj/structure/machinery/cm_vending/sorted/medical/no_access, +/turf/open/floor/kutjevo/colors/cyan, +/area/kutjevo/interior/complex/med/cells) "jfs" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/kutjevo/tan, @@ -6239,6 +5880,10 @@ "jhS" = ( /turf/closed/wall/kutjevo/colony/reinforced/hull, /area/kutjevo/interior/oob) +"jiy" = ( +/obj/structure/platform_decoration/metal/kutjevo, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/lz_dunes) "jiz" = ( /obj/structure/sign/safety/hazard{ pixel_x = -32 @@ -6272,6 +5917,12 @@ /obj/item/device/flashlight/lamp/tripod/grey, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/runoff_river) +"jmH" = ( +/obj/structure/platform/metal/kutjevo/west, +/obj/structure/blocker/invisible_wall, +/obj/structure/platform/metal/kutjevo, +/turf/open/gm/river/darkred, +/area/kutjevo/interior/power) "jmP" = ( /obj/structure/machinery/power/reactor/colony, /turf/open/floor/kutjevo/colors/orange, @@ -6312,12 +5963,6 @@ "jnV" = ( /turf/closed/wall/kutjevo/colony, /area/kutjevo/interior/complex/Northwest_Dorms) -"jnY" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/turf/open/gm/river/desert/shallow_edge/north, -/area/kutjevo/exterior/runoff_river) "jog" = ( /obj/effect/landmark/static_comms/net_one, /turf/open/auto_turf/sand/layer1, @@ -6354,26 +5999,16 @@ "jqt" = ( /turf/closed/wall/kutjevo/rock, /area/kutjevo/exterior/lz_dunes) -"jqy" = ( -/obj/structure/platform/kutjevo/rock{ +"jqT" = ( +/obj/structure/platform/metal/kutjevo_smooth/north, +/obj/structure/machinery/light{ dir = 1 }, -/turf/open/mars_cave/mars_cave_7, -/area/kutjevo/exterior/scrubland) +/turf/open/floor/kutjevo/colors/orange, +/area/kutjevo/interior/colony_South/power2) "jrk" = ( /turf/open/floor/kutjevo/multi_tiles/north, /area/kutjevo/interior/complex/botany) -"jrs" = ( -/obj/structure/stairs/perspective/kutjevo{ - dir = 1; - icon_state = "p_stair_full" - }, -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/obj/effect/decal/cleanable/blood/drip, -/turf/open/floor/kutjevo/multi_tiles, -/area/kutjevo/interior/power) "jrJ" = ( /obj/item/stack/sheet/wood, /obj/effect/landmark/objective_landmark/science, @@ -6383,12 +6018,15 @@ /obj/structure/inflatable/popped, /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/med) -"jsS" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/turf/open/floor/kutjevo/multi_tiles, -/area/kutjevo/interior/power) +"jsi" = ( +/obj/structure/platform/stone/kutjevo/north, +/obj/structure/blocker/invisible_wall, +/turf/open/desert/desert_shore/desert_shore1/north, +/area/kutjevo/interior/oob) +"jsk" = ( +/obj/structure/platform/metal/kutjevo/north, +/turf/open/floor/coagulation/icon7_8_2, +/area/kutjevo/interior/colony_north) "jtl" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /turf/open/auto_turf/sand/layer1, @@ -6420,20 +6058,6 @@ /obj/structure/largecrate/random/secure, /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/exterior/lz_pad) -"juH" = ( -/obj/structure/stairs/perspective/kutjevo{ - dir = 6; - icon_state = "p_stair_full" - }, -/obj/structure/platform/stair_cut{ - icon_state = "kutjevo_platform_sm_stair" - }, -/obj/structure/machinery/light/small{ - dir = 1; - pixel_y = 20 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/runoff_bridge) "juO" = ( /obj/item/stack/tile/plasteel{ pixel_x = 8; @@ -6441,6 +6065,10 @@ }, /turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/interior/complex/botany) +"juW" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/floor/kutjevo/colors/cyan, +/area/kutjevo/interior/complex/med/cells) "juY" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ req_one_access = null @@ -6454,25 +6082,16 @@ }, /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/power/comms) -"jvt" = ( -/turf/open/desert/desert_shore/desert_shore1, -/area/kutjevo/exterior/scrubland) -"jvQ" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/platform/kutjevo/smooth, -/turf/open/gm/river/desert/deep/covered, -/area/kutjevo/interior/complex/med/operating) "jwx" = ( /turf/open/floor/kutjevo/tan/grey_inner_edge/north, /area/kutjevo/interior/complex/med) "jwA" = ( /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/interior/colony_central) +"jwJ" = ( +/obj/structure/platform/metal/kutjevo, +/turf/open/floor/kutjevo/tan, +/area/kutjevo/interior/colony_central) "jwM" = ( /obj/structure/largecrate/random/barrel/red, /turf/open/floor/kutjevo/colors/orange, @@ -6529,28 +6148,44 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/floor/kutjevo/colors/cyan/inner_corner/east, /area/kutjevo/interior/complex/med) +"jAw" = ( +/obj/structure/stairs/perspective/kutjevo{ + icon_state = "p_stair_ew_full_cap_butt" + }, +/obj/structure/platform/metal/stair_cut/kutjevo_smooth_right, +/turf/open/floor/kutjevo/tan/multi_tiles, +/area/kutjevo/interior/colony_South/power2) "jBe" = ( /obj/structure/closet/firecloset/full, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/kutjevo/grey/plate, /area/kutjevo/interior/construction) -"jBJ" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 4 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/interior/oob/dev_room) +"jBj" = ( +/obj/structure/platform/metal/kutjevo, +/turf/open/floor/kutjevo/tan, +/area/kutjevo/interior/colony_north) "jBX" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/colony_north) +"jCK" = ( +/obj/structure/flora/bush/ausbushes/reedbush, +/obj/structure/platform/metal/kutjevo_smooth/east, +/turf/open/gm/river/desert/shallow, +/area/kutjevo/exterior/runoff_bridge) "jCL" = ( /obj/structure/cable/heavyduty{ icon_state = "1-4-8" }, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/complex/botany) +"jDZ" = ( +/obj/structure/platform/metal/kutjevo_smooth, +/obj/structure/barricade/handrail/kutjevo{ + layer = 3.05 + }, +/turf/open/floor/kutjevo/multi_tiles/east, +/area/kutjevo/interior/colony_South/power2) "jEh" = ( /turf/open/floor/plating/kutjevo/panelscorched, /area/kutjevo/interior/complex/Northwest_Dorms) @@ -6570,13 +6205,6 @@ "jFf" = ( /turf/closed/wall/kutjevo/colony/reinforced, /area/kutjevo/exterior/telecomm/lz2_south) -"jFk" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 4 - }, -/obj/structure/platform/kutjevo/rock, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/scrubland) "jFB" = ( /obj/item/stack/sheet/wood, /turf/open/floor/kutjevo/tan/multi_tiles, @@ -6600,28 +6228,10 @@ /obj/effect/landmark/survivor_spawner, /turf/open/floor/kutjevo/colors, /area/kutjevo/interior/complex/botany) -"jIt" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/turf/open/floor/kutjevo/tan, -/area/kutjevo/interior/colony_central) "jIN" = ( /obj/structure/flora/grass/desert/lightgrass_11, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_north) -"jIR" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/kutjevo/colors/green, -/area/kutjevo/interior/complex/botany) "jJe" = ( /obj/structure/flora/grass/tallgrass/desert/corner{ dir = 9 @@ -6632,15 +6242,15 @@ /obj/item/weapon/gun/rifle/m16, /turf/open/floor/kutjevo/colors/red, /area/kutjevo/interior/complex/botany) +"jJn" = ( +/obj/structure/platform_decoration/stone/kutjevo/west, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/scrubland) "jJo" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/radio, /turf/open/floor/kutjevo/multi_tiles/southwest, /area/kutjevo/interior/colony_South/power2) -"jKc" = ( -/obj/structure/platform/kutjevo/smooth, -/turf/open/asphalt/cement_sunbleached, -/area/kutjevo/interior/power) "jKm" = ( /turf/open/floor/kutjevo/tan/alt_edge/east, /area/kutjevo/interior/colony_central) @@ -6650,6 +6260,22 @@ "jKN" = ( /turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/interior/complex/botany/east_tech) +"jMo" = ( +/obj/structure/platform/metal/kutjevo/west, +/obj/structure/machinery/recharge_station, +/turf/open/floor/kutjevo/colors, +/area/kutjevo/interior/power/comms) +"jNH" = ( +/obj/structure/platform/metal/kutjevo/north, +/obj/structure/platform/metal/kutjevo/west, +/obj/structure/blocker/invisible_wall, +/obj/structure/platform/metal/kutjevo, +/obj/structure/filtration/machine_32x64/indestructible{ + bound_height = 32; + icon_state = "solo_tank_empty" + }, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/interior/colony_north) "jOe" = ( /obj/structure/cable/heavyduty{ icon_state = "1-4-8" @@ -6667,13 +6293,14 @@ }, /turf/open/floor/kutjevo/tan/alt_edge/north, /area/kutjevo/interior/complex/Northwest_Flight_Control) -"jPb" = ( -/obj/structure/monorail, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/interior/power) +"jOK" = ( +/obj/effect/sentry_landmark/lz_1/top_right, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/lz_dunes) +"jPr" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/floor/almayer/research/containment/floor1, +/area/kutjevo/interior/complex/med/locks) "jPt" = ( /obj/structure/bed/chair{ dir = 4 @@ -6683,6 +6310,16 @@ "jPD" = ( /turf/open/floor/kutjevo/tan/grey_edge, /area/kutjevo/interior/complex/Northwest_Dorms) +"jPM" = ( +/obj/structure/stairs/perspective/kutjevo{ + icon_state = "p_stair_ew_full_cap_butt" + }, +/obj/structure/platform/metal/stair_cut/kutjevo_smooth_right, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/kutjevo/colors/purple, +/area/kutjevo/interior/complex/med/locks) "jPW" = ( /obj/structure/machinery/light, /obj/structure/machinery/camera/autoname{ @@ -6734,12 +6371,11 @@ }, /turf/open/gm/grass/grass1/weedable, /area/kutjevo/exterior/complex_border/med_park) -"jWM" = ( -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/turf/open/floor/coagulation/icon8_3, -/area/kutjevo/interior/colony_north) +"jWO" = ( +/obj/structure/prop/dam/boulder/boulder3, +/obj/structure/platform/metal/kutjevo/north, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/runoff_dunes) "jXo" = ( /obj/structure/stairs/perspective/kutjevo{ icon_state = "p_stair_full" @@ -6752,6 +6388,10 @@ "jYS" = ( /turf/open/auto_turf/sand/layer2, /area/kutjevo/interior/colony_S_East) +"jZL" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/floor/kutjevo/colors/purple/edge/east, +/area/kutjevo/interior/construction) "jZT" = ( /turf/open/floor/kutjevo/colors/cyan/edge/west, /area/kutjevo/interior/complex/med/triage) @@ -6761,10 +6401,13 @@ }, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/interior/complex/botany) -"kbg" = ( -/obj/structure/blocker/invisible_wall, -/obj/structure/platform/kutjevo, -/turf/open/gm/river/desert/deep/toxic, +"kaZ" = ( +/obj/structure/platform/metal/kutjevo_smooth/west, +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/machinery/power/reactor/colony, +/turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/power) "kbL" = ( /obj/effect/decal/cleanable/blood/oil, @@ -6785,9 +6428,6 @@ }, /turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/interior/complex/botany) -"kdf" = ( -/turf/open/floor/plating/kutjevo, -/area/kutjevo/exterior/scrubland) "kdK" = ( /obj/structure/flora/bush/desert{ icon_state = "tree_4" @@ -6797,13 +6437,6 @@ "kdY" = ( /turf/open/floor/kutjevo/multi_tiles/east, /area/kutjevo/interior/power) -"kec" = ( -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 4 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/gm/river/desert/deep, -/area/kutjevo/interior/oob) "keM" = ( /obj/item/stack/rods, /obj/structure/barricade/deployable{ @@ -6834,10 +6467,10 @@ }, /turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/interior/complex/botany) -"kgt" = ( -/obj/structure/platform/kutjevo, -/turf/open/floor/kutjevo/tan, -/area/kutjevo/interior/colony_north) +"kfG" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, +/turf/open/gm/river/desert/shallow, +/area/kutjevo/exterior/runoff_river) "kgx" = ( /obj/structure/flora/grass/tallgrass/desert, /turf/open/auto_turf/sand/layer1, @@ -6877,21 +6510,17 @@ "kjk" = ( /turf/open/floor/kutjevo/grey/plate, /area/kutjevo/interior/colony_central) -"kjo" = ( -/obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/desert/desert_shore/desert_shore1/east, -/area/kutjevo/exterior/scrubland) "kkB" = ( /obj/structure/machinery/vending/cigarette/colony, /turf/open/floor/kutjevo/colors/cyan, /area/kutjevo/interior/complex/med) -"kkC" = ( -/obj/structure/platform/kutjevo, -/turf/open/floor/coagulation/icon7_0, -/area/kutjevo/interior/colony_north) "kkH" = ( /turf/closed/wall/kutjevo/colony/reinforced, /area/kutjevo/interior/complex/med/operating) +"kle" = ( +/obj/structure/platform/metal/kutjevo, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/interior/foremans_office) "kls" = ( /obj/structure/surface/table/almayer, /obj/item/storage/surgical_tray, @@ -6920,6 +6549,10 @@ }, /turf/open/floor/kutjevo/colors/cyan/edge/north, /area/kutjevo/interior/complex/med) +"klY" = ( +/obj/structure/platform/stone/kutjevo/east, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/scrubland) "kma" = ( /obj/structure/blocker/invisible_wall, /turf/open/floor/plating/kutjevo, @@ -6944,10 +6577,6 @@ /obj/effect/landmark/hunter_primary, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/stonyfields) -"knP" = ( -/obj/structure/platform_decoration/kutjevo, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/runoff_river) "koX" = ( /obj/structure/stairs/perspective/kutjevo{ dir = 1; @@ -6965,6 +6594,13 @@ }, /turf/open/floor/almayer/research/containment/floor2, /area/kutjevo/interior/complex/botany) +"kpC" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/platform/metal/kutjevo_smooth/west, +/turf/open/floor/kutjevo/colors/cyan, +/area/kutjevo/interior/complex/med/cells) "kpK" = ( /obj/structure/cable/heavyduty{ icon_state = "1-2" @@ -6978,14 +6614,6 @@ }, /turf/open/floor/plating/kutjevo, /area/kutjevo/exterior/runoff_bridge) -"kqA" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/machinery/smartfridge/chemistry, -/obj/effect/decal/medical_decals{ - icon_state = "triagedecalleft" - }, -/turf/open/floor/kutjevo/colors/cyan/tile, -/area/kutjevo/interior/complex/med/operating) "kqE" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/kutjevo/tan/grey_edge/southeast, @@ -6994,16 +6622,6 @@ /obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/interior/complex/botany) -"ksb" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/structure/machinery/power/reactor/colony, -/turf/open/floor/kutjevo/colors/orange, -/area/kutjevo/interior/power) "ksl" = ( /obj/effect/landmark/railgun_camera_pos, /turf/open/auto_turf/sand/layer1, @@ -7029,12 +6647,14 @@ "ktq" = ( /turf/closed/wall/kutjevo/colony/reinforced, /area/kutjevo/interior/complex/med/locks) -"ktP" = ( -/obj/structure/platform/kutjevo{ - dir = 8 +"ktU" = ( +/obj/structure/stairs/perspective/kutjevo{ + dir = 1; + icon_state = "p_stair_full" }, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/scrubland) +/obj/structure/platform_decoration/metal/kutjevo, +/turf/open/floor/kutjevo/multi_tiles, +/area/kutjevo/interior/power) "kut" = ( /obj/item/stack/sheet/wood, /turf/open/floor/kutjevo/tan/multi_tiles, @@ -7052,15 +6672,10 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_north) -"kvf" = ( -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 4 - }, -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 1 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/interior/colony_central) +"kvi" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/scrubland) "kvt" = ( /obj/structure/stairs/perspective/kutjevo{ dir = 1; @@ -7077,12 +6692,6 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/closed/wall/kutjevo/colony/reinforced, /area/kutjevo/interior/colony_central) -"kvS" = ( -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 4 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/stonyfields) "kvU" = ( /turf/open/desert/desert_shore/shore_corner2, /area/kutjevo/exterior/lz_dunes) @@ -7120,17 +6729,22 @@ }, /turf/open/floor/almayer/research/containment/floor1, /area/kutjevo/interior/complex/botany) +"kyu" = ( +/obj/structure/platform/metal/kutjevo/north, +/obj/structure/platform/metal/kutjevo/east, +/obj/structure/blocker/invisible_wall, +/obj/structure/platform/metal/kutjevo, +/obj/structure/filtration/machine_32x64/indestructible{ + bound_height = 32; + icon_state = "solo_tank_empty" + }, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/interior/oob) "kzJ" = ( /obj/structure/surface/table/woodentable, /obj/item/reagent_container/food/drinks/bottle/sake, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/colony_N_East) -"kzZ" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/floor/almayer/research/containment/floor1, -/area/kutjevo/interior/complex/med/locks) "kAb" = ( /obj/structure/barricade/wooden{ dir = 1; @@ -7150,6 +6764,10 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/closed/wall/kutjevo/colony/reinforced, /area/kutjevo/interior/construction) +"kAE" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/complex_border/med_rec) "kAW" = ( /obj/structure/machinery/light{ dir = 4 @@ -7178,6 +6796,11 @@ /obj/effect/landmark/monkey_spawn, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_north) +"kCQ" = ( +/obj/structure/platform/metal/kutjevo/north, +/obj/structure/platform/metal/kutjevo/west, +/turf/open/floor/kutjevo/tan, +/area/kutjevo/interior/colony_central) "kDl" = ( /obj/structure/bed/chair/office/light, /obj/effect/landmark/survivor_spawner, @@ -7191,15 +6814,17 @@ }, /turf/open/floor/kutjevo/colors/red, /area/kutjevo/interior/complex/botany) -"kDs" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 +"kDt" = ( +/obj/structure/platform/metal/kutjevo_smooth/east, +/obj/structure/sign/safety/medical{ + pixel_x = 32 }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "kutjevo_medlock_pan"; + name = "\improper Medical North Shutters" }, -/turf/open/gm/river/desert/deep/covered, -/area/kutjevo/exterior/scrubland) +/turf/open/floor/almayer/research/containment/floor2, +/area/kutjevo/interior/complex/med/auto_doc) "kDD" = ( /obj/item/stack/sheet/wood, /obj/structure/machinery/vending/snack/packaged{ @@ -7213,6 +6838,16 @@ "kEh" = ( /turf/open/gm/river/desert/shallow_edge, /area/kutjevo/exterior/spring) +"kEt" = ( +/obj/structure/platform/metal/kutjevo_smooth/stair_plate, +/obj/structure/platform/metal/kutjevo_smooth/north, +/turf/open/floor/kutjevo/multi_tiles/east, +/area/kutjevo/interior/colony_South/power2) +"kED" = ( +/obj/structure/platform/metal/kutjevo_smooth, +/obj/structure/largecrate/random, +/turf/open/floor/kutjevo/colors/orange, +/area/kutjevo/interior/colony_South/power2) "kEG" = ( /obj/structure/sign/poster{ pixel_y = -32 @@ -7220,6 +6855,24 @@ /obj/structure/machinery/light, /turf/open/floor/kutjevo/colors/purple/edge, /area/kutjevo/interior/construction) +"kFi" = ( +/obj/structure/platform/metal/kutjevo/west, +/turf/open/floor/coagulation/icon0_5, +/area/kutjevo/interior/colony_north) +"kFv" = ( +/obj/structure/platform/metal/kutjevo_smooth, +/obj/structure/filtration/machine_32x64/indestructible{ + bound_height = 32; + icon_state = "solo_tank_empty" + }, +/obj/structure/blocker/invisible_wall, +/turf/open/floor/kutjevo/multi_tiles/southwest, +/area/kutjevo/interior/colony_South/power2) +"kFx" = ( +/obj/structure/platform/stone/kutjevo, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/interior/colony_north) "kFF" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; @@ -7269,6 +6922,10 @@ /obj/structure/prop/dam/large_boulder/boulder2, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/spring) +"kJK" = ( +/obj/structure/platform/metal/kutjevo/north, +/turf/open/auto_turf/sand/layer2, +/area/kutjevo/exterior/runoff_dunes) "kKb" = ( /obj/structure/barricade/wooden{ dir = 8 @@ -7297,6 +6954,13 @@ /obj/item/explosive/plastic, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/complex/botany) +"kLO" = ( +/obj/structure/platform/metal/kutjevo/west, +/obj/structure/stairs/perspective/kutjevo{ + icon_state = "p_stair_sn_full_cap" + }, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/exterior/complex_border/med_rec) "kMx" = ( /turf/open/floor/coagulation/icon7_8_2, /area/kutjevo/interior/power/comms) @@ -7317,16 +6981,6 @@ "kNq" = ( /turf/open/gm/river/desert/shallow_edge/southwest, /area/kutjevo/exterior/lz_river) -"kNx" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/exterior/complex_border/med_park) "kOo" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; @@ -7334,20 +6988,30 @@ }, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/complex/med/locks) -"kOD" = ( -/obj/structure/platform/stair_cut{ - icon_state = "kutjevo_platform_sm_stair" - }, +"kOM" = ( /obj/structure/stairs/perspective/kutjevo{ - dir = 8; - icon_state = "p_stair_ew_full_cap_butt" + dir = 4; + icon_state = "p_stair_full" }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/complex_border/med_rec) +/obj/structure/platform/metal/kutjevo_smooth, +/obj/structure/barricade/handrail/kutjevo{ + layer = 3.1 + }, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/interior/colony_South/power2) +"kOR" = ( +/obj/structure/platform/metal/kutjevo/north, +/obj/structure/blocker/invisible_wall, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/exterior/runoff_dunes) "kPa" = ( /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb/m3717, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/interior/colony_central/mine_elevator) +"kPb" = ( +/obj/structure/platform_decoration/stone/kutjevo/east, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/scrubland) "kPw" = ( /obj/effect/landmark/nightmare{ insert_tag = "trappedmonke_andclown" @@ -7381,47 +7045,31 @@ "kQD" = ( /turf/open/desert/desert_shore/desert_shore1/west, /area/kutjevo/exterior/spring) -"kQU" = ( -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/turf/open/floor/kutjevo/tan, -/area/kutjevo/interior/colony_central) "kRM" = ( /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/exterior/complex_border/botany_medical_cave) +"kSd" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/complex_border/med_rec) "kSh" = ( /obj/structure/filingcabinet, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/kutjevo/tan/multi_tiles/north, /area/kutjevo/interior/complex/botany/east) -"kSo" = ( -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 4 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/desert/desert_shore/shore_edge1/east, -/area/kutjevo/interior/oob/dev_room) "kSy" = ( /obj/effect/decal/cleanable/blood/xeno, /turf/open/floor/kutjevo/tan/grey_edge/southwest, /area/kutjevo/interior/complex/Northwest_Dorms) -"kSB" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/turf/open/floor/kutjevo/tan, -/area/kutjevo/interior/colony_north) "kSH" = ( /turf/open/floor/almayer/research/containment/floor2, /area/kutjevo/exterior/complex_border/med_rec) -"kTX" = ( -/obj/structure/platform/kutjevo/rock, -/obj/structure/platform/kutjevo/rock{ +"kUb" = ( +/obj/structure/flora/grass/tallgrass/desert/corner{ dir = 4 }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/interior/colony_central) +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/scrubland/south) "kUX" = ( /obj/structure/machinery/light, /obj/item/stack/sheet/wood, @@ -7458,18 +7106,31 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/kutjevo/colors/orange/edge/north, /area/kutjevo/interior/complex/Northwest_Security_Checkpoint) +"kWp" = ( +/obj/structure/platform/metal/kutjevo/west, +/turf/open/floor/kutjevo/colors, +/area/kutjevo/interior/power/comms) +"kWs" = ( +/obj/structure/platform/stone/kutjevo/west, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/scrubland) "kWX" = ( /turf/open/auto_turf/sand/layer2, /area/kutjevo/exterior/lz_pad) +"kXJ" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/interior/colony_central) "kYb" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/book/manual/atmospipes, /turf/open/floor/kutjevo/multi_tiles/southwest, /area/kutjevo/interior/colony_South/power2) -"kZm" = ( -/obj/structure/platform_decoration/kutjevo, -/turf/open/gm/river/desert/shallow, -/area/kutjevo/exterior/runoff_river) +"kYg" = ( +/obj/structure/platform/stone/kutjevo/north, +/obj/structure/blocker/invisible_wall, +/turf/open/gm/river/desert/shallow_edge/northeast, +/area/kutjevo/interior/oob) "kZt" = ( /obj/structure/sign/safety/hazard{ pixel_x = 32 @@ -7495,12 +7156,6 @@ /obj/item/ammo_magazine/rifle/mar40, /turf/open/floor/kutjevo/multi_tiles/north, /area/kutjevo/interior/power/comms) -"laf" = ( -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 4 - }, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/scrubland) "lah" = ( /turf/open/floor/kutjevo/colors/orange/tile, /area/kutjevo/interior/power_pt2_electric_boogaloo) @@ -7508,13 +7163,6 @@ /obj/item/weapon/twohanded/folded_metal_chair, /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/Northwest_Dorms) -"lbu" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/obj/item/device/defibrillator, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/complex_border/med_rec) "lbF" = ( /obj/structure/bed, /turf/open/floor/kutjevo/grey/plate, @@ -7534,15 +7182,10 @@ "lcS" = ( /turf/open/floor/kutjevo/colors, /area/kutjevo/interior/complex/med/pano) -"ldM" = ( -/obj/effect/decal/medical_decals{ - icon_state = "triagedecalbottomleft" - }, -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/turf/open/floor/kutjevo/colors/cyan, -/area/kutjevo/interior/complex/med/cells) +"ldL" = ( +/obj/structure/platform/metal/kutjevo/west, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/scrubland/south) "ldU" = ( /obj/structure/inflatable{ opacity = 1 @@ -7553,6 +7196,10 @@ /obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/kutjevo/multi_tiles/west, /area/kutjevo/interior/complex/med/locks) +"lfi" = ( +/obj/structure/platform_decoration/metal/kutjevo, +/turf/open/gm/river/desert/deep, +/area/kutjevo/interior/complex/botany/east_tech) "lfm" = ( /obj/item/stack/sheet/wood, /turf/open/floor/kutjevo/tan, @@ -7562,41 +7209,42 @@ /obj/structure/machinery/floodlight/landing, /turf/open/floor/kutjevo, /area/kutjevo/interior/oob/dev_room) +"lgo" = ( +/obj/structure/platform/metal/kutjevo/north, +/obj/structure/platform/metal/kutjevo/west, +/turf/open/floor/coagulation/icon0_8, +/area/kutjevo/interior/colony_north) "lgJ" = ( /obj/item/reagent_container/glass/bucket, /turf/open/floor/kutjevo/colors/green, /area/kutjevo/interior/complex/botany) -"lgL" = ( -/obj/structure/stairs/perspective/kutjevo{ - dir = 1; - icon_state = "p_stair_sn_full_cap"; - pixel_y = 16 - }, -/obj/structure/stairs/perspective/kutjevo{ - dir = 1; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/machinery/light{ - dir = 8 +"lhs" = ( +/obj/structure/platform/metal/kutjevo/north, +/obj/structure/platform/metal/kutjevo/west, +/obj/structure/blocker/invisible_wall, +/obj/structure/platform/metal/kutjevo, +/obj/structure/filtration/machine_32x64/indestructible{ + bound_height = 32; + icon_state = "solo_tank_empty" }, /turf/open/floor/plating/kutjevo, -/area/kutjevo/interior/colony_South/power2) -"lhu" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/item/device/radio, -/turf/open/floor/kutjevo/multi_tiles/southwest, -/area/kutjevo/interior/colony_South/power2) +/area/kutjevo/exterior/complex_border/med_rec) +"lhU" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/floor/kutjevo/tan, +/area/kutjevo/interior/complex/med/cells) "lhY" = ( /obj/structure/machinery/light{ dir = 8 }, /turf/open/floor/kutjevo/colors/cyan, /area/kutjevo/interior/complex/med/auto_doc) +"liK" = ( +/obj/structure/platform/metal/kutjevo/east, +/obj/structure/blocker/invisible_wall, +/obj/structure/platform/metal/kutjevo, +/turf/open/gm/river/desert/deep/toxic, +/area/kutjevo/interior/power) "lkp" = ( /obj/structure/machinery/light{ dir = 8 @@ -7635,11 +7283,6 @@ /obj/structure/blocker/invisible_wall, /turf/open/desert/desert_shore/desert_shore1/east, /area/kutjevo/interior/oob/dev_room) -"loe" = ( -/obj/structure/platform/kutjevo/rock, -/obj/structure/blocker/invisible_wall, -/turf/open/gm/river/desert/deep, -/area/kutjevo/interior/oob) "lok" = ( /obj/effect/decal/cleanable/blood/xeno{ icon_state = "xgib4" @@ -7665,6 +7308,10 @@ }, /turf/open/floor/kutjevo/grey/plate, /area/kutjevo/interior/construction) +"lpm" = ( +/obj/structure/platform/metal/kutjevo/north, +/turf/open/floor/kutjevo/tan/alt_edge/west, +/area/kutjevo/interior/colony_central) "lpD" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer/research/containment/floor2, @@ -7681,14 +7328,11 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/Northwest_Dorms) -"lqG" = ( -/obj/structure/stairs/perspective/kutjevo{ - dir = 4; - icon_state = "p_stair_ew_full_cap" - }, -/obj/structure/platform/kutjevo, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/interior/power/comms) +"lrj" = ( +/obj/structure/platform_decoration/stone/kutjevo/east, +/obj/structure/platform_decoration/stone/kutjevo/north, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/interior/colony_N_East) "lrx" = ( /turf/open/desert/desert_shore/desert_shore1/east, /area/kutjevo/exterior/lz_dunes) @@ -7698,12 +7342,19 @@ }, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/exterior/runoff_bridge) +"lrJ" = ( +/obj/structure/platform/stone/kutjevo/east, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/runoff_dunes) "lrO" = ( /obj/structure/machinery/light/small{ dir = 4 }, /turf/open/floor/kutjevo/colors/green/tile, /area/kutjevo/interior/oob) +"lrQ" = ( +/turf/open/desert/desert_shore/desert_shore1/west, +/area/kutjevo/exterior/scrubland/south) "lsg" = ( /obj/effect/landmark/hunter_secondary, /turf/open/auto_turf/sand/layer0, @@ -7776,30 +7427,34 @@ }, /turf/open/floor/kutjevo/tiles, /area/kutjevo/interior/complex/med/triage) -"lyG" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/turf/open/floor/kutjevo/tan/multi_tiles, -/area/kutjevo/interior/colony_South/power2) +"lyF" = ( +/obj/structure/platform/metal/kutjevo_smooth/north, +/obj/structure/platform/metal/kutjevo_smooth/west, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/interior/power) "lyJ" = ( /turf/open/floor/coagulation/icon0_5, /area/kutjevo/exterior/scrubland) -"lzb" = ( -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/turf/open/floor/kutjevo/multi_tiles/east, -/area/kutjevo/interior/power/comms) "lzD" = ( /turf/open/floor/almayer/research/containment/floor1, /area/kutjevo/exterior/lz_pad) +"lAb" = ( +/obj/structure/platform/metal/kutjevo/west, +/obj/structure/stairs/perspective/kutjevo{ + icon_state = "p_stair_sn_full_cap" + }, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/interior/construction) "lAn" = ( /obj/structure/machinery/light{ dir = 4 }, /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/botany) +"lAw" = ( +/obj/structure/platform/metal/kutjevo, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/scrubland/south) "lAI" = ( /turf/open/floor/plating/kutjevo, /area/shuttle/drop1/kutjevo) @@ -7810,16 +7465,6 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/interior/power) -"lBm" = ( -/obj/structure/platform/kutjevo/rock, -/obj/structure/platform/kutjevo/rock{ - dir = 4 - }, -/obj/structure/platform/kutjevo/rock{ - dir = 8 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/interior/colony_north) "lBP" = ( /obj/structure/window/framed/kutjevo/reinforced, /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -7827,12 +7472,6 @@ }, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/complex/med) -"lCa" = ( -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/scrubland) "lCu" = ( /obj/structure/window/framed/kutjevo, /turf/open/floor/plating/kutjevo, @@ -7841,14 +7480,6 @@ /obj/effect/landmark/yautja_teleport, /turf/open/floor/kutjevo/grey/plate, /area/kutjevo/interior/construction) -"lCH" = ( -/obj/structure/platform/kutjevo/rock, -/obj/structure/platform/kutjevo/rock{ - dir = 8 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/gm/river/desert/deep, -/area/kutjevo/interior/oob) "lDi" = ( /obj/item/stack/sheet/wood, /turf/open/floor/kutjevo/colors/purple, @@ -7859,13 +7490,6 @@ "lEA" = ( /turf/closed/wall/kutjevo/colony/reinforced, /area/kutjevo/interior/colony_central) -"lEB" = ( -/obj/structure/platform_decoration/kutjevo/rock, -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 8 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/scrubland) "lFq" = ( /obj/structure/filtration/machine_32x64/indestructible{ bound_height = 32; @@ -7879,40 +7503,33 @@ /obj/item/device/radio, /turf/open/floor/carpet, /area/kutjevo/interior/oob) +"lFJ" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/gm/river/desert/shallow_edge/northwest, +/area/kutjevo/exterior/runoff_river) "lGj" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_central) +"lGm" = ( +/obj/structure/platform_decoration/stone/kutjevo/west, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/stonyfields) "lHs" = ( /obj/structure/window/framed/kutjevo/reinforced, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/complex/botany) -"lIB" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/obj/structure/blocker/invisible_wall, -/obj/structure/platform/kutjevo, -/obj/structure/filtration/machine_32x64/indestructible{ - bound_height = 32; - icon_state = "solo_tank_empty" - }, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/interior/oob) "lIM" = ( /obj/structure/bed/chair/office/light, /turf/open/floor/kutjevo/colors/orange/edge/north, /area/kutjevo/interior/foremans_office) +"lJE" = ( +/obj/structure/platform/stone/kutjevo/north, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/runoff_dunes) "lKk" = ( /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/lz_pad) -"lKR" = ( -/obj/structure/platform_decoration/kutjevo, -/turf/open/floor/kutjevo/colors/purple/edge/east, -/area/kutjevo/interior/construction) "lKV" = ( /turf/open/desert/desert_shore/desert_shore1/west, /area/kutjevo/exterior/runoff_river) @@ -7925,6 +7542,10 @@ /obj/structure/blocker/invisible_wall, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/oob) +"lLq" = ( +/obj/structure/platform/metal/kutjevo/north, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/runoff_dunes) "lLC" = ( /obj/structure/sign/safety/hazard{ pixel_x = -32 @@ -7944,6 +7565,12 @@ }, /turf/open/floor/kutjevo/colors/purple/edge/west, /area/kutjevo/interior/construction) +"lLS" = ( +/obj/structure/platform/metal/kutjevo_smooth/north, +/obj/structure/platform/metal/kutjevo_smooth/east, +/obj/structure/platform/metal/kutjevo_smooth, +/turf/open/gm/river/desert/deep/covered, +/area/kutjevo/interior/complex/med/operating) "lMr" = ( /obj/structure/barricade/wooden{ dir = 4; @@ -7964,10 +7591,6 @@ /obj/structure/closet/crate/secure/ammo, /turf/open/asphalt/cement_sunbleached, /area/kutjevo/exterior/scrubland) -"lMS" = ( -/obj/structure/platform_decoration/kutjevo, -/turf/open/floor/almayer/research/containment/floor1, -/area/kutjevo/interior/complex/med/locks) "lNl" = ( /obj/structure/machinery/landinglight/ds2/delaytwo{ dir = 1 @@ -7987,10 +7610,19 @@ }, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/power_pt2_electric_boogaloo) +"lNH" = ( +/obj/structure/blocker/invisible_wall, +/obj/structure/platform/metal/kutjevo, +/turf/open/gm/river/red_pool, +/area/kutjevo/interior/power) "lOr" = ( /obj/structure/machinery/vending/coffee, /turf/open/floor/kutjevo/tan/alt_inner_edge, /area/kutjevo/interior/complex/Northwest_Flight_Control) +"lOx" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/closed/wall/kutjevo/rock, +/area/kutjevo/exterior/runoff_dunes) "lOK" = ( /obj/structure/machinery/photocopier, /turf/open/floor/kutjevo/colors/red, @@ -7998,9 +7630,17 @@ "lPR" = ( /turf/closed/wall/kutjevo/colony/reinforced, /area/kutjevo/exterior/construction) +"lRk" = ( +/obj/effect/sentry_landmark/lz_1/bottom_left, +/turf/open/auto_turf/sand/layer2, +/area/kutjevo/exterior/lz_dunes) "lRy" = ( /turf/open/floor/kutjevo/plate, /area/kutjevo/exterior/Northwest_Colony) +"lRB" = ( +/obj/effect/sentry_landmark/lz_2/bottom_right, +/turf/open/floor/almayer/research/containment/floor1, +/area/kutjevo/exterior/Northwest_Colony) "lRV" = ( /obj/structure/machinery/light, /obj/structure/stairs/perspective/kutjevo{ @@ -8021,6 +7661,11 @@ }, /turf/open/floor/kutjevo/colors/cyan/edge, /area/kutjevo/interior/complex/med/operating) +"lSS" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, +/obj/structure/blocker/invisible_wall, +/turf/open/gm/river/desert/deep, +/area/kutjevo/interior/oob) "lSX" = ( /obj/structure/machinery/light{ dir = 1 @@ -8030,20 +7675,18 @@ }, /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/power/comms) -"lTr" = ( -/obj/structure/platform_decoration/kutjevo, -/turf/open/floor/kutjevo/colors/cyan, -/area/kutjevo/interior/complex/med/auto_doc) +"lTu" = ( +/obj/structure/platform/metal/kutjevo/east, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/interior/colony_central) "lUg" = ( /obj/structure/window/framed/kutjevo/reinforced, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/power) -"lUM" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 1 - }, +"lVg" = ( +/obj/structure/platform_decoration/stone/kutjevo/north, /obj/structure/blocker/invisible_wall, -/turf/open/gm/river/desert/shallow_corner, +/turf/open/gm/river/desert/deep, /area/kutjevo/interior/oob) "lVo" = ( /obj/structure/barricade/wooden{ @@ -8068,19 +7711,17 @@ /obj/structure/blocker/invisible_wall, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/power) -"lVZ" = ( -/turf/open/floor/kutjevo/tan/multi_tiles, -/area/kutjevo/exterior/scrubland) -"lXe" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 1 +"lWT" = ( +/obj/structure/bed/sofa/vert/grey/bot{ + pixel_y = 4 }, -/obj/structure/platform/kutjevo/rock{ - dir = 4 +/obj/structure/barricade/handrail/strata{ + dir = 8 }, -/obj/structure/blocker/invisible_wall, -/turf/open/desert/desert_shore/desert_shore1/north, -/area/kutjevo/interior/oob) +/obj/structure/barricade/handrail/strata, +/obj/structure/platform_decoration/metal/kutjevo/north, +/turf/open/floor/mech_bay_recharge_floor, +/area/kutjevo/interior/colony_central/mine_elevator) "lXN" = ( /turf/open/floor/kutjevo/plate, /area/kutjevo/exterior/telecomm/lz1_south) @@ -8107,12 +7748,6 @@ /obj/structure/tunnel, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/construction) -"lZZ" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/construction) "mao" = ( /obj/structure/prop/dam/large_boulder/boulder1, /turf/open/auto_turf/sand/layer0, @@ -8128,10 +7763,6 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/kutjevo/tan/alt_edge/north, /area/kutjevo/interior/complex/Northwest_Flight_Control) -"mbh" = ( -/obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/desert/desert_shore/shore_edge1/north, -/area/kutjevo/exterior/scrubland) "mbp" = ( /obj/structure/barricade/wooden{ dir = 4; @@ -8140,6 +7771,11 @@ /obj/item/stack/sheet/wood, /turf/open/floor/kutjevo/colors/green, /area/kutjevo/interior/complex/botany) +"mbN" = ( +/obj/structure/platform/metal/kutjevo/north, +/obj/item/device/defibrillator, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/complex_border/med_rec) "mbR" = ( /obj/structure/closet/crate/trashcart, /turf/open/auto_turf/sand/layer1, @@ -8213,13 +7849,6 @@ /obj/structure/prop/dam/truck/mining, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/Northwest_Colony) -"mfY" = ( -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/obj/structure/platform/kutjevo, -/turf/open/floor/coagulation/icon0_0, -/area/kutjevo/interior/colony_north) "mgn" = ( /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/exterior/telecomm/lz2_south) @@ -8229,12 +7858,6 @@ }, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/interior/complex/botany) -"mhd" = ( -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/interior/colony_central) "mhf" = ( /obj/structure/barricade/handrail/kutjevo{ dir = 4 @@ -8243,29 +7866,23 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/kutjevo/multi_tiles/southeast, /area/kutjevo/interior/colony_South/power2) -"mhj" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 1 - }, -/obj/structure/platform/kutjevo/rock{ - dir = 8 - }, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/complex_border/botany_medical_cave) +"mhu" = ( +/obj/structure/blocker/invisible_wall, +/obj/structure/platform/metal/kutjevo/west, +/turf/open/gm/river/darkred, +/area/kutjevo/interior/oob) "mhJ" = ( /turf/open/mars_cave/mars_cave_10, /area/kutjevo/exterior/lz_dunes) -"mhN" = ( -/obj/structure/flora/grass/tallgrass/desert/corner{ - dir = 10 - }, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/scrubland) "mhY" = ( /obj/item/device/camera, /obj/structure/blocker/invisible_wall, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/oob/dev_room) +"miP" = ( +/obj/structure/platform/stone/kutjevo/east, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/runoff_river) "mjd" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /turf/open/auto_turf/sand/layer0, @@ -8292,13 +7909,6 @@ /obj/structure/machinery/light, /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/power/comms) -"mkO" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/obj/structure/largecrate/random, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/scrubland) "mkU" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/cameras{ @@ -8306,6 +7916,21 @@ }, /turf/open/floor/kutjevo/colors/orange/edge/west, /area/kutjevo/interior/complex/Northwest_Security_Checkpoint) +"mli" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/north, +/turf/open/floor/kutjevo/colors/cyan/tile, +/area/kutjevo/interior/complex/med/cells) +"mll" = ( +/obj/structure/platform_decoration/stone/kutjevo, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/stonyfields) +"mmh" = ( +/obj/structure/platform/metal/kutjevo_smooth/north, +/turf/open/floor/kutjevo/colors/cyan/tile, +/area/kutjevo/interior/complex/med/cells) "mmH" = ( /obj/structure/largecrate/random, /turf/open/floor/kutjevo/colors/orange, @@ -8313,13 +7938,19 @@ "mnk" = ( /turf/open/desert/desert_shore/shore_edge1/west, /area/kutjevo/exterior/lz_dunes) -"mnn" = ( -/obj/structure/platform/kutjevo{ - dir = 1 +"mnm" = ( +/obj/structure/stairs/perspective/kutjevo{ + dir = 8; + icon_state = "p_stair_ew_full_cap_butt" }, -/obj/structure/blocker/invisible_wall, +/obj/structure/platform_decoration/metal/kutjevo/north, /turf/open/floor/plating/kutjevo, -/area/kutjevo/exterior/complex_border/med_park) +/area/kutjevo/interior/complex/med/cells) +"mnD" = ( +/obj/structure/platform/metal/kutjevo/north, +/obj/structure/platform/metal/kutjevo/east, +/turf/open/gm/river/desert/deep, +/area/kutjevo/interior/complex/botany/east_tech) "mnT" = ( /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_central) @@ -8348,11 +7979,10 @@ }, /turf/open/floor/kutjevo/colors/purple/inner_corner/west, /area/kutjevo/interior/construction) -"msF" = ( -/obj/structure/surface/rack, -/obj/effect/landmark/objective_landmark/far, -/turf/open/floor/kutjevo/multi_tiles/north, -/area/kutjevo/interior/power) +"mrY" = ( +/obj/structure/platform/metal/kutjevo/north, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/scrubland) "msK" = ( /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/complex_border/med_rec) @@ -8379,38 +8009,15 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/Northwest_Security_Checkpoint) -"mtS" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/runoff_river) -"muG" = ( -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/floor/kutjevo/multi_tiles, -/area/kutjevo/interior/power) "mvt" = ( /obj/effect/decal/cleanable/blood/xeno, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/Northwest_Colony) -"mvv" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/turf/open/floor/kutjevo/colors/cyan, -/area/kutjevo/interior/complex/med/cells) -"mvB" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/turf/open/floor/kutjevo/colors/orange, -/area/kutjevo/interior/colony_South/power2) +"mvz" = ( +/obj/structure/platform_decoration/stone/kutjevo/east, +/obj/structure/blocker/invisible_wall, +/turf/open/desert/desert_shore/shore_edge1/east, +/area/kutjevo/interior/oob/dev_room) "mvM" = ( /obj/structure/closet/emcloset, /obj/effect/landmark/objective_landmark/medium, @@ -8424,14 +8031,6 @@ /obj/structure/window/framed/kutjevo/reinforced, /turf/open/floor/kutjevo/colors/green/tile, /area/kutjevo/interior/complex/botany) -"mwV" = ( -/obj/structure/machinery/disposal, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/platform/kutjevo/smooth, -/turf/open/floor/kutjevo/grey/plate, -/area/kutjevo/interior/complex/med/operating) "mxB" = ( /turf/closed/wall/kutjevo/rock/border, /area/kutjevo/interior/oob) @@ -8439,15 +8038,20 @@ /obj/item/frame/rack, /turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/interior/complex/botany/east_tech) +"myf" = ( +/obj/structure/platform/metal/kutjevo_smooth/west, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/kutjevo/colors/orange, +/area/kutjevo/interior/colony_South/power2) "myk" = ( /turf/open/gm/river/desert/shallow_edge/east, /area/kutjevo/exterior/spring) -"mzn" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/turf/open/gm/river/desert/deep, -/area/kutjevo/interior/complex/botany/east_tech) +"mzo" = ( +/obj/structure/platform_decoration/metal/kutjevo, +/turf/open/desert/desert_shore/desert_shore1/east, +/area/kutjevo/exterior/runoff_river) "mzS" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/stack/medical/splint, @@ -8458,6 +8062,11 @@ /obj/item/storage/pill_bottle/dexalin/skillless, /turf/open/floor/kutjevo/grey/plate, /area/kutjevo/interior/complex/med) +"mzW" = ( +/obj/structure/platform/stone/kutjevo/north, +/obj/structure/platform/stone/kutjevo/west, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/complex_border/botany_medical_cave) "mAb" = ( /turf/open/floor/kutjevo/tan/multi_tiles/north, /area/kutjevo/exterior/lz_pad) @@ -8525,32 +8134,10 @@ /obj/effect/decal/cleanable/blood/gibs/down, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/construction) -"mDa" = ( -/obj/structure/platform_decoration/kutjevo/rock, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/stonyfields) -"mDl" = ( -/obj/structure/stairs/perspective/kutjevo{ - dir = 1; - icon_state = "p_stair_full" - }, -/obj/structure/platform_decoration/kutjevo, -/turf/open/floor/kutjevo/multi_tiles, -/area/kutjevo/interior/power) "mDm" = ( /obj/structure/window/framed/kutjevo, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/construction) -"mDu" = ( -/obj/structure/stairs/perspective/kutjevo{ - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/complex_border/med_rec) "mDz" = ( /obj/structure/sign/poster{ pixel_y = 32 @@ -8565,13 +8152,6 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_N_East) -"mDH" = ( -/obj/structure/flora/bush/ausbushes/reedbush, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/turf/open/gm/river/desert/shallow, -/area/kutjevo/exterior/runoff_bridge) "mDL" = ( /obj/structure/stairs/perspective/kutjevo{ dir = 1; @@ -8584,13 +8164,6 @@ }, /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/power_pt2_electric_boogaloo) -"mDN" = ( -/obj/structure/platform/kutjevo/rock, -/obj/structure/platform/kutjevo/rock{ - dir = 1 - }, -/turf/open/auto_turf/sand/layer2, -/area/kutjevo/exterior/scrubland) "mEb" = ( /obj/effect/landmark/static_comms/net_two, /turf/open/floor/kutjevo/plate, @@ -8599,39 +8172,14 @@ /obj/item/stack/cable_coil/random, /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/colony_South/power2) -"mFd" = ( -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/turf/open/gm/river/desert/shallow_edge/north, +"mGu" = ( +/obj/structure/platform/metal/kutjevo/north, +/turf/open/floor/kutjevo/tan/alt_edge/east, /area/kutjevo/interior/colony_central) -"mFf" = ( -/obj/structure/flora/grass/tallgrass/desert/corner{ - dir = 1 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/scrubland) -"mGb" = ( -/obj/structure/platform/kutjevo/smooth, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/interior/power) "mGE" = ( /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, /turf/open/floor/kutjevo/colors/green, /area/kutjevo/interior/complex/botany) -"mGJ" = ( -/obj/structure/stairs/perspective/kutjevo{ - dir = 8; - icon_state = "p_stair_ew_half_cap" - }, -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/complex_border/med_rec) "mGL" = ( /obj/effect/decal/medical_decals{ icon_state = "triagedecalbottomleft" @@ -8646,12 +8194,6 @@ }, /turf/open/floor/kutjevo/multi_tiles/southeast, /area/kutjevo/interior/complex/med/locks) -"mHo" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/interior/power/comms) "mHJ" = ( /turf/open/floor/kutjevo/grey/plate, /area/kutjevo/interior/complex/med) @@ -8665,21 +8207,12 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/closed/wall/kutjevo/colony, /area/kutjevo/interior/construction) -"mIr" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 1 - }, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/scrubland) "mIs" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ req_one_access = null }, /turf/open/floor/kutjevo/colors/green/tile, /area/kutjevo/interior/complex/botany/east) -"mIA" = ( -/turf/open/gm/river/desert/shallow_edge/east, -/area/kutjevo/exterior/scrubland) "mIB" = ( /obj/structure/machinery/door/poddoor/shutters/almayer/open{ dir = 8; @@ -8759,6 +8292,11 @@ }, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/power/comms) +"mOh" = ( +/obj/structure/platform/metal/kutjevo/north, +/obj/structure/bed/roller, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/complex_border/med_rec) "mOO" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/snacks/wrapped/barcardine{ @@ -8767,13 +8305,14 @@ }, /turf/open/floor/kutjevo/plate, /area/kutjevo/interior/colony_central) -"mPt" = ( -/obj/structure/machinery/colony_floodlight, -/obj/structure/platform/kutjevo{ - dir = 1 +"mPI" = ( +/obj/structure/platform/metal/kutjevo_smooth, +/obj/structure/stairs/perspective/kutjevo{ + dir = 4; + icon_state = "p_stair_full" }, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/interior/complex/med/triage) +/turf/open/floor/plating/kutjevo, +/area/kutjevo/interior/power) "mPL" = ( /obj/structure/flora/grass/desert/lightgrass_10, /turf/open/auto_turf/sand/layer1, @@ -8785,15 +8324,18 @@ "mQl" = ( /turf/open/desert/desert_shore/desert_shore1, /area/kutjevo/exterior/lz_river) +"mQt" = ( +/obj/structure/platform/metal/kutjevo/north, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/runoff_dunes) +"mRO" = ( +/obj/structure/platform/metal/kutjevo, +/obj/structure/platform/metal/kutjevo/east, +/turf/open/gm/river/desert/deep, +/area/kutjevo/interior/complex/botany/east_tech) "mRP" = ( /turf/open/floor/kutjevo/colors/purple/inner_corner/west, /area/kutjevo/interior/construction) -"mSd" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/turf/open/gm/river/desert/shallow, -/area/kutjevo/exterior/runoff_river) "mSm" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/auto_turf/sand/layer0, @@ -8809,12 +8351,6 @@ /obj/structure/flora/grass/tallgrass/desert, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/Northwest_Colony) -"mSM" = ( -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/interior/colony_north) "mTf" = ( /obj/effect/landmark/xeno_spawn, /turf/open/auto_turf/sand/layer1, @@ -8823,32 +8359,18 @@ /obj/structure/largecrate/random, /turf/open/asphalt/cement_sunbleached, /area/kutjevo/exterior/scrubland) +"mUS" = ( +/obj/structure/platform/stone/kutjevo, +/obj/structure/platform/stone/kutjevo/west, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/interior/colony_South) "mVr" = ( /turf/open/gm/river/desert/shallow_corner/west, /area/kutjevo/exterior/lz_river) -"mVC" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/obj/effect/decal/medical_decals{ - icon_state = "cryocell2deval" - }, -/turf/open/floor/kutjevo/tan, -/area/kutjevo/interior/complex/med/cells) "mWA" = ( /obj/structure/machinery/autolathe/full, /turf/open/floor/kutjevo/multi_tiles/southwest, /area/kutjevo/interior/colony_South/power2) -"mWO" = ( -/obj/structure/platform_decoration/kutjevo, -/turf/open/auto_turf/sand/layer2, -/area/kutjevo/interior/colony_central) -"mXZ" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/runoff_dunes) "mYj" = ( /turf/open/floor/coagulation/icon0_8, /area/kutjevo/exterior/scrubland) @@ -8864,6 +8386,11 @@ /obj/structure/window/framed/kutjevo/reinforced, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/construction) +"mZo" = ( +/obj/structure/platform/metal/kutjevo/east, +/obj/structure/blocker/invisible_wall, +/turf/open/floor/kutjevo/multi_tiles, +/area/kutjevo/interior/power) "mZt" = ( /obj/structure/prop/dam/boulder/boulder3, /turf/open/auto_turf/sand/layer0, @@ -8877,6 +8404,14 @@ }, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/runoff_dunes) +"naw" = ( +/obj/structure/platform/metal/kutjevo_smooth/east, +/obj/structure/reagent_dispensers/water_cooler/walk_past{ + pixel_x = 8; + pixel_y = 24 + }, +/turf/open/floor/kutjevo/colors/cyan, +/area/kutjevo/interior/complex/med/auto_doc) "naK" = ( /turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/interior/oob) @@ -8887,12 +8422,6 @@ "nbu" = ( /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/botany/east_tech) -"nbH" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 4 - }, -/turf/open/auto_turf/sand/layer2, -/area/kutjevo/exterior/runoff_river) "nbR" = ( /turf/open/gm/river/desert/deep/covered, /area/kutjevo/interior/colony_central) @@ -8929,25 +8458,13 @@ /obj/structure/machinery/iv_drip, /turf/open/floor/kutjevo/colors/cyan/edge/north, /area/kutjevo/interior/complex/med/triage) -"ngp" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/scrubland) "ngK" = ( /turf/open/floor/kutjevo/multi_tiles/north, /area/kutjevo/interior/colony_South/power2) -"ngX" = ( -/obj/structure/stairs/perspective/kutjevo{ - dir = 8; - icon_state = "p_stair_ew_full_cap_butt" - }, -/obj/structure/platform/stair_cut{ - icon_state = "kutjevo_platform_sm_stair" - }, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/exterior/construction) +"ngQ" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/interior/colony_central) "nhT" = ( /obj/effect/decal/cleanable/blood/xeno{ icon_state = "xgibleg" @@ -8958,6 +8475,11 @@ /obj/structure/flora/bush/ausbushes/reedbush, /turf/open/desert/desert_shore/shore_corner2, /area/kutjevo/exterior/runoff_river) +"niK" = ( +/obj/structure/flora/bush/ausbushes/grassybush, +/obj/structure/platform/metal/kutjevo/north, +/turf/open/gm/river/desert/shallow, +/area/kutjevo/exterior/runoff_river) "niP" = ( /obj/structure/tunnel, /turf/open/auto_turf/sand/layer0, @@ -8972,12 +8494,6 @@ /obj/effect/landmark/corpsespawner/security/marshal, /turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/interior/complex/botany/east) -"njY" = ( -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 4 - }, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/stonyfields) "nkV" = ( /obj/item/device/flashlight/on, /turf/open/floor/kutjevo/tan/multi_tiles, @@ -8998,10 +8514,6 @@ "nlA" = ( /turf/open/floor/kutjevo/tan/alt_edge/north, /area/kutjevo/exterior/construction) -"nlT" = ( -/obj/structure/platform/kutjevo, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/interior/colony_central) "nmw" = ( /obj/structure/surface/table/almayer, /obj/item/paper/janitor, @@ -9057,10 +8569,6 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/construction) -"nrD" = ( -/obj/structure/platform/kutjevo, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/complex_border/med_rec) "nsa" = ( /obj/structure/machinery/cm_vending/sorted/tech/comp_storage, /turf/open/floor/kutjevo/colors/orange, @@ -9091,6 +8599,16 @@ }, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/interior/complex/botany) +"ntr" = ( +/obj/structure/platform_decoration/stone/kutjevo/west, +/obj/structure/platform_decoration/stone/kutjevo, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/interior/colony_north) +"nty" = ( +/obj/structure/platform/metal/kutjevo_smooth/north, +/obj/structure/platform/metal/kutjevo_smooth, +/turf/open/gm/river/desert/deep/covered, +/area/kutjevo/interior/complex/med/operating) "ntz" = ( /obj/structure/surface/table/almayer, /turf/open/floor/kutjevo/grey/plate, @@ -9099,36 +8617,21 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/colony_central) -"ntM" = ( -/obj/structure/stairs/perspective/kutjevo{ - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform/kutjevo/smooth, -/obj/structure/machinery/light, -/turf/open/floor/kutjevo/colors/purple, -/area/kutjevo/interior/complex/med/locks) -"nux" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/turf/open/floor/kutjevo/colors/cyan, -/area/kutjevo/interior/complex/med/operating) -"nuA" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/obj/structure/platform/kutjevo{ - dir = 4 - }, +"nui" = ( +/obj/structure/platform/metal/kutjevo/north, +/obj/structure/platform/metal/kutjevo/east, /obj/structure/blocker/invisible_wall, -/obj/structure/platform/kutjevo, -/obj/structure/filtration/machine_32x64/indestructible{ - bound_height = 32; - icon_state = "solo_tank_empty" - }, /turf/open/floor/plating/kutjevo, -/area/kutjevo/exterior/complex_border/med_rec) +/area/kutjevo/exterior/runoff_dunes) +"num" = ( +/obj/structure/platform_decoration/stone/kutjevo/east, +/turf/open/auto_turf/sand/layer2, +/area/kutjevo/exterior/lz_dunes) +"nuP" = ( +/obj/structure/platform/metal/kutjevo/east, +/obj/structure/platform/metal/kutjevo, +/turf/open/floor/coagulation/icon8_0, +/area/kutjevo/interior/colony_north) "nvd" = ( /obj/structure/machinery/door/poddoor/shutters/almayer/open{ id = "kutjevo_hydlock_west"; @@ -9156,36 +8659,34 @@ }, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/colony_central/mine_elevator) +"nxs" = ( +/obj/structure/platform/metal/kutjevo/east, +/obj/structure/platform/metal/kutjevo, +/turf/open/gm/river/desert/deep, +/area/kutjevo/interior/complex/botany/east_tech) +"nxN" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/lz_dunes) "nyp" = ( /obj/structure/machinery/power/apc/no_power/north, /obj/item/clothing/suit/armor/vest/security, /turf/open/floor/kutjevo/colors/cyan/edge/north, /area/kutjevo/interior/complex/med/operating) -"nyv" = ( -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 8 - }, +"nyA" = ( +/obj/structure/platform/metal/kutjevo/east, +/turf/open/floor/coagulation/icon8_3, +/area/kutjevo/interior/construction) +"nyF" = ( +/obj/structure/blocker/invisible_wall, +/obj/structure/platform/metal/kutjevo/north, +/obj/structure/platform/metal/kutjevo/east, +/turf/open/gm/river/red, +/area/kutjevo/interior/oob) +"nzv" = ( +/obj/effect/landmark/hunter_primary, /turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/scrubland) -"nyY" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 1 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/interior/colony_N_East) -"nzB" = ( -/obj/structure/bed/sofa/vert/grey/bot{ - pixel_y = 4 - }, -/obj/structure/barricade/handrail/strata{ - dir = 8 - }, -/obj/structure/barricade/handrail/strata, -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/turf/open/floor/mech_bay_recharge_floor, -/area/kutjevo/interior/colony_central/mine_elevator) +/area/kutjevo/exterior/scrubland/south) "nzP" = ( /obj/structure/cable/heavyduty{ icon_state = "1-8" @@ -9214,6 +8715,18 @@ }, /turf/open/floor/kutjevo/colors/cyan, /area/kutjevo/interior/complex/med) +"nBb" = ( +/obj/structure/closet/secure_closet/medical3{ + req_access = null + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/item/storage/pill_bottle/tramadol/skillless, +/obj/structure/platform/metal/kutjevo_smooth, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/strata/multi_tiles/west, +/area/kutjevo/interior/complex/med/operating) "nCt" = ( /obj/structure/machinery/computer/card{ dir = 4 @@ -9259,12 +8772,24 @@ }, /turf/open/floor/kutjevo/grey/plate, /area/kutjevo/interior/complex/med/cells) -"nDT" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 +"nEr" = ( +/obj/structure/platform/metal/kutjevo_smooth/north, +/obj/structure/platform/metal/kutjevo_smooth/east, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/interior/power) +"nEY" = ( +/obj/structure/platform/metal/kutjevo_smooth/west, +/obj/effect/landmark/objective_landmark/science, +/turf/open/floor/kutjevo/colors/cyan/inner_corner, +/area/kutjevo/interior/complex/med/operating) +"nEZ" = ( +/obj/structure/stairs/perspective/kutjevo{ + dir = 8; + icon_state = "p_stair_ew_full_cap_butt" }, -/turf/open/asphalt/cement_sunbleached, -/area/kutjevo/exterior/scrubland) +/obj/structure/platform/metal/stair_cut/kutjevo_smooth_left, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/interior/power) "nFM" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; @@ -9298,19 +8823,6 @@ }, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/interior/colony_central/mine_elevator) -"nHO" = ( -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 4 - }, -/turf/open/auto_turf/sand/layer2, -/area/kutjevo/interior/colony_central) -"nHU" = ( -/obj/structure/blocker/invisible_wall, -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/turf/open/gm/river/darkred, -/area/kutjevo/interior/oob) "nHV" = ( /obj/structure/surface/rack, /obj/structure/machinery/light{ @@ -9323,6 +8835,12 @@ /obj/item/stack/sandbags_empty, /turf/open/floor/kutjevo/colors, /area/kutjevo/interior/complex/botany) +"nIs" = ( +/obj/structure/flora/grass/tallgrass/desert/corner{ + dir = 9 + }, +/turf/open/auto_turf/sand/layer2, +/area/kutjevo/exterior/scrubland/south) "nIA" = ( /obj/item/device/flashlight/lamp/tripod/grey, /obj/structure/machinery/light, @@ -9348,9 +8866,6 @@ }, /turf/open/floor/kutjevo/colors/orange/edge/west, /area/kutjevo/interior/complex/Northwest_Security_Checkpoint) -"nJC" = ( -/turf/open/floor/kutjevo/colors/orange, -/area/kutjevo/exterior/scrubland) "nJY" = ( /obj/structure/machinery/light{ dir = 4 @@ -9363,15 +8878,14 @@ "nKh" = ( /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/botany/east) +"nKm" = ( +/obj/structure/monorail, +/obj/structure/platform/metal/kutjevo_smooth/east, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/interior/power) "nKs" = ( /turf/open/auto_turf/sand/layer2, /area/kutjevo/exterior/telecomm/lz2_north) -"nKO" = ( -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 1 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/interior/colony_South) "nLc" = ( /turf/open/floor/kutjevo/multi_tiles/southwest, /area/kutjevo/interior/complex/botany) @@ -9387,6 +8901,15 @@ }, /turf/open/floor/kutjevo/colors, /area/kutjevo/interior/complex/botany) +"nLJ" = ( +/obj/structure/stairs/perspective/kutjevo{ + dir = 1; + icon_state = "p_stair_sn_full_cap"; + pixel_y = 16 + }, +/obj/structure/platform/metal/kutjevo_smooth/west, +/turf/open/floor/kutjevo/multi_tiles/southeast, +/area/kutjevo/interior/power) "nLM" = ( /obj/structure/barricade/wooden, /turf/open/floor/kutjevo/tiles, @@ -9419,6 +8942,10 @@ "nLT" = ( /turf/open/desert/desert_shore/shore_corner2/east, /area/kutjevo/exterior/lz_river) +"nMg" = ( +/obj/structure/platform/metal/kutjevo_smooth/west, +/turf/closed/wall/kutjevo/colony, +/area/kutjevo/exterior/runoff_bridge) "nMz" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/kutjevo/colors/orange/tile, @@ -9442,16 +8969,6 @@ "nPf" = ( /turf/open/gm/river/desert/deep/covered, /area/kutjevo/interior/colony_South/power2) -"nPl" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 1 - }, -/obj/structure/platform/kutjevo/rock{ - dir = 8 - }, -/obj/structure/platform/kutjevo/rock, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/interior/colony_central) "nPq" = ( /obj/structure/flora/grass/tallgrass/desert/corner{ dir = 6 @@ -9465,6 +8982,11 @@ "nPA" = ( /turf/open/floor/kutjevo/tan/grey_edge/east, /area/kutjevo/interior/colony_central) +"nPG" = ( +/obj/structure/platform/metal/kutjevo/north, +/obj/structure/platform/metal/kutjevo/east, +/turf/open/floor/coagulation/icon8_8, +/area/kutjevo/interior/colony_north) "nPO" = ( /obj/structure/machinery/iv_drip, /turf/open/floor/kutjevo/colors/cyan, @@ -9472,13 +8994,6 @@ "nPX" = ( /turf/open/gm/river/desert/shallow_edge/northwest, /area/kutjevo/exterior/spring) -"nQc" = ( -/obj/structure/platform_decoration/kutjevo/rock, -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 1 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/interior/colony_north) "nQo" = ( /turf/open/gm/river/desert/shallow_edge/west, /area/kutjevo/exterior/lz_river) @@ -9486,17 +9001,11 @@ /obj/item/ammo_magazine/rifle/mar40, /turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/interior/power/comms) -"nQy" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/turf/open/floor/coagulation/icon7_8_2, -/area/kutjevo/interior/construction) -"nRd" = ( -/obj/item/tool/wrench, -/obj/item/prop/alien/hugger, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/Northwest_Colony) +"nQI" = ( +/obj/structure/platform/metal/kutjevo_smooth/north, +/obj/structure/platform/metal/kutjevo_smooth/east, +/turf/open/gm/river/desert/deep/covered, +/area/kutjevo/exterior/scrubland) "nRk" = ( /obj/structure/machinery/computer/card{ dir = 4 @@ -9507,12 +9016,6 @@ }, /turf/open/floor/kutjevo/colors/red, /area/kutjevo/interior/complex/med) -"nRE" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/turf/open/floor/kutjevo/colors/cyan, -/area/kutjevo/interior/complex/med/cells) "nRY" = ( /obj/structure/machinery/power/port_gen/pacman, /turf/open/floor/almayer/research/containment/floor2, @@ -9535,6 +9038,10 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/closed/wall/kutjevo/colony/reinforced, /area/kutjevo/interior/complex/botany/east_tech) +"nVD" = ( +/obj/structure/platform_decoration/stone/kutjevo/east, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/stonyfields) "nVF" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/kutjevo/tan, @@ -9543,15 +9050,6 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/kutjevo/multi_tiles/southwest, /area/kutjevo/interior/colony_South/power2) -"nWo" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/turf/open/desert/desert_shore/desert_shore1/east, -/area/kutjevo/exterior/scrubland) "nWu" = ( /obj/structure/barricade/wooden{ dir = 4 @@ -9562,6 +9060,14 @@ /obj/effect/decal/cleanable/blood, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/Northwest_Colony) +"nWN" = ( +/obj/structure/stairs/perspective/kutjevo{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform_decoration/metal/kutjevo, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/exterior/runoff_dunes) "nXr" = ( /turf/open/gm/river/desert/deep/covered, /area/kutjevo/interior/construction) @@ -9590,6 +9096,14 @@ /obj/structure/flora/grass/desert/lightgrass_8, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/lz_dunes) +"nZp" = ( +/obj/structure/platform/metal/kutjevo/east, +/obj/structure/stairs/perspective/kutjevo{ + dir = 4; + icon_state = "p_stair_sn_full_cap" + }, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/exterior/complex_border/med_rec) "nZv" = ( /obj/structure/machinery/light{ dir = 8 @@ -9634,17 +9148,6 @@ /obj/item/device/flashlight/lamp, /turf/open/floor/kutjevo/colors/orange/edge/north, /area/kutjevo/interior/complex/Northwest_Security_Checkpoint) -"ocd" = ( -/obj/structure/stairs/perspective/kutjevo{ - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform/kutjevo/smooth, -/obj/structure/barricade/handrail/kutjevo{ - layer = 3.1 - }, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/interior/colony_South/power2) "oce" = ( /turf/open/gm/river/desert/shallow_edge/north, /area/kutjevo/exterior/runoff_river) @@ -9661,6 +9164,15 @@ "oeE" = ( /turf/open/mars_cave/mars_cave_11, /area/kutjevo/exterior/scrubland) +"oeU" = ( +/obj/structure/stairs/perspective/kutjevo{ + dir = 8; + icon_state = "p_stair_sn_full_cap"; + pixel_y = 16 + }, +/obj/structure/platform/metal/kutjevo_smooth/east, +/turf/open/floor/kutjevo/multi_tiles/southeast, +/area/kutjevo/interior/power) "ofn" = ( /obj/structure/flora/grass/desert/lightgrass_6, /turf/open/auto_turf/sand/layer1, @@ -9680,6 +9192,10 @@ }, /turf/open/floor/almayer/research/containment/floor1, /area/kutjevo/interior/power) +"ofX" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/asphalt/cement_sunbleached, +/area/kutjevo/exterior/scrubland) "ogf" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/barricade/handrail/kutjevo{ @@ -9692,9 +9208,18 @@ "ogo" = ( /turf/open/floor/kutjevo/colors/cyan/edge/north, /area/kutjevo/interior/complex/med/operating) +"ogt" = ( +/obj/structure/surface/rack, +/obj/effect/landmark/objective_landmark/far, +/turf/open/floor/kutjevo/multi_tiles/north, +/area/kutjevo/interior/power/comms) "ogG" = ( /turf/open/floor/kutjevo/multi_tiles/west, /area/kutjevo/interior/complex/med/operating) +"ohG" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/interior/foremans_office) "oii" = ( /obj/structure/stairs/perspective/kutjevo{ dir = 1; @@ -9705,22 +9230,19 @@ "oiJ" = ( /turf/open/floor/kutjevo/tiles, /area/kutjevo/exterior/Northwest_Colony) +"oja" = ( +/obj/effect/decal/medical_decals{ + icon_state = "triagedecalbottomleft" + }, +/obj/structure/platform_decoration/metal/kutjevo/east, +/turf/open/floor/kutjevo/colors/cyan, +/area/kutjevo/interior/complex/med/cells) "ojH" = ( /obj/structure/machinery/light{ dir = 4 }, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/interior/power) -"okh" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ - dir = 1; - req_one_access = null - }, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/interior/foremans_office) "okv" = ( /turf/open/floor/almayer/research/containment/floor1, /area/kutjevo/interior/colony_South/power2) @@ -9771,15 +9293,30 @@ }, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/complex/botany) -"omA" = ( +"olR" = ( /obj/structure/stairs/perspective/kutjevo{ - icon_state = "p_stair_ew_full_cap_butt" + dir = 8; + icon_state = "p_stair_sn_full_cap" }, -/obj/structure/platform/stair_cut/alt{ - icon_state = "kutjevo_platform_sm_stair_alt" +/obj/structure/platform_decoration/metal/kutjevo, +/turf/open/floor/kutjevo/tan/multi_tiles, +/area/kutjevo/interior/colony_South/power2) +"olU" = ( +/obj/structure/platform/stone/kutjevo/north, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/scrubland) +"omR" = ( +/obj/structure/platform_decoration/stone/kutjevo/east, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/runoff_dunes) +"onb" = ( +/obj/structure/stairs/perspective/kutjevo{ + dir = 4; + icon_state = "p_stair_sn_full_cap" }, +/obj/structure/platform/metal/kutjevo_smooth/east, /turf/open/floor/plating/kutjevo, -/area/kutjevo/exterior/runoff_dunes) +/area/kutjevo/interior/complex/med/cells) "onk" = ( /obj/structure/barricade/wooden{ dir = 4 @@ -9800,6 +9337,10 @@ /obj/item/stack/sheet/metal/large_stack, /turf/open/floor/kutjevo/colors/orange/edge, /area/kutjevo/interior/complex/Northwest_Security_Checkpoint) +"ooW" = ( +/obj/structure/platform/metal/kutjevo_smooth/east, +/turf/open/floor/kutjevo/multi_tiles/southeast, +/area/kutjevo/interior/complex/botany) "opz" = ( /obj/structure/surface/table/almayer, /obj/item/device/tracker, @@ -9808,6 +9349,10 @@ "opQ" = ( /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/Northwest_Security_Checkpoint) +"oqb" = ( +/obj/structure/flora/grass/tallgrass/desert/corner, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/scrubland/south) "oqd" = ( /obj/effect/landmark/objective_landmark/science, /turf/open/floor/kutjevo/colors, @@ -9825,6 +9370,10 @@ }, /turf/open/auto_turf/sand/layer2, /area/kutjevo/exterior/lz_dunes) +"orf" = ( +/obj/structure/platform_decoration/stone/kutjevo/west, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/scrubland) "oru" = ( /obj/structure/stairs/perspective/kutjevo{ dir = 1; @@ -9847,13 +9396,6 @@ /obj/structure/blocker/invisible_wall, /turf/open/auto_turf/sand/layer2, /area/kutjevo/interior/oob/dev_room) -"otc" = ( -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/obj/structure/machinery/colony_floodlight, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/interior/complex/med) "oum" = ( /obj/item/storage/toolbox/antag, /turf/open/floor/kutjevo/multi_tiles, @@ -9862,6 +9404,10 @@ /obj/structure/barricade/wooden, /turf/open/floor/almayer/research/containment/floor2, /area/kutjevo/exterior/lz_pad) +"oup" = ( +/obj/structure/platform_decoration/stone/kutjevo/north, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/interior/colony_South) "ouR" = ( /obj/structure/blocker/invisible_wall, /obj/structure/xenoautopsy/tank/larva, @@ -9873,11 +9419,6 @@ /obj/item/stack/sheet/metal/medium_stack, /turf/open/floor/kutjevo/grey/plate, /area/kutjevo/interior/construction) -"ovm" = ( -/obj/structure/platform/kutjevo, -/obj/structure/blocker/invisible_wall, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/exterior/runoff_dunes) "ovv" = ( /obj/structure/blocker/invisible_wall, /obj/structure/machinery/light{ @@ -9904,6 +9445,10 @@ /obj/item/device/flashlight, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/complex_border/med_rec) +"owt" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, +/turf/open/floor/kutjevo/tan/multi_tiles, +/area/kutjevo/interior/colony_South/power2) "oww" = ( /obj/structure/window/framed/kutjevo, /turf/open/floor/plating/kutjevo, @@ -9916,27 +9461,21 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/kutjevo/tan/alt_edge/north, /area/kutjevo/interior/complex/Northwest_Flight_Control) +"owK" = ( +/obj/structure/platform/metal/kutjevo_smooth, +/turf/open/desert/desert_shore/desert_shore1/west, +/area/kutjevo/exterior/runoff_river) "oxT" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_S_East) -"ozl" = ( -/obj/structure/platform/kutjevo, -/turf/open/gm/river/desert/shallow_edge/southwest, -/area/kutjevo/exterior/lz_river) "ozq" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/rack, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/kutjevo/multi_tiles/north, /area/kutjevo/interior/power/comms) -"ozs" = ( -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/turf/open/floor/kutjevo/colors, -/area/kutjevo/interior/power/comms) "ozB" = ( /obj/item/ammo_magazine/rifle/m16, /turf/open/floor/kutjevo/colors/green, @@ -9960,6 +9499,10 @@ }, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/colony_South/power2) +"oCO" = ( +/obj/structure/platform/stone/kutjevo/east, +/turf/open/auto_turf/sand/layer2, +/area/kutjevo/exterior/runoff_river) "oDe" = ( /obj/structure/closet/emcloset, /obj/structure/machinery/light{ @@ -9976,6 +9519,15 @@ /obj/structure/machinery/constructable_frame, /turf/open/floor/kutjevo/colors/green, /area/kutjevo/interior/complex/botany) +"oEQ" = ( +/obj/structure/platform/metal/kutjevo_smooth, +/obj/structure/stairs/perspective/kutjevo{ + dir = 4; + icon_state = "p_stair_full" + }, +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/interior/power) "oET" = ( /obj/structure/barricade/wooden{ dir = 4 @@ -9996,25 +9548,6 @@ /obj/structure/machinery/computer/cameras, /turf/open/floor/kutjevo/colors/orange/edge/north, /area/kutjevo/interior/complex/Northwest_Security_Checkpoint) -"oGw" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/machinery/light, -/turf/open/gm/river/desert/deep/covered, -/area/kutjevo/interior/colony_South/power2) -"oGC" = ( -/obj/structure/platform/kutjevo/smooth, -/turf/open/desert/desert_shore/desert_shore1/west, -/area/kutjevo/exterior/runoff_river) -"oIb" = ( -/obj/structure/stairs/perspective/kutjevo{ - dir = 4; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/interior/complex/med/cells) "oIq" = ( /obj/effect/spawner/random/tool, /turf/open/floor/plating/kutjevo, @@ -10036,15 +9569,33 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/botany/east_tech) +"oJv" = ( +/obj/structure/stairs/perspective/kutjevo{ + dir = 5; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/kutjevo_smooth, +/turf/open/floor/kutjevo/multi_tiles, +/area/kutjevo/interior/power) "oJE" = ( /turf/open/floor/kutjevo/tan/alt_edge, /area/kutjevo/exterior/lz_pad) +"oJQ" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/floor/kutjevo/tan, +/area/kutjevo/interior/colony_north) "oJV" = ( /obj/structure/machinery/light{ dir = 1 }, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/scrubland) +"oKn" = ( +/obj/structure/platform/metal/kutjevo_smooth/east, +/obj/structure/platform/metal/kutjevo_smooth, +/obj/structure/blocker/invisible_wall, +/turf/open/gm/river/desert/deep/toxic, +/area/kutjevo/interior/oob) "oKx" = ( /turf/closed/wall/kutjevo/rock, /area/kutjevo/exterior/lz_pad) @@ -10052,6 +9603,11 @@ /obj/item/storage/toolbox/electrical, /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/power) +"oKX" = ( +/obj/structure/platform/stone/kutjevo/west, +/obj/structure/blocker/invisible_wall, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/interior/oob/dev_room) "oLs" = ( /obj/effect/landmark/hunter_primary, /turf/open/auto_turf/sand/layer0, @@ -10079,6 +9635,11 @@ "oMZ" = ( /turf/closed/wall/kutjevo/colony, /area/kutjevo/interior/foremans_office) +"oNe" = ( +/obj/structure/monorail, +/obj/structure/platform/metal/kutjevo_smooth/east, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/interior/colony_central/mine_elevator) "oNE" = ( /obj/structure/flora/grass/tallgrass/desert, /turf/open/auto_turf/sand/layer0, @@ -10111,10 +9672,6 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_N_East) -"oOO" = ( -/obj/structure/platform/kutjevo, -/turf/open/gm/river/desert/shallow_corner/west, -/area/kutjevo/exterior/lz_river) "oPb" = ( /obj/structure/blocker/invisible_wall, /turf/open/floor/plating/kutjevo, @@ -10146,22 +9703,9 @@ }, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/complex/med/operating) -"oRw" = ( -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 4 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/scrubland) "oRE" = ( /turf/open/floor/kutjevo/tan/grey_edge/west, /area/kutjevo/interior/complex/med/auto_doc) -"oRM" = ( -/obj/structure/machinery/cm_vending/sorted/tech/comp_storage, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/turf/open/floor/kutjevo/multi_tiles/southeast, -/area/kutjevo/interior/colony_South/power2) "oRZ" = ( /obj/structure/machinery/autodoc_console, /obj/structure/machinery/light, @@ -10177,6 +9721,13 @@ }, /turf/open/floor/kutjevo/tiles, /area/kutjevo/exterior/Northwest_Colony) +"oSQ" = ( +/turf/open/floor/kutjevo/colors/orange, +/area/kutjevo/exterior/scrubland/south) +"oSU" = ( +/obj/structure/platform/metal/kutjevo, +/turf/open/gm/river/desert/deep, +/area/kutjevo/exterior/lz_river) "oTF" = ( /obj/structure/sign/prop3, /turf/closed/wall/kutjevo/colony/reinforced/hull, @@ -10192,6 +9743,10 @@ "oUP" = ( /turf/closed/wall/kutjevo/colony, /area/kutjevo/interior/construction) +"oVt" = ( +/obj/structure/platform/metal/kutjevo_smooth/west, +/turf/open/floor/kutjevo/colors/cyan/inner_corner/east, +/area/kutjevo/interior/complex/med/operating) "oVO" = ( /obj/structure/machinery/light{ dir = 8 @@ -10205,12 +9760,11 @@ "oVX" = ( /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/med) -"oWo" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/turf/open/floor/kutjevo/colors/cyan/inner_corner/east, -/area/kutjevo/interior/complex/med/operating) +"oWU" = ( +/obj/structure/platform/metal/kutjevo/west, +/obj/structure/platform/metal/kutjevo, +/turf/open/gm/river/desert/deep, +/area/kutjevo/interior/complex/botany/east_tech) "oXb" = ( /obj/structure/stairs/perspective/kutjevo{ dir = 8; @@ -10218,10 +9772,23 @@ }, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/complex_border/med_rec) +"oXv" = ( +/obj/structure/platform/metal/kutjevo_smooth/east, +/obj/structure/largecrate/random/case/double, +/turf/open/floor/kutjevo/multi_tiles/southwest, +/area/kutjevo/interior/colony_South/power2) "oXH" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_South) +"oYs" = ( +/obj/structure/platform_decoration/stone/kutjevo/north, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/interior/colony_N_East) +"oYz" = ( +/obj/structure/platform/stone/kutjevo, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/interior/colony_N_East) "oYQ" = ( /obj/structure/blocker/invisible_wall, /obj/structure/surface/table/reinforced/prison, @@ -10229,12 +9796,6 @@ /obj/item/device/flashlight/lamp, /turf/open/floor/carpet, /area/kutjevo/interior/oob) -"oZD" = ( -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/turf/open/floor/kutjevo/tan, -/area/kutjevo/interior/colony_north) "oZE" = ( /obj/structure/stairs/perspective/kutjevo{ dir = 1; @@ -10249,6 +9810,14 @@ }, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/runoff_river) +"paf" = ( +/obj/structure/platform/metal/kutjevo_smooth/west, +/turf/closed/wall/kutjevo/colony, +/area/kutjevo/interior/complex/botany) +"pbk" = ( +/obj/structure/platform_decoration/stone/kutjevo/west, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/interior/colony_South) "pbP" = ( /obj/structure/machinery/light, /turf/open/floor/kutjevo/tan/alt_inner_edge/west, @@ -10259,6 +9828,11 @@ "pbY" = ( /turf/closed/wall/kutjevo/colony/reinforced/hull, /area/kutjevo/interior/complex/med) +"pcd" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, +/obj/structure/blocker/invisible_wall, +/turf/open/gm/river/desert/deep/toxic, +/area/kutjevo/interior/power) "pci" = ( /turf/open/floor/kutjevo/plate, /area/kutjevo/exterior/telecomm/lz2_south) @@ -10271,14 +9845,6 @@ }, /turf/open/floor/kutjevo/grey/plate, /area/kutjevo/interior/complex/botany/east_tech) -"peQ" = ( -/obj/structure/flora/bush/ausbushes/reedbush{ - pixel_x = -5; - pixel_y = 6 - }, -/obj/structure/platform_decoration/kutjevo, -/turf/open/desert/desert_shore/desert_shore1/north, -/area/kutjevo/exterior/runoff_river) "pfe" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/kutjevo/tan, @@ -10295,15 +9861,14 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/colony_north) +"pfw" = ( +/obj/structure/flora/bush/ausbushes/reedbush, +/obj/structure/platform_decoration/metal/kutjevo/north, +/turf/open/gm/river/desert/shallow_edge/west, +/area/kutjevo/exterior/runoff_river) "pfz" = ( /turf/open/floor/kutjevo/tiles, /area/kutjevo/exterior/complex_border/med_rec) -"pfC" = ( -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/turf/open/floor/coagulation/icon0_5, -/area/kutjevo/interior/construction) "pfK" = ( /obj/structure/barricade/wooden{ dir = 1; @@ -10311,12 +9876,6 @@ }, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/spring) -"pfR" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 4 - }, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/stonyfields) "pgl" = ( /obj/item/device/analyzer/plant_analyzer, /turf/open/floor/kutjevo/tan, @@ -10347,6 +9906,11 @@ }, /turf/open/floor/kutjevo/multi_tiles/north, /area/kutjevo/exterior/runoff_bridge) +"phX" = ( +/obj/structure/platform/metal/kutjevo_smooth, +/obj/structure/blocker/invisible_wall, +/turf/open/gm/river/desert/deep/toxic, +/area/kutjevo/interior/oob) "pih" = ( /obj/structure/window/framed/kutjevo, /turf/open/floor/kutjevo/multi_tiles, @@ -10354,10 +9918,6 @@ "pio" = ( /turf/open/floor/kutjevo/tan/alt_inner_edge/west, /area/kutjevo/interior/complex/Northwest_Flight_Control) -"piq" = ( -/obj/structure/platform/kutjevo/rock, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/lz_dunes) "piA" = ( /obj/structure/largecrate/random/secure, /turf/open/auto_turf/sand/layer0, @@ -10380,13 +9940,6 @@ /obj/structure/flora/bush/ausbushes/reedbush, /turf/open/gm/river/desert/shallow_edge/east, /area/kutjevo/exterior/lz_river) -"pkg" = ( -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/obj/structure/platform/kutjevo, -/turf/open/floor/coagulation/icon8_0, -/area/kutjevo/interior/construction) "pks" = ( /obj/structure/blocker/invisible_wall, /turf/open/floor/coagulation/icon8_6, @@ -10404,6 +9957,12 @@ "plf" = ( /turf/open/floor/almayer/research/containment/floor2, /area/kutjevo/exterior/runoff_bridge) +"plM" = ( +/obj/structure/flora/grass/tallgrass/desert/corner{ + dir = 1 + }, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/scrubland/south) "plQ" = ( /turf/open/floor/kutjevo/multi_tiles/southeast, /area/kutjevo/interior/complex/botany/east) @@ -10430,6 +9989,18 @@ }, /turf/open/gm/river/desert/shallow_edge/southeast, /area/kutjevo/exterior/spring) +"pmE" = ( +/obj/structure/stairs/perspective/kutjevo{ + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/kutjevo, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/complex_border/med_rec) +"pmP" = ( +/obj/structure/platform_decoration/stone/kutjevo/west, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/stonyfields) "pmR" = ( /obj/structure/largecrate/supply/supplies/flares, /turf/open/auto_turf/sand/layer1, @@ -10444,24 +10015,14 @@ /obj/item/storage/belt/shotgun, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/interior/power) -"pof" = ( -/obj/structure/platform/kutjevo, -/turf/open/floor/kutjevo/tan, -/area/kutjevo/interior/colony_central) -"pom" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 1 - }, -/obj/structure/platform/kutjevo/rock{ - dir = 8 - }, -/obj/structure/platform/kutjevo/rock, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/interior/colony_N_East) "poF" = ( /obj/structure/blocker/invisible_wall, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/colony_South/power2) +"poJ" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/floor/kutjevo/multi_tiles/southwest, +/area/kutjevo/interior/colony_South/power2) "poZ" = ( /obj/item/stool{ pixel_y = 8 @@ -10485,26 +10046,28 @@ "pqs" = ( /turf/open/mars_cave/mars_cave_23, /area/kutjevo/exterior/scrubland) -"prv" = ( -/obj/structure/blocker/invisible_wall, -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/obj/structure/platform/kutjevo{ - dir = 4 +"prd" = ( +/obj/structure/platform_decoration/stone/kutjevo/north, +/obj/structure/platform_decoration/stone/kutjevo/east, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/interior/colony_central) +"pre" = ( +/obj/structure/flora/bush/ausbushes/reedbush{ + pixel_y = 14 }, -/turf/open/gm/river/desert/deep/toxic, -/area/kutjevo/interior/power) +/turf/open/desert/desert_shore/desert_shore1, +/area/kutjevo/exterior/scrubland/south) +"prD" = ( +/obj/structure/platform_decoration/stone/kutjevo, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/scrubland) "prJ" = ( /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/lz_dunes) -"prU" = ( -/obj/structure/bed/chair, -/obj/structure/platform/kutjevo{ - dir = 1 - }, +"prQ" = ( +/obj/structure/platform/stone/kutjevo/north, /turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/runoff_dunes) +/area/kutjevo/exterior/scrubland) "psu" = ( /obj/structure/filingcabinet, /obj/effect/landmark/objective_landmark/close, @@ -10526,22 +10089,23 @@ }, /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/Northwest_Flight_Control) +"ptF" = ( +/obj/structure/bed/sofa/vert/grey/bot{ + pixel_y = 4 + }, +/obj/structure/barricade/handrail/strata{ + dir = 4 + }, +/obj/structure/barricade/handrail/strata, +/obj/structure/platform_decoration/metal/kutjevo, +/turf/open/floor/mech_bay_recharge_floor, +/area/kutjevo/interior/colony_central/mine_elevator) "ptH" = ( /obj/structure/machinery/landinglight/ds1/delayone{ dir = 4 }, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/exterior/lz_dunes) -"ptR" = ( -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 8 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/interior/colony_South) -"ptS" = ( -/obj/structure/platform/kutjevo/rock, -/turf/open/auto_turf/sand/layer2, -/area/kutjevo/exterior/scrubland) "ptY" = ( /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/colony_S_East) @@ -10551,12 +10115,6 @@ }, /turf/open/floor/kutjevo/colors/red/tile, /area/kutjevo/interior/complex/med/operating) -"pvk" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/scrubland) "pvL" = ( /obj/structure/barricade/wooden{ desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it..."; @@ -10575,19 +10133,12 @@ "pxb" = ( /turf/open/floor/kutjevo/colors/orange/edge/southeast, /area/kutjevo/interior/power_pt2_electric_boogaloo) -"pxB" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 1 - }, -/obj/structure/platform/kutjevo/rock{ - dir = 8 - }, -/obj/structure/platform/kutjevo/rock{ - dir = 4 - }, -/obj/structure/platform/kutjevo/rock, -/turf/open/gm/river/desert/deep, -/area/kutjevo/interior/colony_South) +"pxl" = ( +/obj/structure/platform/stone/kutjevo, +/obj/structure/platform/stone/kutjevo/east, +/obj/structure/platform/stone/kutjevo/west, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/interior/colony_north) "pyp" = ( /turf/closed/wall/kutjevo/colony/reinforced, /area/kutjevo/interior/power) @@ -10623,22 +10174,24 @@ /obj/structure/bed/chair, /turf/open/floor/kutjevo/plate, /area/kutjevo/interior/colony_central) -"pAu" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/turf/open/desert/desert_shore/desert_shore1/west, -/area/kutjevo/exterior/runoff_river) -"pBi" = ( -/obj/structure/platform/kutjevo, +"pAz" = ( +/obj/structure/platform/metal/kutjevo/west, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/complex_border/med_rec) +"pAG" = ( +/obj/structure/platform/stone/kutjevo/north, /turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/scrubland) +/area/kutjevo/exterior/stonyfields) "pBJ" = ( /obj/structure/cable/heavyduty{ icon_state = "1-4" }, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/colony_central) +"pBN" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, +/turf/open/floor/kutjevo/multi_tiles, +/area/kutjevo/interior/power) "pBV" = ( /obj/structure/window/framed/kutjevo, /turf/open/floor/plating/kutjevo, @@ -10651,6 +10204,17 @@ /obj/structure/machinery/vending/snack, /turf/open/floor/kutjevo/colors/purple/inner_corner/north, /area/kutjevo/interior/construction) +"pCP" = ( +/obj/structure/stairs/perspective/kutjevo{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/kutjevo_smooth, +/obj/structure/barricade/handrail/kutjevo{ + layer = 3.05 + }, +/turf/open/floor/kutjevo/tan/multi_tiles, +/area/kutjevo/interior/colony_South/power2) "pCS" = ( /turf/open/asphalt/cement_sunbleached, /area/kutjevo/exterior/scrubland) @@ -10678,40 +10242,15 @@ "pEg" = ( /turf/open/mars_cave/mars_cave_5, /area/kutjevo/exterior/scrubland) -"pEt" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/interior/colony_central) "pEJ" = ( /obj/structure/flora/bush/desert{ icon_state = "tree_3" }, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/scrubland) -"pFZ" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/turf/open/asphalt/cement_sunbleached, -/area/kutjevo/interior/power) "pGc" = ( /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/interior/colony_central/mine_elevator) -"pGv" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/sign/safety/medical{ - pixel_x = 32 - }, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - id = "kutjevo_medlock_pan"; - name = "\improper Medical North Shutters" - }, -/turf/open/floor/almayer/research/containment/floor2, -/area/kutjevo/interior/complex/med/auto_doc) "pGO" = ( /obj/item/storage/briefcase, /turf/open/floor/kutjevo/colors/cyan/inner_corner/north, @@ -10736,21 +10275,6 @@ /obj/structure/machinery/light, /turf/open/floor/kutjevo/grey/plate, /area/kutjevo/interior/complex/Northwest_Dorms) -"pId" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/obj/structure/blocker/invisible_wall, -/obj/structure/platform/kutjevo, -/obj/structure/filtration/machine_32x64/indestructible{ - bound_height = 32; - icon_state = "solo_tank_empty" - }, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/interior/colony_north) "pIE" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_30"; @@ -10762,12 +10286,20 @@ /obj/item/prop/helmetgarb/spent_buckshot, /turf/open/floor/kutjevo/tan/multi_tiles/north, /area/kutjevo/exterior/runoff_bridge) +"pIU" = ( +/obj/structure/platform/metal/kutjevo, +/turf/open/gm/river/desert/deep, +/area/kutjevo/interior/complex/botany/east_tech) "pJa" = ( /obj/structure/machinery/light{ dir = 1 }, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/complex/botany) +"pJe" = ( +/obj/structure/platform/metal/kutjevo/west, +/turf/open/desert/desert_shore/desert_shore1/north, +/area/kutjevo/exterior/runoff_river) "pJt" = ( /obj/structure/machinery/light{ dir = 8 @@ -10806,6 +10338,10 @@ /obj/item/clothing/suit/armor/vest/security, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/complex_border/botany_medical_cave) +"pLI" = ( +/obj/structure/platform_decoration/stone/kutjevo, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/interior/colony_central) "pLN" = ( /obj/structure/surface/table/almayer, /turf/open/floor/kutjevo/tan/alt_inner_edge/north, @@ -10825,28 +10361,14 @@ /obj/structure/window_frame/kutjevo, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/complex/botany) -"pNM" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/filingcabinet{ - pixel_x = 8; - pixel_y = 5 - }, -/obj/structure/filingcabinet{ - pixel_x = -8; - pixel_y = 5 - }, -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor/kutjevo/colors/orange, -/area/kutjevo/interior/complex/med/locks) "pNW" = ( /obj/structure/flora/grass/desert/lightgrass_2, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/stonyfields) +"pOc" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/runoff_river) "pOi" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ req_one_access = null @@ -10871,24 +10393,13 @@ "pPJ" = ( /turf/open/gm/river/desert/shallow, /area/kutjevo/exterior/lz_dunes) -"pQN" = ( -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 4 - }, -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 1 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/interior/colony_north) -"pRb" = ( -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 1 - }, -/obj/structure/platform_decoration/kutjevo/rock{ +"pQE" = ( +/obj/structure/platform/metal/kutjevo_smooth, +/obj/structure/machinery/light{ dir = 4 }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/interior/colony_central) +/turf/open/floor/kutjevo/multi_tiles/southeast, +/area/kutjevo/interior/power) "pRI" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; @@ -10904,15 +10415,18 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/kutjevo/multi_tiles/north, /area/kutjevo/interior/colony_South/power2) +"pSi" = ( +/obj/structure/platform/metal/kutjevo/north, +/obj/structure/flora/bush/ausbushes/grassybush{ + pixel_x = 5; + pixel_y = -12 + }, +/obj/structure/platform/metal/kutjevo/east, +/turf/open/desert/desert_shore/desert_shore1/west, +/area/kutjevo/exterior/lz_river) "pSs" = ( /turf/open/floor/kutjevo/colors/red, /area/kutjevo/interior/complex/botany) -"pSz" = ( -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 4 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/runoff_dunes) "pSK" = ( /obj/structure/window/framed/kutjevo, /turf/open/floor/plating/kutjevo, @@ -10924,12 +10438,6 @@ }, /turf/open/floor/almayer/research/containment/floor2, /area/kutjevo/interior/complex/med) -"pTI" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 1 - }, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/stonyfields) "pUB" = ( /obj/structure/barricade/wooden{ dir = 1; @@ -10937,16 +10445,16 @@ }, /turf/open/floor/almayer/research/containment/floor2, /area/kutjevo/exterior/lz_pad) -"pVd" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/runoff_dunes) "pVi" = ( /obj/effect/landmark/xeno_spawn, /turf/open/auto_turf/sand/layer2, /area/kutjevo/interior/colony_N_East) +"pVq" = ( +/obj/structure/flora/bush/desert{ + icon_state = "tree_4" + }, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/scrubland/south) "pVt" = ( /obj/structure/bed/roller, /obj/structure/machinery/light{ @@ -10958,12 +10466,6 @@ /obj/structure/tunnel, /turf/open/auto_turf/sand/layer2, /area/kutjevo/exterior/runoff_river) -"pWe" = ( -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 1 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/scrubland) "pWg" = ( /obj/structure/largecrate/random, /turf/open/floor/kutjevo/colors/red/tile, @@ -10983,11 +10485,14 @@ }, /turf/open/gm/grass/grass1/weedable, /area/kutjevo/exterior/complex_border/med_park) -"pZx" = ( -/obj/structure/platform_decoration/kutjevo, -/obj/structure/window/framed/kutjevo/reinforced, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/interior/complex/botany) +"pYX" = ( +/obj/structure/machinery/disposal, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/platform/metal/kutjevo_smooth, +/turf/open/floor/kutjevo/grey/plate, +/area/kutjevo/interior/complex/med/operating) "pZJ" = ( /obj/structure/flora/grass/tallgrass/desert/corner{ dir = 6 @@ -11008,6 +10513,10 @@ /obj/structure/blocker/invisible_wall, /turf/open/desert/desert_shore/shore_corner2/north, /area/kutjevo/interior/oob/dev_room) +"qcf" = ( +/obj/structure/platform/metal/kutjevo/west, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/interior/foremans_office) "qcE" = ( /obj/structure/barricade/wooden{ dir = 1; @@ -11027,6 +10536,12 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/kutjevo/colors/orange/edge/north, /area/kutjevo/interior/complex/Northwest_Security_Checkpoint) +"qfT" = ( +/obj/structure/platform/metal/kutjevo_smooth/north, +/obj/structure/platform/metal/kutjevo_smooth/west, +/obj/structure/blocker/invisible_wall, +/turf/open/gm/river/desert/deep/toxic, +/area/kutjevo/interior/oob) "qgr" = ( /obj/item/ammo_magazine/rifle/m16, /turf/open/floor/kutjevo/colors, @@ -11063,29 +10578,36 @@ /obj/structure/blocker/invisible_wall, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/oob) -"qid" = ( -/obj/structure/bed/sofa/vert/grey/bot{ - pixel_y = 4 - }, -/obj/structure/barricade/handrail/strata{ - dir = 8 - }, -/obj/structure/barricade/handrail/strata, -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/turf/open/floor/mech_bay_recharge_floor, -/area/kutjevo/interior/power) "qjz" = ( /obj/structure/flora/grass/tallgrass/desert/corner, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/runoff_dunes) +"qjS" = ( +/obj/structure/platform/metal/kutjevo_smooth/east, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "kutjevo_medlock_pan"; + name = "\improper Medical North Shutters" + }, +/turf/open/floor/almayer/research/containment/floor2, +/area/kutjevo/interior/complex/med/auto_doc) +"qka" = ( +/obj/structure/platform/stone/kutjevo/north, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/stonyfields) "qkj" = ( /obj/structure/bed/chair{ dir = 1 }, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_central) +"qkP" = ( +/obj/structure/platform/metal/kutjevo/east, +/obj/structure/stairs/perspective/kutjevo{ + dir = 4; + icon_state = "p_stair_sn_full_cap" + }, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/interior/construction) "qmR" = ( /turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/interior/colony_South) @@ -11101,15 +10623,23 @@ "qnU" = ( /turf/open/floor/kutjevo/tan, /area/kutjevo/exterior/lz_dunes) -"qog" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/gm/river/desert/shallow, -/area/kutjevo/exterior/runoff_river) "qoL" = ( /turf/closed/wall/kutjevo/colony/reinforced/hull, /area/kutjevo/interior/construction) +"qoQ" = ( +/obj/structure/stairs/perspective/kutjevo{ + icon_state = "p_stair_ew_full_cap_butt" + }, +/obj/structure/platform/metal/stair_cut/kutjevo_smooth_right, +/turf/open/floor/kutjevo/colors/green, +/area/kutjevo/interior/complex/botany) +"qpg" = ( +/obj/structure/platform/metal/kutjevo_smooth/west, +/obj/structure/machinery/optable, +/obj/effect/decal/cleanable/blood, +/obj/effect/landmark/corpsespawner/colonist/kutjevo/burst, +/turf/open/floor/kutjevo/colors/cyan/edge/west, +/area/kutjevo/interior/complex/med/operating) "qpi" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -11167,20 +10697,6 @@ }, /turf/open/floor/kutjevo/tan/grey_edge/north, /area/kutjevo/interior/complex/Northwest_Dorms) -"qrl" = ( -/obj/structure/stairs/perspective/kutjevo{ - dir = 10; - icon_state = "p_stair_full" - }, -/obj/structure/platform/stair_cut/alt{ - icon_state = "kutjevo_platform_sm_stair_alt" - }, -/obj/structure/machinery/light/small{ - dir = 1; - pixel_y = 20 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/runoff_bridge) "qru" = ( /turf/open/mars_cave/mars_cave_11, /area/kutjevo/exterior/lz_dunes) @@ -11208,6 +10724,16 @@ "quW" = ( /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/colony_central/mine_elevator) +"qve" = ( +/obj/structure/machinery/colony_floodlight, +/obj/structure/platform/metal/kutjevo/north, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/interior/complex/med/triage) +"qvF" = ( +/obj/structure/platform/metal/kutjevo/north, +/obj/structure/platform/metal/kutjevo/west, +/turf/open/gm/river/desert/deep, +/area/kutjevo/interior/complex/botany/east_tech) "qwg" = ( /obj/structure/blocker/invisible_wall, /turf/open/gm/river/desert/deep/toxic, @@ -11229,15 +10755,6 @@ }, /turf/open/floor/kutjevo/colors/green, /area/kutjevo/interior/complex/botany) -"qyD" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/filtration/machine_32x64/indestructible{ - bound_height = 32; - icon_state = "solo_tank_empty" - }, -/obj/structure/blocker/invisible_wall, -/turf/open/floor/kutjevo/multi_tiles/southwest, -/area/kutjevo/interior/colony_South/power2) "qyS" = ( /obj/structure/flora/grass/tallgrass/desert/corner{ dir = 9 @@ -11260,31 +10777,10 @@ "qzY" = ( /turf/open/desert/desert_shore/shore_edge1, /area/kutjevo/exterior/lz_river) -"qAk" = ( -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor/kutjevo/tan/multi_tiles/north, -/area/kutjevo/interior/power) "qAP" = ( /obj/structure/blocker/invisible_wall, /turf/open/gm/river/red_pool, /area/kutjevo/interior/oob) -"qBa" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/exterior/runoff_dunes) -"qBz" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/gm/river/desert/deep, -/area/kutjevo/interior/oob) "qBN" = ( /turf/open/floor/kutjevo/colors/cyan, /area/kutjevo/interior/complex/med/triage) @@ -11303,6 +10799,10 @@ }, /turf/open/floor/kutjevo/multi_tiles/southeast, /area/kutjevo/interior/colony_South/power2) +"qDt" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/floor/kutjevo/colors/cyan, +/area/kutjevo/interior/complex/med/auto_doc) "qDu" = ( /obj/item/trash/kepler, /turf/open/auto_turf/sand/layer0, @@ -11310,6 +10810,14 @@ "qDH" = ( /turf/open/floor/kutjevo/tan/alt_edge/east, /area/kutjevo/exterior/lz_pad) +"qDQ" = ( +/obj/structure/platform/metal/kutjevo_smooth/east, +/obj/structure/largecrate/random/barrel, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/kutjevo/multi_tiles/southwest, +/area/kutjevo/interior/colony_South/power2) "qEq" = ( /turf/open/floor/kutjevo/tan/alt_inner_edge/east, /area/kutjevo/interior/complex/Northwest_Flight_Control) @@ -11323,6 +10831,10 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/colony_S_East) +"qEG" = ( +/obj/structure/platform/metal/kutjevo/west, +/turf/open/floor/kutjevo/tan, +/area/kutjevo/interior/colony_north) "qFh" = ( /obj/structure/flora/grass/tallgrass/desert/corner{ dir = 4 @@ -11332,10 +10844,6 @@ "qFU" = ( /turf/open/desert/desert_shore/shore_corner2/west, /area/kutjevo/exterior/runoff_dunes) -"qGa" = ( -/obj/structure/platform_decoration/kutjevo, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/scrubland) "qGx" = ( /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/colony_South/power2) @@ -11369,28 +10877,19 @@ /obj/effect/spawner/random/tool, /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/construction) -"qIn" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 8 - }, -/turf/open/auto_turf/sand/layer2, -/area/kutjevo/exterior/scrubland) "qIN" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/toy/deck, /obj/item/device/flashlight/lamp, /turf/open/floor/kutjevo/multi_tiles/east, /area/kutjevo/interior/colony_South/power2) -"qIV" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/barricade/handrail/kutjevo{ - layer = 3.1 - }, -/turf/open/floor/kutjevo/colors/orange, -/area/kutjevo/interior/colony_South/power2) "qJx" = ( /turf/open/floor/kutjevo/colors/orange/edge/southwest, /area/kutjevo/interior/power_pt2_electric_boogaloo) +"qJZ" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/scrubland) "qKm" = ( /obj/structure/machinery/disposal, /obj/effect/decal/medical_decals{ @@ -11398,13 +10897,10 @@ }, /turf/open/floor/kutjevo/colors/cyan/tile, /area/kutjevo/interior/complex/med/operating) -"qLa" = ( -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/obj/structure/platform/kutjevo, -/turf/open/gm/river/desert/deep, -/area/kutjevo/interior/complex/botany/east_tech) +"qKn" = ( +/obj/structure/platform/metal/kutjevo/west, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/interior/colony_north) "qLV" = ( /obj/structure/tunnel, /turf/open/auto_turf/sand/layer0, @@ -11415,13 +10911,6 @@ }, /turf/open/floor/kutjevo/colors/green, /area/kutjevo/interior/complex/botany) -"qNo" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/platform/kutjevo/smooth, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/interior/power) "qOw" = ( /turf/open/gm/river/desert/shallow_edge/southeast, /area/kutjevo/exterior/runoff_river) @@ -11431,12 +10920,6 @@ }, /turf/open/floor/kutjevo/multi_tiles/north, /area/kutjevo/interior/complex/med/auto_doc) -"qOJ" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/turf/open/floor/almayer/research/containment/floor1, -/area/kutjevo/interior/complex/med/locks) "qOM" = ( /obj/effect/decal/cleanable/blood/gibs/limb, /turf/open/floor/kutjevo/colors/purple/edge/northeast, @@ -11479,12 +10962,6 @@ }, /turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/interior/complex/botany/east) -"qRR" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 4 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/lz_dunes) "qSy" = ( /obj/effect/decal/cleanable/blood/oil/streak, /turf/open/floor/kutjevo/colors/green, @@ -11495,12 +10972,6 @@ }, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/exterior/lz_pad) -"qTN" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/interior/power) "qUC" = ( /obj/structure/surface/rack, /turf/open/floor/kutjevo/colors/orange, @@ -11536,20 +11007,14 @@ /obj/structure/flora/bush/ausbushes/grassybush, /turf/open/gm/river/desert/shallow_edge/northwest, /area/kutjevo/exterior/runoff_river) -"qVZ" = ( -/obj/structure/filtration/machine_96x96{ - icon_state = "distribution" - }, -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/floor/kutjevo/multi_tiles, -/area/kutjevo/interior/power) "qXd" = ( /obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/kutjevo/colors/cyan, /area/kutjevo/interior/complex/med) +"qXB" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, +/turf/open/floor/kutjevo/tan, +/area/kutjevo/interior/colony_central) "qYn" = ( /obj/structure/stairs/perspective/kutjevo{ dir = 8; @@ -11557,16 +11022,25 @@ }, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/power_pt2_electric_boogaloo) +"qZo" = ( +/obj/structure/platform/metal/kutjevo/west, +/obj/structure/platform/metal/kutjevo, +/obj/structure/filtration/machine_96x96/indestructible{ + icon_state = "disinfection"; + layer = 3.5 + }, +/obj/structure/blocker/invisible_wall, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/exterior/complex_border/med_park) +"qZD" = ( +/obj/structure/platform/metal/kutjevo/west, +/obj/structure/platform/metal/kutjevo, +/turf/open/floor/coagulation/icon0_0, +/area/kutjevo/interior/construction) "qZO" = ( /obj/structure/flora/grass/desert/lightgrass_3, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/lz_dunes) -"raA" = ( -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/complex_border/med_rec) "raN" = ( /turf/closed/wall/kutjevo/colony/reinforced, /area/kutjevo/exterior/runoff_bridge) @@ -11588,6 +11062,11 @@ /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer/research/containment/floor2, /area/kutjevo/exterior/lz_pad) +"rdX" = ( +/obj/structure/blocker/invisible_wall, +/obj/structure/platform/metal/kutjevo/east, +/turf/open/gm/river/darkred, +/area/kutjevo/interior/oob) "rej" = ( /obj/structure/prop/dam/large_boulder/boulder1, /turf/open/auto_turf/sand/layer0, @@ -11603,20 +11082,10 @@ "rfH" = ( /turf/closed/wall/kutjevo/colony/reinforced, /area/kutjevo/interior/colony_N_East) -"rfZ" = ( -/obj/structure/platform/kutjevo/rock, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/scrubland) "rgv" = ( /obj/structure/machinery/power/port_gen/pacman, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/complex_border/med_rec) -"rgw" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/runoff_river) "rgQ" = ( /obj/structure/stairs/perspective/kutjevo{ dir = 8; @@ -11627,12 +11096,6 @@ "rhK" = ( /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/med/operating) -"rhZ" = ( -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/turf/open/desert/desert_shore/desert_shore1, -/area/kutjevo/exterior/runoff_river) "rid" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, /obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, @@ -11646,6 +11109,10 @@ /obj/structure/blocker/invisible_wall, /turf/open/floor/kutjevo/tiles, /area/kutjevo/interior/oob/dev_room) +"riH" = ( +/obj/structure/platform/metal/kutjevo, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/complex_border/med_rec) "riI" = ( /obj/structure/machinery/door_control/brbutton/alt{ health = null; @@ -11672,30 +11139,15 @@ /obj/item/stack/sheet/wood/small_stack, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/spring) -"rjS" = ( -/obj/structure/blocker/invisible_wall, -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/turf/open/gm/river/red, -/area/kutjevo/interior/oob) +"rkd" = ( +/obj/structure/platform/metal/kutjevo, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/interior/colony_central) "rkt" = ( /obj/structure/flora/grass/desert/lightgrass_9, /obj/structure/blocker/invisible_wall, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/oob/dev_room) -"rky" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/gm/river/desert/deep/covered, -/area/kutjevo/interior/colony_central) "rkO" = ( /obj/structure/reagent_dispensers/water_cooler, /obj/structure/machinery/light, @@ -11717,13 +11169,6 @@ /obj/structure/flora/grass/tallgrass/desert, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/lz_pad) -"rmo" = ( -/obj/structure/platform/kutjevo/rock, -/obj/structure/platform/kutjevo/rock{ - dir = 8 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/interior/colony_South) "rmt" = ( /turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/interior/colony_central) @@ -11741,6 +11186,13 @@ "rno" = ( /turf/open/mars_cave/mars_cave_10, /area/kutjevo/exterior/scrubland) +"rnt" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/obj/effect/decal/medical_decals{ + icon_state = "cryocell2deval" + }, +/turf/open/floor/kutjevo/tan, +/area/kutjevo/interior/complex/med/cells) "rnA" = ( /obj/effect/landmark/objective_landmark/close, /turf/open/gm/dirtgrassborder2/north, @@ -11752,15 +11204,10 @@ "rob" = ( /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/construction) -"roc" = ( -/obj/structure/stairs/perspective/kutjevo{ - icon_state = "p_stair_ew_full_cap_butt" - }, -/obj/structure/platform/stair_cut/alt{ - icon_state = "kutjevo_platform_sm_stair_alt" - }, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/exterior/scrubland) +"roO" = ( +/obj/structure/platform/metal/kutjevo, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/scrubland/south) "roS" = ( /turf/open/auto_turf/sand/layer2, /area/kutjevo/exterior/runoff_bridge) @@ -11770,6 +11217,12 @@ }, /turf/open/floor/kutjevo/colors/cyan, /area/kutjevo/interior/complex/med/auto_doc) +"rqA" = ( +/obj/item/fuel_cell, +/obj/structure/surface/rack, +/obj/structure/platform/metal/kutjevo_smooth/north, +/turf/open/floor/kutjevo/multi_tiles/west, +/area/kutjevo/interior/colony_South/power2) "rqD" = ( /obj/item/stack/rods, /obj/effect/decal/cleanable/blood/gibs/limb, @@ -11778,6 +11231,13 @@ }, /turf/open/floor/kutjevo/colors/purple, /area/kutjevo/interior/construction) +"rqL" = ( +/obj/structure/stairs/perspective/kutjevo{ + icon_state = "p_stair_ew_full_cap_butt" + }, +/obj/structure/platform/metal/stair_cut/kutjevo_smooth_right, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/interior/complex/med/cells) "rst" = ( /obj/structure/prop/dam/boulder/boulder1, /turf/open/auto_turf/sand/layer0, @@ -11786,26 +11246,33 @@ /obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/kutjevo/multi_tiles/east, /area/kutjevo/interior/colony_South/power2) -"rsV" = ( -/turf/open/desert/desert_shore/desert_shore1/west, -/area/kutjevo/exterior/scrubland) "rte" = ( /obj/structure/prop/dam/boulder/boulder2, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/stonyfields) -"ruM" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 +"rua" = ( +/obj/structure/stairs/perspective/kutjevo{ + dir = 8; + icon_state = "p_stair_ew_half_cap" }, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/scrubland) -"rvt" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/machinery/light{ - dir = 4 +/obj/structure/platform/metal/kutjevo_smooth/west, +/obj/structure/largecrate/supply/medicine/blood, +/obj/effect/landmark/objective_landmark/science, +/turf/open/floor/kutjevo/colors/cyan/tile, +/area/kutjevo/interior/complex/med/cells) +"ruz" = ( +/obj/structure/filtration/machine_96x96{ + icon_state = "distribution" }, -/turf/open/floor/kutjevo/multi_tiles/southeast, +/obj/structure/platform/metal/kutjevo/west, +/obj/structure/blocker/invisible_wall, +/turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/interior/power) +"ruP" = ( +/obj/structure/platform_decoration/stone/kutjevo/west, +/obj/structure/blocker/invisible_wall, +/turf/open/gm/river/desert/shallow_edge/north, +/area/kutjevo/interior/oob) "rvA" = ( /obj/structure/girder, /turf/open/floor/kutjevo/grey/plate, @@ -11820,6 +11287,12 @@ /obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/power/comms) +"rwg" = ( +/obj/structure/blocker/invisible_wall, +/obj/item/toy/inflatable_duck, +/obj/structure/platform/metal/kutjevo, +/turf/open/gm/river/desert/deep/toxic, +/area/kutjevo/interior/power) "rwj" = ( /obj/structure/window/framed/kutjevo/reinforced/hull, /turf/open/floor/plating/kutjevo, @@ -11863,32 +11336,20 @@ /obj/effect/landmark/monkey_spawn, /turf/open/floor/kutjevo/grey/plate, /area/kutjevo/interior/construction) -"rzb" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/gm/river/desert/deep/toxic, -/area/kutjevo/interior/oob) "rzc" = ( /turf/open/gm/river/desert/deep, /area/kutjevo/exterior/runoff_dunes) "rzh" = ( /turf/closed/wall/kutjevo/colony, /area/kutjevo/interior/oob) -"rzq" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 1 - }, -/obj/structure/platform/kutjevo/rock{ - dir = 4 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/interior/colony_South) "rzE" = ( /obj/structure/flora/bush/ausbushes/reedbush, /turf/open/gm/river/desert/shallow_edge, /area/kutjevo/exterior/runoff_river) +"rzP" = ( +/obj/structure/platform/stone/kutjevo/west, +/turf/open/auto_turf/sand/layer2, +/area/kutjevo/exterior/runoff_dunes) "rzT" = ( /obj/structure/bed{ can_buckle = 0; @@ -11908,25 +11369,6 @@ /obj/structure/prop/dam/boulder/boulder2, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/spring) -"rDO" = ( -/obj/effect/decal/medical_decals{ - icon_state = "triagedecalbottomright" - }, -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/turf/open/floor/kutjevo/colors/cyan, -/area/kutjevo/interior/complex/med/triage) -"rEo" = ( -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/obj/structure/stairs/perspective/kutjevo{ - dir = 4; - icon_state = "p_stair_sn_full_cap" - }, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/interior/construction) "rEs" = ( /turf/open/floor/plating/kutjevo/platingdmg1, /area/kutjevo/interior/complex/Northwest_Dorms) @@ -11951,6 +11393,11 @@ /obj/effect/landmark/monkey_spawn, /turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/interior/colony_central) +"rGh" = ( +/obj/structure/machinery/power/apc/no_power/north, +/obj/structure/platform/metal/kutjevo_smooth/north, +/turf/open/floor/kutjevo/colors/cyan/tile, +/area/kutjevo/interior/complex/med/cells) "rGm" = ( /obj/structure/machinery/space_heater, /turf/open/floor/kutjevo/colors/purple, @@ -11959,6 +11406,11 @@ /obj/structure/prop/dam/truck/cargo, /turf/open/asphalt/cement_sunbleached, /area/kutjevo/exterior/scrubland) +"rHt" = ( +/obj/structure/platform_decoration/metal/kutjevo, +/obj/structure/window/framed/kutjevo/reinforced, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/interior/complex/botany) "rHy" = ( /turf/open/desert/desert_shore/desert_shore1, /area/kutjevo/exterior/lz_dunes) @@ -11986,6 +11438,11 @@ /obj/item/storage/backpack/lightpack, /turf/open/floor/kutjevo/multi_tiles/southwest, /area/kutjevo/interior/colony_South/power2) +"rIq" = ( +/obj/structure/blocker/invisible_wall, +/obj/structure/platform/metal/kutjevo/north, +/turf/open/gm/river/desert/deep/toxic, +/area/kutjevo/interior/oob) "rID" = ( /obj/structure/machinery/shower{ dir = 1; @@ -11999,6 +11456,9 @@ "rIL" = ( /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/complex/botany/east_tech) +"rJl" = ( +/turf/open/desert/desert_shore/desert_shore1, +/area/kutjevo/exterior/scrubland/south) "rJU" = ( /turf/open/desert/desert_shore/shore_edge1/north, /area/kutjevo/exterior/runoff_dunes) @@ -12038,15 +11498,6 @@ }, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/exterior/lz_dunes) -"rMZ" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/turf/open/floor/kutjevo/tan, -/area/kutjevo/interior/colony_central) "rNg" = ( /turf/open/desert/desert_shore/shore_corner2/east, /area/kutjevo/exterior/runoff_river) @@ -12054,12 +11505,10 @@ /obj/item/ammo_magazine/revolver/cmb, /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/botany) -"rOd" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/scrubland) +"rOR" = ( +/obj/structure/platform/metal/kutjevo/east, +/turf/open/floor/coagulation/icon8_3, +/area/kutjevo/interior/colony_north) "rPq" = ( /obj/structure/machinery/landinglight/ds1/delayone, /turf/open/floor/kutjevo/multi_tiles, @@ -12087,12 +11536,6 @@ }, /turf/open/floor/kutjevo/multi_tiles/east, /area/kutjevo/interior/colony_South/power2) -"rRL" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/turf/open/floor/coagulation/icon7_8_2, -/area/kutjevo/interior/colony_north) "rSg" = ( /obj/item/device/flashlight/lamp/tripod/grey, /turf/open/floor/kutjevo/colors/green, @@ -12106,16 +11549,6 @@ "rSU" = ( /turf/open/floor/kutjevo/tan/alt_edge/west, /area/kutjevo/exterior/lz_pad) -"rTi" = ( -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 1 - }, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/scrubland) -"rTv" = ( -/obj/structure/platform_decoration/kutjevo/rock, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/interior/colony_central) "rTF" = ( /turf/open/floor/kutjevo/tan/grey_edge/southwest, /area/kutjevo/interior/construction) @@ -12143,6 +11576,14 @@ }, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/complex_border/botany_medical_cave) +"rUv" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/desert/desert_shore/shore_corner2, +/area/kutjevo/exterior/runoff_river) +"rUD" = ( +/obj/structure/platform/stone/kutjevo, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/scrubland) "rUE" = ( /obj/structure/barricade/wooden{ dir = 4; @@ -12166,31 +11607,46 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/kutjevo/colors/red, /area/kutjevo/interior/complex/botany) +"rVi" = ( +/obj/structure/platform/stone/kutjevo/north, +/obj/structure/blocker/invisible_wall, +/turf/open/gm/river/desert/deep, +/area/kutjevo/interior/oob) +"rVI" = ( +/obj/structure/platform/metal/kutjevo/east, +/turf/open/floor/kutjevo/tan, +/area/kutjevo/interior/colony_north) "rWK" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/kutjevo/colors, /area/kutjevo/interior/power/comms) +"rWP" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, +/turf/open/floor/kutjevo/colors/cyan, +/area/kutjevo/interior/complex/med/cells) "rWY" = ( /obj/structure/bed/chair{ dir = 4 }, /turf/open/floor/kutjevo/tan/alt_edge/southeast, /area/kutjevo/interior/complex/Northwest_Flight_Control) -"rXe" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 4 - }, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/runoff_dunes) "rXj" = ( /obj/structure/surface/table/almayer, /obj/item/storage/box/pizza, /turf/open/floor/kutjevo/colors/purple/inner_corner/north, /area/kutjevo/interior/construction) +"rXS" = ( +/obj/structure/platform/metal/kutjevo/west, +/obj/structure/machinery/colony_floodlight, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/interior/complex/med) "rYc" = ( /obj/item/toy/handcard/uno_reverse_yellow, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_central) +"rYn" = ( +/turf/open/desert/desert_shore/shore_edge1/north, +/area/kutjevo/exterior/scrubland/south) "rYs" = ( /obj/structure/blocker/invisible_wall, /turf/open/desert/desert_shore/desert_shore1/north, @@ -12202,20 +11658,13 @@ }, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/runoff_bridge) -"rYM" = ( -/obj/structure/platform/kutjevo, -/obj/structure/blocker/invisible_wall, -/turf/open/gm/river/desert/deep, -/area/kutjevo/interior/oob) "rYS" = ( /turf/closed/wall/kutjevo/colony/reinforced/hull, /area/kutjevo/interior/complex/botany) -"rZd" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 8 - }, +"rYV" = ( +/obj/structure/platform_decoration/metal/kutjevo, /turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/scrubland) +/area/kutjevo/exterior/lz_dunes) "rZV" = ( /obj/item/tool/wirecutters/clippers, /turf/open/floor/kutjevo/multi_tiles/west, @@ -12223,12 +11672,6 @@ "rZW" = ( /turf/open/floor/kutjevo/colors/orange/tile, /area/kutjevo/interior/complex/Northwest_Security_Checkpoint) -"sal" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/turf/open/floor/kutjevo/tan/alt_edge/west, -/area/kutjevo/interior/colony_central) "saK" = ( /obj/structure/machinery/landinglight/ds2/delaytwo, /turf/open/floor/kutjevo/multi_tiles, @@ -12243,17 +11686,14 @@ /obj/structure/machinery/light/small, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/construction) -"sbF" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/filtration/machine_32x64/indestructible{ - bound_height = 32; - icon_state = "solo_tank_empty" +"sbI" = ( +/obj/structure/platform/metal/kutjevo/east, +/obj/structure/flora/bush/ausbushes/grassybush{ + pixel_x = -10; + pixel_y = 10 }, -/obj/structure/blocker/invisible_wall, -/turf/open/floor/kutjevo/multi_tiles/southwest, -/area/kutjevo/interior/colony_South/power2) +/turf/open/gm/river/desert/shallow, +/area/kutjevo/exterior/runoff_river) "sbX" = ( /turf/open/auto_turf/sand/layer2, /area/kutjevo/exterior/runoff_river) @@ -12288,15 +11728,6 @@ "sef" = ( /turf/open/floor/kutjevo/colors/red/tile, /area/kutjevo/interior/complex/botany) -"sfz" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/turf/open/gm/river/desert/deep, -/area/kutjevo/interior/complex/botany/east_tech) "sgc" = ( /turf/open/floor/kutjevo/tan/alt_edge/southeast, /area/kutjevo/interior/complex/Northwest_Flight_Control) @@ -12360,20 +11791,6 @@ "slF" = ( /turf/open/floor/kutjevo/colors, /area/kutjevo/interior/complex/med/locks) -"slP" = ( -/obj/structure/stairs/perspective/kutjevo{ - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform/kutjevo/smooth, -/turf/open/floor/kutjevo/tan/multi_tiles, -/area/kutjevo/interior/colony_South/power2) -"smo" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/complex_border/med_rec) "smF" = ( /obj/item/clothing/mask/facehugger{ desc = "It has some sort of a tube at the end of its tail. What the hell is this thing?"; @@ -12391,6 +11808,10 @@ }, /turf/open/floor/kutjevo/colors, /area/kutjevo/interior/complex/med) +"snc" = ( +/obj/structure/platform_decoration/metal/kutjevo, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/runoff_river) "snd" = ( /obj/structure/prop/almayer/ship_memorial{ desc = "Kutjevo Refinery, a map by Triiodine. Special thanks to Tobinerd and all the playtesters that made this possible."; @@ -12406,6 +11827,10 @@ "snr" = ( /turf/open/floor/kutjevo/colors/cyan, /area/kutjevo/interior/complex/med) +"snz" = ( +/obj/structure/platform/metal/kutjevo/east, +/turf/open/floor/kutjevo/colors/purple/edge/east, +/area/kutjevo/interior/construction) "snP" = ( /obj/structure/flora/bush/ausbushes/grassybush{ pixel_x = 5; @@ -12419,26 +11844,17 @@ }, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/runoff_dunes) -"soF" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/scrubland) +"soy" = ( +/turf/open/desert/desert_shore/shore_edge1/west, +/area/kutjevo/exterior/scrubland/south) +"soz" = ( +/obj/structure/platform/metal/kutjevo/north, +/turf/open/floor/kutjevo/tan, +/area/kutjevo/interior/colony_central) "soL" = ( /obj/item/stack/sheet/wood/small_stack, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/spring) -"soP" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/platform/kutjevo/smooth, -/turf/open/gm/river/desert/deep/covered, -/area/kutjevo/interior/complex/med/operating) "soQ" = ( /obj/structure/surface/table/almayer, /obj/item/storage/fancy/cigarettes/lady_finger, @@ -12449,16 +11865,16 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/kutjevo/multi_tiles/southeast, /area/kutjevo/interior/power) -"sqr" = ( -/obj/structure/platform/kutjevo, -/turf/open/auto_turf/sand/layer2, -/area/kutjevo/exterior/scrubland) "sqP" = ( /obj/structure/sign/safety/hazard{ pixel_x = 32 }, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/exterior/runoff_bridge) +"sqX" = ( +/obj/effect/sentry_landmark/lz_2/top_right, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/lz_pad) "sre" = ( /obj/structure/surface/table/almayer, /obj/effect/landmark/objective_landmark/medium, @@ -12479,12 +11895,6 @@ /obj/item/tool/wirecutters/clippers, /turf/open/floor/kutjevo/colors/green/tile, /area/kutjevo/interior/complex/botany) -"stj" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/closed/wall/kutjevo/rock, -/area/kutjevo/exterior/runoff_dunes) "str" = ( /obj/effect/decal/cleanable/blood/xeno{ icon_state = "xgib3" @@ -12494,24 +11904,17 @@ "stt" = ( /turf/open/floor/kutjevo/colors/orange/edge/west, /area/kutjevo/interior/power_pt2_electric_boogaloo) -"svp" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 1 - }, +"stz" = ( +/obj/structure/platform/metal/kutjevo_smooth/east, /obj/structure/blocker/invisible_wall, -/turf/open/gm/river/desert/deep, +/turf/open/gm/river/desert/deep/toxic, /area/kutjevo/interior/oob) -"svB" = ( -/obj/structure/platform_decoration/kutjevo/rock, -/obj/structure/platform/kutjevo/rock{ - dir = 8 - }, -/turf/open/auto_turf/sand/layer2, -/area/kutjevo/exterior/scrubland) -"swl" = ( -/obj/structure/flora/grass/tallgrass/desert, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/scrubland) +"swe" = ( +/obj/structure/platform/metal/kutjevo/east, +/obj/structure/platform/metal/kutjevo, +/obj/structure/blocker/invisible_wall, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/exterior/complex_border/med_park) "swq" = ( /obj/item/stack/sheet/metal, /turf/open/floor/kutjevo/tan, @@ -12523,37 +11926,23 @@ "sxy" = ( /turf/open/gm/river/desert/shallow_edge/northwest, /area/kutjevo/exterior/runoff_river) -"sxZ" = ( -/obj/structure/closet/secure_closet/medical3{ - req_access = null - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/item/storage/pill_bottle/kelotane/skillless, -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/obj/structure/platform/kutjevo/smooth, -/obj/effect/landmark/objective_landmark/medium, -/turf/open/floor/kutjevo/grey/plate, -/area/kutjevo/interior/complex/med/operating) "syM" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/colony_N_East) +"szg" = ( +/obj/structure/platform_decoration/stone/kutjevo/east, +/obj/structure/platform_decoration/stone/kutjevo/north, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/interior/colony_north) +"szl" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/scrubland) "szC" = ( /obj/structure/blocker/invisible_wall, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/power_pt2_electric_boogaloo) -"szF" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/stairs/perspective/kutjevo{ - dir = 4; - icon_state = "p_stair_full" - }, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/interior/power) "szJ" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/auto_turf/sand/layer1, @@ -12613,18 +12002,26 @@ "sCG" = ( /turf/open/floor/kutjevo/colors/purple/edge, /area/kutjevo/interior/construction) +"sDe" = ( +/obj/structure/platform/metal/kutjevo_smooth/north, +/obj/structure/machinery/cm_vending/sorted/tech/comp_storage{ + layer = 3 + }, +/turf/open/floor/kutjevo/multi_tiles/southeast, +/area/kutjevo/interior/colony_South/power2) "sDG" = ( /turf/open/gm/river/desert/deep, /area/kutjevo/exterior/lz_river) -"sEf" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/turf/open/floor/kutjevo/multi_tiles/north, -/area/kutjevo/exterior/complex_border/med_rec) "sEG" = ( /turf/open/floor/kutjevo/tan/alt_edge, /area/kutjevo/exterior/construction) +"sFD" = ( +/turf/open/desert/desert_shore/shore_edge1, +/area/kutjevo/exterior/scrubland/south) +"sFF" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/interior/colony_north) "sFL" = ( /obj/structure/machinery/light, /obj/structure/bed/chair{ @@ -12662,6 +12059,11 @@ }, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/lz_dunes) +"sHG" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/obj/item/stack/sandbags/large_stack, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/complex_border/med_rec) "sHQ" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_core, /turf/open/auto_turf/sand/layer1, @@ -12673,12 +12075,27 @@ /obj/structure/barricade/wooden, /turf/open/floor/almayer/research/containment/floor2, /area/kutjevo/interior/complex/med/locks) +"sIG" = ( +/obj/structure/stairs/perspective/kutjevo{ + icon_state = "p_stair_ew_full_cap_butt" + }, +/obj/structure/platform/metal/stair_cut/kutjevo_smooth_right, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/exterior/scrubland) "sJj" = ( /obj/structure/bed/chair/office/light{ dir = 1 }, /turf/open/floor/kutjevo/colors, /area/kutjevo/interior/complex/med/pano) +"sJm" = ( +/obj/structure/platform/metal/kutjevo_smooth/north, +/obj/structure/platform/metal/kutjevo_smooth/west, +/obj/structure/machinery/vending/cigarette/colony{ + layer = 3 + }, +/turf/open/floor/kutjevo/multi_tiles/southeast, +/area/kutjevo/interior/colony_South/power2) "sJM" = ( /obj/structure/closet, /obj/item/clothing/head/helmet/marine/veteran/kutjevo, @@ -12698,11 +12115,6 @@ }, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/runoff_river) -"sKN" = ( -/obj/structure/platform_decoration/kutjevo, -/obj/structure/machinery/cm_vending/sorted/medical/no_access, -/turf/open/floor/kutjevo/colors/cyan, -/area/kutjevo/interior/complex/med/cells) "sLf" = ( /obj/effect/decal/cleanable/blood/oil, /obj/structure/machinery/landinglight/ds2/delayone, @@ -12734,6 +12146,10 @@ /obj/structure/machinery/power/smes/buildable/charged, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/interior/power) +"sNy" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, +/turf/open/floor/almayer/research/containment/floor1, +/area/kutjevo/interior/complex/med/locks) "sNZ" = ( /turf/open/auto_turf/sand/layer2, /area/kutjevo/interior/colony_N_East) @@ -12753,10 +12169,11 @@ "sOJ" = ( /turf/open/gm/river/desert/shallow_corner, /area/kutjevo/exterior/lz_river) -"sPp" = ( -/obj/structure/platform/kutjevo/smooth, -/turf/open/gm/river/desert/deep/covered, -/area/kutjevo/interior/colony_South/power2) +"sPb" = ( +/obj/structure/bed/chair, +/obj/structure/platform/metal/kutjevo/north, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/runoff_dunes) "sPE" = ( /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/power/comms) @@ -12796,12 +12213,6 @@ /obj/structure/surface/rack, /turf/open/floor/kutjevo/colors/cyan, /area/kutjevo/interior/complex/med/auto_doc) -"sTB" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 8 - }, -/turf/open/auto_turf/sand/layer2, -/area/kutjevo/exterior/runoff_dunes) "sTC" = ( /obj/item/ammo_magazine/rifle/mar40/extended, /turf/open/floor/almayer/research/containment/floor2, @@ -12810,12 +12221,6 @@ /obj/structure/lattice, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/construction) -"sUo" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/complex_border/med_rec) "sUs" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/gm/river/desert/deep/covered, @@ -12824,18 +12229,19 @@ /obj/structure/machinery/landinglight/ds2/delaythree, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/exterior/lz_pad) +"sUu" = ( +/obj/structure/platform/stone/kutjevo/west, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/scrubland) "sUC" = ( /obj/structure/blocker/invisible_wall, /obj/structure/filtration/coagulation_arm, /turf/open/gm/river/desert/deep/toxic, /area/kutjevo/interior/oob) -"sVc" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/gm/river/desert/deep/toxic, -/area/kutjevo/interior/power) +"sVd" = ( +/obj/structure/platform_decoration/stone/kutjevo/east, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/scrubland) "sVx" = ( /turf/open/gm/river/desert/deep/covered, /area/kutjevo/interior/complex/botany) @@ -12883,12 +12289,6 @@ "sYd" = ( /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/scrubland) -"sYo" = ( -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/complex_border/med_rec) "sYA" = ( /obj/structure/machinery/portable_atmospherics/hydroponics{ draw_warnings = 0; @@ -12896,16 +12296,16 @@ }, /turf/open/floor/kutjevo/colors/green, /area/kutjevo/interior/complex/botany) -"sYV" = ( -/obj/structure/blocker/invisible_wall, -/obj/item/toy/inflatable_duck, -/obj/structure/platform/kutjevo, -/turf/open/gm/river/desert/deep/toxic, -/area/kutjevo/interior/power) "sZz" = ( /obj/effect/landmark/corpsespawner/colonist/kutjevo, /turf/open/floor/kutjevo/multi_tiles/east, /area/kutjevo/exterior/runoff_bridge) +"sZI" = ( +/obj/structure/flora/grass/tallgrass/desert/corner{ + dir = 9 + }, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/scrubland/south) "sZO" = ( /obj/structure/machinery/light, /obj/effect/landmark/objective_landmark/science, @@ -12915,12 +12315,12 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor/kutjevo/tan/alt_edge/north, /area/kutjevo/interior/colony_central) -"sZZ" = ( +"tac" = ( /obj/structure/flora/grass/tallgrass/desert/corner{ dir = 9 }, /turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/scrubland) +/area/kutjevo/exterior/scrubland/south) "tax" = ( /turf/open/gm/river/desert/shallow_edge, /area/kutjevo/exterior/runoff_dunes) @@ -12947,19 +12347,10 @@ /obj/structure/machinery/vending/cigarette/colony, /turf/open/floor/kutjevo/colors/green, /area/kutjevo/interior/complex/botany) -"tdT" = ( -/obj/structure/platform/kutjevo, +"tdQ" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, /turf/open/auto_turf/sand/layer0, -/area/kutjevo/interior/colony_north) -"tdZ" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/turf/open/floor/kutjevo/colors/cyan/tile, -/area/kutjevo/interior/complex/med/cells) +/area/kutjevo/exterior/scrubland) "ten" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/kutjevo/colors/cyan/edge/north, @@ -12974,6 +12365,14 @@ }, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/lz_dunes) +"teZ" = ( +/obj/structure/stairs/perspective/kutjevo{ + dir = 10; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/stair_cut/kutjevo_smooth_right, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/runoff_bridge) "tfv" = ( /obj/structure/surface/table/almayer, /turf/open/floor/kutjevo/colors/orange/edge, @@ -12984,10 +12383,19 @@ }, /turf/open/floor/kutjevo/grey/plate, /area/kutjevo/interior/complex/botany/east_tech) +"tfL" = ( +/obj/structure/platform/metal/kutjevo/east, +/obj/structure/platform/metal/kutjevo, +/turf/open/floor/coagulation/icon8_0, +/area/kutjevo/interior/construction) "tgl" = ( /obj/item/weapon/gun/revolver/cmb, /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/Northwest_Flight_Control) +"tgC" = ( +/obj/structure/platform/metal/kutjevo/east, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/interior/colony_central) "tgO" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, @@ -13005,6 +12413,11 @@ }, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/complex/med/operating) +"the" = ( +/obj/structure/platform/metal/kutjevo/north, +/obj/structure/blocker/invisible_wall, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/exterior/complex_border/med_park) "thu" = ( /obj/structure/machinery/light{ dir = 8 @@ -13022,22 +12435,14 @@ }, /turf/open/floor/plating/kutjevo, /area/kutjevo/exterior/scrubland) -"tiJ" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/turf/open/floor/kutjevo/multi_tiles, -/area/kutjevo/interior/power) +"tit" = ( +/obj/structure/flora/grass/tallgrass/desert, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/scrubland/south) "tiL" = ( /obj/item/prop/alien/hugger, /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/Northwest_Dorms) -"tiO" = ( -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 1 - }, -/turf/open/auto_turf/sand/layer2, -/area/kutjevo/exterior/scrubland) "tiW" = ( /obj/item/prop/helmetgarb/spent_buckshot, /turf/open/floor/kutjevo/tan/multi_tiles, @@ -13053,12 +12458,6 @@ "tjS" = ( /turf/open/desert/desert_shore/shore_corner2/north, /area/kutjevo/exterior/lz_river) -"tjZ" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/interior/colony_north) "tka" = ( /obj/structure/flora/grass/desert/lightgrass_6, /turf/open/auto_turf/sand/layer0, @@ -13145,16 +12544,16 @@ "tqE" = ( /turf/open/floor/kutjevo/multi_tiles/southeast, /area/kutjevo/interior/complex/botany/east_tech) -"trC" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 1 - }, -/obj/structure/platform/kutjevo/rock{ - dir = 8 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/gm/river/desert/deep, -/area/kutjevo/interior/oob) +"tqF" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, +/obj/structure/flora/bush/ausbushes/reedbush, +/turf/open/desert/desert_shore/shore_edge1/east, +/area/kutjevo/exterior/runoff_river) +"tqN" = ( +/obj/structure/platform/metal/kutjevo/north, +/obj/structure/platform/metal/kutjevo/west, +/turf/open/desert/desert_shore/desert_shore1/east, +/area/kutjevo/exterior/scrubland/south) "trU" = ( /obj/structure/machinery/shower{ name = "automatic sprinkler"; @@ -13165,6 +12564,12 @@ }, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/oob) +"tsr" = ( +/obj/structure/platform/stone/kutjevo/north, +/obj/structure/platform/stone/kutjevo/west, +/obj/structure/platform/stone/kutjevo, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/interior/colony_north) "tsK" = ( /obj/effect/spawner/random/toolbox{ pixel_x = -2; @@ -13182,21 +12587,10 @@ }, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/Northwest_Colony) -"tuW" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/gm/river/desert/deep/toxic, -/area/kutjevo/interior/power) "tvb" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/kutjevo/colors/cyan/inner_corner/west, /area/kutjevo/interior/complex/med/operating) -"tvJ" = ( -/obj/structure/platform_decoration/kutjevo/rock, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/scrubland) "twn" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; @@ -13207,16 +12601,18 @@ "twq" = ( /turf/open/desert/desert_shore/desert_shore1/east, /area/kutjevo/exterior/runoff_dunes) -"txe" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 1 - }, -/turf/open/mars_cave/mars_cave_23, -/area/kutjevo/exterior/scrubland) +"twY" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/gm/river/desert/deep, +/area/kutjevo/interior/complex/botany/east_tech) "txH" = ( /obj/structure/machinery/light, /turf/open/floor/kutjevo/colors/purple/edge, /area/kutjevo/interior/construction) +"txS" = ( +/obj/effect/sentry_landmark/lz_1/bottom_left, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/lz_dunes) "tye" = ( /obj/structure/flora/bush/ausbushes/ppflowers{ icon_state = "sparsegrass_2" @@ -13227,6 +12623,10 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/auto_turf/sand/layer2, /area/kutjevo/interior/colony_north) +"tyr" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, +/turf/open/floor/kutjevo/multi_tiles/north, +/area/kutjevo/exterior/complex_border/med_rec) "tyJ" = ( /obj/structure/bed/chair/office/light, /turf/open/floor/kutjevo/grey/plate, @@ -13246,6 +12646,10 @@ /obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_S_East) +"tzY" = ( +/obj/effect/sentry_landmark/lz_1/top_right, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/lz_dunes) "tAQ" = ( /obj/structure/closet/firecloset/full, /obj/effect/landmark/objective_landmark/far, @@ -13314,17 +12718,12 @@ /obj/item/fuel_cell, /turf/open/floor/kutjevo/multi_tiles/southeast, /area/kutjevo/interior/power) -"tEK" = ( -/obj/structure/bed/sofa/vert/grey/bot{ - pixel_y = 4 - }, -/obj/structure/barricade/handrail/strata{ - dir = 4 - }, -/obj/structure/barricade/handrail/strata, -/obj/structure/platform_decoration/kutjevo, -/turf/open/floor/mech_bay_recharge_floor, -/area/kutjevo/interior/power) +"tEB" = ( +/obj/structure/platform/stone/kutjevo/north, +/obj/structure/platform/stone/kutjevo/west, +/obj/structure/platform/stone/kutjevo, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/interior/colony_N_East) "tFe" = ( /obj/structure/machinery/light, /turf/open/floor/kutjevo/colors/orange/edge, @@ -13363,6 +12762,14 @@ /obj/structure/machinery/floodlight/landing, /turf/open/floor/kutjevo/plate, /area/kutjevo/exterior/lz_pad) +"tGQ" = ( +/obj/structure/stairs/perspective/kutjevo{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/kutjevo_smooth, +/turf/open/floor/kutjevo/tan/multi_tiles, +/area/kutjevo/interior/colony_South/power2) "tHh" = ( /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/lz_pad) @@ -13405,16 +12812,12 @@ /obj/structure/bed/sofa/vert/white, /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/med/auto_doc) +"tKH" = ( +/turf/open/auto_turf/sand/layer2, +/area/kutjevo/exterior/scrubland/south) "tKY" = ( /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/runoff_river) -"tLD" = ( -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/obj/structure/platform/kutjevo, -/turf/open/floor/coagulation/icon0_0, -/area/kutjevo/interior/construction) "tLO" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/kutjevo/tan, @@ -13468,24 +12871,16 @@ /obj/item/stack/sheet/metal/med_small_stack, /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/power/comms) -"tQi" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 1 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/lz_dunes) +"tQl" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/interior/power/comms) "tQB" = ( /turf/open/desert/desert_shore/shore_edge1/west, /area/kutjevo/exterior/runoff_dunes) -"tQO" = ( -/obj/structure/stairs/perspective/kutjevo{ - dir = 8; - icon_state = "p_stair_ew_full_cap_butt" - }, -/obj/structure/platform/stair_cut{ - icon_state = "kutjevo_platform_sm_stair" - }, -/turf/open/floor/plating/kutjevo, +"tRi" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, +/turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/interior/colony_South/power2) "tRp" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ @@ -13494,16 +12889,6 @@ }, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/complex/botany) -"tRG" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - icon_state = "kutjevo_platform_sm_stair" - }, -/obj/structure/stairs/perspective/kutjevo{ - icon_state = "p_stair_ew_full_cap_butt" - }, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/interior/complex/med/cells) "tSi" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/kutjevo/tan/multi_tiles, @@ -13513,6 +12898,10 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/interior/colony_South) +"tTf" = ( +/obj/effect/sentry_landmark/lz_2/top_right, +/turf/open/floor/kutjevo/tan/alt_edge/west, +/area/kutjevo/exterior/lz_pad) "tTi" = ( /obj/structure/blocker/invisible_wall, /obj/structure/filingcabinet, @@ -13530,6 +12919,22 @@ "tUz" = ( /turf/open/gm/river/desert/shallow_edge/east, /area/kutjevo/exterior/lz_river) +"tVg" = ( +/obj/structure/stairs/perspective/kutjevo{ + dir = 1; + icon_state = "p_stair_sn_full_cap"; + pixel_y = 16 + }, +/obj/structure/stairs/perspective/kutjevo{ + dir = 1; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/kutjevo_smooth/west, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/interior/colony_South/power2) "tVs" = ( /obj/effect/landmark/hunter_primary, /turf/open/floor/almayer/research/containment/floor2, @@ -13571,14 +12976,6 @@ /obj/structure/machinery/light, /turf/open/floor/kutjevo/tan/alt_inner_edge/east, /area/kutjevo/interior/complex/Northwest_Flight_Control) -"uam" = ( -/obj/structure/platform_decoration/kutjevo, -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 1 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/gm/river/desert/deep, -/area/kutjevo/interior/oob) "uaz" = ( /turf/open/desert/desert_shore/desert_shore1/north, /area/kutjevo/exterior/spring) @@ -13594,6 +12991,10 @@ }, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_central) +"ubI" = ( +/obj/structure/platform_decoration/metal/kutjevo, +/turf/open/gm/river/desert/shallow_edge/east, +/area/kutjevo/exterior/runoff_river) "ubR" = ( /obj/structure/window/framed/kutjevo/reinforced, /turf/open/floor/plating/kutjevo, @@ -13601,14 +13002,10 @@ "ubV" = ( /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/lz_river) -"udm" = ( -/obj/structure/platform_decoration/kutjevo, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/lz_dunes) -"ueJ" = ( -/obj/structure/platform/kutjevo/rock, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/interior/colony_N_East) +"uew" = ( +/obj/structure/platform_decoration/metal/kutjevo, +/turf/open/floor/almayer/research/containment/floor1, +/area/kutjevo/interior/complex/med/locks) "ueM" = ( /turf/open/desert/desert_shore/shore_corner2/east, /area/kutjevo/exterior/spring) @@ -13706,12 +13103,6 @@ /obj/structure/flora/bush/ausbushes/ppflowers, /turf/open/gm/grass/grass1/weedable, /area/kutjevo/exterior/complex_border/med_park) -"ujG" = ( -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 4 - }, -/turf/open/auto_turf/sand/layer2, -/area/kutjevo/exterior/scrubland) "ujT" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ dir = 1; @@ -13719,34 +13110,38 @@ }, /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/Northwest_Dorms) -"ukd" = ( -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/turf/open/gm/river/desert/deep, -/area/kutjevo/interior/complex/botany/east_tech) "ukN" = ( /obj/structure/prop/dam/boulder/boulder3, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/construction) +"ulc" = ( +/obj/structure/platform/metal/kutjevo/west, +/obj/structure/platform/metal/kutjevo, +/turf/open/floor/coagulation/icon0_0, +/area/kutjevo/interior/colony_north) "ulo" = ( /obj/item/bodybag/tarp/reactive, /obj/item/bodybag/tarp/reactive, /obj/structure/surface/rack, /turf/open/floor/kutjevo/colors/red, /area/kutjevo/interior/complex/botany) -"ult" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/turf/open/gm/river/desert/shallow, -/area/kutjevo/exterior/runoff_bridge) +"ulq" = ( +/obj/structure/platform/metal/kutjevo/north, +/obj/structure/platform/metal/kutjevo/west, +/obj/structure/blocker/invisible_wall, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/exterior/complex_border/med_park) "ulJ" = ( /obj/structure/flora/grass/tallgrass/desert/corner{ dir = 1 }, /turf/open/auto_turf/sand/layer2, /area/kutjevo/exterior/Northwest_Colony) +"ulS" = ( +/obj/structure/platform/metal/kutjevo_smooth/north, +/obj/structure/blocker/invisible_wall, +/turf/open/gm/river/desert/deep/toxic, +/area/kutjevo/interior/oob) "ulV" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/kutjevo/colors/green, @@ -13763,22 +13158,22 @@ /obj/item/trash/cigbutt/bcigbutt, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/interior/colony_central) -"umQ" = ( -/turf/open/desert/desert_shore/shore_edge1/west, -/area/kutjevo/exterior/scrubland) -"una" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 1 - }, -/obj/structure/platform/kutjevo/rock{ - dir = 8 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/scrubland) "unr" = ( /obj/structure/largecrate/random, /turf/open/floor/kutjevo/colors, /area/kutjevo/interior/colony_South/power2) +"uog" = ( +/obj/structure/flora/bush/desert{ + icon_state = "tree_3" + }, +/obj/structure/platform/metal/kutjevo_smooth/north, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/scrubland) +"uon" = ( +/obj/structure/platform/stone/kutjevo/north, +/obj/structure/blocker/invisible_wall, +/turf/open/desert/desert_shore/shore_corner2/west, +/area/kutjevo/interior/oob) "uoz" = ( /turf/closed/wall/kutjevo/colony/reinforced/hull, /area/kutjevo/interior/oob/dev_room) @@ -13798,38 +13193,16 @@ /obj/structure/bed/chair/office/light, /turf/open/floor/kutjevo/colors/cyan/edge/west, /area/kutjevo/interior/complex/med) -"uqL" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/desert/desert_shore/desert_shore1/west, -/area/kutjevo/exterior/lz_river) "uqR" = ( /obj/structure/machinery/light, /turf/open/floor/almayer/research/containment/floor2, /area/kutjevo/interior/power) -"uqW" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/turf/open/floor/kutjevo/tan/alt_edge/east, -/area/kutjevo/interior/colony_central) "uri" = ( /obj/structure/flora/bush/ausbushes/ppflowers{ icon_state = "fullgrass_3" }, /turf/open/gm/grass/grass1/weedable, /area/kutjevo/exterior/complex_border/med_park) -"urm" = ( -/obj/structure/stairs/perspective/kutjevo{ - dir = 1; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/turf/open/floor/kutjevo/tan/multi_tiles, -/area/kutjevo/interior/colony_South/power2) "urv" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, @@ -13842,15 +13215,6 @@ /obj/item/weapon/gun/rifle/m16, /turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/interior/complex/botany) -"usc" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/turf/open/floor/coagulation/icon8_8, -/area/kutjevo/interior/colony_north) "usd" = ( /obj/structure/machinery/landinglight/ds1/delaytwo{ dir = 1 @@ -13862,12 +13226,24 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_north) +"usz" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 4; + name = "\improper Kutjevo Dam Storm Shutters" + }, +/obj/structure/platform_decoration/metal/kutjevo/north, +/turf/open/asphalt/cement_sunbleached, +/area/kutjevo/interior/power) "usP" = ( /obj/effect/decal/medical_decals{ icon_state = "triagedecalleft" }, /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/med/cells) +"usX" = ( +/obj/structure/platform/stone/kutjevo/north, +/turf/open/mars_cave/mars_cave_23, +/area/kutjevo/exterior/scrubland) "utY" = ( /obj/structure/extinguisher_cabinet, /turf/closed/wall/kutjevo/colony, @@ -13877,50 +13253,34 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/floor/kutjevo/colors/cyan, /area/kutjevo/interior/complex/med/cells) +"uwj" = ( +/obj/structure/platform/metal/kutjevo/north, +/obj/structure/platform/metal/kutjevo/east, +/turf/open/floor/coagulation/icon8_8, +/area/kutjevo/interior/construction) "uwD" = ( /obj/item/clothing/mask/cigarette/pipe/cobpipe, /turf/open/floor/kutjevo/multi_tiles/southeast, /area/kutjevo/interior/complex/botany) -"uwY" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/obj/structure/blocker/invisible_wall, -/obj/structure/platform/kutjevo, -/obj/structure/filtration/machine_32x64/indestructible{ - bound_height = 32; - icon_state = "solo_tank_empty" - }, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/interior/oob) +"uwI" = ( +/obj/structure/platform_decoration/stone/kutjevo/west, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/interior/colony_central) +"uxf" = ( +/obj/structure/platform/metal/kutjevo/north, +/turf/open/floor/coagulation/icon7_8_2, +/area/kutjevo/interior/construction) "uxA" = ( /obj/structure/prop/dam/truck, /turf/open/asphalt/cement_sunbleached, /area/kutjevo/exterior/scrubland) -"uze" = ( -/obj/structure/platform/kutjevo/smooth, -/turf/open/desert/desert_shore/desert_shore1/east, -/area/kutjevo/exterior/runoff_river) "uzp" = ( /obj/structure/window/framed/kutjevo, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/complex/Northwest_Dorms) -"uzq" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/complex_border/med_rec) "uzJ" = ( /turf/open/auto_turf/sand/layer2, /area/kutjevo/exterior/spring) -"uAh" = ( -/obj/structure/platform/kutjevo/smooth, -/turf/open/floor/kutjevo/multi_tiles, -/area/kutjevo/interior/power) "uAz" = ( /obj/structure/fence, /turf/open/auto_turf/sand/layer1, @@ -13964,14 +13324,6 @@ /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb, /turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/exterior/runoff_bridge) -"uCR" = ( -/obj/structure/stairs/perspective/kutjevo{ - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform/kutjevo/smooth, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/interior/power) "uDm" = ( /obj/structure/surface/table/gamblingtable, /obj/effect/landmark/objective_landmark/science, @@ -13981,12 +13333,6 @@ /obj/structure/blocker/invisible_wall, /turf/open/desert/desert_shore/desert_shore1, /area/kutjevo/interior/oob/dev_room) -"uEi" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/complex_border/med_rec) "uEk" = ( /obj/structure/surface/table/almayer, /obj/item/book/manual/surgery, @@ -14007,22 +13353,9 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/kutjevo/tan/alt_edge/north, /area/kutjevo/interior/complex/Northwest_Flight_Control) -"uEY" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/floor/kutjevo/multi_tiles/north, -/area/kutjevo/exterior/complex_border/med_rec) "uGd" = ( /turf/open/gm/river/desert/shallow_edge/north, /area/kutjevo/exterior/lz_river) -"uGB" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 1 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/desert/desert_shore/desert_shore1/north, -/area/kutjevo/interior/oob) "uGN" = ( /obj/structure/flora/grass/tallgrass/desert, /turf/open/auto_turf/sand/layer1, @@ -14037,6 +13370,17 @@ "uHP" = ( /turf/open/floor/kutjevo/colors/cyan, /area/kutjevo/interior/complex/med/auto_doc) +"uHR" = ( +/obj/structure/platform/stone/kutjevo/north, +/obj/structure/platform/stone/kutjevo/east, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/interior/colony_South) +"uHZ" = ( +/obj/structure/flora/grass/tallgrass/desert/corner{ + dir = 6 + }, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/scrubland/south) "uIg" = ( /obj/structure/machinery/door/poddoor/shutters/almayer/open{ id = "kutjevo_medlock_west"; @@ -14084,6 +13428,10 @@ }, /turf/open/floor/kutjevo/colors/cyan/tile, /area/kutjevo/interior/complex/med/auto_doc) +"uKT" = ( +/obj/structure/platform/stone/kutjevo/east, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/interior/colony_South) "uKW" = ( /obj/structure/machinery/light{ dir = 1 @@ -14119,38 +13467,10 @@ /obj/structure/closet/crate/secure/ammo, /turf/open/asphalt/cement_sunbleached, /area/kutjevo/exterior/scrubland) -"uNC" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/effect/landmark/objective_landmark/science, -/turf/open/floor/kutjevo/colors/cyan/inner_corner, -/area/kutjevo/interior/complex/med/operating) -"uNI" = ( -/obj/structure/blocker/invisible_wall, -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/turf/open/gm/river/red_pool, -/area/kutjevo/interior/oob) -"uNJ" = ( -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/obj/structure/platform/kutjevo, -/turf/open/gm/river/desert/deep, -/area/kutjevo/interior/complex/botany/east_tech) "uNW" = ( /obj/structure/prop/dam/boulder/boulder2, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/colony_South) -"uNZ" = ( -/obj/structure/machinery/colony_floodlight, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/lz_dunes) "uOe" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ explo_proof = 1 @@ -14163,15 +13483,13 @@ }, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/interior/construction) -"uPu" = ( -/obj/structure/stairs/perspective/kutjevo{ - icon_state = "p_stair_ew_full_cap_butt" - }, -/obj/structure/platform/stair_cut/alt{ - icon_state = "kutjevo_platform_sm_stair_alt" - }, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/interior/power) +"uPt" = ( +/obj/item/fuel_cell, +/obj/structure/surface/rack, +/obj/structure/platform/metal/kutjevo_smooth/north, +/obj/structure/platform/metal/kutjevo_smooth/east, +/turf/open/floor/kutjevo/multi_tiles/southwest, +/area/kutjevo/interior/colony_South/power2) "uPE" = ( /obj/structure/bed/sofa/vert/grey/top, /obj/structure/barricade/handrail/strata{ @@ -14223,13 +13541,11 @@ }, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/complex/med/auto_doc) -"uRP" = ( -/obj/structure/prop/dam/boulder/boulder3, -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/runoff_dunes) +"uRH" = ( +/obj/structure/largecrate/random/secure, +/obj/structure/platform/metal/kutjevo_smooth/east, +/turf/open/floor/kutjevo/colors/cyan, +/area/kutjevo/interior/complex/med/cells) "uSr" = ( /obj/item/stack/cable_coil/random, /turf/open/floor/plating/kutjevo, @@ -14246,17 +13562,6 @@ /obj/item/clothing/suit/armor/vest/security, /turf/open/floor/kutjevo/tan/grey_edge, /area/kutjevo/interior/complex/med) -"uTn" = ( -/obj/structure/stairs/perspective/kutjevo{ - dir = 1; - icon_state = "p_stair_sn_full_cap"; - pixel_y = 16 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/turf/open/floor/kutjevo/multi_tiles/southeast, -/area/kutjevo/interior/power) "uTo" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited{ pixel_y = -28 @@ -14267,12 +13572,10 @@ /obj/structure/largecrate, /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/exterior/lz_pad) -"uWk" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 1 - }, +"uVc" = ( +/obj/structure/platform_decoration/stone/kutjevo/west, /obj/structure/blocker/invisible_wall, -/turf/open/desert/desert_shore/shore_corner2/west, +/turf/open/gm/river/desert/deep, /area/kutjevo/interior/oob) "uWu" = ( /obj/effect/spawner/random/toolbox{ @@ -14281,6 +13584,10 @@ }, /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/med) +"uWT" = ( +/obj/effect/sentry_landmark/lz_1/bottom_right, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/lz_dunes) "uXM" = ( /obj/structure/largecrate/random/case/double, /obj/structure/machinery/light{ @@ -14298,6 +13605,10 @@ }, /turf/open/gm/river/desert/shallow, /area/kutjevo/exterior/runoff_river) +"uYB" = ( +/obj/structure/platform/metal/kutjevo_smooth/east, +/turf/open/asphalt/cement_sunbleached, +/area/kutjevo/exterior/scrubland) "uZa" = ( /obj/effect/decal/cleanable/blood/oil, /obj/structure/machinery/light{ @@ -14305,13 +13616,18 @@ }, /turf/open/floor/kutjevo/colors, /area/kutjevo/interior/complex/botany) -"uZT" = ( -/obj/structure/platform/kutjevo{ - dir = 4 - }, +"uZG" = ( +/obj/structure/platform/metal/kutjevo, /obj/structure/blocker/invisible_wall, -/turf/open/floor/kutjevo/multi_tiles, -/area/kutjevo/interior/power) +/turf/open/gm/river/desert/deep, +/area/kutjevo/interior/oob) +"uZM" = ( +/obj/structure/platform/stone/kutjevo/north, +/obj/structure/platform/stone/kutjevo/west, +/obj/structure/platform/stone/kutjevo/east, +/obj/structure/platform/stone/kutjevo, +/turf/open/gm/river/desert/deep, +/area/kutjevo/interior/colony_South) "vaa" = ( /obj/structure/machinery/cm_vending/sorted/tech/electronics_storage, /turf/open/floor/kutjevo/multi_tiles/southwest, @@ -14339,17 +13655,6 @@ /obj/structure/prop/dam/wide_boulder/boulder1, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/runoff_dunes) -"vbm" = ( -/obj/structure/bed/sofa/vert/grey/bot{ - pixel_y = 4 - }, -/obj/structure/barricade/handrail/strata{ - dir = 4 - }, -/obj/structure/barricade/handrail/strata, -/obj/structure/platform_decoration/kutjevo, -/turf/open/floor/mech_bay_recharge_floor, -/area/kutjevo/interior/colony_central/mine_elevator) "vbA" = ( /turf/open/desert/desert_shore/desert_shore1/west, /area/kutjevo/exterior/runoff_dunes) @@ -14366,36 +13671,35 @@ /obj/structure/surface/table/almayer, /turf/open/floor/kutjevo/colors/green/tile, /area/kutjevo/interior/complex/botany/east) +"vcO" = ( +/obj/structure/stairs/perspective/kutjevo{ + icon_state = "p_stair_ew_full_cap_butt" + }, +/obj/structure/platform/metal/stair_cut/kutjevo_smooth_right, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/interior/power) "vcT" = ( /turf/open/desert/desert_shore/shore_edge1/north, /area/kutjevo/exterior/lz_river) -"vcW" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 1 - }, -/obj/structure/platform/kutjevo/rock{ - dir = 8 - }, -/obj/structure/platform/kutjevo/rock{ - dir = 4 - }, -/obj/structure/platform/kutjevo/rock, -/turf/open/gm/river/desert/deep, -/area/kutjevo/interior/colony_central) -"vcY" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/blocker/invisible_wall, -/turf/open/gm/river/desert/deep/toxic, -/area/kutjevo/interior/oob) -"vdl" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/turf/open/floor/kutjevo/colors/orange, +"vdp" = ( +/obj/structure/platform/metal/kutjevo_smooth/north, +/turf/open/asphalt/cement_sunbleached, /area/kutjevo/interior/power) "vdv" = ( /turf/closed/wall/kutjevo/rock, /area/kutjevo/interior/colony_S_East) +"vdC" = ( +/obj/structure/platform/metal/kutjevo_smooth, +/obj/structure/stairs/perspective/kutjevo{ + dir = 9; + icon_state = "p_stair_full" + }, +/turf/open/floor/kutjevo/multi_tiles, +/area/kutjevo/interior/power) +"vdD" = ( +/obj/structure/platform/metal/kutjevo_smooth/west, +/turf/open/floor/kutjevo/colors/orange, +/area/kutjevo/interior/colony_South/power2) "vdH" = ( /obj/structure/machinery/vending/snack, /turf/open/floor/kutjevo/colors/red, @@ -14451,12 +13755,6 @@ "vfr" = ( /turf/open/floor/kutjevo/colors/purple/edge/north, /area/kutjevo/interior/construction) -"vfZ" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 4 - }, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/runoff_river) "vgw" = ( /turf/open/floor/kutjevo/colors/cyan/edge/east, /area/kutjevo/interior/complex/med) @@ -14478,19 +13776,14 @@ /obj/structure/flora/grass/desert/lightgrass_11, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/spring) -"vhQ" = ( -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 8 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/lz_dunes) -"via" = ( -/obj/effect/landmark/hunter_primary, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/scrubland) "vin" = ( /turf/open/floor/coagulation/icon2_0, /area/kutjevo/exterior/lz_river) +"viE" = ( +/obj/structure/blocker/invisible_wall, +/obj/structure/platform/metal/kutjevo/north, +/turf/open/gm/river/red_pool, +/area/kutjevo/interior/oob) "viU" = ( /turf/open/floor/plating/kutjevo, /area/kutjevo/exterior/construction) @@ -14498,18 +13791,15 @@ /obj/structure/bed/chair, /turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/exterior/runoff_bridge) +"vkr" = ( +/obj/structure/platform/metal/kutjevo_smooth/north, +/obj/structure/platform/metal/kutjevo_smooth/east, +/obj/structure/blocker/invisible_wall, +/turf/open/gm/river/desert/deep/toxic, +/area/kutjevo/interior/oob) "vkK" = ( /turf/open/gm/river/desert/shallow_edge/northeast, /area/kutjevo/exterior/runoff_dunes) -"vkV" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/turf/open/gm/river/desert/deep, -/area/kutjevo/interior/complex/botany/east_tech) "vlg" = ( /obj/structure/flora/grass/tallgrass/desert/corner{ dir = 6 @@ -14532,16 +13822,36 @@ /obj/structure/flora/bush/ausbushes/reedbush, /turf/open/desert/desert_shore/shore_corner2/north, /area/kutjevo/exterior/runoff_river) -"vmH" = ( -/obj/structure/monorail, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/interior/colony_central/mine_elevator) "vmJ" = ( /turf/open/floor/kutjevo/tan/grey_edge/east, /area/kutjevo/interior/complex/med) +"vmN" = ( +/obj/structure/platform/metal/kutjevo_smooth, +/turf/open/gm/river/desert/deep/covered, +/area/kutjevo/interior/colony_South/power2) +"vnq" = ( +/obj/structure/stairs/perspective/kutjevo{ + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/kutjevo_smooth, +/obj/structure/machinery/light, +/turf/open/floor/kutjevo/colors/purple, +/area/kutjevo/interior/complex/med/locks) +"vnv" = ( +/obj/structure/stairs/perspective/kutjevo{ + dir = 8; + icon_state = "p_stair_ew_full_cap_butt" + }, +/obj/structure/platform/metal/stair_cut/kutjevo_smooth_left, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/interior/colony_South/power2) +"vnM" = ( +/obj/structure/platform/metal/kutjevo/north, +/obj/structure/platform/metal/kutjevo/east, +/obj/structure/blocker/invisible_wall, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/exterior/complex_border/med_park) "vnO" = ( /obj/structure/bed/chair{ dir = 8 @@ -14557,23 +13867,19 @@ /obj/structure/flora/grass/tallgrass/desert, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/scrubland) -"vpq" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 1 - }, -/turf/open/auto_turf/sand/layer2, -/area/kutjevo/exterior/scrubland) "vqQ" = ( /obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/exterior/telecomm/lz2_south) -"vre" = ( -/obj/structure/platform/kutjevo{ - dir = 8 +"vqS" = ( +/obj/structure/filtration/machine_96x96/indestructible{ + icon_state = "disinfection"; + layer = 3.5 }, -/obj/structure/machinery/recharge_station, -/turf/open/floor/kutjevo/colors, -/area/kutjevo/interior/power/comms) +/obj/structure/platform/metal/kutjevo_smooth/west, +/obj/structure/platform/metal/kutjevo_smooth, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/interior/power) "vrB" = ( /obj/structure/machinery/floodlight, /turf/open/floor/kutjevo/tan, @@ -14582,12 +13888,6 @@ /obj/structure/bed/stool, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/oob/dev_room) -"vsq" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/floor/kutjevo/colors/purple/edge/east, -/area/kutjevo/interior/construction) "vsP" = ( /turf/closed/wall/kutjevo/rock, /area/kutjevo/interior/colony_N_East) @@ -14606,10 +13906,18 @@ "vuo" = ( /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/runoff_bridge) -"vvE" = ( -/obj/structure/flora/grass/tallgrass/desert/corner, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/scrubland) +"vuv" = ( +/obj/structure/blocker/invisible_wall, +/obj/structure/platform/metal/kutjevo/west, +/turf/open/gm/river/desert/deep/toxic, +/area/kutjevo/interior/oob) +"vvM" = ( +/obj/structure/platform/metal/kutjevo_smooth, +/obj/structure/prop/dam/crane/cargo{ + layer = 3.3 + }, +/turf/open/asphalt/cement_sunbleached, +/area/kutjevo/interior/power) "vxe" = ( /turf/open/floor/kutjevo/tan/alt_edge/west, /area/kutjevo/interior/colony_South) @@ -14618,32 +13926,15 @@ /obj/item/ammo_magazine/shotgun/buckshot, /turf/open/floor/kutjevo/tan/alt_edge, /area/kutjevo/interior/complex/Northwest_Flight_Control) -"vys" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/obj/structure/barricade/wooden, -/turf/open/floor/kutjevo/multi_tiles, -/area/kutjevo/exterior/runoff_bridge) +"vxV" = ( +/obj/structure/platform/metal/kutjevo, +/obj/structure/blocker/invisible_wall, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/exterior/complex_border/med_park) "vzy" = ( /obj/structure/tunnel, /turf/open/gm/dirtgrassborder2, /area/kutjevo/exterior/complex_border/med_park) -"vzC" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/obj/structure/blocker/invisible_wall, -/obj/structure/platform/kutjevo, -/obj/structure/filtration/machine_32x64/indestructible{ - bound_height = 32; - icon_state = "solo_tank_empty" - }, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/exterior/complex_border/med_rec) "vBr" = ( /obj/structure/prop/dam/gravestone{ icon_state = "gravestone2" @@ -14658,22 +13949,6 @@ /obj/item/reagent_container/food/snacks/applecakeslice, /turf/open/floor/kutjevo/tan/grey_edge/west, /area/kutjevo/interior/complex/Northwest_Dorms) -"vCT" = ( -/obj/structure/blocker/invisible_wall, -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/turf/open/gm/river/red_pool, -/area/kutjevo/interior/power) -"vDi" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/asphalt/cement_sunbleached, -/area/kutjevo/exterior/scrubland) "vDu" = ( /obj/structure/bed/chair{ pixel_y = 8 @@ -14695,17 +13970,6 @@ }, /turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/interior/complex/botany) -"vDR" = ( -/obj/structure/stairs/perspective/kutjevo{ - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform/kutjevo/smooth, -/obj/structure/barricade/handrail/kutjevo{ - layer = 3.05 - }, -/turf/open/floor/kutjevo/tan/multi_tiles, -/area/kutjevo/interior/colony_South/power2) "vDS" = ( /turf/open/floor/kutjevo/colors/green, /area/kutjevo/interior/complex/botany) @@ -14730,15 +13994,6 @@ /obj/item/tool/wirecutters, /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/botany) -"vFc" = ( -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/obj/structure/stairs/perspective/kutjevo{ - icon_state = "p_stair_sn_full_cap" - }, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/exterior/complex_border/med_rec) "vFg" = ( /obj/structure/window/framed/kutjevo/reinforced, /obj/structure/machinery/door/poddoor/shutters/almayer, @@ -14748,26 +14003,10 @@ /obj/item/weapon/gun/rifle/mar40, /turf/open/floor/almayer/research/containment/floor2, /area/kutjevo/interior/power) -"vFV" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/turf/open/floor/kutjevo/colors/orange, -/area/kutjevo/interior/power) "vGf" = ( /obj/structure/flora/grass/desert/lightgrass_3, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/scrubland) -"vGx" = ( -/obj/structure/filtration/coagulation_arm, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/platform/kutjevo/smooth, -/obj/structure/blocker/invisible_wall, -/turf/open/gm/river/desert/deep/toxic, -/area/kutjevo/interior/oob) "vHf" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/drinks/cans/sodawater{ @@ -14784,12 +14023,14 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/kutjevo/tan/multi_tiles/east, /area/kutjevo/interior/complex/botany/east) -"vHG" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 +"vHB" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/obj/structure/machinery/door/airlock/almayer/maint/colony/autoname{ + dir = 1; + req_one_access = null }, -/turf/open/desert/desert_shore/shore_corner2/west, -/area/kutjevo/exterior/runoff_river) +/turf/open/floor/plating/kutjevo, +/area/kutjevo/interior/foremans_office) "vHL" = ( /turf/open/floor/kutjevo/colors/green/tile, /area/kutjevo/interior/complex/botany/east) @@ -14824,15 +14065,10 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/kutjevo/grey/plate, /area/kutjevo/interior/complex/Northwest_Dorms) -"vKQ" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/complex_border/med_rec) +"vKF" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, +/turf/open/gm/river/desert/shallow, +/area/kutjevo/exterior/runoff_river) "vKV" = ( /obj/structure/surface/table/almayer, /obj/item/clothing/mask/cigarette/weed{ @@ -14864,6 +14100,11 @@ }, /turf/open/floor/kutjevo/colors/red, /area/kutjevo/interior/complex/med/pano) +"vMd" = ( +/obj/structure/platform_decoration/metal/kutjevo, +/obj/effect/landmark/survivor_spawner, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/interior/foremans_office) "vMf" = ( /obj/structure/surface/table/almayer, /turf/open/floor/kutjevo/colors/purple, @@ -14872,6 +14113,15 @@ /obj/structure/fence, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/construction) +"vMP" = ( +/obj/structure/platform/metal/kutjevo_smooth, +/turf/open/floor/kutjevo/colors/orange, +/area/kutjevo/interior/power) +"vMT" = ( +/obj/structure/platform/stone/kutjevo/east, +/obj/structure/platform/stone/kutjevo, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/scrubland) "vNt" = ( /obj/structure/bed/sofa/vert/white/top{ pixel_y = 17 @@ -14885,12 +14135,6 @@ }, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/colony_central) -"vOt" = ( -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/interior/foremans_office) "vOC" = ( /obj/effect/landmark/objective_landmark/close, /turf/open/floor/kutjevo/multi_tiles, @@ -14920,13 +14164,10 @@ /obj/structure/largecrate/random/case/double, /turf/open/floor/kutjevo/colors/cyan, /area/kutjevo/interior/complex/med/cells) -"vRH" = ( -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 8 - }, -/obj/structure/platform_decoration/kutjevo/rock, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/interior/colony_north) +"vSB" = ( +/obj/structure/platform/stone/kutjevo/west, +/turf/open/auto_turf/sand/layer2, +/area/kutjevo/exterior/scrubland) "vSE" = ( /obj/structure/cargo_container/grant/right, /turf/open/floor/kutjevo/colors/orange, @@ -14935,19 +14176,22 @@ /obj/structure/machinery/autolathe/full, /turf/open/floor/kutjevo/grey/plate, /area/kutjevo/interior/construction) -"vSW" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/turf/open/floor/kutjevo/colors/cyan/tile, -/area/kutjevo/interior/complex/med/cells) "vTc" = ( /obj/structure/prop/dam/boulder/boulder1, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/lz_dunes) -"vTe" = ( -/obj/structure/platform_decoration/kutjevo, -/turf/open/desert/desert_shore/desert_shore1/east, +"vTO" = ( +/obj/structure/monorail, +/obj/structure/platform/metal/kutjevo_smooth/west, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/interior/power) +"vUi" = ( +/obj/structure/platform/metal/kutjevo_smooth/west, +/turf/open/floor/kutjevo/multi_tiles/southwest, +/area/kutjevo/interior/colony_South/power2) +"vUI" = ( +/obj/structure/platform/metal/kutjevo_smooth/north, +/turf/open/desert/desert_shore/desert_shore1/west, /area/kutjevo/exterior/runoff_river) "vVr" = ( /turf/closed/wall/kutjevo/colony/reinforced, @@ -14956,12 +14200,10 @@ /obj/structure/flora/grass/tallgrass/desert, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/runoff_dunes) -"vXd" = ( -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/turf/open/floor/kutjevo/colors/purple/edge/east, -/area/kutjevo/interior/construction) +"vWj" = ( +/obj/effect/sentry_landmark/lz_1/top_left, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/lz_dunes) "vXo" = ( /obj/structure/stairs/perspective/kutjevo{ icon_state = "p_stair_full" @@ -14985,9 +14227,6 @@ /obj/structure/bed/chair/office/dark, /turf/open/floor/kutjevo/colors, /area/kutjevo/interior/colony_South/power2) -"vYC" = ( -/turf/open/desert/desert_shore/desert_shore1/east, -/area/kutjevo/exterior/scrubland) "vYD" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/kutjevo/colors/cyan, @@ -15005,6 +14244,10 @@ }, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/power) +"vYL" = ( +/obj/structure/platform/stone/kutjevo, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/lz_dunes) "vYQ" = ( /obj/structure/filtration/machine_96x96/indestructible{ icon_state = "distribution-damaged" @@ -15016,37 +14259,21 @@ /obj/structure/machinery/recharge_station, /turf/open/floor/kutjevo/multi_tiles/southwest, /area/kutjevo/interior/colony_South/power2) -"wae" = ( -/obj/structure/flora/grass/tallgrass/desert/corner{ - dir = 6 - }, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/scrubland) "wax" = ( /turf/closed/wall/kutjevo/colony, /area/kutjevo/exterior/lz_pad) -"waP" = ( -/obj/structure/stairs/perspective/kutjevo{ - icon_state = "p_stair_ew_full_cap_butt" - }, -/obj/structure/platform/stair_cut/alt{ - icon_state = "kutjevo_platform_sm_stair_alt" - }, -/turf/open/floor/kutjevo/colors/green, -/area/kutjevo/interior/complex/botany) -"waW" = ( -/obj/structure/stairs/perspective/kutjevo{ - dir = 5; - icon_state = "p_stair_full" - }, -/obj/structure/platform/kutjevo/smooth, -/turf/open/floor/kutjevo/multi_tiles, -/area/kutjevo/interior/power) +"waY" = ( +/turf/open/floor/kutjevo/tan/multi_tiles, +/area/kutjevo/exterior/runoff_dunes) "wbE" = ( /obj/structure/surface/rack, /obj/effect/landmark/objective_landmark/far, /turf/open/floor/kutjevo/grey/plate, /area/kutjevo/interior/construction) +"wbH" = ( +/obj/structure/platform/metal/kutjevo_smooth/east, +/turf/closed/wall/kutjevo/rock, +/area/kutjevo/exterior/runoff_bridge) "wbV" = ( /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/exterior/runoff_dunes) @@ -15103,21 +14330,13 @@ "wgK" = ( /turf/open/floor/coagulation/icon8_0, /area/kutjevo/exterior/scrubland) -"wgT" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 1 - }, -/obj/structure/platform/kutjevo/rock{ - dir = 8 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/lz_dunes) -"wix" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 4 +"whj" = ( +/obj/effect/decal/medical_decals{ + icon_state = "triagedecalbottomright" }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/scrubland) +/obj/structure/platform_decoration/metal/kutjevo/north, +/turf/open/floor/kutjevo/colors/cyan, +/area/kutjevo/interior/complex/med/triage) "wiC" = ( /obj/structure/machinery/colony_floodlight, /turf/open/auto_turf/sand/layer0, @@ -15127,17 +14346,15 @@ /obj/item/stack/sheet/wood, /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/power/comms) -"wjI" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/scrubland) "wjW" = ( /obj/structure/blocker/invisible_wall, /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/carpet, /area/kutjevo/interior/oob) +"wkl" = ( +/obj/structure/platform_decoration/metal/kutjevo, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/interior/colony_north) "wkw" = ( /obj/structure/prop/dam/boulder/boulder3, /turf/open/auto_turf/sand/layer0, @@ -15148,10 +14365,31 @@ }, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/construction) +"wkG" = ( +/obj/structure/platform/metal/kutjevo_smooth, +/turf/open/floor/kutjevo/multi_tiles, +/area/kutjevo/interior/power) +"wkS" = ( +/obj/structure/stairs/perspective/kutjevo{ + dir = 1; + icon_state = "p_stair_ew_half_cap" + }, +/obj/structure/platform/metal/kutjevo_smooth/east, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/runoff_dunes) "wlg" = ( /obj/structure/surface/rack, /turf/open/floor/kutjevo/tan, /area/kutjevo/exterior/lz_pad) +"wlk" = ( +/obj/structure/platform_decoration/stone/kutjevo/west, +/obj/structure/blocker/invisible_wall, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/interior/oob/dev_room) +"wlp" = ( +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/kutjevo/tan/multi_tiles, +/area/kutjevo/interior/power/comms) "wlq" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/book/manual/engineering_construction, @@ -15191,6 +14429,10 @@ }, /turf/open/floor/kutjevo/tan/grey_edge/east, /area/kutjevo/interior/complex/Northwest_Dorms) +"wot" = ( +/obj/structure/platform/metal/kutjevo, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/interior/colony_north) "wpq" = ( /obj/structure/blocker/invisible_wall, /turf/open/gm/river/desert/shallow, @@ -15219,19 +14461,19 @@ }, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/exterior/lz_pad) +"wrm" = ( +/obj/structure/platform/metal/kutjevo_smooth/east, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/kutjevo/multi_tiles/southwest, +/area/kutjevo/interior/colony_South/power2) "wrO" = ( /turf/open/gm/river/desert/shallow_edge/north, /area/kutjevo/exterior/spring) "wrV" = ( /turf/open/desert/desert_shore/desert_shore1/east, /area/kutjevo/exterior/spring) -"wsf" = ( -/obj/structure/platform_decoration/kutjevo/rock{ - dir = 8 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/gm/river/desert/shallow_edge/north, -/area/kutjevo/interior/oob) "wsk" = ( /obj/structure/surface/table/almayer, /obj/structure/bed/chair{ @@ -15262,13 +14504,6 @@ /obj/structure/largecrate/random/case, /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/power/comms) -"wuy" = ( -/obj/structure/flora/bush/ausbushes/grassybush, -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/turf/open/gm/river/desert/shallow, -/area/kutjevo/exterior/runoff_river) "wuH" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_core, /turf/open/auto_turf/sand/layer1, @@ -15327,12 +14562,10 @@ /obj/item/stack/cable_coil/random, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/interior/power) -"wwq" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/gm/river/desert/shallow_edge/north, -/area/kutjevo/exterior/runoff_river) +"wwl" = ( +/obj/structure/platform/metal/kutjevo/east, +/turf/open/gm/river/desert/deep, +/area/kutjevo/interior/complex/botany/east_tech) "wwQ" = ( /obj/structure/window/framed/kutjevo, /turf/open/floor/plating/kutjevo, @@ -15349,6 +14582,12 @@ /obj/item/tool/crowbar, /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/botany) +"wyq" = ( +/obj/structure/flora/grass/tallgrass/desert/corner{ + dir = 1 + }, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/scrubland/south) "wyy" = ( /obj/structure/machinery/light{ dir = 1 @@ -15362,6 +14601,10 @@ }, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/complex_border/med_rec) +"wzY" = ( +/obj/structure/platform/metal/kutjevo/west, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/scrubland) "wAo" = ( /obj/structure/surface/table/gamblingtable, /obj/item/toy/deck/uno, @@ -15370,33 +14613,20 @@ "wAp" = ( /turf/open/auto_turf/sand/layer2, /area/kutjevo/interior/construction) -"wAq" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/turf/open/floor/almayer/research/containment/floor1, -/area/kutjevo/interior/complex/med/locks) -"wAF" = ( -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/obj/structure/stairs/perspective/kutjevo{ - icon_state = "p_stair_sn_full_cap" - }, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/interior/construction) "wBt" = ( /obj/structure/machinery/colony_floodlight{ pixel_y = 10 }, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/lz_river) -"wCe" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/floor/kutjevo/tan, -/area/kutjevo/interior/complex/botany) +"wBI" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/scrubland) +"wBO" = ( +/obj/structure/platform_decoration/stone/kutjevo/east, +/turf/open/auto_turf/sand/layer2, +/area/kutjevo/exterior/scrubland) "wCJ" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/kutjevo/tan, @@ -15427,12 +14657,6 @@ }, /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/foremans_office) -"wEh" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/gm/river/desert/shallow_edge/northeast, -/area/kutjevo/exterior/runoff_river) "wEU" = ( /obj/structure/barricade/wooden{ dir = 1; @@ -15487,21 +14711,26 @@ /obj/effect/landmark/corpsespawner/colonist/kutjevo, /turf/open/floor/kutjevo/grey/plate, /area/kutjevo/interior/construction) -"wLB" = ( -/obj/item/fuel_cell, -/obj/structure/surface/rack, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 +"wLH" = ( +/obj/structure/stairs/perspective/kutjevo{ + dir = 10; + icon_state = "p_stair_full" }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 +/obj/structure/platform/metal/stair_cut/kutjevo_smooth_right, +/obj/structure/machinery/light/small{ + dir = 1; + pixel_y = 20 }, -/turf/open/floor/kutjevo/multi_tiles/southwest, -/area/kutjevo/interior/colony_South/power2) +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/runoff_bridge) "wMw" = ( /obj/structure/blocker/invisible_wall, /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/interior/power) +"wMS" = ( +/obj/structure/prop/dam/boulder/boulder3, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/scrubland/south) "wNh" = ( /obj/structure/machinery/power/apc/no_power/north, /obj/structure/machinery/light{ @@ -15535,12 +14764,25 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/kutjevo/grey/plate, /area/kutjevo/interior/construction) -"wQZ" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 +"wQg" = ( +/obj/structure/platform/metal/kutjevo/north, +/obj/structure/platform/metal/kutjevo/west, +/obj/structure/blocker/invisible_wall, +/obj/structure/platform/metal/kutjevo, +/obj/structure/filtration/machine_32x64/indestructible{ + bound_height = 32; + icon_state = "solo_tank_empty" }, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/interior/oob) +"wRj" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, +/turf/open/gm/river/desert/shallow_edge/north, +/area/kutjevo/exterior/runoff_river) +"wSk" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, /turf/open/auto_turf/sand/layer0, -/area/kutjevo/interior/colony_north) +/area/kutjevo/exterior/scrubland) "wSw" = ( /obj/structure/blocker/invisible_wall, /turf/open/floor/kutjevo/colors/red/tile, @@ -15551,6 +14793,11 @@ }, /turf/open/floor/kutjevo/grey/plate, /area/kutjevo/interior/construction) +"wTk" = ( +/obj/structure/platform/metal/kutjevo, +/obj/structure/blocker/invisible_wall, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/exterior/runoff_dunes) "wTr" = ( /obj/effect/landmark/xeno_hive_spawn, /obj/effect/landmark/ert_spawns/groundside_xeno, @@ -15559,6 +14806,14 @@ "wTt" = ( /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/colony_north) +"wTB" = ( +/obj/structure/platform/metal/stair_cut/kutjevo_smooth_left, +/obj/structure/stairs/perspective/kutjevo{ + dir = 8; + icon_state = "p_stair_ew_full_cap_butt" + }, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/complex_border/med_rec) "wUa" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/auto_turf/sand/layer1, @@ -15574,6 +14829,12 @@ /obj/item/stack/cable_coil/random, /turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/interior/colony_South/power2) +"wVK" = ( +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/scrubland/south) +"wWa" = ( +/turf/closed/wall/kutjevo/rock, +/area/kutjevo/exterior/scrubland/south) "wWk" = ( /obj/structure/stairs/perspective/kutjevo{ dir = 8; @@ -15581,15 +14842,6 @@ }, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/power/comms) -"wWq" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/barricade/handrail/kutjevo{ - layer = 3.1 - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/runoff_bridge) "wWy" = ( /turf/open/gm/river/desert/deep/toxic, /area/kutjevo/interior/complex/med) @@ -15625,6 +14877,13 @@ }, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/complex/med) +"wYf" = ( +/obj/structure/platform/metal/kutjevo_smooth, +/obj/structure/barricade/handrail/kutjevo{ + layer = 3.1 + }, +/turf/open/floor/kutjevo/colors/orange, +/area/kutjevo/interior/colony_South/power2) "wYp" = ( /turf/open/gm/grass/grass1/weedable, /area/kutjevo/exterior/complex_border/med_park) @@ -15632,6 +14891,11 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/auto_turf/sand/layer2, /area/kutjevo/interior/colony_S_East) +"wYS" = ( +/obj/structure/blocker/invisible_wall, +/obj/structure/platform/metal/kutjevo/west, +/turf/open/gm/river/red_pool, +/area/kutjevo/interior/oob) "wZo" = ( /obj/structure/stairs/perspective/kutjevo{ dir = 8; @@ -15661,6 +14925,10 @@ /obj/item/explosive/plastic, /turf/open/floor/kutjevo/colors/green/tile, /area/kutjevo/interior/complex/botany/east) +"xbM" = ( +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/kutjevo/tan/multi_tiles, +/area/kutjevo/interior/power/comms) "xca" = ( /obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/kutjevo/tan/alt_inner_edge/north, @@ -15684,10 +14952,22 @@ /obj/item/clothing/accessory/storage/black_vest, /turf/open/floor/kutjevo/colors, /area/kutjevo/interior/power/comms) +"xeY" = ( +/obj/structure/platform/metal/kutjevo_smooth, +/turf/open/asphalt/cement_sunbleached, +/area/kutjevo/interior/power) "xfW" = ( /obj/item/reagent_container/glass/bucket, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/complex/botany) +"xgk" = ( +/obj/structure/stairs/perspective/kutjevo{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/kutjevo_smooth, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/interior/power) "xgl" = ( /turf/closed/wall/kutjevo/colony, /area/kutjevo/interior/complex/med/operating) @@ -15703,6 +14983,12 @@ }, /turf/open/floor/almayer/research/containment/floor1, /area/kutjevo/interior/complex/botany) +"xie" = ( +/obj/structure/flora/bush/desert{ + icon_state = "tree_3" + }, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/scrubland/south) "xjf" = ( /obj/structure/stairs/perspective/kutjevo{ dir = 1; @@ -15714,19 +15000,6 @@ }, /turf/open/floor/kutjevo/tan/multi_tiles/north, /area/kutjevo/interior/power/comms) -"xjg" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/obj/structure/flora/bush/ausbushes/grassybush{ - pixel_x = 5; - pixel_y = -12 - }, -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/turf/open/desert/desert_shore/desert_shore1/west, -/area/kutjevo/exterior/lz_river) "xjY" = ( /turf/open/floor/almayer/research/containment/floor1, /area/kutjevo/interior/power) @@ -15759,16 +15032,10 @@ /obj/structure/machinery/light, /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/power_pt2_electric_boogaloo) -"xms" = ( -/obj/structure/stairs/perspective/kutjevo{ - dir = 10; - icon_state = "p_stair_full" - }, -/obj/structure/platform/stair_cut/alt{ - icon_state = "kutjevo_platform_sm_stair_alt" - }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/runoff_bridge) +"xmQ" = ( +/obj/structure/platform_decoration/stone/kutjevo, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/scrubland) "xnk" = ( /obj/item/ammo_magazine/rifle/mar40, /turf/open/floor/kutjevo/tan/multi_tiles/north, @@ -15801,6 +15068,11 @@ "xoV" = ( /turf/open/desert/desert_shore/shore_corner2/east, /area/kutjevo/exterior/runoff_dunes) +"xpa" = ( +/obj/structure/platform/metal/kutjevo_smooth/east, +/obj/structure/platform/metal/kutjevo_smooth, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/interior/power) "xpd" = ( /obj/structure/largecrate/guns/merc, /turf/open/auto_turf/sand/layer0, @@ -15818,12 +15090,25 @@ /obj/effect/landmark/monkey_spawn, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_N_East) +"xqK" = ( +/obj/structure/flora/bush/ausbushes/reedbush{ + pixel_x = -5; + pixel_y = 6 + }, +/obj/structure/platform_decoration/metal/kutjevo, +/turf/open/desert/desert_shore/desert_shore1/north, +/area/kutjevo/exterior/runoff_river) "xqM" = ( /obj/structure/machinery/light{ dir = 8 }, /turf/open/floor/kutjevo/colors/cyan, /area/kutjevo/interior/complex/med) +"xqQ" = ( +/obj/structure/platform/stone/kutjevo, +/obj/structure/platform/stone/kutjevo/east, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/interior/colony_central) "xqV" = ( /obj/effect/landmark/queen_spawn, /turf/open/auto_turf/sand/layer1, @@ -15861,14 +15146,14 @@ /obj/structure/flora/grass/desert/lightgrass_8, /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/lz_pad) -"xti" = ( -/obj/structure/stairs/perspective/kutjevo{ - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform/kutjevo, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/exterior/complex_border/med_rec) +"xty" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/gm/river/desert/shallow_edge/northeast, +/area/kutjevo/exterior/runoff_river) +"xtz" = ( +/obj/structure/platform/metal/kutjevo_smooth/west, +/turf/open/floor/kutjevo/colors/cyan, +/area/kutjevo/interior/complex/med/operating) "xtN" = ( /obj/structure/bed/chair{ dir = 4 @@ -15918,15 +15203,6 @@ /obj/item/stack/sheet/metal/medium_stack, /turf/open/floor/kutjevo/colors/orange/edge, /area/kutjevo/interior/power_pt2_electric_boogaloo) -"xyx" = ( -/obj/structure/stairs/perspective/kutjevo{ - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform/kutjevo/smooth, -/obj/structure/machinery/light, -/turf/open/floor/kutjevo/colors/purple, -/area/kutjevo/interior/complex/med/locks) "xyF" = ( /obj/effect/landmark/objective_landmark/close, /turf/open/floor/kutjevo/grey/plate, @@ -15955,14 +15231,6 @@ }, /turf/open/floor/almayer/research/containment/floor1, /area/kutjevo/exterior/lz_pad) -"xBb" = ( -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/obj/structure/platform/kutjevo, -/obj/structure/blocker/invisible_wall, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/exterior/runoff_dunes) "xBm" = ( /turf/open/floor/almayer/research/containment/floor2, /area/kutjevo/exterior/Northwest_Colony) @@ -16018,12 +15286,6 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/power) -"xIk" = ( -/obj/structure/flora/bush/ausbushes/reedbush{ - pixel_y = 14 - }, -/turf/open/desert/desert_shore/desert_shore1, -/area/kutjevo/exterior/scrubland) "xIo" = ( /obj/structure/prop/dam/large_boulder/boulder2, /turf/open/auto_turf/sand/layer0, @@ -16039,6 +15301,14 @@ /obj/structure/window/framed/kutjevo, /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/complex/med/auto_doc) +"xKz" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/interior/colony_central) +"xLW" = ( +/obj/structure/platform_decoration/stone/kutjevo/east, +/turf/open/auto_turf/sand/layer1, +/area/kutjevo/exterior/lz_dunes) "xMm" = ( /obj/structure/largecrate/machine/autodoc, /turf/open/auto_turf/sand/layer2, @@ -16059,14 +15329,6 @@ "xNG" = ( /turf/open/auto_turf/sand/layer2, /area/kutjevo/exterior/telecomm/lz1_south) -"xOx" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/barricade/handrail/kutjevo{ - layer = 3.1 - }, -/obj/structure/machinery/power/port_gen/pacman/super, -/turf/open/floor/kutjevo/multi_tiles/southwest, -/area/kutjevo/interior/colony_South/power2) "xOU" = ( /obj/structure/sign/safety/hazard{ pixel_x = -32 @@ -16081,6 +15343,16 @@ /obj/structure/barricade/wooden, /turf/open/floor/kutjevo/colors/red/tile, /area/kutjevo/interior/complex/botany) +"xPn" = ( +/obj/structure/platform/metal/kutjevo/north, +/obj/structure/platform/metal/kutjevo/west, +/obj/structure/blocker/invisible_wall, +/turf/open/floor/plating/kutjevo, +/area/kutjevo/exterior/runoff_dunes) +"xPw" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/construction) "xPU" = ( /obj/effect/landmark/nightmare{ insert_tag = "communications" @@ -16105,23 +15377,10 @@ }, /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/power) -"xRx" = ( -/obj/structure/machinery/power/apc/no_power/north, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/turf/open/floor/kutjevo/colors/cyan/tile, -/area/kutjevo/interior/complex/med/cells) "xRY" = ( /obj/effect/landmark/xeno_spawn, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_N_East) -"xSn" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/turf/closed/wall/kutjevo/rock, -/area/kutjevo/exterior/runoff_bridge) "xSX" = ( /obj/structure/machinery/light{ dir = 1 @@ -16137,21 +15396,23 @@ /obj/item/stack/sheet/metal/small_stack, /turf/open/floor/kutjevo/colors/orange/edge/west, /area/kutjevo/interior/complex/Northwest_Security_Checkpoint) -"xVt" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/stairs/perspective/kutjevo{ - dir = 9; - icon_state = "p_stair_full" +"xUG" = ( +/obj/structure/closet/secure_closet/medical3{ + req_access = null }, -/turf/open/floor/kutjevo/multi_tiles, -/area/kutjevo/interior/power) -"xVM" = ( -/obj/structure/platform/kutjevo/rock, -/obj/structure/platform/kutjevo/rock{ - dir = 8 +/obj/structure/window/reinforced{ + dir = 4 }, -/turf/open/auto_turf/sand/layer0, -/area/kutjevo/interior/colony_N_East) +/obj/item/storage/pill_bottle/kelotane/skillless, +/obj/structure/platform_decoration/metal/kutjevo/east, +/obj/structure/platform/metal/kutjevo_smooth, +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/kutjevo/grey/plate, +/area/kutjevo/interior/complex/med/operating) +"xVy" = ( +/obj/effect/sentry_landmark/lz_2/bottom_right, +/turf/open/auto_turf/sand/layer2, +/area/kutjevo/exterior/Northwest_Colony) "xVZ" = ( /turf/open/floor/kutjevo/tan/multi_tiles/west, /area/kutjevo/interior/colony_South/power2) @@ -16174,13 +15435,12 @@ }, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/runoff_dunes) -"xYs" = ( -/obj/structure/platform_decoration/kutjevo/rock, -/turf/open/auto_turf/sand/layer1, -/area/kutjevo/exterior/scrubland) -"xYt" = ( -/turf/open/desert/desert_shore/shore_edge1, -/area/kutjevo/exterior/scrubland) +"xYD" = ( +/obj/structure/flora/grass/tallgrass/desert/corner{ + dir = 8 + }, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/scrubland/south) "xYR" = ( /obj/item/stack/sheet/wood, /obj/item/storage/belt/marine, @@ -16215,6 +15475,14 @@ }, /turf/open/floor/kutjevo/grey/plate, /area/kutjevo/interior/complex/Northwest_Dorms) +"xZR" = ( +/obj/structure/platform/metal/kutjevo_smooth, +/obj/structure/machinery/smartfridge/chemistry, +/obj/effect/decal/medical_decals{ + icon_state = "triagedecalleft" + }, +/turf/open/floor/kutjevo/colors/cyan/tile, +/area/kutjevo/interior/complex/med/operating) "xZT" = ( /obj/effect/spawner/random/tool, /turf/open/auto_turf/sand/layer0, @@ -16222,16 +15490,6 @@ "yah" = ( /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/complex/botany/east_tech) -"yas" = ( -/obj/structure/stairs/perspective/kutjevo{ - dir = 8; - icon_state = "p_stair_ew_full_cap_butt" - }, -/obj/structure/platform/stair_cut{ - icon_state = "kutjevo_platform_sm_stair" - }, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/interior/power) "yaE" = ( /obj/structure/machinery/landinglight/ds1/delayone{ dir = 8 @@ -16271,10 +15529,22 @@ "ycN" = ( /turf/open/floor/kutjevo/tan/multi_tiles/east, /area/kutjevo/interior/complex/botany) -"ydh" = ( -/obj/structure/platform_decoration/kutjevo, -/turf/open/gm/river/desert/shallow_edge/east, -/area/kutjevo/exterior/runoff_river) +"ydQ" = ( +/obj/structure/platform/metal/kutjevo/north, +/turf/open/floor/kutjevo/multi_tiles/north, +/area/kutjevo/exterior/complex_border/med_rec) +"yeD" = ( +/obj/structure/stairs/perspective/kutjevo{ + dir = 6; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/stair_cut/kutjevo_smooth_left, +/obj/structure/machinery/light/small{ + dir = 1; + pixel_y = 20 + }, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/exterior/runoff_bridge) "yeY" = ( /obj/item/stack/sheet/wood, /turf/open/floor/kutjevo/colors/orange, @@ -16285,6 +15555,10 @@ "yfo" = ( /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/colony_central) +"yfH" = ( +/obj/structure/platform/metal/kutjevo, +/turf/open/floor/coagulation/icon7_0, +/area/kutjevo/interior/construction) "ygh" = ( /obj/effect/decal/cleanable/blood, /obj/structure/pipes/standard/simple/visible{ @@ -16340,18 +15614,6 @@ "yir" = ( /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/complex/botany/east) -"yiX" = ( -/obj/structure/stairs/perspective/kutjevo{ - dir = 8; - icon_state = "p_stair_ew_half_cap" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/largecrate/supply/medicine/blood, -/obj/effect/landmark/objective_landmark/science, -/turf/open/floor/kutjevo/colors/cyan/tile, -/area/kutjevo/interior/complex/med/cells) "yjF" = ( /turf/open/desert/desert_shore/shore_corner2/west, /area/kutjevo/exterior/runoff_bridge) @@ -16368,12 +15630,6 @@ /obj/structure/prop/dam/large_boulder/boulder2, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/runoff_dunes) -"ykE" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/floor/kutjevo/colors/cyan, -/area/kutjevo/interior/complex/med/cells) "ykL" = ( /obj/structure/largecrate/random, /turf/open/floor/kutjevo/multi_tiles/east, @@ -16383,28 +15639,11 @@ /obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_north) -"ylf" = ( -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/obj/structure/stairs/perspective/kutjevo{ - dir = 4; - icon_state = "p_stair_sn_full_cap" - }, -/turf/open/floor/plating/kutjevo, -/area/kutjevo/exterior/complex_border/med_rec) -"ylh" = ( -/obj/structure/closet/secure_closet/medical3{ - req_access = null - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/item/storage/pill_bottle/tramadol/skillless, -/obj/structure/platform/kutjevo/smooth, -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor/strata/multi_tiles/west, -/area/kutjevo/interior/complex/med/operating) +"yln" = ( +/obj/structure/platform/stone/kutjevo/east, +/obj/structure/blocker/invisible_wall, +/turf/open/auto_turf/sand/layer0, +/area/kutjevo/interior/oob/dev_room) "ymc" = ( /obj/structure/machinery/shower{ name = "automatic sprinkler"; @@ -16689,9 +15928,9 @@ dxF dxF dxF mxB -svp +rVi fQB -loe +aVR mxB dxF dxF @@ -16856,9 +16095,9 @@ dxF dxF dxF mxB -svp +rVi fQB -loe +aVR mxB dxF dxF @@ -17023,9 +16262,9 @@ dxF dxF dxF mxB -svp +rVi fQB -loe +aVR mxB dxF dxF @@ -17190,9 +16429,9 @@ dxF dxF mxB mxB -svp +rVi fQB -loe +aVR mxB dxF dxF @@ -17356,10 +16595,10 @@ dxF dxF dxF mxB -trC -kec +fAL +dfC fQB -loe +aVR mxB dxF dxF @@ -17523,10 +16762,10 @@ dxF dxF dxF mxB -svp +rVi fQB fQB -loe +aVR mxB mxB dxF @@ -17690,11 +16929,11 @@ ibm dxF dxF mxB -svp +rVi fQB fQB -hoW -lCH +lVg +gts mxB dxF dxF @@ -17857,11 +17096,11 @@ hMi dxF dxF mxB -svp +rVi fQB fQB fQB -loe +aVR mxB mxB dxF @@ -18024,12 +17263,12 @@ ibm dxF dxF mxB -svp +rVi fQB fQB fQB -hoW -lCH +lVg +gts mxB dxF dxF @@ -18191,12 +17430,12 @@ ibm lfG dxF mxB -lUM +fly fQB fQB fQB fQB -loe +aVR mxB dxF dxF @@ -18358,12 +17597,12 @@ kie ibm nPs osB -bFz +kYg ppM fQB fQB fQB -loe +aVR mxB dxF dxF @@ -18525,12 +17764,12 @@ uDP nPs ibm osB -uWk +uon aHg acN ppM fQB -loe +aVR mxB dxF dxF @@ -18691,13 +17930,13 @@ lmK oFs nPs nPs -fqR -kSo +oKX +mvz ckF bDW fAF fQB -loe +aVR mxB dxF dxF @@ -18801,7 +18040,7 @@ kWX kWX lKk lKk -dmy +eAA dmy jGF bEt @@ -18858,13 +18097,13 @@ ibm nPs osB rkt -jBJ -fOU +yln +wlk ibm rYs fAF fQB -uam +dDT jhS jhS jhS @@ -19026,12 +18265,12 @@ osB dxF dxF mxB -gfK +jcH eQK qaY fAF fQB -rYM +uZG sBH kVJ prJ @@ -19193,12 +18432,12 @@ dxF dxF dxF mxB -uGB +jsi mCo iob lYI fQB -rYM +uZG sBH kVJ wGH @@ -19303,14 +18542,14 @@ lzD dBj dmy dmy -dmy -lKk -lKk +eAA lKk lKk +aiJ lKk lKk lKk +edM lKk lKk lKk @@ -19360,12 +18599,12 @@ dxF dxF dxF mxB -lXe -wsf +bQJ +ruP fQB fQB fQB -rYM +uZG sBH kVJ wGH @@ -19528,11 +18767,11 @@ dxF dxF mxB mxB -ebP -han +bgN +uVc fQB fQB -rYM +uZG sBH kVJ wGH @@ -19696,10 +18935,10 @@ dxF dxF mxB mxB -svp +rVi fQB fQB -qBz +lSS jhS jhS jhS @@ -19863,11 +19102,11 @@ dxF dxF dxF mxB -svp +rVi fQB fQB fQB -loe +aVR mxB dxF prJ @@ -20030,11 +19269,11 @@ dxF dxF dxF mxB -svp +rVi fQB fQB fQB -loe +aVR mxB mxB dxF @@ -20146,7 +19385,7 @@ fmN fmN fmN jGF -qnd +iLQ lKk mAb ggC @@ -20197,11 +19436,11 @@ dxF dxF dxF mxB -svp +rVi fQB fQB fQB -loe +aVR mxB dxF dxF @@ -20864,14 +20103,14 @@ dxF mxB bff oqw -mHo -ozs -lzb -lzb -lzb -lzb -lzb -vre +tQl +kWp +hdP +hdP +hdP +hdP +hdP +jMo tlN dxF dxF @@ -20980,7 +20219,7 @@ lKk lKk lKk lKk -lKk +edM lKk cpD mAb @@ -21033,13 +20272,13 @@ mxB mxB tlN ozq -xzY -xzY -xzY -xzY -xzY -msF -pyp +boR +boR +boR +boR +boR +ogt +tlN dxF dxF vei @@ -21548,10 +20787,10 @@ prJ prJ vei wGH -hzG -qRR -qRR -vhQ +fSL +dYs +dYs +hvr prJ vei wGH @@ -21685,9 +20924,9 @@ dxF dxF dxF dxF -mbh -rsV -xYt +fSk +lrQ +sFD dxF tlN cnb @@ -21710,15 +20949,15 @@ kMP pmu qzd ubV -wGH +emq vei vei prJ prJ -piq +vYL mhJ qGJ -tQi +dGb vei wGH vei @@ -21745,7 +20984,7 @@ qZO wGH uQJ wGH -vei +lRk wGH wGH wGH @@ -21785,7 +21024,7 @@ rSU rSU lKk rSU -rSU +tTf lKk rSU rSU @@ -21852,10 +21091,10 @@ dxF dxF dxF dxF -dsp -dJs -xIk -bXl +jdu +dmp +pre +wVK tlN uKW moL @@ -21869,7 +21108,7 @@ kMP qGQ aAe kMP -qAk +fLq kMP kMP kMP @@ -21882,10 +21121,10 @@ wGH prJ prJ prJ -piq +vYL cLQ qru -tQi +dGb wGH vei prJ @@ -21949,13 +21188,13 @@ lKk tHh lKk lKk +cOk lKk lKk lKk lKk lKk -lKk -tHh +sqX lKk lKk tHh @@ -22019,10 +21258,10 @@ dxF dxF dxF dxF -gxs -kjo -umQ -bXl +cen +dWj +soy +wVK fFH rwX boR @@ -22049,10 +21288,10 @@ prJ prJ prJ wGH -piq +vYL ich -wgT -gSA +dOS +num wGH wGH jqt @@ -22064,7 +21303,7 @@ jqt vei vei wGH -wGH +uWT wGH prJ prJ @@ -22072,10 +21311,10 @@ wGH wGH wGH wGH +txS wGH wGH -wGH -wGH +txS wGH wGH vei @@ -22186,10 +21425,10 @@ dxF dxF dxF dxF -sYd -sYd -sYd -sYd +fgI +fgI +fgI +fgI xjf aAe kMP @@ -22213,12 +21452,12 @@ dfa eRE prJ prJ -wGH +emq vei vei -gPW -iGS -ebZ +aHI +fJm +xLW wGH wGH wGH @@ -22351,12 +21590,12 @@ dxF dxF dxF dxF -bXl -bXl -sYd -sYd -sYd -sYd +wVK +wVK +fgI +fgI +fgI +fgI qGQ bNN pPn @@ -22383,7 +21622,7 @@ prJ vei vei vei -prJ +vWj vei wGH wGH @@ -22401,7 +21640,7 @@ wGH szJ wGH wGH -prJ +cFp prJ prJ prJ @@ -22517,13 +21756,13 @@ dxF dxF dxF dxF -bXl -bXl -sYd -sYd -kIn -sYd -sYd +wVK +wVK +fgI +fgI +tKH +fgI +fgI nOx gTy boR @@ -22573,7 +21812,7 @@ prJ prJ prJ prJ -prJ +cFp prJ prJ wGH @@ -22684,13 +21923,13 @@ dxF dxF dxF dxF -bXl -bXl -sYd -sYd -bXl -sYd -bXl +wVK +wVK +fgI +fgI +wVK +fgI +wVK tlN bmk moL @@ -22721,7 +21960,7 @@ vei prJ prJ wGH -wGH +tzY prJ wGH wGH @@ -22756,9 +21995,9 @@ eWP hQj hQj hWX -qid -jPb -jPb +cpq +vTO +vTO lVS wZP "} @@ -22851,13 +22090,13 @@ dxF dxF dxF dxF -bXl -kIn -sYd -sYd -bXl -bXl -bXl +wVK +tKH +fgI +fgI +wVK +wVK +wVK tlN tWM tWM @@ -22890,7 +22129,7 @@ prJ wGH wGH prJ -prJ +jOK prJ prJ wGH @@ -22923,9 +22162,9 @@ hQj pHv hQj aFr -tEK -afS -afS +aGR +nKm +nKm lVS wZP "} @@ -23018,13 +22257,13 @@ dxF dxF dxF dxF -bXl -sYd -sYd -bXl -bXl -bEp -bXl +wVK +fgI +fgI +wVK +wVK +wWa +wVK tlN tWM tWM @@ -23072,14 +22311,14 @@ wGH jqt jqt jqt -caj -uNZ -cKH +jiy +dqa +nxN prJ prJ prJ -udm -uNZ +rYV +dqa jqt jqt pyp @@ -23183,15 +22422,15 @@ dxF dxF dxF dxF -swl -mFf -bXl -sYd -bXl -bXl -bXl -bXl -bXl +hiI +plM +wVK +fgI +wVK +wVK +wVK +wVK +wVK tlN tWM tWM @@ -23241,11 +22480,11 @@ jqt pyp pyp pyp -uPu +vcO vYI vYI vYI -uCR +xgk pyp pyp pyp @@ -23350,15 +22589,15 @@ dxF dxF dxF dxF -swl -mFf -bXl -sYd -bXl -bXl -bEp -bEp -bEp +hiI +plM +wVK +fgI +wVK +wVK +wWa +wWa +wWa tlN tWM tWM @@ -23389,7 +22628,7 @@ wGH jqt jqt wGH -prJ +jOK wGH wGH wGH @@ -23417,18 +22656,18 @@ aHW aHW aHW pXf -vCT -iCG +gsp +jmH aHW evZ hQj evZ aHW -dtM -arr -uNI -nHU -nHU +hRO +vuv +wYS +mhu +mhu "} (43,1,1) = {" ybY @@ -23517,15 +22756,15 @@ dxF dxF dxF dxF -swl -mFf -bXl -bXl -bXl -sYd -bEp -bEp -bEp +hiI +plM +wVK +wVK +wVK +fgI +wWa +wWa +wWa tlN tlN tlN @@ -23570,7 +22809,7 @@ azO azO azO azO -cun +diY pyp pyp nXX @@ -23581,17 +22820,17 @@ hQj hQj dAB rwj -muG -muG -qVZ -tuW -gtE +geQ +geQ +ruz +pcd +lNH byl evZ kdY evZ byl -iXj +rIq qAP gWo mNl @@ -23683,16 +22922,16 @@ dxF dxF dxF dxF -dez -dez -hSC -bXl -kIn -kIn -bXl -sYd -kIn -bEp +csx +csx +nIs +wVK +tKH +tKH +wVK +fgI +tKH +wWa tlN tlN tlN @@ -23707,7 +22946,7 @@ tlN tlN scu lkP -ffu +xbM adX tlN tlN @@ -23737,7 +22976,7 @@ gWd gWd iSN nQo -ozl +cRy vin pBV hQj @@ -23752,13 +22991,13 @@ wMw wMw wMw eJi -kbg +cdz byl evZ hQj evZ byl -iXj +rIq qwg eKr qAP @@ -23850,26 +23089,26 @@ hrz hrz dxF dxF -kIn -kIn -bXl -sYd -bXl -bXl -bXl -bXl -sYd -kIn +tKH +tKH +wVK +fgI +wVK +wVK +wVK +wVK +fgI +tKH bfg bfg -aNn +tKH dSQ wWk mOe mOe mOe mOe -lqG +bEu tlN vlt boR @@ -23878,8 +23117,8 @@ hnZ boR ezX kMx -xjg -uqL +pSi +coa azO azO azO @@ -23904,7 +23143,7 @@ gWd gWd dTp sOJ -oOO +gbm vin pBV hQj @@ -23915,17 +23154,17 @@ hQj hQj mcA rwj -uZT -uZT -uZT -fdF -kbg +mZo +mZo +mZo +izD +cdz byl evZ kdY evZ byl -iem +viE qAP qAP mNl @@ -24014,29 +23253,29 @@ hrz hrz hrz hrz -kIn -kIn -bXl -sYd -bXl -bXl -bXl -bXl -bXl -bXl -bXl -bXl -sYd -bXl -bXl -sYd -sYd -sYd -sYd -kIn -sYd -sYd -gzv +tKH +tKH +wVK +fgI +wVK +wVK +wVK +wVK +wVK +wVK +wVK +wVK +fgI +wVK +wVK +fgI +fgI +fgI +fgI +tKH +fgI +fgI +roO ezX mZE lkP @@ -24045,7 +23284,7 @@ tXm mZE ezX kMx -kdf +gFz cNE nQo nQo @@ -24071,7 +23310,7 @@ xpk xpk aWt uGd -fkP +oSU vin pyp wNh @@ -24085,14 +23324,14 @@ aHW aHW aHW pXf -sVc -kbg +bZm +cdz aHW awa fRI uqR aHW -iXj +rIq qwg mNl mNl @@ -24181,39 +23420,39 @@ hrz hrz hrz hrz -kIn -kIn -pEJ -bXl -bXl -bXl -bXl -bXl -bXl -bXl -bXl -bXl -sYd -sYd -sYd -sYd -sYd -sYd -bXl -bXl -bXl -sYd -gzv +tKH +tKH +xie +wVK +wVK +wVK +wVK +wVK +wVK +wVK +wVK +wVK +fgI +fgI +fgI +fgI +fgI +fgI +wVK +wVK +wVK +fgI +roO ezX mZE tXm -dQY +wlp tXm lac tlN kMx -kdf -dsp +gFz +jdu sDG sDG sDG @@ -24238,7 +23477,7 @@ sCA ddq mqu uGd -fkP +oSU vin pBV vOC @@ -24249,17 +23488,17 @@ kdY kdY tEj rwj -muG -muG -qVZ -tuW -kbg +geQ +geQ +ruz +pcd +cdz byl sTC kdY pvL byl -iXj +rIq qwg sUC eKr @@ -24307,7 +23546,7 @@ sVF dXL qxc hrz -nRd +dJh hrz hrz iin @@ -24347,30 +23586,30 @@ hrz hrz sVF hrz -bXl -sYd -sYd -bXl -bXl -bXl -bXl -kIn -sYd -sYd -sYd -bXl -sYd -sYd -sYd -sYd -sYd -sYd -bXl -kIn -kIn -sYd -sYd -gzv +wVK +fgI +fgI +wVK +wVK +wVK +wVK +tKH +fgI +fgI +fgI +wVK +fgI +fgI +fgI +fgI +fgI +fgI +wVK +tKH +tKH +fgI +fgI +roO ezX aCo tXm @@ -24379,9 +23618,9 @@ esi mZE ezX kMx -kdf -kdf -mIA +gFz +gFz +deM tUz pjH tUz @@ -24405,7 +23644,7 @@ azO azO tjS uGd -fkP +oSU vin pBV xGI @@ -24420,13 +23659,13 @@ wMw wMw wMw bVB -kbg +cdz byl vFv hQj evZ byl -iXj +rIq qwg qwg flP @@ -24477,12 +23716,12 @@ hrz hrz hrz hrz -iin +xVy huR huR huR lRy -dht +lRB dht dht dht @@ -24513,42 +23752,42 @@ dxF hrz sVF hrz -bXl -bXl -kIn -sYd -sYd -bXl -bXl -kIn -sYd -bXl -sYd -sYd -sYd -bXl -bXl -sYd -bXl -bXl -bXl -bEp -bEp -sYd -sYd -sYd -pBi +wVK +wVK +tKH +fgI +fgI +wVK +wVK +tKH +fgI +wVK +fgI +fgI +fgI +wVK +wVK +fgI +wVK +wVK +wVK +wWa +wWa +fgI +fgI +fgI +lAw tlN vlt lsy -kdY -kdY -cIE -pBV +eiG +eiG +dlR +ezX kMx -nWo -cBi -vYC +tqN +cuG +buJ xpk xpk xpk @@ -24572,7 +23811,7 @@ gWd gWd iSN eyU -dyU +gyW pyp pyp sNp @@ -24583,17 +23822,17 @@ bbL xjY raV rwj -uZT -uZT -uZT -fdF -sYV +mZo +mZo +mZo +izD +rwg byl evZ kdY sTC byl -iXj +rIq qwg flP mNl @@ -24678,33 +23917,33 @@ dxF dxF dxF sVF -kIn -bXl -sYd -kIn -sYd -bXl -bXl -sYd -bXl -kIn -bXl -bXl -fui -rsV -xYt -via -bEp -bXl -bEp -bEp -bEp -bEp -bEp -sYd -sYd -sYd -sqr +tKH +wVK +fgI +tKH +fgI +wVK +wVK +fgI +wVK +tKH +wVK +wVK +rYn +lrQ +sFD +nzv +wWa +wVK +wWa +wWa +wWa +wWa +wWa +fgI +fgI +fgI +eUX tlN tlN ezX @@ -24713,9 +23952,9 @@ ezX tlN tlN tlN -nrk -sYd -bXl +eyP +fgI +wVK cTz goT goT @@ -24744,27 +23983,27 @@ pyp pyp pyp pyp -yas +nEZ ddk ddk ddk -iHk +aEC aHW aHW aHW pXf -prv -gwC +bGS +liK aHW evZ cvV evZ aHW -rjS -ird -ird -ird -ird +nyF +rdX +rdX +rdX +rdX "} (51,1,1) = {" ybY @@ -24845,44 +24084,44 @@ dxF dxF kIn kIn -kIn -bXl -sYd -bXl -bXl -bEp -bEp -sYd -bXl -sYd -bXl -bEp -dsp -dJs -jvt -bTa -bEp -bEp -bEp -bEp -bEp -bEp -bEp -bEp -sYd -sYd -fBL -lCa -ktP -ktP -ktP -ktP -ktP -ruM -sYd -sYd -sYd -sYd +tKH +wVK +fgI +wVK +wVK +wWa +wWa +fgI +wVK +fgI +wVK +wWa +jdu +dmp +rJl +fZy +wWa +wWa +wWa +wWa +wWa +wWa +wWa +wWa +fgI +fgI +aDW +aqc +ldL +ldL +ldL +ldL +ldL +aQd +fgI +fgI +fgI +fgI ePx soe gCb @@ -24910,12 +24149,12 @@ xpk tQB ePx pBV -ksb -vdl +kaZ +cJt xzY xzY xzY -hdQ +vMP xHm cvm aHW @@ -25013,43 +24252,43 @@ kIn sYd aSu sYd -sYd -sYd -bXl -bXl -bEp -sYd -bXl -bXl -kIn -bEp -bEp -gxs -kjo -umQ -bEp -bEp -bEp -bEp -bEp -bEp -bEp -bEp -bEp -kIn -sYd -bXl -sYd -sYd -sYd -sYd -sYd -sYd -sYd -sYd -sYd -sYd -sYd +fgI +fgI +wVK +wVK +wWa +fgI +wVK +wVK +tKH +wWa +wWa +cen +dWj +soy +wWa +wWa +wWa +wWa +wWa +wWa +wWa +wWa +wWa +tKH +fgI +wVK +fgI +fgI +fgI +fgI +fgI +fgI +fgI +fgI +fgI +fgI +fgI cTz cTz cTz @@ -25082,7 +24321,7 @@ xzY oum hQj psz -xVt +vdC xHm cvm fRI @@ -25181,42 +24420,42 @@ bXl sYd sYd sYd -sYd -sYd -bXl -bXl -bXl -bXl -sYd -kIn -bXl -bEp -bEp -bEp -bEp -bEp -bEp -bEp -bEp -bEp -swl -swl -mFf -kIn -sYd -sYd -sYd -bXl -bXl -bXl -bXl -bXl -bXl -bXl -bXl -bXl -sYd -bXl +fgI +fgI +wVK +wVK +wVK +wVK +fgI +tKH +wVK +wWa +wWa +wWa +wWa +wWa +wWa +wWa +wWa +wWa +hiI +hiI +plM +tKH +fgI +fgI +fgI +wVK +wVK +wVK +wVK +wVK +wVK +wVK +wVK +wVK +fgI +wVK cTz cTz cTz @@ -25249,8 +24488,8 @@ xzY hQj hQj hQj -jrs -uTn +fCz +nLJ dzD hQj hQj @@ -25349,41 +24588,41 @@ sYd sYd sYd sYd -sYd -sYd -bXl -bXl -bXl -kIn -sYd -bXl -bEp -bEp -bEp -bEp -bEp -bEp -bEp -swl -swl -dez -dez -eLO -sYd -sYd -sYd -sYd -sYd -bXl -bXl -bXl -bXl -bXl -bXl -sYd -sYd -bXl -bXl +fgI +fgI +wVK +wVK +wVK +tKH +fgI +wVK +wWa +wWa +wWa +wWa +wWa +wWa +wWa +hiI +hiI +csx +csx +sZI +fgI +fgI +fgI +fgI +fgI +wVK +wVK +wVK +wVK +wVK +wVK +fgI +fgI +wVK +wVK ePx cTz cTz @@ -25499,9 +24738,9 @@ tMI hSC kIn bXl -tvJ -wix -nyv +prD +klY +jJn sYd sYd sYd @@ -25516,41 +24755,41 @@ bXl bXl sYd bXl -sYd -sYd -sYd -sYd -bXl -bXl -kIn -kIn -bXl -bEp -bEp -bEp -bEp -bEp -voI -swl -dNg -bXl -sYd -sYd -sYd -sYd -sYd -sYd -bXl -bXl -bXl -bXl -bXl -bXl -bXl -sYd -bXl -bXl -bXl +fgI +fgI +fgI +fgI +wVK +wVK +tKH +tKH +wVK +wWa +wWa +wWa +wWa +wWa +tit +hiI +wyq +wVK +fgI +fgI +fgI +fgI +fgI +fgI +wVK +wVK +wVK +wVK +wVK +wVK +wVK +fgI +wVK +wVK +wVK ePx cTz ePx @@ -25583,8 +24822,8 @@ xXe hQj hQj wnt -mDl -eNK +ktU +oeU dzD pHv avX @@ -25666,9 +24905,9 @@ sYd sYd bXl bXl -dnl +rUD wei -gAu +olU bXl sYd bXl @@ -25684,41 +24923,41 @@ bXl bXl bEp bEp -kIn -bXl -sYd -bXl -bXl -bXl -kIn -bXl -bXl -bEp -bEp -bEp -bEp -swl -voI -sZZ -sYd -sYd -sYd -sYd -sYd -sYd -bXl -bEp -bXl -bXl -bXl -sYd -sYd -sYd -bEp -bEp -bEp -bEp -bEp +tKH +wVK +fgI +wVK +wVK +wVK +tKH +wVK +wVK +wWa +wWa +wWa +wWa +hiI +tit +tac +fgI +fgI +fgI +fgI +fgI +fgI +wVK +wWa +wVK +wVK +wVK +fgI +fgI +cTz +wWa +wWa +wWa +wWa +wWa xXI cTz ePx @@ -25750,7 +24989,7 @@ xzY hQj hQj hQj -waW +oJv xHm cvm hQj @@ -25833,9 +25072,9 @@ kIn bXl bXl bXl -rTi -rZd -laf +ecJ +kWs +kPb sYd kIn sYd @@ -25843,49 +25082,49 @@ mfd kIn bXl sYd -tvJ -wix -nyv +prD +klY +jJn kIn bXl bEp bEp bEp -kIn -sYd -bXl -bXl -bXl -bXl -sYd -bXl -bXl -bXl -bEp -bEp -dez -fQJ -eLO -sYd -sYd -sYd -bXl -sYd -bXl -bEp -bEp -bEp -bEp -bEp -nrk -nJC -lVZ +tKH +fgI +wVK +wVK +wVK +wVK +fgI +wVK +wVK +wVK +wWa +wWa +csx +xYD +sZI +fgI +fgI +fgI +wVK +fgI +wVK +wWa +wWa +wWa +wWa +wWa +eyP +oSQ +waY wbV -nrk -bEp -bEp -bEp -bEp +eyP +wWa +wWa +wWa +wWa niT ePx ePx @@ -25917,14 +25156,14 @@ xzY hQj hQj hQj -uAh +wkG xHm cvm hQj hQj hQj -ftY -iLE +lyF +vqS loI eWP akH @@ -25999,9 +25238,9 @@ kIn oLs bXl bXl -tvJ -wix -nyv +prD +klY +jJn sYd kIn kIn @@ -26010,49 +25249,49 @@ bXl bXl sYd sYd -dnl +rUD wei -gAu +olU sYd kIn bEp bEp bEp bEp -bXl -sYd -bXl -bXl -bXl -sYd -bXl -kIn -sYd -bXl -bXl -bXl -sYd -sYd -sYd -sYd -sYd -sYd -bXl -bEp -bEp -bEp -bEp -bEp -bEp -bEp -sYd +wVK +fgI +wVK +wVK +wVK +fgI +wVK +tKH +fgI +wVK +wVK +wVK +fgI +fgI +fgI +fgI +fgI +fgI +wVK +wWa +wWa +wWa +wWa +wWa +wWa +wWa +cTz cTz cTz ePx ePx -bEp -bEp -bEp +wWa +wWa +wWa niT ePx cTz @@ -26084,14 +25323,14 @@ xzY gcl hQj hQj -jsS -tiJ -vFV +pBN +ext +ciB cGf hQj hQj -qTN -mGb +bxD +ilc nHV qHT hQj @@ -26166,9 +25405,9 @@ bXl lsg bXl dUE -rfZ +aHq wei -gAu +olU bXl kIn kIn @@ -26177,9 +25416,9 @@ bXl bXl sYd bXl -rTi -rZd -laf +ecJ +kWs +kPb kIn sYd bXl @@ -26187,39 +25426,39 @@ bEp bEp kIn bXl -sYd -sYd -bXl -sYd -sYd -sYd -bXl -bXl -kIn -kIn -sYd -sYd -sYd -sYd -kIn -bXl -bXl -bEp -bEp -bEp -bEp -bEp -bEp -bEp -bEp +fgI +fgI +wVK +fgI +fgI +fgI +wVK +wVK +tKH +tKH +fgI +fgI +fgI +fgI +tKH +wVK +wVK +wWa +wWa +wWa +wWa +wWa +wWa +wWa +wWa ePx cTz ePx hii cTz -bEp -bEp -bEp +wWa +wWa +wWa gCb cTz ePx @@ -26253,12 +25492,12 @@ xzY xzY xHY xzY -hdQ +vMP yeY iUD xzY -eRN -qNo +nEr +xpa wwg cGf fRI @@ -26333,9 +25572,9 @@ bXl bXl kIn bXl -rTi -rZd -laf +ecJ +kWs +kPb bXl bXl sYd @@ -26355,29 +25594,29 @@ kIn bXl sYd bXl -bXl -sYd -sYd -sYd -bXl -sYd -kIn -sYd -sYd -sYd -sYd -sYd -kIn -kIn +wVK +fgI +fgI +fgI +wVK +fgI +tKH +fgI +fgI +fgI +fgI +fgI +tKH +tKH jhS jhS jhS -bEp -bEp +wWa +wWa ePx ePx -bEp -bEp +wWa +wWa ePx cTz cTz @@ -26385,7 +25624,7 @@ cTz ePx hii ePx -feU +fIh ePx ePx ePx @@ -26415,12 +25654,12 @@ ePZ boa ePZ cvm -yas -szF +nEZ +mPI spd -yas -cMc -rvt +nEZ +oEQ +pQE xzY hQj xzY @@ -26523,36 +25762,36 @@ sYd sYd sYd bXl -bXl -bXl -bXl -sYd -jtJ -sYd -sYd -sYd -sYd -sYd -kIn -kIn -bXl +wVK +wVK +wVK +fgI +pVq +fgI +fgI +fgI +fgI +fgI +tKH +tKH +wVK jhS naK jhS jhS -prU +sPb cTz cTz ePx -bEp +wWa cTz ePx cTz cTz cTz cTz -sTB -pSz +rzP +omR cTz cTz cTz @@ -26582,11 +25821,11 @@ pyp pyp pyp vbV -pFZ -jKc +vdp +xeY uma -pFZ -jKc +vdp +xeY pyp xzY hQj @@ -26677,9 +25916,9 @@ bXl sYd bXl bXl -tvJ -wix -nyv +prD +klY +jJn bXl bXl bXl @@ -26690,24 +25929,24 @@ sYd bXl bXl bXl -bXl -bXl -sYd -sYd -sYd -sYd -sYd -wae -gYa -dQq -bXl -kIn +wVK +wVK +fgI +fgI +fgI +fgI +fgI +uHZ +kUb +cql +wVK +tKH jhS jhS iSw jhS jhS -pVd +lLq cTz huv ePx @@ -26749,11 +25988,11 @@ ePx pyp pyp pyp -pFZ -jKc +vdp +xeY rmG -pFZ -cKI +vdp +vvM pBV xzY hQj @@ -26838,15 +26077,15 @@ sYd sYd bXl sYd -xYs -wix -lEB -wix -wix -nyv -dnl +xmQ +klY +aCd +klY +klY +jJn +rUD wei -vpq +hFN kIn bXl bEp @@ -26857,24 +26096,24 @@ bXl bXl bXl bXl -sYd -bEp -sYd -sYd -sYd -sYd -sYd -vvE -swl -dNg -bXl -bXl +fgI +wWa +fgI +fgI +fgI +fgI +fgI +oqb +hiI +wyq +wVK +wVK uSG oOs naK oOs uSG -prU +sPb ePx ePx ePx @@ -26901,14 +26140,14 @@ cTz cTz cTz gnY -eaR -ePn +xPn +fSG gnY cTz mZt gnY -eaR -ePn +xPn +fSG gnY cTz cTz @@ -26916,11 +26155,11 @@ ePx goT goT pyp -pFZ -jKc +vdp +xeY xgV -pFZ -jKc +vdp +xeY pBV xzY hQj @@ -27001,21 +26240,21 @@ sYd vGf sYd sYd -ciD +orf sYd bXl sYd -rfZ +aHq mIg -mDN +gkL wei wei -mIr -rTi -rZd -laf +prQ +ecJ +kWs +kPb sYd -xYs +xmQ bEp bEp bXl @@ -27024,24 +26263,24 @@ bEp bEp bXl sYd -bEp -bEp -kIn -sYd -sYd -sYd -sYd -vvE -bEp -dNg -bXl -kIn +wWa +wWa +tKH +fgI +fgI +fgI +fgI +oqb +wWa +wyq +wVK +tKH uSG trU uRm rID uSG -mXZ +mQt ePx ePx cTz @@ -27052,8 +26291,8 @@ cTz cTz cTz cTz -rXe -cek +lrJ +bCr cTz cTz cTz @@ -27068,14 +26307,14 @@ cTz aIF cTz gnY -hKE -ovm +kOR +wTk gnY cTz cTz gnY -hKE -ovm +kOR +wTk gnY cTz cTz @@ -27083,11 +26322,11 @@ ePx goT goT pyp -fKf -aqI +cRw +usz pyp -fKf -aqI +cRw +usz pyp iUD xzY @@ -27168,21 +26407,21 @@ sYd sYd sYd pqs -gAu +olU bXl bXl sYd -pWe -svB -hnE +dXT +efU +dYi wei wei -vpq +hFN bXl kIn kIn -tvJ -jFk +prD +vMT bEp bEp bEp @@ -27192,23 +26431,23 @@ bEp bXl bXl sYd -bEp -sYd -sYd -sYd -sYd -sYd -vvE -bEp -dNg -bXl -sYd +wWa +fgI +fgI +fgI +fgI +fgI +oqb +wWa +wyq +wVK +fgI uSG trU uRm gmS uSG -uRP +jWO cTz ePx cTz @@ -27220,7 +26459,7 @@ cTz cTz ePx kdK -bSV +lJE cTz ePx kne @@ -27235,14 +26474,14 @@ iIn cTz cTz gnY -qBa -xBb +nui +cbG gnY cTz cTz gnY -qBa -xBb +nui +cbG gnY cTz cTz @@ -27335,20 +26574,20 @@ bXl bXl kIn oeE -gAu +olU sYd sYd bXl sYd -rfZ +aHq wei wei -aOj -oRw +gGp +sVd bXl sYd sYd -rfZ +aHq bEp bEp bEp @@ -27360,22 +26599,22 @@ bXl bXl bXl sYd -sYd -sYd -sYd -kIn -sYd -mhN -dez -eLO -bXl -kIn +fgI +fgI +fgI +tKH +fgI +fUw +csx +sZI +wVK +tKH uSG trU uRm rID uSG -pVd +lLq ePx ePx cTz @@ -27495,22 +26734,22 @@ bXl kIn sYd bXl -tvJ -wix -wix -wix -ciD -pWe -rZd -laf +prD +klY +klY +klY +orf +dXT +kWs +kPb sYd sYd bXl bXl -tiO -eZV -eZV -oRw +cgp +sUu +sUu +sVd dUE bXl bXl @@ -27522,27 +26761,27 @@ sYd bEp bEp bEp -gAu -bXl +olU bXl bXl -sYd -sYd bXl sYd -kIn -kIn -sYd -bXl -sYd -bXl -bXl +fgI +wVK +fgI +tKH +tKH +fgI +wVK +fgI +wVK +wVK uSG ymc uRm gmS uSG -mXZ +mQt ePx cTz cTz @@ -27662,11 +26901,11 @@ bXl bXl sYd sYd -rfZ +aHq rno pqs -txe -vpq +usX +hFN kIn bXl bXl @@ -27689,27 +26928,27 @@ bXl sYd bEp bEp -vpq +hFN sYd bXl sYd sYd -sYd -sYd -bXl -bXl -kIn -eDS -bXl -bXl -bXl -bXl +fgI +fgI +wVK +wVK +tKH +wMS +wVK +wVK +wVK +wVK uSG trU uRm rID uSG -pVd +lLq cTz hii cTz @@ -27829,11 +27068,11 @@ kIn bXl sYd pEJ -rfZ +aHq dFk oeE -una -ujG +bWz +wBO bXl bXl bXl @@ -27847,36 +27086,36 @@ sYd bXl bXl sYd -tvJ -wix +prD +klY sYd bXl bXl bXl bXl sYd -qIn -ujG +vSB +wBO bXl sYd sYd sYd bXl -bXl -sYd -bXl -bXl -sYd -bXl -bXl -sYd -bXl +wVK +fgI +wVK +wVK +fgI +wVK +wVK +fgI +wVK uSG lrO kPw lrO uSG -hqO +kJK ePx hii cTz @@ -27996,10 +27235,10 @@ bXl bXl bXl bXl -rfZ +aHq oeE -una -ujG +bWz +wBO kIn sYd sYd @@ -28008,13 +27247,13 @@ sYd sYd sYd kIn -tvJ -wix -nyv +prD +klY +jJn ven sYd bXl -ptS +hqi bEp bEp bEp @@ -28029,21 +27268,21 @@ sYd sYd bXl sYd -bXl -bEp -bEp -bEp -sYd -bXl -sYd -bXl -sYd +wVK +wWa +wWa +wWa +fgI +wVK +fgI +wVK +fgI jhS jhS iSw jhS jhS -mXZ +mQt hii ePx cTz @@ -28070,14 +27309,14 @@ abG cTz ePx gnY -eaR -ePn +xPn +fSG gnY cTz cTz gnY -eaR -ePn +xPn +fSG gnY cTz ePx @@ -28163,9 +27402,9 @@ kIn bXl sYd sYd -pWe -eZV -oRw +dXT +sUu +sVd kIn bXl sYd @@ -28175,13 +27414,13 @@ sYd sYd sYd sYd -dnl +rUD wei -vpq +hFN jtJ sYd kIn -dnl +rUD bEp bEp bEp @@ -28196,21 +27435,21 @@ sYd sYd sYd kIn -bXl -bEp -bEp -bEp -bEp -bXl -bXl -bXl -bXl -sYd +wVK +wWa +wWa +wWa +wWa +wVK +wVK +wVK +wVK +fgI jhS naK naK jhS -pVd +lLq hii cTz ePx @@ -28237,14 +27476,14 @@ goT goT ePx gnY -hKE -ovm +kOR +wTk gnY cTz cTz gnY -hKE -ovm +kOR +wTk gnY cTz ePx @@ -28342,9 +27581,9 @@ bEp bEp eqJ sYd -rTi -rZd -laf +ecJ +kWs +kPb bXl eqJ bEp @@ -28363,21 +27602,21 @@ sYd sYd sYd bXl -bEp -bEp -bEp -bEp -bEp -sYd -bXl -bXl -bXl -sYd +wWa +wWa +wWa +wWa +wWa +fgI +wVK +wVK +wVK +fgI jhS naK naK jhS -pVd +lLq ePx ePx ePx @@ -28404,14 +27643,14 @@ goT goT ePx gnY -qBa -xBb +nui +cbG gnY cTz cTz gnY -qBa -xBb +nui +cbG gnY cTz cTz @@ -28522,7 +27761,7 @@ bEp bEp bEp bEp -vpq +hFN sYd sYd sYd @@ -28530,26 +27769,26 @@ sYd sYd kIn bXl -bEp -bEp -bEp -bEp -bEp -sYd -sYd -bXl -bXl -bXl +wWa +wWa +wWa +wWa +wWa +fgI +fgI +wVK +wVK +wVK jhS jhS jhS jhS -omA +aZD aJy aJy aJy -eLT -atn +nWN +wkS goT goT goT @@ -28647,11 +27886,11 @@ kIn bXl bXl sYd -qGa -iJo -iJo -iJo -rOd +jbM +bNk +bNk +bNk +wSk sYd lMv pCS @@ -28688,26 +27927,26 @@ bEp bEp bEp bEp -aOj -ujG +gGp +wBO kIn sYd sYd sYd pEJ bXl -bEp -bEp -bEp +wWa +wWa +wWa grx -bEp -bEp -bEp -bXl -sYd -bXl -bXl -sYd +wWa +wWa +wWa +wVK +fgI +wVK +wVK +fgI raN raN dDj @@ -28814,11 +28053,11 @@ kIn sYd sYd sYd -pBi +cvU mYj lyJ goa -mkO +agl sYd pCS pCS @@ -28837,9 +28076,9 @@ sYd bXl cDU sYd -xYs -wix -wix +xmQ +klY +klY bEp bEp bXl @@ -28855,7 +28094,7 @@ kIn bEp bEp bEp -ujG +wBO kIn sYd sYd @@ -28863,18 +28102,18 @@ sYd sYd bXl bXl -bEp -bEp +wWa +wWa grx sXo grx -bEp -bEp -bEp -sYd -bXl -bXl -sYd +wWa +wWa +wWa +fgI +wVK +wVK +fgI raN raN dDj @@ -28981,11 +28220,11 @@ bXl sYd sYd sYd -pBi +cvU iyP qVg dsi -ddH +mrY sYd pCS pCS @@ -29002,10 +28241,10 @@ sYd bXl sYd sYd -xYs -wix -jFk -ckC +xmQ +klY +vMT +ikk pqs bEp bEp @@ -29030,19 +28269,19 @@ sYd bXl sYd bXl -bEp -bEp +wWa +wWa grx sXo dgs grx -bEp -bEp -sYd -bXl -bXl -bXl -sYd +wWa +wWa +fgI +wVK +wVK +wVK +fgI ewL plf pIK @@ -29148,11 +28387,11 @@ bXl sYd sYd sYd -pBi +cvU nzQ elo wgK -ddH +mrY sYd pCS pCS @@ -29169,10 +28408,10 @@ sYd sYd sYd sYd -rfZ +aHq rno pEg -jqy +cjA bEp bEp bEp @@ -29197,20 +28436,20 @@ bXl sYd bXl bXl -bEp -bEp -bEp +wWa +wWa +wWa grx sXo grx -bEp -bEp +wWa +wWa dic tKY tKY tKY -knP -wWq +snc +amB plf arG cEd @@ -29218,8 +28457,8 @@ tiW fyD arG plf -xSn -stj +wbH +lOx goT frF frF @@ -29315,11 +28554,11 @@ dxF bXl bXl sYd -ngp -lCa +tdQ +wzY wcr -lCa -wjI +wzY +qJZ sYd pCS pCS @@ -29336,7 +28575,7 @@ bXl sYd sYd sYd -rfZ +aHq dFk bEp bEp @@ -29365,18 +28604,18 @@ bXl bXl bXl sYd -bEp -bEp -bEp +wWa +wWa +wWa grx -bEp -bEp -bEp +wWa +wWa +wWa dKu lKV lKV lKV -oGC +owK sSr plf arG @@ -29386,7 +28625,7 @@ fyD arG ugU dDj -pAu +vUI lKV xTq cTz @@ -29498,7 +28737,7 @@ bEp nrk nrk nrk -aJU +uog bXl bXl bXl @@ -29533,18 +28772,18 @@ mda sYd sYd sYd -bEp -bEp -bEp -bEp -bEp +wWa +wWa +wWa +wWa +wWa dKu qny sxy dte dte -bwT -dqp +pfw +cSj xrx kqt kqt @@ -29552,8 +28791,8 @@ kqt kqt kqt wvW -ult -dTM +fVH +kfG bsb lpJ xTq @@ -29665,7 +28904,7 @@ bEp nrk nrk nrk -roc +sIG thU thU thU @@ -29701,9 +28940,9 @@ sbX dic dic dic -bEp -bEp -bEp +wWa +wWa +wWa dKu vmB dyz @@ -29752,9 +28991,9 @@ xJg vea xJg xJg -mDa -pfR -eZw +mll +bDA +lGm xJg xJg xJg @@ -29816,11 +29055,11 @@ rzh iXD kIn sYd -qGa -iJo +jbM +bNk wcr -iJo -aaN +bNk +szl sYd pCS pCS @@ -29921,7 +29160,7 @@ jfQ jfQ jfQ cDx -pTI +qka xJg xJg xJg @@ -29983,11 +29222,11 @@ ggC iXD bXl sYd -pBi +cvU mYj lyJ goa -ddH +mrY sYd sYd pCS @@ -30074,7 +29313,7 @@ jfQ jfQ jfQ jfQ -erH +pmP xJg xJg xJg @@ -30088,7 +29327,7 @@ jfQ jfQ jfQ cDx -pTI +qka cDx xJg vea @@ -30150,11 +29389,11 @@ ggC iXD bXl sYd -pBi +cvU iyP qVg dsi -ddH +mrY sYd pCS pCS @@ -30211,8 +29450,8 @@ tIh tIh tIh tIh -ydh -fZT +ubI +hwb ndw sRb sRb @@ -30220,8 +29459,8 @@ sRb sRb sRb coU -mDH -fNo +jCK +rUv lKV qny sxy @@ -30241,7 +29480,7 @@ jfQ jfQ xJg vea -hLH +pAG xJg xJg vea @@ -30255,7 +29494,7 @@ jfQ jfQ vea xJg -njY +nVD xJg vea xJg @@ -30317,11 +29556,11 @@ ggC iXD sYd sYd -pBi +cvU nzQ elo wgK -ddH +mrY sYd pCS pCS @@ -30378,7 +29617,7 @@ rNg dTJ dTJ dTJ -uze +fDy sSr plf arG @@ -30388,7 +29627,7 @@ fyD arG ugU dDj -vHG +eBY bsb bsb oce @@ -30408,7 +29647,7 @@ jfQ xJg vea vea -hLH +pAG cDx cDx vea @@ -30484,11 +29723,11 @@ pkP iXD sYd sYd -pvk -lCa -lCa -lCa -ruM +wBI +wzY +wzY +wzY +kvi sYd pCS pCS @@ -30545,8 +29784,8 @@ iuz tKY tKY tKY -mtS -eeP +cIj +paf plf arG fyD @@ -30554,8 +29793,8 @@ fyD fyD arG plf -erE -dGy +nMg +tqF dTJ dNc nct @@ -30575,7 +29814,7 @@ jfQ xJg vea vea -kvS +hpU cDx xJg vea @@ -30700,7 +29939,7 @@ rNg dTJ dTJ dTJ -vTe +mzo dTJ iuz tKY @@ -31248,10 +30487,10 @@ xJg xJg xJg xJg -gcB -gzI -gzI -kvS +hFk +dEO +dEO +hpU vea vea xJg @@ -31486,12 +30725,12 @@ kkH dTL xtN sHg -amu +bel mqG gNI oww -soF -aaN +dyA +szl pCS pCS pCS @@ -31658,8 +30897,8 @@ ogo rbu xgl xgl -kDs -vDi +nQI +ofX pCS pCS wLp @@ -31687,9 +30926,9 @@ dxF dxF dxF dxF -nbH -vfZ -vfZ +oCO +miP +miP dxF dxF hkO @@ -31826,8 +31065,8 @@ gRi cbg xgl xgl -kDs -vDi +nQI +ofX pCS wLp uHP @@ -31994,14 +31233,14 @@ dyB bKl xgl xgl -kDs -nDT -pGv +nQI +uYB +kDt bex -eAS -lTr -ecA -egx +qjS +gKN +naw +qDt iYo iYo uHP @@ -32023,7 +31262,7 @@ dxF dxF dxF dxF -mhj +mzW dxF dxF dxF @@ -32151,9 +31390,9 @@ dxF dxF kkH coL -uNC -egu -oWo +nEY +qpg +oVt kkH rQa gEc @@ -32168,7 +31407,7 @@ pSK ify pSK ify -fIm +ayT yjI yjI aHl @@ -32189,8 +31428,8 @@ fpO orL dxF dxF -mhj -fjF +mzW +hVt wff dxF dxF @@ -32226,11 +31465,11 @@ vDS vDS vDS lHs -peQ -hYS -qog -kZm -qog +xqK +sbI +ewX +fmx +ewX bsb oce dAM @@ -32335,7 +31574,7 @@ dHj qpW etu pSK -ldM +oja usP usP pGY @@ -32356,7 +31595,7 @@ lcs jzl jzl eMC -fjF +hVt fpO nnf wff @@ -32395,11 +31634,11 @@ wGD mNM xvn mNM -xms +teZ dRj dRj nOH -wwq +fwA ixP dAM qPz @@ -32566,7 +31805,7 @@ cqX fyD fyD oeb -jnY +wRj ixP ixP dAM @@ -32663,13 +31902,13 @@ ten gRi acn dlT -fkK +eGt pSK vKY dXE lcS pSK -ykE +juW yjI cVD aHl @@ -32733,7 +31972,7 @@ cqX fyD fyD oeb -wwq +fwA ixP ixP ixP @@ -32825,18 +32064,18 @@ pYf pYf xCc oww -soP +ikZ iyd tvb qKm cnv -kqA +xZR ify xwu ify tZc ify -fIm +ayT yjI yjI neI @@ -32900,7 +32139,7 @@ cqX fyD fyD oeb -jnY +wRj ixP ixP ixP @@ -32992,18 +32231,18 @@ uri ahz onP oww -gUa +nty cbg cbg cbg cbg -nux -bng -sxZ +awH +xtz +xUG glB -frj -yiX -nRE +mnm +rua +rWP yjI yjI aHl @@ -33067,7 +32306,7 @@ mNM pKE fyD oeb -wwq +fwA ixP ixP ixP @@ -33152,23 +32391,23 @@ mxB mxB wqR lwL -kNx -hTn +ulq +qZo wqR lwL lwL lwL oww -gUa +nty cbg rhK nZw rhK rhK cbg -fKJ +gZB glB -tdZ +mli kwJ aHl yjI @@ -33234,7 +32473,7 @@ lHs lcv fyD oeb -jnY +wRj ixP ixP fYI @@ -33319,23 +32558,23 @@ mxB mxB cEq cEq -mnn -jcX +the +vxV cEq cEq tye aVv oww -jvQ +lLS cbg rhK ekh cMv rhK cbg -mwV +pYX glB -xRx +rGh gnP aHl yjI @@ -33401,7 +32640,7 @@ lHs bAe fyD oeb -wwq +fwA ixP ixP dib @@ -33486,8 +32725,8 @@ mxB mxB cXA fQg -dzm -cGz +vnM +swe fQg fQg fQg @@ -33500,9 +32739,9 @@ mAH cMv rhK cbg -ylh +nBb glB -vSW +mmh gnP aHl yjI @@ -33568,7 +32807,7 @@ mbS pfo fyD oeb -jnY +wRj ixP ixP dib @@ -33667,9 +32906,9 @@ dWB dWB aCD qBN -rDO -mvv -nRE +whj +kpC +rWP aHl vYD yjI @@ -33735,7 +32974,7 @@ klN oeb fyD xaB -wwq +fwA fYI tIh qOw @@ -33902,7 +33141,7 @@ rUi oeb vjr hJN -jnY +wRj dib rNg dTJ @@ -34058,7 +33297,7 @@ sVC olO bzl sVx -jIR +fIx vDS vDS mbS @@ -34069,7 +33308,7 @@ rUi oeb fyD phI -wEh +xty qOw uiT sbX @@ -34169,9 +33408,9 @@ qBN qBN qBN mGL -sKN -blY -igT +jez +uRH +lhU yjI yjI cVD @@ -34236,7 +33475,7 @@ dcA oeb fyD oeb -dTM +kfG rNg iuz dic @@ -34338,7 +33577,7 @@ iHO iHO jhb glB -tRG +rqL pDs yjI yjI @@ -34403,7 +33642,7 @@ mbS pfo fyD oeb -qog +ewX uiT dic tKY @@ -34570,7 +33809,7 @@ mwh lcv fyD oeb -dTM +kfG lpJ lKV xTq @@ -34729,7 +33968,7 @@ cAt cAt kDS vDS -pZx +rHt tEa tEa tEa @@ -34737,7 +33976,7 @@ mwh bAe fyD oeb -dox +lFJ dte qPz uiT @@ -34840,8 +34079,8 @@ pfz jhb eCY ygh -oIb -mVC +onb +rnt yjI oNV yjI @@ -34904,7 +34143,7 @@ mNM oeb fyD oeb -jnY +wRj ixP dib lpJ @@ -35001,14 +34240,14 @@ mLK rlB jPW kGU -kOD +wTB wzC -xti +pmE jhb ayB nDH brH -cWX +dcK bVs uvj dLY @@ -35063,15 +34302,15 @@ vDS vDS vDS gqQ -vys +dgB dRj lok mNM -qrl +wLH nOH fyD oeb -wwq +fwA ixP dAM qPz @@ -35168,9 +34407,9 @@ mdr rlB ryB iqE -uzq +jar gld -nrD +riH glB jhb jhb @@ -35238,7 +34477,7 @@ cqX fyD fyD oeb -jnY +wRj ixP ixP dAM @@ -35337,18 +34576,18 @@ ryB iqE msK msK -sUo -raA -uzq +hpy +aEl +jar msK msK msK msK nAc -sUo -gUQ -gUQ -otc +hpy +pAz +pAz +rXS gwY ann uqv @@ -35405,7 +34644,7 @@ cqX fyD fyD oeb -wwq +fwA ixP ixP ixP @@ -35502,7 +34741,7 @@ xQz cmG hfu iqE -smo +inc nAc msK msK @@ -35513,7 +34752,7 @@ gld msK msK gld -vzC +lhs gld msK gwY @@ -35572,7 +34811,7 @@ cqX fyD fyD oeb -jnY +wRj ixP ixP ixP @@ -35669,7 +34908,7 @@ gXF gXF gXF uYi -mPt +qve gld gld msK @@ -35680,7 +34919,7 @@ gld gld gld gld -nuA +aHB gld msK gwY @@ -35739,7 +34978,7 @@ cqX fyD fyD oeb -wwq +fwA ixP ixP ixP @@ -35834,9 +35073,9 @@ rob gld rgQ wzC -mDu -mGJ -uzq +boi +bIq +jar gld gld gld @@ -35894,19 +35133,19 @@ sVx bzl sVx gKG -eJg -wCe +ooW +huJ kDS kDS nOH xuY xyY mNM -juH +yeD dRj dRj nOH -jnY +wRj ixP ixP fYI @@ -36062,16 +35301,16 @@ gKG sVx bzl uQf -waP +qoQ vfd vfd mNM xvn dJT mNM -wuy -mSd -dTM +niK +vKF +kfG sxy bjc ixP @@ -36234,9 +35473,9 @@ nKh nKh wtH pVH -mtS -fPH -dTM +cIj +pJe +kfG bsb bsb oce @@ -36342,10 +35581,10 @@ feY mYM qaI qaI -sYo -sYo -sYo -smo +aCY +aCY +aCY +inc msK msK msK @@ -36364,7 +35603,7 @@ ktq ktq ktq ktq -hQl +xPw bKH bKH bKH @@ -36512,7 +35751,7 @@ mYM vHf qCi fmR -heL +ibV msK msK msK @@ -36531,7 +35770,7 @@ fpJ lfb gUS ktq -giZ +htF hZq bKH xWK @@ -36679,7 +35918,7 @@ mYM efF xNf vEw -heL +ibV msK msK nAc @@ -36736,15 +35975,15 @@ xkk ftF tKY dic -knP -fNc -cMJ -cMJ -cMJ -cMJ -cMJ -rhZ -rgw +snc +dQr +aPi +aPi +aPi +aPi +aPi +ayc +pOc dxF dxF dxF @@ -36845,8 +36084,8 @@ sCG twn vfr xNf -wAF -uEi +lAb +kAE nAc msK msK @@ -37012,8 +36251,8 @@ sCG twn vfr xNf -rEo -smo +qkP +inc msK msK gld @@ -37032,7 +36271,7 @@ nAy nAy lNt ktq -ngX +ePr nnx bKH xWK @@ -37180,11 +36419,11 @@ mYM bTt xNf kxE -heL +ibV msK msK gld -vzC +lhs gld uAz ezm @@ -37193,13 +36432,13 @@ slF slF slF rES -pNM +iTd nAy nAy qpR iJx ktq -lZZ +egJ dzd bKH bKH @@ -37347,18 +36586,18 @@ mYM rXj ikW hOm -heL +ibV msK gld gld -ctS +fUS gld uAz rgv rES -cIZ +dFh keX -xyx +vnq rES rES bEg @@ -37405,13 +36644,13 @@ wCU wCU wCU wCU -sfz -ukd -ukd -ukd -ukd -ukd -uNJ +qvF +bpC +bpC +bpC +bpC +bpC +oWU wCU dxF dxF @@ -37514,18 +36753,18 @@ oUP eTT eTT qaI -heL +ibV msK gld gld -nuA +aHB gld uAz uAz ktq -wAq +sNy dgx -qOJ +hpk ktq bny hHo @@ -37572,13 +36811,13 @@ jKN rRl mCd khI -mzn +iRG iiG iiG wCU iiG iiG -ddi +pIU wCU dxF dxF @@ -37681,7 +36920,7 @@ qCi lLH cdE mYM -heL +ibV nAc msK gld @@ -37739,13 +36978,13 @@ opz oJj jyq khI -mzn +iRG iiG wCU wCU wCU iiG -ddi +pIU wCU dxF dxF @@ -37848,8 +37087,8 @@ euj euj sCG mYM -vKQ -cUI +iWU +kSd gld msK msK @@ -37906,13 +37145,13 @@ uIJ iNF jyq khI -mzn +iRG iiG iiG wCU iiG iiG -ddi +pIU wCU dxF dxF @@ -38016,7 +37255,7 @@ euj kEG qaI eQQ -heL +ibV msK msK gld @@ -38073,13 +37312,13 @@ nbu nbu jKN khI -mzn +iRG iiG iiG iiG iiG iiG -ddi +pIU wCU dxF dxF @@ -38182,8 +37421,8 @@ euj euj sCG twn -vFc -uzq +kLO +jar bIL gld gld @@ -38240,13 +37479,13 @@ nbu nbu jKN wCU -vkV -bQY +mnD +twY iiG iiG iiG -iIz -qLa +lfi +nxs wCU dxF dxF @@ -38349,8 +37588,8 @@ euj euj dOJ twn -ylf -anE +nZp +sHG bUI gld gld @@ -38408,11 +37647,11 @@ nbu hYE wCU wCU -mzn +iRG iiG wCU iiG -ddi +pIU wCU wCU dxF @@ -38517,7 +37756,7 @@ euj txH qaI eQQ -iTK +itr msK hDE gld @@ -38525,9 +37764,9 @@ msK gld msK ktq -kzZ +jPr dgx -lMS +uew ktq xWK xWK @@ -38575,11 +37814,11 @@ nbu jKN jKN khI -mzn +iRG wCU wCU wCU -ddi +pIU wCU dxF dxF @@ -38684,7 +37923,7 @@ euj sCG mYM avT -cEo +mOh owh dUQ gld @@ -38692,9 +37931,9 @@ gld gld gld rES -dnM +jPM wZo -ntM +gxb rES xWK xWK @@ -38742,11 +37981,11 @@ hXh jKN jKN khI -mzn +iRG iiG wCU iiG -ddi +pIU wCU dxF dxF @@ -38844,14 +38083,14 @@ hUk qaI qaI cBd -lKR -vXd -vXd -vsq +hTF +snz +snz +jZL mRP mYM eQQ -lbu +mbN nsi gld iZZ @@ -38909,11 +38148,11 @@ nbu aHC jKN khI -mzn +iRG iiG iiG iiG -ddi +pIU wCU dxF dxF @@ -39076,11 +38315,11 @@ yaI hMu hMu wCU -vkV -bQY +mnD +twY iiG -iIz -hLi +lfi +mRO wCU dxF dxF @@ -39187,7 +38426,7 @@ nnz rEI oMZ bQg -sEf +ydQ fyT ibc fyT @@ -39222,19 +38461,19 @@ rIL rIL mMf jhS -gtL -rzb -vGx +qfT +bvO +hTb jhS jhS -gtL -rzb -vGx +qfT +bvO +hTb jhS jhS -gtL -rzb -vGx +qfT +bvO +hTb jhS htT smF @@ -39244,9 +38483,9 @@ dkE iBd wCU wCU -vkV -bcb -hLi +mnD +wwl +mRO wCU wCU dxF @@ -39343,9 +38582,9 @@ hUk hUk hUk bbW -vOt -vOt -cSz +qcf +qcf +ohG oUh nFM cgJ @@ -39353,8 +38592,8 @@ hmR oMw agG nFM -vFc -bKJ +kLO +tyr fyT ibc fyT @@ -39389,19 +38628,19 @@ cXL rIL hwA jhS -hws +ulS qwg -vcY +phX jhS jhS -hws +ulS qwg -vcY +phX jhS jhS -hws +ulS qwg -vcY +phX jhS dtV dkE @@ -39511,17 +38750,17 @@ hUk hUk bbW oUh -bPf -iVD -iVD -okh +vMd +abZ +abZ +vHB lIM wDT lly agG nFM -ylf -uEY +nZp +fjm fyT ibc fyT @@ -39556,19 +38795,19 @@ rIL mMf hMu jhS -cTG -fRZ -cQt +vkr +stz +oKn jhS jhS -cTG -fRZ -cQt +vkr +stz +oKn jhS jhS -cTG -fRZ -cQt +vkr +stz +oKn jhS htT bdu @@ -39678,7 +38917,7 @@ hUk hUk bbW oUh -edn +kle gHp gUZ oMZ @@ -39688,7 +38927,7 @@ shn mti oMZ bQg -sEf +ydQ fyT ibc fyT @@ -39890,19 +39129,19 @@ fTk fTk lkp foE -fDY +kEt fTk -epb +jDZ lkp aFc -fDY +kEt fTk -epb +jDZ lkp aFc -fDY +kEt fTk -dUy +bRy nTw rzT aRS @@ -40057,19 +39296,19 @@ mLw mLw fTk qgI -aoJ +jAw tnx -vDR +pCP egf eVO -aoJ +jAw tnx -vDR +pCP fTk ogf -aoJ +jAw tnx -slP +tGQ cum rUM exD @@ -41227,13 +40466,13 @@ qGx slx qGx klE -cbv -gde -fdr -lhu -gHm -cFT -eOt +gxB +qDQ +hXJ +fOt +oXv +wrm +poJ mBG qGx efr @@ -41390,17 +40629,17 @@ qCy ctV mhf hiy -tQO +vnv xGF -ocd +kOM cMI -dqH +iMA uhM mcv mcv mcv grR -aRB +rqA shX qGx slx @@ -41553,23 +40792,23 @@ feg rfE rdm rdm -sbF -dml -sbF -mvB -beo +clp +vUi +clp +vdD +owt mLw -lyG -mvB -baL +tRi +vdD +ddZ mcv ouR ouR byw mcv -wLB -fdr -eFf +uPt +hXJ +drR slx qGx fFJ @@ -41728,7 +40967,7 @@ mLw mLw mLw qGx -oGw +gpL mcv lFt wjW @@ -41736,7 +40975,7 @@ gdb grR mcv grR -jeO +jqT slx qGx ekV @@ -41895,7 +41134,7 @@ mLw mLw wVt qGx -sPp +vmN mcv xay gdb @@ -41903,7 +41142,7 @@ xay xay tTi mcv -eaB +hlR slx qGx shX @@ -42062,7 +41301,7 @@ mLw mLw mLw qGx -qyD +kFv mcv xay xay @@ -42070,7 +41309,7 @@ dBO xay tTi mcv -eaB +hlR slx qGx klE @@ -42229,7 +41468,7 @@ mLw bIW mLw qGx -oGw +gpL mcv oPH daQ @@ -42237,7 +41476,7 @@ xay gdb tTi mcv -eaB +hlR slx qGx qGx @@ -42332,7 +41571,7 @@ hSU hUk hUk hUk -pId +jNH wTt bkR bkR @@ -42340,11 +41579,11 @@ hSU bkR bkR bkR -dhm -oZD -oZD -cuF -eyy +wkl +rVI +rVI +duf +oJQ bkR hUk hUk @@ -42396,7 +41635,7 @@ wVt bIW mLw qGx -sPp +vmN mcv nSQ tBS @@ -42404,7 +41643,7 @@ uhX grR mcv grR -jeO +jqT mLw xVZ xVZ @@ -42499,7 +41738,7 @@ wTt hUk hUk hUk -iCh +bhC wTt bkR bkR @@ -42507,11 +41746,11 @@ bkR bkR bkR bkR -kgt -iKf -dKz -mfY -kSB +jBj +lgo +kFi +ulc +dkY bkR hUk hUk @@ -42563,15 +41802,15 @@ gce bIW mLw qGx -qyD +kFv mcv ige wdt oYQ mcv -emU -dml -eFZ +sJm +vUi +bLW slx qGx qGx @@ -42674,11 +41913,11 @@ bkR bkR bkR bkR -kgt -rRL +jBj +jsk cCa -kkC -kSB +epU +dkY bkR hUk hUk @@ -42730,13 +41969,13 @@ mAK bIW nkV qGx -dUP +kED grR mcv mcv mcv grR -oRM +sDe klE qGx slx @@ -42841,11 +42080,11 @@ bkR bkR bkR bkR -tdT -usc -jWM -ePq -kSB +wot +nPG +rOR +nuP +dkY bkR hUk hUk @@ -42897,13 +42136,13 @@ hPD bIW mLw mLw -urm -lgL -mvB -mvB -mvB -bsw -eFZ +bZM +tVg +vdD +vdD +vdD +myf +bLW qGx qGx slx @@ -43008,11 +42247,11 @@ bkR bkR bkR bkR -tjZ -aul -mSM -aul -wQZ +sFF +qEG +qKn +qEG +cUo bkR hUk hUk @@ -43231,8 +42470,8 @@ mPP wVt mLw mLw -fcJ -eoc +olR +ioh qGx qGx slx @@ -43398,7 +42637,7 @@ qGx qGx qGx qGx -qIV +wYf jxc pbR qGx @@ -43565,7 +42804,7 @@ htv nPf nPf nPf -xOx +ahE bDg pbR qGx @@ -44027,11 +43266,11 @@ mnT mnT mnT mnT -mWO -iwD -mhd -mhd -hYp +alG +tgC +lTu +lTu +kXJ uiK mnT mnT @@ -44194,11 +43433,11 @@ mnT mnT mnT mnT -iHw -aEZ -pfC -tLD -bJc +fBb +euz +hvN +qZD +soz mnT mnT uiK @@ -44343,7 +43582,7 @@ hUk hUk hUk hUk -pId +jNH wTt bEH bkR @@ -44361,11 +43600,11 @@ mnT mnT uiK mnT -nlT -nQy +cJP +uxf nXr -aze -bJc +yfH +soz mnT mnT uiK @@ -44510,7 +43749,7 @@ hUk hUk hUk hUk -iCh +bhC wTt wTt wTt @@ -44528,12 +43767,12 @@ mnT uiK uiK mnT -iHw -bcG -iIT -pkg -jIt -fLE +fBb +uwj +nyA +tfL +aOM +hBn mnT mnT dYB @@ -44680,7 +43919,7 @@ hUk hUk hUk hUk -vRH +ntr hUk wTt wTt @@ -44695,12 +43934,12 @@ mnT uiK uiK uiK -nlT +cJP aFL aFL meF jkT -sal +lpm fbK fbK mnT @@ -44832,7 +44071,7 @@ hUk hUk hUk hUk -pId +jNH bkR bkR bkR @@ -44847,7 +44086,7 @@ hUk hUk hUk hUk -bnK +aax hUk hUk hUk @@ -44862,12 +44101,12 @@ mnT uiK uiK uiK -erv +rkd aFL aFL -dCG -mFd -rky +atL +edt +bXA rmt rmt nbR @@ -44999,7 +44238,7 @@ hUk hUk hUk hUk -iCh +bhC bkR bkR bkR @@ -45029,12 +44268,12 @@ mnT nlv uiK uiK -nlT +cJP aFL aFL aFL jkT -uqW +mGu jKm jKm jKm @@ -45196,12 +44435,12 @@ uiK mnT mnT mnT -pof -aEZ -pfC -tLD -rMZ -cMC +jwJ +euz +hvN +qZD +kCQ +ngQ dYB dYB uiK @@ -45363,11 +44602,11 @@ uiK mnT mnT mnT -nlT -nQy +cJP +uxf nXr -aze -bJc +yfH +soz uiK mnT mnT @@ -45507,7 +44746,7 @@ bkR wTt hUk wTt -dNI +kFx hUk wTt wTt @@ -45530,11 +44769,11 @@ hUk nlv uiK uiK -iHw -bcG -iIT -pkg -bJc +fBb +uwj +nyA +tfL +soz mnT uiK uiK @@ -45667,15 +44906,15 @@ hUk hUk hUk hUk -pId +jNH bkR hSU bkR wTt wTt wTt -nQc -lBm +gGz +pxl wTt wTt wTt @@ -45697,11 +44936,11 @@ hUk hUk uiK uiK -pEt -kQU -kQU -kQU -fpM +xKz +fUC +fUC +fUC +qXB mnT mnT mnT @@ -45834,7 +45073,7 @@ hUk hUk hUk hUk -iCh +bhC bkR bkR bkR @@ -46210,9 +45449,9 @@ feg feg nlv uiK -bFh -bhg -hds +ipD +ehq +uwI mnT mnT mnT @@ -46222,8 +45461,8 @@ mnT mnT mnT uiK -rTv -kTX +pLI +xqQ uiK feg feg @@ -46344,7 +45583,7 @@ hSU bkR bEH wTt -pId +jNH hUk hUk hUk @@ -46511,7 +45750,7 @@ bkR bkR bkR bEH -iCh +bhC hUk hUk hUk @@ -46685,7 +45924,7 @@ hUk hUk hUk hUk -ddx +tsr hUk hUk hUk @@ -46852,7 +46091,7 @@ bEH bEH hUk hUk -pQN +szg hUk hUk hUk @@ -46876,7 +46115,7 @@ mnT feg feg feg -nPl +aRZ feg feg feg @@ -47043,7 +46282,7 @@ mnT feg feg feg -pRb +prd feg feg feg @@ -47060,7 +46299,7 @@ feg feg feg feg -nPl +aRZ feg nlv mnT @@ -47227,8 +46466,8 @@ feg lEA feg feg -kvf -nHO +fME +eCI mnT mnT mnT @@ -48183,7 +47422,7 @@ dxF dxF dxF dxF -uwY +wQg bkR bkR bkR @@ -48232,7 +47471,7 @@ feg feg feg uiK -vcW +bom uiK mnT nlv @@ -48350,7 +47589,7 @@ dxF dxF dxF dxF -lIB +kyu bEH bEH bkR @@ -49232,7 +48471,7 @@ uiK mnT nlv uiK -vcW +bom uiK mnT mnT @@ -49882,7 +49121,7 @@ vsP vsP vsP kZz -nyY +aeE kZz nlv nlv @@ -50406,9 +49645,9 @@ kPa nxf pGc uPE -nzB -vmH -vmH +lWT +gcw +gcw lLo wZP jhS @@ -50418,7 +49657,7 @@ vdv vdv vdv mMH -pxB +uZM mMH bpj bpj @@ -50573,9 +49812,9 @@ pGc nxf pGc bLa -vbm -cRO -cRO +ptF +oNe +oNe lLo wZP jhS @@ -50878,7 +50117,7 @@ bsl bsl kZz kZz -ueJ +oYz kZz kZz sNZ @@ -51045,8 +50284,8 @@ bsl bsl kZz kZz -fjp -xVM +oYs +drg kZz vsP vsP @@ -52055,7 +51294,7 @@ kZz vsP vsP vsP -pom +tEB vsP vsP vsP @@ -52222,7 +51461,7 @@ kZz vsP vsP vsP -aoh +lrj vsP vsP vsP @@ -52257,8 +51496,8 @@ dxF dxF dxF dxF -dFV -ptR +uKT +pbk dxF dxF dxF @@ -52385,7 +51624,7 @@ vsP vsP vsP vsP -pom +tEB vsP vsP vsP @@ -52425,7 +51664,7 @@ dxF dxF dxF mMH -rzq +uHR dxF dxF dxF @@ -52552,7 +51791,7 @@ kZz kZz vsP vsP -aoh +lrj vsP vsP vsP @@ -52920,7 +52159,7 @@ ebB ptY dxF mMH -fll +fIz mMH npL mMH @@ -53087,8 +52326,8 @@ ebB ebB ptY mMH -nKO -rmo +oup +mUS mMH npL dxF diff --git a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm index ff2e3daf9b25..b93256bf8aa9 100644 --- a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm +++ b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm @@ -1,4 +1,64 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aaa" = ( +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_1) +"aab" = ( +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/auto_turf/shale/layer1, +/area/lv522/landing_zone_1) +"aac" = ( +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/auto_turf/shale/layer2, +/area/lv522/landing_zone_1) +"aad" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_1) +"aae" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_1) +"aaf" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/northeast, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_1) +"aag" = ( +/obj/structure/machinery/floodlight/landing, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/floor/prison/greenfull/east, +/area/lv522/landing_zone_1) +"aah" = ( +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/floor/prison/greenfull/east, +/area/lv522/landing_zone_1) +"aai" = ( +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/floor/prison/floor_plate, +/area/lv522/landing_zone_1) +"aaj" = ( +/obj/structure/machinery/landinglight/ds1/delayone{ + dir = 4 + }, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/floor/plating, +/area/lv522/landing_zone_1) +"aak" = ( +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/floor/plating, +/area/lv522/landing_zone_1) +"aal" = ( +/obj/structure/machinery/landinglight/ds1/delayone{ + dir = 8 + }, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/floor/plating, +/area/lv522/landing_zone_1) "aam" = ( /obj/structure/machinery/camera/autoname{ dir = 1; @@ -7,6 +67,117 @@ /obj/structure/machinery/light/small, /turf/open/floor/strata/multi_tiles, /area/lv522/indoors/c_block/mining) +"aan" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/southwest, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_1) +"aao" = ( +/obj/effect/landmark/lv624/fog_blocker/short, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_1) +"aap" = ( +/obj/structure/platform_decoration/metal/almayer, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_1) +"aaq" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/southeast, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_1) +"aar" = ( +/obj/structure/machinery/landinglight/ds1{ + dir = 4 + }, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/floor/plating, +/area/lv522/landing_zone_1) +"aas" = ( +/obj/structure/machinery/landinglight/ds1/delaytwo{ + dir = 8 + }, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/floor/plating, +/area/lv522/landing_zone_1) +"aat" = ( +/obj/structure/surface/rack, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/floor/prison/floor_marked/southwest, +/area/lv522/landing_zone_1) +"aau" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_1) +"aav" = ( +/obj/structure/machinery/landinglight/ds1/delaythree{ + dir = 4 + }, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/floor/plating, +/area/lv522/landing_zone_1) +"aaw" = ( +/obj/structure/machinery/landinglight/ds1/delaythree{ + dir = 8 + }, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/floor/plating, +/area/lv522/landing_zone_1) +"aax" = ( +/obj/structure/machinery/landinglight/ds1/delaytwo{ + dir = 4 + }, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/floor/plating, +/area/lv522/landing_zone_1) +"aay" = ( +/obj/structure/machinery/camera/autoname/lz_camera, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/floor/plating, +/area/lv522/landing_zone_1) +"aaz" = ( +/obj/structure/machinery/landinglight/ds1{ + dir = 8 + }, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/floor/plating, +/area/lv522/landing_zone_1) +"aaA" = ( +/obj/structure/machinery/landinglight/ds1/delayone{ + dir = 4 + }, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/floor/prison/greenfull/east, +/area/lv522/landing_zone_1) +"aaB" = ( +/obj/structure/machinery/landinglight/ds1/delayone{ + dir = 8 + }, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/floor/prison/greenfull/east, +/area/lv522/landing_zone_1) +"aaC" = ( +/obj/structure/cargo_container/kelland/left, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_1) +"aaD" = ( +/obj/structure/cargo_container/kelland/right, +/obj/effect/landmark/lv624/fog_blocker/short, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_1) +"aaE" = ( +/obj/effect/landmark/lv624/fog_blocker/short, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/closed/wall/strata_outpost, +/area/lv522/landing_zone_1/ceiling) "aaF" = ( /turf/closed/shuttle/dropship3/tornado{ icon_state = "15" @@ -44,13 +215,6 @@ /obj/effect/spawner/gibspawner/xeno, /turf/open/auto_turf/shale/layer2, /area/lv522/outdoors/nw_rockies) -"aby" = ( -/obj/item/stack/sheet/metal, -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/asphalt/cement/cement1, -/area/lv522/outdoors/colony_streets/north_east_street) "abJ" = ( /obj/effect/landmark/lv624/fog_blocker/short, /turf/closed/wall/strata_outpost, @@ -96,20 +260,14 @@ /obj/effect/acid_hole, /turf/closed/wall/strata_ice/dirty, /area/lv522/oob) +"acv" = ( +/obj/structure/cargo_container/ferret/left, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/containers) "acE" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/c_block/bridge) -"acJ" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 6 - }, -/turf/open/gm/river, -/area/lv522/oob) "adk" = ( /obj/structure/surface/table/almayer, /obj/item/trash/plate, @@ -126,25 +284,22 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/oob) +"adm" = ( +/obj/effect/spawner/gibspawner/xeno, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/prison/floor_plate, +/area/lv522/outdoors/colony_streets/containers) "adG" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/reagent_container/food/condiment/saltshaker, /turf/open/floor/prison/darkredfull2, /area/lv522/indoors/lone_buildings/chunk) -"adI" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 10 - }, -/turf/open/gm/river, -/area/lv522/oob) -"adN" = ( -/obj/structure/platform, -/turf/open/gm/river, -/area/lv522/oob) "aea" = ( /obj/structure/prop/vehicles/crawler{ icon_state = "crawler_fuel"; @@ -156,6 +311,13 @@ /obj/effect/decal/cleanable/dirt, /turf/closed/wall/strata_outpost, /area/lv522/indoors/b_block/bridge) +"aef" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/turf/open/asphalt/cement, +/area/lv522/indoors/lone_buildings/engineering) "aem" = ( /obj/structure/barricade/plasteel/metal, /turf/open/asphalt/cement/cement12, @@ -171,6 +333,16 @@ }, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/mining) +"aff" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/prison/floor_plate, +/area/lv522/indoors/a_block/garden) "afn" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/corsat/plate, @@ -233,6 +405,19 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt/cement/cement12, /area/lv522/outdoors/colony_streets/central_streets) +"agh" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/area/lv522/landing_zone_forecon/UD6_Typhoon) +"agt" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/southeast, +/turf/open/gm/river, +/area/lv522/oob) "agu" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -317,6 +502,12 @@ "aiQ" = ( /turf/closed/wall/strata_outpost, /area/lv522/outdoors/colony_streets/central_streets) +"ajs" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/northwest, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/north_east_street) "ajw" = ( /obj/structure/barricade/wooden{ dir = 8 @@ -331,6 +522,12 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/dorms/glass) +"akj" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/northeast, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/south_west_street) "akk" = ( /turf/open/floor/prison/floor_plate, /area/lv522/oob) @@ -379,6 +576,11 @@ "ame" = ( /turf/open/floor/corsat/brown/northwest, /area/lv522/atmos/east_reactor) +"amz" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/obj/item/stack/rods, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/containers) "amC" = ( /obj/structure/bed/roller, /obj/effect/landmark/objective_landmark/medium, @@ -467,6 +669,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/a_block/admin) +"anP" = ( +/obj/structure/largecrate/random, +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/containers) "aoe" = ( /obj/structure/barricade/handrail/strata, /obj/structure/machinery/light{ @@ -560,6 +766,17 @@ /obj/structure/largecrate/random/secure, /turf/open/floor/prison/blue_plate/north, /area/lv522/indoors/a_block/bridges/op_centre) +"arv" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/stair_cut/platform_left, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/prison/greenfull/east, +/area/lv522/indoors/b_block/bridge) "arN" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 @@ -584,13 +801,6 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/security/glass) -"asF" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison, -/area/lv522/indoors/a_block/kitchen) "asH" = ( /turf/open/floor/corsat/brown/north, /area/lv522/atmos/west_reactor) @@ -630,18 +840,6 @@ /obj/structure/largecrate/random, /turf/open/floor/corsat, /area/lv522/atmos/east_reactor) -"aue" = ( -/obj/structure/prop/invuln/overhead_pipe{ - dir = 8; - pixel_x = -6; - pixel_y = 6 - }, -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/item/stack/sheet/metal, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel/far) "aut" = ( /obj/item/trash/barcardine, /obj/structure/largecrate/random/mini{ @@ -650,9 +848,19 @@ }, /turf/open/floor/shiva/radiator_tile2, /area/lv522/oob) +"auv" = ( +/obj/structure/curtain, +/mob/living/simple_animal/mouse, +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/cargo) "auG" = ( /turf/open/floor/prison, /area/lv522/outdoors/nw_rockies) +"auL" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/prison/greenfull/northwest, +/area/lv522/indoors/b_block/bridge) "avb" = ( /obj/item/stack/sheet/metal, /obj/structure/machinery/light{ @@ -782,27 +990,10 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison, /area/lv522/indoors/c_block/mining) -"aCJ" = ( -/obj/structure/largecrate/random/barrel{ - layer = 2.7 - }, -/obj/structure/largecrate/random/barrel{ - layer = 2.9; - pixel_x = 6; - pixel_y = -16 - }, -/obj/structure/largecrate/random/barrel{ - layer = 2.9; - pixel_x = -17; - pixel_y = -9 - }, -/obj/structure/blocker/invisible_wall, -/obj/structure/prop/invuln/fire{ - pixel_x = -3; - pixel_y = 6 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) +"aCw" = ( +/obj/item/prop/alien/hugger, +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/containers) "aCS" = ( /obj/structure/surface/rack, /obj/item/clothing/suit/storage/hazardvest, @@ -818,12 +1009,6 @@ /obj/structure/ore_box, /turf/open/floor/plating/platebot, /area/lv522/indoors/c_block/cargo) -"aDh" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/cargo) "aDj" = ( /obj/item/prop/colony/usedbandage{ dir = 10 @@ -842,6 +1027,14 @@ }, /turf/open/floor/plating, /area/shuttle/drop2/lv522) +"aDT" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/structure/stairs/perspective{ + dir = 6; + icon_state = "p_stair_full" + }, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_1) "aDZ" = ( /obj/item/ammo_box/magazine/misc/mre, /obj/item/prop/colony/usedbandage{ @@ -874,12 +1067,21 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/floor_plate, /area/lv522/indoors/c_block/cargo) +"aFd" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_east_street) "aFf" = ( /obj/structure/window/framed/strata/reinforced, /obj/structure/machinery/door/poddoor/almayer/closed{ id = "LZ1_Lockdown_Lo"; name = "Emergency Lockdown" }, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/corsat/marked, /area/lv522/landing_zone_1/ceiling) "aFN" = ( @@ -943,15 +1145,6 @@ }, /turf/open/floor/plating, /area/lv522/landing_zone_1) -"aHH" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/central_streets) "aIc" = ( /obj/structure/machinery/light{ dir = 1 @@ -1068,12 +1261,6 @@ }, /turf/open/floor/shiva/radiator_tile2, /area/lv522/oob) -"aLY" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/gm/river, -/area/lv522/indoors/c_block/mining) "aMI" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/bed{ @@ -1105,6 +1292,15 @@ "aNP" = ( /turf/open/floor/strata/white_cyan3/southeast, /area/lv522/indoors/a_block/medical) +"aOf" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/structure/closet/crate/ammo, +/obj/item/ammo_magazine/rifle/lmg/holo_target, +/obj/item/weapon/gun/rifle/lmg{ + current_mag = null + }, +/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/area/lv522/landing_zone_forecon/UD6_Typhoon) "aOi" = ( /obj/structure/prop/ice_colony/ground_wire, /obj/item/lightstick/red/spoke/planted{ @@ -1134,6 +1330,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/greenfull/northwest, /area/lv522/indoors/b_block/bridge) +"aPz" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/plating, +/area/lv522/outdoors/colony_streets/north_east_street) "aPN" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/light{ @@ -1165,21 +1365,26 @@ }, /turf/open/floor/corsat/marked, /area/lv522/landing_zone_1/tunnel/far) +"aQR" = ( +/obj/structure/platform/metal/almayer/east, +/obj/item/prop/colony/used_flare, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_east_street) +"aQW" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/gm/river, +/area/lv522/landing_zone_1/tunnel/far) "aRd" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, /turf/open/floor/strata/white_cyan2/west, /area/lv522/indoors/a_block/medical) +"aRf" = ( +/turf/open/asphalt/cement/cement1, +/area/lv522/outdoors/colony_streets/containers) "aRi" = ( /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/mining) -"aRB" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/decal/cleanable/blood/xeno, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel/far) "aRH" = ( /obj/item/stack/cable_coil, /turf/open/floor/corsat, @@ -1200,6 +1405,12 @@ /obj/item/trash/plate, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/dorms) +"aSG" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/southeast, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_east_street) "aSR" = ( /obj/structure/machinery/floodlight/landing, /turf/open/floor/prison/blue_plate/north, @@ -1279,12 +1490,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/casino) -"aVa" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/landing_zone_2) "aVo" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 8 @@ -1406,11 +1611,20 @@ }, /turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_up_to_down, /area/lv522/landing_zone_forecon/UD6_Typhoon) +"aXZ" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/gm/river, +/area/lv522/landing_zone_1/tunnel) "aYg" = ( /obj/effect/decal/cleanable/blood/oil, /obj/structure/surface/rack, /turf/open/floor/plating, /area/lv522/indoors/c_block/garage) +"aYm" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison/greenfull/northwest, +/area/lv522/indoors/b_block/bridge) "aYD" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/prison, @@ -1465,13 +1679,6 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/south_west_street) -"aYQ" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison/darkbrownfull2, -/area/lv522/indoors/c_block/cargo) "aZj" = ( /obj/structure/plasticflaps, /obj/structure/machinery/conveyor{ @@ -1507,6 +1714,11 @@ /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/plating, /area/lv522/indoors/c_block/mining) +"aZZ" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison, +/area/lv522/indoors/a_block/kitchen) "bag" = ( /obj/structure/bed/chair/comfy, /turf/open/floor/corsat/brown/north, @@ -1654,6 +1866,11 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/south_street) +"bei" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/asphalt/cement/cement14, +/area/lv522/landing_zone_1) "bel" = ( /obj/structure/machinery/computer/crew/colony, /turf/open/floor/strata/blue1, @@ -1709,6 +1926,10 @@ }, /turf/open/floor/corsat, /area/lv522/atmos/east_reactor/west) +"bfJ" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/gm/river, +/area/lv522/landing_zone_1/tunnel) "bgc" = ( /obj/structure/machinery/power/apc/power/north{ start_charge = 20 @@ -1761,13 +1982,6 @@ }, /turf/open/floor/corsat, /area/lv522/atmos/east_reactor) -"bhD" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/obj/structure/machinery/disposal, -/turf/open/floor/prison/darkbrownfull2, -/area/lv522/indoors/c_block/garage) "bhL" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -1778,6 +1992,11 @@ /obj/structure/largecrate/supply/supplies/tables_racks, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/bridges/op_centre) +"biu" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/garage) "biL" = ( /obj/structure/bed/chair{ dir = 1 @@ -1839,12 +2058,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/strata/white_cyan3/northwest, /area/lv522/indoors/a_block/medical/glass) -"bkg" = ( -/obj/structure/platform_decoration/strata{ - dir = 4 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/oob) "bkh" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/strata/white_cyan3/southwest, @@ -1910,6 +2123,11 @@ }, /turf/open/floor/prison, /area/lv522/indoors/a_block/security/glass) +"bmm" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/garage) "bmR" = ( /turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_up_to_down, /area/lv522/landing_zone_forecon/UD6_Typhoon) @@ -2000,6 +2218,13 @@ "bqE" = ( /turf/open/asphalt/cement/cement4, /area/lv522/outdoors/colony_streets/south_east_street) +"brf" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "brk" = ( /obj/structure/cargo_container/grant/rightmid, /turf/open/floor/plating, @@ -2033,6 +2258,13 @@ "bsG" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/c_block/bridge) +"bsR" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/platform_decoration/metal/almayer, +/turf/open/floor/prison/floor_plate, +/area/lv522/indoors/a_block/corpo/glass) "btb" = ( /turf/open/floor/prison/blue_plate/north, /area/lv522/indoors/a_block/admin) @@ -2041,6 +2273,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/strata/blue1, /area/lv522/outdoors/colony_streets/windbreaker/observation) +"buk" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/prison/floor_plate, +/area/lv522/indoors/a_block/corpo/glass) "buD" = ( /obj/structure/barricade/deployable, /turf/open/floor/prison, @@ -2167,6 +2403,14 @@ }, /turf/open/floor/prison/darkpurple2/north, /area/lv522/indoors/a_block/dorms) +"byx" = ( +/obj/structure/prop/vehicles/crawler{ + dir = 8; + icon_state = "crawler_crate_alt2"; + layer = 3.1 + }, +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/containers) "byy" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ id = "mining_shutter_2" @@ -2231,6 +2475,14 @@ }, /turf/open/floor/plating, /area/lv522/indoors/a_block/security) +"bAg" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/structure/stairs/perspective{ + dir = 10; + icon_state = "p_stair_full" + }, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_1) "bAo" = ( /turf/open/floor/corsat/browncorner/north, /area/lv522/atmos/east_reactor/west) @@ -2274,15 +2526,6 @@ }, /turf/open/gm/river, /area/lv522/indoors/a_block/kitchen/damage) -"bBW" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/asphalt/cement/cement3, -/area/lv522/outdoors/colony_streets/north_east_street) "bCd" = ( /obj/structure/tunnel, /turf/open/floor/corsat/brown/southwest, @@ -2304,6 +2547,11 @@ "bCy" = ( /turf/open/asphalt/cement/cement9, /area/lv522/outdoors/colony_streets/south_street) +"bCG" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/garage) "bCX" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/corsat/plate, @@ -2349,6 +2597,10 @@ /obj/structure/bed/chair/comfy, /turf/open/floor/prison/floor_plate, /area/lv522/indoors/a_block/corpo/glass) +"bEx" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/prison, +/area/lv522/indoors/c_block/mining) "bFn" = ( /obj/item/tool/wet_sign{ pixel_x = -11; @@ -2407,6 +2659,13 @@ }, /turf/open/floor/corsat/squares, /area/lv522/atmos/east_reactor) +"bHf" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/southeast, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/asphalt/cement, +/area/lv522/landing_zone_1) "bHg" = ( /turf/open/floor/strata/white_cyan3, /area/lv522/indoors/a_block/medical) @@ -2476,10 +2735,22 @@ /obj/item/device/analyzer, /turf/open/floor/corsat, /area/lv522/atmos/east_reactor) +"bIT" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_east_street) "bIY" = ( /obj/structure/cryofeed/right, /turf/open/floor/bluegrid, /area/lv522/atmos/east_reactor) +"bJn" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/largecrate/random{ + layer = 2.9 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/cargo) "bJp" = ( /obj/item/storage/backpack/marine/satchel{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; @@ -2557,6 +2828,14 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat/plate, /area/lv522/atmos/command_centre) +"bKL" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/obj/structure/stairs/perspective{ + dir = 9; + icon_state = "p_stair_full" + }, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_east_street) "bKO" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -2572,18 +2851,18 @@ /obj/structure/cargo_container/hd/right/alt, /turf/open/floor/corsat/marked, /area/lv522/atmos/north_command_centre) -"bLA" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel/far) "bLI" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/secure_closet/engineering_electrical, /obj/structure/machinery/light, /turf/open/floor/prison/darkyellowfull2/east, /area/lv522/indoors/c_block/t_comm) +"bLK" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/east, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/ceiling) "bLV" = ( /obj/structure/barricade/wooden{ dir = 8 @@ -2614,6 +2893,11 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) +"bMT" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/structure/ore_box, +/turf/open/floor/plating/platebot, +/area/lv522/indoors/c_block/cargo) "bMX" = ( /turf/closed/shuttle{ dir = 1; @@ -2728,6 +3012,10 @@ /obj/structure/window/framed/strata/reinforced, /turf/open/floor/corsat/marked, /area/lv522/indoors/a_block/fitness/glass) +"bQm" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_2) "bQq" = ( /obj/structure/cargo_container/grant/rightmid, /turf/open/auto_turf/shale/layer2, @@ -2757,10 +3045,23 @@ /obj/item/trash/uscm_mre, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_street) +"bRI" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/east, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/south_east_street) "bRN" = ( /obj/item/device/flashlight, /turf/open/floor/corsat, /area/lv522/atmos/east_reactor) +"bRO" = ( +/obj/item/ammo_magazine/m2c{ + current_rounds = 0; + layer = 4.2; + pixel_x = 17 + }, +/turf/closed/wall/strata_ice/dirty, +/area/lv522/outdoors/colony_streets/containers) "bRP" = ( /obj/structure/bed/chair/comfy{ dir = 1 @@ -2982,13 +3283,6 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) -"bXZ" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison, -/area/lv522/indoors/c_block/mining) "bYd" = ( /obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/corsat/plate, @@ -3029,16 +3323,6 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) -"bYV" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/south_street) "bYZ" = ( /obj/structure/machinery/light{ dir = 8 @@ -3185,6 +3469,15 @@ }, /turf/closed/wall/r_wall/biodome/biodome_unmeltable, /area/lv522/oob) +"cel" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/cargo) "cem" = ( /obj/structure/bed/chair/comfy{ dir = 4 @@ -3238,6 +3531,13 @@ /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/asphalt/cement/cement9, /area/lv522/outdoors/colony_streets/south_west_street) +"cfR" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/prison/floor_plate, +/area/lv522/outdoors/colony_streets/north_street) "cfT" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -3247,16 +3547,36 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_street) +"cgn" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/largecrate/random{ + layer = 2.9 + }, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/cargo) "cgB" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 }, /turf/open/floor/prison/greenfull, /area/lv522/indoors/a_block/fitness) +"chh" = ( +/obj/structure/machinery/colony_floodlight{ + layer = 4.3 + }, +/obj/structure/platform/metal/almayer/north, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/south_street) "cho" = ( /obj/item/weapon/gun/rifle/mar40/carbine, /turf/open/floor/plating/platebot, /area/lv522/indoors/c_block/cargo) +"chH" = ( +/obj/structure/platform_decoration/metal/almayer, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison/greenfull/northwest, +/area/lv522/indoors/b_block/bridge) "chR" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 @@ -3267,6 +3587,10 @@ "cia" = ( /turf/open/floor/strata/white_cyan1, /area/lv522/indoors/lone_buildings/chunk) +"cij" = ( +/obj/item/prop/colony/used_flare, +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/containers) "cil" = ( /obj/effect/landmark/xeno_hive_spawn, /obj/effect/landmark/ert_spawns/groundside_xeno, @@ -3430,11 +3754,24 @@ "con" = ( /turf/open/asphalt/cement/cement3, /area/lv522/outdoors/colony_streets/south_east_street) +"cor" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/turf/open/gm/river, +/area/lv522/landing_zone_1/tunnel/far) "coR" = ( /obj/structure/ore_box, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/mining) +"cpc" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/stairs/perspective{ + dir = 5; + icon_state = "p_stair_full" + }, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/garage) "cpk" = ( /turf/open/asphalt/cement/cement15, /area/lv522/outdoors/colony_streets/south_east_street) @@ -3442,15 +3779,6 @@ /obj/effect/landmark/monkey_spawn, /turf/open/floor/corsat/marked, /area/lv522/atmos/east_reactor) -"cpx" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 6 - }, -/turf/open/floor/plating/plating_catwalk/prison, -/area/lv522/indoors/c_block/mining) "cpy" = ( /turf/closed/wall/strata_ice/dirty, /area/lv522/oob) @@ -3587,13 +3915,6 @@ }, /turf/open/floor/corsat/plate, /area/lv522/atmos/north_command_centre) -"csv" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison/darkredfull2, -/area/lv522/indoors/a_block/kitchen) "csy" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 @@ -3636,6 +3957,11 @@ /obj/structure/foamed_metal, /turf/open/floor/plating, /area/lv522/oob) +"ctR" = ( +/obj/effect/spawner/gibspawner/xeno, +/obj/structure/platform/metal/almayer/west, +/turf/open/asphalt/cement/cement1, +/area/lv522/outdoors/colony_streets/north_east_street) "cuk" = ( /obj/structure/cargo_container/horizontal/blue/top, /turf/open/floor/prison/floor_marked, @@ -3659,10 +3985,10 @@ "cvi" = ( /turf/open/floor/plating, /area/lv522/indoors/a_block/security) -"cvA" = ( -/obj/structure/platform_decoration/strata, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/oob) +"cvE" = ( +/obj/structure/machinery/iv_drip, +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/containers) "cvP" = ( /obj/structure/shuttle/engine/heater{ dir = 4; @@ -3847,6 +4173,10 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_west_street) +"cAl" = ( +/obj/structure/platform/stone/strata/west, +/turf/open/auto_turf/shale/layer1, +/area/lv522/oob) "cAp" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/corsat/plate, @@ -3884,10 +4214,22 @@ /obj/item/tool/extinguisher, /turf/open/floor/prison/darkredfull2, /area/lv522/indoors/a_block/kitchen) +"cBz" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/cargo) "cBV" = ( /obj/effect/decal/cleanable/cobweb2, /turf/open/floor/prison/darkredfull2, /area/lv522/indoors/a_block/kitchen) +"cCg" = ( +/obj/structure/platform/stone/strata, +/obj/structure/platform/stone/strata/east, +/turf/open/auto_turf/shale/layer1, +/area/lv522/oob) "cCt" = ( /obj/item/prop/alien/hugger, /obj/item/clothing/head/helmet/riot, @@ -3924,16 +4266,6 @@ }, /turf/open/floor/corsat/brown/northwest, /area/lv522/atmos/west_reactor) -"cDi" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/structure/stairs/perspective{ - dir = 10; - icon_state = "p_stair_full" - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/landing_zone_2) "cDo" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -3953,6 +4285,14 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms/glass) +"cDO" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/containers) +"cDU" = ( +/obj/structure/cargo_container/wy/right, +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/containers) "cEj" = ( /obj/structure/closet/crate, /obj/item/clothing/under/colonist, @@ -3983,6 +4323,12 @@ }, /turf/open/floor/corsat/browncorner/north, /area/lv522/atmos/west_reactor) +"cEB" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/northeast, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_2) "cEM" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 @@ -4082,6 +4428,15 @@ }, /turf/open/floor/bluegrid, /area/lv522/atmos/east_reactor) +"cIc" = ( +/obj/structure/platform_decoration/metal/almayer, +/obj/structure/stairs/perspective{ + dir = 10; + icon_state = "p_stair_full" + }, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/asphalt/cement/cement3, +/area/lv522/landing_zone_1) "cIe" = ( /obj/structure/surface/rack, /obj/item/tool/minihoe{ @@ -4199,6 +4554,17 @@ /obj/structure/closet/crate, /turf/open/floor/corsat/plate, /area/lv522/atmos/north_command_centre) +"cJq" = ( +/obj/structure/platform_decoration/metal/almayer, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/prison/floor_plate, +/area/lv522/outdoors/colony_streets/north_east_street) "cJy" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat/plate, @@ -4207,13 +4573,6 @@ /obj/structure/largecrate, /turf/open/floor/corsat/plate, /area/lv522/atmos/north_command_centre) -"cJF" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/item/stack/sheet/wood, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel/far) "cJW" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 @@ -4307,15 +4666,6 @@ "cLx" = ( /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms/glass) -"cLB" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel) "cLQ" = ( /obj/structure/largecrate/random/secure, /turf/open/floor/prison/darkredfull2, @@ -4455,6 +4805,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/c_block/garage) +"cQv" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/prison/blue_plate/north, +/area/lv522/indoors/a_block/admin) "cQB" = ( /obj/structure/transmitter/colony_net{ phone_category = "LV522 Chances Claim"; @@ -4554,6 +4912,10 @@ }, /turf/open/floor/corsat/brown/northwest, /area/lv522/atmos/command_centre) +"cTq" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/asphalt/cement/cement12, +/area/lv522/outdoors/colony_streets/north_east_street) "cTz" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -4583,6 +4945,16 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat/marked, /area/lv522/indoors/c_block/casino) +"cUe" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/prison/floor_plate, +/area/lv522/outdoors/colony_streets/containers) "cUg" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 1 @@ -4680,18 +5052,6 @@ "cWL" = ( /turf/open/floor/corsat/browncorner/north, /area/lv522/atmos/command_centre) -"cWS" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/asphalt/cement/cement3, -/area/lv522/outdoors/colony_streets/north_west_street) -"cWT" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/asphalt/cement/cement3, -/area/lv522/outdoors/colony_streets/central_streets) "cWY" = ( /obj/structure/filingcabinet/seeds{ density = 0; @@ -4734,6 +5094,17 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison, /area/lv522/indoors/a_block/security) +"cYb" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/asphalt/cement/cement1, +/area/lv522/outdoors/colony_streets/north_east_street) +"cYd" = ( +/obj/structure/platform_decoration/stone/strata/east, +/turf/open/auto_turf/shale/layer1, +/area/lv522/oob) "cYf" = ( /obj/structure/closet/secure_closet/freezer/fridge/full, /obj/item/reagent_container/food/condiment/enzyme, @@ -4830,6 +5201,7 @@ /area/lv522/atmos/cargo_intake) "das" = ( /obj/structure/machinery/landinglight/ds1/delayone, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/plating, /area/lv522/landing_zone_1) "daz" = ( @@ -4861,39 +5233,6 @@ "dbi" = ( /turf/open/floor/corsat/browncorner, /area/lv522/atmos/command_centre) -"dbs" = ( -/obj/item/stack/sheet/wood{ - pixel_x = -5; - pixel_y = -10 - }, -/obj/item/stack/sheet/wood{ - layer = 2.7; - pixel_y = 8 - }, -/obj/item/reagent_container/food/drinks/bottle/whiskey{ - layer = 3.1; - pixel_x = -11; - pixel_y = -6 - }, -/obj/item/reagent_container/food/drinks/drinkingglass{ - icon_state = "shotglass"; - pixel_x = 4; - pixel_y = 17 - }, -/obj/item/reagent_container/food/drinks/drinkingglass{ - icon_state = "shotglass"; - layer = 3.1; - pixel_x = 15; - pixel_y = 17 - }, -/obj/item/reagent_container/food/drinks/drinkingglass{ - icon_state = "shotglass"; - layer = 3.1; - pixel_x = 9; - pixel_y = 1 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) "dbt" = ( /obj/item/prop/alien/hugger, /turf/open/floor/corsat/brown/southeast, @@ -4918,16 +5257,6 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/b_block/hydro) -"dbP" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform/stair_cut{ - icon_state = "platform_stair_alt" - }, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/south_west_street) "dbQ" = ( /obj/effect/spawner/gibspawner/xeno, /obj/structure/pipes/standard/simple/hidden/green{ @@ -5046,6 +5375,10 @@ }, /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms) +"ddB" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/asphalt/cement/cement3, +/area/lv522/outdoors/colony_streets/south_west_street) "ddC" = ( /obj/structure/filingcabinet{ density = 0; @@ -5223,6 +5556,10 @@ "dhH" = ( /turf/open/asphalt/cement/cement12, /area/lv522/landing_zone_2) +"dhO" = ( +/obj/structure/platform_decoration/stone/strata, +/turf/open/auto_turf/shale/layer1, +/area/lv522/oob) "dhP" = ( /obj/structure/machinery/landinglight/ds1/delayone{ dir = 8 @@ -5242,6 +5579,10 @@ }, /turf/open/floor/corsat/browncorner/east, /area/lv522/oob/w_y_vault) +"dhZ" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/central_streets) "dio" = ( /obj/effect/decal/hefa_cult_decals/d32{ desc = "You think you can make out the iconography of a Xenomorph."; @@ -5334,6 +5675,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/a_block/admin) +"dkx" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform/metal/almayer, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_2) "dkB" = ( /obj/structure/largecrate/random, /turf/open/floor/prison, @@ -5376,14 +5723,20 @@ }, /turf/open/floor/corsat/plate, /area/lv522/atmos/command_centre) -"dkX" = ( -/obj/structure/platform_decoration, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/landing_zone_2) "dli" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat/brown, /area/lv522/atmos/command_centre) +"dlx" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/west, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice10"; + pixel_x = 4; + pixel_y = -16 + }, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/north_east_street) "dlC" = ( /obj/structure/prop/invuln/fire{ pixel_x = 8; @@ -5435,17 +5788,10 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/corsat/brown/southeast, /area/lv522/atmos/command_centre) -"dne" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/prison/greenfull/east, -/area/lv522/indoors/b_block/bridge) +"dnf" = ( +/obj/effect/spawner/gibspawner/xeno, +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/containers) "dng" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 @@ -5485,12 +5831,6 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) -"dnO" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel/far) "dnX" = ( /obj/structure/surface/table/almayer, /obj/item/tool/kitchen/rollingpin, @@ -5774,10 +6114,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/bridges/op_centre) -"dvO" = ( -/obj/structure/platform_decoration/strata, -/turf/closed/wall/strata_ice/dirty, -/area/lv522/oob) "dwd" = ( /obj/item/lightstick/red/spoke/planted{ pixel_x = -9; @@ -5927,17 +6263,23 @@ }, /turf/open/floor/corsat, /area/lv522/atmos/cargo_intake) +"dAE" = ( +/obj/vehicle/train/cargo/engine, +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/containers) "dAG" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/corsat/brown/east, /area/lv522/atmos/cargo_intake) -"dAQ" = ( -/obj/structure/platform_decoration{ +"dAJ" = ( +/obj/structure/barricade/deployable{ dir = 1 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison/greenfull/northwest, -/area/lv522/indoors/b_block/bridge) +/obj/item/weapon/gun/rifle/m41a{ + current_mag = null + }, +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/containers) "dBa" = ( /obj/structure/prop/ice_colony/dense/planter_box{ dir = 9 @@ -6227,13 +6569,6 @@ /obj/item/clothing/suit/storage/snow_suit/survivor/parka/red, /turf/open/floor/carpet, /area/lv522/indoors/b_block/bar) -"dHz" = ( -/obj/effect/spawner/gibspawner/xeno, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/asphalt/cement/cement1, -/area/lv522/outdoors/colony_streets/north_east_street) "dHE" = ( /obj/structure/bed/chair/comfy, /turf/open/floor/prison/blue/southeast, @@ -6351,6 +6686,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/whitegreenfull, /area/lv522/indoors/a_block/fitness/glass) +"dKD" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_ew_full_cap" + }, +/obj/structure/platform/metal/stair_cut/platform_right, +/turf/open/floor/corsat/plate, +/area/lv522/atmos/cargo_intake) "dKF" = ( /obj/structure/machinery/conveyor{ dir = 8; @@ -6405,6 +6747,13 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/corsat/browncorner/east, /area/lv522/atmos/cargo_intake) +"dMk" = ( +/obj/structure/platform_decoration/metal/almayer, +/obj/structure/bed/roller, +/obj/effect/landmark/survivor_spawner, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison/blue_plate/north, +/area/lv522/indoors/a_block/admin) "dMl" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -6439,6 +6788,10 @@ }, /turf/open/floor/plating, /area/lv522/landing_zone_1) +"dMZ" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_1) "dNd" = ( /obj/structure/surface/table/almayer, /turf/open/floor/corsat/squares, @@ -6462,6 +6815,11 @@ "dNx" = ( /turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_up_to_down, /area/lv522/landing_zone_forecon/UD6_Tornado) +"dNM" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison/darkredfull2, +/area/lv522/indoors/a_block/kitchen) "dNP" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -6628,6 +6986,13 @@ "dRL" = ( /turf/closed/wall/strata_outpost, /area/lv522/indoors/a_block/dorm_north) +"dRW" = ( +/obj/effect/decal/cleanable/blood/xeno, +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/northeast, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/north_east_street) "dSt" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 @@ -6656,6 +7021,13 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_west_street) +"dTQ" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel/far) "dTW" = ( /obj/item/clothing/under/marine/reconnaissance, /turf/open/floor/corsat/brown/southeast, @@ -6686,6 +7058,14 @@ }, /turf/open/floor/corsat/squares, /area/lv522/atmos/cargo_intake) +"dUO" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/prison/floor_plate, +/area/lv522/outdoors/colony_streets/south_east_street) "dUS" = ( /obj/item/clothing/head/hardhat/white, /obj/item/prop/alien/hugger{ @@ -6763,6 +7143,10 @@ }, /turf/open/floor/corsat/plate, /area/lv522/atmos/east_reactor/south) +"dWU" = ( +/obj/structure/largecrate/random, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/containers) "dWY" = ( /turf/closed/shuttle/dropship3/tornado{ icon_state = "32" @@ -6976,6 +7360,13 @@ }, /turf/open/floor/strata/white_cyan1/east, /area/lv522/indoors/a_block/medical) +"edE" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/prison/floor_plate, +/area/lv522/outdoors/colony_streets/north_east_street) "edP" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, @@ -7141,6 +7532,14 @@ }, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/mining) +"egI" = ( +/obj/structure/stairs/perspective{ + dir = 6; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/stair_cut/platform_left, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/cargo) "egK" = ( /obj/structure/cable/heavyduty{ icon_state = "1-2-8" @@ -7174,6 +7573,10 @@ /obj/effect/landmark/queen_spawn, /turf/open/floor/corsat/squares, /area/lv522/atmos/east_reactor) +"eho" = ( +/obj/item/prop/colony/used_flare, +/turf/open/asphalt/cement/cement12, +/area/lv522/outdoors/colony_streets/containers) "ehr" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/decal/cleanable/dirt, @@ -7183,6 +7586,13 @@ /obj/effect/acid_hole, /turf/closed/wall/strata_outpost, /area/lv522/indoors/a_block/hallway) +"ehJ" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/prison/floor_plate, +/area/lv522/indoors/a_block/garden) "ehM" = ( /obj/structure/prop/ice_colony/ground_wire{ dir = 4 @@ -7230,6 +7640,7 @@ pixel_y = -6 }, /obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) "eiY" = ( @@ -7309,6 +7720,10 @@ }, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/garage) +"elm" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/asphalt/cement/cement14, +/area/lv522/outdoors/colony_streets/north_east_street) "elq" = ( /obj/structure/prop/ice_colony/ground_wire, /obj/structure/prop/ice_colony/ground_wire{ @@ -7444,14 +7859,6 @@ }, /turf/open/floor/corsat/plate, /area/lv522/atmos/east_reactor/south) -"eoH" = ( -/obj/item/stack/sheet/metal{ - layer = 2.5; - pixel_x = 1; - pixel_y = 1 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) "eoZ" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/corsat/brown, @@ -7507,19 +7914,6 @@ }, /turf/open/floor/prison/floor_plate, /area/lv522/indoors/a_block/hallway/damage) -"equ" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/corsat/plate, -/area/lv522/atmos/cargo_intake) -"eqD" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_ew_full_cap" - }, -/obj/structure/platform/stair_cut/alt, -/turf/open/floor/corsat/plate, -/area/lv522/atmos/cargo_intake) "eqM" = ( /turf/open/floor/plating/platingdmg1, /area/lv522/indoors/a_block/security) @@ -7545,6 +7939,17 @@ /obj/structure/pipes/standard/manifold/fourway/hidden/green, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/dorms) +"esc" = ( +/obj/structure/platform_decoration/metal/almayer, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/prison/floor_plate, +/area/lv522/outdoors/colony_streets/south_east_street) "esj" = ( /obj/structure/cargo_container/kelland/left, /turf/open/asphalt/cement/cement9, @@ -7552,6 +7957,10 @@ "eso" = ( /turf/open/floor/prison, /area/lv522/indoors/c_block/mining) +"esu" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_east_street) "esB" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_full" @@ -7598,13 +8007,10 @@ "etx" = ( /turf/open/gm/river, /area/lv522/indoors/a_block/kitchen/damage) -"etN" = ( -/obj/structure/machinery/photocopier, -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/plating/platebot, -/area/lv522/indoors/c_block/cargo) +"etZ" = ( +/obj/structure/platform/metal/almayer, +/turf/open/gm/river, +/area/lv522/oob) "euj" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 @@ -7653,11 +8059,25 @@ /obj/vehicle/train/cargo/engine, /turf/open/floor/plating, /area/lv522/landing_zone_1/tunnel/far) +"evb" = ( +/obj/structure/fence{ + layer = 2.9 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/prison/floor_plate, +/area/lv522/outdoors/colony_streets/containers) "evg" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/power/apc/power/west{ start_charge = 20 }, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) "evu" = ( @@ -7686,52 +8106,18 @@ /obj/item/clothing/suit/storage/marine/M3G, /turf/closed/wall/mineral/bone_resin, /area/lv522/oob) -"evS" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice10"; - pixel_x = 4; - pixel_y = -16 - }, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/north_east_street) -"ewe" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) -"ewf" = ( -/obj/structure/platform, -/turf/open/asphalt/cement/cement4, -/area/lv522/outdoors/colony_streets/south_east_street) -"ewm" = ( -/obj/item/stack/tile/wood{ - layer = 2.5 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) -"ewn" = ( -/obj/structure/platform, -/turf/open/asphalt/cement/cement4, -/area/lv522/outdoors/colony_streets/south_west_street) -"ewp" = ( -/obj/item/weapon/twohanded/folded_metal_chair, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) -"ewE" = ( -/obj/structure/platform{ - dir = 4 +"evD" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/landing_zone_2) +/turf/open/floor/prison/floor_plate, +/area/lv522/outdoors/colony_streets/east_central_street) "exu" = ( /obj/structure/surface/rack, /obj/item/tool/minihoe{ @@ -7752,10 +8138,6 @@ /obj/item/tool/wirecutters/clippers, /turf/open/floor/prison, /area/lv522/indoors/b_block/hydro) -"exB" = ( -/obj/effect/spawner/gibspawner/xeno, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) "exQ" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -7769,18 +8151,6 @@ }, /turf/closed/wall/r_wall/biodome/biodome_unmeltable, /area/lv522/oob) -"eyc" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/central_streets) -"eyh" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/north_east_street) "eym" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 @@ -7791,8 +8161,13 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/asphalt/cement/cement4, /area/lv522/outdoors/colony_streets/central_streets) +"eyt" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/garage) "eyy" = ( /obj/structure/machinery/landinglight/ds1, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/plating, /area/lv522/landing_zone_1) "eyM" = ( @@ -7848,6 +8223,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms) +"ezE" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/plating, +/area/lv522/outdoors/colony_streets/north_east_street) "ezH" = ( /obj/structure/cargo_container/watatsumi/rightmid, /turf/open/floor/prison/floor_marked, @@ -7957,21 +8337,17 @@ }, /turf/open/floor/plating, /area/lv522/indoors/a_block/security) +"eDh" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_1) "eDi" = ( /obj/structure/machinery/light{ dir = 1 }, /turf/open/floor/prison/darkredfull2, /area/lv522/indoors/a_block/kitchen/glass) -"eDq" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/gm/river, -/area/lv522/outdoors/colony_streets/south_street) "eDt" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/corsat/squares, @@ -8073,13 +8449,6 @@ }, /turf/open/floor/wood, /area/lv522/indoors/a_block/executive) -"eHB" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison/darkbrownfull2, -/area/lv522/indoors/c_block/garage) "eHF" = ( /obj/structure/cargo_container/kelland/right, /turf/open/floor/plating, @@ -8114,13 +8483,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/floor_plate, /area/lv522/indoors/a_block/dorms/glass) -"eIn" = ( -/obj/item/weapon/twohanded/folded_metal_chair, -/obj/item/prop/alien/hugger{ - pixel_y = 14 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) "eIF" = ( /obj/structure/bed/alien, /obj/item/pipe{ @@ -8128,15 +8490,6 @@ }, /turf/open/floor/prison/greenfull, /area/lv522/indoors/a_block/fitness) -"eIT" = ( -/obj/item/stack/tile/plasteel{ - name = "ceiling tile"; - pixel_x = -2; - pixel_y = 1 - }, -/obj/item/prop/colony/used_flare, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) "eJc" = ( /obj/structure/surface/table/almayer, /obj/effect/landmark/objective_landmark/close, @@ -8169,10 +8522,6 @@ /obj/item/prop/alien/hugger, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) -"eJq" = ( -/obj/item/stack/sheet/metal, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) "eJw" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/corsat/plate, @@ -8245,11 +8594,6 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat/browncorner/west, /area/lv522/atmos/cargo_intake) -"eLN" = ( -/obj/structure/machinery/light, -/obj/structure/platform, -/turf/open/floor/prison/floor_plate, -/area/lv522/indoors/a_block/corpo/glass) "eLU" = ( /obj/structure/machinery/light{ dir = 4 @@ -8335,19 +8679,6 @@ }, /turf/open/floor/prison/floor_plate, /area/lv522/outdoors/colony_streets/north_east_street) -"eOe" = ( -/obj/structure/fence{ - layer = 2.9 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/atmos/cargo_intake) "eOj" = ( /obj/structure/machinery/light{ dir = 8 @@ -8362,19 +8693,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/floor_plate, /area/lv522/indoors/a_block/admin) -"eOn" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/atmos/cargo_intake) -"eOA" = ( -/turf/closed/wall/shiva/prefabricated/reinforced, -/area/lv522/outdoors/colony_streets/north_east_street) "eOE" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -8469,6 +8787,14 @@ }, /turf/open/floor/plating, /area/lv522/outdoors/colony_streets/north_east_street) +"eRQ" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/structure/stairs/perspective{ + dir = 6; + icon_state = "p_stair_full" + }, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_east_street) "eSf" = ( /obj/structure/barricade/wooden{ dir = 4 @@ -8480,15 +8806,6 @@ /obj/effect/spider/spiderling/nogrow, /turf/open/floor/prison, /area/lv522/indoors/a_block/security/glass) -"eSy" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/plating/platebot, -/area/lv522/indoors/c_block/cargo) "eSO" = ( /obj/structure/largecrate/random, /obj/structure/machinery/light{ @@ -8515,9 +8832,21 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat/brown, /area/lv522/atmos/cargo_intake) +"eUb" = ( +/obj/structure/stairs/perspective{ + dir = 9; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/obj/structure/machinery/light, +/turf/open/floor/prison/blue_plate/north, +/area/lv522/indoors/a_block/admin) "eUh" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/security) +"eUj" = ( +/turf/open/asphalt/cement/cement15, +/area/lv522/outdoors/colony_streets/containers) "eUs" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/corsat, @@ -8540,6 +8869,13 @@ }, /turf/open/floor/corsat/marked, /area/lv522/indoors/b_block/bridge) +"eUM" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/north_west_street) "eUO" = ( /turf/open/floor/corsat/marked, /area/lv522/indoors/lone_buildings/outdoor_bot) @@ -8632,31 +8968,26 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/kitchen, /area/lv522/indoors/a_block/kitchen) -"eXe" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, -/turf/open/auto_turf/shale/layer1, -/area/lv522/outdoors/colony_streets/north_east_street) "eXG" = ( /turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_2) -"eXO" = ( -/obj/effect/spawner/gibspawner/xeno, -/turf/open/floor/prison, -/area/lv522/atmos/cargo_intake) "eXU" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/lone_buildings/engineering) -"eXV" = ( -/obj/item/stack/tile/plasteel{ - name = "ceiling tile"; - pixel_x = -2; - pixel_y = 1 +"eYd" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) +/obj/structure/platform/metal/almayer, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/prison/greenfull/east, +/area/lv522/indoors/b_block/bridge) "eYh" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -8674,6 +9005,12 @@ /obj/effect/decal/cleanable/dirt, /turf/closed/wall/strata_outpost/reinforced, /area/lv522/atmos/cargo_intake) +"eZC" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/northwest, +/turf/open/gm/river, +/area/lv522/landing_zone_1/tunnel) "eZK" = ( /turf/open/floor/prison/floor_plate, /area/lv522/indoors/a_block/admin) @@ -8684,34 +9021,18 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/c_block/casino) -"eZW" = ( -/obj/effect/decal/cleanable/dirt, +"eZP" = ( /obj/structure/stairs/perspective{ + dir = 8; icon_state = "p_stair_full" }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/transmitter/colony_net{ - phone_category = "LV522 Chances Claim"; - phone_color = "red"; - phone_id = "LZ1 Service Tunnel"; - pixel_y = 24 - }, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel) +/obj/structure/platform/metal/almayer, +/turf/open/floor/prison/blue_plate/north, +/area/lv522/indoors/a_block/admin) "eZY" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat, /area/lv522/atmos/cargo_intake) -"fac" = ( -/obj/structure/platform, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/outdoors/colony_streets/south_east_street) "faJ" = ( /obj/item/trash/uscm_mre{ pixel_x = 12; @@ -8765,12 +9086,6 @@ }, /turf/open/floor/prison/darkredfull2, /area/lv522/indoors/a_block/kitchen/damage) -"fbS" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/asphalt/cement/cement3, -/area/lv522/outdoors/colony_streets/south_east_street) "fbV" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -8838,15 +9153,6 @@ /obj/item/trash/plate, /turf/open/floor/carpet, /area/lv522/indoors/b_block/bar) -"fdS" = ( -/obj/structure/machinery/door_display/research_cell{ - dir = 4; - id = "Reactor_e_entry_4"; - pixel_x = -16; - req_access = null - }, -/turf/open/asphalt/cement/cement1, -/area/lv522/outdoors/colony_streets/north_east_street) "fdT" = ( /obj/structure/closet/crate, /turf/open/floor/prison/darkbrownfull2, @@ -8870,20 +9176,6 @@ }, /turf/open/asphalt/cement/cement15, /area/lv522/outdoors/colony_streets/north_east_street) -"feS" = ( -/obj/structure/fence, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/atmos/cargo_intake) -"feZ" = ( -/turf/open/floor/prison/floor_marked, -/area/lv522/atmos/cargo_intake) "ffb" = ( /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/bridge) @@ -8904,10 +9196,6 @@ }, /turf/open/floor/strata/floor3/east, /area/lv522/outdoors/colony_streets/south_street) -"ffr" = ( -/obj/structure/cargo_container/wy/left, -/turf/open/floor/prison/floor_marked, -/area/lv522/atmos/cargo_intake) "ffL" = ( /obj/item/clothing/mask/facehugger{ desc = "It has some sort of a tube at the end of its tail. What the hell is this thing?"; @@ -8929,12 +9217,6 @@ }, /turf/open/floor/strata/white_cyan1/east, /area/lv522/indoors/a_block/medical/glass) -"fgk" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/prison, -/area/lv522/indoors/a_block/dorms) "fgv" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -8943,6 +9225,10 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_west_street) +"fgw" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel/far) "fgB" = ( /obj/item/lightstick/red/spoke/planted{ pixel_x = 18; @@ -8979,14 +9265,14 @@ }, /turf/open/asphalt/cement/cement4, /area/lv522/outdoors/colony_streets/north_east_street) -"fhY" = ( -/obj/structure/cargo_container/wy/mid, -/turf/open/floor/prison/floor_marked, -/area/lv522/atmos/cargo_intake) -"fib" = ( -/obj/structure/cargo_container/wy/right, -/turf/open/floor/prison/floor_marked, -/area/lv522/atmos/cargo_intake) +"fic" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/stair_cut/platform_left, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/south_street) "fiu" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/barricade/wooden{ @@ -8994,10 +9280,6 @@ }, /turf/open/floor/prison, /area/lv522/indoors/c_block/cargo) -"fiA" = ( -/obj/structure/cargo_container/horizontal/blue/top, -/turf/open/floor/prison/floor_marked, -/area/lv522/atmos/cargo_intake) "fiB" = ( /obj/structure/prop/invuln/ice_prefab{ dir = 9 @@ -9046,14 +9328,24 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/strata/white_cyan2/west, /area/lv522/indoors/a_block/medical/glass) +"fjL" = ( +/obj/structure/cable/heavyduty{ + icon_state = "4-8" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/platform_decoration/metal/almayer, +/turf/open/floor/plating, +/area/lv522/outdoors/colony_streets/central_streets) "fjP" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) -"fkb" = ( -/obj/item/prop/alien/hugger, -/turf/open/floor/prison/floor_marked, -/area/lv522/atmos/cargo_intake) "fki" = ( /obj/structure/bed/chair{ dir = 1 @@ -9074,6 +9366,14 @@ "fkB" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/outdoors/nw_rockies) +"fkJ" = ( +/obj/structure/platform_decoration/metal/almayer, +/obj/structure/stairs/perspective{ + dir = 5; + icon_state = "p_stair_full" + }, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_east_street) "fkP" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -9112,6 +9412,12 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/oob) +"flT" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/northwest, +/turf/open/gm/river, +/area/lv522/indoors/c_block/mining) "fms" = ( /obj/structure/bed/chair/comfy, /obj/effect/decal/cleanable/dirt, @@ -9171,6 +9477,14 @@ }, /turf/open/floor/prison/greenfull, /area/lv522/indoors/a_block/fitness) +"foa" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_east_street) "fol" = ( /turf/open/floor/prison/cell_stripe/north, /area/lv522/atmos/cargo_intake) @@ -9178,13 +9492,6 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison/cell_stripe/north, /area/lv522/atmos/cargo_intake) -"foR" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison/greenfull/northwest, -/area/lv522/indoors/b_block/bridge) "foT" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -9248,6 +9555,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/floor_plate, /area/lv522/indoors/a_block/dorms/glass) +"fqJ" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/area/lv522/landing_zone_forecon/UD6_Tornado) "frH" = ( /obj/structure/machinery/light{ dir = 1 @@ -9284,19 +9598,6 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/south_east_street) -"fsz" = ( -/obj/structure/platform, -/obj/structure/prop/vehicles/crawler{ - dir = 8; - layer = 3.1; - pixel_x = 5; - pixel_y = 7 - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/garage) "fsC" = ( /obj/structure/prop/vehicles{ icon_state = "truck_damaged" @@ -9353,13 +9654,6 @@ }, /turf/open/floor/prison/floor_plate, /area/lv522/atmos/way_in_command_centre) -"ftA" = ( -/obj/structure/surface/table/almayer, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/prison/darkpurplefull2, -/area/lv522/indoors/a_block/dorms) "ftD" = ( /obj/structure/machinery/door/airlock/almayer/generic{ name = "\improper A-Block Fitness Centre Airlock" @@ -9382,15 +9676,6 @@ /obj/item/stack/sheet/metal, /turf/open/floor/corsat, /area/lv522/atmos/reactor_garage) -"ful" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison, -/area/lv522/indoors/c_block/cargo) "fuq" = ( /obj/item/prop/colony/used_flare, /turf/open/floor/prison, @@ -9411,15 +9696,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/greenfull, /area/lv522/indoors/a_block/fitness/glass) -"fvn" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/gm/river, -/area/lv522/landing_zone_1/tunnel/far) "fvo" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, @@ -9515,6 +9791,16 @@ }, /turf/open/floor/corsat/marked, /area/lv522/atmos/east_reactor/south) +"fxH" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/prison/floor_plate, +/area/lv522/outdoors/colony_streets/east_central_street) "fyl" = ( /obj/structure/pipes/vents/pump, /obj/effect/decal/cleanable/dirt, @@ -9556,27 +9842,6 @@ }, /turf/open/floor/plating, /area/lv522/indoors/c_block/garage) -"fzg" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/prison/blue_plate/north, -/area/lv522/indoors/a_block/admin) -"fzl" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" - }, -/obj/structure/platform_decoration{ - dir = 1 - }, -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/prison/blue_plate/north, -/area/lv522/indoors/a_block/admin) "fzp" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, @@ -9604,39 +9869,12 @@ }, /turf/open/floor/prison, /area/lv522/indoors/c_block/garage) -"fAq" = ( -/obj/effect/spawner/gibspawner/xeno, -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/north_east_street) -"fAx" = ( -/obj/structure/barricade/deployable{ - dir = 1 - }, -/obj/structure/barricade/deployable{ - dir = 8 - }, -/obj/item/weapon/gun/rifle/m41a{ - current_mag = null - }, -/turf/open/floor/prison, -/area/lv522/atmos/cargo_intake) "fAA" = ( /obj/structure/largecrate/random/barrel{ layer = 2.9 }, /turf/open/asphalt/cement/cement4, /area/lv522/outdoors/colony_streets/central_streets) -"fAG" = ( -/obj/item/ammo_magazine/rifle/heap{ - current_rounds = 0 - }, -/obj/structure/bed/roller, -/obj/effect/decal/cleanable/blood, -/turf/open/floor/prison, -/area/lv522/atmos/cargo_intake) "fAH" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -9660,57 +9898,37 @@ }, /turf/open/floor/corsat/plate, /area/lv522/atmos/command_centre) +"fBi" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/gm/river, +/area/lv522/landing_zone_1/tunnel/far) "fBp" = ( /turf/open/asphalt/cement/cement15, /area/lv522/outdoors/colony_streets/east_central_street) "fBL" = ( /obj/structure/machinery/landinglight/ds1/delaytwo, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1) -"fBP" = ( -/obj/structure/machinery/iv_drip, -/turf/open/floor/prison, -/area/lv522/atmos/cargo_intake) "fBR" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/south_east_street) -"fBU" = ( -/obj/item/storage/belt/medical/lifesaver, -/turf/open/floor/prison, -/area/lv522/atmos/cargo_intake) "fBY" = ( /obj/item/prop/colony/used_flare, /turf/open/floor/prison/floor_plate, /area/lv522/outdoors/colony_streets/north_street) -"fCb" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel/far) "fCl" = ( /obj/structure/barricade/wooden{ dir = 1 }, /turf/open/floor/prison/floor_plate, /area/lv522/indoors/a_block/kitchen/glass) -"fCE" = ( -/obj/structure/barricade/deployable{ - dir = 1 - }, -/turf/open/floor/prison, -/area/lv522/atmos/cargo_intake) -"fCN" = ( -/obj/structure/cargo_container/horizontal/blue/middle, -/turf/open/floor/prison, -/area/lv522/atmos/cargo_intake) -"fCP" = ( -/obj/item/prop/colony/used_flare, -/turf/open/floor/prison, -/area/lv522/atmos/cargo_intake) "fCU" = ( /obj/effect/decal/cleanable/blood{ desc = "Watch your step."; @@ -9726,10 +9944,6 @@ icon_state = "30" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) -"fDi" = ( -/obj/structure/largecrate/random, -/turf/open/floor/prison, -/area/lv522/atmos/cargo_intake) "fDj" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin{ @@ -9741,13 +9955,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) -"fDn" = ( -/obj/structure/barricade/deployable{ - dir = 1 - }, -/obj/item/prop/colony/used_flare, -/turf/open/floor/prison/floor_marked, -/area/lv522/atmos/cargo_intake) "fDr" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 @@ -9775,22 +9982,9 @@ pixel_x = 5; registered_name = "John Forklift" }, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) -"fDH" = ( -/obj/structure/barricade/deployable{ - dir = 1 - }, -/obj/item/weapon/gun/rifle/m41a{ - current_mag = null - }, -/turf/open/floor/prison, -/area/lv522/atmos/cargo_intake) -"fEe" = ( -/obj/structure/platform, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/garage) "fEF" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/shiva/radiator_tile2, @@ -9810,16 +10004,13 @@ /obj/item/explosive/plastic, /turf/open/asphalt/cement/cement12, /area/lv522/outdoors/colony_streets/south_east_street) -"fFp" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 +"fFt" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" }, -/turf/open/floor/prison/floor_plate, -/area/lv522/atmos/cargo_intake) +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/plating, +/area/lv522/landing_zone_forecon/UD6_Tornado) "fFw" = ( /obj/structure/largecrate/random/barrel/white, /turf/open/floor/prison, @@ -9831,10 +10022,6 @@ /obj/structure/largecrate/random/barrel/white, /turf/open/floor/prison/floor_marked, /area/lv522/outdoors/nw_rockies) -"fFF" = ( -/obj/structure/platform_decoration, -/turf/open/floor/corsat/marked, -/area/lv522/indoors/c_block/cargo) "fFS" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison, @@ -9873,6 +10060,10 @@ /obj/structure/largecrate/random/secure, /turf/open/asphalt/cement/cement12, /area/lv522/outdoors/nw_rockies) +"fHd" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_1) "fHy" = ( /obj/structure/barricade/wooden{ dir = 4 @@ -9887,6 +10078,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/strata/white_cyan2, /area/lv522/indoors/a_block/executive) +"fHX" = ( +/obj/structure/platform/metal/almayer, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/south_street) "fIa" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 @@ -9901,10 +10096,18 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/floor_plate, /area/lv522/outdoors/colony_streets/north_street) +"fIs" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/asphalt/cement/cement1, +/area/lv522/outdoors/colony_streets/south_street) "fIx" = ( /obj/structure/closet/emcloset, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/mining) +"fIA" = ( +/obj/structure/platform/stone/strata, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/oob) "fII" = ( /obj/structure/prop/ice_colony/ground_wire{ dir = 4 @@ -9918,6 +10121,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkredfull2, /area/lv522/indoors/a_block/kitchen/glass) +"fIV" = ( +/obj/structure/barricade/deployable{ + dir = 1 + }, +/obj/item/prop/colony/used_flare, +/turf/open/floor/prison/floor_marked, +/area/lv522/outdoors/colony_streets/containers) "fJe" = ( /obj/structure/cargo_container/kelland/right, /turf/open/asphalt/cement/cement12, @@ -9933,12 +10143,6 @@ }, /turf/open/floor/plating, /area/lv522/landing_zone_1/tunnel/far) -"fKf" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/asphalt/cement/cement12, -/area/lv522/outdoors/colony_streets/north_east_street) "fKt" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 4; @@ -9977,6 +10181,7 @@ id = "LZ1_Lockdown_Lo"; name = "Emergency Lockdown" }, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/corsat/marked, /area/lv522/landing_zone_1) "fLM" = ( @@ -10002,6 +10207,13 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat/marked, /area/lv522/indoors/b_block/bar) +"fMl" = ( +/obj/structure/barricade/deployable{ + dir = 4 + }, +/obj/structure/barricade/deployable, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/containers) "fMN" = ( /obj/structure/surface/table/almayer, /obj/item/storage/pill_bottle/tramadol/skillless{ @@ -10045,6 +10257,13 @@ }, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/garage) +"fNb" = ( +/obj/structure/platform/metal/almayer/west, +/obj/item/shard{ + icon_state = "medium" + }, +/turf/open/floor/prison/floor_plate, +/area/lv522/indoors/a_block/corpo/glass) "fNk" = ( /obj/structure/pipes/standard/manifold/fourway/hidden/green, /turf/open/floor/plating/plating_catwalk/prison, @@ -10101,22 +10320,20 @@ /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/prison, /area/lv522/indoors/lone_buildings/outdoor_bot) -"fPv" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" - }, -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/cargo) +"fPc" = ( +/obj/structure/largecrate/random/barrel/true_random, +/turf/open/asphalt/cement/cement1, +/area/lv522/outdoors/colony_streets/containers) "fPB" = ( /obj/structure/bed/chair, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkpurple2, /area/lv522/indoors/a_block/dorms) +"fPG" = ( +/obj/structure/machinery/light, +/obj/structure/platform/metal/almayer, +/turf/open/floor/prison/floor_plate, +/area/lv522/indoors/a_block/corpo/glass) "fPH" = ( /obj/structure/closet/crate/miningcar, /turf/open/auto_turf/shale/layer1, @@ -10132,6 +10349,10 @@ /obj/effect/landmark/corpsespawner/colonist/burst, /turf/open/floor/corsat/browncorner, /area/lv522/atmos/east_reactor/south) +"fQa" = ( +/obj/structure/platform/stone/strata/north, +/turf/open/auto_turf/shale/layer1, +/area/lv522/oob) "fQb" = ( /obj/structure/surface/table/almayer, /obj/item/trash/plate{ @@ -10139,6 +10360,15 @@ }, /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms) +"fQf" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice10"; + pixel_x = -2; + pixel_y = -8 + }, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/north_east_street) "fQD" = ( /obj/structure/bed/chair{ dir = 4 @@ -10153,6 +10383,10 @@ /obj/item/clothing/suit/storage/marine/medium/smooth, /turf/open/floor/corsat/plate, /area/lv522/atmos/east_reactor/south) +"fRe" = ( +/obj/item/prop/alien/hugger, +/turf/open/floor/prison/floor_marked, +/area/lv522/outdoors/colony_streets/containers) "fRf" = ( /obj/structure/closet/bodybag, /turf/open/floor/prison/blue_plate/north, @@ -10165,15 +10399,6 @@ }, /turf/open/floor/corsat/marked, /area/lv522/indoors/a_block/admin) -"fRq" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/corsat/marked, -/area/lv522/indoors/c_block/cargo) "fRP" = ( /obj/structure/prop/vehicles/crawler{ layer = 3.3 @@ -10192,11 +10417,9 @@ "fSe" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/atmos/filt) -"fSf" = ( -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/atmos/cargo_intake) "fSo" = ( /obj/structure/machinery/landinglight/ds1, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1) "fSq" = ( @@ -10210,33 +10433,20 @@ }, /turf/open/floor/prison, /area/lv522/indoors/lone_buildings/engineering) -"fSR" = ( -/obj/structure/barricade/deployable{ - dir = 8 +"fSB" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/turf/open/floor/prison, -/area/lv522/atmos/cargo_intake) -"fSX" = ( -/obj/effect/landmark/objective_landmark/close, -/obj/structure/bed/roller, -/turf/open/floor/prison, -/area/lv522/atmos/cargo_intake) -"fTi" = ( -/obj/item/prop/alien/hugger, -/turf/open/floor/prison, -/area/lv522/atmos/cargo_intake) +/turf/open/floor/prison/floor_plate, +/area/lv522/outdoors/colony_streets/east_central_street) "fTN" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" }, /turf/open/asphalt/cement/cement3, /area/lv522/outdoors/colony_streets/south_west_street) -"fTO" = ( -/obj/item/ammo_magazine/rifle/heap{ - current_rounds = 0 - }, -/turf/open/floor/prison, -/area/lv522/atmos/cargo_intake) "fTP" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, @@ -10251,6 +10461,39 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat/marked, /area/lv522/indoors/a_block/hallway) +"fUn" = ( +/obj/item/stack/sheet/wood{ + pixel_x = -5; + pixel_y = -10 + }, +/obj/item/stack/sheet/wood{ + layer = 2.7; + pixel_y = 8 + }, +/obj/item/reagent_container/food/drinks/bottle/whiskey{ + layer = 3.1; + pixel_x = -11; + pixel_y = -6 + }, +/obj/item/reagent_container/food/drinks/drinkingglass{ + icon_state = "shotglass"; + pixel_x = 4; + pixel_y = 17 + }, +/obj/item/reagent_container/food/drinks/drinkingglass{ + icon_state = "shotglass"; + layer = 3.1; + pixel_x = 15; + pixel_y = 17 + }, +/obj/item/reagent_container/food/drinks/drinkingglass{ + icon_state = "shotglass"; + layer = 3.1; + pixel_x = 9; + pixel_y = 1 + }, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/containers) "fUx" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 @@ -10261,6 +10504,14 @@ }, /turf/open/floor/wood, /area/lv522/indoors/a_block/executive) +"fVc" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/turf/open/auto_turf/shale/layer2, +/area/lv522/outdoors/colony_streets/central_streets) "fVB" = ( /obj/structure/closet, /obj/effect/decal/cleanable/dirt, @@ -10288,10 +10539,6 @@ }, /turf/open/asphalt/cement/cement3, /area/lv522/outdoors/colony_streets/central_streets) -"fWD" = ( -/obj/structure/cargo_container/horizontal/blue/bottom, -/turf/open/floor/prison, -/area/lv522/atmos/cargo_intake) "fWG" = ( /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/south_east_street) @@ -10331,12 +10578,6 @@ icon_state = "19" }, /area/lv522/landing_zone_forecon/UD6_Tornado) -"fXs" = ( -/obj/item/ammo_magazine/rifle/heap{ - current_rounds = 0 - }, -/turf/open/floor/prison/floor_marked, -/area/lv522/atmos/cargo_intake) "fXx" = ( /turf/open/asphalt/cement/cement4, /area/lv522/outdoors/colony_streets/central_streets) @@ -10359,9 +10600,6 @@ }, /turf/open/floor/corsat/plate, /area/lv522/indoors/c_block/mining) -"fXU" = ( -/turf/open/asphalt/cement/cement1, -/area/lv522/atmos/cargo_intake) "fXZ" = ( /obj/structure/curtain/medical, /turf/open/floor/strata/white_cyan4/east, @@ -10384,15 +10622,6 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison/floor_plate, /area/lv522/indoors/c_block/mining) -"fYD" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/gm/river, -/area/lv522/landing_zone_1/tunnel/far) "fYP" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -10446,6 +10675,18 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/floor_marked/southwest, /area/lv522/indoors/c_block/mining) +"fZT" = ( +/obj/structure/barricade/deployable, +/obj/item/weapon/gun/rifle/m41a{ + current_mag = null + }, +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/containers) +"gag" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/asphalt/cement/cement3, +/area/lv522/landing_zone_1) "gat" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -10552,6 +10793,15 @@ }, /turf/open/asphalt/cement/cement12, /area/lv522/outdoors/colony_streets/south_street) +"gca" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/stairs/perspective{ + dir = 9; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/cargo) "gcn" = ( /turf/closed/wall/shiva/prefabricated/reinforced, /area/lv522/outdoors/nw_rockies) @@ -10620,10 +10870,6 @@ "gdX" = ( /turf/open/asphalt/cement/cement1, /area/lv522/outdoors/nw_rockies) -"gej" = ( -/obj/structure/platform, -/turf/open/asphalt/cement/cement4, -/area/lv522/landing_zone_1) "gek" = ( /obj/structure/prop/invuln/ice_prefab/trim{ dir = 4 @@ -10673,16 +10919,6 @@ "geP" = ( /turf/open/floor/corsat/marked, /area/lv522/atmos/cargo_intake) -"geT" = ( -/obj/structure/prop/invuln/overhead_pipe{ - dir = 8; - pixel_x = -6; - pixel_y = 6 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/platform, -/turf/open/gm/river, -/area/lv522/landing_zone_1/tunnel/far) "gfi" = ( /obj/structure/bed/chair, /turf/open/floor/corsat/plate, @@ -10705,6 +10941,15 @@ }, /turf/open/floor/corsat/plate, /area/lv522/atmos/reactor_garage) +"gfH" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/liquid_fuel, +/turf/open/floor/prison/darkredfull2, +/area/lv522/indoors/a_block/kitchen) "gfL" = ( /obj/item/prop/colony/used_flare, /turf/open/floor/corsat/brown/north, @@ -10718,15 +10963,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/floor_plate, /area/lv522/indoors/a_block/admin) +"ggo" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/turf/open/gm/river, +/area/lv522/outdoors/colony_streets/south_street) "ggp" = ( /obj/structure/machinery/floodlight, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/garage) -"ggM" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, -/obj/item/stack/rods, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) "ggO" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin{ @@ -10737,6 +10982,7 @@ /turf/open/floor/prison/blue_plate/north, /area/lv522/indoors/a_block/hallway) "ggS" = ( +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) "ggZ" = ( @@ -10745,10 +10991,6 @@ }, /turf/open/floor/prison, /area/lv522/indoors/c_block/mining) -"ghr" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) "ghu" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/wood, @@ -10760,17 +11002,6 @@ }, /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms/glass) -"ghy" = ( -/obj/effect/spawner/gibspawner/xeno, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/atmos/cargo_intake) "ghY" = ( /obj/structure/bed/chair/dropship/passenger{ dir = 4 @@ -10790,19 +11021,18 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/c_block/casino) -"giF" = ( -/obj/effect/decal/cleanable/blood, -/turf/open/floor/prison, -/area/lv522/atmos/cargo_intake) +"gix" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/stair_cut/platform_left, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/central_streets) "giX" = ( /obj/structure/curtain/red, /turf/open/floor/wood, /area/lv522/indoors/a_block/executive) -"gjm" = ( -/obj/vehicle/train/cargo/trolley, -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor/prison, -/area/lv522/atmos/cargo_intake) "gjt" = ( /obj/structure/machinery/colony_floodlight{ density = 0; @@ -10827,11 +11057,6 @@ }, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/t_comm) -"gjV" = ( -/obj/vehicle/train/cargo/trolley, -/obj/effect/landmark/objective_landmark/medium, -/turf/open/floor/prison, -/area/lv522/atmos/cargo_intake) "gkg" = ( /obj/structure/machinery/portable_atmospherics/hydroponics{ icon_state = "hydrotray4" @@ -10848,6 +11073,19 @@ }, /turf/open/floor/prison/blue_plate, /area/lv522/indoors/a_block/admin) +"gkz" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/stair_cut/platform_left, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 8; + pixel_x = -6; + pixel_y = 6 + }, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "gkF" = ( /obj/structure/machinery/computer/arcade, /obj/effect/decal/cleanable/dirt, @@ -10877,14 +11115,6 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_street) -"glQ" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/mining) "glV" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_full" @@ -10892,41 +11122,12 @@ /obj/item/stack/sheet/wood, /turf/open/asphalt/cement/cement12, /area/lv522/outdoors/colony_streets/south_street) -"gmb" = ( -/obj/vehicle/train/cargo/engine, -/turf/open/floor/prison, -/area/lv522/atmos/cargo_intake) "gme" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) -"gmt" = ( -/obj/item/ammo_magazine/m2c{ - current_rounds = 0; - layer = 4.2; - pixel_x = 1; - pixel_y = 11 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/closed/wall/strata_ice/dirty, -/area/lv522/atmos/cargo_intake) -"gmu" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/gm/river, -/area/lv522/outdoors/colony_streets/south_street) -"gnd" = ( -/turf/closed/wall/strata_ice/dirty, -/area/lv522/atmos/cargo_intake) "gnf" = ( /obj/structure/machinery/landinglight/ds1/delaythree{ dir = 1 @@ -10944,14 +11145,6 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison/floor_plate, /area/lv522/indoors/a_block/bridges) -"gnA" = ( -/obj/item/ammo_magazine/m2c{ - current_rounds = 0; - layer = 4.2; - pixel_x = 17 - }, -/turf/closed/wall/strata_ice/dirty, -/area/lv522/outdoors/colony_streets/north_east_street) "gok" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/prison, @@ -10963,12 +11156,12 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_west_street) -"goo" = ( -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/auto_turf/shale/layer1, -/area/lv522/oob) +"gom" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/southeast, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_1) "gou" = ( /turf/open/floor/prison/darkpurple2/northwest, /area/lv522/indoors/a_block/dorms) @@ -11074,6 +11267,13 @@ /obj/structure/pipes/standard/manifold/hidden/green, /turf/open/asphalt/cement/cement12, /area/lv522/outdoors/nw_rockies) +"gqX" = ( +/obj/structure/barricade/deployable, +/obj/structure/barricade/deployable{ + dir = 4 + }, +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/containers) "grg" = ( /obj/effect/decal/cleanable/blood, /obj/structure/machinery/light{ @@ -11221,18 +11421,6 @@ }, /turf/open/floor/prison/kitchen, /area/lv522/indoors/b_block/bar) -"guE" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 9 - }, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/north_east_street) "guH" = ( /obj/structure/machinery/light{ dir = 4 @@ -11292,6 +11480,15 @@ /obj/effect/alien/resin/sticky, /turf/closed/wall/solaris/reinforced/hull/lv522, /area/lv522/oob) +"gwE" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/obj/structure/stairs/perspective{ + dir = 9; + icon_state = "p_stair_full" + }, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_1) "gwH" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -11338,6 +11535,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/floor_plate, /area/lv522/indoors/a_block/hallway) +"gxD" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/asphalt/cement/cement14, +/area/lv522/outdoors/colony_streets/central_streets) "gxE" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 1 @@ -11354,6 +11555,10 @@ }, /turf/open/floor/corsat/marked, /area/lv522/atmos/reactor_garage) +"gxZ" = ( +/obj/structure/platform/metal/almayer, +/turf/open/asphalt/cement/cement4, +/area/lv522/outdoors/colony_streets/south_west_street) "gyb" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/camera/autoname, @@ -11369,6 +11574,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/cell_stripe/west, /area/lv522/atmos/reactor_garage) +"gzg" = ( +/obj/effect/spawner/gibspawner/xeno, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/containers) "gzu" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -11377,6 +11586,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/corsat/plate, /area/lv522/atmos/reactor_garage) +"gzF" = ( +/obj/structure/machinery/door_display/research_cell{ + dir = 4; + id = "Reactor_e_entry_4"; + pixel_x = -16; + req_access = null + }, +/turf/open/asphalt/cement/cement1, +/area/lv522/outdoors/colony_streets/containers) "gzS" = ( /obj/structure/pipes/unary/freezer{ dir = 1; @@ -11441,6 +11659,11 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) +"gBf" = ( +/obj/structure/platform_decoration/metal/almayer, +/obj/effect/decal/cleanable/dirt, +/turf/open/asphalt/cement, +/area/lv522/indoors/lone_buildings/engineering) "gBi" = ( /obj/item/tool/wet_sign, /turf/open/floor/corsat/squares, @@ -11467,6 +11690,11 @@ }, /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms) +"gCt" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/ore_box, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/cargo) "gCE" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/reagent_container/food/snacks/meat, @@ -11494,6 +11722,16 @@ }, /turf/open/floor/wood, /area/lv522/indoors/a_block/executive) +"gCP" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/machinery/door/poddoor/almayer/closed{ + dir = 4; + id = "LZ1_Lockdown_Lo"; + name = "Emergency Lockdown" + }, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/floor/corsat/marked, +/area/lv522/landing_zone_1) "gDz" = ( /obj/structure/barricade/wooden{ dir = 1 @@ -11511,6 +11749,11 @@ /obj/item/prop/colony/game, /turf/open/floor/carpet, /area/lv522/indoors/c_block/garage) +"gDR" = ( +/obj/item/tool/wrench, +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/garage) "gEd" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 4 @@ -11690,12 +11933,6 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/bridges/corpo) -"gIc" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/north_street) "gIg" = ( /mob/living/simple_animal/mouse, /turf/open/asphalt/cement, @@ -11704,31 +11941,19 @@ /obj/structure/cargo_container/kelland/left, /turf/open/asphalt/cement/cement12, /area/lv522/outdoors/colony_streets/south_east_street) -"gIr" = ( -/obj/structure/platform_decoration, -/turf/open/asphalt/cement/cement2, -/area/lv522/outdoors/colony_streets/south_east_street) "gIH" = ( /turf/open/floor/corsat/browncorner/north, /area/lv522/atmos/east_reactor/south) +"gIP" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/central_streets) "gIZ" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 }, /turf/open/floor/corsat/squares, /area/lv522/atmos/east_reactor/south) -"gJr" = ( -/obj/structure/prop/invuln/overhead_pipe{ - dir = 8; - pixel_x = -6; - pixel_y = 6 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform, -/turf/open/gm/river, -/area/lv522/landing_zone_1/tunnel/far) "gJD" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/corsat/plate, @@ -11745,27 +11970,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/floor_plate, /area/lv522/indoors/lone_buildings/engineering) -"gJM" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison/darkbrownfull2, -/area/lv522/indoors/c_block/cargo) "gKa" = ( /obj/structure/machinery/colony_floodlight, /turf/open/floor/corsat/marked, /area/lv522/outdoors/colony_streets/south_east_street) -"gKg" = ( -/obj/structure/platform, -/obj/structure/machinery/door/poddoor/almayer/closed{ - dir = 4; - id = "LZ1_Lockdown_Lo"; - name = "Emergency Lockdown" - }, +"gKO" = ( +/obj/structure/platform_decoration/metal/almayer/east, /turf/open/floor/corsat/marked, -/area/lv522/landing_zone_1) +/area/lv522/indoors/c_block/cargo) "gKY" = ( /obj/structure/surface/table/almayer, /obj/effect/decal/cleanable/dirt, @@ -11796,11 +12008,6 @@ /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/prison, /area/lv522/indoors/a_block/security) -"gLK" = ( -/obj/structure/barricade/deployable, -/obj/effect/decal/cleanable/blood, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) "gLV" = ( /obj/structure/prop/server_equipment/yutani_server/broken{ density = 0; @@ -11817,27 +12024,16 @@ /obj/item/prop/alien/hugger, /turf/open/floor/wood, /area/lv522/indoors/a_block/security) -"gMc" = ( -/obj/structure/prop/vehicles/crawler{ - icon_state = "crawler_crate_alt" - }, -/turf/open/floor/prison, -/area/lv522/atmos/cargo_intake) -"gMy" = ( -/obj/structure/barricade/deployable{ - dir = 8 - }, -/obj/item/weapon/gun/rifle/m41a{ - current_mag = null - }, -/turf/open/floor/prison, -/area/lv522/atmos/cargo_intake) -"gMG" = ( -/obj/structure/platform_decoration{ - dir = 1 +"gMI" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform/metal/almayer, +/obj/structure/stairs/perspective{ + dir = 6; + icon_state = "p_stair_full" }, -/turf/open/asphalt/cement/cement4, -/area/lv522/outdoors/colony_streets/north_east_street) +/obj/structure/platform_decoration/metal/almayer/southwest, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/garage) "gMQ" = ( /turf/open/asphalt/cement/cement9, /area/lv522/outdoors/colony_streets/south_west_street) @@ -11853,27 +12049,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms) -"gNe" = ( -/obj/structure/machinery{ - density = 1; - dir = 4; - icon = 'icons/obj/vehicles/apc.dmi'; - icon_state = "apc_base_com"; - explo_proof = 1; - name = "\improper M577 armored personnel carrier"; - pixel_y = -21; - unacidable = 1; - unslashable = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/closed/wall/strata_ice/dirty, -/area/lv522/atmos/cargo_intake) "gNn" = ( /obj/structure/largecrate/supply/medicine/medkits{ pixel_x = -7 @@ -11892,15 +12067,6 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/corsat/brown/north, /area/lv522/atmos/cargo_intake) -"gND" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/cargo) "gNJ" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -11971,13 +12137,13 @@ /obj/effect/decal/cleanable/cobweb, /turf/open/floor/prison, /area/lv522/indoors/c_block/cargo) -"gOZ" = ( -/obj/structure/platform_decoration{ - dir = 8 +"gPh" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" }, -/obj/effect/decal/cleanable/blood, -/turf/open/floor/plating, -/area/lv522/outdoors/colony_streets/north_east_street) +/obj/structure/platform/metal/almayer/east, +/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/area/lv522/landing_zone_forecon/UD6_Tornado) "gPp" = ( /obj/item/stack/sheet/metal, /obj/effect/decal/cleanable/dirt, @@ -11987,24 +12153,20 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/corsat/plate, /area/lv522/atmos/reactor_garage) -"gPv" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 5 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/landing_zone_1) "gPw" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/light, /obj/structure/closet/secure_closet/engineering_electrical, /turf/open/floor/prison/darkyellowfull2/east, /area/lv522/indoors/lone_buildings/outdoor_bot) +"gPy" = ( +/obj/structure/machinery/suit_storage_unit/compression_suit/uscm{ + name = "Suit Storage Unit"; + pixel_x = 3 + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/prison/darkpurplefull2, +/area/lv522/indoors/a_block/dorms) "gQu" = ( /mob/living/simple_animal/cat/kitten{ dir = 8 @@ -12017,25 +12179,15 @@ pixel_y = 6 }, /obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) -"gQV" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/largecrate/random{ - layer = 2.9 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/cargo) -"gRj" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/item/prop/colony/used_flare, +"gRi" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/southwest, /turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) +/area/lv522/landing_zone_1) "gRp" = ( /obj/structure/machinery/floodlight/landing, /turf/open/floor/prison/darkbrownfull2, @@ -12050,12 +12202,6 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/dorms) -"gRD" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) "gRJ" = ( /turf/open/floor/corsat/brown/northwest, /area/lv522/atmos/east_reactor/west) @@ -12084,6 +12230,19 @@ }, /turf/open/floor/corsat/marked, /area/lv522/indoors/c_block/mining) +"gSB" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/gm/river, +/area/lv522/landing_zone_1/tunnel/far) +"gSC" = ( +/obj/structure/prop/vehicles/crawler{ + icon_state = "crawler_crate_alt" + }, +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/containers) "gSJ" = ( /obj/structure/surface/table/almayer, /obj/effect/decal/cleanable/dirt, @@ -12105,6 +12264,13 @@ /obj/effect/spawner/gibspawner/xeno, /turf/open/floor/corsat/squares, /area/lv522/atmos/east_reactor/south) +"gTZ" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/prison/floor_plate, +/area/lv522/outdoors/colony_streets/south_east_street) "gUe" = ( /obj/structure/ore_box, /obj/effect/decal/cleanable/cobweb, @@ -12149,10 +12315,6 @@ /obj/effect/decal/cleanable/vomit, /turf/open/floor/strata/white_cyan1/east, /area/lv522/indoors/a_block/medical) -"gVd" = ( -/obj/structure/cargo_container/wy/left, -/turf/open/floor/prison, -/area/lv522/atmos/cargo_intake) "gVf" = ( /obj/structure/machinery/landinglight/ds2, /obj/effect/decal/cleanable/dirt, @@ -12163,12 +12325,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) -"gVn" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/landing_zone_1) "gVr" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/strata/white_cyan3, @@ -12205,10 +12361,6 @@ }, /turf/open/floor/plating, /area/lv522/landing_zone_1/tunnel/far) -"gWg" = ( -/obj/structure/cargo_container/wy/mid, -/turf/open/floor/prison, -/area/lv522/atmos/cargo_intake) "gWh" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkpurple2, @@ -12265,20 +12417,10 @@ /obj/item/prop/alien/hugger, /turf/open/floor/prison/greenfull/northwest, /area/lv522/indoors/b_block/hydro) -"gXB" = ( -/obj/structure/barricade/deployable{ - dir = 8 - }, -/obj/structure/barricade/deployable, -/turf/open/floor/prison, -/area/lv522/atmos/cargo_intake) -"gXE" = ( -/obj/item/weapon/gun/pistol/m1911{ - current_mag = null - }, -/obj/effect/decal/cleanable/blood, -/turf/open/asphalt/cement/cement1, -/area/lv522/atmos/cargo_intake) +"gXH" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/asphalt/cement/cement9, +/area/lv522/outdoors/colony_streets/south_west_street) "gXL" = ( /obj/item/prop/alien/hugger, /obj/effect/decal/cleanable/dirt, @@ -12336,10 +12478,6 @@ /obj/structure/machinery/cm_vending/sorted/tech/tool_storage, /turf/open/floor/prison/darkyellowfull2/east, /area/lv522/indoors/lone_buildings/engineering) -"gZh" = ( -/obj/structure/platform_decoration, -/turf/open/floor/prison/blue_plate/north, -/area/lv522/indoors/a_block/admin) "gZp" = ( /obj/structure/machinery/seed_extractor, /obj/effect/decal/cleanable/dirt, @@ -12371,6 +12509,7 @@ /area/lv522/indoors/b_block/bridge) "haf" = ( /obj/structure/machinery/landinglight/ds1/delaytwo, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/plating, /area/lv522/landing_zone_1) "hag" = ( @@ -12426,10 +12565,6 @@ /obj/item/storage/backpack/marine/satchel/rto, /turf/open/floor/corsat/brown/west, /area/lv522/oob/w_y_vault) -"haR" = ( -/obj/structure/largecrate/random/barrel/true_random, -/turf/open/asphalt/cement/cement1, -/area/lv522/outdoors/colony_streets/north_east_street) "haY" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -12443,10 +12578,6 @@ }, /turf/open/floor/prison/floor_plate, /area/lv522/outdoors/colony_streets/north_west_street) -"hbj" = ( -/obj/effect/spawner/gibspawner/xeno, -/turf/open/floor/prison/floor_marked, -/area/lv522/atmos/cargo_intake) "hbk" = ( /obj/effect/spawner/gibspawner/robot, /turf/open/floor/corsat/marked, @@ -12496,27 +12627,6 @@ /obj/structure/machinery/medical_pod/bodyscanner, /turf/open/floor/strata/white_cyan1/east, /area/lv522/indoors/a_block/medical) -"hbH" = ( -/obj/structure/prop/vehicles/crawler{ - dir = 8; - icon_state = "crawler_crate_alt2"; - layer = 3.1 - }, -/turf/open/floor/prison, -/area/lv522/atmos/cargo_intake) -"hbN" = ( -/obj/item/ammo_magazine/rifle/heap{ - current_rounds = 0 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/atmos/cargo_intake) "hcd" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -12538,27 +12648,11 @@ }, /turf/open/floor/strata/floor3/east, /area/lv522/landing_zone_2/ceiling) -"hcx" = ( -/obj/item/ammo_magazine/rifle/heap{ - current_rounds = 0 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) "hcE" = ( /obj/item/stack/sheet/metal, /obj/effect/decal/cleanable/generic, /turf/open/floor/prison, /area/lv522/outdoors/colony_streets/windbreaker/observation) -"hcO" = ( -/obj/structure/platform_decoration, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/mining) -"hcV" = ( -/obj/item/weapon/gun/rifle/m41a{ - current_mag = null - }, -/turf/open/auto_turf/shale/layer1, -/area/lv522/outdoors/colony_streets/north_east_street) "hcZ" = ( /obj/structure/machinery/colony_floodlight, /turf/open/asphalt/cement, @@ -12585,6 +12679,10 @@ }, /turf/open/floor/wood, /area/lv522/indoors/b_block/bar) +"hdx" = ( +/obj/item/prop/colony/used_flare, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/containers) "hdG" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -12619,6 +12717,10 @@ }, /turf/open/floor/prison/greenfull/east, /area/lv522/indoors/b_block/hydro) +"heU" = ( +/obj/structure/cargo_container/ferret/mid, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/containers) "heX" = ( /obj/structure/largecrate/random/barrel{ layer = 5.1; @@ -12676,6 +12778,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/greenfull/east, /area/lv522/indoors/b_block/bridge) +"hgc" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/effect/decal/cleanable/blood, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/nw_rockies) "hgr" = ( /obj/structure/girder/reinforced, /turf/open/auto_turf/shale/layer1, @@ -12691,6 +12798,20 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/blue/east, /area/lv522/indoors/a_block/hallway) +"hgI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer/west, +/obj/structure/transmitter/colony_net{ + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "LZ1 Service Tunnel"; + pixel_y = 24 + }, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "hgM" = ( /obj/structure/closet/crate/trashcart, /obj/item/storage/backpack/marine/satchel{ @@ -12707,12 +12828,10 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/corsat/browncorner/north, /area/lv522/atmos/east_reactor/south) -"hhb" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/asphalt/cement/cement12, -/area/lv522/landing_zone_2) +"hgT" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/central_streets) "hhD" = ( /turf/open/asphalt/cement/cement1, /area/lv522/outdoors/colony_streets/north_street) @@ -12752,28 +12871,10 @@ /obj/structure/pipes/vents/pump, /turf/open/asphalt/cement/cement4, /area/lv522/outdoors/nw_rockies) -"hix" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/outdoors/colony_streets/south_east_street) "hiK" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat/squares, /area/lv522/atmos/reactor_garage) -"hiL" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/gm/river, -/area/lv522/landing_zone_1/tunnel/far) "hiZ" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -12783,6 +12884,10 @@ }, /turf/open/floor/corsat/marked, /area/lv522/indoors/c_block/mining) +"hjm" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_east_street) "hjW" = ( /obj/structure/surface/table/almayer, /obj/item/trash/plate{ @@ -12801,6 +12906,12 @@ }, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/garage) +"hkg" = ( +/obj/structure/prop/invuln/ice_prefab/standalone{ + icon_state = "white" + }, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/containers) "hkr" = ( /obj/structure/girder, /turf/open/asphalt/cement/cement4, @@ -12848,6 +12959,10 @@ }, /turf/open/floor/corsat/squares, /area/lv522/atmos/reactor_garage) +"hkE" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel/far) "hkO" = ( /obj/structure/surface/rack, /obj/item/stack/sheet/metal/medium_stack, @@ -12874,14 +12989,6 @@ /obj/item/device/binoculars, /turf/open/floor/strata/blue1, /area/lv522/outdoors/colony_streets/windbreaker/observation) -"hmz" = ( -/obj/structure/largecrate/random/barrel/true_random, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) -"hmD" = ( -/obj/structure/barricade/deployable, -/turf/open/floor/prison, -/area/lv522/atmos/cargo_intake) "hmJ" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -12889,13 +12996,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/a_block/hallway) -"hmO" = ( -/obj/structure/barricade/deployable, -/obj/item/weapon/gun/rifle/m41a{ - current_mag = null - }, -/turf/open/floor/prison, -/area/lv522/atmos/cargo_intake) "hnk" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -12910,12 +13010,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/floor_plate, /area/lv522/indoors/b_block/bar) -"hnD" = ( -/obj/structure/barricade/deployable{ - dir = 4 +"hoh" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/obj/structure/barricade/deployable, -/turf/open/auto_turf/sand_white/layer0, +/turf/open/floor/prison/floor_plate, /area/lv522/outdoors/colony_streets/north_east_street) "hoq" = ( /turf/open/asphalt/cement/cement14, @@ -12996,14 +13097,6 @@ "hrk" = ( /turf/open/asphalt/cement/cement2, /area/lv522/outdoors/colony_streets/east_central_street) -"hrl" = ( -/obj/structure/stairs/perspective{ - dir = 10; - icon_state = "p_stair_full" - }, -/obj/structure/platform/stair_cut/alt, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/cargo) "hrw" = ( /obj/effect/decal/cleanable/dirt, /turf/closed/wall/strata_outpost, @@ -13022,10 +13115,27 @@ }, /turf/open/floor/corsat, /area/lv522/atmos/east_reactor/south) +"hrO" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/prison, +/area/lv522/indoors/a_block/dorms) "hrU" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/mining) +"hsa" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/prop/ice_colony/dense/planter_box{ + dir = 8 + }, +/obj/structure/flora/bush/ausbushes/var3/sunnybush{ + pixel_y = 15 + }, +/turf/open/floor/prison/greenfull/east, +/area/lv522/indoors/b_block/bridge) "hsh" = ( /obj/structure/bed/chair{ dir = 8 @@ -13050,6 +13160,10 @@ }, /turf/open/floor/platingdmg1, /area/lv522/indoors/a_block/admin) +"hsD" = ( +/obj/structure/platform_decoration/stone/strata/north, +/turf/open/auto_turf/shale/layer1, +/area/lv522/oob) "htA" = ( /obj/structure/barricade/wooden{ dir = 4 @@ -13117,19 +13231,6 @@ }, /turf/open/asphalt/cement, /area/lv522/outdoors/nw_rockies) -"hwa" = ( -/obj/structure/platform/stair_cut{ - icon_state = "platform_stair_alt" - }, -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/prison/greenfull/east, -/area/lv522/indoors/b_block/bridge) "hwf" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/green{ @@ -13167,6 +13268,10 @@ /obj/structure/surface/table/almayer, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/dorms) +"hxu" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/south_east_street) "hxy" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 @@ -13184,11 +13289,23 @@ }, /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/east_central_street) +"hyb" = ( +/obj/item/ammo_magazine/pistol/m1911{ + pixel_x = 9; + pixel_y = 12 + }, +/obj/structure/platform/metal/almayer, +/turf/open/asphalt/cement/cement4, +/area/lv522/outdoors/colony_streets/north_east_street) "hyf" = ( /obj/structure/machinery/light, /obj/effect/decal/cleanable/dirt, /turf/open/floor/shiva/radiator_tile2, /area/lv522/indoors/b_block/bridge) +"hyh" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/asphalt/cement, +/area/lv522/indoors/lone_buildings/engineering) "hyA" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/generic, @@ -13341,6 +13458,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/floor_plate, /area/lv522/indoors/c_block/cargo) +"hBa" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/prison/floor_plate, +/area/lv522/indoors/a_block/corpo/glass) "hBf" = ( /turf/open/floor/corsat/brown/northeast, /area/lv522/atmos/reactor_garage) @@ -13416,6 +13538,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/floor_plate, /area/lv522/outdoors/colony_streets/north_street) +"hDB" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/asphalt/cement/cement9, +/area/lv522/outdoors/colony_streets/south_street) "hDE" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 10 @@ -13460,26 +13586,10 @@ }, /turf/open/floor/prison/blue_plate/north, /area/lv522/indoors/c_block/mining) -"hFu" = ( -/turf/open/floor/prison/floor_plate, -/area/lv522/atmos/cargo_intake) "hFG" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/casino) -"hFL" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/asphalt/cement/cement1, -/area/lv522/outdoors/colony_streets/north_east_street) -"hFS" = ( -/obj/item/prop/colony/used_flare, -/turf/open/floor/prison/floor_marked, -/area/lv522/atmos/cargo_intake) "hFX" = ( /turf/open/auto_turf/shale/layer2, /area/lv522/outdoors/colony_streets/south_street) @@ -13493,14 +13603,6 @@ }, /turf/open/floor/prison, /area/lv522/indoors/a_block/corpo/glass) -"hGJ" = ( -/obj/structure/cargo_container/lockmart/left, -/turf/open/floor/prison/floor_marked, -/area/lv522/atmos/cargo_intake) -"hGU" = ( -/obj/structure/cargo_container/lockmart/mid, -/turf/open/floor/prison/floor_marked, -/area/lv522/atmos/cargo_intake) "hGX" = ( /obj/structure/bed/chair/comfy{ dir = 1 @@ -13512,36 +13614,14 @@ }, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) -"hHe" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/gm/river, -/area/lv522/landing_zone_1/tunnel/far) -"hHh" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/central_streets) -"hHN" = ( -/obj/structure/cargo_container/lockmart/right, -/turf/open/floor/prison/floor_marked, -/area/lv522/atmos/cargo_intake) -"hHY" = ( -/obj/item/prop/colony/used_flare, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/atmos/cargo_intake) "hIf" = ( /turf/open/floor/prison/darkbrownfull2, /area/lv522/landing_zone_2) +"hIi" = ( +/obj/structure/machinery/colony_floodlight, +/obj/structure/platform/metal/almayer/west, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/north_street) "hIp" = ( /obj/structure/prop/ice_colony/ground_wire{ dir = 8 @@ -13624,6 +13704,15 @@ }, /turf/open/floor/prison, /area/lv522/indoors/a_block/admin) +"hJI" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/structure/stairs/perspective{ + dir = 9; + icon_state = "p_stair_full" + }, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/asphalt/cement/cement3, +/area/lv522/landing_zone_1) "hJQ" = ( /obj/structure/surface/rack, /obj/item/explosive/plastic, @@ -13679,6 +13768,10 @@ }, /turf/open/floor/prison/floor_plate, /area/lv522/atmos/way_in_command_centre) +"hKN" = ( +/obj/structure/platform/metal/almayer, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_east_street) "hKO" = ( /obj/structure/prop/invuln/lattice_prop{ icon_state = "lattice3"; @@ -13701,6 +13794,16 @@ }, /turf/open/floor/prison/floor_marked, /area/lv522/outdoors/colony_streets/north_east_street) +"hLf" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/prison/floor_plate, +/area/lv522/outdoors/colony_streets/north_east_street) "hLl" = ( /obj/vehicle/train/cargo/trolley, /obj/effect/decal/cleanable/dirt, @@ -13749,6 +13852,12 @@ /obj/item/clothing/glasses/kutjevo, /turf/open/floor/prison/darkyellowfull2/east, /area/lv522/indoors/lone_buildings/outdoor_bot) +"hMm" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/northeast, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/north_east_street) "hMz" = ( /turf/open/asphalt/cement/cement12, /area/lv522/outdoors/colony_streets/south_east_street) @@ -13778,6 +13887,10 @@ }, /turf/open/floor/prison, /area/lv522/indoors/c_block/casino) +"hMY" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_east_street) "hNf" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -13793,6 +13906,10 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/c_block/mining) +"hNr" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/prison/darkredfull2, +/area/lv522/indoors/a_block/kitchen) "hNt" = ( /obj/item/trash/uscm_mre, /obj/structure/surface/table/almayer, @@ -13829,6 +13946,10 @@ /obj/effect/landmark/survivor_spawner, /turf/open/floor/prison/blue, /area/lv522/indoors/a_block/admin) +"hOm" = ( +/obj/structure/ore_box, +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/containers) "hOB" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/platebot, @@ -13911,6 +14032,15 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/corsat/plate, /area/lv522/atmos/east_reactor/south) +"hRt" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 8; + pixel_x = -6; + pixel_y = 6 + }, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/mining) "hRu" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -13929,6 +14059,10 @@ }, /turf/open/floor/corsat/plate, /area/lv522/atmos/east_reactor/south) +"hRJ" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/cargo) "hSi" = ( /obj/effect/spawner/gibspawner/xeno, /obj/effect/decal/cleanable/blood/xeno{ @@ -13963,26 +14097,6 @@ "hTe" = ( /turf/open/gm/river, /area/lv522/landing_zone_1/tunnel) -"hTg" = ( -/obj/effect/spawner/gibspawner/xeno, -/obj/effect/decal/cleanable/blood/xeno, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) -"hTh" = ( -/obj/item/prop/colony/used_flare, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) -"hTk" = ( -/obj/structure/ore_box, -/turf/open/floor/prison, -/area/lv522/atmos/cargo_intake) -"hTo" = ( -/obj/structure/barricade/deployable, -/obj/structure/barricade/deployable{ - dir = 4 - }, -/turf/open/floor/prison, -/area/lv522/atmos/cargo_intake) "hTA" = ( /obj/structure/machinery/door/airlock/almayer/engineering{ name = "\improper Cargo Bay Break Room"; @@ -14001,6 +14115,7 @@ /area/lv522/atmos/east_reactor/south) "hTW" = ( /obj/structure/largecrate/random/secure, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "hTX" = ( @@ -14021,6 +14136,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms/glass) +"hUh" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/decal/cleanable/generic, +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/obj/structure/platform_decoration/metal/almayer, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/cargo) "hUq" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/space_heater/radiator/red{ @@ -14065,6 +14190,13 @@ /obj/structure/window/framed/shiva, /turf/open/floor/corsat/marked, /area/lv522/indoors/lone_buildings/chunk) +"hVH" = ( +/obj/structure/platform_decoration/metal/almayer, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/turf/open/asphalt/cement, +/area/lv522/landing_zone_2/ceiling) "hWs" = ( /obj/structure/stairs/perspective{ dir = 10; @@ -14072,15 +14204,6 @@ }, /turf/open/floor/prison/greenfull/east, /area/lv522/indoors/b_block/bridge) -"hWz" = ( -/obj/structure/platform, -/obj/item/prop/colony/canister{ - layer = 3.1; - pixel_y = 16 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/garage) "hWD" = ( /obj/structure/barricade/deployable, /turf/open/floor/prison/blue_plate/north, @@ -14097,6 +14220,18 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/floor_plate, /area/lv522/indoors/c_block/casino) +"hXo" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/containers) +"hXx" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/gm/river, +/area/lv522/landing_zone_1/tunnel/far) "hXA" = ( /obj/structure/bed/chair{ dir = 4 @@ -14193,6 +14328,13 @@ }, /turf/open/floor/strata/white_cyan2/west, /area/lv522/indoors/a_block/medical/glass) +"iai" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/structure/bed/chair/dropship/passenger{ + dir = 4 + }, +/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/area/lv522/landing_zone_forecon/UD6_Tornado) "iaY" = ( /obj/item/prop/alien/hugger, /obj/structure/pipes/standard/simple/hidden/green{ @@ -14232,6 +14374,24 @@ }, /turf/open/floor/strata/white_cyan1/east, /area/lv522/indoors/a_block/medical/glass) +"ick" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 8; + pixel_x = -6; + pixel_y = 6 + }, +/obj/structure/platform_decoration/metal/almayer/east, +/obj/item/stack/sheet/metal, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel/far) +"icC" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/prison/floor_plate, +/area/lv522/indoors/a_block/garden) "icE" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/green, @@ -14304,10 +14464,6 @@ "ien" = ( /turf/closed/wall/solaris/reinforced/hull/lv522, /area/lv522/oob) -"ier" = ( -/obj/structure/cargo_container/arious/leftmid, -/turf/open/floor/prison, -/area/lv522/outdoors/colony_streets/north_east_street) "ieE" = ( /obj/item/ammo_magazine/rifle/heap{ current_rounds = 0 @@ -14322,23 +14478,6 @@ }, /turf/open/asphalt/cement/cement3, /area/lv522/outdoors/colony_streets/north_street) -"ieW" = ( -/obj/structure/cargo_container/arious/rightmid, -/turf/open/floor/prison, -/area/lv522/outdoors/colony_streets/north_east_street) -"iff" = ( -/obj/structure/cargo_container/arious/right, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) -"ifg" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/plating, -/area/lv522/landing_zone_forecon/UD6_Tornado) "ifi" = ( /turf/open/floor/corsat/brown/southwest, /area/lv522/atmos/reactor_garage) @@ -14432,6 +14571,10 @@ }, /turf/open/floor/prison/floor_plate, /area/lv522/outdoors/colony_streets/north_west_street) +"ihK" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/auto_turf/shale/layer2, +/area/lv522/outdoors/colony_streets/central_streets) "iiC" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin/wy{ @@ -14580,6 +14723,17 @@ /obj/structure/machinery/light, /turf/open/floor/corsat/marked, /area/lv522/indoors/c_block/mining) +"imz" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/stair_cut/platform_right, +/turf/open/floor/prison, +/area/lv522/indoors/c_block/cargo) "imJ" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -14593,6 +14747,9 @@ }, /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/east_central_street) +"ina" = ( +/turf/open/asphalt/cement/cement3, +/area/lv522/outdoors/colony_streets/containers) "inm" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin{ @@ -14600,6 +14757,7 @@ pixel_y = 6 }, /obj/item/tool/pen/blue/clicky, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) "inA" = ( @@ -14649,6 +14807,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/strata/blue1, /area/lv522/indoors/a_block/dorm_north) +"ipu" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/mining) "ipw" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -14661,6 +14823,10 @@ "ipx" = ( /turf/open/auto_turf/sand/layer1, /area/lv522/indoors/b_block/bridge) +"ipz" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/floor/prison/darkbrownfull2, +/area/lv522/indoors/c_block/cargo) "ipC" = ( /obj/structure/toilet{ pixel_y = 16 @@ -14704,16 +14870,6 @@ /obj/item/prop/colony/used_flare, /turf/open/floor/prison/blue/east, /area/lv522/indoors/a_block/admin) -"iqw" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/effect/decal/cleanable/generic, -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" - }, -/obj/structure/platform_decoration, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/cargo) "iqQ" = ( /obj/structure/prop/invuln/ice_prefab{ icon_state = "fab_2" @@ -14755,12 +14911,17 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/wood, /area/lv522/indoors/b_block/bar) -"irR" = ( -/obj/structure/platform_decoration{ - dir = 4 +"irP" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" }, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/south_west_street) +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "UD6"; + name = "\improper Shutters" + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/plating, +/area/lv522/landing_zone_forecon/UD6_Typhoon) "isa" = ( /obj/structure/largecrate, /turf/open/auto_turf/shale/layer1, @@ -14840,6 +15001,14 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_east_street) +"iua" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/central_streets) "iui" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/microwave{ @@ -15016,12 +15185,6 @@ /obj/item/prop/colony/canister, /turf/open/floor/corsat/squares, /area/lv522/atmos/cargo_intake) -"iyT" = ( -/obj/structure/platform_decoration, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison/greenfull/northwest, -/area/lv522/indoors/b_block/bridge) "izb" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -15044,14 +15207,6 @@ }, /turf/open/floor/prison/darkyellowfull2/east, /area/lv522/indoors/lone_buildings/engineering) -"izr" = ( -/obj/structure/platform/stair_cut, -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/indoors/c_block/garage) "izz" = ( /obj/effect/decal/cleanable/greenglow, /turf/open/floor/plating, @@ -15189,6 +15344,13 @@ }, /turf/open/floor/corsat/plate, /area/lv522/atmos/cargo_intake) +"iFf" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/plating, +/area/lv522/landing_zone_forecon/UD6_Tornado) "iFk" = ( /obj/structure/machinery/light{ dir = 1 @@ -15226,6 +15388,18 @@ /obj/structure/largecrate/random, /turf/open/floor/prison/darkbrownfull2, /area/lv522/landing_zone_2) +"iGt" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/asphalt/cement, +/area/lv522/landing_zone_1) +"iGy" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/structure/barricade/wooden{ + dir = 1 + }, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel/far) "iGD" = ( /obj/structure/machinery/light/small, /obj/structure/tunnel/maint_tunnel{ @@ -15257,6 +15431,13 @@ }, /turf/open/floor/prison/darkredfull2, /area/lv522/indoors/a_block/security) +"iGX" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/prison/floor_plate, +/area/lv522/indoors/a_block/garden) "iHg" = ( /obj/effect/landmark/survivor_spawner, /turf/open/floor/prison/blue, @@ -15289,19 +15470,6 @@ /obj/item/prop/alien/hugger, /turf/open/floor/prison, /area/lv522/outdoors/colony_streets/windbreaker/observation) -"iIa" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform/stair_cut, -/obj/structure/prop/invuln/overhead_pipe{ - dir = 8; - pixel_x = -6; - pixel_y = 6 - }, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel) "iIs" = ( /obj/effect/decal/cleanable/blood/xeno, /turf/open/floor/plating/plating_catwalk/prison, @@ -15334,15 +15502,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/dorms/glass) -"iIQ" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/landing_zone_2) "iIY" = ( /obj/item/shard{ icon_state = "medium" @@ -15375,6 +15534,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/corsat/brown/west, /area/lv522/atmos/east_reactor/south) +"iJO" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/asphalt/cement/cement1, +/area/lv522/outdoors/colony_streets/south_east_street) "iJS" = ( /obj/structure/machinery/shower{ pixel_y = 16 @@ -15442,6 +15605,10 @@ "iLC" = ( /turf/open/floor/corsat/brown/northeast, /area/lv522/atmos/east_reactor/south) +"iMr" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_1) "iMv" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/prop/almayer/computer/PC{ @@ -15492,6 +15659,13 @@ /obj/structure/machinery/space_heater, /turf/open/floor/prison/darkyellowfull2/east, /area/lv522/indoors/lone_buildings/outdoor_bot) +"iMV" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/south_street) "iNb" = ( /obj/structure/barricade/wooden{ dir = 1; @@ -15635,6 +15809,14 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/auto_turf/shale/layer2, /area/lv522/outdoors/colony_streets/north_west_street) +"iSC" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_1) "iSF" = ( /obj/structure/largecrate/random, /turf/open/floor/plating, @@ -15713,6 +15895,11 @@ /obj/item/clothing/suit/storage/hazardvest, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/lone_buildings/storage_blocks) +"iUg" = ( +/obj/effect/landmark/objective_landmark/close, +/obj/structure/bed/roller, +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/containers) "iUj" = ( /obj/structure/machinery/conveyor{ dir = 10; @@ -15736,10 +15923,6 @@ /obj/structure/machinery/squeezer, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) -"iUX" = ( -/obj/structure/platform, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/south_street) "iVe" = ( /obj/structure/stairs/perspective{ dir = 5; @@ -15748,12 +15931,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/blue_plate/north, /area/lv522/indoors/a_block/hallway) -"iVk" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/asphalt/cement/cement9, -/area/lv522/outdoors/colony_streets/south_street) "iVm" = ( /obj/item/storage/backpack/marine/satchel{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; @@ -15771,10 +15948,6 @@ }, /turf/open/floor/bluegrid, /area/lv522/indoors/a_block/admin) -"iVU" = ( -/obj/structure/platform_decoration, -/turf/open/asphalt/cement/cement2, -/area/lv522/outdoors/colony_streets/south_street) "iVY" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spider/spiderling/nogrow, @@ -15827,12 +16000,6 @@ "iWz" = ( /turf/open/floor/strata/cyan2/east, /area/lv522/indoors/a_block/medical) -"iWN" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/landing_zone_2) "iXy" = ( /obj/structure/largecrate/random/mini/med{ pixel_x = -12; @@ -15869,15 +16036,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkredfull2, /area/lv522/indoors/a_block/kitchen) -"iYf" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/asphalt/cement/cement3, -/area/lv522/outdoors/colony_streets/north_west_street) "iYm" = ( /obj/structure/barricade/deployable, /turf/open/floor/plating/plating_catwalk/prison, @@ -15941,16 +16099,6 @@ /obj/structure/window/framed/strata/reinforced, /turf/open/floor/corsat/marked, /area/lv522/indoors/a_block/medical) -"jaq" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/structure/stairs/perspective{ - dir = 10; - icon_state = "p_stair_full" - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) "jas" = ( /turf/closed/wall/strata_outpost, /area/lv522/indoors/c_block/mining) @@ -15999,16 +16147,6 @@ /mob/living/simple_animal/mouse, /turf/open/floor/prison/kitchen, /area/lv522/indoors/a_block/fitness) -"jba" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/gm/river, -/area/lv522/landing_zone_1/tunnel/far) "jbd" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -16053,6 +16191,10 @@ }, /turf/open/floor/strata/white_cyan3, /area/lv522/indoors/a_block/medical/glass) +"jbQ" = ( +/obj/structure/cargo_container/ferret/right, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/containers) "jcl" = ( /obj/structure/largecrate/random{ layer = 2.9 @@ -16071,11 +16213,27 @@ }, /turf/open/floor/prison/darkpurple2/north, /area/lv522/indoors/a_block/dorms) +"jcS" = ( +/obj/item/ammo_magazine/rifle/heap{ + current_rounds = 0 + }, +/obj/structure/bed/roller, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/containers) "jdf" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/static_comms/net_two, /turf/open/floor/prison/floor_marked/southwest, /area/lv522/indoors/c_block/t_comm) +"jdi" = ( +/obj/effect/decal/cleanable/blood/xeno, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/asphalt/cement/cement1, +/area/lv522/outdoors/colony_streets/north_street) "jdn" = ( /obj/effect/decal/cleanable/blood/drip, /obj/item/reagent_container/hypospray/autoinjector/emergency, @@ -16106,16 +16264,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/greenfull/northwest, /area/lv522/indoors/b_block/bridge) -"jeD" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/south_street) "jeH" = ( /obj/structure/machinery/light, /obj/structure/pipes/vents/pump, @@ -16161,15 +16309,6 @@ /obj/effect/landmark/xeno_spawn, /turf/open/floor/corsat/plate, /area/lv522/atmos/east_reactor/south) -"jfK" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/south_street) "jfO" = ( /turf/open/floor/prison, /area/lv522/indoors/a_block/kitchen/glass) @@ -16178,13 +16317,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/lv522/indoors/c_block/mining) -"jfZ" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison, -/area/lv522/indoors/a_block/dorms) "jgv" = ( /obj/structure/largecrate/random, /obj/effect/decal/warning_stripes{ @@ -16237,31 +16369,6 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) -"jhY" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/south_west_street) -"jic" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/machinery/colony_floodlight, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 5 - }, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/south_street) -"jig" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/asphalt/cement/cement12, -/area/lv522/outdoors/colony_streets/south_street) "jis" = ( /obj/effect/spawner/gibspawner/xeno, /obj/effect/decal/warning_stripes{ @@ -16273,18 +16380,6 @@ }, /turf/open/floor/prison/floor_plate, /area/lv522/atmos/way_in_command_centre) -"jix" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/outdoors/colony_streets/south_east_street) "jiF" = ( /obj/structure/stairs/perspective{ dir = 9; @@ -16382,6 +16477,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkyellowfull2/east, /area/lv522/indoors/lone_buildings/engineering) +"jkZ" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/structure/platform/metal/almayer, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_2) "jlc" = ( /obj/structure/surface/rack, /obj/item/tool/minihoe{ @@ -16455,6 +16555,10 @@ }, /turf/open/floor/prison, /area/lv522/indoors/c_block/cargo) +"jmB" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/prison/floor_plate, +/area/lv522/indoors/a_block/corpo/glass) "jmE" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -16544,24 +16648,18 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) +"joI" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/south_west_street) "joK" = ( /obj/structure/cargo_container/grant/left, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/nw_rockies) -"joL" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/transmitter/colony_net{ - dir = 4; - phone_category = "LV522 Chances Claim"; - phone_color = "red"; - phone_id = "Colony Garage"; - pixel_x = -16 - }, -/turf/open/floor/prison/darkbrownfull2, -/area/lv522/indoors/c_block/garage) +"joX" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/north_street) "jpa" = ( /obj/structure/bedsheetbin{ pixel_y = 7 @@ -16605,15 +16703,6 @@ }, /turf/open/floor/corsat/brown/northwest, /area/lv522/atmos/cargo_intake) -"jqO" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/landing_zone_1) "jrd" = ( /obj/structure/girder/displaced, /turf/open/asphalt/cement, @@ -16643,12 +16732,6 @@ }, /turf/open/floor/corsat/marked, /area/lv522/indoors/a_block/admin) -"jru" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/landing_zone_2) "jrB" = ( /obj/structure/machinery/vending/snack{ density = 0; @@ -16734,6 +16817,14 @@ }, /turf/open/floor/corsat/plate, /area/lv522/atmos/cargo_intake) +"jsT" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/prison/floor_plate, +/area/lv522/outdoors/colony_streets/south_east_street) "jtg" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, @@ -16758,6 +16849,11 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) +"jun" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel/far) "jur" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -16824,6 +16920,10 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_east_street) +"jvq" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/prison, +/area/lv522/indoors/a_block/kitchen) "jvu" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 @@ -16856,6 +16956,12 @@ /obj/structure/machinery/vending/cola, /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms/glass) +"jwh" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/platform/metal/almayer/north, +/obj/structure/largecrate, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "jwx" = ( /obj/item/prop/alien/hugger, /obj/structure/machinery/light{ @@ -16876,6 +16982,10 @@ }, /turf/open/floor/corsat/marked, /area/lv522/indoors/c_block/garage) +"jwS" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/gm/river, +/area/lv522/outdoors/colony_streets/south_street) "jwT" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/blood, @@ -16899,16 +17009,6 @@ }, /turf/open/floor/corsat/marked, /area/lv522/indoors/c_block/mining) -"jxD" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 10 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/landing_zone_2) "jxF" = ( /obj/structure/largecrate/guns/russian, /turf/open/floor/plating, @@ -16929,13 +17029,6 @@ /obj/structure/machinery/colony_floodlight, /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/north_west_street) -"jyw" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/atmos/way_in_command_centre) "jyx" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/weapon/pole/fancy_cane, @@ -16968,12 +17061,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/c_block/cargo) -"jzu" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/asphalt/cement/cement12, -/area/lv522/outdoors/colony_streets/central_streets) "jzC" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/table/woodentable/fancy, @@ -17102,12 +17189,6 @@ }, /turf/open/floor/prison, /area/lv522/indoors/c_block/cargo) -"jBU" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/north_street) "jBY" = ( /turf/open/floor/corsat/brown/northeast, /area/lv522/atmos/cargo_intake) @@ -17134,12 +17215,6 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat/plate, /area/lv522/atmos/east_reactor/south) -"jCQ" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/asphalt/cement/cement12, -/area/lv522/outdoors/colony_streets/south_street) "jCS" = ( /obj/item/trash/wy_chips_pepper, /obj/structure/machinery/light{ @@ -17168,6 +17243,14 @@ /obj/structure/machinery/vending/coffee, /turf/open/floor/prison/blue_plate/north, /area/lv522/indoors/a_block/hallway) +"jCZ" = ( +/obj/structure/stairs/perspective{ + dir = 5; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/cargo) "jDc" = ( /obj/structure/stairs/perspective{ dir = 1; @@ -17178,16 +17261,17 @@ }, /turf/open/asphalt/cement/cement4, /area/lv522/outdoors/nw_rockies) -"jDy" = ( +"jDi" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, /obj/structure/stairs/perspective{ dir = 4; icon_state = "p_stair_full" }, -/obj/structure/platform/stair_cut{ - icon_state = "platform_stair_alt" - }, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/north_street) +/obj/structure/platform/metal/stair_cut/platform_left, +/turf/open/floor/prison/floor_plate, +/area/lv522/indoors/a_block/bridges/dorms_fitness) "jDA" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 4 @@ -17212,14 +17296,6 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_street) -"jEa" = ( -/obj/structure/cargo_container/ferret/left, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) -"jEk" = ( -/obj/structure/cargo_container/ferret/mid, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) "jEq" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /obj/structure/machinery/light{ @@ -17227,10 +17303,6 @@ }, /turf/open/floor/corsat/marked, /area/lv522/atmos/east_reactor) -"jEF" = ( -/obj/structure/cargo_container/ferret/right, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) "jEW" = ( /obj/structure/bed/chair{ dir = 1 @@ -17273,6 +17345,13 @@ }, /turf/open/floor/strata/white_cyan1/east, /area/lv522/indoors/a_block/medical) +"jFy" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/prop/almayer/computers/sensor_computer2{ + layer = 2.0 + }, +/turf/open/floor/prison/floor_plate, +/area/lv522/atmos/way_in_command_centre) "jFC" = ( /obj/structure/machinery/space_heater, /turf/open/floor/prison/darkpurple2/north, @@ -17284,12 +17363,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/corsat/plate, /area/lv522/atmos/east_reactor/south) -"jFP" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/gm/river, -/area/lv522/indoors/c_block/mining) "jGa" = ( /obj/item/storage/backpack/marine/satchel{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; @@ -17310,18 +17383,6 @@ /obj/structure/largecrate/random, /turf/open/floor/plating, /area/lv522/indoors/c_block/mining) -"jGp" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 9 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/landing_zone_2) "jGK" = ( /obj/structure/largecrate/random/secure, /turf/open/auto_turf/shale/layer1, @@ -17383,15 +17444,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/cargo) -"jIQ" = ( -/obj/structure/machinery/colony_floodlight{ - layer = 4.3 - }, -/obj/structure/platform{ - dir = 1 - }, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/south_street) "jJa" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -17450,15 +17502,6 @@ }, /turf/open/asphalt/cement/cement4, /area/lv522/outdoors/colony_streets/south_east_street) -"jKb" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/outdoors/colony_streets/east_central_street) "jKm" = ( /obj/item/stack/sheet/metal, /turf/open/floor/strata/blue1, @@ -17479,12 +17522,6 @@ /obj/structure/closet/emcloset, /turf/open/floor/strata/blue1, /area/lv522/outdoors/colony_streets/windbreaker/observation) -"jKB" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/asphalt/cement/cement15, -/area/lv522/outdoors/colony_streets/north_east_street) "jLf" = ( /obj/item/shard{ icon_state = "medium" @@ -17498,6 +17535,12 @@ /obj/structure/cargo_container/wy/left, /turf/open/floor/prison/darkbrownfull2, /area/lv522/landing_zone_2) +"jLo" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/southwest, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_2) "jLD" = ( /obj/item/stack/sheet/wood, /obj/structure/machinery/light{ @@ -17525,6 +17568,14 @@ /obj/structure/machinery/light, /turf/open/floor/prison/blue_plate/north, /area/lv522/indoors/a_block/bridges/op_centre) +"jMo" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/turf/open/floor/prison/floor_plate, +/area/lv522/indoors/a_block/bridges/dorms_fitness) "jMr" = ( /obj/structure/stairs/perspective{ dir = 1; @@ -17548,10 +17599,6 @@ /obj/structure/cargo_container/kelland/left, /turf/open/floor/prison, /area/lv522/landing_zone_2) -"jMJ" = ( -/obj/item/prop/colony/used_flare, -/turf/open/asphalt/cement/cement12, -/area/lv522/outdoors/colony_streets/north_east_street) "jMZ" = ( /obj/structure/surface/table/almayer, /obj/item/tool/pen/blue/clicky{ @@ -17564,6 +17611,10 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) +"jNb" = ( +/obj/structure/platform/stone/strata/east, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/oob) "jNv" = ( /obj/structure/machinery/power/apc/power/north{ start_charge = 20 @@ -17591,12 +17642,6 @@ }, /turf/open/floor/prison/blue_plate/north, /area/lv522/indoors/a_block/admin) -"jNY" = ( -/turf/open/asphalt/cement/cement12, -/area/lv522/atmos/cargo_intake) -"jOh" = ( -/turf/open/asphalt/cement/cement15, -/area/lv522/atmos/cargo_intake) "jOr" = ( /obj/structure/prop/ice_colony/dense/planter_box{ dir = 9 @@ -17654,14 +17699,6 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/nw_rockies) -"jPg" = ( -/obj/structure/platform_decoration, -/obj/structure/stairs/perspective{ - dir = 5; - icon_state = "p_stair_full" - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/landing_zone_1) "jPj" = ( /obj/structure/machinery/light{ dir = 1 @@ -17696,6 +17733,17 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat/marked, /area/lv522/atmos/reactor_garage) +"jPU" = ( +/obj/item/prop/colony/used_flare, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/prison/floor_plate, +/area/lv522/outdoors/colony_streets/containers) "jQa" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/prop/dam/crane{ @@ -17709,9 +17757,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/a_block/security) +"jQt" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/asphalt/cement/cement2, +/area/lv522/outdoors/colony_streets/north_east_street) "jQC" = ( /obj/structure/machinery/light, /obj/structure/machinery/disposal, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) "jRc" = ( @@ -17721,6 +17774,17 @@ "jRT" = ( /turf/open/floor/wood, /area/lv522/indoors/a_block/executive) +"jRX" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/stair_cut/platform_right, +/turf/open/floor/prison/floor_plate, +/area/lv522/indoors/a_block/bridges/dorms_fitness) "jSk" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/camera/autoname{ @@ -17731,12 +17795,6 @@ }, /turf/open/floor/prison/greenfull/east, /area/lv522/indoors/b_block/bridge) -"jSB" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/cargo) "jSC" = ( /obj/structure/machinery/light, /obj/structure/machinery/disposal, @@ -17940,6 +17998,13 @@ }, /turf/open/floor/prison/greenfull, /area/lv522/indoors/a_block/fitness) +"jXf" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/prison/floor_plate, +/area/lv522/outdoors/colony_streets/east_central_street) "jXp" = ( /obj/effect/spawner/gibspawner/xeno, /obj/effect/decal/cleanable/blood/xeno{ @@ -17993,22 +18058,29 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/shiva/radiator_tile2, /area/lv522/indoors/c_block/cargo) +"jYH" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/prison/greenfull/east, +/area/lv522/indoors/b_block/bridge) "jYK" = ( /obj/structure/stairs/perspective{ dir = 6; icon_state = "p_stair_full" }, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "jZc" = ( /obj/structure/flora/jungle/thickbush, /turf/open/organic/grass, /area/lv522/indoors/a_block/garden) -"jZe" = ( -/obj/structure/platform_decoration, -/obj/effect/decal/cleanable/dirt, -/turf/open/asphalt/cement, -/area/lv522/indoors/lone_buildings/engineering) "jZo" = ( /obj/structure/desertdam/decals/road_edge{ pixel_x = 2 @@ -18020,6 +18092,7 @@ /turf/open/floor/prison/floor_plate, /area/lv522/indoors/a_block/hallway) "jZD" = ( +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/asphalt/cement/cement3, /area/lv522/landing_zone_1) "jZI" = ( @@ -18202,6 +18275,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/corsat/plate, /area/lv522/atmos/east_reactor/south) +"kcr" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_2) "kcv" = ( /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/dirt, @@ -18258,16 +18335,6 @@ }, /turf/open/floor/corsat/plate, /area/lv522/atmos/east_reactor/south) -"kdi" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/stairs/perspective{ - dir = 5; - icon_state = "p_stair_full" - }, -/turf/open/floor/prison/darkbrownfull2, -/area/lv522/indoors/c_block/mining) "kdm" = ( /obj/structure/cargo_container/wy/right, /turf/open/auto_turf/sand_white/layer0, @@ -18314,16 +18381,10 @@ /obj/effect/alien/resin/sticky, /turf/open/floor/corsat/plate, /area/lv522/atmos/east_reactor/south) -"keq" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/structure/stairs/perspective{ - dir = 6; - icon_state = "p_stair_full" - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) +"keV" = ( +/obj/structure/cargo_container/arious/leftmid, +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/containers) "kfi" = ( /obj/structure/closet/secure_closet/engineering_electrical, /turf/open/floor/prison/darkyellowfull2/east, @@ -18449,6 +18510,10 @@ }, /turf/open/floor/prison/floor_plate, /area/lv522/indoors/c_block/cargo) +"kiy" = ( +/obj/structure/cargo_container/wy/mid, +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/containers) "kiE" = ( /obj/structure/barricade/wooden{ dir = 8 @@ -18531,12 +18596,6 @@ /obj/structure/window/framed/strata/reinforced, /turf/open/floor/corsat/marked, /area/lv522/atmos/reactor_garage) -"kkq" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/asphalt/cement/cement3, -/area/lv522/outdoors/colony_streets/south_west_street) "kky" = ( /turf/open/floor/corsat/brown/west, /area/lv522/atmos/north_command_centre) @@ -18552,6 +18611,10 @@ /obj/structure/machinery/light, /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms) +"kkM" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/asphalt/cement/cement3, +/area/lv522/outdoors/colony_streets/north_west_street) "kkP" = ( /obj/structure/surface/rack, /turf/open/floor/prison/darkbrownfull2, @@ -18627,19 +18690,6 @@ }, /turf/open/floor/wood, /area/lv522/indoors/a_block/fitness/glass) -"kmF" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/indoors/a_block/garden) "kmH" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -18743,6 +18793,10 @@ }, /turf/open/floor/prison, /area/lv522/indoors/a_block/admin) +"kpe" = ( +/obj/structure/cargo_container/lockmart/mid, +/turf/open/floor/prison/floor_marked, +/area/lv522/outdoors/colony_streets/containers) "kpo" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/table/almayer, @@ -18794,6 +18848,10 @@ "kqb" = ( /turf/closed/wall/strata_outpost, /area/lv522/indoors/a_block/kitchen) +"kqp" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_1) "kqJ" = ( /obj/structure/barricade/wooden{ dir = 4 @@ -18801,6 +18859,14 @@ /obj/item/stack/sheet/metal, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) +"kqS" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/stairs/perspective{ + dir = 5; + icon_state = "p_stair_full" + }, +/turf/open/floor/prison/darkbrownfull2, +/area/lv522/indoors/c_block/mining) "kqT" = ( /obj/item/ammo_magazine/rifle/heap{ current_rounds = 0 @@ -18897,6 +18963,11 @@ }, /turf/open/floor/prison/darkredfull2, /area/lv522/outdoors/colony_streets/north_street) +"ktg" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison/darkbrownfull2, +/area/lv522/indoors/c_block/garage) "kti" = ( /obj/structure/machinery/door/poddoor/almayer/closed{ id = "Corpo Vault"; @@ -18954,6 +19025,10 @@ /obj/item/device/camera, /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms/glass) +"kuq" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/asphalt/cement/cement1, +/area/lv522/outdoors/colony_streets/south_west_street) "kuD" = ( /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/dirt, @@ -19061,6 +19136,13 @@ /obj/item/tool/pickaxe/silver, /turf/open/floor/prison, /area/lv522/indoors/c_block/cargo) +"kyp" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 6 + }, +/turf/open/floor/plating/plating_catwalk/prison, +/area/lv522/indoors/c_block/mining) "kyz" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/atmos/north_command_centre) @@ -19116,6 +19198,10 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/atmos/reactor_garage) +"kzm" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/prison, +/area/lv522/indoors/a_block/dorms) "kzr" = ( /obj/structure/closet/crate/trashcart, /obj/item/trash/wy_chips_pepper, @@ -19201,10 +19287,6 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/nw_rockies) -"kBK" = ( -/obj/structure/largecrate/random, -/turf/open/auto_turf/shale/layer1, -/area/lv522/outdoors/colony_streets/north_east_street) "kBT" = ( /obj/structure/cargo_container/horizontal/blue/bottom, /turf/open/auto_turf/shale/layer1, @@ -19225,6 +19307,17 @@ }, /turf/open/floor/prison/floor_marked, /area/lv522/outdoors/colony_streets/north_west_street) +"kCt" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_1) +"kCv" = ( +/obj/item/ammo_magazine/rifle/heap{ + current_rounds = 0 + }, +/turf/open/floor/prison/floor_marked, +/area/lv522/outdoors/colony_streets/containers) "kCC" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -19265,6 +19358,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms) +"kDa" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_2) "kDH" = ( /obj/structure/machinery/disposal, /turf/open/floor/prison/darkpurplefull2, @@ -19299,12 +19396,6 @@ }, /turf/open/floor/prison/floor_plate, /area/lv522/indoors/a_block/admin) -"kEl" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/gm/river, -/area/lv522/landing_zone_1/tunnel/far) "kEo" = ( /obj/structure/machinery/colony_floodlight{ layer = 4.3 @@ -19316,6 +19407,27 @@ /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/corsat/marked, /area/lv522/indoors/c_block/mining) +"kEG" = ( +/obj/structure/machinery{ + density = 1; + dir = 4; + icon = 'icons/obj/vehicles/apc.dmi'; + icon_state = "apc_base_com"; + explo_proof = 1; + name = "\improper M577 armored personnel carrier"; + pixel_y = -21; + unacidable = 1; + unslashable = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/closed/wall/strata_ice/dirty, +/area/lv522/outdoors/colony_streets/containers) "kEL" = ( /obj/structure/barricade/deployable{ dir = 1 @@ -19351,12 +19463,6 @@ /obj/structure/closet/secure_closet/freezer/fridge, /turf/open/floor/prison/blue_plate, /area/lv522/indoors/a_block/admin) -"kEZ" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/asphalt/cement/cement14, -/area/lv522/outdoors/colony_streets/central_streets) "kFd" = ( /obj/structure/prop/invuln/overhead_pipe{ dir = 8; @@ -19377,6 +19483,10 @@ /obj/structure/machinery/landinglight/ds2/delaytwo, /turf/open/floor/plating, /area/lv522/landing_zone_2) +"kFC" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/asphalt/cement/cement3, +/area/lv522/outdoors/colony_streets/north_west_street) "kFK" = ( /obj/structure/barricade/deployable{ dir = 1 @@ -19428,6 +19538,20 @@ }, /turf/open/floor/prison/darkredfull2, /area/lv522/indoors/a_block/security) +"kHM" = ( +/obj/structure/cable/heavyduty{ + icon_state = "1-2" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/plating, +/area/lv522/outdoors/colony_streets/central_streets) "kHP" = ( /obj/effect/decal/cleanable/dirt, /obj/item/trash/uscm_mre, @@ -19440,21 +19564,6 @@ }, /turf/open/floor/prison/darkredfull2, /area/lv522/indoors/a_block/security) -"kHW" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel/far) -"kHX" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/asphalt/cement/cement1, -/area/lv522/outdoors/colony_streets/south_street) "kHZ" = ( /obj/structure/surface/table/almayer, /obj/item/tool/weldpack{ @@ -19532,11 +19641,6 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/atmos/east_reactor/south) -"kJh" = ( -/obj/item/stack/rods, -/obj/structure/platform, -/turf/open/asphalt/cement/cement4, -/area/lv522/outdoors/colony_streets/north_east_street) "kJv" = ( /obj/structure/largecrate/random/mini, /turf/open/asphalt/cement/cement3, @@ -19567,6 +19671,15 @@ "kKR" = ( /turf/open/floor/plating/platingdmg1, /area/lv522/indoors/a_block/dorms) +"kKV" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 8; + pixel_x = -6; + pixel_y = 6 + }, +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel/far) "kLc" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/prison, @@ -19588,19 +19701,6 @@ }, /turf/open/asphalt/cement/cement3, /area/lv522/outdoors/colony_streets/south_west_street) -"kMi" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform/stair_cut{ - icon_state = "platform_stair_alt" - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/indoors/a_block/bridges/dorms_fitness) "kMr" = ( /obj/structure/coatrack{ pixel_x = 10; @@ -19695,6 +19795,7 @@ id = "LZ1_Lockdown_Lo"; name = "Emergency Lockdown" }, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/corsat/marked, /area/lv522/landing_zone_1/ceiling) "kPO" = ( @@ -19783,6 +19884,11 @@ }, /turf/open/floor/prison/floor_plate, /area/lv522/atmos/reactor_garage) +"kRM" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/asphalt/cement/cement4, +/area/lv522/landing_zone_1) "kRQ" = ( /turf/open/floor/wood, /area/lv522/indoors/a_block/security) @@ -19992,6 +20098,17 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms) +"kWO" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 8; + pixel_x = -6; + pixel_y = 6 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/west, +/turf/open/gm/river, +/area/lv522/landing_zone_1/tunnel/far) "kWZ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -20050,6 +20167,11 @@ }, /turf/open/floor/prison/blue, /area/lv522/indoors/a_block/admin) +"kYw" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/decal/cleanable/generic, +/turf/open/floor/prison, +/area/lv522/indoors/a_block/kitchen) "kYH" = ( /obj/structure/barricade/wooden{ dir = 8 @@ -20080,13 +20202,6 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/admin) -"kZq" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel) "kZs" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -20122,6 +20237,13 @@ }, /turf/open/floor/prison/blue, /area/lv522/indoors/a_block/admin) +"laF" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/machinery/colony_floodlight, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/northeast, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/south_street) "laX" = ( /obj/structure/prop/invuln/ice_prefab/trim{ dir = 8; @@ -20198,13 +20320,6 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor, /turf/open/floor/corsat/marked, /area/lv522/atmos/command_centre) -"lcD" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/structure/ore_box, -/turf/open/floor/plating/platebot, -/area/lv522/indoors/c_block/cargo) "lcK" = ( /obj/structure/machinery/light{ dir = 8 @@ -20320,6 +20435,10 @@ }, /turf/open/asphalt/cement/cement12, /area/lv522/outdoors/colony_streets/south_street) +"leU" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_2) "leV" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/folder/white{ @@ -20353,12 +20472,6 @@ /obj/effect/landmark/xeno_spawn, /turf/open/floor/corsat/plate, /area/lv522/atmos/west_reactor) -"lgY" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/landing_zone_1) "lhb" = ( /obj/structure/prop/invuln/ice_prefab{ dir = 5 @@ -20384,6 +20497,12 @@ }, /turf/open/floor/prison/darkredfull2, /area/lv522/outdoors/colony_streets/north_street) +"lhr" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/southwest, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_east_street) "lhD" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/atmos/west_reactor) @@ -20423,6 +20542,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) +"ljm" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/prison/darkbrownfull2, +/area/lv522/indoors/c_block/cargo) "ljq" = ( /obj/structure/machinery/floodlight/landing, /turf/open/floor/prison/blue_plate, @@ -20554,6 +20677,10 @@ }, /turf/open/floor/prison/darkredfull2, /area/lv522/indoors/a_block/kitchen/glass) +"lnq" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/gm/river, +/area/lv522/landing_zone_1/tunnel/far) "lnF" = ( /obj/structure/bookcase{ density = 0; @@ -20622,10 +20749,6 @@ /obj/item/prop/alien/hugger, /turf/open/floor/carpet, /area/lv522/indoors/b_block/bar) -"lpt" = ( -/obj/structure/platform, -/turf/open/asphalt/cement, -/area/lv522/indoors/lone_buildings/engineering) "lpy" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/prison, @@ -20702,6 +20825,10 @@ }, /turf/open/floor/corsat/marked, /area/lv522/atmos/east_reactor/west) +"lsa" = ( +/obj/structure/platform/metal/almayer, +/turf/open/asphalt/cement/cement4, +/area/lv522/outdoors/colony_streets/north_east_street) "lsf" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/blue/southwest, @@ -20733,28 +20860,16 @@ }, /turf/open/floor/prison/floor_plate, /area/lv522/outdoors/colony_streets/north_east_street) -"ltf" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) -"ltw" = ( -/obj/structure/platform/strata, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/oob) +"ltk" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/asphalt/cement, +/area/lv522/indoors/lone_buildings/engineering) "lty" = ( /obj/structure/barricade/wooden{ dir = 8 }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_street) -"ltB" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/asphalt/cement/cement3, -/area/lv522/outdoors/colony_streets/north_east_street) "ltC" = ( /obj/structure/bed/chair/comfy, /obj/structure/pipes/standard/simple/hidden/green{ @@ -20762,6 +20877,14 @@ }, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) +"ltN" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/stair_cut/platform_right, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/south_west_street) "lui" = ( /obj/effect/decal/cleanable/blood/drip, /obj/structure/pipes/standard/simple/hidden/green{ @@ -20769,17 +20892,16 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/security) -"lul" = ( -/obj/structure/platform_decoration, -/turf/open/asphalt/cement/cement3, -/area/lv522/outdoors/colony_streets/south_west_street) -"lum" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/south_east_street) +"luu" = ( +/obj/structure/surface/table/almayer, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/prison/darkpurplefull2, +/area/lv522/indoors/a_block/dorms) +"luP" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/obj/structure/machinery/disposal, +/turf/open/floor/prison/darkbrownfull2, +/area/lv522/indoors/c_block/garage) "lvb" = ( /obj/structure/prop/ice_colony/ground_wire{ dir = 4 @@ -20823,6 +20945,10 @@ }, /turf/open/floor/prison/cell_stripe/north, /area/lv522/atmos/way_in_command_centre) +"lwd" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/area/lv522/landing_zone_forecon/UD6_Typhoon) "lwm" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -20875,6 +21001,18 @@ }, /turf/open/floor/prison/darkredfull2, /area/lv522/indoors/a_block/security/glass) +"lxs" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/machinery/disposal, +/turf/open/floor/prison/darkbrownfull2, +/area/lv522/indoors/c_block/mining) +"lxx" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_2) "lxG" = ( /obj/structure/surface/table/almayer, /obj/effect/spider/spiderling/nogrow, @@ -20965,6 +21103,19 @@ /obj/structure/surface/rack, /turf/open/floor/prison, /area/lv522/indoors/c_block/mining) +"lzC" = ( +/obj/item/ammo_magazine/rifle/heap{ + current_rounds = 0 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/prison/floor_plate, +/area/lv522/outdoors/colony_streets/containers) "lzP" = ( /obj/structure/surface/table/almayer, /obj/structure/window/reinforced{ @@ -20974,23 +21125,6 @@ /obj/effect/decal/cleanable/cobweb, /turf/open/floor/prison/blue_plate/north, /area/lv522/indoors/c_block/mining) -"lzU" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) -"lzV" = ( -/obj/structure/platform_decoration, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/outdoors/colony_streets/south_east_street) "lAj" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -21051,6 +21185,9 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/nw_rockies) +"lBM" = ( +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/containers) "lCh" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/table/almayer, @@ -21126,6 +21263,10 @@ }, /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms) +"lEr" = ( +/obj/structure/largecrate/random/secure, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/containers) "lEF" = ( /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/bridges/dorms_fitness) @@ -21145,6 +21286,15 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat/browncorner/west, /area/lv522/atmos/east_reactor) +"lFz" = ( +/obj/structure/barricade/deployable{ + dir = 8 + }, +/obj/item/weapon/gun/rifle/m41a{ + current_mag = null + }, +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/containers) "lFO" = ( /obj/item/storage/backpack/marine/satchel{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; @@ -21316,8 +21466,13 @@ /area/lv522/atmos/way_in_command_centre) "lJq" = ( /obj/structure/largecrate/random/secure, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/auto_turf/shale/layer1, /area/lv522/landing_zone_1) +"lJC" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/asphalt/cement/cement2, +/area/lv522/outdoors/colony_streets/south_east_street) "lJU" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin{ @@ -21325,6 +21480,7 @@ pixel_y = 6 }, /obj/item/tool/pen/blue/clicky, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) "lKi" = ( @@ -21362,6 +21518,10 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms/glass) +"lLp" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/north_east_street) "lLA" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin{ @@ -21475,12 +21635,6 @@ }, /turf/open/floor/prison/floor_plate, /area/lv522/outdoors/colony_streets/north_street) -"lPq" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/south_east_street) "lPv" = ( /obj/effect/decal/cleanable/liquid_fuel, /obj/structure/stairs/perspective{ @@ -21500,20 +21654,26 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/mining) -"lPY" = ( -/obj/structure/stairs/perspective{ - dir = 5; - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/atmos/way_in_command_centre) +"lQG" = ( +/obj/structure/cargo_container/wy/left, +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/containers) "lQS" = ( /obj/item/stack/folding_barricade, /turf/open/floor/prison, /area/lv522/atmos/way_in_command_centre) +"lRl" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/decal/cleanable/dirt, +/obj/structure/transmitter/colony_net{ + dir = 4; + phone_category = "LV522 Chances Claim"; + phone_color = "red"; + phone_id = "Colony Garage"; + pixel_x = -16 + }, +/turf/open/floor/prison/darkbrownfull2, +/area/lv522/indoors/c_block/garage) "lRx" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/condiment/hotsauce/sriracha{ @@ -21530,6 +21690,11 @@ }, /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms) +"lRD" = ( +/obj/item/stack/sheet/metal, +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/asphalt/cement/cement1, +/area/lv522/outdoors/colony_streets/north_east_street) "lRF" = ( /obj/structure/girder, /turf/open/floor/prison, @@ -21601,6 +21766,9 @@ }, /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms) +"lTq" = ( +/turf/open/floor/prison/floor_marked, +/area/lv522/outdoors/colony_streets/containers) "lTQ" = ( /obj/effect/decal/cleanable/blood/gibs/xeno, /obj/structure/pipes/standard/simple/hidden/green{ @@ -21666,15 +21834,25 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_west_street) +"lUZ" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/turf/open/floor/prison/floor_plate, +/area/lv522/indoors/c_block/garage) +"lVb" = ( +/obj/structure/cargo_container/horizontal/blue/middle, +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/containers) +"lVn" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/asphalt/cement/cement2, +/area/lv522/outdoors/colony_streets/south_street) "lVp" = ( /turf/closed/wall/strata_outpost, /area/lv522/indoors/a_block/kitchen/glass) -"lVs" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/plating, -/area/lv522/outdoors/colony_streets/north_east_street) "lVA" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/drinks/cans/souto{ @@ -21740,15 +21918,23 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkredfull2, /area/lv522/indoors/a_block/kitchen/glass) -"lWj" = ( -/obj/structure/platform, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/landing_zone_1) "lWm" = ( /obj/structure/machinery/light, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkredfull2, /area/lv522/indoors/a_block/security/glass) +"lWK" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/prison/floor_plate, +/area/lv522/outdoors/colony_streets/south_east_street) "lWW" = ( /obj/item/trash/crushed_cup{ pixel_x = -4; @@ -21770,17 +21956,15 @@ }, /turf/open/asphalt/cement/cement12, /area/lv522/outdoors/colony_streets/north_east_street) -"lYG" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/structure/prop/invuln/overhead_pipe{ - dir = 8; - pixel_x = -6; - pixel_y = 6 +"lYw" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" }, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/mining) +/obj/structure/platform/metal/almayer/east, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison/blue_plate/north, +/area/lv522/indoors/a_block/admin) "lYL" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -21800,6 +21984,14 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) +"lZo" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/asphalt/cement/cement1, +/area/lv522/outdoors/colony_streets/north_street) +"lZB" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/asphalt/cement/cement1, +/area/lv522/outdoors/colony_streets/south_street) "lZI" = ( /obj/effect/decal/cleanable/dirt, /obj/item/prop/colony/used_flare, @@ -21943,15 +22135,6 @@ }, /turf/open/floor/prison, /area/lv522/indoors/c_block/t_comm) -"mcC" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/indoors/a_block/corpo/glass) "mcG" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -21980,16 +22163,22 @@ }, /turf/open/floor/corsat/brown/west, /area/lv522/atmos/east_reactor) +"mdJ" = ( +/obj/structure/barricade/deployable{ + dir = 8 + }, +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/containers) +"mdU" = ( +/obj/structure/platform_decoration/stone/strata/east, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/oob) "meb" = ( /obj/structure/largecrate/random{ layer = 2.9 }, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) -"mee" = ( -/obj/structure/largecrate/random/barrel/true_random, -/turf/open/auto_turf/shale/layer1, -/area/lv522/outdoors/colony_streets/north_east_street) "men" = ( /turf/closed/wall/strata_outpost, /area/lv522/atmos/east_reactor/south) @@ -22096,18 +22285,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/a_block/admin) -"mil" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 5 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) "miz" = ( /obj/structure/stairs/perspective{ dir = 1; @@ -22115,6 +22292,10 @@ }, /turf/open/asphalt/cement/cement4, /area/lv522/outdoors/colony_streets/north_street) +"miG" = ( +/obj/item/prop/colony/used_flare, +/turf/open/floor/prison/floor_marked, +/area/lv522/outdoors/colony_streets/containers) "miW" = ( /turf/open/asphalt/cement/cement4, /area/lv522/outdoors/colony_streets/north_west_street) @@ -22193,6 +22374,28 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) +"mkB" = ( +/obj/structure/cable/heavyduty{ + icon_state = "0-8" + }, +/obj/structure/cable/heavyduty{ + icon_state = "1-2"; + pixel_y = -23 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/obj/structure/platform/metal/almayer, +/turf/open/floor/plating, +/area/lv522/outdoors/colony_streets/central_streets) "mkJ" = ( /obj/structure/machinery/deployable/barrier, /turf/open/floor/prison/darkredfull2, @@ -22294,18 +22497,18 @@ }, /turf/open/asphalt/cement/cement1, /area/lv522/outdoors/colony_streets/south_west_street) -"mmE" = ( -/obj/structure/machinery/colony_floodlight{ - layer = 4.3 - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/asphalt/cement/cement1, -/area/lv522/outdoors/colony_streets/north_east_street) +"mmN" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison, +/area/lv522/indoors/c_block/mining) "mnb" = ( /turf/open/asphalt/cement/cement4, /area/lv522/outdoors/colony_streets/south_street) +"mng" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/cargo) "mns" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, @@ -22321,18 +22524,6 @@ }, /turf/open/floor/strata/blue1, /area/lv522/outdoors/colony_streets/windbreaker/observation) -"mnz" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/indoors/a_block/garden) "mnN" = ( /obj/item/prop/alien/hugger, /obj/effect/decal/cleanable/dirt, @@ -22361,19 +22552,12 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/corpo/glass) -"moe" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/south_west_street) "moz" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/light{ dir = 8 }, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) "moI" = ( @@ -22388,6 +22572,7 @@ pixel_x = 8; pixel_y = 20 }, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) "moO" = ( @@ -22409,6 +22594,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/corpo/glass) +"mph" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 8; + pixel_x = -6; + pixel_y = 6 + }, +/obj/structure/platform/metal/almayer, +/turf/open/gm/river, +/area/lv522/landing_zone_1/tunnel/far) "mpr" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/blue, @@ -22509,6 +22703,10 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/corsat/marked, /area/lv522/atmos/east_reactor/west) +"mrf" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/asphalt/cement/cement9, +/area/lv522/outdoors/colony_streets/north_east_street) "mrD" = ( /obj/structure/surface/table/reinforced/prison, /turf/open/floor/prison/floor_plate, @@ -22562,6 +22760,18 @@ }, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorm_north) +"msJ" = ( +/obj/structure/machinery/colony_floodlight{ + layer = 4.3 + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/asphalt/cement/cement1, +/area/lv522/outdoors/colony_streets/north_east_street) +"msN" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison, +/area/lv522/indoors/a_block/kitchen) "msQ" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 1 @@ -22604,6 +22814,11 @@ }, /turf/open/floor/prison, /area/lv522/atmos/way_in_command_centre) +"mug" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "mum" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 @@ -22634,6 +22849,7 @@ pixel_x = -8; pixel_y = 4 }, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/landing_zone_1/ceiling) "muP" = ( @@ -22645,23 +22861,19 @@ "muV" = ( /turf/open/floor/prison/blue, /area/lv522/indoors/a_block/admin) -"mvd" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 4 +"mva" = ( +/obj/item/ammo_magazine/rifle/heap{ + current_rounds = 0 }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison/blue_plate/north, -/area/lv522/indoors/a_block/admin) +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/containers) "mvB" = ( /obj/item/prop/alien/hugger, /turf/open/floor/plating, /area/lv522/indoors/a_block/security) "mvP" = ( /obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/landing_zone_1/ceiling) "mwf" = ( @@ -22698,6 +22910,10 @@ }, /turf/open/floor/almayer/w_y1, /area/lv522/atmos/way_in_command_centre) +"mwv" = ( +/obj/structure/barricade/deployable, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/containers) "mwT" = ( /obj/structure/prop/dam/truck, /obj/structure/prop/holidays/wreath{ @@ -22739,6 +22955,7 @@ /obj/structure/bed/chair{ dir = 4 }, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/landing_zone_1/ceiling) "mxO" = ( @@ -22791,6 +23008,7 @@ dir = 8; pixel_y = 5 }, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) "myZ" = ( @@ -22803,6 +23021,7 @@ /obj/item/device/flashlight/lamp{ pixel_x = 6 }, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) "mzi" = ( @@ -22815,11 +23034,6 @@ }, /turf/open/floor/prison, /area/lv522/indoors/a_block/corpo/glass) -"mzX" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/platform, -/turf/open/floor/prison/floor_plate, -/area/lv522/indoors/a_block/corpo/glass) "mAg" = ( /obj/structure/prop/dam/crane/damaged, /turf/open/auto_turf/sand_white/layer0, @@ -22852,12 +23066,6 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) -"mAW" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/indoors/a_block/corpo/glass) "mBc" = ( /obj/structure/bed/chair/comfy{ dir = 1 @@ -22980,6 +23188,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/corsat/plate, /area/lv522/atmos/reactor_garage) +"mEL" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/north_street) "mFg" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -23002,14 +23218,19 @@ }, /obj/effect/landmark/objective_landmark/close, /obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) -"mFA" = ( +"mFD" = ( /obj/structure/stairs/perspective{ dir = 8; icon_state = "p_stair_full" }, -/obj/structure/platform/stair_cut/alt, +/obj/structure/platform/metal/stair_cut/platform_right, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/c_block/cargo) "mFO" = ( @@ -23018,14 +23239,14 @@ }, /turf/open/floor/corsat/marked, /area/lv522/indoors/c_block/t_comm) -"mFZ" = ( -/obj/structure/stairs/perspective{ - dir = 6; - icon_state = "p_stair_full" - }, -/obj/structure/platform/stair_cut, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/cargo) +"mGy" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/asphalt/cement/cement1, +/area/lv522/outdoors/colony_streets/north_east_street) +"mGC" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/central_streets) "mGD" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/prop/almayer/computer/PC{ @@ -23066,12 +23287,6 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/bridges/garden_bridge) -"mHP" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/indoors/a_block/corpo/glass) "mHU" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, /turf/open/floor/grass, @@ -23083,6 +23298,15 @@ }, /turf/open/floor/prison/darkredfull2, /area/lv522/outdoors/colony_streets/north_street) +"mIx" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/asphalt/cement, +/area/lv522/indoors/lone_buildings/engineering) +"mIB" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison/greenfull/northwest, +/area/lv522/indoors/b_block/bridge) "mIO" = ( /obj/structure/machinery/vending/coffee, /obj/structure/machinery/light{ @@ -23102,11 +23326,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/blue_plate/north, /area/lv522/indoors/c_block/mining) -"mIV" = ( -/obj/structure/platform_decoration, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison/blue_plate/north, -/area/lv522/indoors/a_block/admin) "mJs" = ( /obj/structure/prop/invuln/overhead_pipe{ dir = 8; @@ -23116,15 +23335,6 @@ /obj/vehicle/train/cargo/trolley, /turf/open/floor/plating, /area/lv522/landing_zone_1/tunnel/far) -"mJt" = ( -/obj/structure/stairs/perspective{ - dir = 9; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/obj/structure/machinery/light, -/turf/open/floor/prison/blue_plate/north, -/area/lv522/indoors/a_block/admin) "mJF" = ( /obj/structure/cargo_container/kelland/left{ layer = 2.9 @@ -23314,6 +23524,10 @@ }, /turf/open/floor/prison/darkredfull2, /area/lv522/indoors/a_block/kitchen) +"mNU" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/gm/river, +/area/lv522/indoors/c_block/mining) "mNX" = ( /obj/structure/pipes/vents/pump, /obj/effect/decal/cleanable/dirt, @@ -23329,6 +23543,7 @@ /obj/item/device/flashlight/lamp{ pixel_x = -8 }, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) "mOh" = ( @@ -23401,6 +23616,7 @@ name = "remote door-control"; pixel_y = 4 }, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) "mOQ" = ( @@ -23411,6 +23627,10 @@ /obj/structure/foamed_metal, /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms/glass) +"mOZ" = ( +/obj/effect/spawner/gibspawner/xeno, +/turf/open/floor/prison/floor_marked, +/area/lv522/outdoors/colony_streets/containers) "mPc" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 @@ -23423,6 +23643,10 @@ "mPr" = ( /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/south_street) +"mPs" = ( +/obj/item/storage/belt/medical/lifesaver, +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/containers) "mPy" = ( /obj/structure/largecrate/random/barrel/green, /turf/open/floor/prison/darkbrownfull2, @@ -23526,14 +23750,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/kitchen, /area/lv522/indoors/a_block/kitchen) -"mRh" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/south_street) "mRs" = ( /obj/item/prop/colony/used_flare, /turf/open/auto_turf/shale/layer1, @@ -23561,6 +23777,9 @@ "mSe" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/bridges/garden_bridge) +"mSj" = ( +/turf/closed/wall/shiva/prefabricated/reinforced, +/area/lv522/outdoors/colony_streets/containers) "mSl" = ( /obj/structure/showcase{ desc = "The display model for a Weyland Yutani generation one synthetic. It almost feels like the eyes on this one follow you."; @@ -23579,17 +23798,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/bridges/garden_bridge) -"mTa" = ( -/obj/structure/platform_decoration, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/outdoors/colony_streets/north_east_street) "mTx" = ( /obj/structure/machinery/light{ dir = 8 @@ -23648,17 +23856,6 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) -"mUG" = ( -/obj/structure/platform_decoration, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/indoors/a_block/garden) "mUS" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -23670,14 +23867,6 @@ }, /turf/open/floor/corsat/marked, /area/lv522/indoors/a_block/kitchen) -"mVi" = ( -/obj/structure/platform, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/indoors/a_block/garden) "mVj" = ( /obj/structure/machinery/light, /obj/structure/pipes/standard/simple/hidden/green{ @@ -23744,6 +23933,14 @@ "mYo" = ( /turf/open/floor/corsat/marked, /area/lv522/atmos/way_in_command_centre) +"mYJ" = ( +/obj/structure/platform/metal/stair_cut/platform_left, +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/turf/open/floor/prison/floor_plate, +/area/lv522/indoors/c_block/garage) "mYS" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -23845,13 +24042,6 @@ "nax" = ( /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_street) -"naC" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/indoors/a_block/corpo/glass) "naH" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/bed/chair{ @@ -23868,6 +24058,7 @@ /area/lv522/indoors/a_block/hallway) "naS" = ( /obj/structure/machinery/landinglight/ds1/delaythree, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/plating, /area/lv522/landing_zone_1) "nbg" = ( @@ -23955,14 +24146,6 @@ }, /turf/open/floor/prison/blue_plate, /area/lv522/indoors/a_block/admin) -"ncz" = ( -/obj/structure/platform, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/outdoors/colony_streets/north_east_street) "ncJ" = ( /obj/structure/pipes/vents/pump, /obj/effect/decal/cleanable/dirt, @@ -23986,6 +24169,22 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/greenfull/northwest, /area/lv522/indoors/b_block/hydro) +"ndv" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/prop/vehicles/crawler{ + dir = 8; + icon_state = "crawler_crate"; + layer = 3.1; + pixel_x = 6; + pixel_y = 6 + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/garage) +"ndK" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/floor/corsat/marked, +/area/lv522/indoors/c_block/cargo) "ndZ" = ( /obj/structure/cargo_container/kelland/right, /obj/item/seeds/riceseed{ @@ -24032,6 +24231,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkredfull2, /area/lv522/indoors/a_block/bridges/garden_bridge) +"neQ" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/prison/floor_plate, +/area/lv522/indoors/a_block/garden) "neX" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -24050,20 +24257,6 @@ }, /turf/open/floor/plating, /area/lv522/indoors/a_block/admin) -"nff" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/outdoors/colony_streets/north_east_street) "nfk" = ( /obj/item/lightstick/red/spoke/planted{ pixel_x = 10; @@ -24104,6 +24297,15 @@ }, /turf/open/floor/corsat/marked, /area/lv522/outdoors/colony_streets/north_street) +"ngp" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison, +/area/lv522/indoors/c_block/cargo) "ngx" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -24117,21 +24319,17 @@ }, /turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, /area/lv522/landing_zone_forecon/UD6_Typhoon) -"ngK" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/indoors/a_block/garden) "ngL" = ( /obj/structure/cargo_container/horizontal/blue/bottom{ pixel_x = 6 }, /turf/open/floor/plating/platebot, /area/lv522/indoors/c_block/cargo) +"ngM" = ( +/obj/structure/platform/stone/strata/west, +/obj/structure/platform/stone/strata, +/turf/open/auto_turf/shale/layer1, +/area/lv522/oob) "ngY" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/admin) @@ -24181,6 +24379,7 @@ /area/lv522/outdoors/colony_streets/north_street) "niA" = ( /obj/structure/largecrate/random/barrel/green, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/asphalt/cement/cement12, /area/lv522/landing_zone_1) "niE" = ( @@ -24203,10 +24402,6 @@ /obj/structure/bed/sofa/vert/grey/bot, /turf/open/floor/prison, /area/lv522/indoors/a_block/corpo/glass) -"njd" = ( -/obj/structure/platform_decoration, -/turf/open/asphalt/cement/cement3, -/area/lv522/outdoors/colony_streets/north_west_street) "njm" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/item/stack/sheet/wood, @@ -24330,12 +24525,6 @@ /obj/item/stack/sheet/wood, /turf/open/floor/prison, /area/lv522/indoors/c_block/casino) -"nlY" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/asphalt/cement/cement1, -/area/lv522/outdoors/colony_streets/south_street) "nmh" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/prop/almayer/computer/PC{ @@ -24356,14 +24545,6 @@ }, /turf/open/floor/prison/blue_plate/north, /area/lv522/indoors/a_block/admin) -"nmX" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/platform{ - dir = 8 - }, -/obj/item/stack/rods, -/turf/open/floor/prison/floor_plate, -/area/lv522/indoors/a_block/corpo/glass) "nnj" = ( /obj/structure/barricade/handrail/strata{ dir = 4 @@ -24386,6 +24567,7 @@ pixel_y = -8 }, /obj/effect/decal/strata_decals/grime/grime3, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison, /area/lv522/landing_zone_1/ceiling) "nnz" = ( @@ -24395,18 +24577,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/lv522/indoors/a_block/executive) -"nnB" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform/stair_cut/alt, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison, -/area/lv522/indoors/c_block/cargo) "nnG" = ( /obj/structure/machinery/door/poddoor/almayer{ id = "mining_secure_blast_1"; @@ -24420,6 +24590,7 @@ /obj/item/weapon/twohanded/folded_metal_chair, /obj/item/prop/alien/hugger, /obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison, /area/lv522/landing_zone_1/ceiling) "noD" = ( @@ -24461,6 +24632,14 @@ }, /turf/open/asphalt/cement/cement12, /area/lv522/outdoors/colony_streets/north_street) +"npm" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 9 + }, +/obj/structure/machinery/light, +/obj/structure/platform/metal/almayer, +/turf/open/floor/prison/floor_plate, +/area/lv522/indoors/a_block/corpo/glass) "npp" = ( /obj/structure/girder, /obj/structure/prop/invuln/lattice_prop{ @@ -24525,6 +24704,11 @@ "nqe" = ( /turf/open/floor/corsat/squares, /area/lv522/atmos/east_reactor/west) +"nqg" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/garage) "nqj" = ( /obj/structure/surface/table/gamblingtable, /obj/effect/landmark/objective_landmark/close, @@ -24616,6 +24800,10 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/security) +"nse" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/asphalt/cement/cement4, +/area/lv522/outdoors/colony_streets/north_east_street) "nsr" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/prop/almayer/computer/PC{ @@ -24623,6 +24811,7 @@ pixel_y = 5 }, /obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison, /area/lv522/landing_zone_1/ceiling) "nsv" = ( @@ -24663,19 +24852,6 @@ }, /turf/open/floor/prison/floor_plate, /area/lv522/outdoors/colony_streets/north_street) -"ntN" = ( -/obj/structure/fence{ - layer = 2.9 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/strata/floor3, -/area/lv522/outdoors/colony_streets/north_east_street) "ntQ" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/decal/cleanable/dirt, @@ -24700,6 +24876,15 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/security) +"num" = ( +/obj/item/stack/tile/plasteel{ + name = "ceiling tile"; + pixel_x = -2; + pixel_y = 1 + }, +/obj/item/prop/colony/used_flare, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/containers) "nuo" = ( /obj/structure/machinery/light, /turf/open/floor/strata/blue1, @@ -24708,15 +24893,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/a_block/corpo/glass) -"nuL" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/item/shard{ - icon_state = "medium" - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/indoors/a_block/corpo/glass) "nuQ" = ( /obj/structure/surface/table/almayer{ dir = 1; @@ -24767,6 +24943,13 @@ /obj/structure/girder, /turf/open/floor/prison/blue, /area/lv522/indoors/a_block/admin) +"nxk" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/northwest, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/asphalt/cement, +/area/lv522/landing_zone_1) "nxF" = ( /obj/structure/machinery/light/small, /turf/open/floor/plating, @@ -24831,6 +25014,20 @@ /obj/effect/landmark/lv624/fog_blocker/short, /turf/closed/wall/strata_outpost, /area/lv522/landing_zone_1/tunnel/far) +"nzO" = ( +/obj/structure/cable/heavyduty{ + icon_state = "4-8" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/platform/metal/almayer, +/turf/open/floor/plating, +/area/lv522/outdoors/colony_streets/central_streets) "nzU" = ( /obj/structure/barricade/deployable, /turf/open/floor/prison/floor_plate, @@ -24921,11 +25118,26 @@ /obj/effect/spawner/gibspawner/xeno, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) +"nCK" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/prison/floor_plate, +/area/lv522/outdoors/colony_streets/south_east_street) "nCZ" = ( /obj/item/stack/rods, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/blue_plate/north, /area/lv522/indoors/a_block/hallway) +"nDd" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/stair_cut/platform_right, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/central_streets) "nDl" = ( /turf/open/floor/shiva/radiator_tile2, /area/lv522/indoors/a_block/bridges/garden_bridge) @@ -24936,13 +25148,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/bridges/garden_bridge) -"nDt" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/structure/platform, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/landing_zone_2) "nDI" = ( /obj/structure/closet/crate/trashcart, /obj/item/trash/wy_chips_pepper, @@ -24965,7 +25170,12 @@ }, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) +"nEh" = ( +/obj/item/stack/sheet/metal, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/containers) "nEq" = ( +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/landing_zone_1/ceiling) "nEX" = ( @@ -24977,22 +25187,9 @@ "nEY" = ( /turf/open/floor/corsat/marked, /area/lv522/indoors/lone_buildings/engineering) -"nFc" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/indoors/a_block/corpo/glass) "nFj" = ( /turf/open/floor/plating, /area/lv522/landing_zone_1) -"nFt" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/indoors/a_block/corpo/glass) "nFM" = ( /obj/effect/landmark/objective_landmark/science, /obj/effect/decal/cleanable/dirt, @@ -25013,12 +25210,6 @@ /obj/structure/machinery/power/port_gen/pacman, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/nw_rockies) -"nGc" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/indoors/a_block/corpo/glass) "nGe" = ( /obj/structure/cargo_container/kelland/left, /turf/open/auto_turf/sand_white/layer0, @@ -25052,8 +25243,13 @@ /area/lv522/indoors/a_block/admin) "nGJ" = ( /obj/structure/cargo_container/kelland/right, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/auto_turf/shale/layer1, /area/lv522/landing_zone_1) +"nGO" = ( +/obj/structure/platform_decoration/stone/strata, +/turf/closed/wall/strata_ice/dirty, +/area/lv522/oob) "nGU" = ( /turf/open/floor/corsat/browncorner/west, /area/lv522/atmos/east_reactor/south) @@ -25068,6 +25264,20 @@ /obj/structure/barricade/sandbags, /turf/open/asphalt/cement/cement14, /area/lv522/outdoors/colony_streets/north_street) +"nHq" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/cable/heavyduty{ + icon_state = "1-2" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/plating, +/area/lv522/indoors/lone_buildings/engineering) "nHA" = ( /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/cargo) @@ -25116,6 +25326,10 @@ /obj/structure/machinery/light/double, /turf/open/floor/corsat/marked, /area/lv522/indoors/c_block/mining) +"nIR" = ( +/obj/structure/platform/metal/almayer, +/turf/open/asphalt/cement, +/area/lv522/indoors/lone_buildings/engineering) "nJr" = ( /obj/structure/barricade/wooden{ dir = 8 @@ -25152,10 +25366,6 @@ /obj/structure/machinery/light/small, /turf/open/floor/prison/darkredfull2, /area/lv522/indoors/a_block/kitchen/glass) -"nKm" = ( -/obj/structure/platform_decoration, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/north_street) "nKo" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -25165,16 +25375,10 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/security/glass) -"nKK" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/stairs/perspective{ - dir = 5; - icon_state = "p_stair_full" - }, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/garage) +"nKr" = ( +/obj/structure/platform_decoration/stone/strata, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/oob) "nKS" = ( /obj/structure/closet/secure_closet/marshal, /obj/effect/decal/cleanable/dirt, @@ -25208,6 +25412,12 @@ "nLF" = ( /turf/open/asphalt/cement/cement2, /area/lv522/outdoors/colony_streets/north_west_street) +"nLJ" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/northwest, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_east_street) "nLW" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 8 @@ -25216,6 +25426,7 @@ /area/lv522/indoors/a_block/dorm_north) "nMc" = ( /obj/structure/largecrate, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/auto_turf/shale/layer1, /area/lv522/landing_zone_1) "nMd" = ( @@ -25236,6 +25447,10 @@ /obj/item/ammo_box/magazine/l42a, /turf/open/floor/prison/darkredfull2, /area/lv522/indoors/a_block/security) +"nMv" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/auto_turf/shale/layer2, +/area/lv522/outdoors/colony_streets/central_streets) "nMw" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 @@ -25338,17 +25553,6 @@ }, /turf/open/floor/corsat/brown/southwest, /area/lv522/atmos/east_reactor/south) -"nOl" = ( -/obj/effect/decal/cleanable/blood/drip, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison/floor_plate, -/area/lv522/indoors/a_block/dorms) "nOB" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, @@ -25368,16 +25572,6 @@ }, /turf/open/floor/corsat/marked, /area/lv522/indoors/c_block/mining) -"nPb" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 6 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/landing_zone_2) "nPc" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -25395,15 +25589,6 @@ /obj/effect/landmark/lv624/fog_blocker/short, /turf/open/asphalt/cement/cement1, /area/lv522/outdoors/colony_streets/south_west_street) -"nPn" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/plating, -/area/lv522/landing_zone_forecon/UD6_Tornado) "nPo" = ( /obj/item/prop/alien/hugger, /obj/effect/decal/cleanable/dirt, @@ -25420,26 +25605,12 @@ }, /turf/open/floor/prison/darkredfull2, /area/lv522/indoors/a_block/security) -"nPL" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/turf/open/floor/prison/blue_plate/north, -/area/lv522/indoors/a_block/admin) "nPN" = ( /turf/closed/shuttle/dropship3/tornado, /area/lv522/landing_zone_forecon/UD6_Tornado) "nPV" = ( /turf/open/asphalt/cement/cement2, /area/lv522/outdoors/colony_streets/north_street) -"nQa" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/asphalt/cement/cement14, -/area/lv522/outdoors/colony_streets/north_east_street) "nQk" = ( /obj/structure/barricade/deployable{ dir = 1 @@ -25466,10 +25637,6 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_street) -"nQz" = ( -/obj/structure/platform_decoration, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/landing_zone_1) "nQG" = ( /obj/item/stack/sheet/wood, /turf/open/floor/prison, @@ -25521,15 +25688,6 @@ /obj/structure/prop/ice_colony/ground_wire, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) -"nRy" = ( -/obj/structure/machinery/colony_floodlight{ - layer = 4.3 - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/south_street) "nRC" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cargo_container/kelland/right, @@ -25634,11 +25792,6 @@ "nTv" = ( /turf/closed/wall/strata_outpost, /area/lv522/indoors/a_block/bridges/dorms_fitness) -"nTD" = ( -/obj/structure/platform, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison, -/area/lv522/indoors/a_block/kitchen) "nTF" = ( /obj/effect/landmark/lv624/fog_blocker/short, /turf/closed/wall/strata_outpost, @@ -25656,6 +25809,10 @@ /obj/structure/cargo_container/wy/left, /turf/open/floor/prison, /area/lv522/landing_zone_1) +"nUn" = ( +/obj/structure/platform/metal/almayer, +/turf/open/asphalt/cement/cement4, +/area/lv522/outdoors/colony_streets/south_east_street) "nUD" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 @@ -25701,19 +25858,6 @@ /obj/effect/decal/cleanable/liquid_fuel, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_street) -"nVR" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/outdoors/colony_streets/south_east_street) "nVW" = ( /turf/open/floor/corsat/brown, /area/lv522/atmos/east_reactor) @@ -25789,16 +25933,6 @@ }, /turf/open/floor/strata/white_cyan3/east, /area/lv522/indoors/a_block/medical/glass) -"nWK" = ( -/obj/structure/machinery/suit_storage_unit/compression_suit/uscm{ - name = "Suit Storage Unit"; - pixel_x = 3 - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/prison/darkpurplefull2, -/area/lv522/indoors/a_block/dorms) "nXi" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -25821,13 +25955,6 @@ }, /turf/open/floor/prison/greenfull, /area/lv522/indoors/a_block/fitness) -"nXC" = ( -/obj/item/tool/wrench, -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/garage) "nXK" = ( /obj/structure/barricade/wooden{ dir = 8; @@ -25888,20 +26015,6 @@ /obj/structure/cargo_container/wy/mid, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/nw_rockies) -"nYQ" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/outdoors/colony_streets/south_east_street) "nYU" = ( /obj/effect/acid_hole, /obj/effect/landmark/lv624/fog_blocker/short, @@ -25914,11 +26027,6 @@ }, /turf/open/floor/prison, /area/lv522/indoors/c_block/casino) -"nZd" = ( -/obj/structure/platform, -/obj/effect/decal/cleanable/generic, -/turf/open/floor/prison, -/area/lv522/indoors/a_block/kitchen) "nZv" = ( /obj/structure/machinery/conveyor{ dir = 4; @@ -26003,6 +26111,10 @@ icon_state = "40" }, /area/lv522/landing_zone_forecon/UD6_Tornado) +"obl" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_east_street) "obt" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/telecomms/bus/preset_one, @@ -26014,6 +26126,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/a_block/admin) +"ocl" = ( +/obj/structure/stairs/perspective{ + dir = 6; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/prison, +/area/lv522/indoors/c_block/mining) "ocn" = ( /obj/structure/pipes/standard/manifold/hidden/green, /turf/open/floor/plating/plating_catwalk/prison, @@ -26022,6 +26142,12 @@ /obj/structure/machinery/disposal, /turf/open/floor/prison/floor_plate, /area/lv522/indoors/a_block/corpo/glass) +"ocL" = ( +/obj/structure/reagent_dispensers/watertank, +/obj/structure/platform_decoration/metal/almayer/west, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison/darkbrownfull2, +/area/lv522/indoors/c_block/cargo) "oda" = ( /obj/structure/prop/invuln/minecart_tracks, /obj/structure/closet/crate/miningcar{ @@ -26131,15 +26257,6 @@ /obj/effect/spawner/gibspawner/xeno, /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms) -"oeN" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel/far) "oeT" = ( /obj/structure/pipes/vents/pump, /obj/structure/machinery/light{ @@ -26192,12 +26309,6 @@ }, /turf/open/floor/plating, /area/lv522/landing_zone_1/tunnel) -"ofZ" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/prison/darkbrownfull2, -/area/lv522/indoors/c_block/cargo) "oga" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/decal/cleanable/dirt, @@ -26250,17 +26361,6 @@ /obj/structure/machinery/door/airlock/almayer/maint, /turf/open/floor/corsat/marked, /area/lv522/indoors/c_block/mining) -"ogX" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/liquid_fuel, -/turf/open/floor/prison/darkredfull2, -/area/lv522/indoors/a_block/kitchen) "ogZ" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/mouse, @@ -26309,19 +26409,17 @@ "oim" = ( /turf/open/floor/corsat/brown, /area/lv522/atmos/command_centre) -"oiA" = ( -/turf/open/asphalt/cement/cement2, -/area/lv522/outdoors/colony_streets/north_east_street) -"oiC" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, +"oiq" = ( /obj/structure/stairs/perspective{ - dir = 9; + dir = 4; icon_state = "p_stair_full" }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/landing_zone_1) +/obj/structure/platform/metal/almayer, +/turf/open/floor/prison/floor_plate, +/area/lv522/indoors/a_block/bridges/dorms_fitness) +"oiA" = ( +/turf/open/asphalt/cement/cement2, +/area/lv522/outdoors/colony_streets/north_east_street) "oiD" = ( /obj/structure/machinery/light/double/blue{ dir = 4; @@ -26342,6 +26440,7 @@ /turf/open/floor/corsat/squares, /area/lv522/atmos/east_reactor/south) "oiY" = ( +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/asphalt/cement/cement14, /area/lv522/landing_zone_1) "oiZ" = ( @@ -26355,6 +26454,7 @@ /obj/structure/machinery/space_heater/radiator/red{ dir = 4 }, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) "ojn" = ( @@ -26398,6 +26498,21 @@ }, /turf/open/floor/corsat/marked, /area/lv522/indoors/c_block/bridge) +"ojR" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/asphalt/cement/cement3, +/area/lv522/outdoors/colony_streets/south_west_street) +"ojT" = ( +/obj/structure/platform_decoration/metal/almayer, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/prison/floor_plate, +/area/lv522/outdoors/colony_streets/east_central_street) "ojW" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, @@ -26442,6 +26557,14 @@ }, /turf/open/floor/prison, /area/lv522/indoors/a_block/admin) +"olO" = ( +/obj/item/stack/tile/plasteel{ + name = "ceiling tile"; + pixel_x = -2; + pixel_y = 1 + }, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/containers) "oml" = ( /turf/open/floor/prison/blue_plate/north, /area/lv522/indoors/a_block/hallway) @@ -26455,6 +26578,7 @@ pixel_x = 9; pixel_y = 4 }, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) "omT" = ( @@ -26466,16 +26590,6 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/south_west_street) -"omX" = ( -/obj/structure/platform, -/obj/effect/decal/cleanable/blood/oil, -/obj/structure/surface/rack, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/garage) -"onj" = ( -/obj/structure/platform, -/turf/open/asphalt/cement/cement4, -/area/lv522/outdoors/colony_streets/north_east_street) "onT" = ( /obj/structure/largecrate/random, /obj/effect/decal/cleanable/dirt, @@ -26516,9 +26630,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/bridges/corpo) -"opp" = ( -/turf/closed/wall/shiva/prefabricated/reinforced, -/area/lv522/atmos/cargo_intake) "opt" = ( /obj/item/storage/backpack/marine/satchel{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; @@ -26544,22 +26655,6 @@ /obj/structure/pipes/standard/manifold/fourway/hidden/green, /turf/open/floor/prison, /area/lv522/indoors/a_block/bridges/dorms_fitness) -"opQ" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/ore_box, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/cargo) -"oqn" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/outdoors/colony_streets/north_east_street) "oqp" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -26623,6 +26718,10 @@ }, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) +"orf" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_east_street) "ori" = ( /obj/structure/barricade/deployable{ dir = 4 @@ -26637,12 +26736,6 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison/blue/east, /area/lv522/indoors/a_block/hallway) -"orA" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/gm/river, -/area/lv522/landing_zone_1/tunnel/far) "orE" = ( /obj/item/prop/colony/used_flare, /turf/open/auto_turf/sand_white/layer0, @@ -26682,6 +26775,13 @@ /obj/structure/pipes/standard/manifold/hidden/green, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) +"oso" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/prison/floor_plate, +/area/lv522/indoors/a_block/corpo/glass) "osE" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -26724,10 +26824,6 @@ }, /turf/open/asphalt/cement/cement12, /area/lv522/outdoors/colony_streets/south_east_street) -"otT" = ( -/obj/structure/platform, -/turf/open/floor/prison/darkredfull2, -/area/lv522/indoors/a_block/kitchen) "otY" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -26735,22 +26831,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/strata/cyan2/east, /area/lv522/indoors/a_block/medical/glass) -"oud" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison, -/area/lv522/indoors/a_block/kitchen) -"ouj" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/gm/river, -/area/lv522/outdoors/colony_streets/south_street) "ouv" = ( /obj/structure/pipes/vents/pump, /obj/structure/machinery/camera/autoname, @@ -26791,6 +26871,13 @@ }, /turf/open/gm/river, /area/lv522/indoors/a_block/kitchen/damage) +"ovz" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/central_streets) "ovA" = ( /obj/item/shard{ icon_state = "medium" @@ -26805,14 +26892,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkredfull2, /area/lv522/outdoors/colony_streets/north_street) -"ovT" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/turf/open/floor/prison/floor_plate, -/area/lv522/indoors/a_block/bridges/dorms_fitness) "owe" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -26856,16 +26935,10 @@ }, /turf/open/floor/corsat/marked, /area/lv522/indoors/c_block/mining) -"oxT" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/outdoors/colony_streets/north_east_street) +"oxK" = ( +/obj/structure/cargo_container/wy/left, +/turf/open/floor/prison/floor_marked, +/area/lv522/outdoors/colony_streets/containers) "oyf" = ( /obj/structure/machinery/landinglight/ds1/delaythree{ dir = 4 @@ -26904,6 +26977,7 @@ /area/lv522/indoors/a_block/dorms) "oyY" = ( /obj/structure/largecrate, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "ozk" = ( @@ -26932,16 +27006,6 @@ /obj/effect/landmark/objective_landmark/far, /turf/open/floor/strata/blue1, /area/lv522/indoors/a_block/dorm_north) -"ozQ" = ( -/obj/structure/stairs/perspective{ - dir = 9; - icon_state = "p_stair_full" - }, -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/asphalt/cement/cement4, -/area/lv522/outdoors/colony_streets/north_east_street) "ozR" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/blue/north, @@ -26956,18 +27020,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/blue_plate/north, /area/lv522/indoors/a_block/hallway) -"oAu" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 9 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) "oAJ" = ( /obj/structure/bookcase{ density = 0; @@ -27058,6 +27110,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/floor_marked/southwest, /area/lv522/landing_zone_2/ceiling) +"oEC" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 8; + pixel_x = -6; + pixel_y = 6 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/platform/metal/almayer, +/turf/open/gm/river, +/area/lv522/landing_zone_1/tunnel/far) "oFr" = ( /obj/structure/machinery/light{ dir = 8 @@ -27190,6 +27252,10 @@ /obj/item/stack/sheet/metal/large_stack, /turf/open/floor/plating/platebot, /area/lv522/indoors/c_block/cargo) +"oIf" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/asphalt/cement/cement12, +/area/lv522/outdoors/colony_streets/south_street) "oIr" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/floor_plate, @@ -27197,6 +27263,10 @@ "oIu" = ( /turf/open/asphalt/cement/cement1, /area/lv522/outdoors/colony_streets/south_street) +"oIx" = ( +/obj/structure/largecrate/random/barrel/true_random, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/containers) "oIE" = ( /obj/structure/machinery/door/airlock/almayer/generic{ name = "Showeroom" @@ -27261,16 +27331,6 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/south_street) -"oKc" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 6 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/landing_zone_1) "oKe" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 1 @@ -27284,16 +27344,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/cargo) -"oKG" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 10 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/landing_zone_1) "oKI" = ( /obj/structure/stairs/perspective{ dir = 1; @@ -27355,14 +27405,6 @@ }, /turf/open/floor/plating, /area/lv522/indoors/a_block/kitchen/damage) -"oLu" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 9 - }, -/obj/structure/machinery/light, -/obj/structure/platform, -/turf/open/floor/prison/floor_plate, -/area/lv522/indoors/a_block/corpo/glass) "oLz" = ( /obj/structure/prop/invuln/ice_prefab/trim{ dir = 8 @@ -27377,6 +27419,11 @@ "oLG" = ( /turf/open/floor/strata/white_cyan2/west, /area/lv522/indoors/a_block/medical) +"oLV" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/cargo) "oLW" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -27449,6 +27496,13 @@ /obj/item/storage/firstaid/adv/empty, /turf/open/floor/prison/floor_plate, /area/lv522/indoors/a_block/hallway) +"oNF" = ( +/obj/structure/machinery/colony_floodlight{ + layer = 4.3 + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/south_street) "oNM" = ( /obj/structure/machinery/light, /turf/open/floor/prison/darkbrownfull2, @@ -27456,6 +27510,10 @@ "oNQ" = ( /turf/open/asphalt/cement/cement4, /area/lv522/outdoors/nw_rockies) +"oOd" = ( +/obj/structure/cargo_container/kelland/left, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/containers) "oOe" = ( /obj/effect/decal/cleanable/dirt, /turf/open/auto_turf/shale/layer2, @@ -27505,6 +27563,7 @@ /obj/structure/bed/chair{ dir = 4 }, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) "oPW" = ( @@ -27512,15 +27571,32 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/bridge) +"oQe" = ( +/obj/structure/largecrate/random/barrel{ + layer = 2.7 + }, +/obj/structure/largecrate/random/barrel{ + layer = 2.9; + pixel_x = 6; + pixel_y = -16 + }, +/obj/structure/largecrate/random/barrel{ + layer = 2.9; + pixel_x = -17; + pixel_y = -9 + }, +/obj/structure/blocker/invisible_wall, +/obj/structure/prop/invuln/fire{ + pixel_x = -3; + pixel_y = 6 + }, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/containers) "oQt" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/athletic_mixed, /turf/open/floor/strata/blue1, /area/lv522/indoors/a_block/dorm_north) -"oQC" = ( -/obj/structure/platform_decoration, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) "oQH" = ( /obj/effect/decal/cleanable/dirt, /turf/closed/wall/strata_outpost, @@ -27558,6 +27634,7 @@ /obj/structure/machinery/light{ dir = 4 }, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) "oRU" = ( @@ -27577,6 +27654,12 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) +"oSk" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/northwest, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_2) "oSA" = ( /obj/structure/surface/rack, /obj/item/tool/pickaxe, @@ -27593,17 +27676,6 @@ "oSH" = ( /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/bridges) -"oTc" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform/stair_cut, -/turf/open/floor/prison/floor_plate, -/area/lv522/indoors/a_block/bridges/dorms_fitness) "oTd" = ( /obj/structure/cargo_container/ferret/mid, /turf/open/asphalt/cement/cement4, @@ -27688,6 +27760,7 @@ /obj/structure/machinery/space_heater/radiator/red{ dir = 8 }, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) "oVL" = ( @@ -27797,24 +27870,6 @@ /obj/structure/cargo_container/kelland/left, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/east_central_street) -"oYa" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/turf/open/floor/prison/floor_plate, -/area/lv522/indoors/a_block/bridges/dorms_fitness) -"oYO" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/landing_zone_2) "oYZ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkredfull2, @@ -27824,10 +27879,10 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison/greenfull, /area/lv522/indoors/a_block/fitness) -"oZN" = ( -/obj/structure/platform, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) +"oZK" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/gm/river, +/area/lv522/landing_zone_1/tunnel/far) "pab" = ( /obj/structure/machinery/landinglight/ds2/delayone, /obj/effect/decal/cleanable/dirt, @@ -27909,19 +27964,6 @@ "pcV" = ( /turf/open/floor/plating, /area/lv522/oob) -"pdp" = ( -/obj/structure/prop/invuln/overhead_pipe{ - dir = 8; - pixel_x = -6; - pixel_y = 6 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/platform, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/gm/river, -/area/lv522/landing_zone_1/tunnel/far) "pdq" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper B-Block - Hydroponics Airlock"; @@ -27945,18 +27987,11 @@ }, /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms) -"pdv" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/outdoors/colony_streets/north_east_street) +"pdx" = ( +/obj/structure/platform_decoration/metal/almayer, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/asphalt/cement/cement2, +/area/lv522/landing_zone_1) "pdB" = ( /obj/structure/machinery/space_heater/radiator/red{ dir = 4 @@ -27988,26 +28023,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/hallway) -"pet" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/obj/structure/stairs/perspective{ - dir = 9; - icon_state = "p_stair_full" - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) "pez" = ( /obj/structure/cargo_container/horizontal/blue/top, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) -"peM" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/gm/river, -/area/lv522/landing_zone_1/tunnel/far) "peS" = ( /obj/structure/surface/table/almayer{ dir = 1; @@ -28038,6 +28058,14 @@ }, /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms) +"pfk" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_2) "pfq" = ( /obj/structure/machinery/camera/autoname{ dir = 1; @@ -28077,6 +28105,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/blue_plate/north, /area/lv522/indoors/a_block/bridges/garden_bridge) +"pfJ" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/central_streets) "pfN" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/hallway) @@ -28109,15 +28141,6 @@ }, /turf/open/floor/strata/white_cyan2/west, /area/lv522/indoors/a_block/dorms) -"pgp" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/outdoors/colony_streets/north_east_street) "pgs" = ( /obj/effect/spawner/gibspawner/xeno, /obj/effect/decal/cleanable/generic, @@ -28127,19 +28150,6 @@ /obj/structure/machinery/disposal, /turf/open/floor/prison/darkredfull2, /area/lv522/indoors/a_block/security) -"pgG" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/outdoors/colony_streets/north_east_street) "pha" = ( /obj/structure/bed/chair{ can_buckle = 0; @@ -28198,20 +28208,10 @@ }, /turf/open/floor/wood, /area/lv522/indoors/a_block/fitness/glass) -"piY" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/cargo) -"pjm" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/decal/cleanable/cobweb, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/cargo) +"pjn" = ( +/obj/structure/cargo_container/wy/mid, +/turf/open/floor/prison/floor_marked, +/area/lv522/outdoors/colony_streets/containers) "pjM" = ( /obj/effect/spawner/gibspawner/xeno, /turf/open/floor/prison/darkpurple2/north, @@ -28243,10 +28243,6 @@ }, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/mining) -"pka" = ( -/obj/structure/platform_decoration, -/turf/open/floor/prison/darkbrownfull2, -/area/lv522/indoors/c_block/cargo) "pkB" = ( /turf/closed/shuttle/dropship3/tornado{ icon_state = "9" @@ -28267,14 +28263,6 @@ /obj/item/prop/colony/used_flare, /turf/open/floor/prison, /area/lv522/indoors/a_block/kitchen) -"plN" = ( -/obj/structure/platform, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/outdoors/colony_streets/east_central_street) "pme" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/space_heater/radiator/red{ @@ -28288,6 +28276,10 @@ }, /turf/open/floor/prison/blue_plate/north, /area/lv522/indoors/a_block/hallway) +"pnb" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/north_street) "png" = ( /obj/structure/cargo_container/wy/mid{ health = 5000 @@ -28334,6 +28326,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/a_block/hallway) +"poS" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform/metal/almayer/west, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/ceiling) "poZ" = ( /obj/structure/cargo_container/kelland/right, /turf/open/auto_turf/sand_white/layer0, @@ -28384,12 +28385,20 @@ /obj/item/prop/colony/used_flare, /turf/open/asphalt/cement/cement1, /area/lv522/outdoors/colony_streets/north_street) +"ppZ" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/asphalt/cement/cement12, +/area/lv522/indoors/lone_buildings/engineering) "pqj" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/spacecash/c1000, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/casino) +"pqo" = ( +/obj/structure/barricade/deployable, +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/containers) "pqA" = ( /obj/structure/surface/table/almayer, /obj/effect/landmark/objective_landmark/close, @@ -28442,28 +28451,6 @@ /obj/structure/prop/almayer/computers/sensor_computer2, /turf/open/floor/prison/blue_plate, /area/lv522/indoors/a_block/admin) -"prU" = ( -/obj/structure/stairs/perspective{ - dir = 5; - icon_state = "p_stair_full" - }, -/obj/item/weapon/gun/pistol/m1911{ - current_mag = null - }, -/obj/item/prop{ - desc = "Holy shit"; - icon = 'icons/mob/humans/species/r_human.dmi'; - icon_state = "l_arm"; - name = "left arm"; - pixel_x = -4; - pixel_y = 10 - }, -/obj/item/ammo_magazine/pistol/m1911{ - current_rounds = 4 - }, -/obj/structure/platform_decoration, -/turf/open/asphalt/cement/cement4, -/area/lv522/outdoors/colony_streets/north_east_street) "prW" = ( /obj/structure/surface/table/almayer, /obj/item/newspaper{ @@ -28513,22 +28500,6 @@ /obj/structure/machinery/disposal, /turf/open/floor/strata/multi_tiles, /area/lv522/indoors/c_block/mining) -"pul" = ( -/obj/item/ammo_magazine/pistol/m1911{ - pixel_x = 9; - pixel_y = 12 - }, -/obj/structure/platform, -/turf/open/asphalt/cement/cement4, -/area/lv522/outdoors/colony_streets/north_east_street) -"pum" = ( -/obj/structure/stairs/perspective{ - dir = 5; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/cargo) "puu" = ( /obj/structure/machinery/cm_vending/sorted/medical/no_access, /turf/open/floor/strata/white_cyan3/west, @@ -28558,6 +28529,9 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_2) +"pvZ" = ( +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/containers) "pwa" = ( /turf/open/auto_turf/shale/layer1, /area/lv522/landing_zone_1) @@ -28568,12 +28542,6 @@ }, /turf/open/floor/prison/darkpurple2/north, /area/lv522/indoors/a_block/dorms) -"pwu" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/prison, -/area/lv522/indoors/c_block/cargo) "pwz" = ( /obj/structure/cargo_container/horizontal/blue/middle, /turf/open/auto_turf/shale/layer1, @@ -28618,6 +28586,14 @@ "pxN" = ( /turf/open/floor/corsat/brown/west, /area/lv522/atmos/east_reactor) +"pxO" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/turf/open/asphalt/cement, +/area/lv522/indoors/lone_buildings/engineering) "pxS" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison/floor_plate, @@ -28627,6 +28603,12 @@ icon_state = "95" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) +"pxZ" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/containers) "pys" = ( /turf/closed/shuttle/dropship3/tornado{ icon_state = "97" @@ -28645,6 +28627,18 @@ icon_state = "99" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) +"pyQ" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/largecrate/random{ + layer = 2.9 + }, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/cargo) +"pyR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/prison/floor_plate, +/area/lv522/indoors/a_block/corpo/glass) "pzj" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/drinks/cans/beer{ @@ -28852,6 +28846,22 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/garage) +"pEq" = ( +/obj/item/ammo_magazine/m2c{ + current_rounds = 0; + layer = 4.2; + pixel_x = 1; + pixel_y = 11 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/closed/wall/strata_ice/dirty, +/area/lv522/outdoors/colony_streets/containers) "pEu" = ( /obj/structure/machinery/space_heater/radiator/red{ dir = 8 @@ -28875,31 +28885,11 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) -"pET" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel) "pFw" = ( /obj/structure/cargo_container/horizontal/blue/middle, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) -"pFF" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/indoors/a_block/garden) "pFH" = ( /obj/structure/stairs/perspective{ dir = 1; @@ -28912,6 +28902,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkredfull2, /area/lv522/indoors/a_block/security) +"pFY" = ( +/obj/structure/platform_decoration/metal/almayer, +/obj/item/reagent_container/food/drinks/flask/marine, +/obj/effect/landmark/survivor_spawner, +/turf/open/floor/prison/blue_plate/north, +/area/lv522/indoors/a_block/admin) "pGg" = ( /obj/structure/bed/chair{ dir = 8 @@ -28962,30 +28958,10 @@ "pGQ" = ( /turf/open/floor/prison/cell_stripe/west, /area/lv522/atmos/reactor_garage) -"pGY" = ( -/obj/effect/decal/cleanable/blood/xeno, -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 5 - }, +"pHA" = ( +/obj/structure/platform_decoration/metal/almayer/east, /turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/north_east_street) -"pHi" = ( -/obj/structure/prop/invuln/overhead_pipe{ - dir = 8; - pixel_x = -6; - pixel_y = 6 - }, -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel/far) +/area/lv522/outdoors/colony_streets/south_west_street) "pHT" = ( /turf/open/floor/corsat/brown, /area/lv522/atmos/east_reactor/west) @@ -29106,6 +29082,11 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) +"pLK" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison/darkbrownfull2, +/area/lv522/indoors/c_block/garage) "pLT" = ( /obj/item/reagent_container/glass/bucket/janibucket{ desc = "It's a large bucket that fits in a janitorial cart. Holds 500 units. The lip is stained."; @@ -29172,17 +29153,6 @@ }, /turf/open/floor/prison, /area/lv522/indoors/a_block/kitchen) -"pNJ" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform/stair_cut, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/prison/greenfull/east, -/area/lv522/indoors/b_block/bridge) "pNY" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, @@ -29273,11 +29243,29 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/strata/white_cyan2/west, /area/lv522/indoors/a_block/dorms) +"pQo" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/prison/floor_plate, +/area/lv522/outdoors/colony_streets/north_east_street) "pQq" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/firecloset/full, /turf/open/floor/plating, /area/lv522/landing_zone_1/tunnel/far) +"pQv" = ( +/obj/item/weapon/twohanded/folded_metal_chair, +/obj/item/prop/alien/hugger{ + pixel_y = 14 + }, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/containers) "pQx" = ( /obj/structure/closet/firecloset/full, /turf/open/floor/prison/darkbrownfull2, @@ -29296,6 +29284,7 @@ start_charge = 20 }, /obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) "pQN" = ( @@ -29309,6 +29298,17 @@ /obj/structure/surface/table/almayer, /turf/open/floor/prison/darkyellowfull2/east, /area/lv522/indoors/lone_buildings/outdoor_bot) +"pQO" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/prison/floor_plate, +/area/lv522/outdoors/colony_streets/east_central_street) "pQQ" = ( /obj/structure/prop/ice_colony/dense/planter_box{ dir = 9 @@ -29363,18 +29363,10 @@ "pRT" = ( /turf/open/floor/corsat/brown/west, /area/lv522/atmos/west_reactor) -"pRY" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 9 - }, -/turf/open/gm/river, -/area/lv522/indoors/c_block/mining) +"pSd" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_1) "pSs" = ( /obj/structure/machinery/light{ dir = 4 @@ -29385,6 +29377,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/strata/white_cyan2/west, /area/lv522/indoors/a_block/dorms) +"pSF" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/asphalt/cement/cement12, +/area/lv522/outdoors/colony_streets/central_streets) "pTa" = ( /obj/structure/prop/vehicles/crawler{ layer = 3.1 @@ -29398,6 +29394,11 @@ "pTl" = ( /turf/open/floor/shiva/radiator_tile2, /area/lv522/indoors/a_block/bridges/op_centre) +"pTo" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/machinery/colony_floodlight, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/north_east_street) "pTB" = ( /obj/structure/surface/table/almayer, /obj/item/trash/plate, @@ -29465,27 +29466,10 @@ "pUv" = ( /turf/open/asphalt/cement/cement9, /area/lv522/outdoors/colony_streets/central_streets) -"pUR" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/stairs/perspective{ - dir = 9; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/cargo) "pVb" = ( /obj/item/prop/colony/used_flare, /turf/open/floor/prison/floor_plate, /area/lv522/outdoors/colony_streets/north_east_street) -"pVn" = ( -/obj/structure/platform_decoration, -/obj/structure/stairs/perspective{ - dir = 5; - icon_state = "p_stair_full" - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) "pVo" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -29533,6 +29517,17 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkbrownfull2, /area/lv522/landing_zone_2/ceiling) +"pWB" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/prison/floor_plate, +/area/lv522/indoors/a_block/garden) "pWR" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 @@ -29573,18 +29568,6 @@ }, /turf/open/floor/strata/white_cyan3/north, /area/lv522/indoors/a_block/medical) -"pXz" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/prop/ice_colony/dense/planter_box{ - dir = 8 - }, -/obj/structure/flora/bush/ausbushes/grassybush{ - pixel_y = 7 - }, -/turf/open/floor/prison/greenfull/east, -/area/lv522/indoors/b_block/bridge) "pXR" = ( /obj/structure/barricade/sandbags, /obj/item/trash/uscm_mre{ @@ -29609,12 +29592,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/blue_plate/north, /area/lv522/indoors/c_block/mining) -"pYN" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) "pYO" = ( /obj/structure/prop/invuln/overhead_pipe{ pixel_x = 6; @@ -29675,6 +29652,10 @@ /obj/item/device/flashlight/lamp/green, /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms) +"qaF" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/floor/prison/blue_plate/north, +/area/lv522/indoors/a_block/admin) "qaT" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_full" @@ -29683,20 +29664,9 @@ /area/lv522/landing_zone_1/tunnel/far) "qbf" = ( /obj/structure/cargo_container/horizontal/blue/bottom, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) -"qbi" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/north_street) -"qbu" = ( -/obj/structure/platform_decoration, -/turf/open/asphalt/cement/cement2, -/area/lv522/outdoors/colony_streets/north_east_street) "qbB" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/camera/autoname{ @@ -29707,12 +29677,6 @@ }, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/mining) -"qbD" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/asphalt/cement/cement9, -/area/lv522/outdoors/colony_streets/north_east_street) "qbG" = ( /obj/effect/decal{ icon = 'icons/mob/xenos/effects.dmi'; @@ -29773,6 +29737,10 @@ /obj/item/tool/wirecutters, /turf/open/floor/prison/blue/north, /area/lv522/indoors/a_block/admin) +"qcp" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/cargo) "qcw" = ( /obj/effect/spawner/gibspawner/human, /obj/effect/decal/cleanable/dirt, @@ -29787,6 +29755,7 @@ /area/lv522/indoors/a_block/kitchen) "qcO" = ( /obj/structure/machinery/photocopier, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/floor_marked/southwest, /area/lv522/landing_zone_1) "qda" = ( @@ -29861,15 +29830,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/corsat/marked, /area/lv522/indoors/c_block/cargo) -"qfD" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/outdoors/colony_streets/north_street) "qfK" = ( /obj/structure/machinery/light{ dir = 1 @@ -29893,6 +29853,18 @@ }, /turf/open/floor/corsat/marked, /area/lv522/indoors/a_block/kitchen) +"qfQ" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/prison/floor_plate, +/area/lv522/outdoors/colony_streets/north_east_street) "qgj" = ( /obj/structure/barricade/wooden{ dir = 8 @@ -30072,6 +30044,13 @@ }, /turf/open/floor/plating, /area/lv522/outdoors/colony_streets/central_streets) +"qlG" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/asphalt/cement/cement3, +/area/lv522/outdoors/colony_streets/north_west_street) "qma" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -30095,6 +30074,10 @@ /obj/item/trash/plate, /turf/open/floor/prison/blue_plate/north, /area/lv522/indoors/a_block/admin) +"qms" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel/far) "qmM" = ( /obj/structure/prop/invuln/fire{ pixel_x = -8; @@ -30104,16 +30087,17 @@ icon_state = "72" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) -"qnb" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 6 +"qni" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/prop/vehicles/crawler{ + dir = 8; + layer = 3.1; + pixel_x = 5; + pixel_y = 7 }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/garage) "qnk" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/overwatch/almayer/broken{ @@ -30207,6 +30191,19 @@ /obj/structure/cargo_container/kelland/right, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_east_street) +"qoZ" = ( +/obj/structure/platform_decoration/stone/strata/west, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/oob) +"qpa" = ( +/obj/structure/platform_decoration/metal/almayer, +/obj/structure/stairs/perspective{ + dir = 5; + icon_state = "p_stair_full" + }, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_1) "qpc" = ( /obj/structure/cargo_container/watatsumi/right, /obj/effect/decal/cleanable/dirt, @@ -30319,16 +30316,6 @@ }, /turf/open/floor/prison/darkredfull2, /area/lv522/indoors/a_block/security) -"qqG" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 10 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) "qqJ" = ( /turf/open/floor/corsat/plate, /area/lv522/atmos/reactor_garage) @@ -30337,14 +30324,6 @@ /obj/effect/landmark/xeno_spawn, /turf/open/floor/corsat/plate, /area/lv522/atmos/east_reactor/south) -"qqR" = ( -/obj/structure/platform, -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/indoors/c_block/garage) "qqW" = ( /obj/structure/surface/rack, /obj/effect/decal/cleanable/dirt, @@ -30365,6 +30344,17 @@ }, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/mining) +"qrh" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/prison/floor_plate, +/area/lv522/outdoors/colony_streets/south_east_street) "qrj" = ( /obj/structure/machinery/optable, /turf/open/floor/strata/white_cyan2, @@ -30387,13 +30377,12 @@ }, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorm_north) -"qsr" = ( -/obj/structure/surface/table/almayer, -/obj/item/reagent_container/glass/beaker/vial, -/obj/structure/machinery/cell_charger, -/obj/structure/platform_decoration, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/cargo) +"qsp" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/northeast, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_1) "qst" = ( /obj/structure/girder/displaced, /turf/open/floor/plating, @@ -30403,19 +30392,6 @@ /obj/item/storage/box/beakers, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) -"qsL" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/prop/ice_colony/dense/planter_box{ - dir = 9; - layer = 2.9 - }, -/obj/structure/flora/bush/ausbushes/var3/ywflowers{ - layer = 3 - }, -/turf/open/floor/prison/greenfull/east, -/area/lv522/indoors/b_block/bridge) "qsN" = ( /obj/structure/window_frame/strata, /turf/open/floor/plating, @@ -30427,16 +30403,6 @@ /obj/structure/machinery/light/small, /turf/open/floor/prison/darkpurple2, /area/lv522/indoors/a_block/dorms) -"qsU" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/indoors/a_block/garden) "qsW" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/corsat/marked, @@ -30446,18 +30412,6 @@ icon_state = "74" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) -"qtg" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/outdoors/colony_streets/east_central_street) "qts" = ( /turf/open/floor/platingdmg1, /area/lv522/indoors/a_block/security) @@ -30589,12 +30543,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/greenfull, /area/lv522/indoors/a_block/fitness/glass) -"qxk" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/gm/river, -/area/lv522/landing_zone_1/tunnel) "qxm" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/plating, @@ -30717,15 +30665,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/strata/white_cyan4/north, /area/lv522/indoors/a_block/medical) -"qzE" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) "qzQ" = ( /turf/open/floor/prison, /area/lv522/indoors/b_block/bridge) @@ -30864,6 +30803,10 @@ }, /turf/open/floor/strata/blue1, /area/lv522/indoors/a_block/dorm_north) +"qCM" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/asphalt/cement/cement12, +/area/lv522/landing_zone_2) "qCY" = ( /obj/structure/prop/invuln/ice_prefab{ dir = 9 @@ -30899,16 +30842,6 @@ }, /turf/open/floor/prison, /area/lv522/indoors/a_block/security) -"qDt" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/landing_zone_1) "qDw" = ( /obj/effect/decal/cleanable/generic, /turf/open/floor/prison, @@ -30918,6 +30851,7 @@ dir = 5; icon_state = "p_stair_full" }, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "qDL" = ( @@ -31220,13 +31154,6 @@ }, /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/central_streets) -"qKV" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel/far) "qLa" = ( /obj/structure/barricade/wooden{ dir = 4 @@ -31252,10 +31179,6 @@ /obj/structure/closet/firecloset/full, /turf/open/floor/plating, /area/lv522/landing_zone_1/tunnel) -"qLu" = ( -/obj/structure/platform, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/south_west_street) "qLy" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison/darkpurple2, @@ -31426,6 +31349,13 @@ /obj/item/prop/colony/game, /turf/open/floor/corsat/marked, /area/lv522/indoors/a_block/fitness/glass) +"qOx" = ( +/turf/open/asphalt/cement/cement12, +/area/lv522/outdoors/colony_streets/containers) +"qOO" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/corsat/plate, +/area/lv522/atmos/cargo_intake) "qOQ" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, @@ -31442,10 +31372,6 @@ /obj/item/ammo_box/magazine/misc/mre/empty, /turf/open/asphalt/cement/cement3, /area/lv522/outdoors/colony_streets/north_street) -"qPq" = ( -/obj/structure/platform/strata, -/turf/open/auto_turf/shale/layer1, -/area/lv522/oob) "qPu" = ( /obj/item/weapon/gun/revolver/cmb, /obj/item/clothing/head/soft/sec, @@ -31456,26 +31382,6 @@ /obj/effect/decal/cleanable/generic, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) -"qPL" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform/stair_cut{ - icon_state = "platform_stair_alt" - }, -/obj/structure/prop/invuln/overhead_pipe{ - dir = 8; - pixel_x = -6; - pixel_y = 6 - }, -/obj/structure/prop/invuln/overhead_pipe{ - dir = 8; - pixel_x = 6; - pixel_y = 6 - }, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel/far) "qPT" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/space_heater/radiator/red{ @@ -31492,6 +31398,10 @@ }, /turf/open/floor/carpet, /area/lv522/indoors/a_block/dorm_north) +"qQa" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_2) "qQe" = ( /turf/open/floor/carpet, /area/lv522/indoors/c_block/garage) @@ -31593,13 +31503,6 @@ }, /turf/open/floor/prison/greenfull/east, /area/lv522/indoors/b_block/hydro) -"qRH" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/garage) "qRU" = ( /obj/structure/barricade/deployable{ dir = 1 @@ -31643,6 +31546,14 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/cargo) +"qSO" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_1) "qSP" = ( /turf/closed/shuttle/dropship3/tornado/typhoon{ icon_state = "61" @@ -31657,16 +31568,6 @@ }, /turf/open/floor/prison/greenfull/east, /area/lv522/indoors/b_block/bridge) -"qSW" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/structure/machinery/disposal, -/turf/open/floor/prison/darkbrownfull2, -/area/lv522/indoors/c_block/mining) "qTh" = ( /turf/closed/shuttle/dropship3/tornado/typhoon{ icon_state = "62" @@ -31706,12 +31607,6 @@ }, /turf/open/floor/corsat/marked, /area/lv522/indoors/a_block/kitchen) -"qTH" = ( -/obj/structure/platform_decoration/strata{ - dir = 1 - }, -/turf/open/auto_turf/shale/layer1, -/area/lv522/oob) "qTI" = ( /obj/item/lightstick/red/spoke/planted{ layer = 3.1; @@ -31766,13 +31661,28 @@ "qUL" = ( /turf/open/floor/plating, /area/lv522/outdoors/colony_streets/north_east_street) -"qUQ" = ( -/obj/structure/platform/strata, -/obj/structure/platform/strata{ - dir = 4 +"qUU" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 2; + pixel_y = 1 }, -/turf/open/auto_turf/shale/layer1, -/area/lv522/oob) +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/northwest, +/turf/open/asphalt/cement, +/area/lv522/indoors/lone_buildings/engineering) +"qUY" = ( +/obj/structure/platform_decoration/metal/almayer, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/prison/floor_plate, +/area/lv522/indoors/a_block/garden) "qVb" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -31813,6 +31723,14 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/oob) +"qVP" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/turf/open/floor/prison/floor_plate, +/area/lv522/atmos/way_in_command_centre) "qVQ" = ( /obj/structure/machinery/camera/autoname{ dir = 8 @@ -31844,6 +31762,20 @@ }, /turf/open/floor/corsat/marked, /area/lv522/indoors/a_block/kitchen) +"qWV" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/obj/structure/machinery/camera/autoname{ + dir = 4 + }, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "qWX" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ dir = 8; @@ -31875,17 +31807,23 @@ /obj/structure/closet, /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms) -"qXY" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) +"qXU" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/prison/floor_plate, +/area/lv522/indoors/a_block/corpo/glass) "qYc" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/door/window/eastleft, /turf/open/floor/corsat/marked, /area/lv522/indoors/a_block/fitness/glass) +"qYe" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/prison/floor_plate, +/area/lv522/outdoors/colony_streets/east_central_street) "qYk" = ( /obj/effect/landmark/monkey_spawn, /turf/open/floor/corsat/marked, @@ -31913,6 +31851,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/strata/multi_tiles, /area/lv522/indoors/c_block/mining) +"qYr" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/northeast, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_east_street) "qYt" = ( /obj/item/stack/sheet/metal, /obj/item/shard{ @@ -31948,18 +31892,6 @@ "qYM" = ( /turf/open/floor/corsat/browncorner/north, /area/lv522/atmos/cargo_intake) -"qYP" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 5 - }, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/north_east_street) "qYX" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/flour, @@ -31986,13 +31918,6 @@ /obj/structure/largecrate/random/barrel/yellow, /turf/open/asphalt/cement/cement1, /area/lv522/outdoors/colony_streets/north_east_street) -"qZB" = ( -/obj/structure/platform/strata{ - dir = 8 - }, -/obj/structure/platform/strata, -/turf/open/auto_turf/shale/layer1, -/area/lv522/oob) "qZC" = ( /turf/open/floor/corsat/marked, /area/lv522/indoors/a_block/hallway) @@ -32148,6 +32073,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms/glass) +"rbA" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/asphalt/cement/cement3, +/area/lv522/outdoors/colony_streets/central_streets) "rbL" = ( /obj/structure/surface/rack, /obj/item/clothing/mask/gas, @@ -32181,6 +32110,17 @@ /obj/structure/barricade/deployable, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) +"rcC" = ( +/obj/structure/platform/metal/almayer, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/central_streets) +"rcD" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/asphalt/cement/cement3, +/area/lv522/outdoors/colony_streets/north_east_street) "rcO" = ( /obj/structure/prop/ice_colony/ground_wire{ dir = 1; @@ -32257,6 +32197,10 @@ }, /turf/open/floor/prison/greenfull/east, /area/lv522/indoors/b_block/hydro) +"rdC" = ( +/obj/item/weapon/twohanded/folded_metal_chair, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/containers) "rdF" = ( /obj/structure/closet/crate/medical, /obj/item/tool/portadialysis, @@ -32322,20 +32266,16 @@ "rfe" = ( /turf/open/floor/prison/floor_plate, /area/lv522/indoors/a_block/bridges/corpo) -"rfg" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/outdoors/colony_streets/east_central_street) "rfi" = ( /turf/closed/shuttle/dropship3/tornado{ icon_state = "100" }, /area/lv522/landing_zone_forecon/UD6_Tornado) +"rfj" = ( +/obj/vehicle/train/cargo/trolley, +/obj/effect/landmark/objective_landmark/medium, +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/containers) "rfk" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet, @@ -32398,23 +32338,6 @@ icon_state = "101" }, /area/lv522/landing_zone_forecon/UD6_Tornado) -"rgG" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/turf/open/floor/prison, -/area/lv522/indoors/c_block/cargo) -"rgS" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/structure/barricade/wooden{ - dir = 1 - }, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel/far) "rha" = ( /obj/structure/surface/table/almayer, /obj/item/storage/box/matches{ @@ -32480,18 +32403,6 @@ }, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/casino) -"riZ" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/prop/ice_colony/dense/planter_box{ - dir = 8 - }, -/obj/structure/flora/bush/ausbushes/var3/sunnybush{ - pixel_y = 15 - }, -/turf/open/floor/prison/greenfull/east, -/area/lv522/indoors/b_block/bridge) "rjn" = ( /obj/structure/prop/invuln/ice_prefab/trim{ dir = 6; @@ -32662,6 +32573,7 @@ /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_west_street) "rnT" = ( +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/asphalt/cement/cement12, /area/lv522/landing_zone_1) "rod" = ( @@ -32756,6 +32668,15 @@ "rqE" = ( /turf/open/floor/corsat/marked, /area/lv522/atmos/reactor_garage) +"rqH" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/obj/structure/platform_decoration/metal/almayer/north, +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/prison/blue_plate/north, +/area/lv522/indoors/a_block/admin) "rqP" = ( /obj/structure/stairs/perspective{ dir = 4; @@ -32763,21 +32684,6 @@ }, /turf/open/floor/prison, /area/lv522/indoors/c_block/mining) -"rqT" = ( -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/auto_turf/shale/layer1, -/area/lv522/oob) -"rrf" = ( -/obj/structure/platform, -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice10"; - pixel_x = -2; - pixel_y = -8 - }, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/north_east_street) "rro" = ( /obj/structure/machinery/disposal, /obj/effect/decal/cleanable/dirt, @@ -32885,21 +32791,10 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/c_block/cargo) -"rtA" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, -/area/lv522/landing_zone_forecon/UD6_Tornado) -"rtI" = ( -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/oob) +"rtN" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/prison/floor_plate, +/area/lv522/indoors/a_block/corpo/glass) "rtX" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/strata/blue1, @@ -32922,6 +32817,13 @@ icon_state = "59" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) +"rur" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/plating/platebot, +/area/lv522/indoors/c_block/cargo) "rus" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/cell_stripe/west, @@ -33118,11 +33020,18 @@ }, /turf/open/floor/corsat/marked, /area/lv522/indoors/a_block/hallway) +"ryk" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/decal/cleanable/blood/oil, +/obj/structure/surface/rack, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/garage) "rys" = ( /obj/structure/stairs/perspective{ dir = 4; icon_state = "p_stair_full" }, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "ryu" = ( @@ -33177,6 +33086,7 @@ /area/lv522/oob) "rzz" = ( /obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) "rzG" = ( @@ -33205,10 +33115,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkpurple2/north, /area/lv522/indoors/a_block/dorms) -"rAu" = ( -/obj/structure/platform_decoration, -/turf/open/asphalt/cement/cement2, -/area/lv522/landing_zone_1) +"rAJ" = ( +/obj/item/stack/sheet/metal{ + layer = 2.5; + pixel_x = 1; + pixel_y = 1 + }, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/containers) "rAK" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -33225,26 +33139,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/floor_plate, /area/lv522/indoors/a_block/corpo) -"rBd" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/landing_zone_2) "rBy" = ( /obj/effect/landmark/objective_landmark/medium, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/admin) -"rBz" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/auto_turf/shale/layer1, -/area/lv522/oob) "rBU" = ( /turf/closed/shuttle/dropship3/tornado/typhoon{ icon_state = "41" @@ -33271,12 +33170,6 @@ icon_state = "99" }, /area/lv522/landing_zone_forecon/UD6_Tornado) -"rCu" = ( -/obj/structure/platform_decoration/strata{ - dir = 4 - }, -/turf/open/auto_turf/shale/layer1, -/area/lv522/oob) "rCz" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/atmos/east_reactor/south) @@ -33296,12 +33189,6 @@ icon_state = "17" }, /area/lv522/landing_zone_forecon/UD6_Tornado) -"rCM" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/corsat/marked, -/area/lv522/indoors/c_block/cargo) "rCQ" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -33321,12 +33208,22 @@ icon_state = "53" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) +"rDz" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/decal/cleanable/blood/xeno, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel/far) "rDM" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, /turf/open/floor/prison/floor_plate, /area/lv522/indoors/a_block/hallway) +"rDU" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison/darkbrownfull2, +/area/lv522/indoors/c_block/cargo) "rEc" = ( /obj/structure/surface/table/almayer{ dir = 1; @@ -33355,20 +33252,6 @@ /obj/effect/spawner/gibspawner/human, /turf/open/auto_turf/shale/layer2, /area/lv522/outdoors/nw_rockies) -"rFh" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/outdoors/colony_streets/east_central_street) "rFp" = ( /turf/closed/shuttle/dropship3/tornado/typhoon{ icon_state = "51" @@ -33407,6 +33290,14 @@ /obj/structure/bed/chair/comfy, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) +"rGF" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/turf/open/floor/prison, +/area/lv522/indoors/c_block/cargo) "rGN" = ( /obj/structure/bed/chair/comfy, /obj/structure/pipes/standard/simple/hidden/green{ @@ -33474,6 +33365,7 @@ id = "LZ1_Lockdown_Lo"; name = "Emergency Lockdown" }, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/corsat/marked, /area/lv522/landing_zone_1/ceiling) "rIZ" = ( @@ -33511,16 +33403,6 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) -"rKe" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/outdoors/colony_streets/east_central_street) "rKg" = ( /obj/structure/surface/table/almayer, /obj/item/prop/colony/game, @@ -33638,6 +33520,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/whitegreenfull, /area/lv522/indoors/a_block/fitness) +"rMp" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/stair_cut/platform_right, +/turf/open/floor/prison, +/area/lv522/indoors/c_block/cargo) "rMr" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/camera/autoname{ @@ -33672,16 +33562,22 @@ "rMF" = ( /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/central_streets) +"rMJ" = ( +/obj/item/stack/rods, +/obj/structure/platform/metal/almayer, +/turf/open/asphalt/cement/cement4, +/area/lv522/outdoors/colony_streets/north_east_street) "rMR" = ( /obj/structure/largecrate/random/secure, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) -"rNm" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/oob) +"rNj" = ( +/turf/open/asphalt/cement/cement4, +/area/lv522/outdoors/colony_streets/containers) +"rNo" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/asphalt/cement/cement3, +/area/lv522/outdoors/colony_streets/south_east_street) "rNs" = ( /obj/item/stack/sheet/wood, /turf/open/floor/prison/darkbrownfull2, @@ -33733,17 +33629,6 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_west_street) -"rOw" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 6; - layer = 3.51 - }, -/turf/open/asphalt/cement, -/area/lv522/landing_zone_1) "rOD" = ( /obj/item/storage/surgical_tray, /obj/structure/surface/table/reinforced/prison, @@ -33772,6 +33657,17 @@ }, /turf/open/asphalt/cement/cement4, /area/lv522/outdoors/colony_streets/central_streets) +"rPe" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "UD6"; + name = "\improper Shutters" + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/plating, +/area/lv522/landing_zone_forecon/UD6_Typhoon) "rPu" = ( /obj/structure/machinery/light, /obj/effect/decal/cleanable/dirt, @@ -33798,12 +33694,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/c_block/mining) -"rQL" = ( -/obj/structure/platform_decoration/strata{ - dir = 8 +"rQS" = ( +/obj/structure/barricade/deployable{ + dir = 1 }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/oob) +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/containers) "rRa" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/toy/deck{ @@ -33906,11 +33802,19 @@ /area/lv522/indoors/a_block/admin) "rSh" = ( /obj/structure/largecrate/random/barrel/white, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) "rSs" = ( /turf/open/floor/prison/cell_stripe/east, /area/lv522/indoors/lone_buildings/storage_blocks) +"rSz" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/south_street) "rSG" = ( /obj/item/clothing/shoes/jackboots{ pixel_x = 5; @@ -33933,12 +33837,13 @@ }, /turf/open/floor/prison/greenfull/east, /area/lv522/indoors/b_block/bridge) -"rTf" = ( -/obj/structure/platform_decoration{ - dir = 1 +"rSX" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 }, -/turf/open/asphalt/cement/cement9, -/area/lv522/outdoors/colony_streets/south_east_street) +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/corsat/marked, +/area/lv522/indoors/c_block/cargo) "rTh" = ( /turf/open/floor/corsat/brown/southeast, /area/lv522/atmos/west_reactor) @@ -33949,19 +33854,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/blue_plate/north, /area/lv522/indoors/a_block/bridges/op_centre) -"rUg" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/outdoors/colony_streets/east_central_street) "rUr" = ( /obj/structure/machinery/prop/almayer/computer/PC{ pixel_y = 5 @@ -33969,15 +33861,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/a_block/admin) -"rUS" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/structure/bed/chair/dropship/passenger{ - dir = 8 - }, -/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, -/area/lv522/landing_zone_forecon/UD6_Tornado) "rVa" = ( /obj/structure/machinery/colony_floodlight, /turf/open/asphalt/cement, @@ -34047,23 +33930,12 @@ /obj/structure/machinery/vending/dinnerware, /turf/open/floor/prison/kitchen, /area/lv522/indoors/a_block/kitchen) -"rYi" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/machinery/colony_floodlight, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/north_east_street) -"rYq" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 10 +"rYk" = ( +/obj/item/weapon/gun/rifle/m41a{ + current_mag = null }, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/south_west_street) +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/containers) "rYu" = ( /obj/structure/barricade/deployable{ dir = 8 @@ -34123,15 +33995,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/greenfull, /area/lv522/indoors/a_block/bridges/dorms_fitness) -"rZK" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/south_street) "rZL" = ( /turf/open/floor/prison/floor_plate, /area/lv522/landing_zone_2/ceiling) @@ -34160,10 +34023,6 @@ "saC" = ( /turf/closed/wall/mineral/bone_resin, /area/lv522/oob) -"saL" = ( -/obj/structure/platform, -/turf/open/asphalt/cement, -/area/lv522/landing_zone_1) "saQ" = ( /turf/open/floor/prison/cell_stripe/west, /area/lv522/indoors/lone_buildings/storage_blocks) @@ -34206,13 +34065,6 @@ }, /turf/open/floor/corsat/marked, /area/lv522/indoors/c_block/mining) -"sbh" = ( -/obj/structure/platform_decoration, -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/turf/open/asphalt/cement, -/area/lv522/landing_zone_2/ceiling) "sbj" = ( /obj/effect/decal/cleanable/blood/splatter, /turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, @@ -34229,6 +34081,16 @@ }, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/mining) +"sby" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/platform/metal/almayer/west, +/obj/item/stack/rods, +/turf/open/floor/prison/floor_plate, +/area/lv522/indoors/a_block/corpo/glass) +"sbF" = ( +/obj/structure/platform/metal/almayer, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/south_west_street) "sbG" = ( /turf/closed/shuttle/dropship3/tornado/typhoon{ icon_state = "28" @@ -34340,12 +34202,6 @@ /obj/item/toy/crossbow_ammo, /turf/open/floor/prison/greenfull, /area/lv522/indoors/a_block/fitness/glass) -"seX" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/asphalt/cement/cement9, -/area/lv522/outdoors/colony_streets/south_west_street) "sfc" = ( /obj/structure/surface/table/almayer, /turf/open/floor/corsat/plate, @@ -34355,21 +34211,6 @@ /obj/item/toy/bikehorn, /turf/open/floor/prison/greenfull, /area/lv522/indoors/a_block/fitness/glass) -"sfI" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) -"sfO" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/landing_zone_2) "sfZ" = ( /obj/structure/prop/invuln/fire{ pixel_x = 10; @@ -34434,6 +34275,13 @@ }, /turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_up_to_down, /area/lv522/landing_zone_forecon/UD6_Typhoon) +"shl" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/prison, +/area/lv522/indoors/c_block/cargo) "shm" = ( /obj/structure/machinery/vending/cola, /obj/effect/decal/cleanable/dirt, @@ -34506,6 +34354,7 @@ /obj/item/key/cargo_train{ icon_state = "keys" }, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) "sje" = ( @@ -34584,6 +34433,16 @@ }, /turf/open/floor/corsat/brown/east, /area/lv522/atmos/east_reactor/south) +"skC" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/prop/ice_colony/dense/planter_box{ + dir = 8 + }, +/obj/structure/flora/bush/ausbushes/grassybush{ + pixel_y = 7 + }, +/turf/open/floor/prison/greenfull/east, +/area/lv522/indoors/b_block/bridge) "skE" = ( /turf/closed/shuttle/dropship3/tornado{ icon_state = "63" @@ -34604,16 +34463,6 @@ }, /turf/open/floor/prison/kitchen, /area/lv522/indoors/b_block/bar) -"slq" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/structure/stairs/perspective{ - dir = 6; - icon_state = "p_stair_full" - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/landing_zone_2) "slD" = ( /obj/structure/prop/invuln/ice_prefab/trim{ dir = 6 @@ -34656,6 +34505,13 @@ }, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) +"smo" = ( +/obj/item/weapon/gun/pistol/m1911{ + current_mag = null + }, +/obj/effect/decal/cleanable/blood, +/turf/open/asphalt/cement/cement1, +/area/lv522/outdoors/colony_streets/containers) "smr" = ( /obj/structure/prop/server_equipment/yutani_server/broken, /obj/structure/machinery/light{ @@ -34713,6 +34569,13 @@ "snX" = ( /turf/closed/wall/strata_outpost, /area/lv522/landing_zone_2/ceiling) +"soh" = ( +/obj/structure/barricade/deployable{ + dir = 8 + }, +/obj/structure/barricade/deployable, +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/containers) "sol" = ( /obj/structure/machinery/landinglight/ds2/delayone, /turf/open/floor/plating, @@ -34795,15 +34658,6 @@ /obj/structure/machinery/light, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/cargo) -"spW" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/outdoors/colony_streets/south_east_street) "sqd" = ( /turf/open/floor/prison/floor_plate, /area/lv522/indoors/b_block/bridge) @@ -34933,6 +34787,10 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/auto_turf/shale/layer2, /area/lv522/outdoors/nw_rockies) +"suy" = ( +/obj/structure/cargo_container/horizontal/blue/bottom, +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/containers) "suF" = ( /obj/structure/bed/chair{ dir = 4 @@ -34984,16 +34842,17 @@ }, /turf/open/floor/prison, /area/lv522/indoors/a_block/admin) -"svG" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/landing_zone_2) "svK" = ( /obj/structure/largecrate/random/barrel/blue, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_east_street) +"svQ" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/prison/floor_plate, +/area/lv522/outdoors/colony_streets/north_east_street) "svW" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 4; @@ -35001,6 +34860,14 @@ }, /turf/open/floor/corsat/marked, /area/lv522/indoors/lone_buildings/storage_blocks) +"swj" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/structure/stairs/perspective{ + dir = 10; + icon_state = "p_stair_full" + }, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_2) "swr" = ( /turf/closed/shuttle/dropship3/tornado{ icon_state = "45" @@ -35087,6 +34954,14 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) +"syF" = ( +/obj/structure/prop/dam/crane/damaged, +/obj/structure/platform/metal/almayer, +/obj/item/prop/colony/canister{ + pixel_y = 22 + }, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/garage) "syH" = ( /obj/structure/stairs/perspective{ dir = 9; @@ -35098,6 +34973,7 @@ /obj/structure/machinery/door/airlock/almayer/generic{ dir = 2 }, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/corsat/marked, /area/lv522/landing_zone_1/ceiling) "syW" = ( @@ -35121,16 +34997,19 @@ /obj/structure/barricade/deployable, /turf/open/floor/prison/darkredfull2, /area/lv522/outdoors/colony_streets/north_street) -"szo" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/asphalt/cement/cement1, -/area/lv522/outdoors/colony_streets/south_west_street) +"szm" = ( +/obj/structure/cargo_container/arious/rightmid, +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/containers) "szJ" = ( /obj/structure/machinery/medical_pod/sleeper, /turf/open/floor/strata/white_cyan1/east, /area/lv522/indoors/a_block/medical) +"szQ" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/cargo) "szT" = ( /obj/structure/ore_box, /turf/open/asphalt/cement/cement3, @@ -35160,18 +35039,6 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/bridges/op_centre) -"sAt" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 5 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/landing_zone_2) "sAx" = ( /obj/structure/surface/table/almayer, /obj/structure/flora/pottedplant{ @@ -35211,20 +35078,6 @@ }, /turf/open/floor/corsat/marked, /area/lv522/indoors/lone_buildings/storage_blocks) -"sBX" = ( -/obj/structure/cargo_container/wy/right, -/turf/open/floor/prison, -/area/lv522/outdoors/colony_streets/north_east_street) -"sCb" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/structure/stairs/perspective{ - dir = 9; - icon_state = "p_stair_full" - }, -/turf/open/asphalt/cement/cement3, -/area/lv522/landing_zone_1) "sCi" = ( /obj/item/clothing/shoes/jackboots{ pixel_x = -5; @@ -35402,30 +35255,10 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/landing_zone_2/ceiling) -"sHb" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/prison/greenfull/northwest, -/area/lv522/indoors/b_block/bridge) -"sHd" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/gm/river, -/area/lv522/landing_zone_1/tunnel/far) "sHk" = ( /obj/structure/curtain/red, /turf/open/floor/corsat/marked, /area/lv522/indoors/c_block/casino) -"sHp" = ( -/obj/structure/platform_decoration/strata, -/turf/open/auto_turf/shale/layer1, -/area/lv522/oob) "sHy" = ( /obj/structure/machinery/floodlight, /obj/effect/decal/cleanable/dirt, @@ -35439,21 +35272,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/casino) -"sHY" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform, -/obj/structure/stairs/perspective{ - dir = 6; - icon_state = "p_stair_full" - }, -/obj/structure/platform_decoration{ - dir = 10; - layer = 3.51 - }, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/garage) "sIq" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/generic, @@ -35479,6 +35297,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) "sIK" = ( @@ -35644,13 +35463,6 @@ /obj/item/reagent_container/glass/beaker, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) -"sLw" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/garage) "sLG" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -35658,6 +35470,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/c_block/cargo) +"sLI" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/west, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/south_east_street) "sLQ" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/prison/darkpurplefull2, @@ -35721,12 +35538,26 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms/glass) +"sMW" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/obj/effect/landmark/lv624/fog_blocker/short, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_1) "sNk" = ( /obj/structure/closet/crate, /obj/item/storage/pouch/medkit/full_advanced, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/floor_marked, /area/lv522/indoors/lone_buildings/storage_blocks) +"sNz" = ( +/obj/effect/spawner/gibspawner/xeno, +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/north_east_street) "sNQ" = ( /obj/structure/machinery/floodlight, /obj/effect/decal/cleanable/dirt, @@ -35786,18 +35617,6 @@ }, /turf/open/floor/strata/blue1, /area/lv522/outdoors/colony_streets/windbreaker/observation) -"sOM" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 9 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/landing_zone_1) "sON" = ( /turf/open/floor/prison/floor_plate, /area/lv522/outdoors/colony_streets/north_west_street) @@ -35878,6 +35697,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt/cement/cement1, /area/lv522/outdoors/colony_streets/north_street) +"sPV" = ( +/obj/item/ammo_magazine/rifle/heap{ + current_rounds = 0 + }, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/containers) "sQb" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison/blue/northwest, @@ -35952,13 +35777,6 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/asphalt/cement/cement9, /area/lv522/outdoors/colony_streets/north_west_street) -"sRu" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/north_east_street) "sRx" = ( /obj/vehicle/train/cargo/trolley, /turf/open/floor/prison/floor_marked, @@ -35967,12 +35785,12 @@ /obj/structure/largecrate/random/barrel/red, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_east_street) -"sRM" = ( -/obj/structure/platform{ - dir = 1 - }, +"sRO" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/southwest, /turf/open/gm/river, -/area/lv522/landing_zone_1/tunnel) +/area/lv522/oob) "sRY" = ( /obj/item/storage/backpack/marine/satchel{ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"; @@ -36025,6 +35843,7 @@ id = "LZ1_Lockdown_Lo"; name = "Emergency Lockdown" }, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/corsat/marked, /area/lv522/landing_zone_1) "sSW" = ( @@ -36102,15 +35921,6 @@ "sWr" = ( /turf/open/floor/prison, /area/lv522/indoors/a_block/admin) -"sWt" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/prison, -/area/lv522/indoors/a_block/dorms) "sWB" = ( /obj/structure/prop/almayer/computers/sensor_computer2{ density = 0; @@ -36128,6 +35938,17 @@ /obj/effect/landmark/survivor_spawner, /turf/open/floor/prison/blue/north, /area/lv522/indoors/a_block/admin) +"sWW" = ( +/obj/structure/platform/metal/stair_cut/platform_right, +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/prison/greenfull/east, +/area/lv522/indoors/b_block/bridge) "sXm" = ( /obj/structure/surface/table/almayer, /obj/item/newspaper, @@ -36156,12 +35977,6 @@ }, /turf/open/floor/prison/floor_plate, /area/lv522/outdoors/colony_streets/north_west_street) -"sXZ" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/garage) "sYh" = ( /obj/structure/machinery/door/airlock/hatch/cockpit/three{ dir = 1 @@ -36171,14 +35986,6 @@ "sYl" = ( /turf/open/floor/corsat/plate, /area/lv522/atmos/filt) -"sYv" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform/stair_cut, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/south_street) "sYH" = ( /turf/open/floor/plating, /area/shuttle/drop1/lv522) @@ -36194,20 +36001,29 @@ }, /turf/open/floor/strata/blue1, /area/lv522/indoors/a_block/dorm_north) +"sZu" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/northwest, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_1) "sZz" = ( /obj/structure/largecrate/random/case/small, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/lv522/indoors/c_block/mining) +"sZD" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/south_west_street) "taj" = ( /obj/structure/closet/crate, /turf/open/asphalt/cement/cement4, /area/lv522/outdoors/colony_streets/central_streets) -"taw" = ( -/obj/structure/platform_decoration, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison, -/area/lv522/indoors/c_block/cargo) "taH" = ( /obj/structure/prop/invuln/ice_prefab{ dir = 9 @@ -36228,12 +36044,6 @@ }, /turf/open/floor/prison, /area/lv522/outdoors/colony_streets/north_east_street) -"taO" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/indoors/a_block/corpo/glass) "taP" = ( /obj/structure/pipes/standard/manifold/hidden/green, /turf/open/floor/plating, @@ -36244,29 +36054,11 @@ }, /turf/open/asphalt/cement/cement4, /area/lv522/outdoors/colony_streets/south_east_street) -"taW" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/landing_zone_1) "tbl" = ( /turf/closed/shuttle/dropship3/tornado/typhoon{ icon_state = "16" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) -"tbt" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/structure/bed/chair/dropship/passenger{ - dir = 4 - }, -/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, -/area/lv522/landing_zone_forecon/UD6_Tornado) "tby" = ( /obj/structure/bed/chair/comfy{ dir = 4 @@ -36374,15 +36166,6 @@ icon_state = "47" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) -"tdS" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, -/area/lv522/landing_zone_forecon/UD6_Typhoon) "tdT" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -36433,15 +36216,6 @@ /obj/structure/machinery/power/port_gen/pacman, /turf/open/asphalt/cement, /area/lv522/indoors/lone_buildings/engineering) -"teL" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, -/area/lv522/landing_zone_forecon/UD6_Typhoon) "teO" = ( /obj/structure/machinery/door/airlock/almayer/generic{ name = "\improper C-Block - Cargo Airlock"; @@ -36455,17 +36229,17 @@ icon_state = "p_stair_full" }, /obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/asphalt/cement/cement3, /area/lv522/landing_zone_1) -"tfi" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, +"tfg" = ( +/obj/effect/decal/cleanable/blood, /turf/open/floor/prison, -/area/lv522/indoors/a_block/kitchen) +/area/lv522/outdoors/colony_streets/containers) "tfl" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/railgun_camera_pos, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/floor_plate, /area/lv522/landing_zone_1/ceiling) "tfO" = ( @@ -36531,13 +36305,6 @@ icon_state = "71" }, /area/lv522/landing_zone_forecon/UD6_Tornado) -"thi" = ( -/obj/effect/decal/cleanable/blood/xeno, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/asphalt/cement/cement1, -/area/lv522/outdoors/colony_streets/north_east_street) "thI" = ( /obj/structure/barricade/wooden{ dir = 1 @@ -36616,14 +36383,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/b_block/bridge) -"tkm" = ( -/obj/structure/curtain, -/mob/living/simple_animal/mouse, -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/cargo) "tku" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ dir = 1; @@ -36681,6 +36440,16 @@ }, /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms) +"tlm" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/prison/floor_plate, +/area/lv522/outdoors/colony_streets/containers) "tlr" = ( /obj/structure/prop/ice_colony/ground_wire{ dir = 8 @@ -36698,15 +36467,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/greenfull, /area/lv522/indoors/a_block/fitness) -"tlB" = ( -/obj/structure/prop/invuln/overhead_pipe{ - dir = 8; - pixel_x = -6; - pixel_y = 6 - }, -/obj/structure/platform, -/turf/open/gm/river, -/area/lv522/landing_zone_1/tunnel/far) "tlR" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/faxmachine{ @@ -36746,6 +36506,7 @@ pixel_x = -1; pixel_y = 1 }, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) "tmX" = ( @@ -36778,12 +36539,6 @@ /obj/item/prop/alien/hugger, /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms) -"tni" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/asphalt/cement/cement1, -/area/lv522/outdoors/colony_streets/south_east_street) "tns" = ( /obj/structure/machinery/landinglight/ds1{ dir = 4 @@ -36890,17 +36645,16 @@ /obj/structure/barricade/deployable, /turf/open/floor/prison/floor_marked, /area/lv522/outdoors/colony_streets/north_east_street) -"tqh" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/asphalt/cement, -/area/lv522/indoors/lone_buildings/engineering) "tqU" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/whitegreenfull, /area/lv522/indoors/a_block/fitness/glass) +"tqZ" = ( +/obj/structure/platform_decoration/metal/almayer, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison, +/area/lv522/indoors/c_block/cargo) "trj" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -37041,6 +36795,7 @@ dir = 1; icon_state = "p_stair_full" }, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_1) "tue" = ( @@ -37142,20 +36897,27 @@ }, /turf/open/floor/prison/whitegreenfull, /area/lv522/indoors/a_block/fitness) -"twq" = ( -/obj/structure/platform_decoration, -/obj/item/reagent_container/food/drinks/flask/marine, -/obj/effect/landmark/survivor_spawner, -/turf/open/floor/prison/blue_plate/north, -/area/lv522/indoors/a_block/admin) "tww" = ( /turf/open/floor/prison/blue/west, /area/lv522/indoors/a_block/admin) +"twz" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/asphalt/cement/cement9, +/area/lv522/outdoors/colony_streets/south_east_street) "twB" = ( /turf/closed/shuttle/dropship3/tornado{ icon_state = "48" }, /area/lv522/landing_zone_forecon/UD6_Tornado) +"twK" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/obj/structure/platform_decoration/metal/almayer/north, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison/blue_plate/north, +/area/lv522/indoors/a_block/admin) "twQ" = ( /obj/structure/closet/secure_closet/medical1, /turf/open/floor/strata/white_cyan1/east, @@ -37237,16 +36999,6 @@ }, /turf/open/floor/wood, /area/lv522/indoors/a_block/fitness/glass) -"tyU" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" - }, -/turf/open/asphalt/cement, -/area/lv522/indoors/lone_buildings/engineering) "tzd" = ( /turf/closed/shuttle/elevator{ dir = 4 @@ -37259,23 +37011,6 @@ }, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) -"tzA" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/structure/closet/crate/ammo, -/obj/item/ammo_magazine/rifle/lmg/holo_target, -/obj/item/weapon/gun/rifle/lmg{ - current_mag = null - }, -/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, -/area/lv522/landing_zone_forecon/UD6_Typhoon) -"tzF" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, -/area/lv522/landing_zone_forecon/UD6_Typhoon) "tzM" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -37312,15 +37047,6 @@ /obj/item/weapon/twohanded/folded_metal_chair, /turf/open/floor/prison, /area/lv522/landing_zone_1) -"tAu" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/indoors/a_block/garden) "tBb" = ( /obj/structure/prop/dam/drill, /turf/open/auto_turf/sand_white/layer0, @@ -37375,6 +37101,10 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/dorms) +"tCu" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/nw_rockies) "tCN" = ( /turf/closed/wall/strata_ice/dirty, /area/lv522/outdoors/colony_streets/south_east_street) @@ -37397,12 +37127,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/blue/east, /area/lv522/indoors/a_block/admin) -"tDQ" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/asphalt/cement, -/area/lv522/indoors/lone_buildings/engineering) "tDR" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -37434,6 +37158,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkredfull2, /area/lv522/indoors/lone_buildings/chunk) +"tEJ" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/mining) "tEQ" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -37475,6 +37207,7 @@ /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/mining) "tFx" = ( +/obj/effect/landmark/lv624/fog_blocker/short, /turf/closed/wall/strata_outpost, /area/lv522/landing_zone_1/ceiling) "tFB" = ( @@ -37561,20 +37294,6 @@ /obj/structure/machinery/portable_atmospherics/canister/phoron, /turf/open/floor/corsat/squares, /area/lv522/indoors/c_block/mining) -"tHC" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/asphalt/cement, -/area/lv522/indoors/lone_buildings/engineering) -"tHJ" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/spawner/gibspawner/xeno, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison, -/area/lv522/indoors/a_block/dorms) "tIy" = ( /obj/structure/cargo_container/kelland/left, /turf/open/floor/prison/floor_marked/southwest, @@ -37617,23 +37336,6 @@ /obj/vehicle/train/cargo/trolley, /turf/open/auto_turf/shale/layer1, /area/lv522/landing_zone_2) -"tJk" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 2; - pixel_y = 1 - }, -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 9 - }, -/turf/open/asphalt/cement, -/area/lv522/indoors/lone_buildings/engineering) "tJm" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_full" @@ -37708,6 +37410,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/floor_plate, /area/lv522/indoors/lone_buildings/engineering) +"tKq" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/north_street) "tKB" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -37736,8 +37442,21 @@ /area/lv522/atmos/cargo_intake) "tKS" = ( /obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/floor_plate, /area/lv522/landing_zone_1/ceiling) +"tLf" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/south_street) +"tLi" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/gm/river, +/area/lv522/landing_zone_1/tunnel/far) "tLl" = ( /obj/structure/machinery/light/double/blue{ dir = 8; @@ -37812,16 +37531,9 @@ /turf/open/floor/prison, /area/lv522/indoors/a_block/dorm_north) "tMq" = ( +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/asphalt/cement/cement2, /area/lv522/landing_zone_1) -"tMt" = ( -/obj/structure/platform_decoration, -/obj/structure/stairs/perspective{ - dir = 10; - icon_state = "p_stair_full" - }, -/turf/open/asphalt/cement/cement3, -/area/lv522/landing_zone_1) "tMD" = ( /obj/item/prop/alien/hugger, /turf/open/floor/prison, @@ -37849,10 +37561,19 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/lv522/indoors/c_block/casino) +"tNa" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison, +/area/lv522/indoors/a_block/dorms) "tNc" = ( /obj/structure/prop/ice_colony/ground_wire, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/south_street) +"tNd" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_east_street) "tNl" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison, @@ -37875,16 +37596,6 @@ }, /turf/open/asphalt/cement, /area/lv522/indoors/lone_buildings/engineering) -"tOe" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/outdoors/colony_streets/south_east_street) "tOo" = ( /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/south_street) @@ -37895,15 +37606,6 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) -"tOt" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/turf/open/asphalt/cement, -/area/lv522/indoors/lone_buildings/engineering) "tOv" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 @@ -37929,27 +37631,10 @@ /obj/structure/cargo_container/watatsumi/leftmid, /turf/open/asphalt/cement/cement1, /area/lv522/outdoors/colony_streets/north_east_street) -"tPa" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/prison/greenfull/east, -/area/lv522/indoors/b_block/bridge) "tPb" = ( /obj/structure/prop/structure_lattice, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/north_east_street) -"tPf" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/landing_zone_1) "tPr" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/asphalt/cement/cement12, @@ -38012,6 +37697,10 @@ "tRd" = ( /turf/open/floor/corsat/marked, /area/lv522/indoors/a_block/bridges) +"tRj" = ( +/obj/structure/platform/metal/almayer, +/turf/open/floor/prison/darkredfull2, +/area/lv522/indoors/a_block/kitchen) "tRs" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_full" @@ -38030,14 +37719,9 @@ pixel_y = 4 }, /obj/structure/machinery/light, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) -"tRS" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/asphalt/cement/cement12, -/area/lv522/indoors/lone_buildings/engineering) "tSb" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -38153,10 +37837,15 @@ /obj/structure/cargo_container/kelland/right, /turf/open/floor/plating/platebot, /area/lv522/indoors/c_block/cargo) +"tUv" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/central_streets) "tUB" = ( /obj/structure/surface/table/almayer, /obj/item/trash/plate, /obj/item/reagent_container/food/snacks/mushroompizzaslice, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) "tUL" = ( @@ -38174,6 +37863,7 @@ /area/lv522/indoors/a_block/dorms) "tVj" = ( /obj/structure/largecrate/random/barrel/white, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/floor_marked/southwest, /area/lv522/landing_zone_1/ceiling) "tVv" = ( @@ -38188,6 +37878,14 @@ /obj/structure/prop/server_equipment/laptop/on, /turf/open/floor/prison/greenfull/northwest, /area/lv522/indoors/b_block/hydro) +"tVx" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/south_street) "tVN" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkredfull2, @@ -38198,10 +37896,10 @@ }, /turf/open/asphalt/cement/cement1, /area/lv522/outdoors/colony_streets/east_central_street) -"tWt" = ( -/obj/structure/platform_decoration, -/turf/open/asphalt/cement/cement4, -/area/lv522/outdoors/colony_streets/north_east_street) +"tVR" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_1) "tWv" = ( /obj/structure/prop/invuln/overhead_pipe{ pixel_x = 6; @@ -38281,11 +37979,18 @@ }, /obj/item/prop/alien/hugger, /obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/floor_plate, /area/lv522/landing_zone_1/ceiling) "tXW" = ( /turf/open/auto_turf/shale/layer2, /area/lv522/outdoors/colony_streets/south_east_street) +"tXZ" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/southwest, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/south_west_street) "tYf" = ( /obj/structure/machinery/seed_extractor, /obj/structure/machinery/light{ @@ -38298,23 +38003,6 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison/kitchen, /area/lv522/indoors/b_block/bar) -"tYt" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/prop/ice_colony/dense/planter_box{ - dir = 9; - layer = 2.9 - }, -/obj/structure/flora/bush/ausbushes/var3/brflowers, -/turf/open/floor/prison/greenfull/east, -/area/lv522/indoors/b_block/bridge) -"tYx" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/prison/darkredfull2, -/area/lv522/indoors/a_block/kitchen) "tYL" = ( /obj/structure/largecrate/random/secure, /turf/open/floor/prison/blue_plate/north, @@ -38339,12 +38027,6 @@ /obj/structure/machinery/light, /turf/open/floor/prison/darkredfull2, /area/lv522/indoors/a_block/kitchen/glass) -"tZs" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/asphalt/cement/cement12, -/area/lv522/indoors/lone_buildings/engineering) "tZF" = ( /obj/structure/prop/ice_colony/ground_wire{ dir = 4 @@ -38374,6 +38056,10 @@ }, /turf/open/floor/prison/blue/east, /area/lv522/indoors/a_block/hallway) +"uab" = ( +/obj/structure/platform/stone/strata/east, +/turf/open/auto_turf/shale/layer1, +/area/lv522/oob) "uad" = ( /obj/structure/closet/boxinggloves, /obj/effect/decal/cleanable/dirt, @@ -38403,22 +38089,6 @@ /obj/structure/window/framed/strata/reinforced, /turf/open/floor/corsat/marked, /area/lv522/indoors/a_block/dorms/glass) -"uaY" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/cable/heavyduty{ - icon_state = "1-2" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/plating, -/area/lv522/indoors/lone_buildings/engineering) "ubd" = ( /obj/structure/closet/boxinggloves, /turf/open/floor/prison/greenfull, @@ -38440,13 +38110,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/kitchen, /area/lv522/indoors/a_block/fitness) -"ubF" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/asphalt/cement/cement12, -/area/lv522/indoors/lone_buildings/engineering) "ubH" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_full" @@ -38459,6 +38122,24 @@ }, /turf/open/floor/corsat, /area/lv522/atmos/east_reactor/south) +"ubM" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/stair_cut/platform_right, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 8; + pixel_x = -6; + pixel_y = 6 + }, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 8; + pixel_x = 6; + pixel_y = 6 + }, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/mining) "uco" = ( /obj/structure/curtain/red, /turf/open/floor/prison/kitchen, @@ -38486,16 +38167,14 @@ /obj/structure/pipes/standard/manifold/fourway/hidden/green, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/kitchen) +"ucN" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/north_east_street) "ucY" = ( /obj/effect/landmark/xeno_spawn, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/atmos/east_reactor/south) -"udi" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/landing_zone_1) "udv" = ( /obj/effect/decal/cleanable/dirt, /turf/open/asphalt/cement/cement12, @@ -38576,20 +38255,6 @@ }, /turf/open/floor/corsat/marked, /area/lv522/atmos/way_in_command_centre) -"ueW" = ( -/obj/structure/cable/heavyduty{ - icon_state = "4-8" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/platform_decoration, -/turf/open/floor/plating, -/area/lv522/outdoors/colony_streets/central_streets) "ueX" = ( /obj/effect/decal{ icon = 'icons/mob/xenos/effects.dmi'; @@ -38628,20 +38293,6 @@ }, /turf/open/floor/prison, /area/lv522/indoors/lone_buildings/outdoor_bot) -"ufF" = ( -/obj/structure/cable/heavyduty{ - icon_state = "4-8" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/platform, -/turf/open/floor/plating, -/area/lv522/outdoors/colony_streets/central_streets) "ufR" = ( /obj/structure/machinery/landinglight/ds2/delayone{ dir = 4 @@ -38655,34 +38306,13 @@ pixel_y = 6 }, /obj/structure/machinery/light, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) "ufU" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/shiva/radiator_tile2, /area/lv522/indoors/a_block/hallway) -"ugi" = ( -/obj/structure/cable/heavyduty{ - icon_state = "0-8" - }, -/obj/structure/cable/heavyduty{ - icon_state = "1-2"; - pixel_y = -23 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/obj/structure/platform, -/turf/open/floor/plating, -/area/lv522/outdoors/colony_streets/central_streets) "ugn" = ( /obj/structure/prop/invuln/ice_prefab/roof_greeble{ icon_state = "vent2"; @@ -38737,10 +38367,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/a_block/corpo) -"uhP" = ( -/obj/structure/platform, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/central_streets) "uhV" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -38796,12 +38422,6 @@ /obj/item/trash/eat, /turf/open/floor/prison/blue_plate/north, /area/lv522/indoors/a_block/admin) -"uiK" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/central_streets) "uiM" = ( /turf/open/floor/prison, /area/lv522/landing_zone_1) @@ -38841,6 +38461,11 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/south_east_street) +"ujg" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel) "ujq" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/prop/colony/canister{ @@ -38853,6 +38478,9 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/garage) +"ujv" = ( +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/containers) "ujy" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -38875,12 +38503,6 @@ }, /turf/open/floor/prison, /area/lv522/indoors/lone_buildings/engineering) -"uks" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/turf/open/auto_turf/shale/layer1, -/area/lv522/oob) "ukt" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -38920,48 +38542,34 @@ "umf" = ( /turf/open/auto_turf/shale/layer2, /area/lv522/outdoors/colony_streets/central_streets) -"umg" = ( -/obj/structure/platform{ - dir = 8 +"umm" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/north_east_street) +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/prison/floor_plate, +/area/lv522/outdoors/colony_streets/south_east_street) "ums" = ( /obj/item/stack/sheet/metal, /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/central_streets) -"umK" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/asphalt/cement/cement3, -/area/lv522/landing_zone_1) "umR" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_east_street) -"unt" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/auto_turf/shale/layer1, -/area/lv522/outdoors/colony_streets/central_streets) +"umV" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/prison, +/area/lv522/indoors/a_block/kitchen) "unC" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/c_block/cargo) -"unM" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/landing_zone_1) "unQ" = ( /obj/structure/surface/rack, /obj/structure/machinery/light{ @@ -38997,6 +38605,7 @@ pixel_x = -8; pixel_y = 4 }, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) "uok" = ( @@ -39007,10 +38616,12 @@ /area/lv522/atmos/east_reactor/south) "uol" = ( /obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison, /area/lv522/landing_zone_1/ceiling) "uom" = ( /obj/structure/machinery/disposal, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) "uoA" = ( @@ -39048,6 +38659,7 @@ pixel_x = 6; pixel_y = 16 }, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) "upr" = ( @@ -39070,6 +38682,7 @@ /area/lv522/indoors/b_block/hydro) "upX" = ( /obj/structure/machinery/disposal, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/landing_zone_1/ceiling) "upZ" = ( @@ -39094,16 +38707,6 @@ "uqo" = ( /turf/open/floor/plating, /area/lv522/indoors/a_block/admin) -"uqt" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform/stair_cut{ - icon_state = "platform_stair_alt" - }, -/turf/open/auto_turf/shale/layer1, -/area/lv522/outdoors/colony_streets/central_streets) "uqx" = ( /obj/structure/window/framed/strata/reinforced, /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -39112,6 +38715,21 @@ }, /turf/open/floor/corsat/marked, /area/lv522/indoors/a_block/security) +"uqy" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel/far) +"uqH" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/prison/floor_plate, +/area/lv522/outdoors/colony_streets/north_street) "uqP" = ( /obj/structure/cargo_container/horizontal/blue/top{ pixel_x = 6 @@ -39136,6 +38754,15 @@ }, /turf/open/floor/prison, /area/lv522/indoors/c_block/mining) +"uro" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/platform/metal/almayer/north, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison/floor_plate, +/area/lv522/indoors/a_block/dorms) "urp" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/corsat/brown/northeast, @@ -39152,6 +38779,10 @@ }, /turf/open/floor/prison, /area/lv522/indoors/c_block/casino) +"urI" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/asphalt/cement/cement12, +/area/lv522/outdoors/colony_streets/south_street) "urM" = ( /obj/structure/machinery/space_heater/radiator/red{ dir = 8 @@ -39209,6 +38840,7 @@ pixel_y = 4 }, /obj/effect/landmark/objective_landmark/close, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) "utq" = ( @@ -39238,47 +38870,20 @@ /obj/item/trash/cigbutt{ pixel_x = 4 }, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) -"utR" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform/stair_cut, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/central_streets) "uue" = ( /obj/structure/machinery/light, /obj/structure/machinery/disposal, /turf/open/floor/prison/darkredfull2, /area/lv522/indoors/a_block/kitchen) -"uug" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/obj/structure/machinery/camera/autoname{ - dir = 4 - }, -/obj/structure/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel) "uul" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, /turf/open/floor/corsat/brown, /area/lv522/atmos/east_reactor) -"uur" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/central_streets) "uuA" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/floor_plate, @@ -39340,6 +38945,17 @@ /obj/structure/curtain/medical, /turf/open/floor/strata/white_cyan3/east, /area/lv522/indoors/a_block/medical/glass) +"uvT" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/prop/ice_colony/dense/planter_box{ + dir = 9; + layer = 2.9 + }, +/obj/structure/flora/bush/ausbushes/var3/ywflowers{ + layer = 3 + }, +/turf/open/floor/prison/greenfull/east, +/area/lv522/indoors/b_block/bridge) "uwb" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -39410,18 +39026,15 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) -"uxf" = ( -/obj/structure/platform_decoration, -/turf/open/auto_turf/shale/layer2, -/area/lv522/outdoors/colony_streets/central_streets) -"uxi" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" +"uxj" = ( +/obj/structure/platform/metal/almayer, +/obj/item/prop/colony/canister{ + layer = 3.1; + pixel_y = 16 }, -/obj/structure/platform, -/turf/open/auto_turf/shale/layer2, -/area/lv522/outdoors/colony_streets/central_streets) +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/garage) "uxn" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb, @@ -39476,14 +39089,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) -"uzr" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel/far) "uzD" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -39532,17 +39137,14 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/north_west_street) -"uAd" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/central_streets) "uAm" = ( /turf/open/floor/corsat/squares, /area/lv522/atmos/north_command_centre) +"uAn" = ( +/obj/effect/spawner/gibspawner/xeno, +/obj/effect/decal/cleanable/blood/xeno, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/containers) "uAv" = ( /obj/structure/window_frame/strata, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ @@ -39579,32 +39181,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/strata/white_cyan3/north, /area/lv522/indoors/a_block/medical/glass) -"uCo" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform/stair_cut{ - icon_state = "platform_stair_alt" - }, -/obj/structure/prop/invuln/overhead_pipe{ - dir = 8; - pixel_x = -6; - pixel_y = 6 - }, -/obj/structure/prop/invuln/overhead_pipe{ - dir = 8; - pixel_x = 6; - pixel_y = 6 - }, +"uCP" = ( +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/glass/beaker/vial, +/obj/structure/machinery/cell_charger, +/obj/structure/platform_decoration/metal/almayer, /turf/open/floor/plating, -/area/lv522/indoors/c_block/mining) -"uCr" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/auto_turf/shale/layer2, -/area/lv522/outdoors/colony_streets/central_streets) +/area/lv522/indoors/c_block/cargo) "uDb" = ( /turf/open/floor/prison, /area/lv522/indoors/a_block/security) @@ -39613,12 +39196,6 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/security) -"uDC" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/auto_turf/shale/layer2, -/area/lv522/outdoors/colony_streets/central_streets) "uDP" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -39632,19 +39209,6 @@ }, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/b_block/bridge) -"uEr" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - id = "UD6"; - name = "\improper Shutters" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/plating, -/area/lv522/landing_zone_forecon/UD6_Typhoon) "uEt" = ( /obj/structure/stairs/perspective{ icon_state = "p_stair_full" @@ -39655,19 +39219,6 @@ }, /turf/open/floor/plating, /area/lv522/landing_zone_forecon/UD6_Typhoon) -"uEz" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - id = "UD6"; - name = "\improper Shutters" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/plating, -/area/lv522/landing_zone_forecon/UD6_Typhoon) "uEC" = ( /turf/open/floor/prison/whitegreenfull, /area/lv522/indoors/a_block/fitness) @@ -39687,19 +39238,18 @@ }, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1) +"uEK" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_1) "uEP" = ( /obj/structure/machinery/disposal, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/floor_plate, /area/lv522/indoors/a_block/hallway) -"uEV" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/largecrate, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel) "uEX" = ( /obj/structure/prop/invuln/fire{ pixel_x = -6; @@ -39715,6 +39265,14 @@ }, /turf/open/floor/prison/cell_stripe/north, /area/lv522/atmos/way_in_command_centre) +"uFf" = ( +/obj/structure/stairs/perspective{ + dir = 9; + icon_state = "p_stair_full" + }, +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/asphalt/cement/cement4, +/area/lv522/outdoors/colony_streets/north_east_street) "uFo" = ( /obj/effect/decal/cleanable/dirt, /obj/item/stack/rods, @@ -39724,12 +39282,6 @@ }, /turf/open/floor/prison/blue_plate, /area/lv522/indoors/a_block/admin) -"uFp" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/asphalt/cement/cement14, -/area/lv522/landing_zone_1) "uFz" = ( /obj/item/clipboard, /turf/open/auto_turf/sand_white/layer0, @@ -39760,6 +39312,10 @@ }, /turf/open/floor/corsat/marked, /area/lv522/indoors/c_block/mining) +"uFQ" = ( +/obj/structure/cargo_container/lockmart/left, +/turf/open/floor/prison/floor_marked, +/area/lv522/outdoors/colony_streets/containers) "uFT" = ( /turf/open/floor/corsat/brown/north, /area/lv522/atmos/cargo_intake) @@ -39878,6 +39434,10 @@ }, /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms/glass) +"uHz" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel/far) "uHE" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/asphalt/cement/cement2, @@ -39918,6 +39478,11 @@ }, /turf/open/asphalt/cement/cement3, /area/lv522/outdoors/colony_streets/north_west_street) +"uIw" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/garage) "uIx" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ id = "mining_shutter_2" @@ -39932,6 +39497,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/garage) +"uID" = ( +/obj/structure/cargo_container/lockmart/right, +/turf/open/floor/prison/floor_marked, +/area/lv522/outdoors/colony_streets/containers) "uIF" = ( /obj/structure/barricade/handrail, /turf/open/floor/plating, @@ -39952,10 +39521,6 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison/whitegreenfull, /area/lv522/indoors/a_block/fitness) -"uIY" = ( -/obj/structure/platform_decoration, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/tunnel/far) "uIZ" = ( /obj/structure/window_frame/strata, /obj/item/stack/rods, @@ -40016,22 +39581,6 @@ "uKy" = ( /turf/open/floor/corsat/marked, /area/lv522/indoors/a_block/bridges/op_centre) -"uKD" = ( -/obj/structure/cable/heavyduty{ - icon_state = "1-2" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/plating, -/area/lv522/outdoors/colony_streets/central_streets) "uKE" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 @@ -40051,18 +39600,6 @@ }, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) -"uKY" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 9 - }, -/turf/open/asphalt/cement, -/area/lv522/landing_zone_1) "uLk" = ( /obj/structure/prop/invuln/overhead/flammable_pipe/fly{ icon_state = "flammable_pipe_3"; @@ -40081,12 +39618,6 @@ "uLv" = ( /turf/open/gm/river, /area/lv522/indoors/c_block/mining) -"uLw" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/central_streets) "uLz" = ( /obj/effect/landmark/hunter_secondary, /obj/structure/machinery/landinglight/ds1{ @@ -40218,18 +39749,6 @@ "uOs" = ( /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) -"uOA" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 5 - }, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/south_west_street) "uOD" = ( /obj/structure/bed/stool, /turf/open/floor/carpet, @@ -40252,6 +39771,11 @@ /obj/effect/decal/cleanable/blood/xeno, /turf/open/asphalt/cement/cement9, /area/lv522/outdoors/colony_streets/north_street) +"uOW" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/prison/floor_plate, +/area/lv522/atmos/way_in_command_centre) "uPk" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -40265,6 +39789,7 @@ /area/lv522/indoors/c_block/cargo) "uPo" = ( /obj/structure/largecrate/guns/russian, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/floor_marked/southwest, /area/lv522/landing_zone_1/ceiling) "uPv" = ( @@ -40297,42 +39822,12 @@ /obj/structure/surface/table/almayer, /turf/open/floor/prison/floor_plate, /area/lv522/indoors/c_block/mining) -"uQf" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/garage) -"uQg" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/prop/almayer/computers/sensor_computer2{ - layer = 2.0 - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/atmos/way_in_command_centre) -"uQn" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/garage) "uQr" = ( /obj/structure/bed/chair/wood/normal, /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/c_block/casino) -"uQs" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/garage) "uQw" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/camera/autoname{ @@ -40388,12 +39883,6 @@ }, /turf/open/floor/prison/floor_plate, /area/lv522/outdoors/colony_streets/north_east_street) -"uRR" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/gm/river, -/area/lv522/landing_zone_1/tunnel) "uSn" = ( /turf/open/asphalt/cement/cement15, /area/lv522/outdoors/colony_streets/north_west_street) @@ -40416,17 +39905,19 @@ }, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorm_north) -"uSY" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 +"uST" = ( +/obj/structure/fence{ + layer = 2.9 }, -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/obj/structure/platform/stair_cut/alt, -/turf/open/floor/prison, -/area/lv522/indoors/c_block/cargo) +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/strata/floor3, +/area/lv522/outdoors/colony_streets/containers) "uSZ" = ( /obj/item/toy/beach_ball/holoball{ pixel_x = 7; @@ -40465,12 +39956,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkredfull2, /area/lv522/indoors/a_block/bridges/corpo) -"uTK" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/asphalt/cement/cement1, -/area/lv522/outdoors/colony_streets/south_west_street) "uTS" = ( /obj/structure/pipes/vents/pump, /obj/structure/machinery/shower{ @@ -40573,6 +40058,9 @@ }, /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms/glass) +"uWa" = ( +/turf/closed/wall/strata_ice/dirty, +/area/lv522/outdoors/colony_streets/containers) "uWh" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/bed/chair/comfy{ @@ -40622,18 +40110,6 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_street) -"uXu" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/ceiling) "uXO" = ( /obj/effect/decal/cleanable/blood/oil/streak, /turf/open/floor/plating, @@ -40661,6 +40137,11 @@ /obj/structure/cargo_container/grant/left, /turf/open/floor/plating/platebot, /area/lv522/indoors/c_block/cargo) +"uYZ" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/item/stack/sheet/wood, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel/far) "uZc" = ( /obj/structure/machinery/floodlight/landing, /turf/open/floor/prison/greenfull/east, @@ -40729,6 +40210,7 @@ /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) "vbu" = ( +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison, /area/lv522/landing_zone_1/ceiling) "vbF" = ( @@ -40845,15 +40327,13 @@ }, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/casino) -"vdP" = ( -/obj/structure/platform_decoration{ +"vdK" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/structure/bed/chair/dropship/passenger{ dir = 8 }, -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/plating, -/area/lv522/landing_zone_1/ceiling) +/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/area/lv522/landing_zone_forecon/UD6_Tornado) "vdV" = ( /obj/structure/surface/table/almayer, /obj/effect/decal/cleanable/dirt, @@ -40960,20 +40440,6 @@ icon_state = "3" }, /area/lv522/landing_zone_forecon/UD6_Typhoon) -"vgb" = ( -/obj/structure/platform, -/obj/structure/prop/vehicles/crawler{ - dir = 8; - icon_state = "crawler_crate"; - layer = 3.1; - pixel_x = 6; - pixel_y = 6 - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/garage) "vgs" = ( /obj/structure/bed, /obj/item/bedsheet/blue{ @@ -40982,11 +40448,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/lv522/indoors/b_block/bar) -"vgw" = ( -/obj/structure/platform, -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/garage) "vgx" = ( /obj/item/stack/sheet/metal, /turf/open/floor/plating, @@ -40995,19 +40456,6 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/generic, /turf/open/floor/corsat/marked, /area/lv522/atmos/way_in_command_centre) -"vgM" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/auto_turf/shale/layer1, -/area/lv522/outdoors/nw_rockies) -"vhd" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/effect/decal/cleanable/blood, -/turf/open/auto_turf/shale/layer1, -/area/lv522/outdoors/nw_rockies) "vht" = ( /obj/structure/closet/emcloset, /turf/open/floor/prison/greenfull, @@ -41041,6 +40489,14 @@ }, /turf/open/floor/plating, /area/lv522/indoors/lone_buildings/engineering) +"viu" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_2) +"viz" = ( +/obj/structure/cargo_container/kelland/right, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/containers) "viA" = ( /obj/item/lightstick/red/spoke/planted{ pixel_x = -9; @@ -41133,6 +40589,7 @@ /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) "vjC" = ( +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/plating, /area/lv522/landing_zone_1/ceiling) "vjF" = ( @@ -41171,6 +40628,18 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/admin) +"vkk" = ( +/obj/structure/barricade/deployable{ + dir = 1 + }, +/obj/structure/barricade/deployable{ + dir = 8 + }, +/obj/item/weapon/gun/rifle/m41a{ + current_mag = null + }, +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/containers) "vkC" = ( /obj/effect/decal/cleanable/cobweb, /turf/open/floor/prison/blue_plate, @@ -41180,6 +40649,10 @@ /obj/effect/decal/cleanable/generic, /turf/open/floor/prison, /area/lv522/indoors/c_block/casino) +"vkZ" = ( +/obj/item/prop/colony/used_flare, +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/containers) "vlp" = ( /obj/item/pipe, /turf/open/floor/prison, @@ -41193,15 +40666,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/garage) -"vlN" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/prison/floor_plate, -/area/lv522/outdoors/colony_streets/north_street) +"vlA" = ( +/obj/structure/cargo_container/arious/right, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/containers) "vlT" = ( /turf/open/asphalt/cement/cement3, /area/lv522/outdoors/colony_streets/east_central_street) @@ -41262,6 +40730,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms) +"vnn" = ( +/obj/structure/stairs/perspective{ + dir = 9; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/prison/blue_plate/north, +/area/lv522/indoors/a_block/admin) "vnp" = ( /obj/structure/curtain/medical, /turf/open/floor/strata/white_cyan3/west, @@ -41431,16 +40907,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/blue_plate/north, /area/lv522/indoors/a_block/admin) -"vrW" = ( -/obj/structure/stairs/perspective{ - dir = 6; - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/prison, -/area/lv522/indoors/c_block/mining) "vsd" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/food/snacks/sliceable/plaincake{ @@ -41466,6 +40932,7 @@ /area/lv522/indoors/c_block/mining) "vso" = ( /obj/structure/largecrate/random/barrel/yellow, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/floor_marked/southwest, /area/lv522/landing_zone_1/ceiling) "vss" = ( @@ -41518,6 +40985,7 @@ /turf/open/floor/prison/kitchen, /area/lv522/indoors/a_block/kitchen) "vtN" = ( +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/asphalt/cement/cement4, /area/lv522/landing_zone_1) "vtP" = ( @@ -41544,12 +41012,21 @@ /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 }, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/corsat/marked, /area/lv522/landing_zone_1/ceiling) "vuH" = ( /obj/structure/largecrate, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/floor_marked/southwest, /area/lv522/landing_zone_1/ceiling) +"vuL" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_2) "vuY" = ( /obj/item/clothing/mask/facehugger{ desc = "It has some sort of a tube at the end of its tail. What the hell is this thing?"; @@ -41567,6 +41044,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/greenfull/northwest, /area/lv522/indoors/b_block/bridge) +"vvN" = ( +/obj/structure/platform/stone/strata, +/turf/open/auto_turf/shale/layer1, +/area/lv522/oob) "vwi" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/auto_turf/sand_white/layer0, @@ -41757,6 +41238,7 @@ /turf/open/floor/prison, /area/lv522/indoors/a_block/kitchen/glass) "vAW" = ( +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/floor_marked/southwest, /area/lv522/landing_zone_1/ceiling) "vAX" = ( @@ -41778,18 +41260,6 @@ "vBd" = ( /turf/open/floor/plating/platebot, /area/lv522/indoors/c_block/cargo) -"vBm" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 9 - }, -/turf/open/gm/river, -/area/lv522/landing_zone_1/tunnel) "vBx" = ( /obj/structure/surface/table/almayer, /obj/item/trash/ceramic_plate{ @@ -41809,13 +41279,6 @@ "vBI" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/atmos/way_in_command_centre) -"vBK" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/garage) "vBL" = ( /obj/effect/spawner/gibspawner/xeno, /turf/open/asphalt/cement/cement9, @@ -41843,6 +41306,10 @@ /obj/item/trash/uscm_mre, /turf/open/floor/prison/darkredfull2, /area/lv522/outdoors/colony_streets/north_street) +"vCi" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/prison, +/area/lv522/indoors/c_block/cargo) "vCy" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -41877,6 +41344,7 @@ pixel_y = 19; serial_number = 16 }, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/landing_zone_1/ceiling) "vCG" = ( @@ -41980,6 +41448,11 @@ /obj/structure/barricade/wooden, /turf/open/floor/plating/plating_catwalk/prison, /area/lv522/indoors/a_block/admin) +"vEY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/platform/metal/almayer, +/turf/open/floor/prison/floor_plate, +/area/lv522/indoors/a_block/corpo/glass) "vFd" = ( /obj/structure/stairs/perspective{ dir = 9; @@ -42007,18 +41480,12 @@ /obj/item/device/flashlight/lamp, /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms) -"vGb" = ( -/obj/structure/machinery/colony_floodlight, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/north_street) "vGk" = ( /obj/structure/machinery/power/port_gen/pacman, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) "vGo" = ( +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/asphalt/cement, /area/lv522/landing_zone_1) "vGp" = ( @@ -42109,6 +41576,17 @@ /obj/structure/prop/ice_colony/ground_wire, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) +"vHP" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 3; + pixel_y = -1 + }, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform/metal/almayer, +/obj/structure/platform_decoration/metal/almayer/southeast, +/turf/open/asphalt/cement, +/area/lv522/indoors/lone_buildings/engineering) "vHU" = ( /obj/structure/surface/table/almayer, /obj/item/device/flashlight/lamp, @@ -42152,6 +41630,14 @@ }, /turf/open/floor/plating, /area/lv522/indoors/lone_buildings/engineering) +"vIz" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/gm/river, +/area/lv522/landing_zone_1/tunnel/far) "vIS" = ( /turf/open/floor/corsat/brown/north, /area/lv522/atmos/east_reactor/west) @@ -42218,6 +41704,11 @@ /obj/structure/closet/secure_closet/atmos_personal, /turf/open/floor/prison/darkyellowfull2/east, /area/lv522/indoors/lone_buildings/engineering) +"vKH" = ( +/obj/structure/platform_decoration/metal/almayer, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison/blue_plate/north, +/area/lv522/indoors/a_block/admin) "vKJ" = ( /obj/structure/machinery/door/airlock/almayer/security/glass{ name = "\improper Marshal Office Armory" @@ -42256,12 +41747,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/floor_plate, /area/lv522/indoors/b_block/bar) -"vLu" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/north_street) "vLA" = ( /obj/structure/pipes/standard/manifold/visible{ dir = 1 @@ -42294,6 +41779,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/casino) +"vLU" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/asphalt/cement/cement12, +/area/lv522/indoors/lone_buildings/engineering) "vMg" = ( /obj/structure/safe, /turf/open/floor/prison/darkbrownfull2, @@ -42302,6 +41791,11 @@ /obj/item/weapon/gun/boltaction, /turf/open/floor/prison, /area/lv522/indoors/c_block/cargo) +"vMC" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/turf/open/gm/river, +/area/lv522/outdoors/colony_streets/south_street) "vMD" = ( /obj/structure/fence{ layer = 2.9 @@ -42369,6 +41863,7 @@ id = "LZ1_Lockdown_Lo"; name = "Emergency Lockdown" }, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/corsat/marked, /area/lv522/landing_zone_1/ceiling) "vNY" = ( @@ -42434,18 +41929,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/asphalt/cement/cement4, /area/lv522/outdoors/colony_streets/north_street) -"vPs" = ( -/obj/structure/prop/dam/crane/damaged, -/obj/structure/platform, -/obj/item/prop/colony/canister{ - pixel_y = 22 - }, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/garage) -"vPz" = ( -/obj/structure/platform, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/garage) "vPO" = ( /obj/structure/prop/invuln/ice_prefab{ dir = 8; @@ -42532,15 +42015,6 @@ /obj/structure/tunnel, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) -"vSN" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/central_streets) "vSO" = ( /turf/open/floor/prison/greenfull, /area/lv522/indoors/a_block/fitness) @@ -42590,6 +42064,7 @@ /turf/open/floor/plating, /area/lv522/landing_zone_1/tunnel) "vTT" = ( +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/corsat/marked, /area/lv522/landing_zone_1/ceiling) "vTW" = ( @@ -42633,6 +42108,13 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/prison, /area/lv522/indoors/c_block/garage) +"vUr" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_east_street) "vUx" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -42645,6 +42127,7 @@ /area/lv522/indoors/a_block/admin) "vUX" = ( /obj/structure/powerloader_wreckage/ft, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/floor_plate, /area/lv522/landing_zone_1/ceiling) "vVd" = ( @@ -42668,6 +42151,7 @@ /area/lv522/indoors/a_block/kitchen) "vVi" = ( /obj/structure/largecrate, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) "vVp" = ( @@ -42752,6 +42236,28 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) +"vYa" = ( +/obj/structure/stairs/perspective{ + dir = 5; + icon_state = "p_stair_full" + }, +/obj/item/weapon/gun/pistol/m1911{ + current_mag = null + }, +/obj/item/prop{ + desc = "Holy shit"; + icon = 'icons/mob/humans/species/r_human.dmi'; + icon_state = "l_arm"; + name = "left arm"; + pixel_x = -4; + pixel_y = 10 + }, +/obj/item/ammo_magazine/pistol/m1911{ + current_rounds = 4 + }, +/obj/structure/platform_decoration/metal/almayer, +/turf/open/asphalt/cement/cement4, +/area/lv522/outdoors/colony_streets/north_east_street) "vYb" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/asphalt/cement/cement3, @@ -42763,12 +42269,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/casino) -"vYK" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/landing_zone_1) "vYL" = ( /obj/structure/pipes/standard/manifold/hidden/green, /obj/effect/decal/cleanable/dirt, @@ -42815,8 +42315,17 @@ }, /turf/open/floor/strata/white_cyan2/west, /area/lv522/indoors/toilet) +"vZo" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/structure/stairs/perspective{ + dir = 10; + icon_state = "p_stair_full" + }, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_east_street) "vZv" = ( /obj/structure/cargo_container/kelland/left, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) "vZy" = ( @@ -42871,13 +42380,6 @@ }, /turf/open/floor/corsat/marked, /area/lv522/indoors/toilet) -"waQ" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/south_east_street) "waZ" = ( /obj/item/trash/uscm_mre, /obj/effect/decal/cleanable/dirt, @@ -42912,13 +42414,6 @@ }, /turf/open/floor/prison/darkredfull2, /area/lv522/indoors/a_block/security/glass) -"wbE" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison/darkbrownfull2, -/area/lv522/indoors/c_block/garage) "wbP" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/light/small{ @@ -42933,6 +42428,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/strata/white_cyan3/west, /area/lv522/indoors/a_block/medical/glass) +"wcg" = ( +/obj/structure/stairs/perspective{ + dir = 5; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/prison/floor_plate, +/area/lv522/atmos/way_in_command_centre) "wcp" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 @@ -42950,6 +42453,9 @@ }, /turf/open/floor/prison/floor_plate, /area/lv522/atmos/way_in_command_centre) +"wcH" = ( +/turf/open/floor/prison/floor_plate, +/area/lv522/outdoors/colony_streets/containers) "wcM" = ( /obj/structure/largecrate/random/secure, /obj/effect/decal/cleanable/dirt, @@ -42969,13 +42475,6 @@ /obj/item/tool/crowbar, /turf/open/asphalt/cement/cement15, /area/lv522/outdoors/colony_streets/north_west_street) -"wcT" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/platform_decoration, -/turf/open/floor/prison/floor_plate, -/area/lv522/indoors/a_block/corpo/glass) "wcX" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison/darkpurplefull2, @@ -43008,14 +42507,9 @@ /area/lv522/outdoors/colony_streets/central_streets) "wdI" = ( /obj/structure/cargo_container/kelland/right, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/floor_marked/southwest, /area/lv522/landing_zone_1/ceiling) -"wdY" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/landing_zone_1) "wee" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -43026,16 +42520,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/floor_plate, /area/lv522/indoors/b_block/bar) -"wes" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/structure/stairs/perspective{ - dir = 10; - icon_state = "p_stair_full" - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/landing_zone_1) "weJ" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 1 @@ -43207,12 +42691,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkredfull2, /area/lv522/indoors/a_block/security/glass) -"whD" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/asphalt/cement/cement1, -/area/lv522/outdoors/colony_streets/north_east_street) "whE" = ( /obj/structure/cargo_container/horizontal/blue/top{ layer = 3.1; @@ -43246,6 +42724,11 @@ }, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/cargo) +"wiq" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/west, +/turf/open/auto_turf/shale/layer1, +/area/lv522/oob) "wiz" = ( /obj/structure/desertdam/decals/road_edge{ pixel_x = 2; @@ -43289,16 +42772,6 @@ "wjy" = ( /turf/open/floor/corsat/plate, /area/lv522/atmos/east_reactor/west) -"wjE" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/structure/stairs/perspective{ - dir = 6; - icon_state = "p_stair_full" - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/landing_zone_1) "wjF" = ( /obj/structure/cargo_container/horizontal/blue/middle{ pixel_x = 6 @@ -43312,21 +42785,14 @@ }, /turf/open/floor/prison, /area/lv522/indoors/lone_buildings/outdoor_bot) +"wjM" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/asphalt/cement/cement1, +/area/lv522/outdoors/colony_streets/south_west_street) "wjP" = ( /obj/structure/machinery/colony_floodlight, /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/south_west_street) -"wke" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" - }, -/obj/structure/platform_decoration{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison/blue_plate/north, -/area/lv522/indoors/a_block/admin) "wko" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -43349,21 +42815,6 @@ /obj/effect/spider/spiderling/nogrow, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/cargo) -"wky" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 3; - pixel_y = -1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform, -/obj/structure/platform_decoration{ - dir = 6 - }, -/turf/open/asphalt/cement, -/area/lv522/indoors/lone_buildings/engineering) "wkC" = ( /obj/structure/prop/invuln/lattice_prop{ icon_state = "lattice3"; @@ -43395,6 +42846,7 @@ /area/lv522/indoors/c_block/cargo) "wlY" = ( /obj/structure/largecrate/random/secure, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/floor_marked/southwest, /area/lv522/landing_zone_1/ceiling) "wmk" = ( @@ -43420,6 +42872,13 @@ /obj/structure/cargo_container/wy/right, /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/nw_rockies) +"wnx" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/area/lv522/landing_zone_forecon/UD6_Typhoon) "wny" = ( /obj/structure/window_frame/strata, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ @@ -43437,6 +42896,7 @@ /obj/structure/machinery/space_heater/radiator/red{ dir = 4 }, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) "wob" = ( @@ -43455,12 +42915,6 @@ /obj/structure/cargo_container/horizontal/blue/bottom, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) -"wov" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/cargo) "woy" = ( /obj/structure/largecrate/random{ pixel_x = 5 @@ -43483,6 +42937,11 @@ "woU" = ( /turf/open/floor/corsat/brown/northwest, /area/lv522/atmos/east_reactor/south) +"woW" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/garage) "wpa" = ( /obj/structure/prop/server_equipment{ icon_state = "rackframe_broken" @@ -43590,6 +43049,16 @@ }, /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms) +"wsm" = ( +/obj/structure/prop/invuln/overhead_pipe{ + dir = 8; + pixel_x = -6; + pixel_y = 6 + }, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform/metal/almayer, +/turf/open/gm/river, +/area/lv522/landing_zone_1/tunnel/far) "wsz" = ( /obj/structure/machinery/light{ dir = 8 @@ -43598,16 +43067,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/garage) -"wsC" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) "wsT" = ( /obj/structure/machinery/light{ dir = 4 @@ -43639,6 +43098,10 @@ }, /turf/open/floor/prison/darkyellowfull2/east, /area/lv522/indoors/lone_buildings/outdoor_bot) +"wtq" = ( +/obj/structure/platform/stone/strata/north, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/oob) "wtI" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, @@ -43669,6 +43132,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkredfull2, /area/lv522/indoors/a_block/security) +"wuw" = ( +/obj/structure/machinery/photocopier, +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/plating/platebot, +/area/lv522/indoors/c_block/cargo) +"wuz" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/auto_turf/shale/layer2, +/area/lv522/outdoors/colony_streets/central_streets) "wuK" = ( /obj/structure/closet/crate, /turf/open/floor/prison/floor_marked/southwest, @@ -43889,17 +43361,18 @@ /obj/structure/machinery/light, /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms) -"wzS" = ( -/obj/structure/platform_decoration, +"wzQ" = ( +/obj/structure/platform_decoration/metal/almayer/north, /obj/effect/decal/warning_stripes{ icon_state = "N"; pixel_y = 1 }, /obj/effect/decal/warning_stripes{ - icon_state = "W" + icon_state = "E"; + pixel_x = 1 }, /turf/open/floor/prison/floor_plate, -/area/lv522/outdoors/colony_streets/east_central_street) +/area/lv522/indoors/a_block/garden) "wAf" = ( /turf/closed/shuttle/dropship3/tornado{ icon_state = "68" @@ -44011,6 +43484,10 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison/blue/southwest, /area/lv522/indoors/a_block/admin) +"wDo" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/north_street) "wDu" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/transmitter/colony_net{ @@ -44064,6 +43541,10 @@ /obj/item/seeds/bananaseed, /turf/open/floor/prison/greenfull/northwest, /area/lv522/indoors/b_block/hydro) +"wEG" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/gm/river, +/area/lv522/landing_zone_1/tunnel/far) "wEP" = ( /obj/structure/prop/invuln/ice_prefab/standalone/trim{ icon_state = "white_trim" @@ -44101,6 +43582,11 @@ /obj/item/device/m56d_post, /turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_up_to_down, /area/lv522/landing_zone_forecon/UD6_Typhoon) +"wGf" = ( +/obj/effect/decal/cleanable/blood/xeno, +/obj/structure/platform/metal/almayer/west, +/turf/open/asphalt/cement/cement1, +/area/lv522/outdoors/colony_streets/north_east_street) "wGh" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/prison, @@ -44157,11 +43643,25 @@ }, /obj/item/clothing/head/hardhat/white, /obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) +"wHv" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/stair_cut/platform_right, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/north_street) "wHw" = ( /turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_left_to_right, /area/lv522/landing_zone_forecon/UD6_Tornado) +"wHx" = ( +/obj/structure/barricade/deployable, +/obj/effect/decal/cleanable/blood, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/containers) "wHz" = ( /obj/item/clothing/shoes/veteran/pmc{ name = "steel toe boots" @@ -44260,15 +43760,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/casino) -"wKH" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, -/area/lv522/landing_zone_forecon/UD6_Tornado) "wKR" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 @@ -44280,6 +43771,10 @@ /obj/structure/surface/rack, /turf/open/floor/prison/darkyellowfull2/east, /area/lv522/indoors/lone_buildings/outdoor_bot) +"wKX" = ( +/obj/structure/platform/metal/almayer, +/turf/open/floor/prison/floor_plate, +/area/lv522/indoors/a_block/dorms) "wLd" = ( /obj/structure/machinery/light, /obj/structure/pipes/standard/simple/hidden/green{ @@ -44310,6 +43805,14 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms) +"wLS" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/south_street) "wLU" = ( /obj/structure/machinery/light{ dir = 8 @@ -44347,16 +43850,6 @@ /obj/structure/closet, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) -"wNo" = ( -/obj/effect/decal/cleanable/blood/xeno, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/asphalt/cement/cement1, -/area/lv522/outdoors/colony_streets/north_street) "wNp" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/darkbrownfull2, @@ -44392,6 +43885,11 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/landing_zone_2) +"wPO" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/west, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/north_east_street) "wPR" = ( /turf/open/floor/wood/wood_broken6, /area/lv522/indoors/b_block/bar) @@ -44474,14 +43972,6 @@ /obj/structure/window/framed/strata/reinforced, /turf/open/floor/corsat/marked, /area/lv522/indoors/a_block/bridges/garden_bridge) -"wSr" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/turf/open/floor/prison/floor_plate, -/area/lv522/atmos/way_in_command_centre) "wSt" = ( /obj/effect/decal/cleanable/blood/gibs, /turf/open/floor/prison, @@ -44581,6 +44071,10 @@ }, /turf/open/floor/prison/floor_plate, /area/lv522/atmos/way_in_command_centre) +"wUP" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/asphalt/cement/cement15, +/area/lv522/outdoors/colony_streets/north_east_street) "wVo" = ( /obj/item/lightstick/red/spoke/planted{ pixel_x = -9; @@ -44621,6 +44115,11 @@ "wXQ" = ( /turf/open/floor/prison/floor_marked/southwest, /area/lv522/outdoors/colony_streets/north_east_street) +"wXT" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/turf/open/gm/river, +/area/lv522/landing_zone_1/tunnel/far) "wYa" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -44651,22 +44150,6 @@ /obj/item/device/flashlight/lamp, /turf/open/floor/prison, /area/lv522/indoors/a_block/security) -"wYJ" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) -"wYU" = ( -/obj/structure/stairs/perspective{ - dir = 9; - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/prison/blue_plate/north, -/area/lv522/indoors/a_block/admin) "wZl" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -44680,15 +44163,6 @@ }, /turf/open/floor/wood, /area/lv522/indoors/a_block/executive) -"wZt" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/turf/open/floor/prison, -/area/lv522/indoors/c_block/cargo) "wZw" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 @@ -44733,6 +44207,19 @@ }, /turf/open/floor/prison/floor_plate, /area/lv522/indoors/a_block/admin) +"xam" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel/far) +"xat" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/southeast, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_2) "xay" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 @@ -44791,6 +44278,11 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) +"xbm" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/turf/open/asphalt/cement, +/area/lv522/outdoors/colony_streets/central_streets) "xbM" = ( /obj/structure/prop/vehicles/crawler{ icon_state = "crawler_fuel" @@ -44869,6 +44361,7 @@ pixel_x = -13; pixel_y = 2 }, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) "xdt" = ( @@ -44882,6 +44375,10 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_east_street) +"xdu" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/garage) "xdx" = ( /obj/effect/decal/cleanable/dirt, /obj/item/maintenance_jack, @@ -44927,6 +44424,10 @@ /obj/structure/bed/sofa/south/grey/right, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms) +"xeG" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/prison/floor_plate, +/area/lv522/indoors/a_block/corpo/glass) "xfp" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/plating/plating_catwalk/prison, @@ -45087,6 +44588,10 @@ "xjF" = ( /turf/closed/wall/strata_outpost, /area/lv522/indoors/a_block/executive) +"xjM" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/gm/river, +/area/lv522/indoors/c_block/mining) "xjO" = ( /obj/structure/window/framed/strata/reinforced, /turf/open/floor/corsat/marked, @@ -45101,6 +44606,24 @@ /obj/structure/closet/firecloset/full, /turf/open/floor/strata/blue1, /area/lv522/outdoors/colony_streets/windbreaker/observation) +"xjX" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/stair_cut/platform_right, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 8; + pixel_x = -6; + pixel_y = 6 + }, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 8; + pixel_x = 6; + pixel_y = 6 + }, +/turf/open/floor/plating, +/area/lv522/landing_zone_1/tunnel/far) "xjY" = ( /obj/structure/machinery/light{ dir = 1; @@ -45236,6 +44759,7 @@ /obj/structure/bed/chair{ dir = 1 }, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/floor_plate, /area/lv522/landing_zone_1/ceiling) "xnk" = ( @@ -45308,20 +44832,6 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat/marked, /area/lv522/indoors/a_block/hallway) -"xpu" = ( -/obj/structure/platform, -/turf/open/floor/prison/floor_plate, -/area/lv522/indoors/a_block/dorms) -"xpH" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" - }, -/turf/open/auto_turf/sand_white/layer0, -/area/lv522/outdoors/colony_streets/north_east_street) "xpX" = ( /obj/structure/barricade/deployable{ dir = 8 @@ -45374,6 +44884,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison, /area/lv522/indoors/a_block/dorms/glass) +"xrY" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/effect/decal/cleanable/dirt, +/turf/open/asphalt/cement/cement12, +/area/lv522/indoors/lone_buildings/engineering) "xsc" = ( /turf/closed/shuttle/dropship3/tornado{ icon_state = "29" @@ -45422,6 +44937,10 @@ }, /turf/open/floor/prison/blue_plate, /area/lv522/indoors/a_block/admin) +"xtA" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/asphalt/cement/cement4, +/area/lv522/outdoors/colony_streets/north_east_street) "xtH" = ( /obj/effect/spawner/gibspawner/human, /obj/item/device/defibrillator/compact, @@ -45480,6 +44999,14 @@ /obj/effect/spider/spiderling/nogrow, /turf/open/floor/prison, /area/lv522/indoors/c_block/t_comm) +"xvy" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/prison/floor_plate, +/area/lv522/outdoors/colony_streets/north_east_street) "xvB" = ( /obj/structure/window/framed/strata/reinforced, /turf/open/floor/corsat/marked, @@ -45574,6 +45101,10 @@ "xyu" = ( /turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, /area/lv522/landing_zone_forecon/UD6_Tornado) +"xyw" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/garage) "xyC" = ( /obj/structure/machinery/landinglight/ds2/delaythree, /obj/effect/decal/cleanable/dirt, @@ -45596,6 +45127,7 @@ pixel_y = 9 }, /obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) "xzK" = ( @@ -45618,6 +45150,15 @@ }, /turf/open/floor/corsat/marked, /area/lv522/indoors/c_block/mining) +"xAx" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/prop/ice_colony/dense/planter_box{ + dir = 9; + layer = 2.9 + }, +/obj/structure/flora/bush/ausbushes/var3/brflowers, +/turf/open/floor/prison/greenfull/east, +/area/lv522/indoors/b_block/bridge) "xAF" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 4 @@ -45837,6 +45378,12 @@ }, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1) +"xFi" = ( +/obj/item/stack/tile/wood{ + layer = 2.5 + }, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/containers) "xFp" = ( /turf/open/asphalt/cement, /area/lv522/outdoors/colony_streets/north_east_street) @@ -45869,6 +45416,11 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat/marked, /area/lv522/indoors/a_block/fitness) +"xFI" = ( +/obj/vehicle/train/cargo/trolley, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/prison, +/area/lv522/outdoors/colony_streets/containers) "xGa" = ( /obj/effect/decal/cleanable/blood/xeno{ icon_state = "xgib3" @@ -45925,6 +45477,10 @@ "xHz" = ( /turf/open/floor/prison/floor_plate, /area/lv522/indoors/a_block/corpo) +"xHL" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/gm/river, +/area/lv522/landing_zone_1/tunnel) "xHO" = ( /obj/structure/girder, /turf/open/asphalt/cement/cement12, @@ -46081,6 +45637,11 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/central_streets) +"xMa" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison, +/area/lv522/indoors/a_block/kitchen) "xMl" = ( /obj/structure/filingcabinet{ density = 0; @@ -46130,6 +45691,10 @@ }, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) +"xNk" = ( +/obj/structure/largecrate/random/barrel/true_random, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/containers) "xNo" = ( /obj/structure/surface/table/almayer, /obj/effect/landmark/objective_landmark/close, @@ -46177,12 +45742,6 @@ /obj/structure/machinery/conveyor, /turf/open/floor/plating, /area/lv522/indoors/c_block/cargo) -"xPg" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/prison, -/area/lv522/indoors/c_block/mining) "xPj" = ( /obj/structure/largecrate/random, /turf/open/floor/prison/darkbrownfull2, @@ -46323,13 +45882,6 @@ }, /turf/open/floor/prison, /area/lv522/indoors/c_block/garage) -"xRz" = ( -/obj/structure/platform_decoration, -/obj/structure/bed/roller, -/obj/effect/landmark/survivor_spawner, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/prison/blue_plate/north, -/area/lv522/indoors/a_block/admin) "xRE" = ( /turf/open/floor/prison/floor_marked, /area/lv522/outdoors/colony_streets/north_west_street) @@ -46355,6 +45907,10 @@ }, /turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_up_to_down, /area/lv522/landing_zone_forecon/UD6_Tornado) +"xRP" = ( +/obj/structure/cargo_container/horizontal/blue/top, +/turf/open/floor/prison/floor_marked, +/area/lv522/outdoors/colony_streets/containers) "xRQ" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/machinery/recharger{ @@ -46362,6 +45918,14 @@ }, /turf/open/floor/wood, /area/lv522/indoors/a_block/executive) +"xRS" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/structure/stairs/perspective{ + dir = 6; + icon_state = "p_stair_full" + }, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/landing_zone_2) "xSm" = ( /obj/effect/spawner/gibspawner/xeno, /obj/effect/decal/cleanable/dirt, @@ -46386,10 +45950,6 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/corsat/plate, /area/lv522/atmos/east_reactor/south) -"xSN" = ( -/obj/structure/largecrate/random/secure, -/turf/open/auto_turf/shale/layer1, -/area/lv522/outdoors/colony_streets/north_east_street) "xSP" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin{ @@ -46422,6 +45982,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/prison/whitegreenfull, /area/lv522/indoors/a_block/fitness) +"xTD" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/asphalt/cement/cement3, +/area/lv522/outdoors/colony_streets/north_east_street) "xTJ" = ( /obj/item/tool/kitchen/utensil/pknife{ pixel_x = -9 @@ -46506,15 +46070,6 @@ /obj/structure/closet/crate, /turf/open/floor/corsat/marked, /area/lv522/atmos/north_command_centre) -"xVH" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/gm/river, -/area/lv522/landing_zone_1/tunnel/far) "xVI" = ( /obj/effect/spawner/gibspawner/xeno, /obj/structure/pipes/standard/simple/hidden/green, @@ -46523,15 +46078,6 @@ "xVV" = ( /turf/open/asphalt/cement/cement15, /area/lv522/outdoors/colony_streets/south_west_street) -"xWb" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/asphalt/cement, -/area/lv522/outdoors/colony_streets/north_west_street) "xWc" = ( /turf/open/floor/corsat/plate, /area/lv522/atmos/north_command_centre) @@ -46603,14 +46149,15 @@ /area/lv522/indoors/a_block/dorms) "xXO" = ( /obj/structure/machinery/door/airlock/almayer/generic, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/corsat/marked, /area/lv522/landing_zone_1/ceiling) -"xXQ" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/asphalt/cement/cement1, -/area/lv522/outdoors/colony_streets/north_street) +"xXP" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/spawner/gibspawner/xeno, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/prison, +/area/lv522/indoors/a_block/dorms) "xXR" = ( /obj/structure/machinery/colony_floodlight, /turf/open/asphalt/cement, @@ -46632,12 +46179,6 @@ }, /turf/open/floor/carpet, /area/lv522/indoors/b_block/bar) -"xYx" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/prison, -/area/lv522/indoors/a_block/kitchen) "xYA" = ( /turf/open/floor/plating, /area/lv522/landing_zone_2) @@ -46703,6 +46244,13 @@ }, /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/mining) +"yap" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/prison/floor_plate, +/area/lv522/outdoors/colony_streets/east_central_street) "yar" = ( /obj/structure/fence, /obj/effect/decal/warning_stripes{ @@ -46783,21 +46331,16 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/prison/darkredfull2, /area/lv522/indoors/a_block/kitchen) -"ycw" = ( -/turf/open/floor/prison, -/area/lv522/atmos/cargo_intake) +"ycD" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/turf/open/auto_turf/sand_white/layer0, +/area/lv522/outdoors/colony_streets/north_east_street) "ycE" = ( /turf/open/floor/carpet, /area/lv522/indoors/b_block/bar) -"ycH" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/largecrate/random{ - layer = 2.9 - }, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/cargo) "ycM" = ( /obj/structure/prop/ice_colony/ground_wire{ dir = 4 @@ -46819,15 +46362,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/lv522/indoors/a_block/executive) -"ydy" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/largecrate/random{ - layer = 2.9 +"ydd" = ( +/obj/structure/prop/invuln/ice_prefab/roof_greeble{ + icon_state = "flagpole"; + layer = 4.11; + pixel_x = 4; + pixel_y = 3 }, -/turf/open/floor/plating, -/area/lv522/indoors/c_block/cargo) +/turf/open/auto_turf/shale/layer1, +/area/lv522/outdoors/colony_streets/containers) "ydz" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/recharge_station, @@ -46892,9 +46435,20 @@ }, /turf/open/floor/prison/floor_plate, /area/lv522/outdoors/colony_streets/north_west_street) +"yeO" = ( +/obj/structure/stairs/perspective{ + dir = 10; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/stair_cut/platform_right, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/cargo) "yfu" = ( /turf/open/floor/prison, /area/lv522/indoors/lone_buildings/storage_blocks) +"yfy" = ( +/turf/open/asphalt/cement/cement2, +/area/lv522/outdoors/colony_streets/containers) "yfz" = ( /obj/structure/largecrate/random/mini, /obj/effect/decal/cleanable/dirt, @@ -46939,6 +46493,17 @@ }, /turf/open/floor/prison, /area/lv522/indoors/c_block/casino) +"ygr" = ( +/obj/structure/fence, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/prison/floor_plate, +/area/lv522/outdoors/colony_streets/containers) "ygw" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, @@ -46965,6 +46530,10 @@ }, /turf/open/auto_turf/sand_white/layer0, /area/lv522/outdoors/colony_streets/south_street) +"yhu" = ( +/obj/structure/platform/metal/almayer, +/turf/open/floor/plating, +/area/lv522/indoors/c_block/garage) "yhy" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/firstaid/adv{ @@ -46989,6 +46558,7 @@ /turf/open/asphalt/cement/cement3, /area/lv522/outdoors/colony_streets/south_street) "yhU" = ( +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/floor_plate, /area/lv522/landing_zone_1/ceiling) "yif" = ( @@ -47107,6 +46677,10 @@ "yjL" = ( /turf/open/floor/corsat/plate, /area/lv522/atmos/east_reactor) +"yjN" = ( +/obj/structure/cargo_container/wy/right, +/turf/open/floor/prison/floor_marked, +/area/lv522/outdoors/colony_streets/containers) "yjP" = ( /obj/structure/surface/table/almayer, /obj/item/device/radio/off{ @@ -47189,6 +46763,7 @@ pixel_x = -7 }, /obj/effect/landmark/objective_landmark/close, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/prison/greenfull/east, /area/lv522/landing_zone_1/ceiling) "yld" = ( @@ -47221,12 +46796,9 @@ /area/lv522/indoors/a_block/admin) "ymc" = ( /obj/structure/window/framed/strata/reinforced, +/obj/effect/landmark/lv624/fog_blocker/short, /turf/open/floor/corsat/marked, /area/lv522/landing_zone_1/ceiling) -"ymf" = ( -/obj/structure/platform_decoration, -/turf/open/gm/river, -/area/lv522/landing_zone_1/tunnel/far) (1,1,1) = {" bMX @@ -48069,7 +47641,7 @@ cpy cpy cpy cpy -dvO +nGO cpy cpy cpy @@ -48210,11 +47782,11 @@ cpy cpy cpy cpy -nGe +aaC pez pFw qbf -pxb +aaa paT pxb pxb @@ -48274,7 +47846,7 @@ cpy cpy cpy cpy -dvO +nGO cpy cpy cpy @@ -48416,22 +47988,22 @@ cpy cpy cpy oyY -paT -pxb -pxb +aaD +aao +aao +aao +aao pxb pxb -pxb -pxb -nQz -tPf -unM +tVR +iMr +qSO ryU ryU ryU -jqO -tPf -vYK +uEK +iMr +dMZ pxb pxb pxb @@ -48622,14 +48194,14 @@ cpy cpy cpy hTW -pxb -xqp -pxb -pxb -pxb -nQz -tPf -oKc +aaa +aac +aaa +aaa +aaa +tVR +iMr +gom uZc ryU ryU @@ -48637,9 +48209,9 @@ xcY ryU ryU uZc -sOM -tPf -vYK +sZu +iMr +dMZ pxb xqp pxb @@ -48768,10 +48340,10 @@ cpy cpy cpy cpy -sHp -goo -rtI -rQL +dhO +uab +jNb +qoZ cpy cpy cpy @@ -48826,14 +48398,14 @@ cpy cpy cpy cpy -nGe -pwa -pwa -xqp -xqp -xqp -nQz -oKc +aaC +aab +aab +aac +aac +aac +aap +gom ryU ryU ryU @@ -48845,8 +48417,8 @@ pnj ryU ryU ryU -sOM -vYK +sZu +dMZ pxb xqp pwa @@ -48973,11 +48545,11 @@ cpy cpy cpy cpy -sHp -qUQ +dhO +cCg ruv rME -rNm +wtq lpe cpy cpy @@ -49033,12 +48605,12 @@ cpy cpy cpy nGJ -pwa -pwa -pxb -nQz -tPf -oKc +aab +aab +aaa +aap +aau +aaq ryU ryU uiM @@ -49052,9 +48624,9 @@ tAr uiM ryU ryU -sOM -tPf -vYK +sZu +iMr +dMZ pxb pwa pxb @@ -49178,12 +48750,12 @@ cpy cpy cpy cpy -cvA -qUQ +nKr +cCg rmA rza osc -rNm +wtq lpe cpy cpy @@ -49239,12 +48811,12 @@ cpy cpy cpy nMc -pxb -nQz -tPf -oKc -ryU -ryU +aaa +aap +aau +aaq +aah +aah ryU wuK uiM @@ -49260,9 +48832,9 @@ sQZ ryU ryU ryU -sOM -tPf -vYK +sZu +iMr +dMZ pxb pwa pxb @@ -49384,12 +48956,12 @@ cpy cpy cpy cpy -ltw +fIA qVN qZf qZf -rBz -rCu +wiq +cYd lpe cpy cpy @@ -49444,12 +49016,12 @@ cpy cpy cpy lJq -pxb -nQz -oKc -ryU -ryU -ryU +aaa +aap +aaq +aah +aah +aah wuK xfW xfW @@ -49468,8 +49040,8 @@ uVN ryU ryU ryU -sOM -vYK +sZu +dMZ pxb pwa pxb @@ -49590,11 +49162,11 @@ cpy cpy cpy lpe -ltw +fIA qYy cIS rzq -uks +fQa qZf cpy cpy @@ -49650,14 +49222,14 @@ cpy cpy cpy lJq -nQz -oKc -ryU -rhk -uTd -oyf -tns -fOc +aap +aaq +aah +aaA +aax +aav +aar +aaj uTd oyf tns @@ -49675,8 +49247,8 @@ oyf tns rhk ryU -sOM -vYK +sZu +dMZ pxb pwa pxb @@ -49796,11 +49368,11 @@ cpy cpy lpe lpe -qPq +vvN osc roM esO -uks +fQa lpe cpy cpy @@ -49855,15 +49427,15 @@ cpy cpy cpy cpy -pwa -lWj -uZc +aab +kCt +aag fSo -nFj -pRg -nFj -nFj -nFj +aak +aay +aak +aak +aak sYH sYH sYH @@ -49882,7 +49454,7 @@ pRg nFj vER uZc -wdY +fHd pxb pwa pxb @@ -49976,12 +49548,12 @@ bmR wGc bmR mNz -tdS -tzA +wnx +aOf tSJ scw -uEr -vgM +rPe +tCu uWO uWO wbt @@ -50002,11 +49574,11 @@ cpy cpy lpe qZf -qTH -qZB +hsD +ngM osc -rBz -bkg +wiq +mdU lpe cpy cpy @@ -50061,13 +49633,13 @@ tFx tFx tFx niA -pwa -oiC -ryU +aab +gwE +aah naS -nFj -nFj -nFj +aak +aak +aak sYH sYH sYH @@ -50088,7 +49660,7 @@ nFj sYH gnf ryU -wes +bAg pxb pwa pxb @@ -50209,9 +49781,9 @@ cpy cpy qZf qZf -qTH -rqT -rCu +hsD +cAl +cYd lpe cpy cpy @@ -50267,13 +49839,13 @@ wnP evg syM rnT -pxb +aaa ttT -ryU +aah haf -nFj -nFj -nFj +aak +aak +aak sYH sYH sYH @@ -50388,12 +49960,12 @@ tTb bmR aXR aom -teL -tzF +agh +lwd tSU rhB -uEz -vhd +irP +hgc wbt wbt wbt @@ -50473,9 +50045,9 @@ mvP ggS tFx rnT -pxb +aaa ttT -ryU +aah das sYH sYH @@ -50511,8 +50083,8 @@ cpy cpy eYM eYM -uRR -uRR +xHL +xHL eYM eYM eYM @@ -50679,9 +50251,9 @@ mxD uom ymc rnT -pxb +aaa ttT -ryU +aah eyy sYH sYH @@ -50721,7 +50293,7 @@ wfP wfP wfP eYM -sRM +aXZ eYM eYM cpy @@ -50851,10 +50423,10 @@ ien ien ien teE -jZe -tDQ -tDQ -tHC +gBf +hyh +hyh +ltk tQw vXc vXc @@ -50885,9 +50457,9 @@ myQ myZ ymc rnT -pxb +aaa ttT -ryU +aah naS sYH sYH @@ -50927,7 +50499,7 @@ wfP wfP wfP pNa -sRM +aXZ hTe eYM cpy @@ -51056,12 +50628,12 @@ cpy cpy ien teE -jZe -wky +gBf +vHP wPV tyl -tJk -tRS +qUU +vLU vXc vXc vXc @@ -51091,9 +50663,9 @@ rIM rIM tFx rnT -pxb +aaa ttT -ryU +aah haf sYH sYH @@ -51133,7 +50705,7 @@ wfP wfP wfP eYM -sRM +aXZ hTe eYM cpy @@ -51262,12 +50834,12 @@ cpy cpy xoj tfO -lpt +nIR abe ukT ofS tKb -tZs +ppZ vXc vXc vXc @@ -51297,9 +50869,9 @@ veQ fnA sSQ rnT -pxb +aaa ttT -ryU +aah das sYH sYH @@ -51339,7 +50911,7 @@ wfP wfP wfP eYM -sRM +aXZ hTe eYM cpy @@ -51468,12 +51040,12 @@ cpy ien xoj ien -lpt +nIR gJL ukT cAW tKo -uaY +nHq ueR vXc vXc @@ -51503,13 +51075,13 @@ max osN sSQ rnT -pxb +aaa ttT -ryU +aah eyy -nFj -nFj -nFj +aak +aak +aak sYH sYH sYH @@ -51545,7 +51117,7 @@ jJF wfP wfP eYM -sRM +aXZ hTe eYM cpy @@ -51674,18 +51246,18 @@ cpy cpy ien tfZ -lpt +nIR ttf tDR tIS tLX -tZs -ueW -unt +ppZ +fjL +dhZ vXc vXc -uxf -uCr +ihK +wuz vXc wdy rMF @@ -51709,13 +51281,13 @@ max osN sSQ rnT -pxb -jPg -ryU +aaa +qpa +aah naS -nFj -nFj -nFj +aak +aak +aak sYH sYH sYH @@ -51736,7 +51308,7 @@ nFj sYH gnf ryU -wjE +aDT pxb xqp pwa @@ -51751,7 +51323,7 @@ jJF wfP wfP eYM -sRM +aXZ hTe eYM cpy @@ -51880,18 +51452,18 @@ cpy bOX xoj tfZ -tqh -tyU +mIx +pxO wdj xdD -tOt -ubF -ufF -uqt +aef +xrY +nzO +nDd uuQ uuQ -uxi -uDC +fVc +nMv yiM fXx nJv @@ -51915,15 +51487,15 @@ max ien ien ien -pxb -lWj -uZc +aaa +kCt +aag fBL -nFj -pRg -nFj -nFj -nFj +aak +aay +aak +aak +aak sYH sYH sYH @@ -51942,7 +51514,7 @@ pRg nFj xEH uZc -wdY +fHd pxb pwa pxb @@ -51957,7 +51529,7 @@ jJF wfP wfP eYM -sRM +aXZ hTe eYM cpy @@ -52092,12 +51664,12 @@ tEW tEW tOM udv -ugi +mkB utq uwb uwb uzD -uKD +kHM uPv uPv nJv @@ -52121,15 +51693,15 @@ max osN sSQ rnT -pxb -lgY -oKG -ryU -uEH -vJj -jIk -aGS -dhP +aaa +eDh +aan +aah +aaB +aaz +aaw +aas +aal vJj jIk aGS @@ -52147,8 +51719,8 @@ jIk aGS uEH ryU -gPv -gVn +qsp +pSd pwa pwa pxb @@ -52163,7 +51735,7 @@ wfP wfP wfP eYM -sRM +aXZ hTe eYM cpy @@ -52298,12 +51870,12 @@ nKj she she tQw -uhP -utR +rcC +gix uxd uxd -uAd -uLw +iua +gIP yiM fAA nJv @@ -52327,14 +51899,14 @@ max osN sSQ rnT -pxb -pxb -lgY -oKG -ryU -ryU -ryU -tgq +aaa +aaa +eDh +aan +aah +aah +aah +aat qcO qjq uiM @@ -52352,8 +51924,8 @@ tgq ryU ryU ryU -gPv -gVn +qsp +pSd pxb pwa pwa @@ -52369,7 +51941,7 @@ wfP wfP wfP eYM -sRM +aXZ hTe eYM eYM @@ -52504,12 +52076,12 @@ she she jnr yiM -uiK -uur +mGC +pfJ yiM yiM -uiK -uur +mGC +pfJ yiM taj nJv @@ -52533,15 +52105,15 @@ max ien ien ien -pwa -pxb -pxb -lgY -udi -oKG -ryU -ryU -ryU +aab +aaa +aaa +eDh +aae +aan +aah +aah +aah qjq qkw wuK @@ -52556,9 +52128,9 @@ tgq ryU ryU ryU -gPv -udi -gVn +qsp +kqp +pSd pxb pxb pwa @@ -52575,7 +52147,7 @@ wfP wfP wfP eYM -sRM +aXZ pxG hTe eYM @@ -52739,15 +52311,15 @@ max osN sSQ rnT -pwa -pwa -pxb -pxb -pxb -lgY -udi -oKG -ryU +aab +aab +aaa +aaa +aaa +eDh +aae +aan +aah ryU uiM uiM @@ -52760,9 +52332,9 @@ uiM uiM ryU ryU -gPv -udi -gVn +qsp +kqp +pSd pxb pxb pxb @@ -52781,7 +52353,7 @@ wfP wfP nxF eYM -sRM +aXZ hTe ixL eYM @@ -52945,15 +52517,15 @@ max osN sSQ rnT -pwa -pwa -pwa -pxb -pxb -pxb -pxb -lgY -oKG +aab +aab +aab +aaa +aaa +aaa +aaa +eDh +aan ryU ryU ryU @@ -52965,8 +52537,8 @@ pnj ryU ryU ryU -gPv -gVn +qsp +pSd pxb pxb pxb @@ -52975,7 +52547,7 @@ pxb pwa pwa pwa -pxb +aaa cpy cpy eYM @@ -52987,8 +52559,8 @@ ivb wfP wfP eYM -vBm -qxk +eZC +bfJ hTe eYM cpy @@ -53156,32 +52728,32 @@ jZD jZD jZD oiY -pxb -pxb -pxb -lgY -udi -oKG +aaa +aaa +aaa +eDh +kqp +gRi uZc -ryU -ryU -xcY -ryU -ryU -uZc -gPv -udi -gVn -pxb -pxb -pxb -pxb -pxb -pxb -pwa -xqp -pwa -pxb +aah +aah +aai +aah +aah +aag +aaf +aae +aad +aaa +aaa +aaa +aaa +aaa +aaa +aab +aac +aab +aaa cpy eYM eYM @@ -53194,7 +52766,7 @@ wfP jJF eYM eYM -sRM +aXZ hTe eYM cpy @@ -53362,31 +52934,31 @@ tFx ymc tFx rnT -pxb -pxb -pxb -pxb -pxb -lgY -udi -qDt -ryU -ryU -ryU -taW -udi -gVn -pxb -pxb -pxb -pxb -pxb -pxb -pwa -pwa -pwa -xqp -xqp +aaa +aaa +aaa +aaa +aaa +eDh +aae +sMW +aah +aah +aah +iSC +aae +aad +aaa +aaa +aaa +aaa +aaa +aaa +aab +aab +aab +aac +aac cpy cpy eYM @@ -53400,7 +52972,7 @@ wfP jJF xIK eYM -sRM +aXZ hTe eYM cpy @@ -53568,31 +53140,31 @@ ojb uom ymc rnT -pxb -pxb -pxb -pwa -pwa -pxb -pxb +aaa +aaa +aaa +aab +aab +aaa +aaa qDD rys rys rys jYK -pxb -pxb -pxb -pxb -pwa -pwa -pxb -pwa -pwa -pwa -pxb -xqp -xqp +aaa +aaa +aaa +aaa +aab +aab +aaa +aab +aab +aab +aaa +aac +aac cpy cpy eYM @@ -53606,7 +53178,7 @@ wfP wfP jJF eYM -sRM +aXZ hTe eYM cpy @@ -53774,31 +53346,31 @@ uol rzz ymc rnT -pxb -pxb -pwa -pwa -pwa -pwa -pwa -pwa -pxb -pxb -pxb -pxb -pxb -pxb -pxb -pwa -pwa -pwa -pwa -pwa -pwa -pxb -pxb -pwa -xqp +aaa +aaa +aab +aab +aab +aab +aab +aab +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aab +aab +aab +aab +aab +aab +aaa +aaa +aab +aac cpy cpy eYM @@ -53812,7 +53384,7 @@ wfP wfP jJF eYM -sRM +aXZ hTe eYM cpy @@ -53925,8 +53497,8 @@ nLm nLm bwy dBa -nOl -xpu +uro +wKX fEW jOr nLm @@ -53980,31 +53552,31 @@ nEq rzz syM rnT -pxb -pwa -pwa -pwa -xqp -pwa -pwa -pwa -pwa -pwa -pwa -pwa -pxb -pxb -pwa -pwa -pwa -pwa -pwa -pwa -pxb -pxb -pxb -pxb -pxb +aaa +aab +aab +aab +aac +aab +aab +aab +aab +aab +aab +aab +aaa +aaa +aab +aab +aab +aab +aab +aab +aaa +aaa +aaa +aaa +aaa cpy cpy eYM @@ -54018,7 +53590,7 @@ wfP wfP rcR eYM -sRM +aXZ hTe eYM cpy @@ -54128,14 +53700,14 @@ clY sjY miW nLm -nWK -jfZ -jfZ -sWt -fgk -tHJ -jfZ -ftA +gPy +tNa +tNa +hrO +kzm +xXP +tNa +luu nLm rvI hJZ @@ -54186,23 +53758,23 @@ vbu oPR ymc rnT -pwa -pwa -pwa -pxb -xqp -xqp -pwa -pwa -xqp -xqp -xqp -pwa -pwa -pwa -pwa -pwa -pwa +aab +aab +aab +aaa +aac +aac +aab +aab +aac +aac +aac +aab +aab +aab +aab +aab +aab tMq jZD jZD @@ -54224,7 +53796,7 @@ jJF wfP rcR eYM -sRM +aXZ hTe eYM cpy @@ -54392,23 +53964,23 @@ omG oRS ymc rnT -pwa -pwa -pxb -cpy -pxb -pxb -pxb -pwa -rAu -umK -sCb +aab +aab +aaa +cpy +aaa +aaa +aaa +aab +pdx +gag +hJI tfb -tMt -umK -uFp -pwa -pwa +cIc +gag +bei +aab +aab vtN tFx tFx @@ -54430,7 +54002,7 @@ ntT wfP wfP eYM -sRM +aXZ hTe eYM cpy @@ -54598,21 +54170,21 @@ ymc tFx tFx rnT -pxb -pxb +aaa +aaa cpy cpy -pxb -pxb -pxb -rAu -rOw +aaa +aaa +aaa +pdx +bHf tFx tFx xXO tFx tFx -uKY +nxk jZD jZD vGo @@ -54636,7 +54208,7 @@ eYM jCh eYM eYM -sRM +aXZ hTe eYM cpy @@ -54796,22 +54368,22 @@ max max tZh osN -tFx -tFx +aaE +aaE eiP rzz jQC tFx tFx rnT -pxb -pxb -pxb -pxb -pxb -pxb -pwa -gej +aaa +aaa +aaa +aaa +aaa +aaa +aab +kRM tFx tFx pQG @@ -54830,7 +54402,7 @@ yhU vAW tFx eYM -uEV +jwh sdN wfP jJF @@ -54842,7 +54414,7 @@ nSq wfP jJF vTQ -sRM +aXZ eYM eYM cpy @@ -55010,14 +54582,14 @@ vbu rzz ymc rnT -pxb -pxb -pxb -pxb -pxb -pxb -pwa -gej +aaa +aaa +aaa +aaa +aaa +aaa +aab +kRM tFx ykU rzz @@ -55035,8 +54607,8 @@ yhU yhU ggS tFx -eZW -pET +hgI +mug wfP wfP wfP @@ -55048,7 +54620,7 @@ jJF wfP wfP vTQ -sRM +aXZ eYM cpy cpy @@ -55216,14 +54788,14 @@ uol rzz syM rnT -pxb -pxb -pxb -pxb -pxb -pwa -pwa -gej +aaa +aaa +aaa +aaa +aaa +aab +aab +kRM ymc gQy xni @@ -55254,7 +54826,7 @@ wfP wfP wfP uIF -sRM +aXZ eYM cpy cpy @@ -55429,7 +55001,7 @@ jZD jZD ien jZD -saL +iGt ymc muO yhU @@ -55437,8 +55009,8 @@ tfl tKS nEq vuu -uXu -vdP +poS +bLK vjC vuu vAW @@ -55447,8 +55019,8 @@ nEq ggS tVj tFx -cLB -kZq +brf +ujg jJF qVQ jJF @@ -55460,7 +55032,7 @@ wfP jJF jJF uIF -sRM +aXZ eYM cpy cpy @@ -55635,7 +55207,7 @@ fLF fLF ien fLF -gKg +gCP tFx vCE yhU @@ -55666,7 +55238,7 @@ wfP wfP wfP vTQ -sRM +aXZ eYM cpy cpy @@ -55827,7 +55399,7 @@ max max gMQ fnA -tFx +aaE rIM rIM rIM @@ -55841,7 +55413,7 @@ veQ veQ ien veQ -qLu +sbF aFf fDF tKS @@ -56047,7 +55619,7 @@ max max max max -ewn +gxZ aFf sjd rzz @@ -56253,7 +55825,7 @@ max max max max -ewn +gxZ tFx tFx sIE @@ -56281,9 +55853,9 @@ cpy cpy cpy eYM -iIa +gkz drd -uug +qWV eYM cpy cpy @@ -56459,15 +56031,15 @@ max max max max -seX -rYq +gXH +tXZ tFx rIM rIM rIM tFx -uOA -irR +akj +pHA xVV ofi ofi @@ -56487,9 +56059,9 @@ bPJ bPJ bPJ bPJ -aue +ick nZP -dnO +qms bPJ bPJ bPJ @@ -56575,14 +56147,14 @@ xtb jyf ydA ydA -njd -cWS -iYf +kkM +kFC +qlG ydA ydA ydA -njd -xWb +kkM +eUM nLm weR nLm @@ -56666,13 +56238,13 @@ max max max max -seX -szo -szo -szo -szo -szo -uTK +gXH +kuq +kuq +kuq +kuq +kuq +wjM xVV ofi ofi @@ -56688,10 +56260,10 @@ ofi ofi oAY bPJ -xVH -kEl -peM -jba +fBi +lnq +wEG +vIz bPJ edi pXv @@ -56783,11 +56355,11 @@ xyL xyL xtb nTv -kMi +jRX iiE iiE iiE -oYa +jMo nTv nLm sdM @@ -57100,10 +56672,10 @@ tZh ofi oAY bPJ -fYD -orA -ymf -sHd +gSB +tLi +aQW +hXx bPJ eeb nZP @@ -57317,7 +56889,7 @@ nZP nZP nZP nZP -hHe +oZK bPJ cpy bMX @@ -57523,7 +57095,7 @@ nZP nZP nZP pXv -hHe +oZK bPJ cpy bMX @@ -57729,7 +57301,7 @@ nZP nZP nZP enB -hiL +wXT bPJ cpy bMX @@ -57813,11 +57385,11 @@ uEC vSO xtb nTv -oTc +jDi iIw iIw iIw -ovT +oiq nTv nLm qxZ @@ -58018,13 +57590,13 @@ uEC uEC nVh xtb -vGb -wNo +hIi +jdi hhD hhD sKa -xXQ -gIc +lZo +wDo nLm nLm weR @@ -58965,7 +58537,7 @@ ygJ bPJ ica nZP -fvn +cor bPJ cpy bMX @@ -59169,9 +58741,9 @@ oAY bPJ bPJ bPJ -qKV +jun enB -hHe +oZK bPJ cpy bMX @@ -59375,9 +58947,9 @@ cfO xkJ bPJ bPJ -fCb +hkE enB -hHe +oZK bPJ cpy bMX @@ -59580,10 +59152,10 @@ max max oAY bPJ -oeN -rgS +xam +iGy nZP -hiL +wXT bPJ cpy bMX @@ -60198,8 +59770,8 @@ max max oAY bPJ -kHW -cJF +dTQ +uYZ nZP gkH bPJ @@ -60405,7 +59977,7 @@ oaW xkJ bPJ bPJ -aRB +rDz enB bPJ bPJ @@ -60611,7 +60183,7 @@ oAY bPJ bPJ bPJ -bLA +fgw enB nZP bPJ @@ -60819,7 +60391,7 @@ cpy bPJ nZP enB -fvn +cor bPJ cpy bMX @@ -61025,7 +60597,7 @@ cpy bPJ nZP uwe -hHe +oZK bPJ cpy bMX @@ -61203,8 +60775,8 @@ aPu cGw wIr wIr -jhY -kkq +joI +ojR uOd uOd kLO @@ -61216,8 +60788,8 @@ fTN lvl ndZ gBv -lul -jhY +ddB +joI wIr wIr xSA @@ -61231,7 +60803,7 @@ bPJ bPJ nZP nZP -hHe +oZK bPJ cpy bMX @@ -61410,7 +60982,7 @@ aPu tcE wIr wIr -dbP +ltN cbR cbR cbR @@ -61422,7 +60994,7 @@ cbR cbR cbR cbR -moe +sZD wIr wIr vDL @@ -62844,15 +62416,15 @@ oIu tOo wIr wIr -pXz -foR +skC +aYm spJ fTP -iyT -riZ +chH +hsa wIr wIr -sYv +fic ncg ncg ncg @@ -62864,7 +62436,7 @@ ncg ncg ncg ncg -mRh +tVx wIr wIr vDL @@ -62959,8 +62531,8 @@ xtb fIr fIr fIr -qfD -vLu +cfR +pnb wCC fjr fjr @@ -63048,17 +62620,17 @@ lyD mPr hFX bCy -iUX +fHX wIr wIr -hwa +sWW qTr clR -dne +eYd wIr wIr -jic -kHX +laF +lZB oIu oIu oIu @@ -63070,8 +62642,8 @@ oIu oIu oIu oIu -nlY -nRy +fIs +oNF wIr wIr epq @@ -63254,16 +62826,16 @@ mPr mPr hFX hFX -iVk -bYV +hDB +wLS wIr wIr bZV mpF wIr wIr -rZK -jig +iMV +oIf mPr mPr mPr @@ -63371,8 +62943,8 @@ kkc qDL nqy uLp -vlN -jBU +uqH +joX emH emH emH @@ -63696,9 +63268,9 @@ kOa jyM nax mnb -ouj +vMC abJ -pdp +kWO nZP nZP nZP @@ -63902,9 +63474,9 @@ tKB nax nax mnb -gmu +jwS nYU -geT +oEC nZP enB enB @@ -64108,9 +63680,9 @@ pCv nax mPr mnb -gmu +jwS abJ -tlB +mph nZP enB bPJ @@ -64229,14 +63801,14 @@ iqg wwX rqs pQE -vSN -hHh -cWT -cWT -cWT -cWT -cWT -kEZ +ovz +hgT +rbA +rbA +rbA +rbA +rbA +gxD yiM yiM lSq @@ -64314,9 +63886,9 @@ pCv nax mPr mnb -eDq +ggo abJ -gJr +wsm nZP nZP bPJ @@ -64442,8 +64014,8 @@ uKj fdZ lVp lVp -aHH -kEZ +xbm +gxD yiM lSq trZ @@ -64522,9 +64094,9 @@ yhR tOo bPJ abJ -pHi +kKV nZP -uIY +uHz bPJ cpy cpy @@ -64636,10 +64208,10 @@ wua wua sjy kfw -csv +dNM lkj lxL -otT +tRj ogK lVp lVp @@ -64649,7 +64221,7 @@ wGG xaM lVp lVp -jzu +pSF vXc wxB sKc @@ -64677,9 +64249,9 @@ jmG rMF rMF jmG -fRq +rSX six -fFF +ndK jmG rMF rMF @@ -64728,9 +64300,9 @@ jas jas jas ezu -qPL +xjX wfC -uzr +uqy bPJ cpy cpy @@ -64812,12 +64384,12 @@ oUq oUq oUq oUq -uQg -lPY +jFy +wcg mjs wvO wvO -wSr +qVP oUq oUq tvO @@ -64842,10 +64414,10 @@ jUg uVj sjy ogK -oud +aZZ dbQ lxL -nTD +xMa wIL lVp lWh @@ -64855,7 +64427,7 @@ awj cTz hVu lVp -jzu +pSF vXc vXc yiM @@ -64883,9 +64455,9 @@ jmG jmG jmG jmG -uSY +imz cqb -rgG +rGF jmG jmG jmG @@ -65023,7 +64595,7 @@ lQS mlE xBi xBi -jyw +uOW oUq oUq tvO @@ -65048,10 +64620,10 @@ jft xbj sjy mNR -xYx +jvq oLd wob -nTD +xMa izj lVp lWh @@ -65061,7 +64633,7 @@ xkr wSt gYX roL -jzu +pSF vXc gsP qtN @@ -65143,7 +64715,7 @@ sCi ezu wbo mfK -aLY +mNU jas ezu cpy @@ -65232,9 +64804,9 @@ xBi wTu wTu lqY -jBU +joX mGN -nKm +tKq sjy hOL ebn @@ -65254,10 +64826,10 @@ uqx sjy sjy izj -xYx +jvq oLd wob -nZd +kYw kfw lVp hyE @@ -65267,7 +64839,7 @@ owg jfO ogE rrV -jzu +pSF vXc uWD xkO @@ -65349,7 +64921,7 @@ wHz ezu wbo mfK -aLY +mNU uLv ezu cpy @@ -65438,9 +65010,9 @@ mEp xBi wTu oUq -jDy +wHv mJS -qbi +mEL sjy whz jpc @@ -65459,12 +65031,12 @@ leh xxs dzd sjy -ogX -asF +gfH +msN oLd wTr -tfi -tYx +umV +hNr lVp eDi wSt @@ -65473,7 +65045,7 @@ yca gXT gif isA -jzu +pSF vXc uWD xkO @@ -65499,13 +65071,13 @@ izz fwT ild jwM -qsr +uCP jmG wYe wiE qHj jmG -etN +wuw hOB vVS ild @@ -65555,8 +65127,8 @@ hrU ezu nQu gXy -pRY -jFP +flT +xjM ezu cpy cpy @@ -65679,7 +65251,7 @@ yca jfO uaH isA -jzu +pSF vXc uWD xkO @@ -65705,13 +65277,13 @@ ild ild ild jwM -pUR +gca jmG wly unC yhi jmG -hrl +yeO jwM uKS ild @@ -65762,7 +65334,7 @@ sQY nQu wbo ydO -aLY +mNU ezu cpy cpy @@ -65813,7 +65385,7 @@ wUp wUp wUp saC -equ +qOO wBR eLU wBR @@ -65885,7 +65457,7 @@ jfO gLg tZi lVp -jzu +pSF vXc uWD xkO @@ -65911,7 +65483,7 @@ ild ild ild ild -fPv +cel six wly unC @@ -65968,7 +65540,7 @@ ezu nQu nQu gXy -aLY +mNU ezu cpy cpy @@ -66019,7 +65591,7 @@ jfH ecK wUp wUp -eqD +dKD eGQ xZE saC @@ -66091,7 +65663,7 @@ wSt tjV nKk lVp -jzu +pSF vXc uWD xkO @@ -66117,7 +65689,7 @@ ldC ldC ldC ldC -iqw +hUh cxK jze grP @@ -66174,7 +65746,7 @@ ezu wbo nQu gXy -aLY +mNU ezu cpy cpy @@ -66297,7 +65869,7 @@ lNs jfO iqZ lVp -jzu +pSF vXc hxn eOE @@ -66323,13 +65895,13 @@ ild whE weM mbO -pum +jCZ jmG wYe qic yhi jmG -mFZ +egI ild ild ild @@ -66380,7 +65952,7 @@ ezu kNo nQu gXy -aLY +mNU ezu cpy cpy @@ -66503,7 +66075,7 @@ lNs yca uaH isA -jzu +pSF vXc yiM yiM @@ -66529,13 +66101,13 @@ jwM ild ild ild -tkm +auv jmG wly unC yhi jmG -wov +mng xDR xPa xNi @@ -66709,7 +66281,7 @@ eAC yca gYX isA -jzu +pSF vXc vXc yiM @@ -66737,9 +66309,9 @@ ild xJd jwM jmG -wZt +shl yhi -taw +tqZ jmG ild xDD @@ -66915,7 +66487,7 @@ eAC jfO gYX isA -jzu +pSF yiM vXc vXc @@ -66943,9 +66515,9 @@ ftK pMs jEW jmG -nnB +mFD fvN -ful +ngp jmG ild xDD @@ -66985,7 +66557,7 @@ jas jas fZS xcn -qSW +lxs pBn ozw vjr @@ -67121,7 +66693,7 @@ jfO jfO gYX isA -jzu +pSF yiM yiM vXc @@ -67168,16 +66740,16 @@ jmG xAR mPr hFX -iVU -jeD +lVn +tLf wIr wIr bZV mpF wIr wIr -jfK -jCQ +rSz +urI mPr mPr mPr @@ -67191,7 +66763,7 @@ jas dxY wQy uVw -xPg +bEx vpe eso jpx @@ -67327,7 +66899,7 @@ yca hLK uWz lVp -jzu +pSF vXc yiM yiM @@ -67374,16 +66946,16 @@ jmG xAR mPr tEu -iUX +fHX wIr wIr -pNJ +arv eMj xnp -tPa +jYH wIr wIr -jIQ +chh mcO mPr mPr @@ -67397,7 +66969,7 @@ eKc vpe vpe sVJ -bXZ +mmN fhl nQu vxf @@ -67533,7 +67105,7 @@ iCR pDA lVp lVp -eyc +tUv iPR iPR iPR @@ -67571,23 +67143,23 @@ ifB ptp jmG jmG -ycH -gQV -piY -piY -aDh +cgn +bJn +szQ +szQ +qcp jmG tOo yhR tOo wIr wIr -qsL -sHb +uvT +auL oqp qzQ -dAQ -tYt +mIB +xAx wIr wIr tyh @@ -67603,7 +67175,7 @@ lhI vpe vpe kpB -bXZ +mmN wwc vlp nDR @@ -67805,11 +67377,11 @@ mPr nax fki jas -kdi +kqS rqP rqP -vrW -cpx +ocl +kyp hNk vpe vpe @@ -67905,13 +67477,13 @@ uuW lfS vpO wwM -wcT -taO -taO -taO -taO -taO -nFc +bsR +qXU +qXU +qXU +qXU +qXU +hBa wwM mrD sjy @@ -68111,13 +67683,13 @@ uwn tQe vpO aVD -oLu +npm beB mQw mZW njF beB -mcC +oso vQL vpO sjy @@ -68317,13 +67889,13 @@ uwY uTv vpO mnX -mzX +vEY beB mSc mSc mSc beB -nFt +xeG vQL vpO kUM @@ -68523,13 +68095,13 @@ lxW lKC vpO moZ -eLN +fPG beB mSl mZX nly beB -mcC +oso vQL ojn ryv @@ -68729,13 +68301,13 @@ lfS wrC vqH mpQ -mAW -mHP -mHP -naC -nmX -nuL -nGc +buk +rtN +rtN +pyR +sby +fNb +jmB nuG uWh sjy @@ -69013,11 +68585,11 @@ xPK oTG jmG jmG -pjm -opQ -ydy -opQ -opQ +oLV +gCt +pyQ +gCt +gCt jmG xzK xxq @@ -69342,8 +68914,8 @@ spy qnS uRL qSH -qbu -rYi +jQt +pTo wrC bEk iIG @@ -69423,7 +68995,7 @@ spM jmG jmG jmG -lcD +bMT ild rdF ild @@ -69548,7 +69120,7 @@ nQQ qSH trV qSH -onj +lsa wKg wKg wKg @@ -69628,8 +69200,8 @@ yhi wiE woi jmG -eSy -wov +rur +mng ild iSF jwM @@ -69754,7 +69326,7 @@ jGa qSH trV qSH -ozQ +uFf wKg wKg vtl @@ -70372,7 +69944,7 @@ jOw qSH trV umR -prU +vYa wKg wKg xlI @@ -70578,7 +70150,7 @@ xZE qSH lsR umR -pul +hyb wKg wKg xjF @@ -70784,8 +70356,8 @@ kdx vGp trV umR -qbD -umg +mrf +lLp xjF xjF vtp @@ -71015,9 +70587,9 @@ uNB ulZ ulZ ulZ -mUG -ngK -mnz +qUY +iGX +aff jZc wIE ulZ @@ -71221,9 +70793,9 @@ uNB ulZ ulZ wIE -mVi +icC mxg -tAu +ehJ hre oTY ulZ @@ -71427,9 +70999,9 @@ uNB ulZ wIE eKm -pFF -qsU -kmF +wzQ +neQ +pWB wIE bWA ulZ @@ -71473,17 +71045,17 @@ pDU hRz vNk woi -pka -ofZ -pwu +ipz +ljm +vCi wly wiE -taw -aYQ -gJM +tqZ +rDU +ocL jmG -gND -jSB +cBz +hRJ jwM okA bbd @@ -71681,15 +71253,15 @@ vNk vNk vNk vNk -mFA +rMp eur cqb -rgG +rGF jmG jmG jmG jmG -rCM +gKO six jmG jmG @@ -72070,9 +71642,9 @@ cpy cpy cpy rnB -wzS -rfg -qtg +ojT +jXf +fxH rnB rnB rnB @@ -72276,9 +71848,9 @@ cpy cpy cpy rnB -plN +fSB pOa -jKb +yap tTD rnB rnB @@ -72482,9 +72054,9 @@ cpy cpy cpy rnB -rFh -rKe -rUg +evD +qYe +pQO tTD rnB rnB @@ -73281,9 +72853,9 @@ uNB fkj mtI mHU -mUG -ngK -mnz +qUY +iGX +aff bWd jHi fkj @@ -73487,9 +73059,9 @@ uNB gUi jHi fkj -mVi +icC mxg -tAu +ehJ mHU fkj fkj @@ -73693,9 +73265,9 @@ uNB fkj fkj mHU -pFF -qsU -kmF +wzQ +neQ +pWB fkj mtI fkj @@ -73870,9 +73442,9 @@ iJE gok rtX vGB -mTa -oqn -pdv +cJq +svQ +hLf fcW qSH qSH @@ -74076,9 +73648,9 @@ rtX iJE rtX vGB -ncz +xvy kKj -pgp +edE fcW qSH qSH @@ -74282,9 +73854,9 @@ rhh rtX xjU wDj -nff -oxT -pgG +qfQ +hoh +pQo fcW qSH vGp @@ -74406,9 +73978,9 @@ ctE ctE ctE jas -lYG +hRt nQu -hcO +ipu ezu cpy cpy @@ -74612,9 +74184,9 @@ ctE ctE ctE jas -uCo +ubM sid -glQ +tEJ ezu cpy cpy @@ -76528,14 +76100,14 @@ cpy cpy cpy cpy -dHF -fdS -dHF -dHF -dHF -dHF -dHF -haR +aRf +gzF +aRf +aRf +aRf +aRf +aRf +fPc ien ien xoj @@ -76734,15 +76306,15 @@ cpy cpy cpy ien -eXe -vGp -vGp -qSH -qSH -eJq -qSH -qSH -hmz +cDO +lBM +lBM +pvZ +pvZ +nEh +pvZ +pvZ +xNk ien cpy cpy @@ -76754,14 +76326,14 @@ jJO jJO jJO wDj -eyh -eyh -ltB -ltB -bBW -ltB -ltB -nQa +ucN +ucN +xTD +xTD +rcD +xTD +xTD +elm qSH qSH qSH @@ -76941,14 +76513,14 @@ ien ien ien ien -vGp -vGp -qSH -ggM -qSH -qSH -qSH -hmz +lBM +lBM +pvZ +amz +pvZ +pvZ +pvZ +xNk ien cpy cpy @@ -76967,8 +76539,8 @@ rJf qiG rJf dRL -guE -nQa +ajs +elm qSH qSH qSH @@ -77143,17 +76715,17 @@ cpy ien ien ien -kBK -kBK +dWU +dWU ien -vGp -vGp -vGp -qSH -qSH -qSH -qSH -qSH +lBM +lBM +lBM +pvZ +pvZ +pvZ +pvZ +pvZ ien ien ien @@ -77174,8 +76746,8 @@ qje qSj dRL dRL -guE -nQa +ajs +elm qSH qSH qSH @@ -77183,7 +76755,7 @@ vGp vGp cpy pZo -tWt +xtA tDS tDS thc @@ -77348,19 +76920,19 @@ cpy cpy cpy ien -xSN -kBK -vGp -ntN -vGp -vGp -qSH -qSH -qSH -qSH -qSH -vGp -vGp +lEr +dWU +lBM +uST +lBM +lBM +pvZ +pvZ +pvZ +pvZ +pvZ +lBM +lBM ien cpy dRL @@ -77381,15 +76953,15 @@ xCT rsl dRL dRL -guE -nQa +ajs +elm qSH qSH qSH vGp vGp pZo -onj +lsa tDS bTF lbK @@ -77405,7 +76977,7 @@ oHQ gqh oHQ dkh -xRz +dMk gdO vSV oyB @@ -77554,18 +77126,18 @@ cpy cpy cpy ien -vGp -vGp -vGp -ntN -vGp -qSH -qSH -qSH -ghr -qSH -qSH -vGp +lBM +lBM +lBM +uST +lBM +pvZ +pvZ +pvZ +hXo +pvZ +pvZ +lBM cpy ien cpy @@ -77588,14 +77160,14 @@ xCT rvw dRL dRL -fKf +cTq qSH qSH qSH vGp vGp pZo -onj +lsa svf prT qIu @@ -77606,12 +77178,12 @@ vZI sWr pVo mpr -mIV -wYU +vKH +vnn ixW lNm ixW -nPL +eZP gdO okE ozR @@ -77691,15 +77263,15 @@ dhH wQa wQa eXG -dkX -rBd -ewE +viu +leU +pfk hIf hIf hIf -iIQ -rBd -sfO +vuL +leU +qQa eXG wQa wQa @@ -77761,16 +77333,16 @@ cpy ien ien ien -vGp -vGp -ntN -qSH -qSH -qSH -qSH -qSH -qSH -vGp +lBM +lBM +uST +pvZ +pvZ +pvZ +pvZ +pvZ +pvZ +lBM cpy ien ien @@ -77794,14 +77366,14 @@ rsq xCT yfP rJf -fKf +cTq qSH qSH qSH qSH vGp pZo -onj +lsa fRk ibk gjF @@ -77812,7 +77384,7 @@ sWr sWr oMi muV -mJt +eUb tDS xaj wUx @@ -77895,9 +77467,9 @@ vDo tos dhH wQa -dkX -rBd -nPb +viu +leU +xat lfA rVR hIf @@ -77905,9 +77477,9 @@ rqn iGr iGr gRp -jGp -rBd -sfO +oSk +leU +qQa eXG eXG eXG @@ -77966,16 +77538,16 @@ cpy cpy cpy ien -kBK -vGp -vGp -ntN -qSH -qSH -qSH -qSH -qSH -vGp +dWU +lBM +lBM +uST +pvZ +pvZ +pvZ +pvZ +pvZ +lBM cpy cpy cpy @@ -78000,14 +77572,14 @@ xCT xCT yfP rJf -fKf +cTq qSH qSH qSH qSH vGp pZo -onj +lsa fRk prT orS @@ -78018,7 +77590,7 @@ wGY sWr xxU hag -fzl +rqH mKA sQb lOk @@ -78100,8 +77672,8 @@ wZz vDo tos dhH -dkX -nPb +viu +xat gRp iGr iGr @@ -78113,8 +77685,8 @@ lhE iGr iGr hIf -jGp -sfO +oSk +qQa eXG eXG eXG @@ -78172,17 +77744,17 @@ cpy cpy cpy ien -xSN -xSN -vGp +lEr +lEr +lBM ien -vGp -eXe -qSH -qSH -qSH -vGp -vGp +lBM +cDO +pvZ +pvZ +pvZ +lBM +lBM cpy cpy ien @@ -78206,14 +77778,14 @@ xCT xCT yfP rJf -fKf +cTq vGp qSH qSH qSH qSH pZo -onj +lsa fRk ibk qcd @@ -78273,10 +77845,10 @@ cUG cUG cUG cUG -izr +mYJ swF fzV -qqR +lUZ cUG iQR hMz @@ -78304,9 +77876,9 @@ ycc ycc wZz vDo -sbh -hhb -nPb +hVH +qCM +xat hIf jLk jMy @@ -78320,9 +77892,9 @@ kBj dIi vjF vjF -jGp -rBd -sfO +oSk +leU +qQa eXG eXG eXG @@ -78383,13 +77955,13 @@ ien ien ien ien -vGp -vGp -qSH -qSH -qSH -vGp -vGp +lBM +lBM +pvZ +pvZ +pvZ +lBM +lBM ien ien ien @@ -78412,14 +77984,14 @@ xCT hqp dRL dRL -fKf +cTq vGp vGp qSH qSH qSH umR -onj +lsa tDS jjt hAA @@ -78429,8 +78001,8 @@ rcd lHY mBc mpr -gZh -fzg +qaF +cQv eZK wWV oGF @@ -78477,12 +78049,12 @@ vfN ekR wsz tjh -bhD -joL -wbE +luP +lRl +pLK xRw uaI -eHB +ktg cUG xzK cpk @@ -78530,7 +78102,7 @@ aKn hIf rnq rnq -sfO +qQa eXG eXG eXG @@ -78584,18 +78156,18 @@ cpy cpy cpy ien -xSN -mee -vGp +lEr +oIx +lBM ien -vGp -vGp -qSH -qSH -qSH -qSH -qSH -vGp +lBM +lBM +pvZ +pvZ +pvZ +pvZ +pvZ +lBM cpy ien cpy @@ -78617,15 +78189,15 @@ rfk nKh dRL dRL -qYP -jKB +hMm +wUP vGp vGp qSH qSH qSH umR -onj +lsa svf rEc wWV @@ -78635,7 +78207,7 @@ tgj svo bqo sFf -mJt +eUb tDS pGN aKO @@ -78736,8 +78308,8 @@ qvA hIf hIf hIf -jGp -sfO +oSk +qQa eXG eXG eXG @@ -78790,19 +78362,19 @@ cpy cpy cpy ien -mee -vGp -vGp -vGp -vGp -qSH -qSH -qSH -qSH -qSH -qSH -qSH -vGp +oIx +lBM +lBM +lBM +lBM +pvZ +pvZ +pvZ +pvZ +pvZ +pvZ +pvZ +lBM ien cpy dRL @@ -78822,8 +78394,8 @@ qQt rge dRL dRL -qYP -jKB +hMm +wUP vGp vGp vGp @@ -78831,7 +78403,7 @@ vGp qSH qSH umR -onj +lsa fRk ydV qIy @@ -78841,7 +78413,7 @@ bkt dsL iQL muV -wke +twK eZK hCq azK @@ -78943,8 +78515,8 @@ fPO ufR jVq hIf -jGp -sfO +oSk +qQa eXG eXG eXG @@ -78997,17 +78569,17 @@ cpy ien ien ien -ewe -qSH -qSH -qSH -qSH -qSH -qSH -qSH -qSH -qSH -vGp +pxZ +pvZ +pvZ +pvZ +pvZ +pvZ +pvZ +pvZ +pvZ +pvZ +lBM ien ien gwC @@ -79027,8 +78599,8 @@ rJf qiG rJf dRL -pGY -jKB +dRW +wUP vGp vGp vGp @@ -79037,7 +78609,7 @@ vGp vGp qSH umR -onj +lsa svf ydV sWT @@ -79082,11 +78654,11 @@ cUG sKS tID tiM -uQf -fsz +woW +qni uya -uQf -vgb +woW +ndv xCY vDr vjn @@ -79150,7 +78722,7 @@ aiP xYA jYr gRp -aVa +kDa eXG eXG wQa @@ -79202,38 +78774,38 @@ cpy cpy cpy ien -eoH -dbs -qSH -qSH -qSH -qSH -qSH -qSH -qSH -qSH -qSH -qSH -qSH -qSH +rAJ +fUn +pvZ +pvZ +pvZ +pvZ +pvZ +pvZ +pvZ +pvZ +pvZ +pvZ +pvZ +pvZ ien ien ien ien ien -dHF -dHF -dHF -dHF +aRf +aRf +aRf +aRf ien ien -whD -whD -whD -hFL -thi -dHz -jKB +mGy +mGy +mGy +cYb +wGf +ctR +wUP vGp vGp vGp @@ -79243,7 +78815,7 @@ vGp vGp qSH yaF -kJh +rMJ svf prT aaI @@ -79288,11 +78860,11 @@ cUG uIB tiM bVA -uQn -vPz +xyw +yhu ggp -uQn -vgw +xyw +bCG xPj vDr vjn @@ -79356,7 +78928,7 @@ xYA aIp kcR hIf -cDi +swj eXG wQa wQa @@ -79408,29 +78980,29 @@ cpy cpy cpy ien -aCJ -ewm -eIn -qSH -qSH -qSH -qSH -qSH -qSH -qSH -qSH -qSH -vGp -vGp -vGp -vGp -vGp +oQe +xFi +pQv +pvZ +pvZ +pvZ +pvZ +pvZ +pvZ +pvZ +pvZ +pvZ +lBM +lBM +lBM +lBM +lBM ien -vGp -vGp -vGp -vGp -vGp +lBM +lBM +lBM +lBM +lBM ien lyP vGp @@ -79449,7 +79021,7 @@ lTV lTV xSv tWE -onj +lsa tDS ibk lKF @@ -79491,17 +79063,17 @@ tTD tTD kEo cUG -sLw -sXZ -qRH -vBK -nXC -sXZ -vBK -uQs -nKK +bmm +eyt +biu +uIw +gDR +eyt +uIw +xdu +cpc fzf -sHY +gMI wao jIA tID @@ -79527,14 +79099,14 @@ kcC uwT uwT uwT -gIr -fbS -fbS -fbS -fbS -fbS -lPq -lPq +lJC +rNo +rNo +rNo +rNo +rNo +hxu +hxu uzI sDz rVR @@ -79615,28 +79187,28 @@ cpy ien ien ien -ewp -qSH -qSH -qSH -qSH -qSH -qSH -qSH -qSH -qSH -vGp -vGp -vGp -vGp -vGp -vGp -vGp -vGp -vGp -vGp -vGp -vGp +rdC +pvZ +pvZ +pvZ +pvZ +pvZ +pvZ +pvZ +pvZ +pvZ +lBM +lBM +lBM +lBM +lBM +lBM +lBM +lBM +lBM +lBM +lBM +lBM ien mbx vGp @@ -79651,11 +79223,11 @@ vGp vGp vGp vGp -mTa -oqn -pdv +cJq +svQ +hLf umR -onj +lsa jCW jAz gjF @@ -79707,7 +79279,7 @@ cSO kJO cSO aqH -vPz +yhu wao whW uaI @@ -79732,8 +79304,8 @@ uwT fWG uwT uwT -gIr -waQ +lJC +bRI snX snX vpp @@ -79820,28 +79392,28 @@ cpy cpy cpy ien -qSH -qSH -oiA -vTx -vTx -vTx -vTx -vTx -vTx -vTx -vTx -vTx -qSH -eXV -hTg -qSH -vTx -vTx -vTx -vGp -vGp -vGp +pvZ +pvZ +yfy +ina +ina +ina +ina +ina +ina +ina +ina +ina +pvZ +olO +uAn +pvZ +ina +ina +ina +lBM +lBM +lBM ien ien ien @@ -79857,12 +79429,12 @@ vGp vGp vGp vGp -ncz +xvy kKj -pgp +edE umR -gMG -sRu +nse +wPO hsA vgx rjP @@ -79913,7 +79485,7 @@ cSO vpD cSO cSO -hWz +uxj wao oVL mkW @@ -79938,7 +79510,7 @@ fWG cpy fWG uwT -ewf +nUn snX snX rRy @@ -80026,29 +79598,29 @@ cpy cpy cpy ien -qSH -qSH -uRb -opp -opp -feS -feS -fFp -ghy -fFp -feS -feS -qSH -qSH -qSH -qSH -eJq -opp -opp -vGp -vGp -vGp -vGp +pvZ +pvZ +rNj +mSj +mSj +ygr +ygr +cUe +adm +cUe +ygr +ygr +pvZ +pvZ +pvZ +pvZ +nEh +mSj +mSj +lBM +lBM +lBM +lBM qBQ kyH fbA @@ -80063,12 +79635,12 @@ lyP vGp vGp vGp -nff -oxT -pgG +qfQ +hoh +pQo umR ikw -rrf +fQf tDS nku uqo @@ -80076,8 +79648,8 @@ gPp mqi mqi cCK -twq -mvd +pFY +lYw way way gdk @@ -80119,7 +79691,7 @@ vpD cSO cSO vpD -fEe +nqg wao vLO tMD @@ -80144,7 +79716,7 @@ cpy cpy fWG uwT -ewf +nUn vpp nat kow @@ -80233,28 +79805,28 @@ cpy ien ien ien -qSH -uRb -opp -ycw -ycw -ycw -ycw -ycw -ycw -ycw -ycw -eJq -qSH -hTh -eXV -qSH -qSH -opp -qSH -qSH -vGp -vGp +pvZ +rNj +mSj +ujv +ujv +ujv +ujv +ujv +ujv +ujv +ujv +nEh +pvZ +hdx +olO +pvZ +pvZ +mSj +pvZ +pvZ +lBM +lBM rdq saY vGp @@ -80274,8 +79846,8 @@ qSH qSH umR eKe -fAq -evS +sNz +dlx tXd bCl tDS @@ -80325,7 +79897,7 @@ vpD cSO cSO ngd -omX +ryk wao pzj wzt @@ -80338,9 +79910,9 @@ qQe inA xjO hMz -lzV -hix -jix +esc +nCK +umm uwT uwT uwT @@ -80350,7 +79922,7 @@ cpy cpy cpy uwT -ewf +nUn vpp tlR rYT @@ -80438,28 +80010,28 @@ cpy cpy cpy ien -qSH -qSH -uRb -eOe -ycw -feZ -feZ -fSf -feZ -feZ -feZ -hbj -feZ -feZ -qSH -qSH -qSH -qSH -qSH -qSH -qSH -vGp +pvZ +pvZ +rNj +evb +ujv +lTq +lTq +pvZ +lTq +lTq +lTq +mOZ +lTq +lTq +pvZ +pvZ +pvZ +pvZ +pvZ +pvZ +pvZ +lBM ien ien ien @@ -80481,21 +80053,21 @@ qSH umR qSH eKe -aby -whD -dHz -whD -whD -whD -whD -whD -mmE -whD -whD -whD -whD -whD -umg +lRD +mGy +ctR +mGy +mGy +mGy +mGy +mGy +msJ +mGy +mGy +mGy +mGy +mGy +lLp gdO jhp sha @@ -80531,7 +80103,7 @@ cSO cSO sOA cSO -vPs +syF wao bka tID @@ -80544,9 +80116,9 @@ rfW inA xjO hMz -fac +dUO gKa -spW +gTZ uwT uwT uwT @@ -80556,7 +80128,7 @@ cpy cpy cpy uwT -ewf +nUn vpp mQm kow @@ -80644,29 +80216,29 @@ cpy cpy cpy ien -qSH -qSH -uRb -eOe -eXO -feZ -fAx -fSR -fTO -ycw -ycw -ycw -ycw -feZ -qSH -qSH -qSH -qSH -qSH -qSH -qSH -qSH -vGp +pvZ +pvZ +rNj +evb +dnf +lTq +vkk +mdJ +mva +ujv +ujv +ujv +ujv +lTq +pvZ +pvZ +pvZ +pvZ +pvZ +pvZ +pvZ +pvZ +lBM ien rwo vGp @@ -80737,7 +80309,7 @@ cSO cSO vpD cSO -vPz +yhu cUG eDL uaI @@ -80750,9 +80322,9 @@ nmh lHL xjO hMz -nYQ -tOe -nVR +lWK +jsT +qrh uwT uwT fWG @@ -80762,7 +80334,7 @@ cpy cpy cpy uwT -ewf +nUn snX snX pWx @@ -80851,28 +80423,28 @@ cpy ien ien ien -qSH -uRb -eOe -ycw -ffr -fAG -ycw -fCP -ycw -gVd -fBU -ycw -feZ -eJq -qSH -qSH -qSH -qSH -ezj -qSH -qSH -qSH +pvZ +rNj +evb +ujv +oxK +jcS +ujv +cij +ujv +lQG +mPs +ujv +lTq +nEh +pvZ +pvZ +pvZ +pvZ +qOx +pvZ +pvZ +pvZ ien jvo vGp @@ -80968,8 +80540,8 @@ cpy cpy tXW uwT -rTf -lum +twz +sLI snX snX vpp @@ -80978,7 +80550,7 @@ vpp vpp snX snX -oYO +dkx rVR gVf xYA @@ -81004,7 +80576,7 @@ xYA aIp kcR hIf -slq +xRS eXG eXG eXG @@ -81056,28 +80628,28 @@ cpy cpy cpy ien -amc -exB -uRb -eOe -ycw -fhY -fBP -fSX -ycw -ycw -gWg -hbH -ycw -feZ -ycw -qSH -qSH -eXV -qSH -ezj -qSH -qSH +oOd +gzg +rNj +evb +ujv +pjn +cvE +iUg +ujv +ujv +kiy +byx +ujv +lTq +ujv +pvZ +pvZ +olO +pvZ +qOx +pvZ +pvZ ien ien ien @@ -81091,15 +80663,15 @@ mZQ rpm vGp vGv -oQC -lzU -wsC +hMY +orf +foa ljA ljA ljA -sfI -lzU -gRD +ycD +orf +tNd qSH qSH vGp @@ -81175,16 +80747,16 @@ cpy tXW uwT uwT -rTf -tni -tni -tni -tni -tni -tni +twz +iJO +iJO +iJO +iJO +iJO +iJO cpy cpy -nDt +jkZ gRp xyC xYA @@ -81210,7 +80782,7 @@ aiP xYA wBx gRp -aVa +kDa eXG eXG eXG @@ -81262,29 +80834,29 @@ cpy cpy cpy ien -poZ -qSH -uRb -eOn -ycw -fib -fBU -fTi -qSH -qSH -sBX -ycw -ycw -feZ -ycw -qSH -qSH -qSH -jEa -jMJ -qSH -qSH -qSH +viz +pvZ +rNj +tlm +ujv +yjN +mPs +aCw +pvZ +pvZ +cDU +ujv +ujv +lTq +ujv +pvZ +pvZ +pvZ +acv +eho +pvZ +pvZ +pvZ ien amc qSH @@ -81295,9 +80867,9 @@ qSH qSH rcr qSH -oQC -lzU -qnb +hMY +orf +aSG ljq ljA ljA @@ -81305,9 +80877,9 @@ lAn ljA ljA ljq -oAu -lzU -gRD +nLJ +orf +tNd qSH lyP vGp @@ -81390,8 +80962,8 @@ uwT cpy cpy cpy -iWN -jxD +bQm +jLo hIf sTR udA @@ -81415,8 +80987,8 @@ xsq res sTR hIf -sAt -svG +cEB +lxx eXG eXG cpy @@ -81469,28 +81041,28 @@ cpy ien ien ien -qSH -uRb -eOn -ycw -feZ -fCE -fTO -qSH -gLK -qSH -ycw -ycw -feZ -ycw -ycw -qSH -qSH -jEk -qSH -qSH -qSH -qSH +pvZ +rNj +tlm +ujv +lTq +rQS +mva +pvZ +wHx +pvZ +ujv +ujv +lTq +ujv +ujv +pvZ +pvZ +heU +pvZ +pvZ +pvZ +pvZ ien poZ qSH @@ -81500,8 +81072,8 @@ qSH qSH qSH qSH -oQC -qnb +hMY +aSG ljA ljA vrd @@ -81513,8 +81085,8 @@ mqc vrd ljA iNs -oAu -gRD +nLJ +tNd qSH lyP vGp @@ -81597,8 +81169,8 @@ cpy cpy cpy cpy -iWN -jxD +bQm +jLo hIf hIf hIf @@ -81620,8 +81192,8 @@ oTL lId fdT fdT -sAt -svG +cEB +lxx eXG eXG eXG @@ -81674,28 +81246,28 @@ cpy cpy cpy ien -qSH -qSH -uRb -eOe -ycw -fiA -fCN -fWD -ycw -fTi -ycw -ycw -ycw -hFu -hFu -hFu -hFu -qSH -jEF -qSH -qSH -qSH +pvZ +pvZ +rNj +evb +ujv +xRP +lVb +suy +ujv +aCw +ujv +ujv +ujv +wcH +wcH +wcH +wcH +pvZ +jbQ +pvZ +pvZ +pvZ ien ien ien @@ -81704,9 +81276,9 @@ qSH qSH qSH qSH -oQC -gRj -qnb +hMY +aQR +aSG ljA ljA xIv @@ -81720,9 +81292,9 @@ xIv kqT kbn hSs -oAu -lzU -gRD +nLJ +orf +tNd qSH vGp vGp @@ -81804,7 +81376,7 @@ cpy cpy cpy eXG -iWN +bQm rnq rnq rVR @@ -81826,7 +81398,7 @@ whG fdT rnq rnq -svG +lxx eXG eXG eXG @@ -81880,37 +81452,37 @@ cpy cpy cpy ien -qSH -qSH -uRb -eOn -ycw -feZ -ycw -ycw -giF -ycw -fTO -ycw -hmD -hFS -ycw -ycw -ycw -qSH -qSH -eJq -qSH -qSH -qSH +pvZ +pvZ +rNj +tlm +ujv +lTq +ujv +ujv +tfg +ujv +mva +ujv +pqo +miG +ujv +ujv +ujv +pvZ +pvZ +nEh +pvZ +pvZ +pvZ ien fjk qSH tNQ qSH -oQC -lzU -qnb +hMY +orf +aSG ljA ljA ljA @@ -81928,9 +81500,9 @@ rJr kbn krH krH -oAu -lzU -gRD +nLJ +orf +tNd vGp vGp qSH @@ -82012,9 +81584,9 @@ eXG eXG eXG eXG -iWN -jru -jxD +bQm +kcr +jLo rVR rVR crM @@ -82028,9 +81600,9 @@ wDa wDa kXf iGr -sAt -jru -svG +cEB +kcr +lxx eXG eXG eXG @@ -82087,34 +81659,34 @@ cpy ien ien ien -qSH -uRb -eOe -ycw -fkb -ycw -fDH -fTO -ycw -ycw -ycw -hmO -feZ -eXO -ycw -ycw -qSH -qSH -qSH -qSH -qSH -qSH +pvZ +rNj +lsR +ujv +fRe +ujv +dAJ +mva +ujv +ujv +ujv +fZT +lTq +dnf +ujv +ujv +pvZ +pvZ +pvZ +pvZ +pvZ +pvZ ien igg rMR qSH -oQC -qnb +hMY +aSG ljA ljA ljA @@ -82136,8 +81708,8 @@ wXQ krH krH krH -oAu -gRD +nLJ +tNd qSH qSH vGp @@ -82220,8 +81792,8 @@ cex cex wQa eXG -iWN -jxD +bQm +jLo rVR hIf hIf @@ -82233,8 +81805,8 @@ qvA hIf hIf hIf -sAt -svG +cEB +lxx eXG eXG eXG @@ -82292,34 +81864,34 @@ cpy cpy cpy ien -qSH -qSH -uRb -eOe -ycw -feZ -ycw -ycw -fCE -ycw -ycw -giF -ycw -hGJ -ycw -ier -ycw -qSH -qSH -qSH -qSH -qSH +pvZ +pvZ +rNj +evb +ujv +lTq +ujv +ujv +rQS +ujv +ujv +tfg +ujv +uFQ +ujv +keV +ujv +pvZ +pvZ +pvZ +pvZ +pvZ ien ien ien rMR -oQC -qnb +hMY +aSG ljA ljA lAn @@ -82343,8 +81915,8 @@ lAn lAn krH krH -oAu -gRD +nLJ +tNd qSH vGp vGp @@ -82427,9 +81999,9 @@ wQa wQa cex cex -iWN -jru -jxD +bQm +kcr +jLo gRp hIf hIf @@ -82437,9 +82009,9 @@ eWR rVR hIf gRp -sAt -jru -svG +cEB +kcr +lxx eXG eXG eXG @@ -82498,33 +82070,33 @@ cpy cpy cpy ien -qSH -qSH -uRb -eOe -ycw -feZ -fCP -ycw -ycw -gMc -ycw -ycw -ycw -hGU -ycw -ieW -ycw -qSH -qSH -exB -qSH -qSH -qSH -ntN -qSH -qSH -oZN +pvZ +pvZ +rNj +evb +ujv +lTq +cij +ujv +ujv +gSC +ujv +ujv +ujv +kpe +ujv +szm +ujv +pvZ +pvZ +gzg +pvZ +pvZ +pvZ +uST +qSH +qSH +hKN ljq ljA qUL @@ -82550,7 +82122,7 @@ aDs qUL krH aSR -ltf +bIT qSH vGp vGp @@ -82635,15 +82207,15 @@ wQa wQa wQa cex -iWN -jru -jxD +bQm +kcr +jLo rVR rVR rVR -sAt -jru -svG +cEB +kcr +lxx eXG eXG eXG @@ -82705,32 +82277,32 @@ cpy ien ien ien -qSH -uRb -qSH -qSH -eXV -ycw -ycw -ycw -ycw -ycw -ycw -ycw -hHN -ycw -iff -ycw -qSH -eXV -qSH -qSH -qSH -qSH -ntN -qSH -qSH -pet +pvZ +rNj +pvZ +pvZ +olO +ujv +ujv +ujv +ujv +ujv +ujv +ujv +uID +ujv +vlA +ujv +pvZ +olO +pvZ +pvZ +pvZ +pvZ +uST +qSH +qSH +bKL ljA xIv qUL @@ -82756,7 +82328,7 @@ nPN qUL lAn krH -jaq +vZo vGp vGp lyP @@ -82843,11 +82415,11 @@ wQa wQa wQa cex -iWN -jru -jru -jru -svG +bQm +kcr +kcr +kcr +lxx eXG eXG eXG @@ -82910,30 +82482,30 @@ cpy cpy cpy ien -vGp -qSH -qSH -qSH -eJq -qSH -qSH -ycw -ycw -ycw -fSf -fTi -ycw -feZ -ycw -qSH -ycw -qSH -qSH -ghr -qSH -qSH -qSH -ntN +lBM +pvZ +pvZ +pvZ +nEh +pvZ +pvZ +ujv +ujv +ujv +pvZ +aCw +ujv +lTq +ujv +pvZ +ujv +pvZ +pvZ +hXo +pvZ +pvZ +pvZ +uST qSH qSH pFH @@ -83116,30 +82688,30 @@ cpy cpy cpy ien -vGp -vGp -qSH -qSH -qSH -qSH -qSH -ycw -ycw -ycw -ycw -fTO -hmO -feZ -ycw -ycw -ycw -qSH -qSH -qSH -qSH -qSH -qSH -ntN +lBM +lBM +pvZ +pvZ +pvZ +pvZ +pvZ +ujv +ujv +ujv +ujv +mva +fZT +lTq +ujv +ujv +ujv +pvZ +pvZ +pvZ +pvZ +pvZ +pvZ +uST qSH qSH pFH @@ -83323,29 +82895,29 @@ cpy ien ien ien -vGp -eIT -exB -qSH -qSH -qSH -ycw -gjm -ycw -ycw -ycw -hmD -hFu -hFu -hFu -hFu -qSH -qSH -qSH -qSH -qSH -qSH -ntN +lBM +num +gzg +pvZ +pvZ +pvZ +ujv +xFI +ujv +ujv +ujv +pqo +wcH +wcH +wcH +wcH +pvZ +pvZ +pvZ +pvZ +pvZ +pvZ +uST qSH qSH pFH @@ -83365,12 +82937,12 @@ dNx nHF dNx oeV -rtA -tbt +fqJ +iai qbP dpS -nPn -lVs +iFf +aPz bUy lAn krH @@ -83528,30 +83100,30 @@ cpy cpy cpy enG -vGp -fbA -qSH -qSH -qSH -qSH -ycw -ycw -gjV -giF -ycw -ycw -ycw -feZ -ycw -ycw -qSH -qSH -eXV -exB -qSH -qSH -qSH -ntN +lBM +hkg +pvZ +pvZ +pvZ +pvZ +ujv +ujv +rfj +tfg +ujv +ujv +ujv +lTq +ujv +ujv +pvZ +pvZ +olO +gzg +pvZ +pvZ +pvZ +uST qSH qSH pFH @@ -83734,235 +83306,235 @@ cpy cpy cpy ien -saY -vGp -qSH -qSH -qSH -qSH -ycw -ycw -gjV -gMy -gXB -ycw -fTO -feZ -hTk -eXO -qSH -qSH -qSH -qSH -qSH -qSH -ien -ien -ien -qSH -pFH -ljA -xIv -qUL -qUL -rii -rCi -ssU -sKi -bYC -dNx -dNx -dNx -dNx -dNx -dNx -ykj -wKH -rUS -jAX -goC -ifg -gOZ -hZc -lAn -krH -nTp -vGp -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -bMX -"} -(179,1,1) = {" -bMX -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -cpy -ien +ydd +lBM +pvZ +pvZ +pvZ +pvZ +ujv +ujv +rfj +lFz +soh +ujv +mva +lTq +hOm +dnf +pvZ +pvZ +pvZ +pvZ +pvZ +pvZ +ien ien ien -vGp -eJq -qSH -eXV -qSH -fDi -ycw -gmb -ycw -fTO -ycw -ycw -feZ -hmO -ycw -qSH -qSH -qSH -qSH -qSH qSH +pFH +ljA +xIv +qUL +qUL +rii +rCi +ssU +sKi +bYC +dNx +dNx +dNx +dNx +dNx +dNx +ykj +gPh +vdK +jAX +goC +fFt +ezE +hZc +lAn +krH +nTp vGp +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +bMX +"} +(179,1,1) = {" +bMX +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +cpy +ien +ien +ien +lBM +nEh +pvZ +olO +pvZ +anP +ujv +dAE +ujv +mva +ujv +ujv +lTq +fZT +ujv +pvZ +pvZ +pvZ +pvZ +pvZ +pvZ +lBM ien qSH qSH @@ -84146,29 +83718,29 @@ cpy cpy cpy ien -vGp -vGp -qSH -qSH -qSH -exB -fDn -fXs -fkb -feZ -feZ -qSH -feZ -feZ -hTo -fCP -qSH -qSH -qSH -jNY -qSH -vGp -vGp +lBM +lBM +pvZ +pvZ +pvZ +gzg +fIV +kCv +fRe +lTq +lTq +pvZ +lTq +lTq +gqX +cij +pvZ +pvZ +pvZ +qOx +pvZ +lBM +lBM ien qSH qSH @@ -84352,33 +83924,33 @@ cpy cpy cpy ien -vGp -vGp -qSH -eOA -qSH -qSH -fDH -ycw -ycw -giF -ycw -qSH -ycw -ycw -ycw -ycw -eXV -qSH -opp -jNY -vGp -vGp +lBM +lBM +pvZ +mSj +pvZ +pvZ +dAJ +ujv +ujv +tfg +ujv +pvZ +ujv +ujv +ujv +ujv +olO +pvZ +mSj +qOx +lBM +lBM ien ien ien qSH -pVn +fkJ ljA xIv qUL @@ -84404,7 +83976,7 @@ dWv qUL lAn krH -keq +eRQ vGp cpy cpy @@ -84559,32 +84131,32 @@ cpy ien ien ien -vGp -qSH -eOA -eOA -qSH -fFp -fFp -gmt -gNe -fFp -hbN -fFp -hHY -ghy -fFp -qSH -opp -opp -jNY -vGp -vGp -vGp +lBM +pvZ +mSj +mSj +pvZ +cUe +cUe +pEq +kEG +cUe +lzC +cUe +jPU +adm +cUe +pvZ +mSj +mSj +qOx +lBM +lBM +lBM ien qSH qSH -oZN +hKN ljq iNs qUL @@ -84610,7 +84182,7 @@ qUL qUL krH aSR -ltf +bIT vGp cpy cpy @@ -84764,34 +84336,34 @@ cpy cpy cpy ien -kBK -qSH -qSH -qSH -qSH -qSH -qSH -fXU -gnd -gnd -gXE -fXU -fXU -qSH -vGp -fXU -fXU -fXU -fXU -jOh -vGp +dWU +pvZ +pvZ +pvZ +pvZ +pvZ +pvZ +aRf +uWa +uWa +smo +aRf +aRf +pvZ +lBM +aRf +aRf +aRf +aRf +eUj +lBM cpy cpy ien vGp qSH -pYN -qqG +esu +lhr kbn ljA lAn @@ -84815,8 +84387,8 @@ lAn lAn krH krH -mil -wYJ +qYr +obl vGp cpy cpy @@ -84930,7 +84502,7 @@ bMX bMX cpy abo -acJ +agt ajw abo cpy @@ -84970,26 +84542,26 @@ cpy cpy cpy ien -xSN -vGp -vGp -vGp -qSH -qSH -qSH -qSH -gnA -uwF -qSH -hcx -rcr -qSH -qSH -vGp -vGp -vGp -vGp -vGp +lEr +lBM +lBM +lBM +pvZ +pvZ +pvZ +pvZ +bRO +uWa +pvZ +sPV +mwv +pvZ +pvZ +lBM +lBM +lBM +lBM +lBM cpy cpy ien @@ -84997,8 +84569,8 @@ ien ien vGp qSH -pYN -qqG +esu +lhr ljA ljA ljA @@ -85020,8 +84592,8 @@ wXQ krH krH krH -mil -wYJ +qYr +obl qSH vGp cpy @@ -85177,24 +84749,24 @@ cpy ien ien ien -xSN -vGp +lEr +lBM ien -vGp -qSH -vGp +lBM +pvZ +lBM cpy cpy cpy cpy -hcV -hnD -qSH -qSH -vGp -mRs -vGp -vGp +rYk +fMl +pvZ +pvZ +lBM +vkZ +lBM +lBM cpy cpy cpy @@ -85204,9 +84776,9 @@ oOe vGp qSH qSH -pYN -qXY -qqG +esu +hjm +lhr ljA ljA ljA @@ -85224,9 +84796,9 @@ mqc ljA krH krH -mil -qXY -wYJ +qYr +hjm +obl qSH qSH vGp @@ -85342,7 +84914,7 @@ bMX bMX cpy abo -adI +sRO ajM abo cpy @@ -85387,18 +84959,18 @@ ien ien ien ien -vGp +lBM cpy cpy cpy cpy cpy cpy -mRs -qSH -qSH -qSH -vGp +vkZ +pvZ +pvZ +pvZ +lBM cpy cpy cpy @@ -85412,9 +84984,9 @@ lyP qSH qSH qSH -pYN -qXY -qqG +esu +hjm +lhr ljA ljA xIv @@ -85428,9 +85000,9 @@ xIv kVh ljA ljA -mil -qXY -wYJ +qYr +hjm +obl qSH qSH qSH @@ -85548,7 +85120,7 @@ bMX bMX cpy abo -adN +etZ akk abo abo @@ -85602,8 +85174,8 @@ cpy cpy cpy cpy -qSH -qSH +pvZ +pvZ cpy cpy cpy @@ -85620,8 +85192,8 @@ qSH qSH qSH qSH -pYN -qqG +esu +lhr ljA ljA ljA @@ -85633,8 +85205,8 @@ mqc ljA ljA ljA -mil -wYJ +qYr +obl qSH qSH qSH @@ -85754,7 +85326,7 @@ bMX bMX cpy abo -adN +etZ ajM ann abo @@ -85827,9 +85399,9 @@ qSH qSH qSH qSH -pYN -qXY -qqG +esu +hjm +lhr ljq ljA ljA @@ -85837,9 +85409,9 @@ lAn ljA ljA ljq -mil -qXY -wYJ +qYr +hjm +obl qSH qSH qSH @@ -85960,7 +85532,7 @@ bMX bMX cpy cpy -adN +etZ akl apS arP @@ -86035,15 +85607,15 @@ vGp vGp qSH qSH -pYN -qXY -xpH +esu +hjm +aFd ljA ljA ljA -qzE -qXY -wYJ +vUr +hjm +obl qSH qSH qSH diff --git a/maps/map_files/LV624/LV624.dmm b/maps/map_files/LV624/LV624.dmm index 1183e3e97051..dfce3d726bb3 100644 --- a/maps/map_files/LV624/LV624.dmm +++ b/maps/map_files/LV624/LV624.dmm @@ -811,16 +811,6 @@ /obj/structure/fence, /turf/open/gm/dirt, /area/lv624/ground/barrens/containers) -"aep" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 1 - }, -/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, -/area/lv624/ground/caves/sand_temple) -"aeq" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/caves/sand_temple) "aer" = ( /obj/structure/stairs/perspective{ color = "#b29082"; @@ -934,21 +924,6 @@ /obj/structure/cargo_container/wy/right, /turf/open/floor, /area/lv624/ground/barrens/containers) -"afi" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 8 - }, -/turf/open/gm/dirt, -/area/lv624/ground/caves/sand_temple) -"afj" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform/mineral/sandstone/runed, -/turf/open/floor/whiteyellowfull/east, -/area/lv624/ground/caves/sand_temple) "afk" = ( /obj/item/ammo_casing, /turf/open/gm/dirt, @@ -965,12 +940,6 @@ /obj/structure/cargo_container/ferret/right, /turf/open/floor, /area/lv624/ground/barrens/containers) -"afq" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 1 - }, -/turf/open/gm/grass/grass1, -/area/lv624/ground/caves/sand_temple) "afr" = ( /obj/structure/ore_box, /obj/structure/fence, @@ -3381,7 +3350,8 @@ }, /obj/item/clothing/mask/yautja_flavor{ anchored = 1; - unacidable = 0 + unacidable = 0; + pixel_y = 10 }, /obj/item/clothing/shoes/yautja_flavor{ anchored = 1 @@ -4452,10 +4422,6 @@ }, /turf/open/floor/plating, /area/lv624/lazarus/landing_zones/lz2) -"aAd" = ( -/obj/structure/platform/mineral/sandstone/runed, -/turf/open/gm/dirtgrassborder/north, -/area/lv624/ground/caves/sand_temple) "aAh" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating/warnplate/west, @@ -8713,14 +8679,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/brown/northwest, /area/lv624/lazarus/comms) -"aVd" = ( -/obj/structure/lattice{ - layer = 2.9 - }, -/obj/structure/platform, -/obj/structure/machinery/power/reactor/colony, -/turf/open/floor/plating/warnplate/southeast, -/area/lv624/lazarus/engineering) "aVe" = ( /turf/open/floor/plating/warnplate/east, /area/lv624/lazarus/engineering) @@ -8742,19 +8700,6 @@ /obj/structure/machinery/power/reactor/colony, /turf/open/floor/plating/warnplate/east, /area/lv624/lazarus/engineering) -"aVj" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/obj/structure/machinery/door/airlock/almayer/engineering/colony{ - dir = 1; - locked = 1; - name = "\improper Engineering Dome SMES"; - req_access_txt = "100"; - req_one_access = null - }, -/turf/open/floor/delivery, -/area/lv624/lazarus/engineering) "aVk" = ( /obj/structure/sign/safety/maint, /obj/structure/fence, @@ -8846,21 +8791,6 @@ }, /turf/open/floor/dark, /area/lv624/lazarus/engineering) -"aVG" = ( -/obj/item/device/radio/intercom{ - freerange = 1; - frequency = 1469; - name = "General Listening Channel"; - pixel_y = 30 - }, -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform/stair_cut, -/obj/item/clothing/head/hardhat/orange, -/turf/open/floor/dark, -/area/lv624/lazarus/engineering) "aVH" = ( /obj/structure/machinery/light{ dir = 1 @@ -8980,14 +8910,6 @@ }, /turf/open/floor/delivery, /area/lv624/lazarus/engineering) -"aWg" = ( -/obj/structure/lattice{ - layer = 2.9 - }, -/obj/structure/platform, -/obj/structure/machinery/power/reactor/colony, -/turf/open/floor/plating/warnplate/southwest, -/area/lv624/lazarus/engineering) "aWh" = ( /obj/structure/fence, /turf/open/gm/dirtgrassborder/east, @@ -9106,27 +9028,6 @@ /obj/structure/machinery/light, /turf/open/floor/dark, /area/lv624/lazarus/engineering) -"aWG" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - layer = 3.1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/dark, -/area/lv624/lazarus/engineering) -"aWH" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/folder, -/obj/item/device/assembly/signaller, -/obj/structure/platform_decoration{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/dark, -/area/lv624/lazarus/engineering) "aWI" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/flashlight, @@ -9223,16 +9124,6 @@ /obj/structure/flora/bush/ausbushes/lavendergrass, /turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_tcomms_road) -"aXa" = ( -/obj/structure/machinery/light, -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/brown/northwest, -/area/lv624/lazarus/comms) "aXc" = ( /obj/structure/surface/table, /turf/open/floor/bluecorner, @@ -10241,6 +10132,10 @@ "bwk" = ( /turf/open/gm/dirtgrassborder/east, /area/lv624/ground/barrens/south_eastern_barrens) +"bwq" = ( +/obj/effect/sentry_landmark/lz_2/bottom_right, +/turf/open/gm/dirt, +/area/lv624/lazarus/landing_zones/lz2) "bwR" = ( /obj/structure/machinery/colony_floodlight, /turf/open/gm/grass/grass1, @@ -10336,7 +10231,8 @@ }, /obj/item/clothing/mask/yautja_flavor{ anchored = 1; - unacidable = 0 + unacidable = 0; + pixel_y = 10 }, /obj/item/clothing/shoes/yautja_flavor{ anchored = 1 @@ -10357,12 +10253,6 @@ /obj/structure/machinery/iv_drip, /turf/open/floor/whiteblue/southeast, /area/lv624/lazarus/medbay) -"bIO" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 8 - }, -/turf/open/gm/coast/beachcorner/north_east, -/area/lv624/ground/caves/sand_temple) "bJe" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/brown/northwest, @@ -10418,12 +10308,6 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) -"bOg" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 1 - }, -/turf/open/gm/dirt, -/area/lv624/ground/barrens/south_eastern_barrens) "bOm" = ( /obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{ light_on = 1; @@ -10523,6 +10407,10 @@ /obj/effect/landmark/objective_landmark/far, /turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz2) +"bXU" = ( +/obj/structure/platform/stone/runed_sandstone/north, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, +/area/lv624/ground/caves/sand_temple) "bZb" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 @@ -10565,6 +10453,10 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/auto_turf/strata_grass/layer1, /area/lv624/ground/caves/south_west_caves) +"cdB" = ( +/obj/structure/platform/stone/runed_sandstone/east, +/turf/open/gm/dirt, +/area/lv624/ground/caves/sand_temple) "cdF" = ( /obj/effect/landmark/nightmare{ insert_tag = "lv-centralcaves" @@ -10634,6 +10526,15 @@ /obj/structure/girder/reinforced, /turf/open/floor/plating, /area/lv624/lazarus/secure_storage) +"cib" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 10; + icon_state = "p_stair_full" + }, +/obj/structure/platform/stone/runed_sandstone/east, +/turf/open/gm/dirt, +/area/lv624/ground/barrens/south_eastern_barrens) "cij" = ( /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, @@ -10781,15 +10682,6 @@ /obj/structure/foamed_metal, /turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/east_central_jungle) -"cyP" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform/stair_cut/alt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/brown/northwest, -/area/lv624/lazarus/comms) "czq" = ( /obj/effect/landmark/objective_landmark/science, /turf/open/auto_turf/strata_grass/layer1, @@ -10915,6 +10807,10 @@ /obj/effect/landmark/monkey_spawn, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) +"cJY" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/west, +/turf/open/gm/dirtgrassborder/east, +/area/lv624/ground/caves/sand_temple) "cKj" = ( /obj/effect/landmark/yautja_teleport, /turf/open/gm/grass/grass1, @@ -10979,15 +10875,6 @@ /obj/item/device/multitool, /turf/open/floor/brown/northwest, /area/lv624/lazarus/comms) -"cQX" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 10; - icon_state = "p_stair_full" - }, -/obj/structure/platform/mineral/sandstone/runed, -/turf/open/gm/dirt, -/area/lv624/ground/barrens/south_eastern_barrens) "cRm" = ( /obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/mineral/sandstone/runed/decor, @@ -11210,10 +11097,23 @@ }, /turf/open/gm/dirt, /area/lv624/ground/caves/east_caves) +"dtZ" = ( +/obj/structure/platform_decoration/stone/runed_sandstone, +/turf/open/gm/dirt, +/area/lv624/ground/barrens/south_eastern_barrens) "dvf" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) +"dvA" = ( +/obj/structure/stairs/perspective{ + color = "#6b675e"; + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform_decoration/stone/runed_sandstone/north, +/turf/open/floor/whiteyellowfull/east, +/area/lv624/ground/caves/sand_temple) "dvF" = ( /obj/structure/flora/bush/ausbushes/pointybush, /obj/structure/flora/jungle/vines/heavy, @@ -11226,17 +11126,6 @@ }, /turf/open/floor/whiteyellow/southeast, /area/lv624/lazarus/corporate_dome) -"dws" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 8 - }, -/turf/open/floor/whiteyellowfull/east, -/area/lv624/ground/barrens/south_eastern_barrens) "dwt" = ( /obj/structure/fence, /turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, @@ -11481,6 +11370,15 @@ /obj/effect/landmark/queen_spawn, /turf/open/gm/dirt, /area/lv624/ground/caves/central_caves) +"dSb" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/stone/runed_sandstone, +/turf/open/gm/dirt, +/area/lv624/ground/barrens/south_eastern_barrens) "dTm" = ( /turf/open/gm/dirt/desert1, /area/lv624/ground/barrens/south_eastern_jungle_barrens) @@ -11520,10 +11418,6 @@ /obj/effect/landmark/monkey_spawn, /turf/open/auto_turf/strata_grass/layer1, /area/lv624/ground/caves/south_west_caves) -"dXq" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed, -/turf/open/gm/dirt, -/area/lv624/ground/barrens/south_eastern_barrens) "dYx" = ( /obj/effect/decal/grass_overlay/grass1{ dir = 6 @@ -11611,6 +11505,11 @@ }, /turf/open/gm/dirt, /area/lv624/ground/caves/west_caves) +"efJ" = ( +/obj/structure/platform/stone/runed_sandstone/north, +/obj/structure/platform/stone/runed_sandstone/east, +/turf/open/gm/dirt, +/area/lv624/ground/caves/sand_temple) "efX" = ( /turf/open/gm/coast/east, /area/lv624/ground/river/east_river) @@ -11670,12 +11569,6 @@ }, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) -"ekJ" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/gm/dirt, -/area/lv624/ground/barrens/south_eastern_barrens) "elm" = ( /obj/structure/machinery/vending/hydroseeds, /obj/structure/machinery/light{ @@ -11692,13 +11585,6 @@ }, /turf/open/gm/dirt, /area/lv624/ground/caves/east_caves) -"elO" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/brown/northwest, -/area/lv624/lazarus/comms) "enn" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /obj/effect/decal/grass_overlay/grass1{ @@ -11817,17 +11703,6 @@ /obj/structure/flora/bush/ausbushes/ausbush, /turf/open/gm/dirtgrassborder/east, /area/lv624/ground/jungle/east_central_jungle) -"ezC" = ( -/obj/structure/stairs/perspective{ - color = "#6b675e"; - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 1 - }, -/turf/open/floor/whiteyellowfull/east, -/area/lv624/ground/caves/sand_temple) "eAr" = ( /obj/structure/showcase{ color = "#95948B"; @@ -11838,7 +11713,8 @@ }, /obj/item/clothing/mask/yautja_flavor{ anchored = 1; - unacidable = 0 + unacidable = 0; + pixel_y = 10 }, /obj/item/clothing/suit/armor/yautja_flavor{ anchored = 1 @@ -11898,6 +11774,15 @@ "eGD" = ( /turf/open/gm/dirt, /area/lv624/ground/caves/south_central_caves) +"eHl" = ( +/obj/structure/stairs/perspective{ + color = "#6b675e"; + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform_decoration/stone/runed_sandstone/east, +/turf/open/floor/whiteyellowfull/east, +/area/lv624/ground/caves/sand_temple) "eHm" = ( /obj/structure/bed, /obj/effect/decal/cleanable/blood, @@ -11912,6 +11797,10 @@ /obj/structure/flora/bush/ausbushes/var3/sparsegrass, /turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz1) +"eHw" = ( +/obj/structure/platform/stone/runed_sandstone/east, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/caves/sand_temple) "eHQ" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/jungle/north_west_jungle) @@ -11944,6 +11833,17 @@ /obj/structure/machinery/colony_floodlight, /turf/open/gm/dirt, /area/lv624/ground/barrens/east_barrens) +"eOJ" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/obj/structure/machinery/door/airlock/almayer/engineering/colony{ + dir = 1; + locked = 1; + name = "\improper Engineering Dome SMES"; + req_access_txt = "100"; + req_one_access = null + }, +/turf/open/floor/delivery, +/area/lv624/lazarus/engineering) "ePp" = ( /turf/open/gm/dirt/desert3, /area/lv624/ground/barrens/south_eastern_jungle_barrens) @@ -11966,6 +11866,10 @@ "eQL" = ( /turf/open/auto_turf/strata_grass/layer1, /area/lv624/ground/barrens/north_east_barrens) +"eSb" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/west, +/turf/open/gm/coast/north, +/area/lv624/ground/caves/sand_temple) "eSg" = ( /obj/structure/flora/jungle/vines/heavy, /turf/closed/wall/strata_ice/jungle, @@ -12002,6 +11906,10 @@ /obj/effect/landmark/lv624/fog_blocker, /turf/open/gm/river, /area/lv624/ground/river/east_river) +"eYQ" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/east, +/turf/open/gm/dirtgrassborder/south, +/area/lv624/ground/caves/sand_temple) "eZg" = ( /obj/item/reagent_container/food/snacks/grown/mushroom/amanita, /turf/open/auto_turf/strata_grass/layer1, @@ -12045,6 +11953,14 @@ "fdl" = ( /turf/open/floor, /area/lv624/lazarus/hydroponics) +"fdr" = ( +/obj/structure/lattice{ + layer = 2.9 + }, +/obj/structure/platform/metal/almayer, +/obj/structure/machinery/power/reactor/colony, +/turf/open/floor/plating/warnplate/southeast, +/area/lv624/lazarus/engineering) "fem" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -12071,17 +11987,15 @@ }, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) -"fhs" = ( +"fhC" = ( /obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 4; + color = "#6b675e"; + dir = 6; icon_state = "p_stair_full" }, -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/floor/whiteyellowfull/east, -/area/lv624/ground/barrens/south_eastern_barrens) +/obj/structure/platform/stone/runed_sandstone/west, +/turf/open/gm/dirt, +/area/lv624/ground/caves/sand_temple) "fhJ" = ( /turf/open/gm/dirtgrassborder/west, /area/lv624/ground/barrens/south_eastern_barrens) @@ -12165,6 +12079,10 @@ /obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/asteroidwarning/east, /area/lv624/ground/colony/telecomm/sw_lz2) +"fqS" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/east, +/turf/open/gm/dirt/desert_dug, +/area/lv624/ground/caves/sand_temple) "frV" = ( /obj/effect/decal/grass_overlay/grass1/inner{ dir = 6 @@ -12200,17 +12118,27 @@ "fuY" = ( /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/north_east_jungle) -"fvt" = ( +"fvx" = ( +/obj/structure/platform_decoration/metal/almayer/north, /obj/structure/stairs/perspective{ - color = "#b29082"; - icon_state = "p_stair_ew_full_cap"; - layer = 3.5 + dir = 1; + icon_state = "p_stair_full" }, -/obj/structure/platform/mineral/sandstone/runed{ - dir = 1 +/turf/open/floor/plating/warnplate/southwest, +/area/lv624/lazarus/engineering) +"fxh" = ( +/obj/structure/platform/stone/runed_sandstone/east, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, +/area/lv624/ground/caves/sand_temple) +"fxZ" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 8; + icon_state = "p_stair_full" }, +/obj/structure/platform_decoration/stone/runed_sandstone/west, /turf/open/floor/whiteyellowfull/east, -/area/lv624/ground/caves/sand_temple) +/area/lv624/ground/barrens/south_eastern_barrens) "fyA" = ( /obj/structure/flora/jungle/planttop1, /turf/open/gm/grass/grass1, @@ -12258,6 +12186,15 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/gm/dirt, /area/lv624/ground/caves/south_west_caves) +"fDo" = ( +/obj/structure/platform/stone/runed_sandstone, +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 6; + icon_state = "p_stair_full" + }, +/turf/open/gm/dirt, +/area/lv624/ground/barrens/south_eastern_barrens) "fDq" = ( /obj/structure/barricade/wooden{ dir = 4 @@ -12367,6 +12304,10 @@ /obj/item/reagent_container/food/snacks/grown/mushroom/angel, /turf/open/auto_turf/strata_grass/layer1, /area/lv624/ground/caves/west_caves) +"fLk" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/west, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/caves/sand_temple) "fMa" = ( /obj/item/prop/alien/hugger, /turf/open/floor/dark, @@ -12395,6 +12336,10 @@ "fPH" = ( /turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/west_central_jungle) +"fPJ" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/north, +/turf/open/gm/dirt, +/area/lv624/ground/caves/sand_temple) "fQx" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -12403,6 +12348,15 @@ }, /turf/open/floor/dark, /area/lv624/lazarus/engineering) +"fQD" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 6; + icon_state = "p_stair_full" + }, +/obj/structure/platform/stone/runed_sandstone/west, +/turf/open/gm/dirt, +/area/lv624/ground/barrens/south_eastern_barrens) "fQL" = ( /turf/open/gm/coast/beachcorner2/south_east, /area/lv624/ground/river/west_river) @@ -12414,6 +12368,11 @@ /obj/structure/flora/bush/ausbushes/genericbush, /turf/open/auto_turf/strata_grass/layer1, /area/lv624/ground/caves/west_caves) +"fSA" = ( +/obj/structure/flora/bush/ausbushes/var3/ywflowers, +/obj/structure/platform_decoration/stone/runed_sandstone/east, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, +/area/lv624/ground/barrens/south_eastern_barrens) "fSX" = ( /turf/open/gm/grass/grass2, /area/lv624/ground/jungle/east_jungle) @@ -12478,6 +12437,14 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/gm/dirt, /area/lv624/ground/river/west_river) +"gch" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/folder, +/obj/item/device/assembly/signaller, +/obj/structure/platform_decoration/metal/almayer/north, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/dark, +/area/lv624/lazarus/engineering) "gcn" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, /turf/open/gm/grass/grass1, @@ -12644,6 +12611,11 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/floor/greengrid, /area/lv624/lazarus/secure_storage) +"gtW" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/structure/foamed_metal, +/turf/open/floor/dark, +/area/lv624/lazarus/engineering) "guQ" = ( /obj/effect/landmark/nightmare{ insert_tag = "cargospecial2" @@ -12750,10 +12722,19 @@ }, /turf/open/floor/white, /area/lv624/lazarus/corporate_dome) +"gFk" = ( +/obj/structure/flora/jungle/vines/heavy, +/obj/structure/platform/stone/runed_sandstone/north, +/turf/open/gm/coast/beachcorner2/south_east, +/area/lv624/ground/caves/sand_temple) "gFm" = ( /obj/effect/landmark/lv624/fog_blocker, /turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_east_jungle) +"gFO" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/west, +/turf/open/gm/coast/beachcorner/north_east, +/area/lv624/ground/caves/sand_temple) "gGd" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, /turf/open/gm/grass/grass1, @@ -12765,24 +12746,12 @@ "gKg" = ( /turf/open/floor/plating/warnplate/northeast, /area/lv624/lazarus/engineering) -"gKN" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/brown/northwest, -/area/lv624/lazarus/comms) "gMe" = ( /obj/effect/landmark/nightmare{ insert_tag = "lv-rightsidepass" }, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) -"gNo" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/caves/sand_temple) "gPu" = ( /obj/effect/decal/grass_overlay/grass1{ dir = 9 @@ -12795,6 +12764,15 @@ "gQr" = ( /turf/open/gm/coast/beachcorner/south_east, /area/lv624/ground/caves/sand_temple) +"gRh" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 9; + icon_state = "p_stair_full" + }, +/obj/structure/platform/stone/runed_sandstone/east, +/turf/open/gm/dirt, +/area/lv624/ground/barrens/south_eastern_barrens) "gRk" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/auto_turf/strata_grass/layer1, @@ -12817,6 +12795,10 @@ }, /turf/open/gm/dirt, /area/lv624/ground/caves/south_west_caves) +"gTm" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/north, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, +/area/lv624/ground/caves/sand_temple) "gTu" = ( /obj/structure/filingcabinet{ density = 0; @@ -12837,12 +12819,6 @@ /obj/structure/flora/jungle/vines/light_2, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) -"gTM" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 1 - }, -/turf/open/gm/dirt, -/area/lv624/ground/barrens/south_eastern_barrens) "gUq" = ( /turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/south_east_jungle) @@ -13022,15 +12998,6 @@ }, /turf/open/gm/dirt, /area/lv624/ground/caves/west_caves) -"hke" = ( -/obj/structure/platform/mineral/sandstone/runed, -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 6; - icon_state = "p_stair_full" - }, -/turf/open/gm/dirt, -/area/lv624/ground/barrens/south_eastern_barrens) "hkT" = ( /obj/effect/decal/grass_overlay/grass1/inner{ dir = 10 @@ -13255,6 +13222,10 @@ "hLu" = ( /turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/south_central_jungle) +"hLB" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/brown/northwest, +/area/lv624/lazarus/comms) "hMd" = ( /obj/effect/landmark/objective_landmark/far, /turf/open/floor/whiteyellowfull/east, @@ -13277,10 +13248,6 @@ }, /turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_east_jungle) -"hNq" = ( -/obj/structure/platform/mineral/sandstone/runed, -/turf/open/gm/dirt, -/area/lv624/ground/caves/sand_temple) "hNR" = ( /obj/structure/surface/rack, /obj/item/clothing/under/colonist, @@ -13388,6 +13355,15 @@ }, /turf/open/floor/wood, /area/lv624/ground/caves/north_central_caves) +"hYx" = ( +/obj/structure/platform/stone/runed_sandstone/north, +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 5; + icon_state = "p_stair_full" + }, +/turf/open/gm/dirt, +/area/lv624/ground/barrens/south_eastern_barrens) "hZg" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -13607,15 +13583,14 @@ /obj/structure/fence, /turf/open/gm/dirtgrassborder/south, /area/lv624/ground/colony/north_nexus_road) -"iwl" = ( +"iyd" = ( /obj/structure/stairs/perspective{ color = "#6b675e"; - dir = 6; + dir = 5; icon_state = "p_stair_full" }, -/obj/structure/platform/mineral/sandstone/runed{ - dir = 8 - }, +/obj/structure/flora/jungle/vines/heavy, +/obj/structure/platform/stone/runed_sandstone/west, /turf/open/floor/strata/grey_multi_tiles, /area/lv624/ground/caves/sand_temple) "iye" = ( @@ -13652,6 +13627,15 @@ }, /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) +"iAv" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform_decoration/stone/runed_sandstone/north, +/turf/open/floor/whiteyellowfull/east, +/area/lv624/ground/barrens/south_eastern_barrens) "iAA" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 @@ -13742,6 +13726,10 @@ /obj/structure/ore_box, /turf/open/gm/dirt, /area/lv624/ground/barrens/south_west_barrens) +"iNF" = ( +/obj/structure/platform/stone/runed_sandstone/west, +/turf/open/gm/dirt, +/area/lv624/ground/barrens/south_eastern_barrens) "iNJ" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, /turf/open/auto_turf/strata_grass/layer1, @@ -13758,6 +13746,10 @@ }, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) +"iPw" = ( +/obj/structure/platform/stone/runed_sandstone/north, +/turf/open/gm/grass/grass1, +/area/lv624/ground/caves/sand_temple) "iPB" = ( /obj/structure/flora/bush/ausbushes/pointybush, /turf/open/gm/grass/grass1, @@ -13885,12 +13877,6 @@ "jeL" = ( /turf/closed/wall/r_wall, /area/lv624/ground/caves/north_central_caves) -"jfN" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/brown/northwest, -/area/lv624/lazarus/comms) "jga" = ( /turf/open/gm/river, /area/lv624/ground/jungle/west_jungle) @@ -14000,20 +13986,26 @@ /obj/structure/cargo_container/lockmart/mid, /turf/open/floor, /area/lv624/ground/barrens/containers) +"jvr" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/north, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/barrens/south_eastern_barrens) "jvQ" = ( /obj/effect/decal/grass_overlay/grass1/inner{ dir = 8 }, /turf/open/gm/dirt, /area/lv624/ground/caves/west_caves) -"jwW" = ( -/obj/structure/platform_decoration, +"jvV" = ( /obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" + color = "#b29082"; + dir = 8; + icon_state = "p_stair_ew_full_cap"; + layer = 3.5 }, -/turf/open/floor/plating/warnplate/southeast, -/area/lv624/lazarus/engineering) +/obj/structure/platform/stone/stair_cut/runed_sandstone_left, +/turf/open/floor/whiteyellowfull/east, +/area/lv624/ground/barrens/south_eastern_barrens) "jxw" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -14064,18 +14056,6 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, /turf/open/gm/dirt, /area/lv624/ground/caves/east_caves) -"jAK" = ( -/obj/structure/stairs/perspective{ - color = "#6b675e"; - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/flora/jungle/vines/heavy, -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/shuttle/red, -/area/lv624/ground/caves/sand_temple) "jBl" = ( /obj/effect/decal/grass_overlay/grass1{ dir = 1 @@ -14164,6 +14144,10 @@ /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/jungle/west_central_jungle) +"jKI" = ( +/obj/structure/platform/stone/runed_sandstone, +/turf/open/gm/dirtgrassborder/north, +/area/lv624/ground/caves/sand_temple) "jKX" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -14210,17 +14194,6 @@ }, /turf/open/gm/dirt, /area/lv624/ground/caves/south_east_caves) -"jMH" = ( -/obj/structure/stairs/perspective{ - color = "#6b675e"; - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 1 - }, -/turf/open/shuttle/red, -/area/lv624/ground/caves/sand_temple) "jMS" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, @@ -14314,7 +14287,8 @@ }, /obj/item/clothing/mask/yautja_flavor{ anchored = 1; - unacidable = 0 + unacidable = 0; + pixel_y = 10 }, /turf/open/floor/sandstone/runed, /area/lv624/ground/barrens/south_eastern_barrens) @@ -14391,6 +14365,10 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) +"kfq" = ( +/obj/structure/platform_decoration/stone/runed_sandstone, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/caves/sand_temple) "kft" = ( /obj/structure/flora/bush/ausbushes/reedbush, /turf/open/gm/river, @@ -14623,6 +14601,15 @@ /obj/structure/flora/bush/ausbushes/ausbush, /turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/jungle/south_west_jungle) +"kBJ" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform/stone/runed_sandstone, +/turf/open/gm/dirt, +/area/lv624/ground/barrens/south_eastern_barrens) "kCD" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, /turf/open/auto_turf/strata_grass/layer1, @@ -14706,12 +14693,6 @@ /obj/structure/fence, /turf/open/floor/warning/east, /area/lv624/ground/barrens/east_barrens) -"kPU" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 1 - }, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/caves/sand_temple) "kPY" = ( /obj/structure/surface/table, /obj/item/trash/plate, @@ -14805,17 +14786,6 @@ /obj/structure/largecrate/random/barrel/blue, /turf/open/gm/dirt, /area/lv624/lazarus/crashed_ship_containers) -"kZs" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 6; - icon_state = "p_stair_full" - }, -/obj/structure/platform/mineral/sandstone/runed{ - dir = 8 - }, -/turf/open/gm/dirt, -/area/lv624/ground/barrens/south_eastern_barrens) "kZw" = ( /obj/structure/flora/jungle/vines/light_2, /turf/open/gm/grass/grass1, @@ -14848,6 +14818,15 @@ }, /turf/open/gm/grass/grass2, /area/lv624/ground/jungle/east_jungle) +"lde" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 9; + icon_state = "p_stair_full" + }, +/obj/structure/platform/stone/runed_sandstone/north, +/turf/open/gm/dirt, +/area/lv624/ground/barrens/south_eastern_barrens) "ldi" = ( /obj/structure/flora/bush/ausbushes/grassybush, /turf/open/auto_turf/strata_grass/layer1, @@ -14930,6 +14909,14 @@ /obj/effect/landmark/hunter_primary, /turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/jungle/south_east_jungle) +"loA" = ( +/obj/structure/lattice{ + layer = 2.9 + }, +/obj/structure/platform/metal/almayer, +/obj/structure/machinery/power/reactor/colony, +/turf/open/floor/plating/warnplate/southwest, +/area/lv624/lazarus/engineering) "loP" = ( /obj/effect/decal/grass_overlay/grass1/inner{ dir = 8 @@ -14951,17 +14938,6 @@ /obj/effect/landmark/monkey_spawn, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/central_jungle) -"lse" = ( -/obj/structure/stairs/perspective{ - color = "#6b675e"; - dir = 5; - icon_state = "p_stair_full" - }, -/obj/structure/platform/mineral/sandstone/runed{ - dir = 8 - }, -/turf/open/gm/dirt, -/area/lv624/ground/caves/sand_temple) "lsq" = ( /obj/structure/flora/jungle/vines/heavy, /obj/structure/flora/jungle/plantbot1, @@ -15025,6 +15001,11 @@ }, /turf/open/floor/dark, /area/lv624/lazarus/engineering) +"lAv" = ( +/obj/structure/flora/bush/ausbushes/ppflowers, +/obj/structure/platform_decoration/stone/runed_sandstone/east, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, +/area/lv624/ground/caves/sand_temple) "lAX" = ( /obj/structure/flora/bush/ausbushes/reedbush, /turf/open/gm/grass/grass1, @@ -15089,6 +15070,10 @@ /obj/structure/machinery/power/reactor/colony, /turf/open/floor/plating/warnplate, /area/lv624/lazarus/engineering) +"lHG" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/east, +/turf/open/gm/dirt, +/area/lv624/ground/caves/sand_temple) "lHL" = ( /obj/effect/landmark/hunter_primary, /turf/open/gm/grass/grass1, @@ -15280,15 +15265,6 @@ /obj/effect/decal/grass_overlay/grass1/inner, /turf/open/gm/dirt, /area/lv624/ground/caves/south_west_caves) -"lWw" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform/mineral/sandstone/runed, -/turf/open/gm/dirt, -/area/lv624/ground/barrens/south_eastern_barrens) "lWO" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/jungle/south_west_jungle) @@ -15370,6 +15346,15 @@ }, /turf/open/auto_turf/strata_grass/layer1, /area/lv624/ground/caves/east_caves) +"mft" = ( +/obj/structure/machinery/light, +/obj/structure/stairs/perspective{ + dir = 9; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/turf/open/floor/brown/northwest, +/area/lv624/lazarus/comms) "mfu" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 8 @@ -15398,6 +15383,11 @@ }, /turf/open/floor/dark, /area/lv624/lazarus/corporate_dome) +"mhc" = ( +/obj/structure/platform_decoration/metal/almayer, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/brown/northwest, +/area/lv624/lazarus/comms) "mhZ" = ( /turf/open/shuttle/red, /area/lv624/ground/caves/sand_temple) @@ -15446,13 +15436,6 @@ }, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) -"mkZ" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/structure/foamed_metal, -/turf/open/floor/dark, -/area/lv624/lazarus/engineering) "mmu" = ( /obj/structure/flora/jungle/plantbot1, /turf/open/gm/grass/grass1, @@ -15477,6 +15460,10 @@ }, /turf/open/floor/wood, /area/lv624/ground/caves/north_central_caves) +"mpc" = ( +/obj/effect/sentry_landmark/lz_2/bottom_left, +/turf/open/floor/plating/asteroidwarning, +/area/lv624/lazarus/landing_zones/lz2) "mph" = ( /obj/structure/surface/table, /obj/item/reagent_container/food/drinks/cans/waterbottle{ @@ -15542,6 +15529,15 @@ /obj/structure/machinery/colony_floodlight, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) +"mww" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + icon_state = "p_stair_ew_full_cap"; + layer = 3.5 + }, +/obj/structure/platform/stone/stair_cut/runed_sandstone_right, +/turf/open/floor/whiteyellowfull/east, +/area/lv624/ground/caves/sand_temple) "mwB" = ( /obj/structure/machinery/atm{ name = "Weyland-Yutani Automatic Teller Machine"; @@ -15627,6 +15623,15 @@ "mJB" = ( /turf/open/floor/whiteyellowcorner/north, /area/lv624/lazarus/corporate_dome) +"mJC" = ( +/obj/structure/stairs/perspective{ + color = "#6b675e"; + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform_decoration/stone/runed_sandstone/north, +/turf/open/shuttle/red, +/area/lv624/ground/caves/sand_temple) "mJF" = ( /obj/structure/flora/bush/ausbushes/palebush, /turf/open/auto_turf/strata_grass/layer1, @@ -15711,6 +15716,11 @@ /obj/structure/flora/bush/ausbushes/ausbush, /turf/open/gm/dirtgrassborder/east, /area/lv624/ground/barrens/south_eastern_jungle_barrens) +"mTK" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/brown/northwest, +/area/lv624/lazarus/comms) "mUH" = ( /turf/open/gm/dirtgrassborder/desert0, /area/lv624/ground/barrens/south_eastern_barrens) @@ -15718,12 +15728,6 @@ /obj/structure/flora/bush/ausbushes/var3/fernybush, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_jungle) -"mUZ" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 8 - }, -/turf/open/gm/coast/north, -/area/lv624/ground/caves/sand_temple) "mVg" = ( /obj/item/weapon/harpoon/yautja{ anchored = 1; @@ -15820,12 +15824,6 @@ /obj/structure/flora/jungle/vines/heavy, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_east_jungle) -"nfX" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/gm/dirt, -/area/lv624/ground/barrens/south_eastern_barrens) "nha" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, @@ -15883,9 +15881,22 @@ "nnL" = ( /turf/open/gm/coast/beachcorner2/south_east, /area/lv624/ground/barrens/east_barrens) +"noO" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/dark, +/area/lv624/lazarus/engineering) "npf" = ( /turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/jungle/west_jungle) +"npt" = ( +/obj/structure/platform/stone/runed_sandstone/north, +/turf/open/gm/dirt, +/area/lv624/ground/barrens/south_eastern_barrens) "npQ" = ( /obj/structure/flora/jungle/vines/heavy, /obj/structure/flora/bush/ausbushes/ppflowers, @@ -15942,17 +15953,6 @@ }, /turf/open/gm/dirt, /area/lv624/lazarus/landing_zones/lz2) -"nsF" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 1 - }, -/turf/open/floor/whiteyellowfull/east, -/area/lv624/ground/barrens/south_eastern_barrens) "ntr" = ( /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/barrens/north_east_barrens) @@ -15996,7 +15996,8 @@ }, /obj/item/clothing/mask/yautja_flavor{ anchored = 1; - unacidable = 0 + unacidable = 0; + pixel_y = 10 }, /turf/open/floor/sandstone/runed, /area/lv624/ground/barrens/south_eastern_barrens) @@ -16004,16 +16005,6 @@ /obj/item/bananapeel, /turf/open/gm/dirt, /area/lv624/lazarus/landing_zones/lz2) -"nwR" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" - }, -/turf/open/floor/plating/warnplate/southwest, -/area/lv624/lazarus/engineering) "nxe" = ( /obj/structure/surface/table/woodentable/poor, /obj/structure/machinery/microwave{ @@ -16074,12 +16065,6 @@ }, /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) -"nEr" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/gm/dirt, -/area/lv624/ground/caves/sand_temple) "nED" = ( /obj/item/weapon/unathiknife{ desc = "A curved blade made of a strange material. It looks both old and very sharp."; @@ -16257,6 +16242,10 @@ /obj/structure/curtain/red, /turf/open/floor/strata/grey_multi_tiles, /area/lv624/ground/caves/sand_temple) +"nTT" = ( +/obj/structure/platform/stone/runed_sandstone/west, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, +/area/lv624/ground/caves/sand_temple) "nUs" = ( /obj/structure/stairs/perspective{ color = "#6b675e"; @@ -16296,33 +16285,10 @@ /obj/structure/flora/bush/ausbushes/var3/ywflowers, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_west_jungle) -"nVZ" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 10; - icon_state = "p_stair_full" - }, -/obj/structure/platform/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/gm/dirt, -/area/lv624/ground/barrens/south_eastern_barrens) "nWe" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_jungle_barrens) -"nWw" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 8; - icon_state = "p_stair_ew_full_cap"; - layer = 3.5 - }, -/obj/structure/platform/mineral/sandstone/runed{ - dir = 1 - }, -/turf/open/floor/whiteyellowfull/east, -/area/lv624/ground/barrens/south_eastern_barrens) "nWJ" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, /turf/open/gm/river, @@ -16371,13 +16337,6 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/white, /area/lv624/lazarus/corporate_dome) -"ocL" = ( -/obj/effect/landmark/lv624/fog_blocker, -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 8 - }, -/turf/open/gm/coast/beachcorner/north_east, -/area/lv624/ground/river/east_river) "odw" = ( /obj/structure/machinery/landinglight/ds2/delaythree{ dir = 1 @@ -16623,12 +16582,6 @@ /obj/effect/decal/grass_overlay/grass1, /turf/open/gm/dirt, /area/lv624/ground/caves/east_caves) -"oDY" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/gm/coast/north, -/area/lv624/ground/caves/sand_temple) "oEc" = ( /obj/item/ammo_casing/bullet{ icon_state = "cartridge_6_1" @@ -16669,23 +16622,6 @@ }, /turf/open/gm/dirt, /area/lv624/ground/caves/central_caves) -"oFO" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 1 - }, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/barrens/south_eastern_barrens) -"oGj" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 9; - icon_state = "p_stair_full" - }, -/obj/structure/platform/mineral/sandstone/runed{ - dir = 1 - }, -/turf/open/gm/dirt, -/area/lv624/ground/barrens/south_eastern_barrens) "oGr" = ( /turf/open/gm/dirt/desert3, /area/lv624/ground/barrens/south_eastern_barrens) @@ -16767,6 +16703,10 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/auto_turf/strata_grass/layer1, /area/lv624/ground/caves/east_caves) +"oQU" = ( +/obj/structure/platform/stone/runed_sandstone, +/turf/open/gm/dirt, +/area/lv624/ground/caves/sand_temple) "oRH" = ( /turf/open/gm/dirtgrassborder/south, /area/lv624/ground/jungle/north_east_jungle) @@ -16837,6 +16777,10 @@ "oVM" = ( /turf/open/floor/plating/warnplate/north, /area/lv624/ground/barrens/east_barrens/ceiling) +"oVR" = ( +/obj/effect/sentry_landmark/lz_2/top_right, +/turf/open/gm/dirt, +/area/lv624/lazarus/landing_zones/lz2) "oWN" = ( /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/grass/grass2, @@ -16932,13 +16876,6 @@ /obj/item/weapon/twohanded/fireaxe, /turf/open/floor/wood, /area/lv624/ground/caves/north_central_caves) -"pfK" = ( -/obj/structure/flora/bush/ausbushes/var3/ywflowers, -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, -/area/lv624/ground/barrens/south_eastern_barrens) "pgc" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /turf/open/auto_turf/strata_grass/layer1, @@ -16966,6 +16903,10 @@ "pjk" = ( /turf/open/gm/coast/beachcorner2/north_east, /area/lv624/ground/river/east_river) +"pjw" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/floor/brown/northwest, +/area/lv624/lazarus/comms) "pjY" = ( /obj/structure/flora/jungle/plantbot1, /turf/open/gm/grass/grass1, @@ -17014,6 +16955,10 @@ }, /turf/open/floor/white, /area/lv624/lazarus/corporate_dome) +"poE" = ( +/obj/structure/platform/stone/runed_sandstone/north, +/turf/open/gm/dirt, +/area/lv624/ground/caves/sand_temple) "poX" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /obj/effect/decal/grass_overlay/grass1/inner{ @@ -17111,6 +17056,21 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/dark, /area/lv624/lazarus/comms) +"pAr" = ( +/obj/item/device/radio/intercom{ + freerange = 1; + frequency = 1469; + name = "General Listening Channel"; + pixel_y = 30 + }, +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/stair_cut/platform_left, +/obj/item/clothing/head/hardhat/orange, +/turf/open/floor/dark, +/area/lv624/lazarus/engineering) "pAE" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, /turf/open/auto_turf/strata_grass/layer1, @@ -17208,10 +17168,6 @@ /obj/structure/fence, /turf/open/gm/dirtgrassborder/north, /area/lv624/ground/colony/west_nexus_road) -"pIz" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/barrens/south_eastern_barrens) "pIB" = ( /obj/structure/flora/bush/ausbushes/ausbush, /turf/open/auto_turf/strata_grass/layer1, @@ -17273,6 +17229,11 @@ /obj/structure/flora/jungle/vines/light_2, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_east_jungle) +"pNG" = ( +/obj/effect/landmark/lv624/fog_blocker, +/obj/structure/platform_decoration/stone/runed_sandstone/west, +/turf/open/gm/coast/beachcorner/north_east, +/area/lv624/ground/river/east_river) "pOC" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/jungle/north_west_jungle) @@ -17377,6 +17338,10 @@ /obj/structure/flora/grass/tallgrass/jungle, /turf/open/gm/grass/grass1, /area/lv624/ground/colony/west_nexus_road) +"pXR" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/north, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/caves/sand_temple) "pYp" = ( /obj/structure/flora/bush/ausbushes/var3/sunnybush, /turf/open/gm/grass/grass1, @@ -17399,15 +17364,13 @@ /obj/item/clothing/mask/gas, /turf/open/floor/vault, /area/lv624/lazarus/quartstorage) -"qap" = ( -/obj/structure/machinery/light, -/obj/structure/stairs/perspective{ - dir = 9; - icon_state = "p_stair_full" +"qae" = ( +/obj/structure/machinery/landinglight/ds2/delaythree{ + dir = 1 }, -/obj/structure/platform, -/turf/open/floor/brown/northwest, -/area/lv624/lazarus/comms) +/obj/effect/sentry_landmark/lz_2/bottom_left, +/turf/open/floor/plating, +/area/lv624/lazarus/landing_zones/lz2) "qaE" = ( /obj/effect/landmark/hunter_primary, /obj/effect/landmark/queen_spawn, @@ -17469,6 +17432,10 @@ }, /turf/open/gm/dirt, /area/lv624/ground/caves/north_east_caves) +"qgt" = ( +/obj/effect/sentry_landmark/lz_2/bottom_right, +/turf/open/floor/plating/asteroidfloor/north, +/area/lv624/lazarus/landing_zones/lz2) "qgA" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/jungle/south_east_jungle) @@ -17528,12 +17495,6 @@ }, /turf/open/gm/dirt, /area/lv624/ground/caves/north_west_caves) -"qsM" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 1 - }, -/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, -/area/lv624/ground/caves/sand_temple) "qtj" = ( /turf/open/gm/dirt, /area/lv624/ground/jungle/south_central_jungle) @@ -17566,7 +17527,8 @@ }, /obj/item/clothing/mask/yautja_flavor{ anchored = 1; - unacidable = 0 + unacidable = 0; + pixel_y = 10 }, /turf/open/floor/corsat/squareswood/north, /area/lv624/ground/caves/sand_temple) @@ -17599,10 +17561,6 @@ }, /turf/open/floor/wood, /area/lv624/ground/caves/north_central_caves) -"qAc" = ( -/obj/structure/platform/mineral/sandstone/runed, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/caves/sand_temple) "qAf" = ( /obj/structure/flora/bush/ausbushes/var3/sunnybush{ desc = "The oranges aren't done yet... this sucks."; @@ -17624,17 +17582,6 @@ /obj/structure/flora/bush/ausbushes/var3/brflowers, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) -"qBQ" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 9; - icon_state = "p_stair_full" - }, -/obj/structure/platform/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/gm/dirt, -/area/lv624/ground/barrens/south_eastern_barrens) "qBW" = ( /turf/open/gm/dirt, /area/lv624/ground/jungle/south_west_jungle/ceiling) @@ -17759,18 +17706,6 @@ /obj/structure/flora/bush/ausbushes/var3/ywflowers, /turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_jungle_barrens) -"qPO" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 8; - icon_state = "p_stair_ew_full_cap"; - layer = 3.5 - }, -/obj/structure/platform/mineral/sandstone/runed{ - dir = 1 - }, -/turf/open/floor/whiteyellowfull/east, -/area/lv624/ground/caves/sand_temple) "qPY" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, @@ -17888,6 +17823,15 @@ }, /turf/open/gm/dirt, /area/lv624/ground/caves/south_central_caves) +"rbw" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + icon_state = "p_stair_ew_full_cap"; + layer = 3.5 + }, +/obj/structure/platform/stone/stair_cut/runed_sandstone_right, +/turf/open/floor/whiteyellowfull/east, +/area/lv624/ground/barrens/south_eastern_barrens) "rby" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/auto_turf/strata_grass/layer1, @@ -18229,6 +18173,10 @@ /obj/structure/flora/jungle/vines/light_2, /turf/closed/wall/r_wall, /area/lv624/lazarus/landing_zones/lz2) +"rKf" = ( +/obj/effect/sentry_landmark/lz_2/top_left, +/turf/open/floor/plating, +/area/lv624/lazarus/landing_zones/lz2) "rKQ" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 @@ -18279,12 +18227,6 @@ }, /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_west_jungle) -"rQu" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 8 - }, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/caves/sand_temple) "rRE" = ( /obj/item/tool/minihoe{ pixel_x = 1; @@ -18340,16 +18282,19 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/auto_turf/strata_grass/layer1, /area/lv624/ground/caves/north_east_caves) -"rYA" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 1 - }, -/turf/open/gm/dirt, -/area/lv624/ground/caves/sand_temple) "rYI" = ( /obj/effect/landmark/objective_landmark/close, /turf/open/gm/river, /area/lv624/ground/caves/west_caves) +"rZK" = ( +/obj/structure/stairs/perspective{ + color = "#6b675e"; + dir = 5; + icon_state = "p_stair_full" + }, +/obj/structure/platform/stone/runed_sandstone/west, +/turf/open/gm/dirt, +/area/lv624/ground/caves/sand_temple) "rZL" = ( /obj/structure/surface/rack, /obj/item/ammo_magazine/rifle/mar40, @@ -18374,6 +18319,10 @@ }, /turf/open/gm/dirt, /area/lv624/ground/caves/central_caves) +"scu" = ( +/obj/structure/platform/stone/runed_sandstone/west, +/turf/open/gm/dirt, +/area/lv624/ground/caves/sand_temple) "sdh" = ( /obj/structure/barricade/sandbags/wired, /turf/open/floor/wood, @@ -18432,6 +18381,14 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/gm/grass/grass2, /area/lv624/lazarus/yggdrasil) +"siY" = ( +/obj/structure/platform_decoration/metal/almayer, +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/turf/open/floor/plating/warnplate/southeast, +/area/lv624/lazarus/engineering) "slW" = ( /obj/structure/flora/jungle/vines/heavy, /turf/closed/wall/mineral/sandstone/runed/decor, @@ -18439,12 +18396,6 @@ "smx" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/ground/jungle/west_central_jungle) -"smE" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/caves/sand_temple) "snc" = ( /obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{ light_on = 1; @@ -18506,17 +18457,6 @@ /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/grass/grass1, /area/lv624/lazarus/landing_zones/lz2) -"sqR" = ( -/obj/structure/stairs/perspective{ - color = "#6b675e"; - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/floor/whiteyellowfull/east, -/area/lv624/ground/caves/sand_temple) "srn" = ( /obj/effect/decal/grass_overlay/grass1/inner{ dir = 8 @@ -18550,6 +18490,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/dark, /area/lv624/lazarus/engineering) +"swt" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/west, +/turf/open/gm/dirt, +/area/lv624/ground/barrens/south_eastern_barrens) "swR" = ( /obj/structure/flora/jungle/vines/light_3, /obj/structure/flora/jungle/vines/heavy, @@ -18574,6 +18518,10 @@ /obj/structure/flora/bush/ausbushes/var3/leafybush, /turf/open/auto_turf/strata_grass/layer1, /area/lv624/ground/caves/south_east_caves) +"sxJ" = ( +/obj/structure/platform/stone/runed_sandstone/north, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/caves/sand_temple) "sxY" = ( /obj/structure/surface/rack, /obj/item/moneybag, @@ -18619,17 +18567,6 @@ "sBY" = ( /turf/open/auto_turf/strata_grass/layer1, /area/lv624/ground/caves/north_west_caves) -"sCg" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - icon_state = "p_stair_ew_full_cap"; - layer = 3.5 - }, -/obj/structure/platform/mineral/sandstone/runed{ - dir = 1 - }, -/turf/open/floor/whiteyellowfull/east, -/area/lv624/ground/barrens/south_eastern_barrens) "sCx" = ( /obj/item/clothing/head/welding, /obj/effect/decal/cleanable/dirt, @@ -18648,6 +18585,10 @@ /obj/structure/flora/bush/ausbushes/var3/brflowers, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_central_jungle) +"sDV" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/east, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/caves/sand_temple) "sET" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /obj/effect/decal/grass_overlay/grass1{ @@ -18697,17 +18638,6 @@ /obj/effect/decal/remains/xeno, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/south_east_caves) -"sIM" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 1 - }, -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 5; - icon_state = "p_stair_full" - }, -/turf/open/gm/dirt, -/area/lv624/ground/barrens/south_eastern_barrens) "sJM" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_core, /turf/open/gm/dirt, @@ -18767,6 +18697,15 @@ /obj/effect/landmark/hunter_primary, /turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_jungle_barrens) +"sPq" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 10; + icon_state = "p_stair_full" + }, +/obj/structure/platform/stone/runed_sandstone, +/turf/open/gm/dirt, +/area/lv624/ground/barrens/south_eastern_barrens) "sPy" = ( /obj/structure/flora/bush/ausbushes/ausbush, /turf/open/gm/grass/grass1, @@ -18775,6 +18714,15 @@ /obj/item/reagent_container/food/snacks/grown/mushroom/angel, /turf/open/auto_turf/strata_grass/layer1, /area/lv624/ground/caves/central_caves) +"sPU" = ( +/obj/structure/stairs/perspective{ + color = "#6b675e"; + dir = 6; + icon_state = "p_stair_full" + }, +/obj/structure/platform/stone/runed_sandstone/west, +/turf/open/floor/strata/grey_multi_tiles, +/area/lv624/ground/caves/sand_temple) "sRH" = ( /obj/structure/flora/bush/ausbushes/palebush, /turf/open/gm/grass/grass1, @@ -18844,7 +18792,8 @@ }, /obj/item/clothing/mask/yautja_flavor{ anchored = 1; - unacidable = 0 + unacidable = 0; + pixel_y = 10 }, /turf/open/floor/corsat/squareswood/north, /area/lv624/ground/caves/sand_temple) @@ -18964,7 +18913,8 @@ }, /obj/item/clothing/mask/yautja_flavor{ anchored = 1; - unacidable = 0 + unacidable = 0; + pixel_y = 10 }, /obj/item/clothing/suit/armor/yautja_flavor{ anchored = 1 @@ -19038,6 +18988,10 @@ "tnY" = ( /turf/open/gm/dirt/desert3, /area/lv624/ground/caves/west_caves) +"tob" = ( +/obj/structure/platform_decoration/stone/runed_sandstone, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, +/area/lv624/ground/caves/sand_temple) "toz" = ( /obj/structure/flora/bush/ausbushes/pointybush, /turf/open/gm/grass/grass1, @@ -19063,6 +19017,10 @@ /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_jungle_barrens) +"tqh" = ( +/obj/structure/platform_decoration/stone/runed_sandstone, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/barrens/south_eastern_barrens) "tqH" = ( /obj/structure/flora/jungle/plantbot1, /turf/open/gm/grass/grass1, @@ -19075,17 +19033,6 @@ /obj/item/tool/shovel, /turf/open/gm/dirt, /area/lv624/ground/barrens/north_east_barrens) -"trJ" = ( -/obj/structure/stairs/perspective{ - color = "#6b675e"; - dir = 6; - icon_state = "p_stair_full" - }, -/obj/structure/platform/mineral/sandstone/runed{ - dir = 8 - }, -/turf/open/gm/dirt, -/area/lv624/ground/caves/sand_temple) "tsa" = ( /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/jungle/south_central_jungle) @@ -19115,6 +19062,24 @@ /obj/structure/barricade/handrail/strata, /turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/lv624/ground/barrens/south_eastern_barrens) +"tur" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform_decoration/stone/runed_sandstone, +/turf/open/floor/whiteyellowfull/east, +/area/lv624/ground/barrens/south_eastern_barrens) +"tut" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/stair_cut/platform_right, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/brown/northwest, +/area/lv624/lazarus/comms) "tuJ" = ( /obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{ light_on = 1; @@ -19164,12 +19129,6 @@ "tzo" = ( /turf/open/gm/dirt/desert_dug, /area/lv624/ground/barrens/central_barrens) -"tzB" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 8 - }, -/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, -/area/lv624/ground/caves/sand_temple) "tzK" = ( /obj/effect/landmark/crap_item, /turf/open/gm/grass/grass1, @@ -19189,17 +19148,6 @@ /obj/structure/flora/bush/ausbushes/var3/sparsegrass, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_central_jungle) -"tDa" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 5; - icon_state = "p_stair_full" - }, -/obj/structure/platform/mineral/sandstone/runed{ - dir = 8 - }, -/turf/open/gm/dirt, -/area/lv624/ground/barrens/south_eastern_barrens) "tEm" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, @@ -19225,6 +19173,16 @@ /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/whiteblue/west, /area/lv624/lazarus/medbay) +"tIw" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 8; + icon_state = "p_stair_ew_full_cap"; + layer = 3.5 + }, +/obj/structure/platform/stone/stair_cut/runed_sandstone_left, +/turf/open/floor/whiteyellowfull/east, +/area/lv624/ground/caves/sand_temple) "tIZ" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /turf/open/gm/grass/grass1, @@ -19246,7 +19204,8 @@ anchored = 1 }, /obj/item/clothing/mask/gas/yautja/damaged{ - anchored = 1 + anchored = 1; + pixel_y = 10 }, /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) @@ -19287,15 +19246,6 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/gm/dirt, /area/lv624/ground/barrens/east_barrens) -"tMF" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform_decoration/mineral/sandstone/runed, -/turf/open/floor/whiteyellowfull/east, -/area/lv624/ground/barrens/south_eastern_barrens) "tMP" = ( /obj/structure/window_frame/colony, /turf/open/floor/plating, @@ -19447,12 +19397,6 @@ /obj/structure/flora/bush/ausbushes/var3/leafybush, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) -"udj" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 8 - }, -/turf/open/gm/dirt, -/area/lv624/ground/barrens/south_eastern_barrens) "udM" = ( /obj/effect/landmark/good_item, /turf/open/floor/dark, @@ -19460,6 +19404,10 @@ "udP" = ( /turf/open/gm/dirt, /area/lv624/ground/colony/south_medbay_road) +"udZ" = ( +/obj/structure/platform/stone/runed_sandstone, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/caves/sand_temple) "ueZ" = ( /obj/structure/flora/jungle/planttop1, /obj/structure/flora/grass/tallgrass/jungle/corner{ @@ -19595,10 +19543,6 @@ /obj/structure/flora/bush/ausbushes/reedbush, /turf/open/auto_turf/strata_grass/layer1, /area/lv624/ground/caves/east_caves) -"upp" = ( -/obj/structure/platform_decoration, -/turf/open/floor/brown/northwest, -/area/lv624/lazarus/comms) "upM" = ( /obj/effect/landmark/crap_item, /turf/open/gm/grass/grass1, @@ -19637,6 +19581,16 @@ /obj/structure/flora/bush/ausbushes/reedbush, /turf/open/gm/dirt, /area/lv624/ground/barrens/central_barrens) +"uta" = ( +/obj/structure/machinery/light, +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/brown/northwest, +/area/lv624/lazarus/comms) "uuf" = ( /obj/effect/landmark/hunter_primary, /turf/open/gm/dirt, @@ -19944,6 +19898,15 @@ /obj/effect/decal/grass_overlay/grass1, /turf/open/gm/dirt, /area/lv624/ground/caves/central_caves) +"vcI" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 5; + icon_state = "p_stair_full" + }, +/obj/structure/platform/stone/runed_sandstone/west, +/turf/open/gm/dirt, +/area/lv624/ground/barrens/south_eastern_barrens) "vcY" = ( /obj/structure/machinery/colony_floodlight, /turf/open/gm/grass/grass1, @@ -19979,31 +19942,10 @@ }, /turf/open/floor/white, /area/lv624/lazarus/corporate_dome) -"ver" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/gm/dirtgrassborder/south, -/area/lv624/ground/caves/sand_temple) -"vft" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/gm/dirt/desert_dug, -/area/lv624/ground/caves/sand_temple) "vfR" = ( /obj/structure/flora/jungle/plantbot1, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) -"vgJ" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 1 - }, -/obj/structure/platform/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/gm/dirt, -/area/lv624/ground/caves/sand_temple) "vgM" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /turf/open/gm/grass/grass1, @@ -20088,15 +20030,6 @@ /obj/structure/flora/bush/ausbushes/reedbush, /turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_jungle_barrens) -"vpu" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform/mineral/sandstone/runed, -/turf/open/gm/dirt, -/area/lv624/ground/barrens/south_eastern_barrens) "vqT" = ( /turf/open/gm/grass/grass2, /area/lv624/ground/jungle/north_jungle) @@ -20123,12 +20056,6 @@ /obj/effect/landmark/crap_item, /turf/open/gm/dirt, /area/lv624/lazarus/crashed_ship_containers) -"vvs" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, -/area/lv624/ground/caves/sand_temple) "vvE" = ( /obj/structure/machinery/vending/cola, /obj/structure/machinery/light{ @@ -20180,12 +20107,10 @@ "vBe" = ( /turf/open/gm/dirtgrassborder/east, /area/lv624/ground/jungle/east_central_jungle) -"vBu" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/gm/dirt, -/area/lv624/ground/caves/sand_temple) +"vBg" = ( +/obj/effect/sentry_landmark/lz_2/bottom_left, +/turf/open/gm/dirtgrassborder/west, +/area/lv624/lazarus/landing_zones/lz2) "vBQ" = ( /obj/structure/largecrate, /turf/open/floor/bot/north, @@ -20196,6 +20121,16 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/gm/dirt, /area/lv624/ground/caves/south_east_caves) +"vDc" = ( +/obj/structure/stairs/perspective{ + color = "#6b675e"; + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/flora/jungle/vines/heavy, +/obj/structure/platform_decoration/stone/runed_sandstone/east, +/turf/open/shuttle/red, +/area/lv624/ground/caves/sand_temple) "vDy" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/barrens/south_eastern_barrens) @@ -20267,9 +20202,22 @@ /obj/structure/flora/jungle/vines/light_2, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/east_jungle) +"vLF" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/brown/northwest, +/area/lv624/lazarus/comms) "vLO" = ( /turf/open/gm/dirtgrassborder/south, /area/lv624/lazarus/quartstorage/outdoors) +"vMA" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform/stone/runed_sandstone, +/turf/open/floor/whiteyellowfull/east, +/area/lv624/ground/caves/sand_temple) "vMC" = ( /obj/structure/extinguisher_cabinet{ pixel_y = 30 @@ -20311,6 +20259,10 @@ "vOF" = ( /turf/open/gm/dirtgrassborder/west, /area/lv624/ground/jungle/south_central_jungle) +"vOG" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/north, +/turf/open/gm/dirt, +/area/lv624/ground/barrens/south_eastern_barrens) "vPo" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_wall, /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, @@ -20338,6 +20290,10 @@ /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/brown/northwest, /area/lv624/lazarus/comms) +"vRR" = ( +/obj/effect/sentry_landmark/lz_2/top_right, +/turf/open/gm/grass/grass1, +/area/lv624/lazarus/landing_zones/lz2) "vSG" = ( /obj/structure/flora/jungle/vines/light_1, /turf/open/gm/grass/grass1, @@ -20433,12 +20389,6 @@ }, /turf/open/gm/dirtgrassborder/weedable/grass1, /area/lv624/ground/barrens/south_eastern_barrens) -"wcj" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 1 - }, -/turf/open/gm/dirt, -/area/lv624/ground/caves/sand_temple) "wcK" = ( /obj/structure/surface/rack, /obj/item/clothing/suit/storage/hazardvest, @@ -20450,13 +20400,6 @@ /obj/structure/flora/bush/ausbushes/ausbush, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) -"wcW" = ( -/obj/structure/flora/jungle/vines/heavy, -/obj/structure/platform/mineral/sandstone/runed{ - dir = 1 - }, -/turf/open/gm/coast/beachcorner2/south_east, -/area/lv624/ground/caves/sand_temple) "weB" = ( /obj/item/stack/rods/plasteel, /turf/open/floor/greengrid, @@ -20469,13 +20412,6 @@ /obj/item/stack/rods, /turf/open/floor/plating/platingdmg3, /area/lv624/lazarus/secure_storage) -"wgk" = ( -/obj/structure/flora/bush/ausbushes/ppflowers, -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, -/area/lv624/ground/caves/sand_temple) "whk" = ( /obj/item/reagent_container/food/snacks/grown/mushroom/glowshroom{ light_on = 1; @@ -20516,6 +20452,10 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/gm/dirt, /area/lv624/ground/barrens/containers) +"wjA" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/east, +/turf/open/gm/coast/north, +/area/lv624/ground/caves/sand_temple) "wjT" = ( /obj/structure/sign/safety/analysis_lab{ pixel_x = 40 @@ -20548,12 +20488,6 @@ /obj/structure/flora/bush/ausbushes/genericbush, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) -"wmj" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 1 - }, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/caves/sand_temple) "wol" = ( /obj/item/ammo_magazine/rifle/extended, /turf/open/floor/plating, @@ -20677,6 +20611,15 @@ }, /turf/open/gm/dirt, /area/lv624/ground/caves/east_caves) +"wEk" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform_decoration/stone/runed_sandstone/east, +/turf/open/floor/whiteyellowfull/east, +/area/lv624/ground/barrens/south_eastern_barrens) "wEO" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door, /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, @@ -20826,18 +20769,6 @@ "wSo" = ( /turf/open/gm/coast/east, /area/lv624/ground/barrens/west_barrens) -"wSA" = ( -/obj/structure/stairs/perspective{ - color = "#6b675e"; - dir = 5; - icon_state = "p_stair_full" - }, -/obj/structure/flora/jungle/vines/heavy, -/obj/structure/platform/mineral/sandstone/runed{ - dir = 8 - }, -/turf/open/floor/strata/grey_multi_tiles, -/area/lv624/ground/caves/sand_temple) "wSR" = ( /obj/effect/landmark/hunter_secondary, /obj/structure/surface/table/reinforced/prison, @@ -20862,6 +20793,10 @@ /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/north_east_jungle) +"wTf" = ( +/obj/effect/sentry_landmark/lz_2/top_left, +/turf/open/floor/plating/asteroidwarning/west, +/area/lv624/lazarus/landing_zones/lz2) "wTC" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 @@ -20957,12 +20892,6 @@ "wZW" = ( /turf/open/floor/sandstone/runed, /area/lv624/ground/barrens/south_eastern_barrens) -"xak" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 8 - }, -/turf/open/gm/dirt, -/area/lv624/ground/barrens/south_eastern_barrens) "xar" = ( /obj/effect/decal/grass_overlay/grass1/inner, /turf/open/gm/dirt, @@ -21052,10 +20981,6 @@ "xpf" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/colony/north_nexus_road) -"xpz" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed, -/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, -/area/lv624/ground/caves/sand_temple) "xpR" = ( /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/caves/north_east_caves) @@ -21084,11 +21009,6 @@ "xvj" = ( /turf/open/gm/dirt, /area/lv624/lazarus/secure_storage) -"xvz" = ( -/obj/structure/platform_decoration, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/brown/northwest, -/area/lv624/lazarus/comms) "xvN" = ( /obj/structure/barricade/handrail/strata{ dir = 1 @@ -21107,6 +21027,10 @@ "xwr" = ( /turf/open/gm/dirt, /area/lv624/ground/barrens/west_barrens) +"xwt" = ( +/obj/structure/platform/stone/runed_sandstone/east, +/turf/open/gm/dirt, +/area/lv624/ground/barrens/south_eastern_barrens) "xwN" = ( /obj/structure/flora/bush/ausbushes/var3/brflowers, /turf/open/auto_turf/strata_grass/layer1, @@ -21354,12 +21278,6 @@ /obj/structure/flora/bush/ausbushes/var3/fullgrass, /turf/open/gm/river, /area/lv624/ground/river/central_river) -"ybO" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 8 - }, -/turf/open/gm/dirtgrassborder/east, -/area/lv624/ground/caves/sand_temple) "ybQ" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/weapon/pole/fancy_cane, @@ -21460,6 +21378,10 @@ }, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) +"ykl" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/east, +/turf/open/gm/dirt, +/area/lv624/ground/barrens/south_eastern_barrens) "ykM" = ( /obj/structure/flora/jungle/vines/heavy, /obj/structure/flora/bush/ausbushes/pointybush, @@ -27825,7 +27747,7 @@ aJF aJF uRE uRE -uRE +vBg uRE uRE aJF @@ -28051,7 +27973,7 @@ uzH uzH uzH uzH -uzH +wTf uzH uzH uzH @@ -28513,7 +28435,7 @@ aRg aRg aCi aRg -odw +qae aRg wLz tZD @@ -28742,7 +28664,7 @@ aRg aKO aRg aEw -aRg +rKf wLz tZD aAp @@ -29655,7 +29577,7 @@ aRg aRg aEw aRg -wLz +mpc gef mxW oOf @@ -30110,7 +30032,7 @@ aRg aRg aRg aZT -aRg +rKf wLz lUb tZD @@ -31683,7 +31605,7 @@ aAp nmO aZP aDv -aDv +oVR aDv aRx aXX @@ -31701,7 +31623,7 @@ aDv aDv aDv aOB -wHp +qgt wLz aDv tZD @@ -32144,12 +32066,12 @@ aDv aRx aXX aXX -aXX +vRR aXX aXX azD aEs -aDv +bwq aDv aDv aRx @@ -32607,7 +32529,7 @@ aXX aZP aDv aCI -aDv +bwq aRx twg aXX @@ -32833,7 +32755,7 @@ ado aXX aXX aZP -aDv +oVR aDv aDv aRx @@ -38558,12 +38480,12 @@ aQn aTi aTi qit -upp -jfN -jfN -gKN -xvz -elO +pjw +hLB +hLB +vLF +mhc +mTK aPT kxI lIU @@ -38786,11 +38708,11 @@ aTg aTg kKL aXn -qap +mft aTg aTg -cyP -aXa +tut +uta aPt aPt kxI @@ -40838,7 +40760,7 @@ aSL aSL aVg tem -aVd +fdr kzp aTq aTq @@ -41066,7 +40988,7 @@ aSL lHc ogR aUs -nwR +fvx aTM aTq kzp @@ -41750,7 +41672,7 @@ aSL lHc gKg aVe -jwW +siY aTM aTM gqG @@ -41978,7 +41900,7 @@ aSL aSL aVf jMk -aWg +loA lzW kyz aWF @@ -42663,9 +42585,9 @@ aTs aTR aUu aSX -aVG +pAr vdl -aWG +noO aSX aXt aWi @@ -42890,10 +42812,10 @@ aSL aTu fLf fQx -aVj -mkZ +eOJ +gtW hDe -aWH +gch aSX aXu aXN @@ -51901,14 +51823,14 @@ ahv ahv afS aej -wSA -jAK +iyd +vDc ubJ -jMH -iwl +mJC +sPU aej ssK -rYA +poE agX agX ahv @@ -52136,7 +52058,7 @@ mhZ pEV uFA cRm -rYA +poE agX ahv ahv @@ -52364,7 +52286,7 @@ mhZ lDh pws ssK -rYA +poE agX agX ahv @@ -52592,7 +52514,7 @@ mhZ dID kbr jFc -rYA +poE agX gxd ahv @@ -52820,7 +52742,7 @@ mhZ pEV lJm aeg -rYA +poE gxd qeW btX @@ -53048,7 +52970,7 @@ mhZ pEV uDd slW -rYA +poE fPi btX wPN @@ -53276,8 +53198,8 @@ mhZ pEV fzZ aeg -vgJ -mUZ +efJ +eSb wPN gQr agX @@ -53505,7 +53427,7 @@ nTE afS afS aeg -wcW +gFk gQr agX xBi @@ -53723,17 +53645,17 @@ ahv ahv ahv aeg -wcj -lse -sqR +fPJ +rZK +eHl oyI oyI oyI -ezC -trJ -oDY +dvA +fhC +wjA aeg -rYA +poE agX agX agX @@ -53951,17 +53873,17 @@ ahv ahv ahv ufW -xpz -nEr -rQu +tob +cdB +fLk boe boe boe -aeq -nEr -bIO +kfq +cdB +gFO afS -rYA +poE agX agX agX @@ -53978,9 +53900,9 @@ xch xch xch xch -dXq -nfX -ocL +dtZ +xwt +pNG uxT uxT uxT @@ -54179,17 +54101,17 @@ aeb dkN ufW ufW -aAd +jKI avk -wmj +sxJ boe boe boe -qAc +udZ thn -qsM +bXU ufW -fvt +mww rCK rCK rCK @@ -54199,19 +54121,19 @@ slW afS ahv ahv -udj +swt xch xch xch -dXq -qBQ -dws -cQX +dtZ +gRh +fxZ +sPq nnq -oGj -tMF -nVZ -udj +lde +tur +cib +swt ajw ajI alz @@ -54407,15 +54329,15 @@ agA rac ufW msd -aep -afi -gNo +gTm +scu +sDV boe boe boe -kPU -afi -ver +pXR +scu +eYQ hqS agX agX @@ -54427,11 +54349,11 @@ wUz afS aeg lUy -sCg +rbw qpX qpX pRx -vpu +dSb jSp oTx jhG @@ -54439,7 +54361,7 @@ jhG jhG thS btr -gTM +npt ajw ajI ajI @@ -54659,7 +54581,7 @@ wBS ahB wZW wZW -oFO +jvr dVO bEq iuO @@ -54667,7 +54589,7 @@ lPJ whv dGc lBq -gTM +npt jLc aqu ajI @@ -54895,7 +54817,7 @@ rxV lPJ dGc shy -gTM +npt xch ajw ajI @@ -55115,7 +55037,7 @@ wZW wZW wZW wZW -pIz +tqh xvN bEq uUJ @@ -55123,7 +55045,7 @@ lPJ mUH dGc wca -gTM +npt xch ajw alA @@ -55319,15 +55241,15 @@ aeT rac aej boe -aeq -smE -rQu +kfq +eHw +fLk agX agX agX -aeq -vvs -ybO +kfq +fxh +cJY dDa boe agX @@ -55339,11 +55261,11 @@ kqL aeg aeg lUy -nWw +jvV dqo dqo bQA -lWw +kBJ eAr ktf iOz @@ -55351,7 +55273,7 @@ iOz iOz ttZ mVg -gTM +npt arT ajw ajI @@ -55547,17 +55469,17 @@ aKj ahv aeg aeg -qAc +udZ woM -rYA +poE yhd dxy agX -hNq +oQU idz -afq +iPw ufW -qPO +tIw aBi aBi aBi @@ -55567,19 +55489,19 @@ aeg aeg ahv ahv -pfK +fSA iIF xch xch -bOg -tDa -fhs -hke +vOG +vcI +wEk +fDo nnq -sIM -nsF -kZs -ekJ +hYx +iAv +fQD +ykl rGZ ajw alz @@ -55775,17 +55697,17 @@ gWE ahv ahv slW -wcj -afi -vBu +fPJ +scu +lHG qqJ aev agX -wcj -tzB -wgk +fPJ +nTT +lAv ufW -rYA +poE agX agX agX @@ -55802,9 +55724,9 @@ xch xch xch xch -bOg -xak -ekJ +vOG +iNF +ykl dGc eER iIF @@ -56232,16 +56154,16 @@ ahv ahv aeg aeg -qPO +tIw aBi aBi aBi aBi aBi -afj +vMA afS afS -rYA +poE agX agX agX @@ -56460,16 +56382,16 @@ ahv ahv ahv aeg -gNo +sDV boe boe boe boe boe -kPU +pXR afS ahv -vft +fqS agX agX agX diff --git a/maps/map_files/LV624/maintemple/1.intact.dmm b/maps/map_files/LV624/maintemple/1.intact.dmm index a0fdb0661ceb..9567d1214815 100644 --- a/maps/map_files/LV624/maintemple/1.intact.dmm +++ b/maps/map_files/LV624/maintemple/1.intact.dmm @@ -1,4 +1,32 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"ah" = ( +/obj/structure/showcase{ + color = "#95948B"; + desc = "A grey statue dawned in ancient armor, it stares into your soul."; + icon = 'icons/mob/humans/species/r_synthetic.dmi'; + icon_state = "Synthetic_Template"; + name = "Eternal guardian" + }, +/obj/item/weapon/harpoon/yautja{ + name = "Alien Harpoon"; + pixel_x = 6 + }, +/obj/effect/decal/remains/xeno{ + pixel_x = -1; + pixel_y = 31 + }, +/obj/item/clothing/mask/yautja_flavor/map_random{ + anchored = 1; + pixel_y = 10 + }, +/obj/item/clothing/suit/armor/yautja_flavor{ + anchored = 1 + }, +/obj/item/clothing/shoes/yautja_flavor{ + anchored = 1 + }, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/barrens/south_eastern_barrens) "as" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -22,6 +50,10 @@ }, /turf/open/floor/strata/grey_multi_tiles, /area/lv624/ground/caves/sand_temple/powered) +"aH" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/east, +/turf/open/gm/dirt, +/area/lv624/ground/barrens/south_eastern_barrens) "aI" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -62,6 +94,40 @@ }, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) +"ba" = ( +/obj/item/weapon/sword{ + pixel_x = 6; + pixel_y = 7 + }, +/obj/structure/showcase{ + color = "#95948B"; + desc = "A grey statue dawned in ancient armor, it stares into your soul."; + dir = 1; + icon = 'icons/mob/humans/species/r_synthetic.dmi'; + icon_state = "Synthetic_Template"; + name = "Eternal guardian" + }, +/obj/item/clothing/mask/yautja_flavor/map_random{ + anchored = 1; + pixel_y = 10 + }, +/obj/item/clothing/suit/armor/yautja_flavor{ + anchored = 1 + }, +/obj/item/clothing/shoes/yautja_flavor{ + anchored = 1 + }, +/turf/open/floor/strata/grey_multi_tiles, +/area/lv624/ground/caves/sand_temple) +"bq" = ( +/obj/structure/stairs/perspective{ + color = "#6b675e"; + dir = 5; + icon_state = "p_stair_full" + }, +/obj/structure/platform/stone/runed_sandstone/west, +/turf/open/floor/strata/grey_multi_tiles, +/area/lv624/ground/caves/sand_temple) "bP" = ( /obj/structure/bed/chair/comfy/black, /turf/open/floor/corsat/squareswood/north, @@ -73,15 +139,45 @@ /obj/item/tool/pickaxe/plasmacutter, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple/powered) -"dr" = ( +"cG" = ( +/obj/structure/stairs/perspective{ + color = "#6b675e"; + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform_decoration/stone/runed_sandstone/north, +/turf/open/shuttle/red, +/area/lv624/ground/caves/sand_temple) +"cN" = ( +/obj/structure/platform/stone/runed_sandstone/north, +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 5; + icon_state = "p_stair_full" + }, +/turf/open/gm/dirt, +/area/lv624/ground/barrens/south_eastern_barrens) +"cT" = ( /obj/structure/stairs/perspective{ color = "#b29082"; dir = 4; icon_state = "p_stair_full" }, -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 1 +/obj/structure/platform/stone/runed_sandstone, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/barrens/south_eastern_barrens) +"dp" = ( +/obj/structure/blocker/forcefield/multitile_vehicles, +/obj/structure/platform_decoration/stone/runed_sandstone/west, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/caves/sand_temple) +"dz" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 8; + icon_state = "p_stair_full" }, +/obj/structure/platform_decoration/stone/runed_sandstone, /turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_barrens) "dA" = ( @@ -121,15 +217,6 @@ /obj/effect/landmark/objective_landmark/far, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) -"dE" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform/mineral/sandstone/runed, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/barrens/south_eastern_barrens) "dF" = ( /turf/open/gm/dirtgrassborder/north, /area/lv624/ground/barrens/south_eastern_barrens) @@ -143,17 +230,6 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) -"dL" = ( -/obj/structure/stairs/perspective{ - color = "#6b675e"; - dir = 6; - icon_state = "p_stair_full" - }, -/obj/structure/platform/mineral/sandstone/runed{ - dir = 8 - }, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/caves/sand_temple) "dQ" = ( /obj/structure/machinery/autolathe/yautja, /turf/open/floor/strata/grey_multi_tiles, @@ -216,6 +292,10 @@ }, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) +"eH" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/east, +/turf/open/gm/dirt, +/area/lv624/ground/caves/sand_temple) "eM" = ( /obj/structure/stairs/perspective{ color = "#b29082"; @@ -224,38 +304,8 @@ }, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) -"eY" = ( -/obj/structure/showcase{ - color = "#FFE55C"; - desc = "This statue seems taller and somehow mightier than the others... it makes you want to steer away from it."; - icon = 'icons/mob/humans/species/r_synthetic.dmi'; - icon_state = "Synthetic_Template"; - name = "massive statue" - }, -/obj/item/clothing/mask/gas/yautja/damaged{ - anchored = 1; - color = "#FFE55C"; - icon_state = "pred_mask_elder_n"; - name = "unsettling stone mask" - }, -/obj/item/clothing/suit/armor/yautja/hunter{ - anchored = 1; - color = "#FFE55C"; - icon_state = "halfarmor_elder_n"; - name = "gilded clan armor" - }, -/obj/item/clothing/shoes/yautja/hunter{ - anchored = 1; - color = "#FFE55C"; - icon_state = "y-boots2"; - name = "gilded clan greaves" - }, -/obj/item/weapon/yautja/chained/combistick{ - color = "#FFE55C"; - name = "strange spear"; - anchored = 1; - desc = "This ancient and frayed gilded spear almost gleans with it's razor sharp edge." - }, +"eT" = ( +/obj/structure/platform/stone/runed_sandstone/west, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "fl" = ( @@ -335,25 +385,32 @@ /obj/item/weapon/twohanded/yautja/spear, /turf/open/floor/corsat/squareswood/north, /area/lv624/ground/caves/sand_temple) -"gY" = ( -/obj/structure/stairs/perspective{ - color = "#6b675e"; - dir = 4; - icon_state = "p_stair_full" +"hi" = ( +/turf/open/gm/dirtgrassborder/south, +/area/lv624/ground/barrens/south_eastern_barrens) +"hp" = ( +/obj/structure/showcase{ + color = "#95948B"; + desc = "A grey statue dawned in ancient armor, it stares into your soul."; + icon = 'icons/mob/humans/species/r_synthetic.dmi'; + icon_state = "Synthetic_Template"; + name = "Eternal guardian" }, -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 1 +/obj/item/weapon/harpoon/yautja{ + name = "Alien Harpoon"; + pixel_x = 6 }, -/turf/open/shuttle/red, -/area/lv624/ground/caves/sand_temple) -"gZ" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 1 +/obj/item/clothing/mask/yautja_flavor/map_random{ + anchored = 1; + pixel_y = 10 + }, +/obj/item/clothing/suit/armor/yautja_flavor{ + anchored = 1 + }, +/obj/item/clothing/shoes/yautja_flavor{ + anchored = 1 }, /turf/open/floor/sandstone/runed, -/area/lv624/ground/caves/sand_temple) -"hi" = ( -/turf/open/gm/dirtgrassborder/south, /area/lv624/ground/barrens/south_eastern_barrens) "hu" = ( /obj/structure/surface/table/reinforced/prison{ @@ -388,14 +445,30 @@ /obj/item/weapon/yautja/knife, /turf/open/gm/dirtgrassborder/desert2, /area/lv624/ground/barrens/south_eastern_barrens) -"hL" = ( -/obj/structure/platform/mineral/sandstone/runed, -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 6; - icon_state = "p_stair_full" +"hI" = ( +/obj/item/weapon/harpoon/yautja{ + name = "Alien Harpoon"; + pixel_x = 6 }, -/turf/open/gm/dirt, +/obj/structure/showcase{ + color = "#95948B"; + desc = "A grey statue dawned in ancient armor, it stares into your soul."; + dir = 1; + icon = 'icons/mob/humans/species/r_synthetic.dmi'; + icon_state = "Synthetic_Template"; + name = "Eternal guardian" + }, +/obj/item/clothing/mask/yautja_flavor/map_random{ + anchored = 1; + pixel_y = 10 + }, +/obj/item/clothing/suit/armor/yautja_flavor{ + anchored = 1 + }, +/obj/item/clothing/shoes/yautja_flavor{ + anchored = 1 + }, +/turf/open/floor/sandstone/runed, /area/lv624/ground/barrens/south_eastern_barrens) "hO" = ( /obj/structure/surface/table/reinforced/prison{ @@ -408,28 +481,10 @@ }, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) -"ig" = ( -/obj/structure/morgue/sarcophagus, -/obj/item/weapon/twohanded/yautja/glaive/damaged{ - name = "damaged war glaive" - }, -/turf/open/floor/corsat/squareswood/north, -/area/lv624/ground/caves/sand_temple) -"iw" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 8 - }, -/turf/open/gm/dirt, -/area/lv624/ground/barrens/south_eastern_barrens) -"iN" = ( -/obj/item/weapon/sword{ - pixel_x = -6; - pixel_y = 7 +"hX" = ( +/obj/item/weapon/harpoon/yautja{ + name = "Alien Harpoon"; + pixel_x = -7 }, /obj/structure/showcase{ color = "#95948B"; @@ -440,7 +495,8 @@ name = "Eternal guardian" }, /obj/item/clothing/mask/yautja_flavor/map_random{ - anchored = 1 + anchored = 1; + pixel_y = 10 }, /obj/item/clothing/suit/armor/yautja_flavor{ anchored = 1 @@ -448,8 +504,29 @@ /obj/item/clothing/shoes/yautja_flavor{ anchored = 1 }, -/turf/open/floor/strata/grey_multi_tiles, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/barrens/south_eastern_barrens) +"ig" = ( +/obj/structure/morgue/sarcophagus, +/obj/item/weapon/twohanded/yautja/glaive/damaged{ + name = "damaged war glaive" + }, +/turf/open/floor/corsat/squareswood/north, +/area/lv624/ground/caves/sand_temple) +"iu" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + icon_state = "p_stair_ew_full_cap"; + layer = 3.5 + }, +/obj/structure/platform/stone/stair_cut/runed_sandstone_right, +/turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) +"iH" = ( +/obj/effect/landmark/lv624/fog_blocker, +/obj/structure/platform_decoration/stone/runed_sandstone/west, +/turf/open/gm/coast/beachcorner/north_east, +/area/lv624/ground/river/east_river) "iW" = ( /obj/structure/barricade/handrail/strata{ dir = 1 @@ -467,6 +544,15 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/strata/grey_multi_tiles, /area/lv624/ground/caves/sand_temple) +"jd" = ( +/obj/structure/stairs/perspective{ + color = "#6b675e"; + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform_decoration/stone/runed_sandstone/east, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/caves/sand_temple) "kb" = ( /obj/effect/decal/remains/xeno, /turf/open/floor/sandstone/runed, @@ -479,23 +565,24 @@ }, /turf/open/floor/whiteyellowfull/east, /area/lv624/ground/caves/sand_temple) +"kM" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/stone/runed_sandstone, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/barrens/south_eastern_barrens) "kO" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) -"ma" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/gm/dirt, -/area/lv624/ground/caves/sand_temple) -"mf" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 8 - }, +"kW" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/west, /turf/open/gm/dirt, -/area/lv624/ground/caves/sand_temple) -"mr" = ( +/area/lv624/ground/barrens/south_eastern_barrens) +"lr" = ( /obj/structure/showcase{ color = "#95948B"; desc = "A grey statue dawned in ancient armor, it stares into your soul."; @@ -503,16 +590,9 @@ icon_state = "Synthetic_Template"; name = "Eternal guardian" }, -/obj/item/weapon/harpoon/yautja{ - name = "Alien Harpoon"; - pixel_x = -7 - }, -/obj/effect/decal/remains/xeno{ - pixel_x = 1; - pixel_y = 31 - }, /obj/item/clothing/mask/yautja_flavor/map_random{ - anchored = 1 + anchored = 1; + pixel_y = 10 }, /obj/item/clothing/suit/armor/yautja_flavor{ anchored = 1 @@ -520,21 +600,9 @@ /obj/item/clothing/shoes/yautja_flavor{ anchored = 1 }, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/barrens/south_eastern_barrens) -"mv" = ( -/turf/open/floor/sandstone/runed, +/turf/open/floor/corsat/squareswood/north, /area/lv624/ground/caves/sand_temple) -"mB" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 8; - icon_state = "p_stair_ew_full_cap"; - layer = 3.5 - }, -/obj/structure/platform/mineral/sandstone/runed{ - dir = 1 - }, +"mv" = ( /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "mI" = ( @@ -555,6 +623,34 @@ }, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) +"mL" = ( +/obj/structure/showcase{ + color = "#95948B"; + desc = "A grey statue dawned in ancient armor, it stares into your soul."; + icon = 'icons/mob/humans/species/r_synthetic.dmi'; + icon_state = "Synthetic_Template"; + name = "Eternal guardian" + }, +/obj/item/weapon/harpoon/yautja{ + name = "Alien Harpoon"; + pixel_x = -7 + }, +/obj/effect/decal/remains/xeno{ + pixel_x = 1; + pixel_y = 31 + }, +/obj/item/clothing/mask/yautja_flavor/map_random{ + anchored = 1; + pixel_y = 10 + }, +/obj/item/clothing/suit/armor/yautja_flavor{ + anchored = 1 + }, +/obj/item/clothing/shoes/yautja_flavor{ + anchored = 1 + }, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/barrens/south_eastern_barrens) "mN" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -577,30 +673,40 @@ /obj/structure/prop/brazier/torch, /turf/closed/wall/mineral/sandstone/runed, /area/lv624/ground/caves/sand_temple) -"mW" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 4; - icon_state = "p_stair_full" +"nN" = ( +/obj/structure/surface/table/reinforced/prison{ + color = "#6b675e" }, -/obj/structure/platform/mineral/sandstone/runed, +/obj/item/tool/surgery/cautery/predatorcautery, +/obj/item/tool/surgery/circular_saw/predatorbonesaw, +/obj/item/tool/surgery/hemostat/predatorhemostat, +/obj/item/tool/surgery/retractor/predatorretractor, +/obj/item/tool/surgery/scalpel/predatorscalpel, +/turf/open/floor/strata/grey_multi_tiles, +/area/lv624/ground/caves/sand_temple) +"nV" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/east, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) -"mZ" = ( -/obj/item/weapon/harpoon/yautja{ - name = "Alien Harpoon"; - pixel_x = -7 - }, +"oi" = ( +/turf/closed/wall/mineral/sandstone/runed/decor, +/area/lv624/ground/caves/sand_temple) +"ot" = ( /obj/structure/showcase{ color = "#95948B"; desc = "A grey statue dawned in ancient armor, it stares into your soul."; - dir = 1; icon = 'icons/mob/humans/species/r_synthetic.dmi'; icon_state = "Synthetic_Template"; name = "Eternal guardian" }, +/obj/item/weapon/sword{ + layer = 3.1; + pixel_x = 6; + pixel_y = 7 + }, /obj/item/clothing/mask/yautja_flavor/map_random{ - anchored = 1 + anchored = 1; + pixel_y = 10 }, /obj/item/clothing/suit/armor/yautja_flavor{ anchored = 1 @@ -608,38 +714,8 @@ /obj/item/clothing/shoes/yautja_flavor{ anchored = 1 }, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/barrens/south_eastern_barrens) -"nk" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed, -/turf/open/gm/dirt, -/area/lv624/ground/barrens/south_eastern_barrens) -"nL" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 8 - }, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/caves/sand_temple) -"nN" = ( -/obj/structure/surface/table/reinforced/prison{ - color = "#6b675e" - }, -/obj/item/tool/surgery/cautery/predatorcautery, -/obj/item/tool/surgery/circular_saw/predatorbonesaw, -/obj/item/tool/surgery/hemostat/predatorhemostat, -/obj/item/tool/surgery/retractor/predatorretractor, -/obj/item/tool/surgery/scalpel/predatorscalpel, /turf/open/floor/strata/grey_multi_tiles, /area/lv624/ground/caves/sand_temple) -"od" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/caves/sand_temple) -"oi" = ( -/turf/closed/wall/mineral/sandstone/runed/decor, -/area/lv624/ground/caves/sand_temple) "oR" = ( /obj/structure/stairs/perspective{ color = "#b29082"; @@ -666,22 +742,14 @@ }, /turf/open/shuttle/red, /area/lv624/ground/caves/sand_temple) -"pX" = ( +"qk" = ( /obj/structure/stairs/perspective{ - color = "#b29082"; + color = "#6b675e"; dir = 4; icon_state = "p_stair_full" }, -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/gm/dirt, -/area/lv624/ground/barrens/south_eastern_barrens) -"qf" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 1 - }, -/turf/open/gm/dirt, +/obj/structure/platform_decoration/stone/runed_sandstone/east, +/turf/open/shuttle/red, /area/lv624/ground/caves/sand_temple) "qz" = ( /obj/structure/bed/alien{ @@ -689,35 +757,14 @@ }, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) -"rA" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/caves/sand_temple) -"rI" = ( -/obj/item/weapon/harpoon/yautja{ - name = "Alien Harpoon"; - pixel_x = 6 - }, -/obj/structure/showcase{ - color = "#95948B"; - desc = "A grey statue dawned in ancient armor, it stares into your soul."; - dir = 1; - icon = 'icons/mob/humans/species/r_synthetic.dmi'; - icon_state = "Synthetic_Template"; - name = "Eternal guardian" - }, -/obj/item/clothing/mask/yautja_flavor/map_random{ - anchored = 1 - }, -/obj/item/clothing/suit/armor/yautja_flavor{ - anchored = 1 - }, -/obj/item/clothing/shoes/yautja_flavor{ - anchored = 1 +"qZ" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 9; + icon_state = "p_stair_full" }, -/turf/open/floor/sandstone/runed, +/obj/structure/platform/stone/runed_sandstone/east, +/turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_barrens) "rS" = ( /obj/structure/closet/coffin/predator, @@ -749,122 +796,22 @@ }, /turf/open/floor/corsat/squareswood/north, /area/lv624/ground/caves/sand_temple) -"sM" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/caves/sand_temple) "sN" = ( /obj/effect/landmark/nightmare{ insert_tag = "maintemple" }, /turf/template_noop, /area/template_noop) -"th" = ( -/obj/structure/stairs/perspective{ - color = "#6b675e"; - dir = 6; - icon_state = "p_stair_full" - }, -/obj/structure/platform/mineral/sandstone/runed{ - dir = 8 - }, -/turf/open/floor/strata/grey_multi_tiles, -/area/lv624/ground/caves/sand_temple) -"ts" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 9; - icon_state = "p_stair_full" - }, -/obj/structure/platform/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/gm/dirt, -/area/lv624/ground/barrens/south_eastern_barrens) -"tE" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 8; - icon_state = "p_stair_ew_full_cap"; - layer = 3.5 - }, -/obj/structure/platform/mineral/sandstone/runed{ - dir = 1 - }, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/barrens/south_eastern_barrens) -"un" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 10; - icon_state = "p_stair_full" - }, -/obj/structure/platform/mineral/sandstone/runed, +"tX" = ( +/obj/structure/platform/stone/runed_sandstone/north, /turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_barrens) -"uy" = ( -/obj/structure/showcase{ - color = "#95948B"; - desc = "A grey statue dawned in ancient armor, it stares into your soul."; - icon = 'icons/mob/humans/species/r_synthetic.dmi'; - icon_state = "Synthetic_Template"; - name = "Eternal guardian" - }, -/obj/item/weapon/sword{ - layer = 3.1; - pixel_x = 6; - pixel_y = 7 - }, -/obj/item/clothing/mask/yautja_flavor/map_random{ - anchored = 1 - }, -/obj/item/clothing/suit/armor/yautja_flavor{ - anchored = 1 - }, -/obj/item/clothing/shoes/yautja_flavor{ - anchored = 1 - }, -/turf/open/floor/strata/grey_multi_tiles, -/area/lv624/ground/caves/sand_temple) "uE" = ( /turf/open/floor/sandstone/runed, /area/lv624/ground/barrens/south_eastern_barrens) -"uO" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 8 - }, -/turf/open/gm/dirt, -/area/lv624/ground/barrens/south_eastern_barrens) -"uQ" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform_decoration/mineral/sandstone/runed, -/turf/open/gm/dirt, -/area/lv624/ground/barrens/south_eastern_barrens) -"uT" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/gm/dirt, -/area/lv624/ground/barrens/south_eastern_barrens) -"vu" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 6; - icon_state = "p_stair_full" - }, -/obj/structure/platform/mineral/sandstone/runed{ - dir = 8 - }, -/turf/open/gm/dirt, -/area/lv624/ground/barrens/south_eastern_barrens) -"vN" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 1 - }, +"vf" = ( +/obj/structure/blocker/forcefield/multitile_vehicles, +/obj/structure/platform_decoration/stone/runed_sandstone/east, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "we" = ( @@ -874,17 +821,6 @@ }, /turf/open/floor/corsat/squareswood/north, /area/lv624/ground/caves/sand_temple) -"wf" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 10; - icon_state = "p_stair_full" - }, -/obj/structure/platform/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/gm/dirt, -/area/lv624/ground/barrens/south_eastern_barrens) "wi" = ( /obj/item/hunting_trap{ desc = "A bizarre alien device used for trapping and killing prey."; @@ -897,15 +833,15 @@ }, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) -"wx" = ( +"wJ" = ( /obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 8; + color = "#6b675e"; + dir = 6; icon_state = "p_stair_full" }, -/obj/structure/platform/mineral/sandstone/runed, +/obj/structure/platform/stone/runed_sandstone/west, /turf/open/floor/sandstone/runed, -/area/lv624/ground/barrens/south_eastern_barrens) +/area/lv624/ground/caves/sand_temple) "wS" = ( /obj/structure/showcase{ desc = "An ancient, dusty tomb with strange alien writing. It's best not to touch it."; @@ -921,9 +857,14 @@ }, /turf/open/gm/dirtgrassborder/desert0, /area/lv624/ground/barrens/south_eastern_barrens) -"xx" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed, -/turf/open/floor/sandstone/runed, +"xg" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 10; + icon_state = "p_stair_full" + }, +/obj/structure/platform/stone/runed_sandstone, +/turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_barrens) "xy" = ( /obj/structure/stairs/perspective{ @@ -944,37 +885,34 @@ }, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) -"yv" = ( +"yh" = ( +/obj/structure/platform/stone/runed_sandstone, /obj/structure/stairs/perspective{ - color = "#6b675e"; - dir = 4; + color = "#b29082"; + dir = 6; icon_state = "p_stair_full" }, -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 1 - }, +/turf/open/gm/dirt, +/area/lv624/ground/barrens/south_eastern_barrens) +"yJ" = ( +/obj/structure/platform/stone/runed_sandstone/west, +/turf/open/gm/dirt, +/area/lv624/ground/barrens/south_eastern_barrens) +"ze" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/north, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) -"yT" = ( +"zf" = ( /obj/structure/stairs/perspective{ color = "#b29082"; - dir = 5; + dir = 8; icon_state = "p_stair_full" }, -/obj/structure/platform/mineral/sandstone/runed{ - dir = 8 - }, +/obj/structure/platform_decoration/stone/runed_sandstone/west, /turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_barrens) -"zg" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 1 - }, -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 5; - icon_state = "p_stair_full" - }, +"zA" = ( +/obj/structure/platform/stone/runed_sandstone/east, /turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_barrens) "zG" = ( @@ -986,20 +924,36 @@ }, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) -"zO" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 1 +"zV" = ( +/obj/structure/stairs/perspective{ + color = "#6b675e"; + dir = 5; + icon_state = "p_stair_full" }, -/turf/open/gm/dirt, -/area/lv624/ground/barrens/south_eastern_barrens) -"zZ" = ( -/obj/structure/platform/mineral/sandstone/runed, +/obj/structure/platform/stone/runed_sandstone/west, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) +"Ah" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform_decoration/stone/runed_sandstone/north, +/turf/open/gm/dirt, +/area/lv624/ground/barrens/south_eastern_barrens) "Ai" = ( /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) -"Ao" = ( +"Ba" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 9; + icon_state = "p_stair_full" + }, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/caves/sand_temple) +"Bg" = ( /obj/structure/showcase{ color = "#95948B"; desc = "A grey statue dawned in ancient armor, it stares into your soul."; @@ -1009,10 +963,11 @@ }, /obj/item/weapon/harpoon/yautja{ name = "Alien Harpoon"; - pixel_x = 6 + pixel_x = -7 }, /obj/item/clothing/mask/yautja_flavor/map_random{ - anchored = 1 + anchored = 1; + pixel_y = 10 }, /obj/item/clothing/suit/armor/yautja_flavor{ anchored = 1 @@ -1022,53 +977,23 @@ }, /turf/open/floor/sandstone/runed, /area/lv624/ground/barrens/south_eastern_barrens) -"AQ" = ( -/obj/structure/stairs/perspective{ - color = "#6b675e"; - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/caves/sand_temple) -"Ba" = ( +"Bm" = ( /obj/structure/stairs/perspective{ color = "#b29082"; - dir = 9; + dir = 4; icon_state = "p_stair_full" }, +/obj/structure/platform/stone/runed_sandstone, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "Br" = ( /obj/structure/bed/chair/comfy/black, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple/powered) -"BI" = ( -/obj/item/weapon/sword{ - pixel_x = 6; - pixel_y = 7 - }, -/obj/structure/showcase{ - color = "#95948B"; - desc = "A grey statue dawned in ancient armor, it stares into your soul."; - dir = 1; - icon = 'icons/mob/humans/species/r_synthetic.dmi'; - icon_state = "Synthetic_Template"; - name = "Eternal guardian" - }, -/obj/item/clothing/mask/yautja_flavor/map_random{ - anchored = 1 - }, -/obj/item/clothing/suit/armor/yautja_flavor{ - anchored = 1 - }, -/obj/item/clothing/shoes/yautja_flavor{ - anchored = 1 - }, -/turf/open/floor/strata/grey_multi_tiles, -/area/lv624/ground/caves/sand_temple) +"Bt" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/north, +/turf/open/gm/dirt, +/area/lv624/ground/barrens/south_eastern_barrens) "BY" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -1088,6 +1013,15 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) +"Cj" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 6; + icon_state = "p_stair_full" + }, +/obj/structure/platform/stone/runed_sandstone/west, +/turf/open/gm/dirt, +/area/lv624/ground/barrens/south_eastern_barrens) "Cr" = ( /obj/effect/decal/cleanable/blood{ basecolor = "#20d450"; @@ -1113,41 +1047,6 @@ }, /turf/open/gm/dirtgrassborder/west, /area/lv624/ground/barrens/south_eastern_barrens) -"DH" = ( -/obj/structure/showcase{ - color = "#95948B"; - desc = "A grey statue dawned in ancient armor, it stares into your soul."; - icon = 'icons/mob/humans/species/r_synthetic.dmi'; - icon_state = "Synthetic_Template"; - name = "Eternal guardian" - }, -/obj/item/weapon/sword{ - layer = 3.1; - pixel_x = -6; - pixel_y = 7 - }, -/obj/item/clothing/mask/yautja_flavor/map_random{ - anchored = 1 - }, -/obj/item/clothing/suit/armor/yautja_flavor{ - anchored = 1 - }, -/obj/item/clothing/shoes/yautja_flavor{ - anchored = 1 - }, -/turf/open/floor/strata/grey_multi_tiles, -/area/lv624/ground/caves/sand_temple) -"DX" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 9; - icon_state = "p_stair_full" - }, -/obj/structure/platform/mineral/sandstone/runed{ - dir = 1 - }, -/turf/open/gm/dirt, -/area/lv624/ground/barrens/south_eastern_barrens) "Eq" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -1166,6 +1065,10 @@ }, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) +"EA" = ( +/obj/structure/platform/stone/runed_sandstone/north, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/caves/sand_temple) "EJ" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -1187,6 +1090,15 @@ }, /turf/open/floor/whiteyellowfull/east, /area/lv624/ground/caves/sand_temple) +"Fp" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform_decoration/stone/runed_sandstone/east, +/turf/open/gm/dirt, +/area/lv624/ground/barrens/south_eastern_barrens) "FS" = ( /obj/structure/xenoautopsy/tank/alien, /turf/open/shuttle/red, @@ -1194,26 +1106,29 @@ "Ge" = ( /turf/open/floor/corsat/squareswood/north, /area/lv624/ground/caves/sand_temple) -"Gt" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 8 - }, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/caves/sand_temple) -"GO" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - icon_state = "p_stair_ew_full_cap"; - layer = 3.5 - }, -/obj/structure/platform/mineral/sandstone/runed{ - dir = 1 - }, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/caves/sand_temple) "GT" = ( /turf/closed/wall/rock/brown, /area/lv624/ground/caves/sand_temple) +"GX" = ( +/obj/structure/showcase{ + color = "#95948B"; + desc = "A grey statue dawned in ancient armor, it stares into your soul."; + icon = 'icons/mob/humans/species/r_synthetic.dmi'; + icon_state = "Synthetic_Template"; + name = "Eternal guardian" + }, +/obj/item/clothing/suit/armor/yautja/hunter{ + anchored = 1 + }, +/obj/item/clothing/mask/gas/yautja/damaged{ + anchored = 1; + pixel_y = 10 + }, +/obj/item/clothing/shoes/yautja/hunter{ + anchored = 1 + }, +/turf/open/floor/strata/grey_multi_tiles, +/area/lv624/ground/caves/sand_temple/powered) "He" = ( /obj/structure/curtain/red, /turf/open/floor/strata/grey_multi_tiles, @@ -1239,7 +1154,31 @@ /obj/item/stool, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) -"HJ" = ( +"HK" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 5; + icon_state = "p_stair_full" + }, +/obj/structure/platform/stone/runed_sandstone/west, +/turf/open/gm/dirt, +/area/lv624/ground/barrens/south_eastern_barrens) +"Ix" = ( +/obj/structure/barricade/handrail/strata, +/obj/structure/barricade/handrail/strata{ + dir = 4 + }, +/turf/open/gm/dirtgrassborder/weedable/grass1, +/area/lv624/ground/barrens/south_eastern_barrens) +"IQ" = ( +/obj/structure/platform/stone/runed_sandstone, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/caves/sand_temple) +"IR" = ( +/obj/structure/prop/brazier/torch, +/turf/closed/wall/mineral/sandstone/runed, +/area/lv624/ground/caves/sand_temple) +"IW" = ( /obj/structure/showcase{ color = "#95948B"; desc = "A grey statue dawned in ancient armor, it stares into your soul."; @@ -1247,12 +1186,14 @@ icon_state = "Synthetic_Template"; name = "Eternal guardian" }, -/obj/item/weapon/harpoon/yautja{ - name = "Alien Harpoon"; - pixel_x = -7 +/obj/item/weapon/sword{ + layer = 3.1; + pixel_x = -6; + pixel_y = 7 }, /obj/item/clothing/mask/yautja_flavor/map_random{ - anchored = 1 + anchored = 1; + pixel_y = 10 }, /obj/item/clothing/suit/armor/yautja_flavor{ anchored = 1 @@ -1260,24 +1201,7 @@ /obj/item/clothing/shoes/yautja_flavor{ anchored = 1 }, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/barrens/south_eastern_barrens) -"Iv" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 1 - }, -/turf/open/gm/dirt, -/area/lv624/ground/barrens/south_eastern_barrens) -"Ix" = ( -/obj/structure/barricade/handrail/strata, -/obj/structure/barricade/handrail/strata{ - dir = 4 - }, -/turf/open/gm/dirtgrassborder/weedable/grass1, -/area/lv624/ground/barrens/south_eastern_barrens) -"IR" = ( -/obj/structure/prop/brazier/torch, -/turf/closed/wall/mineral/sandstone/runed, +/turf/open/floor/strata/grey_multi_tiles, /area/lv624/ground/caves/sand_temple) "IZ" = ( /obj/structure/barricade/handrail/strata{ @@ -1315,23 +1239,19 @@ }, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) -"Jw" = ( +"Js" = ( /obj/structure/stairs/perspective{ - color = "#6b675e"; - dir = 4; + color = "#b29082"; + dir = 10; icon_state = "p_stair_full" }, -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/shuttle/red, -/area/lv624/ground/caves/sand_temple) -"JZ" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 4 - }, +/obj/structure/platform/stone/runed_sandstone/east, /turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_barrens) +"Jz" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/west, +/turf/open/gm/dirt, +/area/lv624/ground/caves/sand_temple) "KB" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -1357,44 +1277,15 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) -"LF" = ( +"Mj" = ( /obj/structure/stairs/perspective{ - color = "#b29082"; - icon_state = "p_stair_ew_full_cap"; - layer = 3.5 - }, -/obj/structure/platform/mineral/sandstone/runed{ - dir = 1 - }, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/barrens/south_eastern_barrens) -"LL" = ( -/obj/structure/showcase{ - color = "#95948B"; - desc = "A grey statue dawned in ancient armor, it stares into your soul."; - icon = 'icons/mob/humans/species/r_synthetic.dmi'; - icon_state = "Synthetic_Template"; - name = "Eternal guardian" - }, -/obj/item/weapon/harpoon/yautja{ - name = "Alien Harpoon"; - pixel_x = 6 - }, -/obj/effect/decal/remains/xeno{ - pixel_x = -1; - pixel_y = 31 - }, -/obj/item/clothing/mask/yautja_flavor/map_random{ - anchored = 1 - }, -/obj/item/clothing/suit/armor/yautja_flavor{ - anchored = 1 - }, -/obj/item/clothing/shoes/yautja_flavor{ - anchored = 1 + color = "#6b675e"; + dir = 6; + icon_state = "p_stair_full" }, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/barrens/south_eastern_barrens) +/obj/structure/platform/stone/runed_sandstone/west, +/turf/open/floor/strata/grey_multi_tiles, +/area/lv624/ground/caves/sand_temple) "Mn" = ( /obj/structure/showcase{ color = "#95948B"; @@ -1413,6 +1304,10 @@ }, /turf/open/floor/corsat/squareswood/north, /area/lv624/ground/caves/sand_temple) +"Mr" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/west, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/caves/sand_temple) "Mx" = ( /obj/structure/prop/brazier, /turf/open/floor/corsat/squareswood/north, @@ -1440,6 +1335,10 @@ "MK" = ( /turf/open/gm/dirtgrassborder/desert_dug, /area/lv624/ground/barrens/south_eastern_barrens) +"Nm" = ( +/obj/structure/platform_decoration/stone/runed_sandstone, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/caves/sand_temple) "Nt" = ( /obj/structure/stairs/perspective{ color = "#6b675e"; @@ -1448,17 +1347,25 @@ }, /turf/open/floor/corsat/squareswood/north, /area/lv624/ground/caves/sand_temple) -"ND" = ( +"NX" = ( /obj/structure/stairs/perspective{ - color = "#6b675e"; - dir = 5; + color = "#b29082"; + dir = 9; icon_state = "p_stair_full" }, -/obj/structure/platform/mineral/sandstone/runed{ - dir = 8 +/obj/structure/platform/stone/runed_sandstone/north, +/turf/open/gm/dirt, +/area/lv624/ground/barrens/south_eastern_barrens) +"NZ" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 8; + icon_state = "p_stair_ew_full_cap"; + layer = 3.5 }, -/turf/open/floor/strata/grey_multi_tiles, -/area/lv624/ground/caves/sand_temple) +/obj/structure/platform/stone/stair_cut/runed_sandstone_left, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/barrens/south_eastern_barrens) "Od" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -1485,40 +1392,30 @@ /obj/structure/barricade/handrail/strata, /turf/open/gm/dirtgrassborder/weedable/grass1, /area/lv624/ground/barrens/south_eastern_barrens) -"Ps" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 1 - }, -/obj/structure/platform/mineral/sandstone/runed{ - dir = 4 - }, +"Pf" = ( +/obj/structure/platform_decoration/stone/runed_sandstone, +/turf/open/gm/dirt, +/area/lv624/ground/barrens/south_eastern_barrens) +"Pm" = ( +/obj/structure/platform/stone/runed_sandstone/north, +/obj/structure/platform/stone/runed_sandstone/east, /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) +"Pz" = ( +/obj/structure/stairs/perspective{ + color = "#6b675e"; + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform_decoration/stone/runed_sandstone/north, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/caves/sand_temple) "PA" = ( /obj/structure/machinery/door/airlock/sandstone/runed{ name = "Strange Temple" }, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple/powered) -"PN" = ( -/obj/structure/showcase{ - color = "#95948B"; - desc = "A grey statue dawned in ancient armor, it stares into your soul."; - icon = 'icons/mob/humans/species/r_synthetic.dmi'; - icon_state = "Synthetic_Template"; - name = "Eternal guardian" - }, -/obj/item/clothing/suit/armor/yautja/hunter{ - anchored = 1 - }, -/obj/item/clothing/mask/gas/yautja/damaged{ - anchored = 1 - }, -/obj/item/clothing/shoes/yautja/hunter{ - anchored = 1 - }, -/turf/open/floor/strata/grey_multi_tiles, -/area/lv624/ground/caves/sand_temple/powered) "PO" = ( /obj/item/weapon/harpoon/yautja{ name = "Alien Harpoon"; @@ -1545,6 +1442,20 @@ }, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) +"Qa" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 8; + icon_state = "p_stair_ew_full_cap"; + layer = 3.5 + }, +/obj/structure/platform/stone/stair_cut/runed_sandstone_left, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/caves/sand_temple) +"Qe" = ( +/obj/structure/platform_decoration/stone/runed_sandstone, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/barrens/south_eastern_barrens) "QG" = ( /obj/structure/barricade/handrail/strata{ dir = 4 @@ -1559,6 +1470,10 @@ }, /turf/open/floor/corsat/squareswood/north, /area/lv624/ground/caves/sand_temple) +"Rc" = ( +/obj/structure/platform/stone/runed_sandstone/east, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/caves/sand_temple) "Rh" = ( /obj/structure/prop/brazier/torch, /turf/closed/wall/mineral/sandstone/runed/decor, @@ -1581,12 +1496,30 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) -"RZ" = ( -/obj/structure/blocker/forcefield/multitile_vehicles, -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 4 +"Sc" = ( +/obj/item/weapon/sword{ + pixel_x = -6; + pixel_y = 7 }, -/turf/open/floor/sandstone/runed, +/obj/structure/showcase{ + color = "#95948B"; + desc = "A grey statue dawned in ancient armor, it stares into your soul."; + dir = 1; + icon = 'icons/mob/humans/species/r_synthetic.dmi'; + icon_state = "Synthetic_Template"; + name = "Eternal guardian" + }, +/obj/item/clothing/mask/yautja_flavor/map_random{ + anchored = 1; + pixel_y = 10 + }, +/obj/item/clothing/suit/armor/yautja_flavor{ + anchored = 1 + }, +/obj/item/clothing/shoes/yautja_flavor{ + anchored = 1 + }, +/turf/open/floor/strata/grey_multi_tiles, /area/lv624/ground/caves/sand_temple) "Sm" = ( /obj/structure/surface/table/reinforced/prison{ @@ -1605,12 +1538,6 @@ }, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) -"SK" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 1 - }, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/barrens/south_eastern_barrens) "SO" = ( /obj/structure/stairs/perspective{ color = "#6b675e"; @@ -1633,10 +1560,58 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/corsat/squareswood/north, /area/lv624/ground/caves/sand_temple/powered) +"TL" = ( +/obj/structure/showcase{ + color = "#FFE55C"; + desc = "This statue seems taller and somehow mightier than the others... it makes you want to steer away from it."; + icon = 'icons/mob/humans/species/r_synthetic.dmi'; + icon_state = "Synthetic_Template"; + name = "massive statue" + }, +/obj/item/clothing/mask/gas/yautja/damaged{ + anchored = 1; + color = "#FFE55C"; + icon_state = "pred_mask_elder_n"; + name = "unsettling stone mask"; + pixel_y = 10 + }, +/obj/item/clothing/suit/armor/yautja/hunter{ + anchored = 1; + color = "#FFE55C"; + icon_state = "halfarmor_elder_n"; + name = "gilded clan armor" + }, +/obj/item/clothing/shoes/yautja/hunter{ + anchored = 1; + color = "#FFE55C"; + icon_state = "y-boots2"; + name = "gilded clan greaves" + }, +/obj/item/weapon/yautja/chained/combistick{ + color = "#FFE55C"; + name = "strange spear"; + anchored = 1; + desc = "This ancient and frayed gilded spear almost gleans with it's razor sharp edge." + }, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/caves/sand_temple) +"TO" = ( +/obj/structure/platform/stone/runed_sandstone/north, +/turf/open/gm/dirt, +/area/lv624/ground/caves/sand_temple) "TY" = ( /obj/structure/machinery/optable, /turf/open/floor/strata/grey_multi_tiles, /area/lv624/ground/caves/sand_temple) +"UA" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + icon_state = "p_stair_ew_full_cap"; + layer = 3.5 + }, +/obj/structure/platform/stone/stair_cut/runed_sandstone_right, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/barrens/south_eastern_barrens) "UK" = ( /turf/open/gm/dirtgrassborder/desert, /area/lv624/ground/barrens/south_eastern_barrens) @@ -1657,16 +1632,13 @@ /obj/item/tool/surgery/scalpel/predatorscalpel, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple/powered) -"Vm" = ( -/obj/structure/blocker/forcefield/multitile_vehicles, -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 8 - }, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/caves/sand_temple) "Vu" = ( /turf/open/gm/grass/grass1, /area/lv624/ground/caves/sand_temple) +"Wj" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/north, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/barrens/south_eastern_barrens) "Wl" = ( /obj/structure/bed/chair/comfy/black{ dir = 1 @@ -1703,55 +1675,12 @@ }, /turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/barrens/south_eastern_barrens) -"Xz" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 8 - }, -/turf/open/gm/dirt, -/area/lv624/ground/barrens/south_eastern_barrens) "XV" = ( /obj/structure/bed/chair/comfy/black{ dir = 1 }, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple/powered) -"YB" = ( -/obj/structure/showcase{ - color = "#95948B"; - desc = "A grey statue dawned in ancient armor, it stares into your soul."; - icon = 'icons/mob/humans/species/r_synthetic.dmi'; - icon_state = "Synthetic_Template"; - name = "Eternal guardian" - }, -/obj/item/clothing/mask/yautja_flavor/map_random{ - anchored = 1 - }, -/obj/item/clothing/suit/armor/yautja_flavor{ - anchored = 1 - }, -/obj/item/clothing/shoes/yautja_flavor{ - anchored = 1 - }, -/turf/open/floor/corsat/squareswood/north, -/area/lv624/ground/caves/sand_temple) -"YT" = ( -/obj/structure/stairs/perspective{ - color = "#6b675e"; - dir = 5; - icon_state = "p_stair_full" - }, -/obj/structure/platform/mineral/sandstone/runed{ - dir = 8 - }, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/caves/sand_temple) -"YU" = ( -/obj/effect/landmark/lv624/fog_blocker, -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 8 - }, -/turf/open/gm/coast/beachcorner/north_east, -/area/lv624/ground/river/east_river) "Zt" = ( /obj/structure/prop/brazier, /turf/open/floor/sandstone/runed, @@ -2025,14 +1954,14 @@ GT GT OC IR -ND -Jw +bq +qk pu -gY -th +cG +Mj IR OC -qf +TO Ai Ai GT @@ -2074,7 +2003,7 @@ Jc gL wS oi -qf +TO Ai GT GT @@ -2108,7 +2037,7 @@ GT GT GT oi -YB +lr gL Jc Jc @@ -2116,7 +2045,7 @@ Jc gL Mn OC -qf +TO Ai Ai GT @@ -2158,7 +2087,7 @@ Jc gL wS oi -qf +TO dK Ai GT @@ -2192,7 +2121,7 @@ GT GT GT oi -YB +lr gL Jc Jc @@ -2200,7 +2129,7 @@ Jc gL Mn OC -qf +TO Ai Ai Ai @@ -2242,7 +2171,7 @@ Jc fQ wS oi -qf +TO Ai Ai Ai @@ -2276,7 +2205,7 @@ GT GT GT OC -YB +lr gL Jc Jc @@ -2284,8 +2213,8 @@ Jc gL Mn OC -Ps -mf +Pm +Jz Ai Ai dK @@ -2327,7 +2256,7 @@ He IR OC OC -qf +TO Ai Ai Ai @@ -2359,17 +2288,17 @@ GT GT GT OC -gZ -YT -AQ +ze +zV +jd SO SO SO -yv -dL -rA +Pz +wJ +nV OC -qf +TO Ai Ai Ai @@ -2401,17 +2330,17 @@ GT GT GT OC -sM -od -nL +Nm +Rc +Mr mv mv mv -sM -od -nL +Nm +Rc +Mr OC -qf +TO Ai Ai Ai @@ -2428,9 +2357,9 @@ ZX ZX ZX ZX -nk -uT -YU +Pf +zA +iH ZX ZX ZX @@ -2443,17 +2372,17 @@ wi GT OC OC -zZ -DH -vN +IQ +IW +EA mv mv mv -zZ -iN -vN +IQ +Sc +EA OC -GO +iu aT aT aT @@ -2468,14 +2397,14 @@ ZX ZX ZX ZX -ts -iw -un +qZ +zf +xg Zt -DX -uQ -wf -uO +NX +dz +Js +kW "} (18,1,1) = {" SF @@ -2485,17 +2414,17 @@ mv Dd IR mv -gZ -Gt -rA +ze +eT +nV mv mv mv -gZ -Gt -RZ +ze +eT +vf mO -od +Rc mv mv mv @@ -2505,19 +2434,19 @@ mv OC OC fV -LF +UA xy xy xy -wx -HJ +kM +Bg fD DG DG DG aN -mZ -zO +hX +tX "} (19,1,1) = {" SF @@ -2546,12 +2475,12 @@ mv mv mv OC -mr +mL uE uE uE uE -SK +Wj Ws dF Cr @@ -2559,7 +2488,7 @@ UK hD hi OJ -zO +tX "} (20,1,1) = {" eM @@ -2601,7 +2530,7 @@ MK UK hi OP -zO +tX "} (21,1,1) = {" SF @@ -2630,12 +2559,12 @@ mv mv mv OC -LL +ah uE uE uE uE -xx +Qe iW dF ZG @@ -2643,7 +2572,7 @@ UK wZ hi Ix -zO +tX "} (22,1,1) = {" eM @@ -2653,17 +2582,17 @@ kb Dd IR mv -sM -od -nL +Nm +Rc +Mr mv mv mv -sM -od -Vm +Nm +Rc +dp mO -Gt +eT mv mv mv @@ -2673,19 +2602,19 @@ mv OC OC fV -tE +NZ RV RV RV -dE -Ao +cT +hp Xg QG QG QG IZ -rI -zO +hI +tX "} (23,1,1) = {" oR @@ -2695,17 +2624,17 @@ eb GT OC OC -zZ -uy -vN +IQ +ot +EA mv mv mv -zZ -BI -vN +IQ +ba +EA OC -mB +Qa eb eb eb @@ -2720,14 +2649,14 @@ ZX ZX ZX ZX -yT -pX -hL +HK +Fp +yh Zt -zg -dr -vu -JZ +cN +Ah +Cj +aH "} (24,1,1) = {" mv @@ -2737,17 +2666,17 @@ mv GT GT oi -gZ -Gt -rA +ze +eT +nV mv mv mv -gZ -Gt -rA +ze +eT +nV OC -qf +TO Ai Ai Ai @@ -2764,9 +2693,9 @@ ZX ZX ZX ZX -Iv -Xz -JZ +Bt +yJ +aH ZX ZX ZX @@ -2822,16 +2751,16 @@ GT GT OC OC -mB +Qa eb eb eb eb eb -mW +Bm OC OC -qf +TO Ai dK Ai @@ -2864,16 +2793,16 @@ GT GT GT IR -rA +nV mv mv mv mv mv -gZ +ze IR GT -ma +eH Ai Ai Ai @@ -3244,9 +3173,9 @@ mv mv mv mv -sM -od -nL +Nm +Rc +Mr mv mv mv @@ -3286,9 +3215,9 @@ mv mv mv mv -zZ -eY -vN +IQ +TL +EA mv mv mv @@ -3328,9 +3257,9 @@ mv mv mv mv -gZ -Gt -rA +ze +eT +nV mv mv mv @@ -3576,8 +3505,8 @@ ZX GT OC aA -PN -PN +GX +GX dQ OC fE diff --git a/maps/map_files/LV624/maintemple/2.flooded.dmm b/maps/map_files/LV624/maintemple/2.flooded.dmm index 725a5b22aa13..c5dd5b3fca48 100644 --- a/maps/map_files/LV624/maintemple/2.flooded.dmm +++ b/maps/map_files/LV624/maintemple/2.flooded.dmm @@ -3,6 +3,15 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/closed/wall/rock/brown, /area/lv624/ground/caves/sand_temple) +"aj" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform_decoration/stone/runed_sandstone, +/turf/open/floor/whiteyellowfull/east, +/area/lv624/ground/barrens/south_eastern_barrens) "ap" = ( /turf/open/gm/coast/beachcorner2/north_east, /area/lv624/ground/barrens/south_eastern_barrens) @@ -23,9 +32,14 @@ "ax" = ( /turf/open/gm/coast/north, /area/lv624/ground/caves/sand_temple) -"aA" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed, -/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, +"aH" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform/stone/runed_sandstone, +/turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "aI" = ( /obj/structure/surface/table/reinforced/prison{ @@ -61,6 +75,10 @@ }, /turf/open/floor/whiteyellowfull/east, /area/lv624/ground/caves/sand_temple) +"aU" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/north, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, +/area/lv624/ground/caves/sand_temple) "bP" = ( /obj/structure/flora/jungle/vines/light_3, /turf/open/floor/sandstone/runed, @@ -72,19 +90,25 @@ "ci" = ( /turf/open/gm/coast/beachcorner2/south_east, /area/lv624/ground/caves/sand_temple) -"de" = ( -/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, -/area/lv624/ground/barrens/south_eastern_barrens) -"dr" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 4; - icon_state = "p_stair_full" +"cG" = ( +/obj/structure/showcase{ + color = "#95948B"; + desc = "A grey statue dawned in ancient armor, it stares into your soul."; + icon = 'icons/mob/humans/species/r_synthetic.dmi'; + icon_state = "Synthetic_Template"; + name = "Eternal guardian" }, -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 1 +/obj/item/clothing/suit/armor/yautja/hunter{ + anchored = 1 }, -/turf/open/floor/whiteyellowfull/east, +/obj/item/clothing/mask/gas/yautja/damaged{ + anchored = 1; + pixel_y = 10 + }, +/turf/open/gm/dirt, +/area/lv624/ground/caves/sand_temple) +"de" = ( +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/lv624/ground/barrens/south_eastern_barrens) "dA" = ( /obj/structure/flora/jungle/vines/heavy, @@ -109,15 +133,6 @@ }, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) -"dE" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform/mineral/sandstone/runed, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/barrens/south_eastern_barrens) "dF" = ( /turf/open/gm/dirtgrassborder/north, /area/lv624/ground/barrens/south_eastern_barrens) @@ -131,17 +146,6 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) -"dL" = ( -/obj/structure/stairs/perspective{ - color = "#6b675e"; - dir = 6; - icon_state = "p_stair_full" - }, -/obj/structure/platform/mineral/sandstone/runed{ - dir = 8 - }, -/turf/open/gm/dirt, -/area/lv624/ground/caves/sand_temple) "dQ" = ( /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, @@ -164,6 +168,62 @@ }, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) +"eq" = ( +/obj/structure/showcase{ + color = "#95948B"; + desc = "A grey statue dawned in ancient armor, it stares into your soul."; + icon = 'icons/mob/humans/species/r_synthetic.dmi'; + icon_state = "Synthetic_Template"; + name = "Eternal guardian" + }, +/obj/item/weapon/harpoon/yautja{ + name = "Alien Harpoon"; + pixel_x = 6 + }, +/obj/item/clothing/shoes/yautja_flavor{ + anchored = 1 + }, +/obj/item/clothing/suit/armor/yautja_flavor{ + anchored = 1 + }, +/obj/item/clothing/mask/yautja_flavor/map_random{ + anchored = 1; + pixel_y = 10 + }, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/barrens/south_eastern_barrens) +"es" = ( +/obj/structure/showcase{ + color = "#95948B"; + desc = "A grey statue dawned in ancient armor, it stares into your soul."; + icon = 'icons/mob/humans/species/r_synthetic.dmi'; + icon_state = "Synthetic_Template"; + name = "Eternal guardian" + }, +/obj/item/weapon/harpoon/yautja{ + name = "Alien Harpoon"; + pixel_x = 6 + }, +/obj/effect/decal/remains/xeno{ + pixel_x = -1; + pixel_y = 31 + }, +/obj/item/clothing/shoes/yautja_flavor{ + anchored = 1 + }, +/obj/item/clothing/suit/armor/yautja_flavor{ + anchored = 1 + }, +/obj/item/clothing/mask/yautja_flavor/map_random{ + anchored = 1; + pixel_y = 10 + }, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/barrens/south_eastern_barrens) +"ev" = ( +/obj/structure/platform/stone/runed_sandstone/west, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, +/area/lv624/ground/caves/sand_temple) "ez" = ( /turf/open/gm/coast/west, /area/lv624/ground/barrens/south_eastern_barrens) @@ -179,6 +239,11 @@ /obj/structure/flora/jungle/vines/light_3, /turf/open/gm/dirtgrassborder/north, /area/lv624/ground/caves/sand_temple) +"fd" = ( +/obj/item/weapon/twohanded/yautja/spear, +/obj/structure/platform_decoration/stone/runed_sandstone/east, +/turf/open/gm/river, +/area/lv624/ground/caves/sand_temple) "fl" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/caves/sand_temple) @@ -191,16 +256,36 @@ }, /turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/lv624/ground/barrens/south_eastern_barrens) -"fE" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/gm/coast/beachcorner2/north_west, +"fG" = ( +/obj/structure/platform/stone/runed_sandstone/north, +/turf/open/gm/coast/beachcorner/north_west, /area/lv624/ground/caves/sand_temple) "fP" = ( /obj/structure/flora/jungle/vines/light_3, /turf/open/gm/coast/east, /area/lv624/ground/caves/sand_temple) +"fT" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 5; + icon_state = "p_stair_full" + }, +/obj/structure/platform/stone/runed_sandstone/west, +/turf/open/gm/dirt, +/area/lv624/ground/barrens/south_eastern_barrens) +"gm" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/east, +/turf/open/gm/dirt, +/area/lv624/ground/caves/sand_temple) +"gq" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 10; + icon_state = "p_stair_full" + }, +/obj/structure/platform/stone/runed_sandstone, +/turf/open/gm/dirt, +/area/lv624/ground/barrens/south_eastern_barrens) "gw" = ( /turf/open/gm/dirtgrassborder/south, /area/lv624/ground/caves/sand_temple) @@ -215,32 +300,22 @@ }, /turf/open/gm/grass/grass1, /area/lv624/ground/caves/sand_temple) -"gL" = ( -/turf/open/floor/strata/grey_multi_tiles, -/area/lv624/ground/caves/sand_temple) -"gS" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, -/area/lv624/ground/caves/sand_temple) -"gY" = ( +"gJ" = ( /obj/structure/stairs/perspective{ - color = "#6b675e"; - dir = 4; + color = "#b29082"; + dir = 8; icon_state = "p_stair_full" }, -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 1 - }, -/turf/open/shuttle/red, -/area/lv624/ground/caves/sand_temple) -"gZ" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 1 - }, +/obj/structure/platform/stone/runed_sandstone, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/barrens/south_eastern_barrens) +"gK" = ( +/obj/structure/platform/stone/runed_sandstone/north, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) +"gL" = ( +/turf/open/floor/strata/grey_multi_tiles, +/area/lv624/ground/caves/sand_temple) "hi" = ( /turf/open/gm/dirtgrassborder/south, /area/lv624/ground/barrens/south_eastern_barrens) @@ -261,6 +336,15 @@ /obj/structure/flora/jungle/vines/light_3, /turf/open/gm/dirtgrassborder/north, /area/lv624/ground/caves/sand_temple) +"hX" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform_decoration/stone/runed_sandstone/east, +/turf/open/floor/whiteyellowfull/east, +/area/lv624/ground/barrens/south_eastern_barrens) "ic" = ( /obj/structure/flora/jungle/vines/heavy, /obj/structure/blocker/forcefield/multitile_vehicles, @@ -276,17 +360,6 @@ }, /turf/open/floor/corsat/squareswood/north, /area/lv624/ground/caves/sand_temple) -"iw" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 8 - }, -/turf/open/floor/whiteyellowfull/east, -/area/lv624/ground/barrens/south_eastern_barrens) "iM" = ( /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/dirtgrassborder/west, @@ -295,6 +368,15 @@ /obj/structure/flora/bush/ausbushes/ppflowers, /turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/lv624/ground/caves/sand_temple) +"iU" = ( +/obj/structure/stairs/perspective{ + color = "#6b675e"; + dir = 5; + icon_state = "p_stair_full" + }, +/obj/structure/platform/stone/runed_sandstone/west, +/turf/open/gm/dirt, +/area/lv624/ground/caves/sand_temple) "iW" = ( /obj/structure/barricade/handrail/strata{ dir = 1 @@ -308,20 +390,47 @@ /obj/structure/flora/jungle/vines/light_3, /turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/caves/sand_temple) -"jc" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 1 - }, -/obj/effect/landmark/objective_landmark/close, +"jq" = ( +/obj/structure/platform/stone/runed_sandstone, +/turf/open/gm/coast/beachcorner/south_east, +/area/lv624/ground/caves/sand_temple) +"jz" = ( +/obj/structure/platform/stone/runed_sandstone/east, /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) +"jP" = ( +/obj/structure/showcase{ + color = "#95948B"; + desc = "A grey statue dawned in ancient armor, it stares into your soul."; + icon = 'icons/mob/humans/species/r_synthetic.dmi'; + icon_state = "Synthetic_Template"; + name = "Eternal guardian" + }, +/obj/item/clothing/shoes/yautja_flavor{ + anchored = 1 + }, +/obj/item/clothing/suit/armor/yautja_flavor{ + anchored = 1 + }, +/obj/item/clothing/mask/yautja_flavor/map_random{ + anchored = 1; + pixel_y = 10 + }, +/turf/open/floor/corsat/squareswood/north, +/area/lv624/ground/caves/sand_temple) "jZ" = ( /obj/structure/flora/jungle/vines/light_3, /turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/caves/sand_temple) -"ky" = ( -/obj/structure/platform/mineral/sandstone/runed, -/turf/open/gm/coast/beachcorner/south_east, +"kZ" = ( +/obj/structure/stairs/perspective{ + color = "#6b675e"; + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/flora/jungle/vines/heavy, +/obj/structure/platform_decoration/stone/runed_sandstone/east, +/turf/open/shuttle/red, /area/lv624/ground/caves/sand_temple) "lm" = ( /turf/open/gm/coast/east, @@ -333,144 +442,86 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) -"lI" = ( +"lu" = ( /obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 10; + color = "#6b675e"; + dir = 4; icon_state = "p_stair_full" }, -/obj/structure/platform/mineral/sandstone/runed, -/turf/open/gm/dirt, -/area/lv624/ground/barrens/south_eastern_barrens) +/obj/structure/platform_decoration/stone/runed_sandstone/north, +/turf/open/shuttle/red, +/area/lv624/ground/caves/sand_temple) "lS" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/gm/river, /area/lv624/ground/barrens/south_eastern_barrens) -"ma" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/gm/dirt, -/area/lv624/ground/caves/sand_temple) "mf" = ( /obj/effect/landmark/nightmare{ insert_tag = "maintemple" }, /turf/template_noop, /area/template_noop) -"mr" = ( +"mq" = ( +/obj/structure/stairs/perspective{ + color = "#6b675e"; + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform_decoration/stone/runed_sandstone/north, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/caves/sand_temple) +"mt" = ( +/obj/structure/platform/stone/runed_sandstone/west, +/turf/open/gm/coast/north, +/area/lv624/ground/caves/sand_temple) +"mv" = ( +/turf/open/floor/sandstone/runed, +/area/lv624/ground/caves/sand_temple) +"mF" = ( +/obj/structure/closet/coffin/predator, +/turf/open/floor/corsat/squareswood/north, +/area/lv624/ground/caves/sand_temple) +"mI" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/barrens/south_eastern_barrens) +"mM" = ( +/obj/structure/platform_decoration/stone/runed_sandstone, +/turf/open/gm/dirt, +/area/lv624/ground/barrens/south_eastern_barrens) +"mN" = ( +/obj/structure/flora/jungle/vines/heavy, +/turf/open/gm/dirt, +/area/lv624/ground/caves/sand_temple) +"mZ" = ( +/obj/item/weapon/harpoon/yautja{ + name = "Alien Harpoon"; + pixel_x = -7 + }, /obj/structure/showcase{ color = "#95948B"; desc = "A grey statue dawned in ancient armor, it stares into your soul."; + dir = 1; icon = 'icons/mob/humans/species/r_synthetic.dmi'; icon_state = "Synthetic_Template"; name = "Eternal guardian" }, -/obj/item/weapon/harpoon/yautja{ - name = "Alien Harpoon"; - pixel_x = -7 - }, -/obj/structure/flora/jungle/vines/heavy, -/obj/effect/decal/remains/xeno{ - pixel_x = 1; - pixel_y = 31 - }, -/obj/item/clothing/shoes/yautja_flavor{ - anchored = 1 - }, -/obj/item/clothing/suit/armor/yautja_flavor{ - anchored = 1 - }, -/obj/item/clothing/mask/yautja_flavor/map_random{ - anchored = 1 - }, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/barrens/south_eastern_barrens) -"mv" = ( -/turf/open/floor/sandstone/runed, -/area/lv624/ground/caves/sand_temple) -"mB" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 8; - icon_state = "p_stair_ew_full_cap"; - layer = 3.5 - }, -/obj/structure/platform/mineral/sandstone/runed{ - dir = 1 - }, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/caves/sand_temple) -"mF" = ( -/obj/structure/closet/coffin/predator, -/turf/open/floor/corsat/squareswood/north, -/area/lv624/ground/caves/sand_temple) -"mI" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/barrens/south_eastern_barrens) -"mN" = ( -/obj/structure/flora/jungle/vines/heavy, -/turf/open/gm/dirt, -/area/lv624/ground/caves/sand_temple) -"mW" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform/mineral/sandstone/runed, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/caves/sand_temple) -"mZ" = ( -/obj/item/weapon/harpoon/yautja{ - name = "Alien Harpoon"; - pixel_x = -7 - }, -/obj/structure/showcase{ - color = "#95948B"; - desc = "A grey statue dawned in ancient armor, it stares into your soul."; - dir = 1; - icon = 'icons/mob/humans/species/r_synthetic.dmi'; - icon_state = "Synthetic_Template"; - name = "Eternal guardian" - }, -/obj/item/clothing/suit/armor/yautja_flavor{ - anchored = 1 +/obj/item/clothing/suit/armor/yautja_flavor{ + anchored = 1 }, /obj/item/clothing/shoes/yautja_flavor{ anchored = 1 }, /turf/open/floor/sandstone/runed, /area/lv624/ground/barrens/south_eastern_barrens) -"nL" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 8 - }, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/caves/sand_temple) -"nN" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 8 - }, -/turf/open/gm/dirtgrassborder/east, -/area/lv624/ground/caves/sand_temple) -"od" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 4 - }, +"nv" = ( +/obj/structure/platform/stone/runed_sandstone/east, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "ow" = ( /obj/structure/flora/jungle/vines/heavy, /turf/open/floor/strata/grey_multi_tiles, /area/lv624/ground/caves/sand_temple) -"oC" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/gm/dirt, -/area/lv624/ground/caves/sand_temple) "oR" = ( /obj/structure/stairs/perspective{ color = "#b29082"; @@ -490,35 +541,10 @@ }, /turf/open/shuttle/red, /area/lv624/ground/caves/sand_temple) -"py" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 8 - }, -/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, -/area/lv624/ground/caves/sand_temple) -"pN" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/gm/river, -/area/lv624/ground/caves/sand_temple) -"pX" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/floor/whiteyellowfull/east, -/area/lv624/ground/barrens/south_eastern_barrens) -"qf" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 1 - }, +"qj" = ( +/obj/structure/platform/stone/runed_sandstone/north, /turf/open/gm/dirt, -/area/lv624/ground/caves/sand_temple) +/area/lv624/ground/barrens/south_eastern_barrens) "qz" = ( /obj/structure/bed/alien{ color = "#aba9a9" @@ -528,12 +554,6 @@ "rd" = ( /turf/open/gm/coast/beachcorner/north_east, /area/lv624/ground/caves/sand_temple) -"rA" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/caves/sand_temple) "rI" = ( /obj/item/weapon/harpoon/yautja{ name = "Alien Harpoon"; @@ -573,24 +593,22 @@ }, /turf/open/floor/corsat/squareswood/north, /area/lv624/ground/caves/sand_temple) -"sM" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed, +"sE" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + icon_state = "p_stair_ew_full_cap"; + layer = 3.5 + }, +/obj/structure/platform/stone/stair_cut/runed_sandstone_right, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) +"sH" = ( +/obj/structure/platform/stone/runed_sandstone/north, +/turf/open/gm/grass/grass1, +/area/lv624/ground/caves/sand_temple) "sN" = ( /turf/open/gm/river, /area/lv624/ground/caves/sand_temple) -"th" = ( -/obj/structure/stairs/perspective{ - color = "#6b675e"; - dir = 6; - icon_state = "p_stair_full" - }, -/obj/structure/platform/mineral/sandstone/runed{ - dir = 8 - }, -/turf/open/floor/strata/grey_multi_tiles, -/area/lv624/ground/caves/sand_temple) "tn" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -598,29 +616,42 @@ /obj/item/stack/yautja_rope, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) -"ts" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 9; - icon_state = "p_stair_full" +"tu" = ( +/obj/structure/platform_decoration/stone/runed_sandstone, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/caves/sand_temple) +"tS" = ( +/obj/structure/showcase{ + color = "#95948B"; + desc = "A grey statue dawned in ancient armor, it stares into your soul."; + icon = 'icons/mob/humans/species/r_synthetic.dmi'; + icon_state = "Synthetic_Template"; + name = "Eternal guardian" }, -/obj/structure/platform/mineral/sandstone/runed{ - dir = 4 +/obj/item/weapon/harpoon/yautja{ + name = "Alien Harpoon"; + pixel_x = -7 }, -/turf/open/gm/dirt, -/area/lv624/ground/barrens/south_eastern_barrens) -"tE" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 8; - icon_state = "p_stair_ew_full_cap"; - layer = 3.5 +/obj/item/clothing/shoes/yautja_flavor{ + anchored = 1 }, -/obj/structure/platform/mineral/sandstone/runed{ - dir = 1 +/obj/item/clothing/suit/armor/yautja_flavor{ + anchored = 1 + }, +/obj/item/clothing/mask/yautja_flavor/map_random{ + anchored = 1; + pixel_y = 10 }, /turf/open/floor/sandstone/runed, /area/lv624/ground/barrens/south_eastern_barrens) +"tU" = ( +/obj/structure/platform/stone/runed_sandstone/west, +/turf/open/gm/dirt, +/area/lv624/ground/caves/sand_temple) +"uc" = ( +/obj/structure/platform_decoration/stone/runed_sandstone, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, +/area/lv624/ground/caves/sand_temple) "ue" = ( /obj/structure/showcase{ desc = "An ancient, dusty tomb with strange alien writing. It's best not to touch it."; @@ -630,6 +661,15 @@ /obj/structure/flora/jungle/vines/heavy, /turf/open/floor/corsat/squareswood/north, /area/lv624/ground/caves/sand_temple) +"un" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform_decoration/stone/runed_sandstone/north, +/turf/open/floor/whiteyellowfull/east, +/area/lv624/ground/barrens/south_eastern_barrens) "uy" = ( /obj/structure/showcase{ color = "#95948B"; @@ -654,55 +694,33 @@ "uE" = ( /turf/open/floor/sandstone/runed, /area/lv624/ground/barrens/south_eastern_barrens) -"uK" = ( -/obj/structure/platform/mineral/sandstone/runed, -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 6; - icon_state = "p_stair_full" - }, -/turf/open/gm/dirt, -/area/lv624/ground/barrens/south_eastern_barrens) -"uO" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 8 - }, -/turf/open/gm/dirt, -/area/lv624/ground/barrens/south_eastern_barrens) -"uQ" = ( +"uP" = ( /obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 8; + color = "#6b675e"; + dir = 5; icon_state = "p_stair_full" }, -/obj/structure/platform_decoration/mineral/sandstone/runed, -/turf/open/floor/whiteyellowfull/east, -/area/lv624/ground/barrens/south_eastern_barrens) +/obj/structure/flora/jungle/vines/heavy, +/obj/structure/platform/stone/runed_sandstone/west, +/turf/open/floor/strata/grey_multi_tiles, +/area/lv624/ground/caves/sand_temple) "vl" = ( /obj/item/tool/kitchen/utensil/spoon, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) -"vu" = ( +"vB" = ( /obj/structure/stairs/perspective{ color = "#b29082"; - dir = 6; - icon_state = "p_stair_full" - }, -/obj/structure/platform/mineral/sandstone/runed{ - dir = 8 + icon_state = "p_stair_ew_full_cap"; + layer = 3.5 }, -/turf/open/gm/dirt, +/obj/structure/platform/stone/stair_cut/runed_sandstone_right, +/turf/open/floor/sandstone/runed, /area/lv624/ground/barrens/south_eastern_barrens) "vC" = ( /obj/structure/flora/jungle/vines/light_3, /turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/caves/sand_temple) -"vN" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 1 - }, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/caves/sand_temple) "vY" = ( /turf/open/gm/coast/beachcorner/south_east, /area/lv624/ground/caves/sand_temple) @@ -713,17 +731,6 @@ }, /turf/open/floor/corsat/squareswood/north, /area/lv624/ground/caves/sand_temple) -"wf" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 10; - icon_state = "p_stair_full" - }, -/obj/structure/platform/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/gm/dirt, -/area/lv624/ground/barrens/south_eastern_barrens) "wk" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -739,6 +746,35 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) +"wl" = ( +/obj/structure/showcase{ + color = "#95948B"; + desc = "A grey statue dawned in ancient armor, it stares into your soul."; + icon = 'icons/mob/humans/species/r_synthetic.dmi'; + icon_state = "Synthetic_Template"; + name = "Eternal guardian" + }, +/obj/item/weapon/harpoon/yautja{ + name = "Alien Harpoon"; + pixel_x = -7 + }, +/obj/structure/flora/jungle/vines/heavy, +/obj/effect/decal/remains/xeno{ + pixel_x = 1; + pixel_y = 31 + }, +/obj/item/clothing/shoes/yautja_flavor{ + anchored = 1 + }, +/obj/item/clothing/suit/armor/yautja_flavor{ + anchored = 1 + }, +/obj/item/clothing/mask/yautja_flavor/map_random{ + anchored = 1; + pixel_y = 10 + }, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/barrens/south_eastern_barrens) "wt" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -753,15 +789,6 @@ }, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) -"wx" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform/mineral/sandstone/runed, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/barrens/south_eastern_barrens) "wP" = ( /turf/open/gm/coast/beachcorner2/north_east, /area/lv624/ground/caves/sand_temple) @@ -769,12 +796,6 @@ /obj/structure/flora/jungle/vines/light_3, /turf/open/gm/dirtgrassborder/east, /area/lv624/ground/caves/sand_temple) -"wR" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 1 - }, -/turf/open/gm/grass/grass1, -/area/lv624/ground/caves/sand_temple) "wS" = ( /obj/structure/showcase{ desc = "An ancient, dusty tomb with strange alien writing. It's best not to touch it."; @@ -786,6 +807,10 @@ "wU" = ( /turf/open/gm/coast/beachcorner/north_west, /area/lv624/ground/caves/sand_temple) +"wX" = ( +/obj/structure/platform/stone/runed_sandstone/north, +/turf/open/gm/coast/beachcorner2/north_west, +/area/lv624/ground/caves/sand_temple) "wZ" = ( /turf/open/gm/dirtgrassborder/desert0, /area/lv624/ground/barrens/south_eastern_barrens) @@ -796,10 +821,6 @@ /obj/structure/flora/jungle/vines/light_3, /turf/closed/wall/mineral/sandstone/runed, /area/lv624/ground/caves/sand_temple) -"xx" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/barrens/south_eastern_barrens) "xy" = ( /obj/structure/stairs/perspective{ color = "#b29082"; @@ -808,88 +829,42 @@ }, /turf/open/floor/sandstone/runed, /area/lv624/ground/barrens/south_eastern_barrens) -"xz" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/gm/dirt, -/area/lv624/ground/barrens/south_eastern_barrens) "xO" = ( /obj/structure/flora/jungle/vines/heavy, /turf/closed/wall/mineral/sandstone/runed, /area/lv624/ground/caves/sand_temple) -"yc" = ( -/obj/structure/flora/bush/ausbushes/ppflowers, -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, -/area/lv624/ground/caves/sand_temple) "yf" = ( /obj/effect/landmark/yautja_teleport, /turf/open/gm/coast/beachcorner/south_west, /area/lv624/ground/barrens/south_eastern_barrens) -"yh" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 8 - }, -/turf/open/gm/dirt, -/area/lv624/ground/barrens/south_eastern_barrens) -"yv" = ( -/obj/structure/stairs/perspective{ - color = "#6b675e"; - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 1 - }, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/caves/sand_temple) "yA" = ( /obj/structure/flora/jungle/vines/heavy, /obj/structure/prop/brazier/torch, /turf/closed/wall/mineral/sandstone/runed, /area/lv624/ground/caves/sand_temple) -"yT" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 5; - icon_state = "p_stair_full" - }, -/obj/structure/platform/mineral/sandstone/runed{ - dir = 8 - }, +"yB" = ( +/obj/structure/platform/stone/runed_sandstone/west, /turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_barrens) -"zv" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 8; - layer = 3.01 - }, -/turf/open/gm/coast/north, -/area/lv624/ground/caves/sand_temple) -"zA" = ( -/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, +"yH" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/north, +/obj/effect/landmark/objective_landmark/close, +/turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) -"zO" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 1 +"yL" = ( +/obj/structure/stairs/perspective{ + color = "#6b675e"; + dir = 4; + icon_state = "p_stair_full" }, -/turf/open/gm/dirt, -/area/lv624/ground/barrens/south_eastern_barrens) -"zZ" = ( -/obj/structure/platform/mineral/sandstone/runed, +/obj/structure/platform_decoration/stone/runed_sandstone/east, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) -"Ai" = ( -/turf/open/gm/dirt, +"za" = ( +/obj/structure/platform/stone/runed_sandstone, +/turf/open/gm/dirtgrassborder/north, /area/lv624/ground/caves/sand_temple) -"Ak" = ( -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/gm/coast/east, -/area/lv624/ground/barrens/south_eastern_barrens) -"Ao" = ( +"zu" = ( /obj/structure/showcase{ color = "#95948B"; desc = "A grey statue dawned in ancient armor, it stares into your soul."; @@ -897,20 +872,33 @@ icon_state = "Synthetic_Template"; name = "Eternal guardian" }, -/obj/item/weapon/harpoon/yautja{ - name = "Alien Harpoon"; - pixel_x = 6 +/obj/item/weapon/sword{ + layer = 3.1; + pixel_x = -6; + pixel_y = 7 }, /obj/item/clothing/shoes/yautja_flavor{ anchored = 1 }, -/obj/item/clothing/suit/armor/yautja_flavor{ - anchored = 1 - }, /obj/item/clothing/mask/yautja_flavor/map_random{ - anchored = 1 + anchored = 1; + pixel_y = 10 }, +/turf/open/floor/strata/grey_multi_tiles, +/area/lv624/ground/caves/sand_temple) +"zA" = ( +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, +/area/lv624/ground/caves/sand_temple) +"zB" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/west, /turf/open/floor/sandstone/runed, +/area/lv624/ground/caves/sand_temple) +"Ai" = ( +/turf/open/gm/dirt, +/area/lv624/ground/caves/sand_temple) +"Ak" = ( +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/gm/coast/east, /area/lv624/ground/barrens/south_eastern_barrens) "Aw" = ( /turf/open/gm/dirtgrassborder/west, @@ -918,17 +906,6 @@ "AB" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/lv624/ground/barrens/south_eastern_barrens) -"AQ" = ( -/obj/structure/stairs/perspective{ - color = "#6b675e"; - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/caves/sand_temple) "Ba" = ( /obj/structure/stairs/perspective{ color = "#b29082"; @@ -949,6 +926,15 @@ }, /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) +"BE" = ( +/obj/structure/stairs/perspective{ + color = "#6b675e"; + dir = 6; + icon_state = "p_stair_full" + }, +/obj/structure/platform/stone/runed_sandstone/west, +/turf/open/floor/strata/grey_multi_tiles, +/area/lv624/ground/caves/sand_temple) "BI" = ( /obj/item/weapon/sword{ pixel_x = 6; @@ -967,25 +953,21 @@ }, /turf/open/floor/strata/grey_multi_tiles, /area/lv624/ground/caves/sand_temple) -"Ci" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 1 - }, -/turf/open/gm/dirt, +"Ce" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/east, +/turf/open/gm/coast/beachcorner2/north_west, +/area/lv624/ground/caves/sand_temple) +"Cr" = ( +/turf/open/gm/dirtgrassborder/desert3, /area/lv624/ground/barrens/south_eastern_barrens) -"Ck" = ( +"Df" = ( /obj/structure/stairs/perspective{ color = "#b29082"; - dir = 9; + dir = 8; icon_state = "p_stair_full" }, -/obj/structure/platform/mineral/sandstone/runed{ - dir = 1 - }, -/turf/open/gm/dirt, -/area/lv624/ground/barrens/south_eastern_barrens) -"Cr" = ( -/turf/open/gm/dirtgrassborder/desert3, +/obj/structure/platform_decoration/stone/runed_sandstone/west, +/turf/open/floor/whiteyellowfull/east, /area/lv624/ground/barrens/south_eastern_barrens) "Dg" = ( /obj/structure/stairs/perspective{ @@ -998,10 +980,6 @@ "Dj" = ( /turf/open/gm/coast/beachcorner2/south_west, /area/lv624/ground/barrens/south_eastern_barrens) -"Dl" = ( -/obj/structure/platform/mineral/sandstone/runed, -/turf/open/gm/dirtgrassborder/north, -/area/lv624/ground/caves/sand_temple) "Ds" = ( /obj/structure/flora/jungle/alienplant1{ layer = 4.13; @@ -1018,34 +996,23 @@ }, /turf/open/gm/dirtgrassborder/west, /area/lv624/ground/barrens/south_eastern_barrens) -"DH" = ( -/obj/structure/showcase{ - color = "#95948B"; - desc = "A grey statue dawned in ancient armor, it stares into your soul."; - icon = 'icons/mob/humans/species/r_synthetic.dmi'; - icon_state = "Synthetic_Template"; - name = "Eternal guardian" - }, -/obj/item/weapon/sword{ - layer = 3.1; - pixel_x = -6; - pixel_y = 7 - }, -/obj/item/clothing/shoes/yautja_flavor{ - anchored = 1 - }, -/obj/item/clothing/mask/yautja_flavor/map_random{ - anchored = 1 +"DN" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/east, +/turf/open/gm/dirt, +/area/lv624/ground/barrens/south_eastern_barrens) +"DT" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 10; + icon_state = "p_stair_full" }, -/turf/open/floor/strata/grey_multi_tiles, +/obj/structure/platform/stone/runed_sandstone/east, +/turf/open/gm/dirt, +/area/lv624/ground/barrens/south_eastern_barrens) +"Ep" = ( +/obj/structure/platform/stone/runed_sandstone, +/turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) -"DZ" = ( -/obj/effect/landmark/lv624/fog_blocker, -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 8 - }, -/turf/open/gm/coast/beachcorner/north_east, -/area/lv624/ground/river/east_river) "Eq" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -1075,43 +1042,14 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/floor/strata/grey_multi_tiles, /area/lv624/ground/caves/sand_temple) -"EM" = ( -/obj/structure/showcase{ - color = "#95948B"; - desc = "A grey statue dawned in ancient armor, it stares into your soul."; - icon = 'icons/mob/humans/species/r_synthetic.dmi'; - icon_state = "Synthetic_Template"; - name = "Eternal guardian" - }, -/obj/item/clothing/mask/gas/yautja/damaged{ - anchored = 1; - armor_bio = 0; - armor_bomb = 0; - armor_bullet = 0; - armor_energy = 0; - armor_internaldamage = 0; - armor_laser = 0; - armor_melee = 0; - armor_rad = 0; - desc = "A beautifully designed stone face mask, both ornate and functional."; - name = "stone clan mask"; - unacidable = 0 - }, -/obj/structure/flora/jungle/vines/heavy, -/obj/item/clothing/suit/armor/yautja_flavor{ - anchored = 1 - }, -/obj/item/clothing/shoes/yautja_flavor{ - anchored = 1 - }, -/turf/open/floor/corsat/squareswood/north, +"EN" = ( +/obj/structure/platform/stone/runed_sandstone/east, +/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/lv624/ground/caves/sand_temple) -"Ff" = ( -/obj/item/weapon/twohanded/yautja/spear, -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/gm/river, +"Fx" = ( +/obj/structure/flora/bush/ausbushes/ppflowers, +/obj/structure/platform_decoration/stone/runed_sandstone/east, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_west, /area/lv624/ground/caves/sand_temple) "FF" = ( /obj/structure/prop/brazier/torch, @@ -1125,6 +1063,10 @@ /obj/item/tool/kitchen/utensil/spoon, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) +"FN" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/west, +/turf/open/gm/coast/north, +/area/lv624/ground/caves/sand_temple) "FS" = ( /obj/structure/flora/jungle/vines/light_3, /obj/item/hunting_trap{ @@ -1136,24 +1078,11 @@ "Ge" = ( /turf/open/floor/corsat/squareswood/north, /area/lv624/ground/caves/sand_temple) -"Gt" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 8 - }, -/turf/open/gm/dirt, -/area/lv624/ground/caves/sand_temple) "Gu" = ( /turf/open/gm/coast/east, -/area/lv624/ground/barrens/south_eastern_barrens) -"GO" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - icon_state = "p_stair_ew_full_cap"; - layer = 3.5 - }, -/obj/structure/platform/mineral/sandstone/runed{ - dir = 1 - }, +/area/lv624/ground/barrens/south_eastern_barrens) +"GI" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/north, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "GT" = ( @@ -1197,29 +1126,14 @@ /obj/item/stool, /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) -"HJ" = ( -/obj/structure/showcase{ - color = "#95948B"; - desc = "A grey statue dawned in ancient armor, it stares into your soul."; - icon = 'icons/mob/humans/species/r_synthetic.dmi'; - icon_state = "Synthetic_Template"; - name = "Eternal guardian" - }, -/obj/item/weapon/harpoon/yautja{ - name = "Alien Harpoon"; - pixel_x = -7 - }, -/obj/item/clothing/shoes/yautja_flavor{ - anchored = 1 - }, -/obj/item/clothing/suit/armor/yautja_flavor{ - anchored = 1 - }, -/obj/item/clothing/mask/yautja_flavor/map_random{ - anchored = 1 - }, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/barrens/south_eastern_barrens) +"HI" = ( +/obj/structure/platform_decoration/stone/runed_sandstone, +/turf/open/gm/coast/south, +/area/lv624/ground/caves/sand_temple) +"HL" = ( +/obj/structure/platform/stone/runed_sandstone/north, +/turf/open/gm/dirt, +/area/lv624/ground/caves/sand_temple) "HN" = ( /turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_barrens) @@ -1245,6 +1159,10 @@ }, /turf/open/gm/dirtgrassborder/weedable/grass1, /area/lv624/ground/barrens/south_eastern_barrens) +"IP" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/north, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/barrens/south_eastern_barrens) "IZ" = ( /obj/structure/barricade/handrail/strata{ dir = 4 @@ -1285,29 +1203,15 @@ /obj/structure/flora/jungle/vines/heavy, /turf/closed/wall/mineral/sandstone/runed/decor, /area/lv624/ground/caves/sand_temple) -"Jo" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 1 - }, +"Jz" = ( /obj/structure/stairs/perspective{ color = "#b29082"; - dir = 5; - icon_state = "p_stair_full" - }, -/turf/open/gm/dirt, -/area/lv624/ground/barrens/south_eastern_barrens) -"Jw" = ( -/obj/structure/stairs/perspective{ - color = "#6b675e"; dir = 4; icon_state = "p_stair_full" }, -/obj/structure/flora/jungle/vines/heavy, -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/shuttle/red, -/area/lv624/ground/caves/sand_temple) +/obj/structure/platform/stone/runed_sandstone, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/barrens/south_eastern_barrens) "JN" = ( /obj/structure/showcase{ color = "#95948B"; @@ -1325,12 +1229,6 @@ }, /turf/open/floor/corsat/squareswood/north, /area/lv624/ground/caves/sand_temple) -"JZ" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 4 - }, -/turf/open/gm/dirt, -/area/lv624/ground/barrens/south_eastern_barrens) "Ki" = ( /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, @@ -1338,12 +1236,6 @@ "Kk" = ( /turf/open/gm/grass/grass1, /area/lv624/ground/barrens/south_eastern_barrens) -"Kr" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 1 - }, -/turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, -/area/lv624/ground/caves/sand_temple) "KB" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -1368,48 +1260,19 @@ "Lg" = ( /turf/open/gm/river, /area/lv624/ground/barrens/south_eastern_barrens) +"Lm" = ( +/obj/structure/platform/stone/runed_sandstone/east, +/turf/open/gm/dirt, +/area/lv624/ground/barrens/south_eastern_barrens) "Lt" = ( /obj/item/reagent_container/food/snacks/stew, /turf/open/gm/coast/south, /area/lv624/ground/caves/sand_temple) -"LF" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - icon_state = "p_stair_ew_full_cap"; - layer = 3.5 - }, -/obj/structure/platform/mineral/sandstone/runed{ - dir = 1 - }, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/barrens/south_eastern_barrens) -"LL" = ( -/obj/structure/showcase{ - color = "#95948B"; - desc = "A grey statue dawned in ancient armor, it stares into your soul."; - icon = 'icons/mob/humans/species/r_synthetic.dmi'; - icon_state = "Synthetic_Template"; - name = "Eternal guardian" - }, -/obj/item/weapon/harpoon/yautja{ - name = "Alien Harpoon"; - pixel_x = 6 - }, -/obj/effect/decal/remains/xeno{ - pixel_x = -1; - pixel_y = 31 - }, -/obj/item/clothing/shoes/yautja_flavor{ - anchored = 1 - }, -/obj/item/clothing/suit/armor/yautja_flavor{ - anchored = 1 - }, -/obj/item/clothing/mask/yautja_flavor/map_random{ - anchored = 1 - }, -/turf/open/floor/sandstone/runed, -/area/lv624/ground/barrens/south_eastern_barrens) +"Mk" = ( +/obj/effect/landmark/lv624/fog_blocker, +/obj/structure/platform_decoration/stone/runed_sandstone/west, +/turf/open/gm/coast/beachcorner/north_east, +/area/lv624/ground/river/east_river) "Mn" = ( /obj/structure/showcase{ color = "#95948B"; @@ -1453,18 +1316,10 @@ }, /turf/open/floor/corsat/squareswood/north, /area/lv624/ground/caves/sand_temple) -"ND" = ( -/obj/structure/stairs/perspective{ - color = "#6b675e"; - dir = 5; - icon_state = "p_stair_full" - }, -/obj/structure/flora/jungle/vines/heavy, -/obj/structure/platform/mineral/sandstone/runed{ - dir = 8 - }, -/turf/open/floor/strata/grey_multi_tiles, -/area/lv624/ground/caves/sand_temple) +"OA" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/west, +/turf/open/gm/dirt, +/area/lv624/ground/barrens/south_eastern_barrens) "OC" = ( /turf/closed/wall/mineral/sandstone/runed, /area/lv624/ground/caves/sand_temple) @@ -1475,6 +1330,10 @@ }, /turf/open/gm/dirtgrassborder/weedable/grass1, /area/lv624/ground/barrens/south_eastern_barrens) +"OL" = ( +/obj/structure/platform_decoration/stone/runed_sandstone, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/barrens/south_eastern_barrens) "OP" = ( /obj/structure/barricade/handrail/strata, /turf/open/gm/dirtgrassborder/weedable/grass1, @@ -1483,34 +1342,21 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) -"Ps" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 1 - }, -/turf/open/gm/coast/beachcorner/north_west, -/area/lv624/ground/caves/sand_temple) "PA" = ( /obj/structure/machinery/door/airlock/sandstone/runed/destroyable{ name = "\improper Strange Temple" }, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) -"PN" = ( -/obj/structure/showcase{ - color = "#95948B"; - desc = "A grey statue dawned in ancient armor, it stares into your soul."; - icon = 'icons/mob/humans/species/r_synthetic.dmi'; - icon_state = "Synthetic_Template"; - name = "Eternal guardian" - }, -/obj/item/clothing/suit/armor/yautja/hunter{ - anchored = 1 - }, -/obj/item/clothing/mask/gas/yautja/damaged{ - anchored = 1 +"PK" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 9; + icon_state = "p_stair_full" }, +/obj/structure/platform/stone/runed_sandstone/north, /turf/open/gm/dirt, -/area/lv624/ground/caves/sand_temple) +/area/lv624/ground/barrens/south_eastern_barrens) "PO" = ( /obj/item/weapon/harpoon/yautja{ name = "Alien Harpoon"; @@ -1538,9 +1384,9 @@ }, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) -"PR" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed, -/turf/open/gm/coast/south, +"Qj" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/east, +/turf/open/gm/river, /area/lv624/ground/caves/sand_temple) "QG" = ( /obj/structure/barricade/handrail/strata{ @@ -1571,6 +1417,15 @@ }, /turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) +"Rr" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 9; + icon_state = "p_stair_full" + }, +/obj/structure/platform/stone/runed_sandstone/east, +/turf/open/gm/dirt, +/area/lv624/ground/barrens/south_eastern_barrens) "Rx" = ( /obj/structure/bed/chair/comfy/black{ dir = 8 @@ -1594,11 +1449,23 @@ /obj/structure/flora/jungle/vines/heavy, /turf/open/floor/corsat/squareswood/north, /area/lv624/ground/caves/sand_temple) -"SK" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 1 +"Sg" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 6; + icon_state = "p_stair_full" }, -/turf/open/floor/sandstone/runed, +/obj/structure/platform/stone/runed_sandstone/west, +/turf/open/gm/dirt, +/area/lv624/ground/barrens/south_eastern_barrens) +"SL" = ( +/obj/structure/platform/stone/runed_sandstone/north, +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 5; + icon_state = "p_stair_full" + }, +/turf/open/gm/dirt, /area/lv624/ground/barrens/south_eastern_barrens) "SO" = ( /obj/structure/stairs/perspective{ @@ -1621,6 +1488,14 @@ /obj/effect/landmark/hunter_primary, /turf/open/gm/river, /area/lv624/ground/barrens/south_eastern_barrens) +"Tv" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/east, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/caves/sand_temple) +"TD" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/north, +/turf/open/gm/dirt, +/area/lv624/ground/caves/sand_temple) "TY" = ( /obj/structure/flora/jungle/vines/light_3, /obj/structure/surface/table/reinforced/prison{ @@ -1628,11 +1503,19 @@ }, /turf/open/gm/dirtgrassborder/east, /area/lv624/ground/caves/sand_temple) -"Ug" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 8 +"Uh" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/west, +/turf/open/gm/dirtgrassborder/east, +/area/lv624/ground/caves/sand_temple) +"Uj" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 8; + icon_state = "p_stair_ew_full_cap"; + layer = 3.5 }, -/turf/open/gm/coast/north, +/obj/structure/platform/stone/stair_cut/runed_sandstone_left, +/turf/open/floor/sandstone/runed, /area/lv624/ground/caves/sand_temple) "Uk" = ( /obj/structure/stairs/perspective{ @@ -1648,13 +1531,13 @@ }, /turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/lv624/ground/caves/sand_temple) +"UH" = ( +/obj/structure/platform_decoration/stone/runed_sandstone/north, +/turf/open/gm/dirt, +/area/lv624/ground/barrens/south_eastern_barrens) "UK" = ( /turf/open/gm/dirtgrassborder/desert, /area/lv624/ground/barrens/south_eastern_barrens) -"UQ" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed, -/turf/open/gm/dirt, -/area/lv624/ground/barrens/south_eastern_barrens) "UU" = ( /turf/closed/wall/strata_ice/jungle, /area/lv624/ground/caves/sand_temple) @@ -1667,6 +1550,15 @@ "Vu" = ( /turf/open/gm/grass/grass1, /area/lv624/ground/caves/sand_temple) +"VP" = ( +/obj/structure/platform/stone/runed_sandstone, +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 6; + icon_state = "p_stair_full" + }, +/turf/open/gm/dirt, +/area/lv624/ground/barrens/south_eastern_barrens) "Wl" = ( /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/dirtgrassborder/east, @@ -1688,6 +1580,47 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) +"WJ" = ( +/obj/structure/stairs/perspective{ + color = "#6b675e"; + dir = 6; + icon_state = "p_stair_full" + }, +/obj/structure/platform/stone/runed_sandstone/west, +/turf/open/gm/dirt, +/area/lv624/ground/caves/sand_temple) +"WW" = ( +/obj/structure/showcase{ + color = "#95948B"; + desc = "A grey statue dawned in ancient armor, it stares into your soul."; + icon = 'icons/mob/humans/species/r_synthetic.dmi'; + icon_state = "Synthetic_Template"; + name = "Eternal guardian" + }, +/obj/item/clothing/mask/gas/yautja/damaged{ + anchored = 1; + armor_bio = 0; + armor_bomb = 0; + armor_bullet = 0; + armor_energy = 0; + armor_internaldamage = 0; + armor_laser = 0; + armor_melee = 0; + armor_rad = 0; + desc = "A beautifully designed stone face mask, both ornate and functional."; + name = "stone clan mask"; + unacidable = 0; + pixel_y = 10 + }, +/obj/structure/flora/jungle/vines/heavy, +/obj/item/clothing/suit/armor/yautja_flavor{ + anchored = 1 + }, +/obj/item/clothing/shoes/yautja_flavor{ + anchored = 1 + }, +/turf/open/floor/corsat/squareswood/north, +/area/lv624/ground/caves/sand_temple) "Xg" = ( /obj/structure/barricade/handrail/strata{ dir = 1 @@ -1714,48 +1647,6 @@ }, /turf/open/gm/dirt, /area/lv624/ground/caves/sand_temple) -"Yd" = ( -/obj/structure/platform/mineral/sandstone/runed{ - dir = 1 - }, -/turf/open/gm/coast/beachcorner2/north_west, -/area/lv624/ground/caves/sand_temple) -"Yu" = ( -/obj/structure/platform_decoration/mineral/sandstone/runed{ - dir = 1 - }, -/turf/open/gm/dirt, -/area/lv624/ground/caves/sand_temple) -"YB" = ( -/obj/structure/showcase{ - color = "#95948B"; - desc = "A grey statue dawned in ancient armor, it stares into your soul."; - icon = 'icons/mob/humans/species/r_synthetic.dmi'; - icon_state = "Synthetic_Template"; - name = "Eternal guardian" - }, -/obj/item/clothing/shoes/yautja_flavor{ - anchored = 1 - }, -/obj/item/clothing/suit/armor/yautja_flavor{ - anchored = 1 - }, -/obj/item/clothing/mask/yautja_flavor/map_random{ - anchored = 1 - }, -/turf/open/floor/corsat/squareswood/north, -/area/lv624/ground/caves/sand_temple) -"YT" = ( -/obj/structure/stairs/perspective{ - color = "#6b675e"; - dir = 5; - icon_state = "p_stair_full" - }, -/obj/structure/platform/mineral/sandstone/runed{ - dir = 8 - }, -/turf/open/gm/dirt, -/area/lv624/ground/caves/sand_temple) "Zi" = ( /obj/structure/bed/alien{ color = "#aba9a9" @@ -1769,6 +1660,16 @@ "ZG" = ( /turf/open/gm/dirtgrassborder/desert1, /area/lv624/ground/barrens/south_eastern_barrens) +"ZH" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 8; + icon_state = "p_stair_ew_full_cap"; + layer = 3.5 + }, +/obj/structure/platform/stone/stair_cut/runed_sandstone_left, +/turf/open/floor/sandstone/runed, +/area/lv624/ground/barrens/south_eastern_barrens) "ZX" = ( /turf/template_noop, /area/template_noop) @@ -2035,14 +1936,14 @@ GT GT OC yA -ND -Jw +uP +kZ pu -gY -th +lu +BE Mq OC -qf +HL Ai Ai GT @@ -2084,7 +1985,7 @@ Jc gL wS if -qf +HL Ai GT GT @@ -2118,7 +2019,7 @@ GT GT GT Jm -EM +WW gL Jc Jc @@ -2126,7 +2027,7 @@ Jc gL JN OC -qf +HL Ai wU GT @@ -2168,7 +2069,7 @@ Jc EL wS if -qf +HL Ai ax GT @@ -2202,7 +2103,7 @@ GT GT GT Jm -EM +WW gL Jc Jc @@ -2210,7 +2111,7 @@ Jc gL JN xO -qf +HL wU po sN @@ -2252,7 +2153,7 @@ Jc gL ue Jm -qf +HL ax sN ci @@ -2286,7 +2187,7 @@ GT GT GT OC -YB +jP gL Jc Jc @@ -2294,7 +2195,7 @@ Jc gL Mn xO -Ps +fG po ci vY @@ -2336,7 +2237,7 @@ gA He Mq OC -fE +Ce ci vY Ai @@ -2369,15 +2270,15 @@ GT GT GT xO -Yu -YT -AQ +TD +iU +yL SO SO SO -yv -dL -pN +mq +WJ +Qj ci vY Ai @@ -2411,9 +2312,9 @@ GT GT GT dA -aA -oC -nL +uc +jz +zB mv mv mv @@ -2421,7 +2322,7 @@ mv ax ci OC -qf +HL Ai Ai Ai @@ -2438,9 +2339,9 @@ ZX ZX ZX ZX -UQ -xz -DZ +mM +Lm +Mk ZX ZX ZX @@ -2453,9 +2354,9 @@ ZX ai dA dA -Dl -DH -vN +za +zu +gK mv mv mv @@ -2463,7 +2364,7 @@ wU po MB dA -GO +sE Uk Uk Uk @@ -2478,14 +2379,14 @@ ZX ZX ZX ZX -ts -iw -lI +Rr +Df +gq Zs -Ck -uQ -wf -uO +PK +aj +DT +OA "} (18,1,1) = {" ZX @@ -2495,9 +2396,9 @@ ZX bZ dA Aw -Kr -Gt -rA +aU +tU +Tv mv mv wU @@ -2515,19 +2416,19 @@ mN OC xO GT -LF +vB xy xy xy -wx -HJ +gJ +tS fD DG DG DG aN mZ -zO +qj "} (19,1,1) = {" ZX @@ -2542,7 +2443,7 @@ Ai mv Ba aT -Ug +FN ci vY MX @@ -2556,12 +2457,12 @@ MX MX mv ic -mr +wl uE mI uE uE -SK +IP Ws dF Cr @@ -2569,7 +2470,7 @@ UK hD hi OJ -zO +qj "} (20,1,1) = {" ZX @@ -2584,7 +2485,7 @@ mv mv eM Ge -Yd +wX MB MX MX @@ -2611,7 +2512,7 @@ MK UK hi OP -zO +qj "} (21,1,1) = {" ZX @@ -2625,8 +2526,8 @@ mv mv mv oR -zv -Ff +mt +fd MB Ai mN @@ -2640,12 +2541,12 @@ jZ mv mv ic -LL +es uE uE uE uE -xx +OL iW dF ZG @@ -2653,7 +2554,7 @@ UK wZ hi Ix -zO +qj "} (22,1,1) = {" ZX @@ -2663,15 +2564,15 @@ ZX bZ yA mv -sM -od -nL +tu +nv +zB Ai ax sN -PR -gS -nN +HI +EN +Uh ja mv Ai @@ -2683,19 +2584,19 @@ MX xO xO FF -tE +ZH RV RV RV -dE -Ao +Jz +eq Xg QG QG QG IZ rI -zO +qj "} (23,1,1) = {" ZX @@ -2705,17 +2606,17 @@ ZX GT xO xO -zZ +Ep uy -qf +HL Ai ax ci -ky +jq BI -wR +sH dA -mB +Uj eb eb eb @@ -2730,14 +2631,14 @@ ZX ZX ZX ZX -yT -pX -uK +fT +hX +VP Zs -Jo -dr -vu -JZ +SL +un +Sg +DN "} (24,1,1) = {" ZX @@ -2747,17 +2648,17 @@ ZX GT GT Jm -Yu -Gt -ma +TD +tU +gm wU po MB -jc -py -yc +yH +ev +Fx dA -qf +HL Ai Ai Ai @@ -2774,9 +2675,9 @@ ZX ZX ZX ZX -Ci -yh -JZ +UH +yB +DN ZX ZX ZX @@ -2832,16 +2733,16 @@ GT GT xO xO -mB +Uj eb ax MB Ai eb -mW +aH OC OC -qf +HL Ai Ai Ai @@ -2874,16 +2775,16 @@ GT GT GT xO -rA +Tv mv ax EJ hA mv -gZ +GI Mq GT -ma +gm Ai Ai Ai @@ -3586,7 +3487,7 @@ ZX GT GT GT -PN +cG Ai GT GT diff --git a/maps/map_files/New_Varadero/New_Varadero.dmm b/maps/map_files/New_Varadero/New_Varadero.dmm index 8da838c3cecc..0cbf9c9a9e30 100644 --- a/maps/map_files/New_Varadero/New_Varadero.dmm +++ b/maps/map_files/New_Varadero/New_Varadero.dmm @@ -46,17 +46,6 @@ }, /turf/open/floor/wood, /area/varadero/interior/beach_bar) -"abE" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/almayer/maint{ - name = "\improper Underground Maintenance"; - req_access_txt = "100"; - req_one_access = null - }, -/turf/open/floor/plating, -/area/varadero/interior/maintenance/security) "abK" = ( /obj/structure/barricade/handrail/wire{ dir = 4 @@ -87,12 +76,21 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva/multi_tiles/north, /area/varadero/interior/electrical) -"aer" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 +"aeJ" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 }, -/turf/open/gm/dirt, -/area/varadero/exterior/monsoon) +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/pontoon_beach) "afg" = ( /turf/closed/wall/r_wall/elevator{ dir = 8 @@ -128,6 +126,12 @@ }, /turf/open/floor/shiva/yellow, /area/varadero/interior/cargo) +"agh" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/turf/open/gm/river/ocean/deep_ocean, +/area/varadero/exterior/farocean) "agi" = ( /obj/structure/window/reinforced{ dir = 4; @@ -178,15 +182,6 @@ }, /turf/open/floor/plating, /area/varadero/interior/electrical) -"ahb" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/effect/overlay/palmtree_r, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/exterior/lz1_near) "ahg" = ( /turf/closed/wall, /area/varadero/interior/dock_control) @@ -213,6 +208,17 @@ }, /turf/open/floor/shiva/floor3, /area/varadero/interior/security) +"ajm" = ( +/obj/structure/pipes/standard/manifold/hidden/green, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) +"ajS" = ( +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/obj/effect/overlay/palmtree_r, +/turf/open/gm/dirt, +/area/varadero/exterior/comms4) "akd" = ( /obj/structure/closet/secure_closet/freezer/fridge, /obj/structure/machinery/firealarm{ @@ -277,28 +283,19 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/wood, /area/varadero/interior/bunks) -"alD" = ( -/obj/structure/filtration/coagulation_arm{ - explo_proof = 1; - layer = 2.1; - density = 0 - }, -/obj/structure/barricade/handrail/wire{ - layer = 3.1 - }, -/obj/structure/barricade/handrail/wire{ - dir = 8; - layer = 2.991 - }, -/obj/structure/platform, -/turf/open/gm/river/desert/deep/covered, -/area/varadero/interior/maintenance/north) "alG" = ( /obj/structure/bed/chair{ dir = 8 }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance/research) +"alK" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/largecrate/random, +/turf/open/floor/asteroidfloor/north, +/area/varadero/interior/comms1) "alL" = ( /obj/structure/prop/structure_lattice{ dir = 1; @@ -334,6 +331,13 @@ }, /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/hall_N) +"anx" = ( +/obj/structure/girder/displaced, +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "anA" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/table/woodentable, @@ -360,25 +364,6 @@ /obj/structure/window/framed/colony/reinforced, /turf/open/floor/plating, /area/varadero/interior/maintenance/research) -"apj" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/maintenance/security) -"apt" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pontoon_beach/lz) "apG" = ( /obj/structure/blocker/invisible_wall/water, /obj/item/lightstick/variant/planted, @@ -442,6 +427,10 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance/north) +"aqO" = ( +/obj/structure/flora/bush/ausbushes/var3/stalkybush, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/security/north) "ara" = ( /turf/open/floor/wood, /area/varadero/interior/court) @@ -471,10 +460,41 @@ "asx" = ( /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/exterior/lz1_near) +"asV" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/item/shard{ + icon_state = "large"; + pixel_x = -5; + pixel_y = -6 + }, +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -1; + pixel_y = 9; + explo_proof = 1; + unacidable = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) +"atu" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_x = 16; + pixel_y = -8 + }, +/obj/effect/sentry_landmark/lz_2/bottom_left, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) "atz" = ( /obj/structure/machinery/vending/cigarette/colony, /turf/open/floor/shiva/blue/southeast, /area/varadero/interior/administration) +"atL" = ( +/obj/structure/closet/firecloset/full, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "atM" = ( /obj/structure/prop/mech/drill, /turf/open/shuttle/red, @@ -516,14 +536,6 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/gm/dirt, /area/varadero/exterior/lz1_near) -"avX" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/coast/beachcorner/north_east, -/area/varadero/exterior/comms4) "awr" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, /turf/open/gm/dirt/desert0, @@ -550,16 +562,6 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/comms2) -"axv" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail/wire{ - layer = 3.1 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pool) "axY" = ( /obj/structure/bed/chair/comfy/lime, /turf/open/floor/wood, @@ -584,20 +586,6 @@ /obj/item/clothing/shoes/swimmingfins, /turf/open/floor/shiva/snow_mat/east, /area/varadero/interior/maintenance) -"azr" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pool) "azv" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/shiva/multi_tiles, @@ -627,10 +615,12 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/shiva/floor3, /area/varadero/interior/mess) -"aAr" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 +"aAl" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/item/shard{ + icon_state = "medium" }, /obj/item/lightstick/red/spoke/planted{ pixel_x = -1; @@ -638,13 +628,8 @@ explo_proof = 1; unacidable = 1 }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/farocean) +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) "aAC" = ( /obj/item/shard{ icon_state = "medium" @@ -693,30 +678,6 @@ }, /turf/open/floor/shiva/floor3, /area/varadero/interior/disposals) -"aBY" = ( -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pontoon_beach/lz) -"aCd" = ( -/obj/structure/barricade/handrail/wire{ - layer = 3.1 - }, -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/ocean/deep_ocean, -/area/varadero/exterior/comms4) "aCl" = ( /obj/structure/machinery/door/airlock/strata/autoname{ autoname = 0; @@ -762,6 +723,18 @@ /obj/structure/machinery/power/apc/power/north, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance/north) +"aDg" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/gm/coast/west, +/area/varadero/exterior/pontoon_beach) "aDu" = ( /obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/shiva/floor3, @@ -790,6 +763,21 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/wood, /area/varadero/interior/administration) +"aDS" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -1; + pixel_y = 9; + explo_proof = 1; + unacidable = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/farocean) "aDZ" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/plating/icefloor/asteroidplating, @@ -989,29 +977,6 @@ }, /turf/open/shuttle/red, /area/varadero/interior_protected/vessel) -"aJD" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" - }, -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pontoon_beach) "aJF" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -1034,17 +999,6 @@ /obj/structure/largecrate/random/case, /turf/open/floor/shiva/purple/east, /area/varadero/interior/research) -"aKk" = ( -/obj/structure/machinery/light/small{ - dir = 8 - }, -/obj/structure/bed/chair/office/dark{ - dir = 1; - pixel_x = -5; - pixel_y = 6 - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "aKJ" = ( /obj/item/tool/warning_cone, /obj/structure/prop/invuln/lattice_prop{ @@ -1082,6 +1036,14 @@ "aOg" = ( /turf/open/gm/grass/grass1/weedable, /area/varadero/interior_protected/caves/central) +"aOh" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22"; + pixel_y = 8 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "aOG" = ( /obj/item/lightstick/red/spoke/planted{ pixel_x = -1; @@ -1096,6 +1058,10 @@ /obj/effect/landmark/corpsespawner/scientist, /turf/open/floor/carpet, /area/varadero/interior/hall_SE) +"aPf" = ( +/obj/structure/platform_decoration/metal/kutjevo, +/turf/open/gm/river/ocean/deep_ocean, +/area/varadero/exterior/farocean) "aPQ" = ( /obj/effect/landmark/objective_landmark/science, /turf/open/floor/shiva/north, @@ -1106,6 +1072,15 @@ }, /turf/open/floor/shiva/blue/north, /area/varadero/interior/administration) +"aPY" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/interior/caves/north_research) "aQc" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -1141,6 +1116,14 @@ /obj/item/tool/screwdriver, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/comms2) +"aRg" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8; + pixel_x = -13; + pixel_y = 11 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "aRr" = ( /turf/open/floor/shiva/floor3, /area/varadero/interior/hall_NW) @@ -1210,6 +1193,10 @@ /obj/structure/prop/rock/brown, /turf/open/gm/river/shallow_ocean_shallow_ocean, /area/varadero/exterior/pontoon_beach) +"aUz" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/pontoon_beach) "aUA" = ( /obj/structure/prop/rock/brown, /obj/structure/prop/invuln/lattice_prop, @@ -1236,6 +1223,17 @@ }, /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/hall_SE) +"aUS" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 1; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz1_near) "aVs" = ( /obj/structure/machinery/door/poddoor/almayer/planet_side_blastdoor{ id = "undergroundhangarsouth"; @@ -1284,6 +1282,18 @@ /obj/structure/flora/bush/ausbushes/var3/stalkybush, /turf/open/gm/dirt, /area/varadero/interior_protected/caves/digsite) +"aXd" = ( +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) "aXm" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -1315,18 +1325,6 @@ /obj/structure/largecrate/supply/medicine/iv, /turf/open/shuttle/elevator/grating, /area/varadero/interior/records) -"aYg" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/interior/caves/north_research) "aZb" = ( /obj/structure/bedsheetbin{ icon_state = "linenbin-empty" @@ -1383,16 +1381,6 @@ /obj/effect/landmark/monkey_spawn, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance/research) -"bah" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail/wire{ - layer = 3.1 - }, -/turf/open/gm/river/ocean/deep_ocean, -/area/varadero/exterior/pontoon_beach/lz) "bak" = ( /obj/structure/prop/invuln/overhead_pipe{ dir = 4; @@ -1419,6 +1407,11 @@ /obj/effect/landmark/hunter_primary, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/digsite) +"bbF" = ( +/obj/structure/surface/rack, +/obj/item/reagent_container/blood/OMinus, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "bbG" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, /turf/open/gm/coast/west, @@ -1427,6 +1420,18 @@ /obj/effect/decal/cleanable/blood/drip, /turf/open/gm/dirt, /area/varadero/exterior/lz2_near) +"bbU" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/gm/coast/east, +/area/varadero/exterior/pontoon_beach) "bbW" = ( /obj/item/clothing/under/shorts/black, /turf/open/floor/shiva/bluefull/west, @@ -1444,6 +1449,12 @@ /obj/item/tool/wet_sign, /turf/open/floor/asteroidfloor/north, /area/varadero/exterior/eastbeach) +"bcF" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/turf/open/gm/river/ocean/deep_ocean, +/area/varadero/exterior/pontoon_beach/lz) "bdc" = ( /obj/item/stack/tile/plasteel{ layer = 2.89; @@ -1452,6 +1463,12 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior_protected/maintenance/south) +"bde" = ( +/obj/structure/barricade/wooden{ + dir = 8 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "bdH" = ( /turf/open/gm/coast/beachcorner/north_east, /area/varadero/interior/caves/north_research) @@ -1510,6 +1527,15 @@ /obj/effect/landmark/objective_landmark/far, /turf/open/floor/shiva/red/east, /area/varadero/interior/security) +"bfe" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/monsoon) "bfg" = ( /obj/structure/surface/table, /obj/item/ashtray/plastic, @@ -1549,21 +1575,27 @@ "bgE" = ( /turf/closed/wall/r_wall, /area/varadero/interior/maintenance/north) +"bhg" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/obj/structure/platform_decoration/metal/kutjevo/east, +/obj/structure/prop/invuln/minecart_tracks{ + dir = 10 + }, +/obj/structure/platform_decoration/metal/kutjevo/east, +/obj/structure/blocker/invisible_wall/water, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/oob) "bhF" = ( /obj/structure/sign/safety/water{ pixel_x = 15 }, /turf/closed/wall/r_wall, /area/varadero/interior/hall_N) -"bhU" = ( -/obj/structure/machinery/floodlight{ - name = "Floodlight" - }, -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior_protected/caves/digsite) "bih" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -1598,18 +1630,15 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/floor/shiva/purplefull/west, /area/varadero/interior/research) -"biS" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 +"biY" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 }, -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 +/obj/structure/machinery/storm_siren{ + pixel_y = 5 }, /turf/open/gm/dirt, -/area/varadero/exterior/eastbeach) +/area/varadero/exterior/monsoon) "bjf" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -1620,6 +1649,12 @@ }, /turf/open/floor/shiva/purplefull/west, /area/varadero/interior/research) +"bjv" = ( +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz1_near) "bjA" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/shiva/blue/north, @@ -1681,6 +1716,18 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/digsite) +"bmL" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -1; + pixel_y = 9; + explo_proof = 1; + unacidable = 1 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/monsoon) "bmV" = ( /obj/effect/decal/warning_stripes/asteroid{ icon_state = "warning_s" @@ -1733,6 +1780,12 @@ /obj/structure/prop/almayer/computers/sensor_computer2, /turf/open/floor/prison/darkredfull2, /area/varadero/interior/dock_control) +"boP" = ( +/obj/structure/prop/invuln/minecart_tracks, +/obj/structure/platform_decoration/metal/kutjevo/west, +/obj/structure/platform_decoration/metal/kutjevo/east, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/comms1) "boV" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -1751,6 +1804,23 @@ /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/hall_N) +"bpP" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/prop/invuln/minecart_tracks{ + dir = 8 + }, +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/structure/prop/invuln/minecart_tracks{ + dir = 5 + }, +/obj/structure/platform_decoration/metal/kutjevo, +/obj/structure/blocker/invisible_wall/water, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/oob) "bpT" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -1811,13 +1881,6 @@ }, /turf/open/shuttle/elevator, /area/varadero/interior/hall_N) -"btU" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/coast/beachcorner2/south_west, -/area/varadero/exterior/pontoon_beach) "bum" = ( /obj/structure/machinery/shower{ dir = 4 @@ -1842,23 +1905,6 @@ /obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance/research) -"bvF" = ( -/obj/structure/flora/bush/desert{ - icon_state = "tree_2"; - pixel_x = -18; - pixel_y = -8 - }, -/obj/structure/prop/ice_colony/dense/planter_box/hydro{ - pixel_x = -17; - pixel_y = -19 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pontoon_beach) "bwz" = ( /obj/structure/closet/emcloset, /turf/open/floor/shiva/purple/east, @@ -1917,12 +1963,6 @@ }, /turf/open/floor/shiva/redfull, /area/varadero/interior/security) -"bys" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/lz2_near) "byw" = ( /obj/structure/surface/table, /obj/item/folder/black, @@ -1932,14 +1972,6 @@ /obj/structure/flora/bush/ausbushes/var3/stalkybush, /turf/open/gm/river/ocean/deep_ocean, /area/varadero/exterior/eastocean) -"byF" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/floor/plating/bare_catwalk, -/area/varadero/exterior/farocean) "byU" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/plating/icefloor/asteroidplating, @@ -1957,14 +1989,6 @@ "bzq" = ( /turf/open/floor/shiva/multi_tiles/west, /area/varadero/interior/medical) -"bzz" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/monsoon) "bAj" = ( /obj/structure/prop/ice_colony/dense/planter_box/plated{ dir = 9; @@ -2045,27 +2069,18 @@ }, /turf/open/floor/shiva/floor3, /area/varadero/interior/security) -"bCM" = ( -/obj/structure/platform_decoration/kutjevo, -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pontoon_beach/lz) "bDs" = ( /obj/item/weapon/gun/flare{ current_mag = null }, /turf/open/floor/asteroidfloor/north, /area/varadero/exterior/lz2_near) +"bDC" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) "bEj" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/disposalpipe/junction, @@ -2080,19 +2095,6 @@ }, /turf/open/floor/shiva/floor3, /area/varadero/interior/comms3) -"bEY" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/prop/rock/brown{ - explo_proof = 1; - unacidable = 1; - name = "sturdy rock(s)"; - desc = "A solidified collection of local minerals. When melted, becomes a substance best known as lava. These look particularly durable." - }, -/turf/open/gm/coast/beachcorner/south_east, -/area/varadero/exterior/pontoon_beach) "bFj" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/storage/box/donkpockets{ @@ -2108,14 +2110,6 @@ /obj/effect/landmark/crap_item, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/digsite) -"bFD" = ( -/obj/structure/bed/chair{ - icon_state = "chair_alt"; - pixel_x = 3; - pixel_y = 17 - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "bFV" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -2156,18 +2150,12 @@ "bIt" = ( /turf/closed/wall, /area/varadero/interior/technical_storage) -"bJv" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/machinery/light{ - dir = 4 +"bIR" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 5 }, -/obj/structure/machinery/power/apc/power/north, -/turf/open/floor/asteroidfloor/north, -/area/varadero/interior/comms1) +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) "bJH" = ( /obj/item/tool/warning_cone, /obj/effect/decal/warning_stripes{ @@ -2178,37 +2166,18 @@ "bJI" = ( /turf/closed/wall/rock/brown, /area/varadero/exterior/lz1_near) -"bJV" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pontoon_beach) -"bLl" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" - }, -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 +"bKZ" = ( +/obj/structure/surface/table, +/obj/effect/spawner/random/toolbox, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) +"bLn" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pontoon_beach) +/obj/structure/barricade/wooden, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "bLp" = ( /obj/structure/bed/chair/comfy/orange{ dir = 8 @@ -2280,6 +2249,14 @@ /obj/item/clothing/suit/storage/bomber, /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/bunks) +"bNx" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/obj/structure/prop/invuln/minecart_tracks{ + dir = 4 + }, +/obj/structure/platform_decoration/metal/kutjevo, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/comms1) "bNC" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -2293,6 +2270,20 @@ /obj/item/prop/almayer/comp_open, /turf/open/floor/asteroidfloor/north, /area/varadero/exterior/lz1_near) +"bOt" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/largecrate/random, +/turf/open/floor/asteroidfloor/north, +/area/varadero/interior/comms1) +"bOu" = ( +/obj/effect/sentry_landmark/lz_1/bottom_left, +/turf/open/floor/asteroidfloor/north, +/area/varadero/exterior/lz1_near) "bOO" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk, @@ -2301,19 +2292,6 @@ }, /turf/open/floor/shiva/floor3, /area/varadero/interior/hall_N) -"bPe" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/flora/bush/ausbushes/var3/stalkybush, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/interior_protected/caves) -"bPk" = ( -/obj/structure/window/framed/colony/reinforced, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "bPl" = ( /obj/structure/bed/chair{ dir = 1 @@ -2375,6 +2353,19 @@ }, /turf/open/floor/shiva/floor3, /area/varadero/interior/administration) +"bQQ" = ( +/obj/structure/prop/invuln/minecart_tracks{ + dir = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/obj/structure/blocker/invisible_wall/water, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/oob) "bRg" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -2405,17 +2396,6 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/floor/shiva/north, /area/varadero/interior/research) -"bSj" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice1"; - pixel_x = -16; - pixel_y = -8 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/eastbeach) "bSu" = ( /obj/structure/closet/crate/supply, /obj/effect/spawner/random/attachment, @@ -2425,6 +2405,12 @@ /obj/structure/machinery/power/apc/power/north, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/comms2) +"bSG" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/turf/open/gm/coast/south, +/area/varadero/exterior/pontoon_beach) "bSQ" = ( /obj/item/tool/warning_cone, /turf/open/gm/dirt, @@ -2434,14 +2420,6 @@ /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/carpet, /area/varadero/interior/maintenance/north) -"bTg" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/interior/caves/north_research) "bTm" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/item/weapon/gun/rifle/m4ra, @@ -2452,6 +2430,13 @@ /obj/structure/pipes/standard/manifold/hidden/green, /turf/open/floor/carpet, /area/varadero/interior/records) +"bTK" = ( +/obj/structure/machinery/storm_siren{ + dir = 8; + pixel_x = 3 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "bTN" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -2488,17 +2473,6 @@ /obj/structure/flora/bush/ausbushes/var3/fernybush, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/central) -"bVe" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/lz2_near) "bVq" = ( /obj/structure/machinery/light{ dir = 4 @@ -2514,19 +2488,6 @@ "bVI" = ( /turf/open/floor/shiva/green/west, /area/varadero/interior/court) -"bVQ" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 1; - icon_state = "p_stair_full" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/lz1_near) "bVS" = ( /turf/open/gm/dirt/desert_dug, /area/varadero/exterior/lz1_near) @@ -2540,6 +2501,39 @@ /obj/item/prop/magazine/dirty/torn, /turf/open/floor/shiva/floor3, /area/varadero/interior/cargo) +"bWu" = ( +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/turf/open/gm/river/ocean/deep_ocean, +/area/varadero/exterior/comms4) +"bWE" = ( +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz2_near) +"bYn" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/structure/prop/rock/brown{ + explo_proof = 1; + unacidable = 1; + name = "sturdy rock(s)"; + desc = "A solidified collection of local minerals. When melted, becomes a substance best known as lava. These look particularly durable." + }, +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -15; + pixel_y = 16; + explo_proof = 1; + unacidable = 1 + }, +/turf/open/gm/coast/beachcorner/south_west, +/area/varadero/exterior/pontoon_beach) "bYO" = ( /obj/item/tool/shovel/spade, /turf/open/gm/dirt, @@ -2583,20 +2577,6 @@ }, /turf/open/gm/dirt, /area/varadero/exterior/lz1_near) -"caD" = ( -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pontoon_beach) "cba" = ( /obj/structure/window/framed/colony/reinforced, /turf/open/floor/plating/icefloor/asteroidplating, @@ -2659,18 +2639,6 @@ }, /turf/closed/wall/r_wall/unmeltable, /area/varadero/interior/maintenance/north) -"ccU" = ( -/obj/structure/machinery/light/small{ - dir = 8 - }, -/obj/structure/bed/chair/office/dark{ - dir = 4 - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) -"cdb" = ( -/turf/closed/wall, -/area/varadero/interior/maintenance/security) "cdc" = ( /obj/effect/landmark/xeno_spawn, /turf/open/floor/strata/grey_multi_tiles, @@ -2707,6 +2675,18 @@ /obj/structure/bed/chair, /turf/open/floor/shiva/floor3, /area/varadero/interior/laundry) +"ceH" = ( +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/pontoon_beach) "ceJ" = ( /obj/item/storage/fancy/candle_box, /turf/open/floor/carpet, @@ -2725,6 +2705,14 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance/north) +"cfQ" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/structure/blocker/invisible_wall/water, +/obj/item/lightstick/variant/planted, +/turf/open/gm/river/ocean/deep_ocean, +/area/varadero/exterior/farocean) "cgb" = ( /obj/structure/machinery/cm_vending/sorted/tech/tool_storage, /obj/structure/machinery/light{ @@ -2749,6 +2737,10 @@ }, /turf/open/floor/asteroidfloor/north, /area/varadero/exterior/lz1_near) +"cgX" = ( +/obj/effect/sentry_landmark/lz_1/top_left, +/turf/open/floor/asteroidfloor/north, +/area/varadero/exterior/lz1_near) "che" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -2856,6 +2848,12 @@ /obj/effect/landmark/monkey_spawn, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves) +"clc" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) "clv" = ( /obj/structure/pipes/standard/manifold/hidden/green, /obj/structure/pipes/standard/simple/hidden/green{ @@ -2871,19 +2869,6 @@ /obj/effect/landmark/yautja_teleport, /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/bunks) -"clG" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/interior_protected/caves) "clX" = ( /turf/closed/wall/r_wall, /area/varadero/interior/maintenance) @@ -2918,6 +2903,21 @@ }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves) +"cmA" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz1_near) +"cmL" = ( +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) "cmU" = ( /obj/item/reagent_container/food/snacks/fishfingers{ pixel_y = 7 @@ -2925,17 +2925,6 @@ /obj/structure/surface/table, /turf/open/floor/asteroidfloor/north, /area/varadero/exterior/lz1_near) -"cne" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/asteroidfloor/north, -/area/varadero/interior/comms1) "cnv" = ( /obj/structure/closet/crate/ammo/alt, /obj/item/ammo_magazine/pistol/vp78, @@ -2967,6 +2956,12 @@ /obj/structure/sign/safety/bulkhead_door, /turf/closed/wall/r_wall, /area/varadero/interior/maintenance/north) +"coP" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/turf/open/floor/asteroidfloor/north, +/area/varadero/interior/comms1) "coQ" = ( /obj/effect/decal/cleanable/blood, /turf/open/gm/river/shallow_ocean_shallow_ocean, @@ -2981,12 +2976,24 @@ /obj/structure/morgue, /turf/open/floor/shiva/floor3, /area/varadero/interior/morgue) -"cpC" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 9 +"cpB" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/prop/invuln/minecart_tracks{ + dir = 8 + }, +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 }, +/obj/structure/closet/crate/miningcar{ + layer = 3.1; + name = "\improper materials storage bin"; + pixel_y = 8 + }, +/obj/structure/blocker/invisible_wall/water, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/oob) "cpF" = ( /obj/structure/barricade/handrail{ desc = "Your platforms look pretty heavy king, let me support them for you."; @@ -2996,20 +3003,16 @@ }, /turf/open/gm/river/shallow_ocean_shallow_ocean, /area/varadero/exterior/pontoon_beach) -"cql" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/effect/landmark/lv624/fog_blocker{ - time_to_dispel = 25000 +"cqu" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + icon_state = "p_stair_full" }, -/obj/item/shard{ - icon_state = "medium" +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 }, /turf/open/gm/dirt, -/area/varadero/exterior/monsoon) +/area/varadero/exterior/lz1_near) "cqB" = ( /obj/structure/machinery/light{ dir = 8 @@ -3031,15 +3034,26 @@ /obj/item/stack/sheet/metal, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/vessel) -"crC" = ( -/obj/structure/machinery/power/apc/no_power/north, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "csb" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/bed/sofa/vert/grey/bot, /turf/open/floor/shiva/floor3, /area/varadero/interior/medical) +"csl" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/pontoon_beach/lz) "csr" = ( /obj/structure/prop/ice_colony/flamingo, /turf/open/floor/plating/icefloor/asteroidplating, @@ -3061,24 +3075,6 @@ "cty" = ( /turf/closed/wall/rock/brown, /area/varadero/interior_protected/caves/central) -"ctE" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" - }, -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pontoon_beach) "cuc" = ( /obj/structure/barricade/handrail/wire{ dir = 8; @@ -3128,6 +3124,19 @@ }, /turf/open/floor/shiva/floor3, /area/varadero/interior/security) +"cwb" = ( +/obj/structure/prop/invuln/minecart_tracks{ + dir = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/structure/blocker/invisible_wall/water, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/oob) "cwe" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/surface/table/reinforced/prison, @@ -3163,6 +3172,12 @@ /obj/item/clothing/suit/armor/riot, /turf/open/floor/strata/grey_multi_tiles, /area/varadero/interior_protected/vessel) +"cwt" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/exterior/lz2_near) "cwE" = ( /turf/closed/wall/rock/brown, /area/varadero/interior/maintenance/north) @@ -3171,19 +3186,30 @@ /obj/item/storage/bible/booze, /turf/open/floor/carpet, /area/varadero/interior/chapel) +"cxn" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/structure/prop/rock/brown{ + explo_proof = 1; + unacidable = 1; + name = "sturdy rock(s)"; + desc = "A solidified collection of local minerals. When melted, becomes a substance best known as lava. These look particularly durable." + }, +/turf/open/gm/coast/south, +/area/varadero/exterior/pontoon_beach) "cxT" = ( /obj/effect/decal/cleanable/blood/drip, /obj/effect/decal/cleanable/blood, /turf/open/auto_turf/sand_white/layer1, /area/varadero/exterior/lz2_near) -"cym" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 +"cyP" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/machinery/light/small{ + dir = 8 }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/interior/caves/north_research) +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "cyT" = ( /obj/structure/machinery/light/small, /obj/structure/prop/invuln/lattice_prop{ @@ -3254,17 +3280,6 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/shiva/wred/north, /area/varadero/interior/medical) -"cEm" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail/wire{ - layer = 3.1 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pontoon_beach/lz) "cEu" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -3289,6 +3304,20 @@ /obj/structure/xenoautopsy/tank/larva, /turf/open/shuttle/red, /area/varadero/interior_protected/vessel) +"cFv" = ( +/obj/structure/plasticflaps/mining, +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/structure/prop/invuln/minecart_tracks{ + dir = 1 + }, +/obj/structure/blocker/invisible_wall/water, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/oob) "cFw" = ( /turf/open/gm/dirt, /area/varadero/exterior/eastbeach) @@ -3432,14 +3461,12 @@ /obj/structure/flora/bush/ausbushes/var3/stalkybush, /turf/open/gm/river/ocean/deep_ocean, /area/varadero/exterior/farocean) -"cKB" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 +"cKb" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/farocean) +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/security/south) "cKC" = ( /obj/item/explosive/grenade/incendiary, /turf/open/floor/shiva/floor3, @@ -3466,15 +3493,6 @@ "cLP" = ( /turf/open/space, /area/space) -"cLV" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/blocker/invisible_wall/water, -/turf/open/gm/river/ocean/deep_ocean, -/area/varadero/exterior/farocean) "cLX" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating/icefloor/asteroidplating, @@ -3499,6 +3517,19 @@ /obj/item/device/binoculars, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance/north) +"cNc" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -1; + pixel_y = 9; + explo_proof = 1; + unacidable = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) "cNh" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/flashlight, @@ -3532,6 +3563,10 @@ }, /turf/open/floor/plating, /area/varadero/interior/administration) +"cNC" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/pontoon_beach) "cNF" = ( /obj/structure/machinery/light{ dir = 4 @@ -3544,6 +3579,10 @@ /obj/item/map/current_map, /turf/open/floor/corsat/squareswood/north, /area/varadero/interior_protected/vessel) +"cNK" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "cNT" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -3579,6 +3618,15 @@ }, /turf/open/floor/shiva/north, /area/varadero/interior/research) +"cQm" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/item/stack/tile/plasteel{ + layer = 2.89; + pixel_x = 17; + pixel_y = 16 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "cQr" = ( /obj/item/tool/crowbar/red{ pixel_x = 9; @@ -3619,6 +3667,19 @@ "cSq" = ( /turf/open/floor/wood, /area/varadero/interior/chapel) +"cSB" = ( +/obj/effect/landmark/corpsespawner/miner, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/security/north) +"cSL" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice1"; + pixel_x = -16; + pixel_y = -8 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) "cTb" = ( /obj/item/device/flashlight/flare, /turf/open/shuttle/red, @@ -3647,6 +3708,10 @@ /obj/effect/spawner/random/toolbox, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance/north) +"cUD" = ( +/obj/structure/platform_decoration/metal/kutjevo, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz1_near) "cUE" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -3657,24 +3722,6 @@ }, /turf/open/floor/corsat/squareswood/north, /area/varadero/interior_protected/vessel) -"cUF" = ( -/obj/structure/prop/invuln/minecart_tracks{ - dir = 1 - }, -/obj/structure/plasticflaps/mining, -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/blocker/invisible_wall/water, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/oob) "cUN" = ( /obj/structure/prop/rock/brown{ explo_proof = 1; @@ -3718,35 +3765,6 @@ /obj/structure/prop/invuln/pipe_water, /turf/open/floor/shiva/snow_mat/west, /area/varadero/interior/maintenance) -"cWu" = ( -/obj/structure/prop/invuln/minecart_tracks{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/blocker/invisible_wall/water, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/oob) -"cXa" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/stairs/perspective{ - color = "#6b675e"; - icon_state = "p_stair_full" - }, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior_protected/vessel) "cXQ" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -3779,10 +3797,6 @@ /obj/effect/decal/warning_stripes, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/exterior/monsoon) -"cYB" = ( -/obj/structure/window_frame/colony/reinforced, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "cYC" = ( /obj/effect/landmark/structure_spawner/xvx_hive/xeno_core, /turf/open/gm/dirt, @@ -3795,6 +3809,21 @@ /obj/structure/machinery/landinglight/ds2, /turf/open/floor/asteroidfloor/north, /area/varadero/exterior/lz1_near) +"cZC" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/turf/open/gm/river/ocean/deep_ocean, +/area/varadero/exterior/comms4) "cZN" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva/yellowfull/west, @@ -3835,6 +3864,13 @@ /obj/item/trash/liquidfood, /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/hall_NW) +"dcC" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/effect/overlay/palmtree_r, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz1_near) "dcM" = ( /obj/item/ammo_magazine/revolver/cmb, /turf/open/auto_turf/sand_white/layer1, @@ -3899,10 +3935,23 @@ }, /turf/open/gm/dirt, /area/varadero/exterior/eastbeach) +"deV" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/monsoon) "deX" = ( /obj/item/trash/boonie, /turf/open/floor/shiva/yellow/west, /area/varadero/interior/hall_NW) +"dfc" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) "dfs" = ( /obj/item/storage/belt/utility, /obj/structure/surface/rack, @@ -3958,10 +4007,10 @@ /obj/item/weapon/sword/katana, /turf/open/floor/carpet, /area/varadero/interior/chapel) -"dhV" = ( -/obj/structure/platform_decoration/kutjevo, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/comms4) +"dii" = ( +/obj/effect/sentry_landmark/lz_1/bottom_right, +/turf/open/floor/asteroidfloor/north, +/area/varadero/exterior/lz1_near) "dir" = ( /obj/effect/landmark/lv624/fog_blocker{ time_to_dispel = 25000 @@ -4055,16 +4104,20 @@ "dkl" = ( /turf/open/floor/shiva/snow_mat, /area/varadero/interior/maintenance) +"dko" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/structure/machinery/storm_siren{ + dir = 4; + pixel_x = -3 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) "dkr" = ( /obj/structure/window/framed/colony/reinforced, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/research) -"dkC" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/gm/river/ocean/deep_ocean, -/area/varadero/exterior/comms4) "dkS" = ( /obj/effect/landmark/lv624/fog_blocker{ time_to_dispel = 25000 @@ -4166,6 +4219,11 @@ /obj/item/clothing/head/helmet, /turf/open/floor/wood, /area/varadero/interior/security) +"doF" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) "doH" = ( /obj/effect/decal/cleanable/blood, /turf/open/gm/dirt, @@ -4256,13 +4314,6 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/comms2) -"dsC" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/comms4) "dtj" = ( /obj/structure/sign/poster/propaganda, /turf/closed/wall, @@ -4347,24 +4398,17 @@ /obj/structure/prop/rock/brown, /turf/open/gm/dirt, /area/varadero/interior/caves/north_research) +"dxV" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, +/obj/structure/barricade/wooden, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) "dyl" = ( /obj/effect/spawner/random/tool, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/exterior/lz2_near) -"dyo" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" - }, -/turf/open/gm/coast/beachcorner2/south_east, -/area/varadero/exterior/pontoon_beach) "dzH" = ( /obj/structure/largecrate/random, /turf/open/auto_turf/sand_white/layer1, @@ -4390,6 +4434,13 @@ /obj/structure/machinery/body_scanconsole, /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/medical) +"dCb" = ( +/obj/structure/prop/structure_lattice{ + dir = 1; + health = 300 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior_protected/caves/swcaves) "dCz" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/camera{ @@ -4447,26 +4498,6 @@ /obj/structure/prop/fishing/line/long, /turf/open/gm/coast/beachcorner2/south_west, /area/varadero/exterior/pontoon_beach) -"dFC" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/item/shard{ - icon_state = "large"; - pixel_x = -5; - pixel_y = -6 - }, -/obj/item/lightstick/red/spoke/planted{ - pixel_x = -1; - pixel_y = 9; - explo_proof = 1; - unacidable = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/gm/dirt, -/area/varadero/exterior/monsoon) "dGh" = ( /obj/effect/landmark/objective_landmark/medium, /obj/structure/closet/crate/hydroponics/prespawned, @@ -4494,6 +4525,10 @@ /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/strata/grey_multi_tiles, /area/varadero/interior_protected/vessel) +"dHG" = ( +/obj/structure/closet/secure_closet/engineering_electrical, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "dHY" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal8"; @@ -4543,14 +4578,6 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior_protected/maintenance/south) -"dJI" = ( -/obj/structure/surface/rack, -/obj/item/fuel_cell, -/obj/item/fuel_cell, -/obj/item/fuel_cell, -/obj/item/fuel_cell, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "dJX" = ( /obj/effect/decal/cleanable/blood/drip, /obj/effect/decal/cleanable/blood, @@ -4571,6 +4598,34 @@ /obj/item/reagent_container/food/drinks/cans/souto/grape, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/exterior/lz1_near) +"dKW" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/pontoon_beach) +"dLn" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) +"dLA" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) "dLN" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -4582,6 +4637,11 @@ }, /turf/open/floor/shiva/north, /area/varadero/interior/medical) +"dLO" = ( +/obj/structure/surface/rack, +/obj/effect/spawner/random/toolbox, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) "dLP" = ( /obj/item/stool{ icon_state = "stool_alt" @@ -4597,6 +4657,13 @@ /obj/item/tool/surgery/bonegel/predatorbonegel, /turf/open/floor/shiva/purplefull/west, /area/varadero/interior/research) +"dME" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) "dNh" = ( /obj/structure/stairs/perspective{ color = "#b29082"; @@ -4671,6 +4738,17 @@ "dOS" = ( /turf/open/gm/dirt/desert2, /area/varadero/exterior/pontoon_beach) +"dPB" = ( +/obj/structure/stairs/perspective{ + color = "#6b675e"; + dir = 1; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/turf/open/floor/strata/grey_multi_tiles, +/area/varadero/interior_protected/vessel) "dPR" = ( /obj/item/reagent_container/glass/bucket, /turf/open/gm/dirt, @@ -4753,13 +4831,6 @@ "dTG" = ( /turf/open/gm/coast/beachcorner/south_west, /area/varadero/exterior/eastocean) -"dTS" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/interior_protected/caves) "dUh" = ( /obj/structure/morgue, /turf/open/floor/shiva/red/east, @@ -4768,13 +4839,6 @@ /obj/structure/machinery/bioprinter, /turf/open/floor/shiva/redfull, /area/varadero/interior/medical) -"dUL" = ( -/obj/structure/machinery/light/small{ - dir = 4 - }, -/obj/structure/barricade/wooden, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "dUS" = ( /obj/effect/landmark/xeno_spawn, /turf/open/shuttle/red, @@ -4798,16 +4862,6 @@ /obj/structure/pipes/vents/pump, /turf/open/floor/shiva/multi_tiles/west, /area/varadero/interior/administration) -"dWH" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail/wire{ - layer = 3.1 - }, -/turf/open/gm/river/ocean/deep_ocean, -/area/varadero/exterior/comms4) "dWN" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/machinery/faxmachine{ @@ -4818,6 +4872,12 @@ }, /turf/open/floor/wood, /area/varadero/interior/administration) +"dWP" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz1_near) "dWV" = ( /obj/structure/barricade/handrail/wire{ layer = 3.1 @@ -4832,6 +4892,16 @@ "dXg" = ( /turf/closed/wall/rock/brown, /area/varadero/exterior/pontoon_beach) +"dXi" = ( +/obj/structure/stairs/perspective{ + color = "#6b675e"; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/vessel) "dXr" = ( /obj/structure/barricade/wooden{ dir = 1 @@ -4871,28 +4941,32 @@ }, /turf/open/floor/shiva/redfull/west, /area/varadero/interior/hall_SE) -"dYW" = ( -/obj/item/reagent_container/glass/bucket/mopbucket{ - pixel_x = 11 +"dYM" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/exterior/eastbeach) +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/gm/river/ocean/deep_ocean, +/area/varadero/exterior/comms4) "dYX" = ( /obj/structure/machinery/light, /turf/open/floor/carpet, /area/varadero/interior/library) +"dZn" = ( +/obj/structure/prop/rock/brown, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/security/north) "dZT" = ( /obj/structure/bed/chair{ dir = 1 }, /turf/open/floor/shiva/yellow, /area/varadero/interior/cargo) -"eat" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/lz1_near) "eaC" = ( /obj/item/packageWrap, /turf/open/gm/dirt, @@ -4944,29 +5018,6 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/exterior/lz2_near) -"ebJ" = ( -/obj/structure/prop/invuln/minecart_tracks{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/blocker/invisible_wall/water, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/oob) -"ebN" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/turf/open/gm/river/ocean/deep_ocean, -/area/varadero/exterior/pontoon_beach) "ecb" = ( /obj/structure/machinery/cm_vending/sorted/tech/comp_storage, /obj/structure/machinery/light{ @@ -4982,19 +5033,6 @@ "edu" = ( /turf/open/floor/shiva/blue/north, /area/varadero/interior/maintenance) -"edD" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/interior/caves/north_research) "eea" = ( /obj/vehicle/train/cargo/engine{ dir = 2 @@ -5006,6 +5044,30 @@ /obj/structure/disposalpipe/trunk, /turf/open/floor/shiva/yellow/northeast, /area/varadero/interior/technical_storage) +"eer" = ( +/obj/structure/bed/chair{ + dir = 4; + icon_state = "chair_alt"; + pixel_y = 9 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) +"eeP" = ( +/obj/structure/prop/ice_colony/dense/planter_box/hydro{ + density = 0; + pixel_x = 11; + pixel_y = 9 + }, +/obj/structure/flora/bush/desert{ + icon_state = "tree_2"; + pixel_x = 10; + pixel_y = 20 + }, +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/interior/caves/north_research) "efw" = ( /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance/research) @@ -5018,6 +5080,15 @@ }, /turf/open/floor/asteroidfloor/north, /area/varadero/exterior/lz1_near) +"egb" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz1_near) "egj" = ( /obj/effect/landmark/hunter_secondary, /turf/open/floor/plating/icefloor, @@ -5050,22 +5121,19 @@ /obj/item/reagent_container/glass/pressurized_canister, /turf/open/floor/shiva/yellow/west, /area/varadero/interior/technical_storage) +"egU" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/pontoon_beach/lz) "egV" = ( /obj/item/ammo_magazine/handful/shotgun/buckshot, /turf/open/floor/carpet, /area/varadero/interior/maintenance/north) -"eha" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pontoon_beach) "ehD" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/green{ @@ -5084,27 +5152,6 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/cargo) -"ehM" = ( -/obj/structure/stairs/perspective{ - color = "#6b675e"; - dir = 1; - icon_state = "p_stair_full" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior_protected/vessel) -"ehT" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/coast/east, -/area/varadero/exterior/comms4) "ehY" = ( /obj/item/clothing/under/shorts/red{ pixel_y = 9; @@ -5164,18 +5211,13 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/shiva/yellow/north, /area/varadero/interior/comms3) -"ekE" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 +"ekq" = ( +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 }, -/turf/open/gm/dirt, -/area/varadero/exterior/monsoon) +/obj/structure/blocker/invisible_wall/water, +/turf/open/gm/river/ocean/deep_ocean, +/area/varadero/exterior/farocean) "ekO" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, /turf/open/gm/river/ocean/deep_ocean, @@ -5183,11 +5225,6 @@ "elI" = ( /turf/open/gm/coast/beachcorner/north_west, /area/varadero/exterior/eastocean) -"elO" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/barricade/wooden, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "elP" = ( /turf/open/gm/dirt/desert2, /area/varadero/exterior/monsoon) @@ -5216,6 +5253,10 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva/red/north, /area/varadero/interior/security) +"enS" = ( +/obj/effect/sentry_landmark/lz_2/top_left, +/turf/open/gm/dirt/desert0, +/area/varadero/exterior/lz2_near) "enU" = ( /turf/open/floor/shiva/multi_tiles/west, /area/varadero/interior/cargo) @@ -5224,19 +5265,6 @@ /obj/structure/flora/bush/ausbushes/var3/stalkybush, /turf/open/gm/coast/beachcorner2/south_west, /area/varadero/exterior/farocean) -"eoj" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/coast/north, -/area/varadero/exterior/pontoon_beach) -"eoq" = ( -/obj/item/shard{ - icon_state = "medium" - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "eov" = ( /turf/open/gm/dirt, /area/varadero/interior_protected/caves/central) @@ -5294,14 +5322,6 @@ }, /turf/open/floor/shiva/purplefull/west, /area/varadero/interior/research) -"eqg" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/turf/closed/wall/rock/brown, -/area/varadero/exterior/pontoon_beach) "eqn" = ( /obj/structure/machinery/light{ dir = 4 @@ -5402,6 +5422,12 @@ }, /turf/open/floor/wood, /area/varadero/interior/security) +"etJ" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/eastbeach) "etV" = ( /obj/item/stack/sheet/metal, /turf/open/gm/dirt, @@ -5421,14 +5447,6 @@ /obj/structure/machinery/light, /turf/open/floor/shiva/green/north, /area/varadero/interior/hall_N) -"euS" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/coast/beachcorner/south_west, -/area/varadero/exterior/pontoon_beach/lz) "evV" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -5547,19 +5565,6 @@ }, /turf/open/floor/shiva/north, /area/varadero/interior/research) -"ezU" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/item/lightstick/red/spoke/planted{ - pixel_x = -1; - pixel_y = 9; - explo_proof = 1; - unacidable = 1 - }, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/exterior/eastbeach) "ezW" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -5598,23 +5603,6 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance) -"eBm" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" - }, -/obj/structure/machinery/storm_siren{ - pixel_y = 5 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pontoon_beach) "eBs" = ( /turf/closed/wall/r_wall/elevator{ dir = 9 @@ -5655,21 +5643,15 @@ /obj/structure/flora/bush/ausbushes/var3/stalkybush, /turf/open/gm/coast/south, /area/varadero/interior_protected/caves/central) -"eCB" = ( -/obj/structure/blocker/invisible_wall/water, -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 +"eCU" = ( +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 }, -/obj/item/lightstick/red/spoke/planted{ - pixel_x = 3; - pixel_y = 15; - explo_proof = 1; - unacidable = 1 +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/farocean) +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) "eDF" = ( /obj/structure/bed/stool{ icon_state = "stool_alt" @@ -5685,17 +5667,14 @@ }, /turf/open/floor/interior/plastic, /area/varadero/interior_protected/caves/digsite) -"eDY" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pontoon_beach) "eEd" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/closed/wall/r_wall, /area/varadero/interior_protected/maintenance/south) +"eEF" = ( +/obj/effect/decal/cleanable/blood/xeno, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "eEY" = ( /obj/structure/prop/ice_colony/dense/planter_box/plated{ dir = 4 @@ -5715,12 +5694,6 @@ "eFJ" = ( /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/comms3) -"eFW" = ( -/obj/structure/machinery/storm_siren{ - pixel_y = 5 - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "eGd" = ( /obj/structure/machinery/power/reactor/colony, /obj/structure/machinery/light{ @@ -5774,10 +5747,6 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/gm/grass/grass1/weedable, /area/varadero/interior_protected/caves/central) -"eIr" = ( -/obj/structure/platform_decoration/kutjevo, -/turf/open/floor/strata/grey_multi_tiles, -/area/varadero/interior_protected/vessel) "eIT" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/drinks/bottle/sake{ @@ -5794,6 +5763,12 @@ "eIV" = ( /turf/open/floor/shiva/wred/east, /area/varadero/interior/medical) +"eJD" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "eJI" = ( /obj/structure/barricade/handrail/wire{ layer = 3.1 @@ -5809,17 +5784,6 @@ }, /turf/open/floor/shiva/red, /area/varadero/interior/medical) -"eJN" = ( -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice12"; - pixel_x = 16; - pixel_y = -8 - }, -/obj/structure/barricade/handrail/wire{ - dir = 4 - }, -/turf/open/floor/asteroidfloor/north, -/area/varadero/exterior/eastbeach) "eJS" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -5833,14 +5797,6 @@ }, /turf/open/floor/shiva/floor3, /area/varadero/interior/security) -"eKF" = ( -/obj/structure/bed/chair{ - dir = 4; - icon_state = "chair_alt"; - pixel_y = 9 - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "eKL" = ( /obj/effect/overlay/palmtree_r{ icon_state = "palm2" @@ -5914,13 +5870,6 @@ /obj/structure/surface/table/reinforced/prison, /turf/open/gm/dirt, /area/varadero/exterior/eastbeach) -"eOa" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/coast/west, -/area/varadero/exterior/lz1_near) "eOh" = ( /obj/structure/machinery/optable, /obj/effect/landmark/corpsespawner/colonist/burst, @@ -5962,17 +5911,6 @@ }, /turf/open/floor/shiva/green, /area/varadero/interior/hall_N) -"eQa" = ( -/obj/structure/pipes/standard/manifold/hidden/green{ - dir = 1 - }, -/obj/item/stack/tile/plasteel{ - layer = 2.89; - pixel_x = 17; - pixel_y = 16 - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "eQm" = ( /obj/structure/window/framed/wood, /turf/open/floor/wood, @@ -6079,6 +6017,15 @@ "eUh" = ( /turf/open/floor/shiva/bluefull/west, /area/varadero/interior/maintenance) +"eUk" = ( +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/turf/open/gm/river/ocean/deep_ocean, +/area/varadero/exterior/comms4) "eUv" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -6098,6 +6045,9 @@ /obj/structure/largecrate/random, /turf/open/floor/shiva/yellow/north, /area/varadero/interior/cargo) +"eVy" = ( +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "eVH" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/blood/oil/streak, @@ -6122,52 +6072,15 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/exterior/lz1_near) -"eWp" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 +"eWa" = ( +/obj/structure/machinery/storm_siren{ + pixel_y = 5 }, -/obj/structure/largecrate/random, -/turf/open/floor/asteroidfloor/north, -/area/varadero/interior/comms1) +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "eWR" = ( /turf/open/floor/shiva/purplecorners/west, /area/varadero/interior/research) -"eWZ" = ( -/obj/structure/prop/invuln/minecart_tracks{ - dir = 8 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/exterior/lz1_near) -"eXg" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pontoon_beach) "eXr" = ( /obj/structure/surface/rack, /obj/item/storage/briefcase, @@ -6249,14 +6162,22 @@ }, /turf/open/floor/shiva/yellowfull/west, /area/varadero/interior/comms3) +"faT" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/pontoon_beach) "faX" = ( /obj/structure/closet/secure_closet/engineering_electrical, /turf/open/floor/shiva/yellow/north, /area/varadero/interior/electrical) -"fbr" = ( -/obj/effect/landmark/corpsespawner/miner, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/maintenance/security) "fbw" = ( /obj/structure/prop/ice_colony/dense/planter_box/hydro{ desc = "A high-power hydroelectric generator."; @@ -6356,6 +6277,11 @@ }, /turf/open/floor/shiva/north, /area/varadero/interior/maintenance/research) +"fdQ" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/decal/cleanable/blood/xeno, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "fef" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/snacks/eat_bar{ @@ -6368,6 +6294,15 @@ }, /turf/open/floor/shiva/purplefull/west, /area/varadero/interior/research) +"fek" = ( +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/interior/caves/north_research) "feH" = ( /obj/effect/landmark/lv624/fog_blocker{ time_to_dispel = 25000 @@ -6378,13 +6313,6 @@ /obj/structure/barricade/wooden, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/maintenance/south) -"feR" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "feV" = ( /obj/structure/surface/table, /obj/effect/spawner/random/attachment, @@ -6412,24 +6340,31 @@ /obj/structure/pipes/standard/manifold/hidden/green, /turf/open/floor/carpet, /area/varadero/interior/hall_SE) -"ffY" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 +"ffF" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 }, /obj/structure/barricade/handrail/wire{ layer = 3.1 }, -/turf/open/floor/shiva/multi_tiles, -/area/varadero/interior/disposals) -"fga" = ( -/obj/structure/machinery/light/small{ - dir = 1 +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 }, -/obj/structure/surface/rack, -/obj/item/tool/wrench, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/obj/item/lightstick/red/spoke/planted{ + pixel_x = 2; + pixel_y = 15; + explo_proof = 1; + unacidable = 1; + layer = 4.1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/comms4) +"fgj" = ( +/obj/structure/blocker/invisible_wall/water, +/obj/structure/flora/bush/ausbushes/var3/stalkybush, +/obj/structure/platform_decoration/metal/kutjevo, +/turf/open/gm/river/ocean/deep_ocean, +/area/varadero/exterior/farocean) "fgS" = ( /obj/structure/closet/crate/secure, /obj/effect/landmark/objective_landmark/close, @@ -6505,6 +6440,9 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/shiva/redfull, /area/varadero/interior/medical) +"fiY" = ( +/turf/open/floor/plating, +/area/varadero/interior/maintenance/security/north) "fjg" = ( /turf/open/gm/grass/grass1/weedable, /area/varadero/interior_protected/caves/swcaves) @@ -6582,6 +6520,21 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance/north) +"fkM" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -1; + pixel_y = 9; + explo_proof = 1; + unacidable = 1 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/monsoon) "fkR" = ( /turf/closed/wall, /area/varadero/interior/court) @@ -6595,6 +6548,10 @@ }, /turf/open/floor/wood, /area/varadero/interior/research) +"fld" = ( +/obj/structure/window/framed/colony/reinforced, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "fmu" = ( /obj/structure/barricade/handrail/wire{ layer = 3.5 @@ -6608,6 +6565,21 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/comms2) +"fmG" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/comms4) "fnj" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/blocker/forcefield/multitile_vehicles, @@ -6624,12 +6596,6 @@ /obj/effect/spawner/random/technology_scanner, /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/hall_SE) -"fnX" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/turf/open/floor/shiva/snow_mat, -/area/varadero/interior/maintenance) "fof" = ( /obj/structure/shuttle/engine/heater{ dir = 8; @@ -6663,12 +6629,6 @@ /obj/structure/machinery/bot/mulebot, /turf/open/floor/shiva/yellow/north, /area/varadero/interior/cargo) -"foQ" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/exterior/pontoon_beach) "foU" = ( /obj/structure/filingcabinet{ density = 0; @@ -6718,6 +6678,21 @@ /obj/item/weapon/gun/rifle/m41a, /turf/open/floor/shiva/multi_tiles/north, /area/varadero/interior/hall_SE) +"fqD" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/sentry_landmark/lz_2/top_right, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) +"fqS" = ( +/obj/structure/platform/metal/almayer/north{ + density = 0; + climb_delay = 0 + }, +/obj/structure/catwalk{ + layer = 3 + }, +/turf/open/gm/river/desert/deep/no_slowdown, +/area/varadero/interior/maintenance/north) "fqY" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -6742,6 +6717,10 @@ }, /turf/open/gm/dirt, /area/varadero/exterior/eastbeach) +"fsU" = ( +/obj/structure/largecrate/random, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) "ftm" = ( /obj/structure/fence, /obj/effect/decal/warning_stripes{ @@ -6810,6 +6789,21 @@ "fwo" = ( /turf/open/auto_turf/sand_white/layer1, /area/varadero/exterior/lz1_near) +"fwt" = ( +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/structure/bed/chair/office/dark{ + dir = 1; + pixel_x = -5; + pixel_y = 6 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) +"fwF" = ( +/obj/structure/machinery/power/apc/no_power/north, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) "fxK" = ( /obj/structure/machinery/floodlight/landing{ desc = "A powerful light stationed near construction zones to provide better visibility."; @@ -6895,6 +6889,27 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva/blue, /area/varadero/interior/administration) +"fAt" = ( +/obj/structure/bed/chair/comfy{ + dir = 8; + pixel_x = 12; + pixel_y = 25 + }, +/obj/structure/bed/chair/comfy{ + pixel_x = -7; + pixel_y = 18 + }, +/obj/structure/bed/chair/comfy{ + dir = 8; + pixel_x = 7; + pixel_y = 12 + }, +/obj/structure/bed/chair/comfy{ + dir = 4; + pixel_x = 7 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) "fAO" = ( /turf/open/floor/plating, /area/varadero/interior/technical_storage) @@ -6945,13 +6960,6 @@ /obj/structure/machinery/door/airlock/multi_tile/elevator/access/arrivals, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/records) -"fEA" = ( -/obj/structure/girder/displaced, -/obj/structure/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "fEI" = ( /obj/structure/bedsheetbin{ icon_state = "linenbin-empty" @@ -6967,6 +6975,14 @@ }, /turf/open/floor/shiva/red/east, /area/varadero/interior/security) +"fEZ" = ( +/turf/closed/wall/r_wall, +/area/varadero/interior/maintenance/security/north) +"fFb" = ( +/obj/item/tool/pickaxe, +/obj/structure/platform_decoration/metal/kutjevo/north, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves/digsite) "fFm" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/drinks/drinkingglass{ @@ -6997,14 +7013,6 @@ /obj/structure/machinery/power/port_gen/pacman, /turf/open/floor/shiva/yellow/north, /area/varadero/interior/electrical) -"fFH" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/lz1_near) "fFI" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -7026,6 +7034,23 @@ /obj/effect/landmark/corpsespawner/colonist/burst, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior_protected/caves) +"fGp" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/obj/item/reagent_container/food/snacks/carpmeat{ + desc = "This leathery protofish was named the gullible toothfish for the combination of its near identical dentata to that of Homo sapiens sapiens and the fact that if released after being caught, it is not uncommon to catch the same one; it not having learned its lesson. Its meat is said to taste like bitter clove."; + icon = 'icons/obj/items/fishing_atoms.dmi'; + icon_state = "gullible_toothfish_gutted"; + name = "gullible toothfish"; + pixel_x = 1; + pixel_y = -2 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/comms4) "fGM" = ( /obj/structure/bed/chair/wood/normal{ dir = 8 @@ -7042,12 +7067,6 @@ /obj/effect/landmark/queen_spawn, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves) -"fHf" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pontoon_beach) "fHg" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/auto_turf/sand_white/layer1, @@ -7073,6 +7092,18 @@ }, /turf/open/floor/shiva/snow_mat, /area/varadero/interior/security) +"fHA" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) "fIk" = ( /obj/item/prop/colony/used_flare, /turf/open/floor/asteroidfloor/north, @@ -7150,6 +7181,18 @@ /obj/effect/landmark/crap_item, /turf/open/floor/shiva/yellow/west, /area/varadero/interior/comms3) +"fMj" = ( +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz1_near) "fMq" = ( /obj/item/device/cassette_tape/heavymetal{ pixel_x = -3; @@ -7171,24 +7214,6 @@ /obj/structure/surface/table/reinforced/prison, /turf/open/floor/shiva/yellow/north, /area/varadero/interior/hall_SE) -"fNm" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/item/lightstick/red/spoke/planted{ - pixel_x = -1; - pixel_y = 9; - explo_proof = 1; - unacidable = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/exterior/monsoon) "fND" = ( /obj/structure/prop/invuln/lattice_prop{ icon_state = "lattice12"; @@ -7197,15 +7222,12 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance/research) -"fOG" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 +"fOm" = ( +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 }, -/obj/structure/machinery/constructable_frame, -/turf/open/floor/asteroidfloor/north, -/area/varadero/interior/comms1) +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/interior/caves/north_research) "fOO" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited, /turf/closed/wall/r_wall/unmeltable, @@ -7327,6 +7349,10 @@ /obj/effect/landmark/objective_landmark/far, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/caves/east) +"fUD" = ( +/obj/effect/sentry_landmark/lz_2/top_left, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) "fUF" = ( /obj/structure/machinery/landinglight/ds2/delaythree{ dir = 8 @@ -7346,6 +7372,17 @@ }, /turf/open/floor/shiva/yellow/northwest, /area/varadero/interior/disposals) +"fVo" = ( +/obj/structure/stairs/perspective{ + color = "#6b675e"; + dir = 1; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/turf/open/floor/strata/grey_multi_tiles, +/area/varadero/interior_protected/vessel) "fVt" = ( /obj/structure/machinery/door_control{ id = "colony_sec_armory"; @@ -7387,30 +7424,6 @@ /obj/structure/bed/chair, /turf/open/floor/shiva/purplefull/west, /area/varadero/interior/research) -"fWE" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail/wire{ - layer = 3.1 - }, -/turf/open/gm/coast/beachcorner2/north_west, -/area/varadero/exterior/pontoon_beach/lz) -"fWR" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 8; - icon_state = "p_stair_ew_half_cap" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/lz1_near) "fWU" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva/redfull/west, @@ -7438,16 +7451,6 @@ /obj/item/trash/barcardine, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/exterior/lz1_near) -"fXA" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/effect/decal/cleanable/blood/oil, -/obj/effect/decal/cleanable/dirt, -/turf/open/gm/dirt, -/area/varadero/exterior/monsoon) "fXG" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -7522,10 +7525,10 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/caves/east) -"fZX" = ( -/obj/structure/platform_decoration/kutjevo, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/exterior/pontoon_beach) +"fZQ" = ( +/obj/structure/platform_decoration/metal/kutjevo, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) "gan" = ( /obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/shiva/green/west, @@ -7544,12 +7547,6 @@ }, /turf/open/floor/shiva/green/northwest, /area/varadero/interior/hall_SE) -"gaG" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/eastbeach) "gaJ" = ( /obj/effect/spawner/random/tool, /turf/open/floor/plating/icefloor/asteroidplating, @@ -7589,25 +7586,6 @@ }, /turf/open/floor/shiva/yellow/northwest, /area/varadero/interior/cargo) -"gdJ" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/prop/rock/brown{ - explo_proof = 1; - unacidable = 1; - name = "sturdy rock(s)"; - desc = "A solidified collection of local minerals. When melted, becomes a substance best known as lava. These look particularly durable." - }, -/obj/item/lightstick/red/spoke/planted{ - pixel_x = -15; - pixel_y = 16; - explo_proof = 1; - unacidable = 1 - }, -/turf/open/gm/coast/beachcorner/south_west, -/area/varadero/exterior/pontoon_beach) "gdN" = ( /obj/structure/surface/table/woodentable, /obj/effect/landmark/objective_landmark/close, @@ -7624,47 +7602,6 @@ "geo" = ( /turf/open/gm/dirt, /area/varadero/interior_protected/caves/swcaves) -"gey" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, -/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/maintenance/security) -"geK" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" - }, -/turf/open/gm/dirt, -/area/varadero/exterior/lz2_near) -"gfc" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" - }, -/turf/open/gm/dirt, -/area/varadero/exterior/lz1_near) -"gfe" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/exterior/monsoon) "gfg" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -7672,12 +7609,6 @@ }, /turf/open/floor/shiva/red/southeast, /area/varadero/interior/security) -"gfj" = ( -/obj/effect/decal/cleanable/cobweb{ - dir = 4 - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "gfk" = ( /obj/structure/girder/displaced, /turf/open/gm/dirt, @@ -7717,10 +7648,6 @@ }, /turf/open/floor/shiva/blue, /area/varadero/interior/hall_SE) -"gfu" = ( -/obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "gfA" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3" @@ -7731,10 +7658,12 @@ }, /turf/open/floor/wood, /area/varadero/interior/court) -"gfG" = ( -/obj/structure/closet/crate/trashcart, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +"gga" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/turf/closed/wall/rock/brown, +/area/varadero/exterior/lz1_near) "ggk" = ( /turf/closed/wall/r_wall/elevator{ dir = 8 @@ -7751,10 +7680,6 @@ }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves) -"gha" = ( -/obj/structure/surface/table, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "ghb" = ( /obj/item/tool/crowbar, /turf/open/floor/shiva/red, @@ -7793,9 +7718,22 @@ /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/shiva/purple/north, /area/varadero/interior/research) +"giu" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/asteroidfloor/north, +/area/varadero/interior/comms1) "giN" = ( /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/maintenance/north) +"giY" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/pontoon_beach) "gja" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/prop/invuln/overhead_pipe{ @@ -7810,6 +7748,18 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior_protected/maintenance/south) +"gjm" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -1; + pixel_y = 9; + explo_proof = 1; + unacidable = 1 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/eastbeach) "gjs" = ( /obj/structure/prop/invuln/lattice_prop{ icon_state = "lattice8"; @@ -7829,14 +7779,6 @@ /obj/structure/machinery/computer/communications, /turf/open/floor/shiva/redfull, /area/varadero/interior/medical) -"gjz" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22"; - pixel_y = 8 - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "gjC" = ( /obj/effect/overlay/palmtree_r, /turf/open/gm/dirt, @@ -7901,6 +7843,16 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/maintenance/south) +"glM" = ( +/obj/structure/blocker/invisible_wall/water, +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/turf/open/floor/plating/bare_catwalk, +/area/varadero/exterior/farocean) "gms" = ( /obj/effect/landmark/good_item, /turf/open/shuttle/red, @@ -7910,6 +7862,18 @@ /obj/effect/landmark/objective_landmark/far, /turf/open/floor/shiva/yellowfull/west, /area/varadero/interior/laundry) +"gmH" = ( +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/comms4) "gmK" = ( /obj/structure/machinery/vending/snack, /turf/open/floor/shiva/red/southeast, @@ -7955,23 +7919,6 @@ }, /turf/open/floor/wood, /area/varadero/interior/court) -"gor" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/comms4) -"gpJ" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/blocker/invisible_wall/water, -/obj/item/lightstick/variant/planted, -/turf/open/gm/river/ocean/deep_ocean, -/area/varadero/exterior/farocean) "gqE" = ( /obj/structure/bed/sofa/pews/flipped{ dir = 1 @@ -8031,25 +7978,6 @@ "gsP" = ( /turf/open/space/basic, /area/space) -"gsQ" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" - }, -/turf/open/gm/dirt, -/area/varadero/exterior/lz1_near) "gtv" = ( /obj/structure/machinery/storm_siren{ dir = 8; @@ -8057,15 +7985,6 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/exterior/eastbeach) -"gtz" = ( -/obj/structure/barricade/wooden{ - dir = 8 - }, -/obj/structure/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "gun" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/shiva/purple/east, @@ -8142,6 +8061,18 @@ /obj/structure/machinery/light, /turf/open/floor/shiva/floor3, /area/varadero/interior/medical) +"gxa" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz1_near) "gxi" = ( /obj/structure/prop/invuln/lattice_prop{ icon_state = "lattice8"; @@ -8150,6 +8081,12 @@ }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/maintenance) +"gxM" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/interior/caves/north_research) "gxQ" = ( /obj/structure/prop/rock/brown, /turf/open/auto_turf/sand_white/layer1, @@ -8158,6 +8095,12 @@ /obj/structure/window/framed/colony/reinforced, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/hall_SE) +"gyu" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/pool) "gyw" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -8190,15 +8133,25 @@ }, /turf/open/floor/shiva/yellow/north, /area/varadero/interior/technical_storage) -"gzm" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 +"gzG" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 }, -/obj/item/stack/sheet/metal, -/obj/effect/decal/cleanable/blood/oil/streak, /turf/open/gm/dirt, -/area/varadero/exterior/monsoon) +/area/varadero/exterior/lz1_near) +"gAd" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/interior_protected/caves) "gAl" = ( /obj/structure/bed/chair{ dir = 4 @@ -8219,12 +8172,6 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior_protected/maintenance/south) -"gAV" = ( -/obj/structure/barricade/wooden{ - dir = 1 - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "gBi" = ( /obj/item/stool{ icon_state = "stool_alt" @@ -8255,20 +8202,6 @@ }, /turf/open/floor/strata/grey_multi_tiles, /area/varadero/interior_protected/vessel) -"gBP" = ( -/obj/structure/blocker/invisible_wall/water, -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/floor/plating/bare_catwalk, -/area/varadero/exterior/farocean) "gBV" = ( /obj/structure/machinery/photocopier, /turf/open/floor/shiva/redfull/west, @@ -8306,29 +8239,6 @@ }, /turf/open/gm/dirt, /area/varadero/exterior/lz2_near) -"gCZ" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/item/lightstick/red/spoke/planted{ - pixel_x = -1; - pixel_y = 9; - explo_proof = 1; - unacidable = 1 - }, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/exterior/monsoon) -"gDh" = ( -/obj/structure/largecrate/random, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "gDr" = ( /obj/item/tool/warning_cone, /turf/open/gm/dirt, @@ -8348,6 +8258,12 @@ /obj/structure/machinery/medical_pod/bodyscanner, /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/medical) +"gEH" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/turf/closed/wall/rock/brown, +/area/varadero/exterior/pontoon_beach) "gEO" = ( /obj/structure/surface/rack, /obj/item/weapon/gun/pistol/m4a3, @@ -8372,6 +8288,12 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/floor/shiva/redfull, /area/varadero/interior/medical) +"gFc" = ( +/obj/effect/decal/cleanable/cobweb{ + dir = 4 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "gFt" = ( /obj/structure/largecrate/random, /turf/open/floor/shiva/green/west, @@ -8419,6 +8341,13 @@ /obj/structure/machinery/vending/snack, /turf/open/floor/shiva/greenfull/west, /area/varadero/interior/hall_SE) +"gJi" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/machinery/constructable_frame, +/turf/open/floor/asteroidfloor/north, +/area/varadero/interior/comms1) "gJs" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -8435,6 +8364,19 @@ /obj/structure/largecrate/random/barrel/white, /turf/open/auto_turf/sand_white/layer1, /area/varadero/exterior/eastbeach) +"gJP" = ( +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/structure/prop/invuln/minecart_tracks{ + dir = 1 + }, +/obj/structure/blocker/invisible_wall/water, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/oob) "gKn" = ( /obj/structure/machinery/light{ dir = 8 @@ -8487,17 +8429,6 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/exterior/pontoon_beach) -"gMm" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 1 - }, -/obj/structure/platform/kutjevo/rock, -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice12"; - pixel_y = -3 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/interior_protected/maintenance/south) "gMp" = ( /obj/structure/surface/table, /obj/item/paper_bin{ @@ -8507,14 +8438,6 @@ /obj/item/tool/pen/red/clicky, /turf/open/floor/interior/plastic, /area/varadero/interior_protected/caves/digsite) -"gMV" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/interior/caves/north_research) "gNb" = ( /obj/structure/closet/wardrobe/chaplain_black, /turf/open/floor/wood, @@ -8541,6 +8464,10 @@ /obj/item/tool/wirecutters, /turf/open/gm/dirt, /area/varadero/exterior/lz2_near) +"gOJ" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "gPi" = ( /turf/open/gm/coast/west, /area/varadero/exterior/monsoon) @@ -8553,20 +8480,6 @@ "gPG" = ( /turf/open/gm/dirt/desert2, /area/varadero/exterior/lz1_near) -"gPL" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" - }, -/turf/open/gm/coast/west, -/area/varadero/exterior/pontoon_beach) "gPZ" = ( /obj/structure/bed/chair/office/light{ dir = 4 @@ -8660,6 +8573,12 @@ /obj/structure/window/framed/colony/reinforced, /turf/open/floor/plating, /area/varadero/interior_protected/caves) +"gUX" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "gVd" = ( /obj/structure/fence, /turf/open/gm/coast/north, @@ -8671,13 +8590,6 @@ "gVO" = ( /turf/open/gm/coast/beachcorner2/south_east, /area/varadero/exterior/pontoon_beach) -"gVP" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/lz2_near) "gVQ" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -8696,30 +8608,19 @@ }, /turf/open/floor/wood, /area/varadero/interior/court) +"gWj" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) +"gWu" = ( +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/security/north) "gWL" = ( /obj/structure/surface/table, /obj/structure/machinery/faxmachine, /turf/open/floor/interior/plastic, /area/varadero/interior_protected/caves/digsite) -"gXf" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" - }, -/turf/open/gm/dirt, -/area/varadero/exterior/pontoon_beach) "gXh" = ( /obj/structure/machinery/constructable_frame{ icon_state = "box_1" @@ -8821,6 +8722,17 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva/floor3, /area/varadero/interior/security) +"haY" = ( +/obj/structure/stairs/perspective{ + color = "#6b675e"; + dir = 1; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/vessel) "hbi" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -8828,14 +8740,6 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior_protected/maintenance/south) -"hbD" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/interior_protected/caves) "hbP" = ( /obj/structure/surface/table, /obj/item/storage/firstaid/regular{ @@ -8857,13 +8761,16 @@ /obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/asteroidfloor/north, /area/varadero/exterior/lz1_near) -"hcI" = ( -/obj/item/stack/tile/plasteel{ - pixel_x = 8; - pixel_y = 6 +"hcG" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 }, +/turf/open/gm/coast/east, +/area/varadero/exterior/lz2_near) +"hdh" = ( +/obj/effect/landmark/monkey_spawn, /turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/maintenance/security) +/area/varadero/interior_protected/caves/swcaves) "hds" = ( /turf/open/gm/coast/north, /area/varadero/exterior/eastocean) @@ -8873,12 +8780,6 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/comms2) -"hej" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/pontoon_beach) "hek" = ( /obj/structure/machinery/vending/cigarette/colony, /turf/open/floor/shiva/red/northeast, @@ -8892,18 +8793,22 @@ /obj/structure/machinery/power/apc/no_power/west, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/caves/north_research) -"hfn" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/barricade/wooden, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "hfo" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/disposalpipe/segment, /turf/open/floor/shiva/greenfull/west, /area/varadero/interior/hall_SE) +"hfA" = ( +/obj/structure/stairs/perspective{ + color = "#6b675e"; + dir = 1; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/vessel) "hfD" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/bed/chair/office/light{ @@ -8912,6 +8817,12 @@ /obj/effect/landmark/objective_landmark/far, /turf/open/floor/shiva/north, /area/varadero/interior/research) +"hfQ" = ( +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/pool) "hfR" = ( /turf/open/floor/prison/chapel_carpet/doubleside/north, /area/varadero/interior/chapel) @@ -8959,6 +8870,10 @@ }, /turf/open/floor/shiva/yellow/north, /area/varadero/interior/cargo) +"hij" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/interior/caves/north_research) "hiD" = ( /turf/open/floor/shiva/multi_tiles/north, /area/varadero/interior/mess) @@ -8966,12 +8881,6 @@ /obj/structure/flora/bush/ausbushes/var3/brflowers, /turf/open/gm/grass/grass1/weedable, /area/varadero/interior_protected/caves/central) -"hjf" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/farocean) "hjn" = ( /obj/structure/prop/invuln/lattice_prop{ icon_state = "lattice3"; @@ -8981,24 +8890,6 @@ /obj/structure/girder, /turf/open/gm/dirt, /area/varadero/exterior/eastbeach) -"hjK" = ( -/obj/structure/blocker/invisible_wall/water, -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/floor/plating/bare_catwalk, -/area/varadero/exterior/farocean) -"hkQ" = ( -/obj/structure/platform_decoration/kutjevo, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/exterior/lz1_near) "hkZ" = ( /obj/structure/surface/table/woodentable, /obj/item/folder/red, @@ -9037,23 +8928,6 @@ /obj/effect/landmark/survivor_spawner, /turf/open/floor/carpet, /area/varadero/interior/maintenance/north) -"hlF" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pool) -"hlG" = ( -/obj/structure/barricade/handrail/wire{ - layer = 3.1 - }, -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/comms4) "hlK" = ( /obj/structure/surface/table/woodentable, /obj/item/storage/box/drinkingglasses{ @@ -9070,6 +8944,10 @@ }, /turf/open/floor/wood, /area/varadero/interior/security) +"hlN" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) "hmg" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -9110,15 +8988,6 @@ }, /turf/closed/wall/rock/brown, /area/varadero/interior/oob) -"hnR" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/comms4) "hoC" = ( /obj/structure/prop/rock/brown, /turf/open/auto_turf/sand_white/layer1, @@ -9151,6 +9020,24 @@ }, /turf/open/shuttle/red, /area/varadero/interior_protected/vessel) +"hpv" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) +"hpx" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) +"hpC" = ( +/obj/structure/barricade/handrail/wire{ + dir = 4; + layer = 4 + }, +/obj/structure/platform/metal/almayer/north, +/turf/open/gm/river/desert/deep/covered, +/area/varadero/interior/maintenance/north) "hre" = ( /turf/open/gm/dirt, /area/varadero/interior_protected/caves/digsite) @@ -9161,13 +9048,6 @@ /obj/structure/closet/emcloset, /turf/open/floor/shiva/green/northwest, /area/varadero/interior/hall_SE) -"hsa" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/exterior/lz2_near) "hsl" = ( /turf/open/floor/asteroidfloor/north, /area/varadero/interior/maintenance/north) @@ -9187,6 +9067,12 @@ /obj/item/tool/wet_sign, /turf/open/floor/white, /area/varadero/interior/toilets) +"hsE" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/turf/open/gm/dirt/desert1, +/area/varadero/exterior/lz1_near) "hsF" = ( /obj/effect/landmark/yautja_teleport, /turf/open/floor/shiva/floor3, @@ -9194,21 +9080,13 @@ "hte" = ( /turf/closed/wall/rock/brown, /area/varadero/interior_protected/vessel) -"hti" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/effect/landmark/lv624/fog_blocker{ - time_to_dispel = 25000 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/monsoon) "hto" = ( /obj/structure/prop/rock/brown, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves) +"htt" = ( +/turf/closed/wall/rock/brown, +/area/varadero/interior/maintenance/security/north) "hty" = ( /obj/structure/closet/secure_closet/personal, /obj/item/storage/large_holster/ceremonial_sword/full, @@ -9280,6 +9158,15 @@ /obj/structure/largecrate/random, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance) +"hwr" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/security/north) "hwE" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, /turf/open/gm/river/shallow_ocean_shallow_ocean, @@ -9314,12 +9201,37 @@ /obj/structure/closet/secure_closet/security, /turf/open/floor/shiva/red/southwest, /area/varadero/interior/administration) +"hxb" = ( +/obj/structure/machinery/floodlight{ + name = "Floodlight" + }, +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves/digsite) +"hxg" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/turf/open/gm/coast/beachcorner2/north_west, +/area/varadero/exterior/pontoon_beach/lz) "hxO" = ( /obj/structure/barricade/wooden{ dir = 4 }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/maintenance/north) +"hxW" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/turf/open/gm/coast/north, +/area/varadero/exterior/pontoon_beach) "hyd" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -9353,6 +9265,11 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/comms2) +"hzj" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/security/south) "hzm" = ( /turf/open/floor/shiva/red/east, /area/varadero/interior/security) @@ -9360,18 +9277,6 @@ /obj/structure/flora/bush/ausbushes/var3/fullgrass, /turf/open/gm/dirt, /area/varadero/exterior/eastbeach) -"hzK" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - icon_state = "p_stair_full" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/lz1_near) "hAg" = ( /obj/structure/largecrate/random/case/double, /turf/open/gm/dirt, @@ -9380,12 +9285,6 @@ /obj/effect/landmark/survivor_spawner, /turf/open/floor/wood, /area/varadero/interior/court) -"hAI" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pontoon_beach) "hBA" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/auto_turf/sand_white/layer1, @@ -9393,19 +9292,6 @@ "hBX" = ( /turf/open/floor/shiva/purple/southwest, /area/varadero/interior/research) -"hCw" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 1; - icon_state = "p_stair_full" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/lz1_near) "hCZ" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 4 @@ -9461,14 +9347,6 @@ /obj/structure/closet/l3closet/scientist, /turf/open/floor/shiva/purplefull/west, /area/varadero/interior/research) -"hET" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/pontoon_beach) "hFA" = ( /obj/structure/window/reinforced{ dir = 4 @@ -9496,6 +9374,32 @@ /obj/structure/pipes/vents/pump, /turf/open/floor/shiva/wredfull, /area/varadero/interior/medical) +"hHb" = ( +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/obj/structure/barricade/handrail/wire{ + dir = 4 + }, +/obj/structure/platform/metal/almayer, +/turf/open/gm/river/desert/deep/covered, +/area/varadero/interior/maintenance/north) +"hHc" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/obj/structure/machinery/storm_siren{ + dir = 8; + pixel_x = 3 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/comms4) "hHn" = ( /obj/effect/landmark/hunter_secondary, /turf/open/gm/dirt, @@ -9535,6 +9439,17 @@ }, /turf/open/floor/wood/wood_broken, /area/varadero/interior/court) +"hID" = ( +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 1 + }, +/obj/item/stack/tile/plasteel{ + layer = 2.89; + pixel_x = 17; + pixel_y = 16 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "hJl" = ( /obj/structure/machinery/firealarm{ pixel_y = 24 @@ -9682,20 +9597,6 @@ }, /turf/open/floor/shiva/redfull/west, /area/varadero/interior/hall_SE) -"hNq" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" - }, -/turf/open/gm/coast/south, -/area/varadero/exterior/pontoon_beach) "hOp" = ( /obj/structure/machinery/floodlight/landing{ desc = "A powerful light stationed near construction zones to provide better visibility."; @@ -9722,10 +9623,26 @@ "hPj" = ( /turf/closed/wall/rock/brown, /area/varadero/interior/security) +"hPm" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) "hPq" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, /turf/open/gm/dirt, /area/varadero/exterior/lz2_near) +"hPs" = ( +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/turf/open/gm/coast/east, +/area/varadero/exterior/comms4) +"hPA" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves/digsite) "hPD" = ( /turf/open/floor/shiva/floor3, /area/varadero/interior/court) @@ -9733,6 +9650,12 @@ /obj/item/paper/crumpled, /turf/open/floor/shiva/red/west, /area/varadero/interior/morgue) +"hPY" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) "hQb" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/green{ @@ -9856,6 +9779,12 @@ /obj/structure/closet/wardrobe/engineering_yellow, /turf/open/floor/shiva/yellow, /area/varadero/interior/electrical) +"hVi" = ( +/obj/item/shard{ + icon_state = "medium" + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "hVL" = ( /obj/item/stack/sandbags/large_stack{ pixel_y = 4; @@ -9899,6 +9828,10 @@ /obj/structure/surface/table, /turf/open/floor/shiva/red/north, /area/varadero/interior/security) +"hXB" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/floor/shiva/yellow/north, +/area/varadero/interior/cargo) "hXR" = ( /turf/open/auto_turf/sand_white/layer1, /area/varadero/exterior/pontoon_beach) @@ -9906,6 +9839,10 @@ /obj/structure/window/framed/colony, /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/maintenance) +"hYr" = ( +/obj/structure/platform_decoration/metal/kutjevo, +/turf/open/gm/river/ocean/deep_ocean, +/area/varadero/exterior/comms4) "hZo" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -9913,6 +9850,12 @@ }, /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/medical) +"hZq" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/turf/open/gm/dirt/desert1, +/area/varadero/exterior/lz1_near) "hZD" = ( /turf/open/floor/shiva/redfull, /area/varadero/interior/security) @@ -9993,24 +9936,6 @@ /obj/item/device/flashlight/lamp/tripod, /turf/open/gm/grass/grass1/weedable, /area/varadero/interior/hall_SE) -"icb" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/item/device/camera{ - pixel_x = -2; - pixel_y = 9 - }, -/obj/item/newspaper{ - layer = 2.99; - pixel_x = 7; - pixel_y = 4 - }, -/obj/structure/surface/table, -/turf/open/gm/dirt, -/area/varadero/exterior/lz1_near) "icl" = ( /obj/structure/prop/rock/brown, /turf/closed/wall/rock/brown, @@ -10038,23 +9963,24 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance/research) -"icJ" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/item/shard{ - icon_state = "large"; - pixel_x = -5; - pixel_y = -6 - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "icM" = ( /obj/structure/bed/chair{ dir = 8 }, /turf/open/floor/shiva/green/east, /area/varadero/interior/hall_NW) +"idh" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/gm/coast/west, +/area/varadero/exterior/lz1_near) "idn" = ( /obj/structure/window/reinforced{ dir = 4; @@ -10112,20 +10038,6 @@ /obj/effect/decal/cleanable/blood/gibs, /turf/open/floor/wood, /area/varadero/interior/court) -"igB" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" - }, -/turf/open/gm/dirt, -/area/varadero/exterior/pontoon_beach) "igQ" = ( /obj/structure/machinery/power/port_gen/pacman, /turf/open/floor/plating/icefloor/asteroidplating, @@ -10156,24 +10068,18 @@ /obj/item/storage/belt/utility, /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/electrical) +"ihw" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/turf/closed/wall/rock/brown, +/area/varadero/exterior/pontoon_beach) "ihC" = ( /obj/effect/landmark/lv624/fog_blocker{ time_to_dispel = 25000 }, /turf/open/gm/river/shallow_ocean_shallow_ocean, /area/varadero/exterior/monsoon) -"ihX" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/machinery/storm_siren{ - dir = 4; - pixel_x = -3 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/eastbeach) "ihY" = ( /turf/closed/wall/rock/brown, /area/varadero/exterior/eastbeach) @@ -10243,14 +10149,29 @@ /obj/structure/prop/rock/brown, /turf/open/gm/river/ocean/deep_ocean, /area/varadero/exterior/farocean) -"imu" = ( -/obj/item/stack/tile/plasteel{ - layer = 2.89; - pixel_x = 17; - pixel_y = 16 +"imo" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/obj/structure/flora/bush/ausbushes/var3/stalkybush, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/interior_protected/caves) +"imq" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/obj/structure/platform_decoration/metal/kutjevo, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/pontoon_beach) "imz" = ( /turf/closed/wall/r_wall/elevator/gears, /area/varadero/interior/records) @@ -10317,17 +10238,6 @@ /obj/structure/machinery/vending/cigarette/colony, /turf/open/floor/shiva/green/east, /area/varadero/interior/hall_SE) -"ipi" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/sign/double/barsign{ - name = "The Salty Cutlass"; - desc = "Come drown your troubles away! Mind the sway." - }, -/turf/closed/wall/wood, -/area/varadero/interior/beach_bar) "ipl" = ( /obj/structure/prop/ice_colony/dense/planter_box/plated{ dir = 9; @@ -10349,13 +10259,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/gm/dirt, /area/varadero/exterior/monsoon) -"ipZ" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/obj/structure/machinery/power/port_gen/pacman, -/turf/open/gm/dirt, -/area/varadero/exterior/lz1_near) "iqv" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/tool, @@ -10393,6 +10296,12 @@ }, /turf/open/floor/shiva/blue/west, /area/varadero/interior/technical_storage) +"ist" = ( +/obj/structure/barricade/wooden{ + dir = 1 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) "isK" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/largecrate/random/mini/small_case/b{ @@ -10410,32 +10319,20 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/varadero/interior/administration) -"itL" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 +"itw" = ( +/obj/structure/platform/stone/kutjevo/north, +/obj/structure/platform/stone/kutjevo, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_y = -3 }, -/turf/open/gm/river/ocean/deep_ocean, -/area/varadero/exterior/farocean) +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/interior/maintenance/security/north) "itP" = ( /turf/closed/wall/r_wall/elevator{ dir = 6 }, /area/varadero/interior/hall_N) -"itQ" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" - }, -/turf/open/gm/coast/west, -/area/varadero/exterior/lz1_near) "itT" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/gm/dirt, @@ -10524,6 +10421,12 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/wood, /area/varadero/interior/bunks) +"iwx" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/exterior/comms4) "iwT" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/auto_turf/sand_white/layer1, @@ -10592,20 +10495,6 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/shuttle/red, /area/varadero/interior_protected/vessel) -"izl" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" - }, -/turf/open/gm/river/ocean/deep_ocean, -/area/varadero/exterior/comms4) "izs" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva/north, @@ -10659,13 +10548,6 @@ /obj/structure/blocker/invisible_wall/water, /turf/open/gm/coast/beachcorner/south_west, /area/varadero/exterior/farocean) -"iAP" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/turf/open/floor/plating/bare_catwalk, -/area/varadero/exterior/pontoon_beach) "iAX" = ( /turf/open/floor/carpet, /area/varadero/interior/administration) @@ -10681,6 +10563,16 @@ }, /turf/open/floor/shiva/green/west, /area/varadero/interior/mess) +"iBX" = ( +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/machinery/power/apc/power/north, +/turf/open/floor/asteroidfloor/north, +/area/varadero/interior/comms1) "iCy" = ( /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/research) @@ -10720,6 +10612,10 @@ }, /turf/open/floor/wood, /area/varadero/interior/beach_bar) +"iEO" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, +/turf/open/floor/strata/grey_multi_tiles, +/area/varadero/interior_protected/vessel) "iFb" = ( /turf/closed/wall/r_wall, /area/varadero/interior_protected/caves/central) @@ -10771,21 +10667,9 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/gm/dirt, /area/varadero/interior_protected/caves/digsite) -"iFZ" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 5 - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "iGm" = ( /turf/open/floor/wood/wood_broken6, /area/varadero/interior/court) -"iGM" = ( -/obj/effect/decal/cleanable/cobweb{ - dir = 1 - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "iGS" = ( /obj/effect/landmark/corpsespawner/engineer, /turf/open/floor/shiva/multi_tiles/north, @@ -10851,6 +10735,12 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance/north) +"iJh" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/turf/open/gm/coast/west, +/area/varadero/exterior/lz1_near) "iJk" = ( /obj/structure/pipes/standard/manifold/hidden/green, /obj/effect/decal/cleanable/blood/gibs, @@ -10870,10 +10760,27 @@ }, /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/hall_SE) -"iLc" = ( -/obj/structure/surface/table/woodentable, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +"iKQ" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 8; + icon_state = "p_stair_ew_half_cap" + }, +/obj/item/lightstick/red/spoke/planted{ + pixel_x = 10; + pixel_y = 2; + explo_proof = 1; + unacidable = 1 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) +"iKU" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves/digsite) "iLd" = ( /obj/structure/window/reinforced{ dir = 4; @@ -10941,6 +10848,10 @@ }, /turf/open/floor/shiva/red/west, /area/varadero/interior/security) +"iNA" = ( +/obj/structure/machinery/light/small, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "iNE" = ( /obj/structure/prop/invuln/lattice_prop{ icon_state = "lattice12"; @@ -10949,6 +10860,21 @@ }, /turf/open/floor/shiva/floor3, /area/varadero/interior/mess) +"iNO" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/comms4) "iNU" = ( /obj/effect/decal/cleanable/blood/drip, /obj/item/device/flashlight, @@ -10965,6 +10891,12 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves) +"iOM" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/turf/open/gm/coast/south, +/area/varadero/exterior/pontoon_beach) "iOQ" = ( /obj/structure/bed/chair/office/dark, /obj/structure/disposalpipe/segment, @@ -11016,9 +10948,27 @@ /obj/structure/surface/table, /turf/open/floor/asteroidfloor/north, /area/varadero/exterior/lz1_near) +"iQM" = ( +/obj/structure/bed/chair, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "iQS" = ( /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/comms2) +"iQX" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) +"iRg" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/decal/remains/human, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "iRw" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -11034,18 +10984,16 @@ /obj/structure/window/framed/colony, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance) -"iSi" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/turf/open/floor/shiva/multi_tiles, -/area/varadero/interior/disposals) "iSz" = ( /obj/structure/prop/invuln/minecart_tracks{ dir = 8 }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/exterior/lz1_near) +"iSB" = ( +/obj/effect/sentry_landmark/lz_2/top_right, +/turf/open/floor/asteroidfloor/north, +/area/varadero/exterior/lz2_near) "iSC" = ( /obj/structure/window/reinforced{ dir = 8; @@ -11117,6 +11065,28 @@ }, /turf/open/floor/wood, /area/varadero/interior/bunks) +"iUg" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/pontoon_beach/lz) +"iUn" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/prop/invuln/minecart_tracks{ + dir = 8 + }, +/obj/structure/blocker/invisible_wall/water, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/oob) "iUx" = ( /obj/structure/machinery/constructable_frame, /obj/structure/machinery/light{ @@ -11132,27 +11102,30 @@ /obj/effect/decal/warning_stripes, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/exterior/eastbeach) +"iUT" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/interior/caves/north_research) "iUZ" = ( /obj/structure/ore_box, /turf/open/gm/dirt, /area/varadero/exterior/lz1_near) +"iVi" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, +/obj/structure/surface/rack, +/obj/item/tool/wrench, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) "iVt" = ( /turf/open/floor/shiva/floor3, /area/varadero/interior/electrical) -"iVD" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/comms4) "iWf" = ( /obj/structure/bed/chair/office/light{ dir = 1 @@ -11163,6 +11136,24 @@ /obj/structure/blocker/invisible_wall/water, /turf/open/gm/coast/south, /area/varadero/exterior/farocean) +"iWw" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 + }, +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -1; + pixel_y = 9; + explo_proof = 1; + unacidable = 1 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) "iWE" = ( /obj/item/ammo_casing/shell{ icon_state = "cartridge_10" @@ -11192,14 +11183,6 @@ }, /turf/open/gm/dirt, /area/varadero/exterior/eastbeach) -"iXR" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8; - pixel_x = -13; - pixel_y = 11 - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "iXX" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 @@ -11221,29 +11204,28 @@ dir = 1 }, /area/varadero/interior/records) +"iYC" = ( +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/pool) "iYE" = ( /obj/item/device/camera_film, /turf/open/floor/wood, /area/varadero/interior/security) -"iZj" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" +"iYX" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 }, /turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/comms4) +/area/varadero/interior/caves/north_research) "iZx" = ( /obj/structure/machinery/door_control/brbutton{ id = "cargobay"; @@ -11323,6 +11305,15 @@ }, /turf/open/floor/shiva/red, /area/varadero/interior/security) +"jcN" = ( +/obj/structure/platform/stone/kutjevo/north, +/obj/structure/platform/stone/kutjevo, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_y = -3 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/interior/cargo) "jcT" = ( /turf/closed/wall, /area/varadero/interior/maintenance) @@ -11330,20 +11321,13 @@ /obj/structure/flora/bush/ausbushes/var3/fullgrass, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/central) -"jdu" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" +"jdn" = ( +/obj/structure/surface/rack, +/obj/structure/machinery/light/small{ + dir = 8 }, -/turf/open/gm/coast/beachcorner/south_east, -/area/varadero/exterior/pontoon_beach) +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "jek" = ( /turf/open/gm/coast/west, /area/varadero/exterior/eastocean) @@ -11351,14 +11335,6 @@ /obj/item/tool/mop, /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/hall_SE) -"jew" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8; - pixel_x = -6; - pixel_y = 3 - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "jeO" = ( /obj/structure/machinery/conveyor, /obj/structure/plasticflaps, @@ -11383,10 +11359,6 @@ }, /turf/open/floor/corsat/squareswood/north, /area/varadero/interior_protected/caves/digsite) -"jeW" = ( -/obj/item/device/flashlight/lamp/tripod, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/maintenance/security) "jfn" = ( /obj/structure/desertdam/decals/road_edge{ pixel_x = -12 @@ -11401,18 +11373,6 @@ /obj/structure/barricade/handrail/wire, /turf/open/floor/wood/wood_broken3, /area/varadero/interior/court) -"jfw" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22"; - pixel_y = 8 - }, -/obj/structure/machinery/storm_siren{ - dir = 8; - pixel_x = 3 - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "jfA" = ( /obj/item/device/motiondetector/hacked, /turf/open/floor/carpet, @@ -11449,19 +11409,6 @@ }, /turf/open/floor/shiva/red/north, /area/varadero/interior/security) -"jhu" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/lz1_near) "jhv" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva/snow_mat/east, @@ -11479,12 +11426,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/shiva/blue, /area/varadero/interior/administration) -"jhM" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/gm/dirt/desert3, -/area/varadero/exterior/lz1_near) "jhW" = ( /obj/structure/barricade/handrail/wire{ dir = 8; @@ -11635,10 +11576,6 @@ }, /turf/open/floor/plating, /area/varadero/interior_protected/caves/digsite) -"joV" = ( -/obj/structure/flora/bush/ausbushes/var3/fullgrass, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/maintenance/security) "jpm" = ( /obj/structure/machinery/door/airlock/almayer/maint{ name = "\improper Underground Maintenance"; @@ -11662,21 +11599,6 @@ }, /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/hall_SE) -"jpZ" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail/wire{ - layer = 3.1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/comms4) "jqd" = ( /obj/effect/decal/cleanable/blood/oil, /obj/structure/machinery/landinglight/ds1/spoke{ @@ -11724,6 +11646,20 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/caves/east) +"jrQ" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/prop/invuln/minecart_tracks{ + dir = 8 + }, +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/structure/blocker/invisible_wall/water, +/obj/structure/plasticflaps/mining, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/oob) "jsf" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -11735,6 +11671,10 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/security) +"jsg" = ( +/obj/structure/barricade/wooden, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "jsh" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/green{ @@ -11759,22 +11699,16 @@ /obj/structure/machinery/vending/cola, /turf/open/floor/shiva/green/east, /area/varadero/interior/hall_SE) +"jti" = ( +/obj/structure/flora/bush/ausbushes/var3/stalkybush, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/security/south) "jts" = ( /obj/structure/prop/invuln/minecart_tracks{ dir = 9 }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/comms1) -"jtx" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/flora/bush/ausbushes/var3/stalkybush{ - pixel_y = 9 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/interior_protected/caves) "jty" = ( /obj/effect/landmark/hunter_primary, /turf/open/floor/shiva/multi_tiles/west, @@ -11834,19 +11768,24 @@ "jvh" = ( /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/records) +"jvx" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/comms4) "jvF" = ( /obj/item/ammo_magazine/revolver/cmb, /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/research) -"jwf" = ( -/obj/structure/platform_decoration/kutjevo, -/obj/item/tool/warning_cone, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior_protected/caves/digsite) "jwy" = ( /obj/item/weapon/gun/revolver/cmb, /turf/open/floor/shiva/purple, /area/varadero/interior/research) +"jwW" = ( +/turf/closed/wall/r_wall/unmeltable, +/area/varadero/interior/maintenance/security/north) "jwX" = ( /obj/structure/largecrate/random, /turf/open/gm/dirt, @@ -11892,14 +11831,6 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/exterior/lz2_near) -"jzL" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/item/tool/warning_cone, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/exterior/pontoon_beach) "jzZ" = ( /turf/open/floor/carpet, /area/varadero/interior/library) @@ -11935,6 +11866,13 @@ }, /turf/open/floor/shiva/blue/east, /area/varadero/interior/administration) +"jBv" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/flora/bush/ausbushes/var3/stalkybush, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/interior_protected/caves) "jBw" = ( /obj/item/trash/cigbutt/ucigbutt{ pixel_x = 4; @@ -11942,6 +11880,22 @@ }, /turf/open/floor/wood, /area/varadero/interior/security) +"jBD" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/gm/dirt/desert3, +/area/varadero/exterior/lz1_near) +"jCg" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/gm/coast/beachcorner/south_east, +/area/varadero/exterior/pontoon_beach) "jCr" = ( /turf/open/floor/shiva/floor3, /area/varadero/interior/mess) @@ -12010,19 +11964,15 @@ }, /turf/open/gm/dirt, /area/varadero/exterior/eastbeach) -"jEG" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/coast/south, -/area/varadero/exterior/pontoon_beach) "jEZ" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/tool, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance/north) +"jFg" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, +/turf/open/floor/shiva/multi_tiles, +/area/varadero/interior/disposals) "jFt" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/bed/chair/wood/normal{ @@ -12033,6 +11983,18 @@ }, /turf/open/floor/wood, /area/varadero/interior/beach_bar) +"jFJ" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/gm/coast/beachcorner2/south_east, +/area/varadero/exterior/pontoon_beach) "jFL" = ( /turf/open/gm/river/ocean/deep_ocean, /area/varadero/exterior/monsoon) @@ -12054,6 +12016,11 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance/research) +"jGt" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/security/south) "jGz" = ( /obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/white, @@ -12062,16 +12029,6 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance/research) -"jGT" = ( -/obj/structure/prop/invuln/minecart_tracks, -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/comms1) "jHb" = ( /obj/structure/bed/chair{ icon_state = "chair_alt" @@ -12099,6 +12056,17 @@ }, /turf/open/floor/wood, /area/varadero/interior/administration) +"jIi" = ( +/obj/structure/prop/ice_colony/dense/planter_box/plated{ + dir = 9; + icon_state = "planter_box_soil" + }, +/obj/structure/flora/bush/ausbushes/pointybush{ + icon_state = "pointybush_3"; + pixel_y = 11 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "jIo" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/clothing/gloves/botanic_leather, @@ -12113,6 +12081,10 @@ /obj/structure/machinery/light, /turf/open/floor/shiva/blue, /area/varadero/interior/technical_storage) +"jIK" = ( +/obj/structure/platform_decoration/metal/kutjevo, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/comms4) "jJf" = ( /obj/effect/landmark/corpsespawner/colonist/burst, /turf/open/gm/coast/beachcorner/north_west, @@ -12150,6 +12122,10 @@ }, /turf/open/floor/shiva/floor3, /area/varadero/interior/security) +"jKr" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/monsoon) "jKs" = ( /obj/structure/barricade/handrail/wire{ layer = 3.1 @@ -12181,31 +12157,12 @@ }, /turf/open/floor/plating, /area/varadero/interior/toilets) -"jKW" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/pontoon_beach) -"jLS" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 +"jLk" = ( +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 }, /turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pontoon_beach) +/area/varadero/exterior/pontoon_beach/lz) "jLU" = ( /obj/structure/reagent_dispensers/fueltank/gas, /turf/open/floor/plating, @@ -12293,15 +12250,6 @@ /obj/structure/pipes/standard/manifold/fourway/hidden/green, /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/hall_SE) -"jPM" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/machinery/light/small{ - dir = 1 - }, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/maintenance/security) "jQa" = ( /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/swcaves) @@ -12321,6 +12269,13 @@ }, /turf/open/floor/shiva/red, /area/varadero/interior/security) +"jQi" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/machinery/light/small, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "jQB" = ( /obj/structure/surface/table/woodentable, /obj/item/clipboard, @@ -12353,6 +12308,15 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance/research) +"jRf" = ( +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/interior_protected/caves) "jRu" = ( /obj/structure/prop/invuln/minecart_tracks{ dir = 8 @@ -12382,6 +12346,10 @@ "jSX" = ( /turf/open/gm/coast/beachcorner/north_west, /area/varadero/exterior/pontoon_beach) +"jTi" = ( +/obj/effect/sentry_landmark/lz_2/bottom_right, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/eastbeach) "jTj" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass{ icon_state = "sparsegrass_2" @@ -12434,12 +12402,6 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/comms2) -"jXp" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior_protected/caves/digsite) "jYl" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -12497,6 +12459,15 @@ /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/carpet, /area/varadero/interior/chapel) +"jZF" = ( +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/structure/bed/chair/office/dark{ + dir = 4 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "jZG" = ( /obj/structure/window/reinforced{ dir = 4; @@ -12525,16 +12496,13 @@ }, /turf/open/floor/shiva/snow_mat/east, /area/varadero/interior/medical) -"kap" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 +"jZZ" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 }, -/obj/structure/barricade/handrail/wire{ - layer = 3.1 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pontoon_beach/lz) +/obj/item/tool/warning_cone, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/exterior/pontoon_beach) "kaY" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/pill_bottle/inaprovaline/skillless{ @@ -12594,6 +12562,21 @@ /obj/structure/prop/rock/brown, /turf/open/gm/coast/west, /area/varadero/exterior/farocean) +"kdr" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 + }, +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -1; + pixel_y = 9; + explo_proof = 1; + unacidable = 1 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/monsoon) "kdV" = ( /obj/structure/machinery/light{ dir = 4 @@ -12619,10 +12602,6 @@ }, /turf/open/floor/shiva/floor3, /area/varadero/interior/cargo) -"keY" = ( -/obj/structure/flora/bush/ausbushes/var3/stalkybush, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/maintenance/security) "kfc" = ( /obj/structure/machinery/storm_siren{ pixel_y = 5 @@ -12676,22 +12655,6 @@ }, /turf/open/floor/shiva/floor3, /area/varadero/interior/court) -"khB" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail/wire{ - dir = 8; - layer = 2.991 - }, -/obj/item/shard{ - icon_state = "large"; - pixel_x = -5; - pixel_y = -6 - }, -/turf/open/floor/shiva/blue/east, -/area/varadero/interior/maintenance) "kif" = ( /obj/structure/ladder, /turf/open/floor/plating/icefloor/asteroidplating, @@ -12727,14 +12690,6 @@ }, /turf/open/gm/dirt/desert3, /area/varadero/exterior/eastbeach) -"kjr" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/item/stack/sheet/metal, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/exterior/monsoon) "kjI" = ( /turf/open/shuttle/red, /area/varadero/interior_protected/vessel) @@ -12746,14 +12701,6 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/caves/east) -"kkt" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/lz2_near) "kkv" = ( /obj/structure/prop/rock/brown, /turf/open/auto_turf/sand_white/layer1, @@ -12765,25 +12712,12 @@ "kkF" = ( /turf/closed/wall/r_wall/unmeltable, /area/varadero/exterior/farocean) -"klf" = ( +"kkR" = ( /obj/structure/barricade/wooden{ dir = 4 }, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) -"kli" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/interior/caves/north_research) +/area/varadero/interior/maintenance/security/north) "klu" = ( /obj/structure/bed/chair{ icon_state = "chair_alt" @@ -12832,31 +12766,22 @@ /obj/structure/window/framed/colony/reinforced, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior_protected/caves/central) +"kmN" = ( +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 4 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "kmW" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, /turf/open/gm/coast/beachcorner/south_east, /area/varadero/interior_protected/caves/central) -"knN" = ( -/obj/structure/prop/invuln/minecart_tracks{ - dir = 8 - }, -/obj/structure/prop/invuln/minecart_tracks{ - dir = 5 +"knw" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform_decoration/kutjevo, -/obj/structure/blocker/invisible_wall/water, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/oob) +/turf/open/floor/plating/bare_catwalk, +/area/varadero/exterior/pontoon_beach) "knP" = ( /obj/structure/machinery/light/small, /turf/open/floor/plating/icefloor/asteroidplating, @@ -12865,13 +12790,9 @@ /obj/structure/filingcabinet, /turf/open/floor/shiva/red/northwest, /area/varadero/interior/security) -"koZ" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/auto_turf/sand_white/layer1, +"kpe" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, +/turf/open/gm/river/shallow_ocean_shallow_ocean, /area/varadero/exterior/pontoon_beach) "kpF" = ( /obj/structure/filingcabinet{ @@ -12913,11 +12834,6 @@ /obj/structure/window/framed/colony, /turf/open/floor/wood, /area/varadero/interior/maintenance/north) -"kqE" = ( -/obj/structure/surface/rack, -/obj/effect/landmark/objective_landmark/far, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "kqN" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/gm/dirt, @@ -12959,19 +12875,6 @@ /obj/structure/machinery/vending/cola, /turf/open/floor/shiva/purplefull/west, /area/varadero/interior/research) -"ksu" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/lz2_near) "ksX" = ( /turf/closed/wall/r_wall, /area/varadero/interior_protected/maintenance/south) @@ -12997,13 +12900,6 @@ /obj/structure/machinery/power/apc/no_power/north, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/maintenance/south) -"kuO" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/exterior/eastbeach) "kuX" = ( /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/hall_NW) @@ -13087,6 +12983,10 @@ /obj/structure/machinery/door/airlock/almayer/engineering/autoname, /turf/open/floor/wood, /area/varadero/interior/maintenance/north) +"kyA" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "kyD" = ( /obj/effect/decal/cleanable/dirt, /turf/open/gm/dirt, @@ -13094,6 +12994,14 @@ "kyG" = ( /turf/closed/wall, /area/varadero/interior/disposals) +"kyH" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/item/stack/sheet/metal, +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) "kyI" = ( /obj/effect/spawner/random/toolbox, /turf/open/floor/plating/icefloor/asteroidplating, @@ -13162,10 +13070,6 @@ }, /turf/open/gm/dirt, /area/varadero/exterior/lz2_near) -"kAL" = ( -/obj/effect/decal/cleanable/blood, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/caves/north_research) "kAN" = ( /obj/structure/prop/invuln/lattice_prop{ icon_state = "lattice3"; @@ -13190,9 +13094,6 @@ }, /turf/open/floor/carpet, /area/varadero/interior/library) -"kBZ" = ( -/turf/closed/wall/rock/brown, -/area/varadero/interior/maintenance/security) "kCb" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/stack/sheet/mineral/phoron/medium_stack, @@ -13320,27 +13221,6 @@ /obj/structure/flora/bush/ausbushes/var3/fullgrass, /turf/open/gm/grass/grass1/weedable, /area/varadero/interior/hall_SE) -"kGB" = ( -/obj/structure/prop/invuln/minecart_tracks{ - dir = 8 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/closet/crate/miningcar{ - layer = 3.1; - name = "\improper materials storage bin"; - pixel_y = 8 - }, -/obj/structure/blocker/invisible_wall/water, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/oob) "kGD" = ( /obj/effect/decal/cleanable/blood/oil/streak, /turf/open/gm/dirt/desert_dug, @@ -13435,6 +13315,13 @@ "kLd" = ( /turf/open/floor/shiva/red/west, /area/varadero/interior/administration) +"kLk" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/item/stack/sheet/metal, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/monsoon) "kLA" = ( /obj/structure/disposalpipe/trunk{ dir = 8 @@ -13446,14 +13333,6 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/auto_turf/sand_white/layer1, /area/varadero/exterior/lz2_near) -"kMe" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pontoon_beach/lz) "kMf" = ( /obj/structure/window/framed/colony/reinforced/tinted, /turf/open/floor/plating, @@ -13556,18 +13435,11 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior_protected/maintenance/south) -"kQy" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/coast/east, -/area/varadero/exterior/comms4) +"kQD" = ( +/obj/effect/decal/cleanable/blood/gibs/xeno, +/obj/effect/sentry_landmark/lz_1/bottom_right, +/turf/open/floor/asteroidfloor/north, +/area/varadero/exterior/lz1_near) "kRp" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /obj/item/device/flashlight/lamp/tripod, @@ -13576,28 +13448,6 @@ "kRH" = ( /turf/open/gm/coast/beachcorner/north_west, /area/varadero/exterior/lz1_near) -"kRU" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail/wire{ - layer = 3.1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/item/lightstick/red/spoke/planted{ - pixel_x = 2; - pixel_y = 15; - explo_proof = 1; - unacidable = 1; - layer = 4.1 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/comms4) "kSd" = ( /obj/structure/machinery/alarm{ dir = 1; @@ -13606,26 +13456,18 @@ /obj/structure/curtain/shower, /turf/open/floor/interior/plastic, /area/varadero/interior/laundry) +"kSw" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/pontoon_beach) "kSz" = ( /obj/structure/barricade/handrail/wire{ dir = 4 }, /turf/open/floor/asteroidfloor/north, /area/varadero/exterior/lz1_near) -"kSD" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/flora/bush/ausbushes/var3/stalkybush, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/interior_protected/caves) "kSN" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/machinery/door/airlock/almayer/maint{ @@ -13678,13 +13520,6 @@ "kVp" = ( /turf/open/floor/shiva/yellow/northwest, /area/varadero/interior/cargo) -"kVq" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/coast/east, -/area/varadero/exterior/lz2_near) "kVE" = ( /obj/structure/window_frame/colony/reinforced, /obj/effect/landmark/lv624/fog_blocker{ @@ -13692,26 +13527,6 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/caves/east) -"kVL" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" - }, -/turf/open/gm/coast/east, -/area/varadero/exterior/comms4) -"kWf" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/farocean) "kWj" = ( /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/carpet, @@ -13794,6 +13609,21 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/shiva/floor3, /area/varadero/interior/mess) +"kZu" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) +"kZL" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/closet/crate, +/obj/item/prop/magazine/dirty/torn/alt, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) "laa" = ( /obj/structure/bed/chair{ dir = 1; @@ -13801,12 +13631,6 @@ }, /turf/open/floor/wood, /area/varadero/interior/hall_SE) -"lab" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 10 - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "lat" = ( /obj/item/device/camera, /turf/open/floor/plating/icefloor/asteroidplating, @@ -13876,6 +13700,18 @@ /obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/wood/wood_broken3, /area/varadero/interior/hall_SE) +"leB" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/comms4) "leF" = ( /obj/structure/machinery/optable{ desc = "This maybe could be used for advanced medical procedures."; @@ -13883,25 +13719,6 @@ }, /turf/open/floor/shiva/floor3, /area/varadero/interior/morgue) -"leG" = ( -/obj/structure/prop/invuln/minecart_tracks{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/prop/invuln/minecart_tracks{ - dir = 5 - }, -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/obj/structure/platform_decoration/kutjevo, -/obj/structure/blocker/invisible_wall/water, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/oob) "leI" = ( /obj/structure/sink{ dir = 1; @@ -13967,16 +13784,6 @@ }, /turf/open/floor/shiva/red/north, /area/varadero/interior/administration) -"lhn" = ( -/obj/structure/catwalk, -/obj/structure/platform{ - dir = 1; - layer = 2.25; - density = 0; - climb_delay = 0 - }, -/turf/open/gm/river/desert/deep/no_slowdown, -/area/varadero/interior/maintenance/north) "lhp" = ( /obj/structure/barricade/wooden{ dir = 4 @@ -14004,15 +13811,6 @@ }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/caves/east) -"liz" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/exterior/monsoon) "liE" = ( /obj/structure/closet/crate/secure/weapon, /obj/effect/landmark/objective_landmark/medium, @@ -14022,6 +13820,11 @@ /obj/structure/pipes/binary/passive_gate, /turf/open/gm/river/desert/deep/no_slowdown, /area/varadero/interior/maintenance/north) +"liN" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "ljt" = ( /obj/structure/prop/structure_lattice{ dir = 1; @@ -14054,6 +13857,12 @@ /obj/structure/prop/rock/brown, /turf/open/gm/river/shallow_ocean_shallow_ocean, /area/varadero/exterior/comms4) +"llU" = ( +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz1_near) "lmd" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/machinery/door/airlock/almayer/maint{ @@ -14081,23 +13890,6 @@ }, /turf/open/floor/prison/chapel_carpet/doubleside/north, /area/varadero/interior/chapel) -"lmS" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" - }, -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pontoon_beach) "lnw" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/flashlight/lamp/green{ @@ -14166,16 +13958,15 @@ }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/digsite) -"lqF" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 +"lql" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 }, /obj/structure/barricade/handrail/wire{ layer = 3.1 }, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/exterior/lz1_near) +/turf/open/gm/river/ocean/deep_ocean, +/area/varadero/exterior/pontoon_beach/lz) "lqM" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -14191,6 +13982,10 @@ /obj/effect/spawner/random/supply_kit, /turf/open/floor/shiva/red/east, /area/varadero/interior/administration) +"lrJ" = ( +/obj/structure/surface/rack, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) "lrR" = ( /obj/structure/girder/displaced, /turf/open/floor/plating/icefloor/asteroidplating, @@ -14267,22 +14062,6 @@ }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/digsite) -"luz" = ( -/obj/structure/prop/invuln/minecart_tracks{ - dir = 8 - }, -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/blocker/invisible_wall/water, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/oob) "luC" = ( /obj/structure/prop/invuln/lattice_prop{ icon_state = "lattice2"; @@ -14296,18 +14075,6 @@ /obj/item/clothing/accessory/storage/black_vest/brown_vest, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves) -"lvt" = ( -/obj/structure/stairs/perspective{ - color = "#6b675e"; - icon_state = "p_stair_full" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/floor/strata/grey_multi_tiles, -/area/varadero/interior_protected/vessel) "lvG" = ( /obj/structure/curtain/red, /turf/open/floor/shiva/multi_tiles/southeast, @@ -14331,19 +14098,6 @@ }, /turf/open/floor/plating/warnplate/northeast, /area/varadero/interior/disposals) -"lwm" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/floor/plating/bare_catwalk, -/area/varadero/exterior/farocean) "lxe" = ( /obj/item/stack/sheet/wood, /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, @@ -14372,19 +14126,6 @@ /obj/structure/closet/secure_closet/personal, /turf/open/floor/shiva/red, /area/varadero/interior/security) -"lxR" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail/wire{ - layer = 3.1 - }, -/obj/item/shard{ - icon_state = "medium" - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pool) "lxT" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/flashlight/lamp/green{ @@ -14448,10 +14189,19 @@ }, /turf/open/floor/shiva/snow_mat/east, /area/varadero/interior/medical) +"lBn" = ( +/turf/closed/wall, +/area/varadero/interior/maintenance/security/south) "lBw" = ( /obj/structure/window/framed/colony/reinforced, /turf/open/floor/shiva/north, /area/varadero/interior/research) +"lCj" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) "lCK" = ( /obj/structure/prop/structure_lattice{ dir = 1; @@ -14474,17 +14224,30 @@ "lDk" = ( /turf/open/floor/shiva/red/southwest, /area/varadero/interior/hall_N) -"lDm" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "lDz" = ( /obj/effect/landmark/queen_spawn, /turf/open/floor/corsat/squareswood/north, /area/varadero/interior_protected/vessel) +"lDA" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail{ + density = 0; + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/obj/structure/prop/structure_lattice{ + density = 0; + desc = "If this is removed, you cannot escape."; + health = 300; + icon_state = "ladder10"; + name = "ladder" + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/pool) "lDF" = ( /turf/closed/wall/rock/brown, /area/varadero/interior_protected/caves/digsite) @@ -14524,16 +14287,6 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/shiva/snow_mat/east, /area/varadero/interior/medical) -"lEV" = ( -/obj/structure/barricade/handrail/wire{ - dir = 8; - layer = 4 - }, -/obj/structure/platform{ - dir = 1 - }, -/turf/open/gm/river/desert/deep/covered, -/area/varadero/interior/maintenance/north) "lEY" = ( /obj/structure/machinery/alarm{ dir = 8; @@ -14548,12 +14301,15 @@ "lFl" = ( /turf/open/floor/plating/icefloor/warnplate/west, /area/varadero/interior/cargo) -"lFr" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 +"lFp" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 }, -/turf/open/floor/strata/grey_multi_tiles, -/area/varadero/interior_protected/vessel) +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz1_near) "lFA" = ( /obj/structure/machinery/storm_siren{ dir = 8; @@ -14607,16 +14363,6 @@ /obj/structure/largecrate/random, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/maintenance/north) -"lGT" = ( -/obj/structure/barricade/handrail/wire{ - dir = 4; - layer = 4 - }, -/obj/structure/platform{ - dir = 1 - }, -/turf/open/gm/river/desert/deep/covered, -/area/varadero/interior/maintenance/north) "lHH" = ( /obj/structure/bed/chair{ dir = 1 @@ -14630,25 +14376,6 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/shiva/floor3, /area/varadero/interior/security) -"lId" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pontoon_beach/lz) "lIo" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 @@ -14663,6 +14390,12 @@ }, /turf/open/floor/asteroidwarning/west, /area/varadero/exterior/lz1_console) +"lIM" = ( +/obj/effect/decal/warning_stripes/asteroid{ + icon_state = "warning_s" + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "lIO" = ( /obj/structure/prop/ice_colony/tiger_rug{ icon_state = "White"; @@ -14700,6 +14433,16 @@ /obj/structure/surface/rack, /turf/open/floor/shiva/wred/southwest, /area/varadero/interior/medical) +"lJJ" = ( +/obj/structure/stairs/perspective{ + color = "#6b675e"; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/turf/open/floor/strata/grey_multi_tiles, +/area/varadero/interior_protected/vessel) "lKI" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/glass/beaker/ethanol{ @@ -14733,14 +14476,6 @@ /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior_protected/caves) -"lMl" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pool) "lMq" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/landmark/crap_item, @@ -14750,9 +14485,34 @@ "lMv" = ( /turf/open/floor/shiva/multi_tiles/west, /area/varadero/interior/hall_SE) +"lMy" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/barricade/wooden{ + dir = 8 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "lMB" = ( /turf/open/floor/asteroidfloor/north, /area/varadero/interior/comms1) +"lMC" = ( +/obj/structure/filtration/coagulation_arm{ + explo_proof = 1; + layer = 2.1; + density = 0 + }, +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/obj/structure/barricade/handrail/wire{ + dir = 8; + layer = 2.991 + }, +/obj/structure/platform/metal/almayer, +/turf/open/gm/river/desert/deep/covered, +/area/varadero/interior/maintenance/north) "lMD" = ( /obj/structure/surface/table/reinforced/prison, /turf/open/floor/shiva/multi_tiles/southeast, @@ -14782,14 +14542,17 @@ }, /turf/open/floor/carpet, /area/varadero/interior/research) -"lNL" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 +"lNy" = ( +/obj/structure/prop/ice_colony/dense/planter_box/plated{ + dir = 9; + icon_state = "planter_box_soil" }, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/exterior/lz1_near) +/obj/structure/flora/bush/ausbushes/pointybush{ + icon_state = "pointybush_2"; + pixel_y = 11 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "lNX" = ( /obj/structure/machinery/light{ dir = 4 @@ -14804,22 +14567,10 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior_protected/maintenance/south) -"lPj" = ( -/obj/structure/prop/invuln/minecart_tracks{ - dir = 8 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/blocker/invisible_wall/water, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/oob) +"lOL" = ( +/obj/structure/platform_decoration/metal/kutjevo, +/turf/open/floor/strata/grey_multi_tiles, +/area/varadero/interior_protected/vessel) "lPk" = ( /obj/item/stack/cable_coil/cut{ pixel_x = 1; @@ -14830,6 +14581,10 @@ "lPq" = ( /turf/open/floor/shiva/red/east, /area/varadero/interior/morgue) +"lPR" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) "lQg" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3"; @@ -14917,26 +14672,10 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance) -"lUG" = ( -/obj/structure/platform_decoration/kutjevo, -/turf/open/gm/river/ocean/deep_ocean, -/area/varadero/exterior/farocean) "lUT" = ( /obj/structure/machinery/smartfridge, /turf/open/floor/shiva/green/southwest, /area/varadero/interior/mess) -"lVa" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/floor/asteroidwarning, -/area/varadero/interior/comms1) -"lVc" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "lVf" = ( /obj/item/tool/warning_cone{ pixel_x = -9 @@ -15036,24 +14775,6 @@ /obj/structure/holostool, /turf/open/floor/wood, /area/varadero/interior/beach_bar) -"lXT" = ( -/obj/structure/plasticflaps/mining, -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/prop/invuln/minecart_tracks{ - dir = 1 - }, -/obj/structure/blocker/invisible_wall/water, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/oob) "lYi" = ( /obj/structure/surface/table, /obj/item/reagent_container/food/drinks/cup{ @@ -15204,16 +14925,6 @@ /obj/structure/surface/table, /turf/open/floor/shiva/greenfull/west, /area/varadero/interior/hall_SE) -"mcB" = ( -/obj/structure/platform_decoration/kutjevo, -/obj/item/lightstick/red/spoke/planted{ - pixel_x = -10; - pixel_y = 2; - explo_proof = 1; - unacidable = 1 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/eastbeach) "mcN" = ( /obj/structure/coatrack{ pixel_x = 14; @@ -15234,41 +14945,10 @@ "mdg" = ( /turf/open/gm/dirt/desert0, /area/varadero/exterior/lz2_near) -"mdj" = ( -/obj/item/clothing/head/helmet, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) -"mdy" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/ocean/deep_ocean, -/area/varadero/exterior/comms4) "mdL" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior_protected/caves) -"mdM" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/ocean/deep_ocean, -/area/varadero/exterior/farocean) "mdN" = ( /obj/structure/window/framed/colony/reinforced, /turf/open/gm/grass/grass1/weedable, @@ -15378,6 +15058,19 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/cargo) +"mjf" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/item/tool/warning_cone, +/obj/item/lightstick/red/spoke/planted{ + pixel_x = 10; + pixel_y = 2; + explo_proof = 1; + unacidable = 1 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) "mjA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -15455,6 +15148,12 @@ }, /turf/open/floor/plating, /area/varadero/interior_protected/caves/digsite) +"mms" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/security/north) "mmv" = ( /obj/structure/bed/chair{ buckling_y = 18; @@ -15462,20 +15161,10 @@ }, /turf/open/floor/interior/plastic, /area/varadero/interior_protected/caves/digsite) -"mmO" = ( -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/pontoon_beach) +"mmG" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) "mnc" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva/floor3, @@ -15515,18 +15204,14 @@ }, /turf/open/gm/coast/north, /area/varadero/exterior/pontoon_beach) +"mnC" = ( +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) "mnL" = ( /obj/structure/window/framed/colony/reinforced, /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor/plating, /area/varadero/interior_protected/caves/central) -"mnU" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/lz2_near) "mol" = ( /obj/structure/window/phoronreinforced{ dir = 4; @@ -15583,6 +15268,10 @@ /obj/structure/cryofeed, /turf/open/floor/strata/grey_multi_tiles, /area/varadero/interior_protected/vessel) +"mqs" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/security/south) "mqt" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -15637,12 +15326,27 @@ }, /turf/open/floor/shiva/yellow/west, /area/varadero/interior/cargo) +"msS" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/pontoon_beach) "mtp" = ( /obj/structure/machinery/floodlight{ name = "Floodlight" }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/exterior/eastbeach) +"mts" = ( +/obj/structure/barricade/wooden{ + dir = 8 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) "mtx" = ( /obj/structure/prop/invuln/overhead_pipe{ dir = 4; @@ -15690,13 +15394,6 @@ }, /turf/open/shuttle/red, /area/varadero/interior_protected/vessel) -"mvA" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "mvI" = ( /turf/open/floor/shiva/green/east, /area/varadero/interior/hall_SE) @@ -15711,26 +15408,6 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/wood, /area/varadero/interior/court) -"mwm" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/obj/item/reagent_container/food/snacks/carpmeat{ - desc = "This leathery protofish was named the gullible toothfish for the combination of its near identical dentata to that of Homo sapiens sapiens and the fact that if released after being caught, it is not uncommon to catch the same one; it not having learned its lesson. Its meat is said to taste like bitter clove."; - icon = 'icons/obj/items/fishing_atoms.dmi'; - icon_state = "gullible_toothfish_gutted"; - name = "gullible toothfish"; - pixel_x = 1; - pixel_y = -2 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/comms4) "mwD" = ( /obj/item/storage/toolbox/mechanical{ pixel_x = 1; @@ -15772,6 +15449,14 @@ /obj/item/storage/beer_pack, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/caves/east) +"mxK" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/decal/cleanable/dirt, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) "myj" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 @@ -15883,11 +15568,6 @@ "mBG" = ( /turf/open/floor/shiva/yellow, /area/varadero/interior/disposals) -"mCe" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/effect/decal/cleanable/blood/xeno, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "mCx" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -15913,6 +15593,16 @@ }, /turf/open/floor/carpet, /area/varadero/interior/hall_SE) +"mCM" = ( +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/obj/structure/stairs/perspective{ + color = "#6b675e"; + icon_state = "p_stair_full" + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/vessel) "mCX" = ( /obj/structure/prop/structure_lattice{ dir = 1; @@ -15948,18 +15638,6 @@ /obj/structure/machinery/light/small, /turf/open/auto_turf/sand_white/layer1, /area/varadero/exterior/eastbeach) -"mEy" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pontoon_beach) "mEA" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/newspaper{ @@ -15978,6 +15656,12 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/caves/east) +"mFw" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) "mFY" = ( /obj/structure/machinery/vending/coffee, /turf/open/floor/shiva/floor3, @@ -15989,27 +15673,6 @@ /obj/item/tank/anesthetic, /turf/open/floor/shiva/snow_mat, /area/varadero/interior/maintenance) -"mHh" = ( -/obj/structure/machinery/light/small, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) -"mHM" = ( -/obj/structure/prop/invuln/minecart_tracks{ - dir = 8 - }, -/obj/structure/plasticflaps/mining, -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/blocker/invisible_wall/water, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/oob) "mIG" = ( /obj/structure/bed, /obj/item/bedsheet/orange, @@ -16018,28 +15681,6 @@ "mIL" = ( /turf/open/floor/shiva/yellow/north, /area/varadero/interior/cargo) -"mIQ" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/floor/shiva/snow_mat, -/area/varadero/interior/maintenance) -"mIU" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" - }, -/turf/open/gm/coast/east, -/area/varadero/exterior/pontoon_beach) "mJe" = ( /obj/structure/flora/bush/ausbushes/ppflowers, /turf/open/gm/grass/grass1/weedable, @@ -16070,10 +15711,6 @@ }, /turf/open/floor/shiva/redfull, /area/varadero/interior/medical) -"mLg" = ( -/obj/structure/platform_decoration/kutjevo, -/turf/open/gm/river/ocean/deep_ocean, -/area/varadero/exterior/comms4) "mLt" = ( /obj/structure/sign/goldenplaque{ pixel_y = 32 @@ -16086,10 +15723,12 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/exterior/lz1_near) -"mLJ" = ( -/obj/structure/platform_decoration/kutjevo, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior_protected/caves/digsite) +"mMd" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/structure/surface/rack, +/obj/item/ammo_magazine/shotgun/buckshot, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "mMu" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/auto_turf/sand_white/layer1, @@ -16102,18 +15741,6 @@ /obj/item/stack/sheet/wood/small_stack, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/maintenance/north) -"mMX" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/interior_protected/caves) "mMZ" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -16121,6 +15748,18 @@ /obj/structure/surface/rack, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior_protected/maintenance/south) +"mNj" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) "mNm" = ( /obj/structure/machinery/light{ dir = 1 @@ -16136,17 +15775,6 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior_protected/maintenance/south) -"mNT" = ( -/obj/structure/prop/ice_colony/dense/planter_box/plated{ - dir = 9; - icon_state = "planter_box_soil" - }, -/obj/structure/flora/bush/ausbushes/pointybush{ - icon_state = "pointybush_2"; - pixel_y = 11 - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "mOx" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -16279,19 +15907,10 @@ /obj/structure/pipes/vents/pump/on, /turf/open/floor/shiva/north, /area/varadero/interior/electrical) -"mSS" = ( -/obj/structure/prop/invuln/minecart_tracks{ - dir = 1 - }, -/obj/structure/plasticflaps/mining, -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/blocker/invisible_wall/water, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/oob) +"mTe" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, +/turf/open/gm/dirt, +/area/varadero/exterior/lz1_near) "mTD" = ( /obj/structure/machinery/light{ dir = 4 @@ -16326,35 +15945,6 @@ /obj/structure/machinery/photocopier, /turf/open/floor/shiva/purple/east, /area/varadero/interior/research) -"mVj" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/effect/landmark/lv624/fog_blocker{ - time_to_dispel = 25000 - }, -/obj/item/lightstick/red/spoke/planted{ - pixel_x = -1; - pixel_y = 9; - explo_proof = 1; - unacidable = 1 - }, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/exterior/monsoon) -"mVn" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/item/shard{ - icon_state = "medium" - }, -/obj/effect/decal/cleanable/blood/oil, -/turf/open/gm/dirt, -/area/varadero/exterior/monsoon) "mVF" = ( /obj/structure/prop/souto_land/pole{ dir = 1 @@ -16374,15 +15964,19 @@ "mVS" = ( /turf/open/floor/shiva/bluefull/west, /area/varadero/interior/hall_SE) -"mVY" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 +"mWm" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/pontoon_beach/lz) +"mWt" = ( +/obj/structure/platform/stone/kutjevo/north, +/obj/structure/platform/stone/kutjevo, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_y = -3 }, -/obj/item/clothing/under/shorts/grey, /turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pool) +/area/varadero/interior_protected/maintenance/south) "mXi" = ( /obj/effect/landmark/objective_landmark/far, /turf/open/shuttle/elevator, @@ -16423,15 +16017,6 @@ /obj/structure/bed/chair, /turf/open/floor/shiva/multi_tiles/north, /area/varadero/interior/electrical) -"mYA" = ( -/obj/structure/blocker/invisible_wall/water, -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/ocean/deep_ocean, -/area/varadero/exterior/farocean) "mYR" = ( /obj/item/facepaint/sunscreen_stick, /turf/open/floor/plating/icefloor/asteroidplating, @@ -16442,14 +16027,6 @@ "mZi" = ( /turf/open/floor/shiva/green, /area/varadero/interior/court) -"mZk" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/closet/crate, -/obj/item/prop/magazine/dirty/torn/alt, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "mZC" = ( /obj/structure/surface/table/woodentable{ icon_state = "reinf_table" @@ -16495,12 +16072,6 @@ }, /turf/open/gm/dirt/desert1, /area/varadero/exterior/eastbeach) -"nau" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/floor/strata/grey_multi_tiles, -/area/varadero/interior_protected/vessel) "nbA" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva/floor3, @@ -16520,11 +16091,6 @@ }, /turf/open/floor/shiva/red/west, /area/varadero/interior/morgue) -"nch" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "ncn" = ( /obj/item/trash/cheesie, /obj/effect/decal/cleanable/blood, @@ -16569,6 +16135,10 @@ /obj/item/tool/surgery/retractor/predatorretractor, /turf/open/floor/corsat/squareswood/north, /area/varadero/interior_protected/vessel) +"ndF" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, +/turf/open/floor/shiva/snow_mat, +/area/varadero/interior/maintenance) "nee" = ( /obj/structure/barricade/handrail/wire{ layer = 3.1 @@ -16655,62 +16225,12 @@ /obj/structure/surface/table/reinforced/prison, /turf/open/gm/dirt, /area/varadero/exterior/eastbeach) -"nhI" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/effect/landmark/lv624/fog_blocker{ - time_to_dispel = 25000 - }, -/obj/item/lightstick/red/spoke/planted{ - pixel_x = -1; - pixel_y = 9; - explo_proof = 1; - unacidable = 1 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/monsoon) -"nhX" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" - }, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/exterior/comms4) -"nhY" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" +"nhM" = ( +/obj/effect/decal/cleanable/cobweb{ + dir = 1 }, -/obj/structure/platform_decoration/kutjevo, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pontoon_beach) +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "nih" = ( /obj/structure/prop/structure_lattice{ density = 0; @@ -16733,17 +16253,6 @@ /obj/structure/closet/secure_closet/personal/patient, /turf/open/floor/shiva/floor3, /area/varadero/interior/medical) -"njC" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/exterior/lz2_near) "nkd" = ( /obj/structure/surface/table, /obj/item/storage/firstaid/o2, @@ -16767,6 +16276,16 @@ }, /turf/open/floor/carpet, /area/varadero/interior/records) +"nkK" = ( +/obj/structure/prop/ice_colony/dense/planter_box/plated{ + dir = 9; + icon_state = "planter_box_soil" + }, +/obj/structure/flora/bush/ausbushes/pointybush{ + pixel_y = 11 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "nma" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/largecrate/random/mini/small_case/c{ @@ -16838,6 +16357,16 @@ }, /turf/open/floor/shiva/floor3, /area/varadero/interior/hall_N) +"nnB" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/structure/flora/bush/ausbushes/var3/sparsegrass, +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) "nnF" = ( /obj/structure/machinery/vending/snack, /turf/open/floor/shiva/greenfull/west, @@ -16846,6 +16375,20 @@ /obj/item/device/flashlight/lamp/tripod, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/maintenance/south) +"nol" = ( +/obj/structure/plasticflaps/mining, +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/prop/invuln/minecart_tracks{ + dir = 8 + }, +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/structure/blocker/invisible_wall/water, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/oob) "noC" = ( /obj/structure/pipes/vents/pump/on, /turf/open/floor/shiva/multi_tiles, @@ -16895,6 +16438,10 @@ "nrd" = ( /turf/open/floor/white, /area/varadero/interior/security) +"nrm" = ( +/obj/effect/sentry_landmark/lz_1/top_right, +/turf/open/floor/asteroidfloor/north, +/area/varadero/exterior/lz1_near) "nsc" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -16915,6 +16462,18 @@ "nsN" = ( /turf/open/gm/coast/south, /area/varadero/exterior/lz2_near) +"nsU" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz1_near) "nti" = ( /turf/closed/wall/r_wall, /area/varadero/exterior/lz2_near) @@ -16957,6 +16516,12 @@ /obj/structure/window/framed/colony, /turf/open/floor/plating, /area/varadero/interior/medical) +"nyk" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 9 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "nyJ" = ( /obj/structure/closet/hydrant{ pixel_x = -32 @@ -16979,21 +16544,28 @@ "nzr" = ( /turf/open/floor/shiva/green/southeast, /area/varadero/interior/mess) -"nzS" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 +"nzu" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 }, -/obj/structure/machinery/light{ - dir = 4 +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -1; + pixel_y = 9; + explo_proof = 1; + unacidable = 1 }, -/obj/structure/surface/rack, -/obj/item/tool/pickaxe/drill{ - pixel_y = 4 +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) +"nzT" = ( +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 }, -/turf/open/floor/asteroidfloor/north, -/area/varadero/interior/comms1) +/turf/open/floor/plating/bare_catwalk, +/area/varadero/exterior/farocean) +"nAR" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/farocean) "nBc" = ( /turf/open/gm/coast/beachcorner2/south_west, /area/varadero/exterior/lz2_near) @@ -17036,6 +16608,10 @@ "nCF" = ( /turf/open/gm/coast/beachcorner/north_east, /area/varadero/exterior/eastocean) +"nCJ" = ( +/obj/structure/window/framed/colony, +/turf/open/floor/plating, +/area/varadero/interior/maintenance/security/south) "nCV" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/carpet, @@ -17059,16 +16635,6 @@ }, /turf/open/floor/shiva/floor3, /area/varadero/interior/court) -"nDL" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail/wire{ - layer = 3.1 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/lz1_near) "nEE" = ( /obj/structure/prop/server_equipment/laptop/on{ pixel_x = -5 @@ -17091,18 +16657,6 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/disposals) -"nFp" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/interior/caves/north_research) "nFy" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -17119,14 +16673,6 @@ /obj/structure/flora/bush/ausbushes/var3/fernybush, /turf/open/gm/river/shallow_ocean_shallow_ocean, /area/varadero/exterior/pontoon_beach) -"nFH" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/ocean/deep_ocean, -/area/varadero/exterior/comms4) "nFK" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/auto_turf/sand_white/layer1, @@ -17135,6 +16681,21 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/gm/dirt, /area/varadero/exterior/lz2_near) +"nGf" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/structure/prop/rock/brown{ + explo_proof = 1; + unacidable = 1; + name = "sturdy rock(s)"; + desc = "A solidified collection of local minerals. When melted, becomes a substance best known as lava. These look particularly durable." + }, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) "nGE" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/machinery/door/airlock/almayer/engineering{ @@ -17144,15 +16705,6 @@ }, /turf/open/floor/shiva/multi_tiles/north, /area/varadero/interior/comms3) -"nHy" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/item/tool/warning_cone, -/turf/open/gm/dirt, -/area/varadero/exterior/pontoon_beach) "nHA" = ( /turf/open/floor/shiva/red, /area/varadero/interior/security) @@ -17160,21 +16712,6 @@ /obj/structure/girder/displaced, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior_protected/caves) -"nHH" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/obj/structure/flora/bush/desert{ - icon_state = "tree_2"; - pixel_x = -18; - pixel_y = -8 - }, -/obj/structure/prop/ice_colony/dense/planter_box/hydro{ - pixel_x = -17; - pixel_y = -19 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pontoon_beach) "nIF" = ( /obj/structure/reagent_dispensers/water_cooler/stacks{ density = 0; @@ -17204,6 +16741,10 @@ /obj/structure/bed/chair, /turf/open/auto_turf/sand_white/layer1, /area/varadero/exterior/lz1_near) +"nJx" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) "nKd" = ( /obj/structure/prop/turbine_extras, /turf/open/floor/plating/icefloor/asteroidplating, @@ -17259,6 +16800,10 @@ /obj/item/tool/pickaxe, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/caves/east) +"nMN" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, +/turf/open/floor/strata/grey_multi_tiles, +/area/varadero/interior_protected/vessel) "nNe" = ( /obj/structure/window/framed/colony/reinforced, /turf/open/floor/plating, @@ -17318,18 +16863,13 @@ /obj/effect/landmark/ert_spawns/groundside_xeno, /turf/open/gm/dirt, /area/varadero/interior_protected/caves) -"nOM" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 +"nON" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/coast/north, -/area/varadero/exterior/pontoon_beach) +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) "nOO" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/disposalpipe/segment, @@ -17343,18 +16883,6 @@ /obj/item/tool/lighter/zippo/gold, /turf/open/floor/carpet, /area/varadero/interior/research) -"nPx" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/largecrate/random, -/turf/open/floor/asteroidfloor/north, -/area/varadero/interior/comms1) "nPE" = ( /obj/structure/safe, /obj/item/reagent_container/food/drinks/bottle/whiskey, @@ -17421,14 +16949,6 @@ }, /turf/open/floor/shiva/purple/east, /area/varadero/interior/research) -"nQR" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/ocean/deep_ocean, -/area/varadero/exterior/comms4) "nRk" = ( /obj/structure/closet/crate, /obj/item/stack/sheet/metal/med_large_stack, @@ -17477,6 +16997,12 @@ }, /turf/closed/wall, /area/varadero/interior/medical) +"nSW" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/turf/open/floor/plating/bare_catwalk, +/area/varadero/exterior/farocean) "nTj" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1; @@ -17537,27 +17063,16 @@ }, /turf/open/floor/plating/warnplate/east, /area/varadero/interior/disposals) -"nVv" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail/wire{ - layer = 3.1 - }, -/obj/item/lightstick/red/spoke/planted{ - pixel_x = 10; - pixel_y = 22; - explo_proof = 1; - unacidable = 1; - layer = 4.1 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/comms4) "nVy" = ( /obj/structure/closet/coffin, /turf/open/floor/shiva/red/northeast, /area/varadero/interior/morgue) +"nVU" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) "nWg" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -17581,6 +17096,13 @@ }, /turf/open/floor/shiva/floor3, /area/varadero/interior/records) +"nXF" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz2_near) "nXR" = ( /obj/structure/machinery/landinglight/ds2{ dir = 8 @@ -17613,6 +17135,21 @@ }, /turf/open/floor/shiva/north, /area/varadero/interior/cargo) +"nYS" = ( +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/turf/open/floor/plating/bare_catwalk, +/area/varadero/exterior/farocean) +"nYY" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/turf/open/gm/coast/beachcorner2/south_west, +/area/varadero/exterior/pontoon_beach) "nZd" = ( /obj/effect/landmark/survivor_spawner, /turf/open/floor/shiva/floor3, @@ -17728,6 +17265,15 @@ }, /turf/open/floor/shiva/redfull, /area/varadero/interior/medical) +"odf" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) "odw" = ( /obj/structure/machinery/photocopier, /obj/item/storage/firstaid/regular{ @@ -17748,20 +17294,20 @@ /obj/structure/barricade/handrail/wire, /turf/open/floor/shiva/yellow/west, /area/varadero/interior/cargo) -"oef" = ( -/obj/effect/decal/warning_stripes/asteroid{ - icon_state = "warning_s" +"oeC" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) -"oep" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 +/obj/item/reagent_container/food/snacks/carpmeat{ + desc = "Revolting beyond description."; + icon = 'icons/obj/items/fishing_atoms.dmi'; + icon_state = "gullible_toothfish_teeth"; + name = "human-ish teeth"; + pixel_x = 1; + pixel_y = -2 }, -/obj/structure/prop/rock/brown, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/exterior/eastbeach) +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/exterior/comms4) "oeF" = ( /obj/structure/barricade/wooden{ dir = 8 @@ -17833,13 +17379,9 @@ }, /turf/open/floor/shiva/red/northwest, /area/varadero/interior/security) -"ohC" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/coast/beachcorner2/south_west, +"oho" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, +/turf/open/gm/river/shallow_ocean_shallow_ocean, /area/varadero/exterior/pontoon_beach/lz) "ohM" = ( /obj/structure/barricade/wooden{ @@ -17906,17 +17448,6 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/shiva/purple, /area/varadero/interior/research) -"okI" = ( -/obj/structure/surface/rack, -/obj/item/implantpad, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) -"okJ" = ( -/obj/structure/pipes/standard/manifold/hidden/green{ - dir = 8 - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "ola" = ( /obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/plating/icefloor/asteroidplating, @@ -17981,17 +17512,6 @@ /obj/structure/reagent_dispensers/beerkeg, /turf/open/floor/wood/wood_broken3, /area/varadero/interior/beach_bar) -"opP" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/obj/item/shard{ - icon_state = "medium" - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pool) "opW" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/stack/sheet/wood{ @@ -18031,6 +17551,27 @@ /obj/effect/decal/cleanable/dirt, /turf/open/auto_turf/sand_white/layer1, /area/varadero/exterior/monsoon) +"orx" = ( +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 8 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) +"orB" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -1; + pixel_y = 9; + explo_proof = 1; + unacidable = 1 + }, +/turf/open/gm/dirt/desert1, +/area/varadero/exterior/monsoon) "orH" = ( /obj/structure/filingcabinet{ pixel_x = -8; @@ -18084,16 +17625,6 @@ /obj/item/tool/pickaxe, /turf/open/gm/dirt, /area/varadero/exterior/eastbeach) -"otL" = ( -/obj/structure/prop/invuln/minecart_tracks{ - dir = 4 - }, -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/obj/structure/platform_decoration/kutjevo, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/comms1) "otO" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/carpet, @@ -18101,20 +17632,10 @@ "ouy" = ( /turf/closed/wall/r_wall, /area/varadero/interior/caves/east) -"ouP" = ( -/obj/effect/decal/cleanable/blood, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "ouV" = ( /obj/effect/spawner/random/bomb_supply, /turf/open/floor/shiva/yellow/north, /area/varadero/interior/hall_SE) -"ovp" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/turf/open/floor/shiva/snow_mat, -/area/varadero/interior/maintenance) "ovC" = ( /turf/open/floor/carpet, /area/varadero/interior/research) @@ -18213,6 +17734,21 @@ }, /turf/open/gm/dirt, /area/varadero/exterior/lz2_near) +"oyq" = ( +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/pontoon_beach/lz) "oyv" = ( /obj/item/device/flashlight, /turf/open/gm/dirt/desert2, @@ -18253,14 +17789,10 @@ /obj/item/weapon/gun/shotgun/pump, /turf/open/floor/shiva/floor3, /area/varadero/interior/hall_SE) -"ozD" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, +"ozY" = ( +/obj/structure/platform_decoration/metal/kutjevo, /turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/comms4) +/area/varadero/exterior/pontoon_beach) "oAm" = ( /obj/structure/toilet{ dir = 1 @@ -18276,24 +17808,38 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves) -"oAJ" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/item/lightstick/red/spoke/planted{ - pixel_x = -1; - pixel_y = 9; - explo_proof = 1; - unacidable = 1 +"oBb" = ( +/obj/item/stack/tile/plasteel{ + layer = 2.89; + pixel_x = 17; + pixel_y = 16 }, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/exterior/monsoon) +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) "oBj" = ( /obj/structure/machinery/vending/cigarette/colony, /turf/open/floor/shiva/floor3, /area/varadero/interior/hall_N) +"oBl" = ( +/obj/structure/barricade/handrail/wire{ + dir = 8; + layer = 3.5 + }, +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/prop/structure_lattice{ + density = 0; + desc = "If this is removed, you cannot escape."; + health = 300; + icon_state = "ladder10"; + name = "ladder" + }, +/obj/item/shard{ + icon_state = "medium" + }, +/turf/open/floor/shiva/blue/east, +/area/varadero/interior/maintenance) "oBq" = ( /obj/item/shard{ icon_state = "medium" @@ -18356,6 +17902,10 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/shiva/red/southeast, /area/varadero/interior/security) +"oCM" = ( +/obj/effect/sentry_landmark/lz_2/bottom_right, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/exterior/lz2_near) "oCN" = ( /obj/structure/machinery/computer/cameras{ dir = 4 @@ -18366,6 +17916,12 @@ /obj/structure/surface/table/reinforced/prison, /turf/open/floor/shiva/redfull/west, /area/varadero/interior/security) +"oCP" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) "oCR" = ( /turf/open/gm/dirt/desert0, /area/varadero/exterior/lz1_near) @@ -18400,19 +17956,12 @@ }, /turf/open/gm/dirt, /area/varadero/exterior/pontoon_beach) -"oDX" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/obj/structure/platform_decoration/kutjevo{ - dir = 4 +"oEU" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 }, -/obj/structure/prop/invuln/minecart_tracks, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/exterior/lz1_near) -"oET" = ( -/turf/closed/wall/r_wall/unmeltable, -/area/varadero/interior/maintenance/security) +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/interior_protected/caves) "oEX" = ( /obj/structure/closet/crate, /obj/item/clothing/head/helmet, @@ -18442,6 +17991,21 @@ }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/maintenance) +"oHX" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail/wire{ + dir = 8; + layer = 2.991 + }, +/obj/item/shard{ + icon_state = "large"; + pixel_x = -5; + pixel_y = -6 + }, +/turf/open/floor/shiva/blue/east, +/area/varadero/interior/maintenance) "oIc" = ( /obj/structure/prop/rock/brown, /turf/open/gm/coast/beachcorner2/north_east, @@ -18483,10 +18047,6 @@ "oJB" = ( /turf/open/floor/shiva/north, /area/varadero/interior/cargo) -"oJW" = ( -/obj/structure/closet/firecloset/full, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "oJX" = ( /obj/item/stack/sheet/metal, /obj/structure/shuttle/engine/heater{ @@ -18554,20 +18114,12 @@ }, /turf/closed/wall, /area/varadero/interior/cargo) -"oLZ" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" +"oLW" = ( +/obj/structure/machinery/light/small{ + dir = 4 }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pontoon_beach) +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) "oMa" = ( /obj/structure/surface/table, /obj/item/storage/pill_bottle/packet/bicaridine, @@ -18595,12 +18147,6 @@ "oMs" = ( /turf/open/floor/shiva/floor3, /area/varadero/interior/hall_N) -"oNa" = ( -/obj/structure/blocker/invisible_wall/water, -/obj/structure/flora/bush/ausbushes/var3/stalkybush, -/obj/structure/platform_decoration/kutjevo, -/turf/open/gm/river/ocean/deep_ocean, -/area/varadero/exterior/farocean) "oNy" = ( /turf/open/shuttle/elevator, /area/varadero/interior/hall_N) @@ -18627,9 +18173,6 @@ "oPQ" = ( /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/caves/north_research) -"oPV" = ( -/turf/open/floor/plating, -/area/varadero/interior/maintenance/security) "oRx" = ( /obj/structure/closet/crate/secure, /obj/item/trash/eat, @@ -18676,6 +18219,21 @@ /obj/structure/window/framed/colony/reinforced, /turf/open/floor/plating, /area/varadero/interior/electrical) +"oTf" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/pontoon_beach) "oTs" = ( /obj/structure/blocker/fog, /turf/open/gm/coast/beachcorner2/south_east, @@ -18694,14 +18252,6 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/floor/shiva/blue/southwest, /area/varadero/interior/administration) -"oTX" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/floor/asteroidfloor/north, -/area/varadero/interior/comms1) "oUh" = ( /obj/structure/cable/heavyduty{ icon_state = "1-2" @@ -18724,6 +18274,15 @@ /obj/item/storage/box/engineer, /turf/open/floor/shiva/yellow/north, /area/varadero/interior/electrical) +"oUU" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/structure/flora/bush/ausbushes/var3/stalkybush{ + pixel_y = 9 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/interior_protected/caves) "oVm" = ( /obj/structure/surface/rack, /obj/item/storage/toolbox/electrical, @@ -18733,16 +18292,6 @@ "oVn" = ( /turf/open/floor/shiva/blue/east, /area/varadero/interior/technical_storage) -"oVp" = ( -/obj/structure/prop/invuln/minecart_tracks, -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/comms1) "oVr" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -18791,6 +18340,15 @@ /obj/effect/landmark/yautja_teleport, /turf/open/shuttle/red, /area/varadero/interior_protected/vessel) +"oXd" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/turf/open/floor/plating/bare_catwalk, +/area/varadero/exterior/farocean) "oXf" = ( /turf/open/floor/carpet, /area/varadero/interior/chapel) @@ -18843,6 +18401,21 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva/red/north, /area/varadero/interior/medical) +"oZo" = ( +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/pontoon_beach/lz) +"oZv" = ( +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 1 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "oZw" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/disposalpipe/segment, @@ -18909,16 +18482,6 @@ "pbt" = ( /turf/closed/wall, /area/varadero/interior/mess) -"pbw" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/machinery/door/airlock/almayer/maint{ - dir = 1; - name = "\improper Underground Maintenance"; - req_access_txt = "100"; - req_one_access = null - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "pbM" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ dir = 1; @@ -18980,25 +18543,6 @@ /obj/structure/prop/rock/brown, /turf/open/gm/coast/beachcorner2/north_east, /area/varadero/interior/caves/north_research) -"per" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pool) "peA" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -19008,12 +18552,6 @@ "pfd" = ( /turf/open/gm/coast/beachcorner/north_east, /area/varadero/exterior/pontoon_beach) -"pfr" = ( -/obj/structure/pipes/standard/manifold/hidden/green{ - dir = 4 - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "pfL" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -19025,6 +18563,21 @@ /obj/structure/reagent_dispensers/beerkeg/alt, /turf/open/floor/freezerfloor, /area/varadero/interior/cargo) +"pfU" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/pontoon_beach) "pgg" = ( /obj/item/tool/pickaxe, /turf/open/gm/coast/south, @@ -19095,6 +18648,18 @@ /obj/item/book/manual/research_and_development, /turf/open/floor/carpet, /area/varadero/interior/library) +"pjr" = ( +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/pontoon_beach/lz) "pjs" = ( /obj/structure/bed/chair, /turf/open/floor/shiva/floor3, @@ -19110,6 +18675,15 @@ /obj/item/circuitboard/apc, /turf/open/floor/shiva, /area/varadero/interior/technical_storage) +"pjK" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/turf/open/gm/river/ocean/deep_ocean, +/area/varadero/exterior/farocean) "pkj" = ( /obj/item/tool/weldingtool, /turf/open/gm/dirt, @@ -19164,28 +18738,9 @@ }, /turf/open/gm/dirt, /area/varadero/exterior/eastbeach) -"plm" = ( -/obj/effect/decal/cleanable/blood/gibs/xeno, -/turf/open/floor/asteroidfloor/north, -/area/varadero/exterior/lz1_near) "plq" = ( /turf/open/gm/coast/beachcorner2/north_east, /area/varadero/exterior/eastocean) -"plF" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/item/reagent_container/food/snacks/carpmeat{ - desc = "Revolting beyond description."; - icon = 'icons/obj/items/fishing_atoms.dmi'; - icon_state = "gullible_toothfish_teeth"; - name = "human-ish teeth"; - pixel_x = 1; - pixel_y = -2 - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/exterior/comms4) "plN" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -19204,6 +18759,15 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/white, /area/varadero/interior/toilets) +"pms" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/turf/open/gm/river/ocean/deep_ocean, +/area/varadero/exterior/comms4) "pmy" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/ashtray/plastic, @@ -19368,14 +18932,6 @@ }, /turf/open/floor/carpet, /area/varadero/interior/security) -"psd" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/exterior/lz1_near) "psk" = ( /obj/structure/closet/secure_closet/bar, /turf/open/floor/wood/wood_broken, @@ -19391,14 +18947,6 @@ /obj/effect/spawner/random/toolbox, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance) -"ptp" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/comms4) "ptw" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva/multi_tiles, @@ -19457,6 +19005,12 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance) +"pvC" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/farocean) "pvQ" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, /turf/open/auto_turf/sand_white/layer1, @@ -19486,6 +19040,18 @@ }, /turf/open/floor/shiva/north, /area/varadero/interior/cargo) +"pxC" = ( +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/turf/open/gm/river/ocean/deep_ocean, +/area/varadero/exterior/comms4) "pyk" = ( /obj/item/reagent_container/food/snacks/wrapped/barcardine{ pixel_y = 7 @@ -19502,6 +19068,16 @@ /obj/effect/landmark/corpsespawner/colonist/burst, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior_protected/maintenance/south) +"pyR" = ( +/obj/structure/stairs/perspective{ + color = "#6b675e"; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/turf/open/floor/strata/grey_multi_tiles, +/area/varadero/interior_protected/vessel) "pAa" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -19561,12 +19137,6 @@ }, /turf/open/floor/shiva/red/northeast, /area/varadero/interior/administration) -"pBS" = ( -/obj/effect/decal/cleanable/cobweb, -/obj/structure/surface/rack, -/obj/item/ammo_magazine/shotgun/buckshot, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "pCa" = ( /obj/structure/blocker/invisible_wall/water, /obj/structure/flora/bush/ausbushes/var3/stalkybush, @@ -19647,14 +19217,6 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/digsite) -"pEo" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pontoon_beach/lz) "pEE" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -19677,6 +19239,23 @@ /obj/effect/decal/cleanable/blood/gibs/xeno/limb, /turf/open/floor/asteroidfloor/north, /area/varadero/exterior/lz1_near) +"pFZ" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/pontoon_beach) +"pGb" = ( +/obj/structure/prop/ice_colony/dense/planter_box/plated{ + dir = 9; + icon_state = "planter_box_soil" + }, +/obj/structure/flora/bush/ausbushes/pointybush{ + icon_state = "pointybush_3"; + pixel_y = 11 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) "pGc" = ( /obj/structure/window/framed/colony/reinforced, /obj/structure/blocker/forcefield/multitile_vehicles, @@ -19695,6 +19274,12 @@ "pGs" = ( /turf/closed/wall/rock/brown, /area/varadero/interior/oob) +"pGy" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/comms4) "pGJ" = ( /turf/closed/wall/r_wall, /area/varadero/interior/hall_N) @@ -19709,13 +19294,6 @@ /obj/item/stack/sheet/wood, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance/north) -"pIj" = ( -/obj/structure/surface/rack, -/obj/structure/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "pIz" = ( /obj/structure/surface/table, /obj/item/trash/plate{ @@ -19766,6 +19344,16 @@ }, /turf/open/floor/carpet, /area/varadero/interior/hall_SE) +"pJw" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1; + name = "\improper Underground Maintenance"; + req_access_txt = "100"; + req_one_access = null + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "pJA" = ( /obj/structure/prop/invuln/lattice_prop{ icon_state = "lattice8"; @@ -19782,6 +19370,10 @@ /obj/item/book/manual/evaguide, /turf/open/floor/wood, /area/varadero/interior/library) +"pJR" = ( +/obj/structure/platform_decoration/metal/kutjevo, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/farocean) "pJZ" = ( /obj/structure/surface/table, /obj/effect/landmark/objective_landmark/medium, @@ -19891,39 +19483,10 @@ /obj/effect/decal/cleanable/blood/drip, /turf/closed/wall/rock/brown, /area/varadero/exterior/lz2_near) -"pNT" = ( -/obj/structure/barricade/handrail/wire{ - dir = 8; - layer = 3.5 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/prop/structure_lattice{ - density = 0; - desc = "If this is removed, you cannot escape."; - health = 300; - icon_state = "ladder10"; - name = "ladder" - }, -/obj/item/shard{ - icon_state = "medium" - }, -/turf/open/floor/shiva/blue/east, -/area/varadero/interior/maintenance) "pOa" = ( /obj/structure/largecrate/supply, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior_protected/maintenance/south) -"pOg" = ( -/obj/structure/machinery/storm_siren{ - dir = 8; - pixel_x = 3 - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "pOz" = ( /obj/structure/machinery/computer/card{ dir = 8 @@ -19948,6 +19511,15 @@ /obj/structure/machinery/light, /turf/open/floor/asteroidwarning, /area/varadero/interior/comms1) +"pPE" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/turf/open/gm/coast/east, +/area/varadero/exterior/comms4) "pQp" = ( /turf/closed/wall/r_wall, /area/varadero/interior/technical_storage) @@ -19998,24 +19570,20 @@ }, /turf/open/floor/shiva/snow_mat/west, /area/varadero/interior/security) +"pRC" = ( +/obj/structure/prop/invuln/minecart_tracks{ + dir = 1 + }, +/obj/structure/plasticflaps/mining, +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/obj/structure/blocker/invisible_wall/water, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/oob) "pRP" = ( /turf/open/floor/shiva/yellowfull/west, /area/varadero/interior/hall_SE) -"pRR" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail/wire{ - layer = 3.1 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pool) "pRV" = ( /turf/open/gm/coast/beachcorner2/north_east, /area/varadero/exterior/comms4) @@ -20026,6 +19594,13 @@ /obj/structure/inflatable/door, /turf/open/floor/interior/plastic, /area/varadero/interior_protected/caves/digsite) +"pSu" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, +/obj/structure/surface/rack, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "pSD" = ( /obj/structure/bed/chair, /obj/structure/machinery/light{ @@ -20065,35 +19640,6 @@ /obj/effect/decal/cleanable/blood/oil/streak, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/digsite) -"pTQ" = ( -/obj/structure/barricade/handrail/wire{ - layer = 3.1 - }, -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/ocean/deep_ocean, -/area/varadero/exterior/comms4) -"pUi" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" - }, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/exterior/lz1_near) "pUW" = ( /obj/item/stack/tile/plasteel{ pixel_x = 4; @@ -20258,6 +19804,17 @@ "pZT" = ( /turf/open/gm/coast/beachcorner2/north_east, /area/varadero/exterior/lz2_near) +"qaB" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; + dir = 1; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz1_near) "qaE" = ( /turf/open/floor/wood, /area/varadero/interior/dock_control) @@ -20270,6 +19827,10 @@ /obj/structure/sign/safety/water, /turf/closed/wall, /area/varadero/interior/library) +"qbB" = ( +/obj/structure/closet/crate/trashcart, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) "qbX" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -20277,6 +19838,13 @@ /obj/item/stack/sheet/metal, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/digsite) +"qcv" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/structure/prop/rock/brown, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/eastbeach) "qcC" = ( /obj/structure/stairs/perspective{ color = "#6b675e"; @@ -20300,6 +19868,12 @@ "qcN" = ( /turf/closed/wall, /area/varadero/interior/medical) +"qcQ" = ( +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/pontoon_beach) "qdd" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -20416,6 +19990,16 @@ }, /turf/open/floor/shiva/red, /area/varadero/interior/hall_N) +"qhd" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/turf/open/gm/coast/beachcorner/north_west, +/area/varadero/exterior/pontoon_beach/lz) +"qhE" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, +/turf/closed/wall/rock/brown, +/area/varadero/exterior/pontoon_beach) "qhF" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/wood, @@ -20434,18 +20018,6 @@ /obj/effect/spawner/random/tool, /turf/open/gm/dirt, /area/varadero/exterior/monsoon) -"qhQ" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - icon_state = "p_stair_full" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/lz1_near) "qhZ" = ( /obj/structure/window/framed/colony/reinforced, /turf/open/floor/shiva/floor3, @@ -20490,11 +20062,6 @@ }, /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/laundry) -"qjg" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/effect/decal/remains/human, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "qjU" = ( /obj/effect/overlay/palmtree_r{ icon_state = "palm2" @@ -20525,23 +20092,39 @@ /obj/item/stack/tile/plasteel, /turf/open/floor/carpet, /area/varadero/interior/hall_SE) -"qlW" = ( -/obj/structure/surface/table, -/obj/item/trash/plate, -/turf/open/floor/shiva/floor3, -/area/varadero/interior/mess) -"qmF" = ( -/obj/structure/platform/kutjevo/smooth{ +"qlE" = ( +/obj/structure/stairs/perspective{ + color = "#b29082"; dir = 8; - climb_delay = 1; - layer = 2.99 + icon_state = "p_stair_ew_half_cap" }, -/obj/structure/machinery/storm_siren{ - dir = 4; - pixel_x = -3 +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz1_near) +"qlS" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/obj/structure/platform_decoration/metal/kutjevo/north, /turf/open/gm/river/shallow_ocean_shallow_ocean, /area/varadero/exterior/pontoon_beach) +"qlW" = ( +/obj/structure/surface/table, +/obj/item/trash/plate, +/turf/open/floor/shiva/floor3, +/area/varadero/interior/mess) +"qmh" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) "qnf" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/disposalpipe/junction, @@ -20573,15 +20156,6 @@ /obj/structure/closet/fireaxecabinet, /turf/closed/wall/r_wall, /area/varadero/interior/electrical) -"qoj" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/obj/effect/overlay/palmtree_r, -/turf/open/gm/dirt, -/area/varadero/exterior/comms4) "qoy" = ( /obj/effect/landmark/objective_landmark/science, /turf/open/floor/shiva/purple, @@ -20651,19 +20225,6 @@ }, /turf/open/gm/river/shallow_ocean_shallow_ocean, /area/varadero/exterior/pontoon_beach) -"qsb" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/prop/rock/brown{ - explo_proof = 1; - unacidable = 1; - name = "sturdy rock(s)"; - desc = "A solidified collection of local minerals. When melted, becomes a substance best known as lava. These look particularly durable." - }, -/turf/open/gm/coast/south, -/area/varadero/exterior/pontoon_beach) "qsh" = ( /obj/structure/closet/secure_closet/security, /obj/structure/machinery/light{ @@ -20675,6 +20236,13 @@ }, /turf/open/floor/shiva/red/east, /area/varadero/interior/security) +"qsJ" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/flora/bush/ausbushes/var3/fullgrass, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/security/north) "qto" = ( /obj/structure/machinery/door/airlock/almayer/security/glass{ name = "\improper Underground Security Interrogation"; @@ -20695,6 +20263,14 @@ }, /turf/closed/wall/rock/brown, /area/varadero/interior/oob) +"qtC" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/item/stack/sheet/metal, +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) "qtQ" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/microwave{ @@ -20706,6 +20282,12 @@ }, /turf/open/floor/shiva/purplefull/west, /area/varadero/interior/research) +"quj" = ( +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/comms4) "qul" = ( /turf/closed/wall/rock/brown, /area/varadero/interior/caves/north_research) @@ -20713,14 +20295,22 @@ /obj/structure/surface/table/reinforced/prison, /turf/open/floor/wood, /area/varadero/interior/hall_SE) -"quP" = ( -/obj/effect/landmark/static_comms/net_two, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "quR" = ( /obj/item/stack/sheet/metal, /turf/open/floor/wood, /area/varadero/interior/hall_SE) +"qvk" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/gm/river/ocean/deep_ocean, +/area/varadero/exterior/farocean) "qvo" = ( /obj/structure/window/framed/colony/reinforced, /turf/open/floor/plating, @@ -20729,13 +20319,6 @@ /obj/effect/landmark/corpsespawner/colonist, /turf/open/floor/shiva/multi_tiles/east, /area/varadero/interior/morgue) -"qvO" = ( -/obj/structure/machinery/light/small{ - dir = 1 - }, -/obj/structure/surface/rack, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "qvQ" = ( /obj/structure/bed/chair{ dir = 1 @@ -20792,6 +20375,21 @@ }, /turf/open/floor/corsat/squareswood/north, /area/varadero/interior_protected/vessel) +"qxt" = ( +/obj/structure/flora/bush/desert{ + icon_state = "tree_2"; + pixel_x = -18; + pixel_y = -8 + }, +/obj/structure/prop/ice_colony/dense/planter_box/hydro{ + pixel_x = -17; + pixel_y = -19 + }, +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/pontoon_beach) "qxu" = ( /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/hall_N) @@ -20840,19 +20438,6 @@ }, /turf/open/floor/wood/wood_broken3, /area/varadero/interior/beach_bar) -"qza" = ( -/obj/structure/stairs/perspective{ - color = "#6b675e"; - dir = 1; - icon_state = "p_stair_full" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior_protected/vessel) "qzb" = ( /obj/structure/window/framed/colony, /turf/open/floor/plating/icefloor/asteroidplating, @@ -20881,6 +20466,10 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/gm/grass/grass1/weedable, /area/varadero/interior_protected/caves/swcaves) +"qAa" = ( +/obj/effect/landmark/corpsespawner/colonist/burst, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/security/north) "qAd" = ( /obj/structure/machinery/door/airlock/strata/autoname{ autoname = 0; @@ -20909,29 +20498,20 @@ /obj/item/tool/shovel, /turf/open/gm/dirt, /area/varadero/exterior/lz2_near) -"qAI" = ( -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pontoon_beach/lz) "qAS" = ( /obj/effect/landmark/corpsespawner/colonist/burst, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/maintenance/south) +"qBk" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/structure/flora/bush/ausbushes/var3/stalkybush, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/interior_protected/caves) "qBn" = ( /obj/structure/surface/rack, /obj/effect/decal/cleanable/cobweb{ @@ -20997,18 +20577,6 @@ /obj/structure/inflatable, /turf/open/floor/interior/plastic, /area/varadero/interior_protected/caves/digsite) -"qCY" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/comms4) "qDh" = ( /obj/structure/prop/invuln/lattice_prop{ icon_state = "lattice2"; @@ -21017,13 +20585,6 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance/research) -"qDr" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/turf/closed/wall/rock/brown, -/area/varadero/exterior/pontoon_beach) "qDs" = ( /obj/structure/surface/table/reinforced/prison, /turf/open/floor/shiva/red/southeast, @@ -21055,12 +20616,6 @@ }, /turf/open/floor/shiva/floor3, /area/varadero/interior/security) -"qEc" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/exterior/monsoon) "qEf" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -21076,14 +20631,6 @@ /obj/item/stack/sheet/metal, /turf/open/shuttle/red, /area/varadero/interior_protected/vessel) -"qEt" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/eastbeach) "qEG" = ( /obj/structure/largecrate/supply/supplies/mre, /turf/open/floor/plating/icefloor/asteroidplating, @@ -21125,6 +20672,14 @@ /obj/structure/prop/fishing/line/long/part2, /turf/open/gm/river/ocean/deep_ocean, /area/varadero/exterior/pontoon_beach) +"qHo" = ( +/obj/structure/flora/bush/ausbushes/var3/fullgrass, +/obj/item/stack/tile/plasteel{ + pixel_x = 8; + pixel_y = 6 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/security/north) "qHu" = ( /obj/effect/landmark/hunter_primary, /turf/open/floor/shiva/green/east, @@ -21147,14 +20702,38 @@ /obj/item/tool/wet_sign, /turf/open/floor/shiva/floor3, /area/varadero/interior/hall_SE) +"qIn" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/monsoon) +"qIs" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) "qIF" = ( /turf/open/gm/dirt, /area/varadero/interior/caves/east) +"qJh" = ( +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/turf/open/gm/coast/beachcorner/north_east, +/area/varadero/exterior/comms4) +"qJp" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/turf/open/gm/river/ocean/deep_ocean, +/area/varadero/exterior/comms4) "qJF" = ( /obj/structure/surface/rack, /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance) +"qJZ" = ( +/obj/item/device/flashlight/lamp/tripod, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/security/north) "qKb" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -21173,25 +20752,6 @@ "qKZ" = ( /turf/open/gm/coast/west, /area/varadero/exterior/lz1_near) -"qLf" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pontoon_beach) "qLq" = ( /obj/structure/prop/ice_colony/dense/planter_box/plated{ dir = 9; @@ -21310,18 +20870,6 @@ }, /turf/open/floor/wood, /area/varadero/interior/records) -"qOO" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/ocean/deep_ocean, -/area/varadero/exterior/comms4) "qOS" = ( /obj/item/reagent_container/glass/bucket, /turf/open/auto_turf/sand_white/layer1, @@ -21353,10 +20901,6 @@ }, /turf/open/floor/shiva/yellow/northeast, /area/varadero/interior/disposals) -"qQd" = ( -/obj/structure/closet/secure_closet/engineering_electrical, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "qQe" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -21425,10 +20969,6 @@ }, /turf/open/floor/wood, /area/varadero/interior/court) -"qRP" = ( -/obj/structure/pipes/standard/manifold/hidden/green, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "qSj" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva/yellow, @@ -21441,35 +20981,20 @@ /obj/structure/closet/crate/trashcart, /turf/open/gm/dirt, /area/varadero/exterior/eastbeach) -"qTh" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 +"qTg" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 }, -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/item/lightstick/red/spoke/planted{ - pixel_x = -1; - pixel_y = 9; - explo_proof = 1; - unacidable = 1 - }, -/turf/open/gm/dirt/desert1, -/area/varadero/exterior/monsoon) -"qTs" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 }, -/turf/open/gm/coast/beachcorner2/south_east, +/turf/open/gm/dirt, /area/varadero/exterior/pontoon_beach) "qTz" = ( /obj/structure/flora/pottedplant{ @@ -21484,6 +21009,10 @@ "qTE" = ( /turf/open/gm/dirt/desert1, /area/varadero/exterior/eastbeach) +"qTL" = ( +/obj/structure/window_frame/colony/reinforced, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "qTZ" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, /turf/open/gm/coast/beachcorner2/south_west, @@ -21531,6 +21060,24 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance/research) +"qVq" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/pontoon_beach/lz) "qVD" = ( /obj/item/reagent_container/glass/bucket{ pixel_x = 8; @@ -21592,6 +21139,11 @@ }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/caves/north_research) +"qYw" = ( +/obj/item/reagent_container/glass/bucket/mopbucket, +/obj/item/tool/mop, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "qYE" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/clothing/suit/fire/firefighter{ @@ -21631,25 +21183,6 @@ /obj/item/stack/sheet/wood/small_stack, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance/north) -"rbp" = ( -/obj/structure/prop/invuln/minecart_tracks{ - dir = 8 - }, -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/obj/structure/prop/invuln/minecart_tracks{ - dir = 5 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform_decoration/kutjevo, -/obj/structure/blocker/invisible_wall/water, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/oob) "rbU" = ( /turf/open/floor/wood, /area/varadero/interior/research) @@ -21689,20 +21222,18 @@ }, /turf/open/floor/carpet, /area/varadero/interior/library) -"red" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/machinery/storm_siren{ - dir = 8; - pixel_x = 3 - }, -/turf/open/gm/coast/east, -/area/varadero/exterior/comms4) +"rdU" = ( +/obj/structure/platform_decoration/metal/kutjevo, +/obj/item/tool/warning_cone, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves/digsite) "res" = ( /turf/open/gm/dirt/desert3, /area/varadero/exterior/eastbeach) +"ret" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "rex" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -21720,6 +21251,28 @@ dir = 10 }, /area/varadero/interior/hall_N) +"rfg" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/prop/invuln/minecart_tracks{ + dir = 8 + }, +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/exterior/lz1_near) +"rfm" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/structure/machinery/storm_siren{ + dir = 8; + pixel_x = 3 + }, +/turf/open/gm/coast/east, +/area/varadero/exterior/comms4) "rfn" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -21742,13 +21295,6 @@ "rgb" = ( /turf/open/floor/shiva/green/west, /area/varadero/interior/hall_NW) -"rgf" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/dirt/desert1, -/area/varadero/exterior/lz1_near) "rgg" = ( /obj/structure/girder/displaced, /turf/open/auto_turf/sand_white/layer1, @@ -21768,6 +21314,21 @@ /obj/structure/surface/table, /turf/open/floor/asteroidwarning/east, /area/varadero/exterior/lz1_near) +"rhq" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/pool) "rhu" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/auto_turf/sand_white/layer1, @@ -21776,23 +21337,25 @@ /obj/structure/bed/sofa/pews/flipped, /turf/open/floor/carpet, /area/varadero/interior/chapel) +"riG" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/turf/open/floor/shiva/multi_tiles, +/area/varadero/interior/disposals) "riJ" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/window/framed/colony, /turf/open/floor/plating, /area/varadero/interior/court) -"riM" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/lz2_near) +"riV" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/barricade/wooden, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "rja" = ( /obj/item/toy/beach_ball, /turf/open/gm/river/shallow_ocean_shallow_ocean, @@ -21806,6 +21369,19 @@ /obj/structure/prop/rock/brown, /turf/open/gm/dirt/desert2, /area/varadero/exterior/lz1_near) +"rjs" = ( +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/surface/rack, +/obj/item/tool/pickaxe/drill{ + pixel_y = 4 + }, +/turf/open/floor/asteroidfloor/north, +/area/varadero/interior/comms1) "rjE" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/drinks/coffeecup/uscm{ @@ -21870,14 +21446,6 @@ /obj/item/tool/pickaxe, /turf/open/gm/dirt, /area/varadero/exterior/lz1_near) -"rlI" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pontoon_beach) "rlJ" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -21946,6 +21514,12 @@ /obj/item/tool/surgery/scalpel/predatorscalpel, /turf/open/floor/corsat/squareswood/north, /area/varadero/interior_protected/vessel) +"rnx" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/turf/open/gm/coast/beachcorner2/north_east, +/area/varadero/exterior/pontoon_beach) "rnL" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, /turf/open/gm/river/ocean/deep_ocean, @@ -21983,32 +21557,6 @@ }, /turf/open/floor/shiva/north, /area/varadero/interior/cargo) -"roT" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail{ - density = 0; - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" - }, -/obj/structure/prop/structure_lattice{ - density = 0; - desc = "If this is removed, you cannot escape."; - health = 300; - icon_state = "ladder10"; - name = "ladder" - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pool) -"rpd" = ( -/obj/structure/bed/chair, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "rpu" = ( /turf/closed/wall, /area/varadero/interior/oob) @@ -22016,6 +21564,12 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/gm/dirt, /area/varadero/interior_protected/caves) +"rpF" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz1_near) "rpH" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/box/lights, @@ -22071,18 +21625,6 @@ }, /turf/open/floor/shiva/yellow/north, /area/varadero/interior/disposals) -"rqG" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/ocean/deep_ocean, -/area/varadero/exterior/farocean) "rrp" = ( /obj/item/paper_bin, /obj/item/tool/stamp{ @@ -22129,6 +21671,13 @@ "rsB" = ( /turf/open/floor/shiva/yellow, /area/varadero/interior/electrical) +"rsD" = ( +/obj/structure/blocker/invisible_wall/water, +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/turf/open/gm/river/ocean/deep_ocean, +/area/varadero/exterior/farocean) "rsL" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Underground Security Checkpoint"; @@ -22142,17 +21691,6 @@ }, /turf/open/floor/shiva/floor3, /area/varadero/interior/medical) -"rsO" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/effect/landmark/lv624/fog_blocker{ - time_to_dispel = 25000 - }, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/exterior/monsoon) "rtm" = ( /obj/structure/machinery/camera/autoname/lz_camera, /turf/open/floor/plating/icefloor, @@ -22260,6 +21798,19 @@ "rxe" = ( /turf/open/floor/shiva/yellow/northeast, /area/varadero/interior/cargo) +"rxu" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/prop/invuln/minecart_tracks{ + dir = 8 + }, +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/structure/blocker/invisible_wall/water, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/oob) "rxI" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/prop/invuln/lattice_prop{ @@ -22269,9 +21820,15 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance/research) -"ryD" = ( -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/maintenance/security) +"rxO" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) "ryG" = ( /obj/structure/surface/rack, /obj/item/clothing/under/shorts/red{ @@ -22303,6 +21860,12 @@ /obj/item/clothing/suit/armor/vest, /turf/open/floor/shiva/redfull, /area/varadero/interior/medical) +"rAb" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/turf/open/gm/coast/beachcorner/south_west, +/area/varadero/exterior/pontoon_beach/lz) "rAf" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -22335,24 +21898,35 @@ /obj/structure/flora/bush/ausbushes/var3/ywflowers, /turf/open/gm/dirt, /area/varadero/exterior/lz2_near) +"rBJ" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/comms4) "rBP" = ( /turf/open/floor/shiva/green/west, /area/varadero/interior/hall_SE) +"rCa" = ( +/obj/structure/platform_decoration/metal/kutjevo, +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -10; + pixel_y = 2; + explo_proof = 1; + unacidable = 1 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/eastbeach) "rCf" = ( /obj/structure/largecrate/random/case/small, /turf/open/gm/dirt, /area/varadero/exterior/lz1_near) -"rCs" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 1 - }, -/obj/structure/platform/kutjevo/rock, -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice12"; - pixel_y = -3 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/interior/hall_SE) "rCB" = ( /obj/structure/filingcabinet/chestdrawer{ pixel_x = -8 @@ -22362,6 +21936,15 @@ }, /turf/open/floor/interior/plastic, /area/varadero/interior_protected/caves/digsite) +"rCN" = ( +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/comms4) "rDz" = ( /obj/structure/bed/chair/comfy/orange{ dir = 8 @@ -22372,17 +21955,47 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior_protected/caves) -"rDD" = ( -/obj/structure/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "rDK" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /obj/item/stack/sheet/metal, /turf/open/floor/strata/grey_multi_tiles, /area/varadero/interior_protected/vessel) +"rDM" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 10 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) +"rEi" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/pontoon_beach) +"rEJ" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -1; + pixel_y = 9; + explo_proof = 1; + unacidable = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/monsoon) "rFj" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/landmark/objective_landmark/far, @@ -22431,19 +22044,10 @@ "rHv" = ( /turf/open/floor/shiva/green/north, /area/varadero/interior/hall_N) -"rHE" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/turf/closed/wall/wood, -/area/varadero/interior/beach_bar) -"rIF" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/interior/caves/north_research) +"rIr" = ( +/obj/structure/surface/table, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "rIG" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass{ icon_state = "sparsegrass_3" @@ -22460,6 +22064,10 @@ /obj/structure/window/framed/colony, /turf/open/floor/shiva/floor3, /area/varadero/interior/chapel) +"rJp" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves/digsite) "rJq" = ( /obj/structure/surface/table, /obj/item/pamphlet/skill/engineer{ @@ -22508,42 +22116,22 @@ "rKM" = ( /turf/open/gm/dirt/desert1, /area/varadero/exterior/pontoon_beach) -"rKS" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/item/lightstick/red/spoke/planted{ - pixel_x = -1; - pixel_y = 9; - explo_proof = 1; - unacidable = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/gm/dirt, -/area/varadero/exterior/monsoon) +"rKZ" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/largecrate/supply/supplies/mre, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "rLC" = ( /obj/structure/machinery/photocopier, /turf/open/floor/shiva/wredfull, /area/varadero/interior/medical) -"rLK" = ( -/obj/structure/prop/ice_colony/dense/planter_box/hydro{ - density = 0; - pixel_x = 11; - pixel_y = 9 +"rLS" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 }, -/obj/structure/flora/bush/desert{ - icon_state = "tree_2"; - pixel_x = 10; - pixel_y = 20 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/interior/caves/north_research) +/obj/item/tool/warning_cone, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) "rLU" = ( /obj/structure/pipes/standard/manifold/hidden/green, /turf/open/floor/plating/icefloor/asteroidplating, @@ -22558,13 +22146,6 @@ /obj/structure/flora/bush/ausbushes/var3/fernybush, /turf/open/gm/dirt, /area/varadero/exterior/pontoon_beach) -"rMl" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/coast/south, -/area/varadero/exterior/pontoon_beach) "rMM" = ( /obj/structure/prop/turbine, /obj/structure/prop/turbine_extras/border, @@ -22577,13 +22158,6 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/gm/dirt, /area/varadero/interior/caves/east) -"rNf" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/exterior/comms4) "rNm" = ( /obj/item/stack/sheet/wood, /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, @@ -22599,6 +22173,17 @@ }, /turf/open/floor/shiva/redfull, /area/varadero/interior/medical) +"rNR" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/almayer/maint{ + name = "\improper Underground Maintenance"; + req_access_txt = "100"; + req_one_access = null + }, +/turf/open/floor/plating, +/area/varadero/interior/maintenance/security/south) "rOL" = ( /obj/structure/closet/secure_closet/personal{ density = 0; @@ -22612,6 +22197,10 @@ }, /turf/open/floor/white, /area/varadero/interior/laundry) +"rPp" = ( +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "rPB" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, @@ -22668,14 +22257,32 @@ /obj/item/circuitboard/apc, /turf/open/floor/shiva, /area/varadero/interior/technical_storage) -"rRq" = ( -/obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "rRz" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva/blue/north, /area/varadero/interior/administration) +"rSf" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/item/device/camera{ + pixel_x = -2; + pixel_y = 9 + }, +/obj/item/newspaper{ + layer = 2.99; + pixel_x = 7; + pixel_y = 4 + }, +/obj/structure/surface/table, +/turf/open/gm/dirt, +/area/varadero/exterior/lz1_near) +"rSh" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/lz2_near) "rSl" = ( /obj/item/tool/wrench, /turf/open/gm/dirt, @@ -22762,6 +22369,10 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/electrical) +"rTH" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/farocean) "rTT" = ( /obj/structure/disposaloutlet{ dir = 4 @@ -22775,23 +22386,12 @@ /obj/structure/flora/bush/ausbushes/var3/stalkybush, /turf/open/gm/river/shallow_ocean_shallow_ocean, /area/varadero/exterior/farocean) -"rUc" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 +"rUo" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 }, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/exterior/lz2_near) +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/comms4) "rUw" = ( /obj/structure/window/reinforced{ dir = 4 @@ -22858,17 +22458,6 @@ /obj/structure/flora/bush/ausbushes/var3/ywflowers, /turf/open/gm/grass/grass1/weedable, /area/varadero/interior_protected/caves/central) -"rWY" = ( -/obj/structure/prop/ice_colony/dense/planter_box/plated{ - dir = 9; - icon_state = "planter_box_soil" - }, -/obj/structure/flora/bush/ausbushes/pointybush{ - icon_state = "pointybush_3"; - pixel_y = 11 - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "rXf" = ( /obj/item/stack/cable_coil/cut, /turf/open/floor/shiva/redcorners, @@ -22882,12 +22471,6 @@ }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/maintenance/south) -"rYi" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior_protected/caves/digsite) "rYC" = ( /obj/structure/blocker/invisible_wall/water, /obj/item/lightstick/variant/planted, @@ -22965,6 +22548,10 @@ }, /turf/open/floor/wood, /area/varadero/interior/beach_bar) +"sbG" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "sbP" = ( /obj/structure/machinery/landinglight/ds1/spoke{ pixel_y = -5; @@ -23026,6 +22613,24 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva/yellow, /area/varadero/interior/disposals) +"seV" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/structure/prop/rock/brown{ + explo_proof = 1; + unacidable = 1; + name = "sturdy rock(s)"; + desc = "A solidified collection of local minerals. When melted, becomes a substance best known as lava. These look particularly durable." + }, +/obj/item/lightstick/red/spoke/planted{ + pixel_x = -15; + pixel_y = 5; + explo_proof = 1; + unacidable = 1 + }, +/turf/open/gm/coast/south, +/area/varadero/exterior/pontoon_beach) "seY" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -23191,6 +22796,39 @@ /obj/structure/window/framed/colony, /turf/open/floor/asteroidfloor/north, /area/varadero/interior/maintenance/north) +"siw" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) +"siC" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/gm/coast/south, +/area/varadero/exterior/pontoon_beach) +"sjb" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/pontoon_beach) "sjD" = ( /obj/structure/machinery/light{ dir = 1 @@ -23223,27 +22861,6 @@ /obj/structure/flora/bush/ausbushes/var3/fernybush, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/exterior/lz2_near) -"slA" = ( -/obj/structure/bed/chair/comfy{ - dir = 8; - pixel_x = 12; - pixel_y = 25 - }, -/obj/structure/bed/chair/comfy{ - pixel_x = -7; - pixel_y = 18 - }, -/obj/structure/bed/chair/comfy{ - dir = 8; - pixel_x = 7; - pixel_y = 12 - }, -/obj/structure/bed/chair/comfy{ - dir = 4; - pixel_x = 7 - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "slB" = ( /obj/structure/filingcabinet{ density = 0; @@ -23268,13 +22885,6 @@ }, /turf/open/floor/strata/grey_multi_tiles, /area/varadero/interior_protected/vessel) -"smE" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/reagent_dispensers/watertank, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "smO" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/faxmachine, @@ -23290,12 +22900,6 @@ }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/caves/east) -"sny" = ( -/obj/structure/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "snE" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 8 @@ -23401,12 +23005,16 @@ }, /turf/open/floor/asteroidfloor/north, /area/varadero/exterior/lz1_near) -"ssw" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 +"ssI" = ( +/obj/structure/platform/metal/almayer{ + density = 0; + climb_delay = 0 }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pontoon_beach/lz) +/obj/structure/catwalk{ + layer = 3 + }, +/turf/open/gm/river/desert/deep/no_slowdown, +/area/varadero/interior/maintenance/north) "ssZ" = ( /obj/item/storage/belt/marine, /turf/open/floor/carpet, @@ -23420,17 +23028,6 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance) -"stw" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 1 - }, -/obj/structure/platform/kutjevo/rock, -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice12"; - pixel_y = -3 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/interior/maintenance/security) "stK" = ( /obj/structure/blocker/invisible_wall/water, /turf/open/floor/plating/icefloor/asteroidplating, @@ -23465,13 +23062,15 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/exterior/lz2_near) -"svt" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 +"svz" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 }, -/turf/open/gm/dirt, -/area/varadero/exterior/pontoon_beach) +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/pontoon_beach/lz) "svD" = ( /obj/structure/largecrate/random/case/double, /turf/open/shuttle/elevator/grating, @@ -23496,6 +23095,13 @@ }, /turf/open/floor/carpet, /area/varadero/interior/library) +"svP" = ( +/obj/item/reagent_container/glass/bucket/mopbucket{ + pixel_x = 11 + }, +/obj/effect/sentry_landmark/lz_2/bottom_left, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/exterior/eastbeach) "swf" = ( /obj/structure/bed/chair{ dir = 4 @@ -23535,15 +23141,6 @@ /obj/structure/closet/crate/construction, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/maintenance/south) -"sxL" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/prop/rock/brown, -/turf/open/gm/dirt, -/area/varadero/exterior/monsoon) "sxR" = ( /obj/structure/surface/table, /obj/item/stack/cable_coil{ @@ -23552,10 +23149,6 @@ /obj/item/weapon/gun/energy/yautja/plasmapistol, /turf/open/floor/interior/plastic, /area/varadero/interior_protected/caves/digsite) -"sxY" = ( -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "syb" = ( /obj/structure/surface/rack, /obj/item/ammo_magazine/pistol/mod88, @@ -23675,6 +23268,12 @@ }, /turf/open/floor/shiva/purplefull/west, /area/varadero/interior/research) +"sBl" = ( +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/turf/open/floor/asteroidwarning, +/area/varadero/interior/comms1) "sBF" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/disposalpipe/segment, @@ -23708,10 +23307,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/caves/east) -"sCA" = ( -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "sCJ" = ( /obj/vehicle/train/cargo/trolley, /turf/open/floor/shiva/north, @@ -23743,6 +23338,19 @@ /obj/item/stack/cable_coil/cut, /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/technical_storage) +"sDx" = ( +/obj/structure/platform_decoration/metal/kutjevo, +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/pontoon_beach/lz) "sDE" = ( /obj/structure/prop/ice_colony/dense/planter_box/plated{ dir = 9; @@ -23769,6 +23377,10 @@ /obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/shiva/wred/east, /area/varadero/interior/medical) +"sDX" = ( +/obj/structure/closet/crate, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "sDZ" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -23803,6 +23415,10 @@ "sGo" = ( /turf/open/floor/white, /area/varadero/interior/toilets) +"sGp" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/comms4) "sGY" = ( /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/cargo) @@ -23810,21 +23426,6 @@ /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/shiva/north, /area/varadero/interior/electrical) -"sHJ" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/ocean/deep_ocean, -/area/varadero/exterior/comms4) -"sHO" = ( -/obj/item/stack/tile/plasteel{ - layer = 2.89; - pixel_x = 17; - pixel_y = 16 - }, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/maintenance/security) "sHV" = ( /obj/structure/machinery/landinglight/ds2/delaytwo, /turf/open/floor/asteroidfloor/north, @@ -23866,6 +23467,10 @@ }, /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/hall_SE) +"sIW" = ( +/obj/structure/surface/table/woodentable, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) "sJm" = ( /turf/open/gm/dirt/desert1, /area/varadero/exterior/lz1_near) @@ -23922,12 +23527,6 @@ /obj/structure/machinery/autolathe, /turf/open/floor/shiva/purple/west, /area/varadero/interior/research) -"sKu" = ( -/obj/structure/barricade/wooden{ - dir = 8 - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "sKz" = ( /obj/structure/closet/crate/supply, /obj/item/storage/box/wy_mre, @@ -23955,6 +23554,16 @@ }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/maintenance) +"sLl" = ( +/obj/structure/machinery/power/apc/no_power/north, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) +"sLr" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/exterior/pontoon_beach) "sLO" = ( /obj/item/device/flashlight/slime{ mouse_opacity = 0; @@ -23977,6 +23586,15 @@ /obj/item/prop/magazine/dirty, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/maintenance) +"sMW" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/interior/caves/north_research) "sNa" = ( /obj/structure/window/reinforced/tinted, /turf/open/floor/white, @@ -24100,6 +23718,12 @@ /obj/structure/surface/table, /turf/open/floor/asteroidfloor/north, /area/varadero/exterior/lz1_near) +"sSM" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz1_near) "sSU" = ( /obj/structure/machinery/door/airlock/almayer/command{ dir = 1; @@ -24141,26 +23765,6 @@ }, /turf/open/floor/shiva/floor3, /area/varadero/interior/medical) -"sUj" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/obj/structure/prop/invuln/minecart_tracks{ - dir = 6 - }, -/obj/structure/blocker/invisible_wall/water, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/oob) "sUp" = ( /obj/item/toy/beach_ball, /turf/open/gm/dirt, @@ -24186,14 +23790,6 @@ }, /turf/open/floor/plating, /area/varadero/interior_protected/caves/digsite) -"sVr" = ( -/obj/structure/flora/bush/ausbushes/var3/fullgrass, -/obj/item/stack/tile/plasteel{ - pixel_x = 8; - pixel_y = 6 - }, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/maintenance/security) "sVH" = ( /obj/structure/prop/invuln/lattice_prop{ icon_state = "lattice1"; @@ -24228,24 +23824,12 @@ /obj/item/paper, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance/north) -"sZW" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" +"sZD" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 }, -/obj/structure/machinery/storm_siren{ - dir = 8; - pixel_x = 3 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/comms4) +/turf/open/floor/shiva/snow_mat, +/area/varadero/interior/maintenance) "tak" = ( /obj/structure/surface/table/reinforced/prison, /turf/open/floor/carpet, @@ -24271,6 +23855,18 @@ /obj/structure/pipes/vents/pump, /turf/open/floor/white, /area/varadero/interior/toilets) +"tcV" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/obj/item/shard{ + icon_state = "medium" + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/pool) "tcX" = ( /obj/structure/surface/rack, /obj/item/frame/table, @@ -24283,18 +23879,6 @@ /obj/structure/flora/bush/ausbushes/var3/fullgrass, /turf/open/gm/grass/grass1/weedable, /area/varadero/interior_protected/caves/swcaves) -"tdt" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice3"; - pixel_x = 16; - pixel_y = 24 - }, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/exterior/eastbeach) "tdy" = ( /obj/item/storage/box/donkpockets{ pixel_x = 6; @@ -24311,45 +23895,10 @@ /obj/structure/window/framed/colony/reinforced, /turf/open/floor/plating, /area/varadero/interior_protected/maintenance/south) -"tdX" = ( -/obj/structure/barricade/handrail/wire{ - layer = 3.1 - }, -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/comms4) "teg" = ( /obj/structure/girder, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/exterior/eastbeach) -"ten" = ( -/obj/structure/prop/invuln/minecart_tracks{ - dir = 8 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/closet/crate/miningcar{ - layer = 3.1; - name = "\improper materials storage bin"; - pixel_y = 8 - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/exterior/lz1_near) "teu" = ( /obj/structure/prop/ice_colony/dense/planter_box/plated{ dir = 9; @@ -24390,6 +23939,12 @@ }, /turf/open/floor/shiva/green/east, /area/varadero/interior/hall_N) +"tfp" = ( +/obj/structure/prop/invuln/minecart_tracks, +/obj/structure/platform_decoration/metal/kutjevo/east, +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/comms1) "tfC" = ( /obj/structure/showcase{ color = "#95948B"; @@ -24408,7 +23963,8 @@ }, /obj/item/clothing/mask/yautja_flavor{ anchored = 1; - unacidable = 0 + unacidable = 0; + pixel_y = 10 }, /turf/open/floor/corsat/squareswood/north, /area/varadero/interior_protected/caves/digsite) @@ -24428,17 +23984,6 @@ /obj/item/limb/foot/l_foot, /turf/open/floor/wood, /area/varadero/interior/administration) -"tgC" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/machinery/storm_siren{ - pixel_y = 5 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/monsoon) "tgE" = ( /turf/open/gm/dirt/desert_dug, /area/varadero/exterior/pontoon_beach) @@ -24479,6 +24024,18 @@ /obj/item/tool/pickaxe, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/maintenance) +"tiK" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/lz2_near) "tjn" = ( /obj/structure/prop/structure_lattice{ dir = 1; @@ -24500,14 +24057,6 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/exterior/monsoon) -"tjs" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/floor/plating/bare_catwalk, -/area/varadero/exterior/farocean) "tju" = ( /obj/structure/fence, /obj/effect/decal/warning_stripes{ @@ -24551,39 +24100,22 @@ }, /turf/open/floor/shiva/north, /area/varadero/interior/research) -"tkF" = ( -/obj/structure/prop/rock/brown, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/maintenance/security) +"tkR" = ( +/obj/structure/pipes/standard/manifold/hidden/green{ + dir = 4 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) "tkT" = ( /obj/structure/pipes/vents/pump{ dir = 8 }, /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/administration) -"tkV" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pontoon_beach/lz) +"tlc" = ( +/obj/item/clothing/head/helmet, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "tlq" = ( /obj/item/lightstick/red/spoke/planted{ pixel_x = -10; @@ -24593,25 +24125,12 @@ }, /turf/open/gm/dirt, /area/varadero/exterior/eastbeach) -"tlE" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/lz1_near) "tlG" = ( /obj/structure/machinery/firealarm{ pixel_y = 24 }, /turf/open/floor/white, /area/varadero/interior/toilets) -"tlM" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/effect/decal/cleanable/blood, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "tlT" = ( /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/electrical) @@ -24716,18 +24235,6 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/exterior/lz1_near) -"tqa" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/interior_protected/caves) "tqh" = ( /obj/structure/window/framed/colony/reinforced, /turf/open/floor/plating, @@ -24742,10 +24249,6 @@ }, /turf/open/floor/shiva/multi_tiles/southeast, /area/varadero/interior/medical) -"tqV" = ( -/obj/structure/platform_decoration/kutjevo, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pontoon_beach) "trh" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -24876,6 +24379,20 @@ }, /turf/open/floor/shiva/green, /area/varadero/interior/hall_SE) +"tyc" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) +"tyj" = ( +/obj/structure/blocker/invisible_wall/water, +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/turf/open/floor/plating/bare_catwalk, +/area/varadero/exterior/farocean) "tyT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -24889,12 +24406,6 @@ }, /turf/open/floor/shiva/floor3, /area/varadero/interior/medical) -"tyV" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pontoon_beach/lz) "tzp" = ( /obj/structure/machinery/light{ dir = 8 @@ -24914,11 +24425,12 @@ /obj/effect/landmark/corpsespawner/colonist/burst, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/swcaves) -"tBm" = ( -/obj/structure/surface/rack, -/obj/effect/spawner/random/toolbox, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +"tBn" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/turf/open/gm/river/ocean/deep_ocean, +/area/varadero/exterior/pontoon_beach/lz) "tCl" = ( /obj/structure/window/framed/colony, /turf/open/floor/plating, @@ -24958,13 +24470,6 @@ /obj/structure/largecrate/random/barrel/green, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior_protected/caves) -"tEc" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/turf/closed/wall/rock/brown, -/area/varadero/exterior/lz1_near) "tEF" = ( /obj/structure/prop/rock/brown, /obj/structure/machinery/storm_siren{ @@ -24994,11 +24499,6 @@ /obj/structure/prop/rock/brown, /turf/open/gm/river/ocean/deep_ocean, /area/varadero/exterior/comms4) -"tFQ" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, -/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/maintenance/security) "tFX" = ( /obj/structure/closet/secure_closet/security_empty, /obj/item/ammo_box/magazine/shotgun/buckshot, @@ -25014,13 +24514,6 @@ }, /turf/open/floor/shiva/snow_mat/east, /area/varadero/interior/medical) -"tGw" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/coast/beachcorner2/north_east, -/area/varadero/exterior/pontoon_beach) "tGV" = ( /turf/closed/wall/r_wall/elevator{ dir = 1 @@ -25055,6 +24548,29 @@ }, /turf/open/floor/plating, /area/varadero/interior/hall_N) +"tJx" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice3"; + pixel_x = 16; + pixel_y = 24 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/eastbeach) +"tJI" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/structure/prop/rock/brown{ + explo_proof = 1; + unacidable = 1; + name = "sturdy rock(s)"; + desc = "A solidified collection of local minerals. When melted, becomes a substance best known as lava. These look particularly durable." + }, +/turf/open/gm/coast/beachcorner/south_east, +/area/varadero/exterior/pontoon_beach) "tJT" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/flashlight/lamp/green{ @@ -25090,10 +24606,6 @@ }, /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/records) -"tLu" = ( -/obj/structure/window/framed/colony/reinforced, -/turf/open/floor/plating, -/area/varadero/interior/maintenance/security) "tLS" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /turf/open/gm/dirt, @@ -25136,13 +24648,6 @@ "tMZ" = ( /turf/closed/wall/r_wall/unmeltable, /area/varadero/exterior/lz2_near) -"tNy" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/exterior/pontoon_beach) "tNE" = ( /obj/structure/filingcabinet{ density = 0; @@ -25183,29 +24688,6 @@ }, /turf/open/floor/shiva/yellowfull/west, /area/varadero/interior/hall_NW) -"tOx" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/prop/invuln/minecart_tracks{ - dir = 8 - }, -/obj/structure/blocker/invisible_wall/water, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/oob) -"tOB" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pontoon_beach/lz) "tOK" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/camera{ @@ -25224,13 +24706,6 @@ }, /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/hall_N) -"tPE" = ( -/obj/item/tool/pickaxe, -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior_protected/caves/digsite) "tPI" = ( /obj/structure/machinery/alarm{ pixel_y = 24 @@ -25350,6 +24825,12 @@ }, /turf/open/floor/shiva/redfull/west, /area/varadero/interior/security) +"tUA" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 5 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "tVf" = ( /obj/structure/closet/crate, /obj/item/tool/stamp, @@ -25383,14 +24864,33 @@ /obj/item/maintenance_jack, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior_protected/maintenance/south) -"tWA" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/maintenance/security) +"tWK" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/pontoon_beach) "tWT" = ( /obj/structure/blocker/invisible_wall/water, /turf/open/gm/coast/west, /area/varadero/exterior/farocean) +"tWZ" = ( +/obj/structure/surface/rack, +/obj/item/implantpad, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "tXg" = ( /obj/structure/disposalpipe/trunk{ dir = 8 @@ -25431,15 +24931,6 @@ "tYg" = ( /turf/open/floor/shiva/red, /area/varadero/interior/medical) -"tYw" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/barricade/wooden{ - dir = 8 - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "tYP" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -25458,6 +24949,13 @@ }, /turf/open/floor/shiva/purple, /area/varadero/interior/research) +"tYZ" = ( +/obj/item/stack/tile/plasteel{ + pixel_x = 8; + pixel_y = 6 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/security/north) "tZl" = ( /obj/effect/landmark/lv624/fog_blocker{ time_to_dispel = 25000 @@ -25554,6 +25052,10 @@ /obj/structure/flora/bush/ausbushes/var3/fernybush, /turf/open/gm/river/shallow_ocean_shallow_ocean, /area/varadero/exterior/monsoon) +"udb" = ( +/obj/effect/landmark/static_comms/net_two, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) "udg" = ( /obj/structure/closet/secure_closet/engineering_welding, /obj/effect/landmark/objective_landmark/medium, @@ -25570,6 +25072,12 @@ "uet" = ( /turf/open/gm/coast/beachcorner/north_west, /area/varadero/interior/caves/east) +"uez" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/pontoon_beach/lz) "ueB" = ( /obj/structure/cable, /turf/open/floor/plating/icefloor/asteroidplating, @@ -25686,6 +25194,13 @@ }, /turf/open/floor/shiva/snow_mat/west, /area/varadero/interior/maintenance) +"ukb" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) "ukw" = ( /obj/structure/window/reinforced{ dir = 1 @@ -25766,12 +25281,6 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/wood, /area/varadero/interior/security) -"unH" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/pontoon_beach) "uoh" = ( /obj/structure/flora/bush/desert{ icon_state = "tree_2"; @@ -25800,23 +25309,6 @@ /obj/structure/pipes/vents/pump, /turf/open/floor/shiva/floor3, /area/varadero/interior/security) -"uoU" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/item/shard{ - icon_state = "medium" - }, -/obj/item/lightstick/red/spoke/planted{ - pixel_x = -1; - pixel_y = 9; - explo_proof = 1; - unacidable = 1 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/monsoon) "upb" = ( /obj/structure/barricade/handrail/wire{ dir = 8; @@ -25845,11 +25337,18 @@ }, /turf/open/floor/shiva/floor3, /area/varadero/interior/hall_SE) -"uqw" = ( -/obj/structure/surface/rack, -/obj/item/reagent_container/blood/OMinus, +"uqb" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22"; + pixel_y = 8 + }, +/obj/structure/machinery/storm_siren{ + dir = 8; + pixel_x = 3 + }, /turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/area/varadero/interior/maintenance/security/south) "uqx" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -25861,6 +25360,12 @@ }, /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/maintenance) +"uqB" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/turf/open/gm/river/ocean/deep_ocean, +/area/varadero/exterior/comms4) "uqU" = ( /obj/structure/surface/table/woodentable, /obj/effect/landmark/objective_landmark/close, @@ -25890,17 +25395,17 @@ }, /turf/open/floor/carpet, /area/varadero/interior/research) -"usB" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/structure/machinery/light/small, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "usQ" = ( /obj/item/facepaint/sunscreen_stick, /turf/open/gm/dirt, /area/varadero/exterior/lz2_near) +"usT" = ( +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/obj/item/clothing/under/shorts/grey, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/pool) "uti" = ( /obj/structure/window/framed/colony/reinforced, /turf/open/floor/plating, @@ -25944,10 +25449,21 @@ "uvd" = ( /turf/open/floor/strata/grey_multi_tiles, /area/varadero/interior_protected/vessel) -"uvr" = ( -/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +"uvu" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz1_near) "uvw" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -25973,14 +25489,24 @@ /obj/effect/landmark/objective_landmark/far, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance) +"uvY" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/gm/dirt, +/area/varadero/exterior/pontoon_beach) "uww" = ( /turf/open/floor/shiva/yellow, /area/varadero/interior/hall_N) -"uwJ" = ( -/obj/structure/surface/rack, -/obj/item/tool/screwdriver, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "uwN" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -25995,19 +25521,22 @@ /obj/item/storage/box/lightstick, /turf/open/floor/shiva/yellow/north, /area/varadero/interior/electrical) -"uxi" = ( -/obj/structure/stairs/perspective{ - color = "#6b675e"; - dir = 1; - icon_state = "p_stair_full" +"uwW" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 +/obj/structure/barricade/handrail/wire{ + layer = 3.1 }, -/turf/open/floor/strata/grey_multi_tiles, -/area/varadero/interior_protected/vessel) +/obj/item/lightstick/red/spoke/planted{ + pixel_x = 10; + pixel_y = 22; + explo_proof = 1; + unacidable = 1; + layer = 4.1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/comms4) "uxM" = ( /obj/structure/blocker/invisible_wall/water, /obj/structure/flora/bush/ausbushes/var3/stalkybush, @@ -26061,6 +25590,12 @@ /obj/structure/largecrate/random/barrel/yellow, /turf/open/gm/dirt, /area/varadero/exterior/eastbeach) +"uAO" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/turf/open/gm/coast/north, +/area/varadero/exterior/pontoon_beach) "uBV" = ( /obj/structure/prop/invuln/overhead_pipe{ dir = 4; @@ -26086,6 +25621,15 @@ /obj/item/device/flashlight/lamp/green, /turf/open/floor/wood, /area/varadero/interior/hall_SE) +"uDd" = ( +/obj/structure/platform/stone/kutjevo/north, +/obj/structure/platform/stone/kutjevo, +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_y = -3 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/interior/hall_SE) "uDw" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -26099,12 +25643,18 @@ }, /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/cargo) -"uEc" = ( -/obj/structure/machinery/light/small{ - dir = 8 +"uEw" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/obj/effect/landmark/lv624/fog_blocker{ + time_to_dispel = 25000 + }, +/obj/item/shard{ + icon_state = "medium" + }, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) "uEz" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -26118,16 +25668,6 @@ }, /turf/open/floor/prison/chapel_carpet/doubleside/north, /area/varadero/interior/chapel) -"uEF" = ( -/obj/structure/barricade/handrail/wire{ - layer = 3.1 - }, -/obj/structure/barricade/handrail/wire{ - dir = 4 - }, -/obj/structure/platform, -/turf/open/gm/river/desert/deep/covered, -/area/varadero/interior/maintenance/north) "uEI" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva/yellowfull/west, @@ -26145,19 +25685,20 @@ "uFJ" = ( /turf/open/floor/shiva/red/west, /area/varadero/interior/security) -"uFO" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/eastbeach) "uGf" = ( /obj/effect/decal/warning_stripes{ icon_state = "N" }, /turf/open/floor/shiva/yellowcorners/east, /area/varadero/interior/cargo) +"uGo" = ( +/obj/structure/bed/chair{ + icon_state = "chair_alt"; + pixel_x = 3; + pixel_y = 17 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) "uGs" = ( /obj/structure/machinery/power/terminal{ dir = 8 @@ -26227,23 +25768,6 @@ }, /turf/open/floor/wood/wood_broken6, /area/varadero/interior/dock_control) -"uKY" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pontoon_beach) "uKZ" = ( /obj/item/stack/tile/plasteel{ layer = 2.89; @@ -26252,6 +25776,23 @@ }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/maintenance/south) +"uLv" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/prop/invuln/minecart_tracks{ + dir = 8 + }, +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/structure/closet/crate/miningcar{ + layer = 3.1; + name = "\improper materials storage bin"; + pixel_y = 8 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/exterior/lz1_near) "uLP" = ( /obj/structure/surface/rack, /obj/item/clothing/head/caphat{ @@ -26320,28 +25861,6 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/medical) -"uOk" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/obj/structure/prop/invuln/minecart_tracks{ - dir = 10 - }, -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/obj/structure/blocker/invisible_wall/water, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/oob) "uOo" = ( /obj/structure/pipes/vents/pump, /obj/structure/bed/roller, @@ -26397,32 +25916,42 @@ /obj/structure/window/framed/colony/reinforced, /turf/open/floor/plating, /area/varadero/interior/cargo) -"uSF" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 +"uTg" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 }, -/obj/item/stack/sheet/metal, -/obj/effect/decal/cleanable/blood/oil/streak, -/turf/open/gm/dirt, -/area/varadero/exterior/monsoon) +/obj/structure/prop/invuln/minecart_tracks{ + dir = 8 + }, +/obj/structure/platform_decoration/metal/kutjevo/north, +/obj/structure/prop/invuln/minecart_tracks{ + dir = 5 + }, +/obj/structure/platform_decoration/metal/kutjevo, +/obj/structure/blocker/invisible_wall/water, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/oob) "uTj" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, /turf/open/gm/river/shallow_ocean_shallow_ocean, /area/varadero/exterior/comms4) -"uTq" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/item/device/flashlight/lamp/tripod, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "uTu" = ( /turf/open/gm/coast/beachcorner/south_east, /area/varadero/exterior/pontoon_beach) +"uTv" = ( +/obj/effect/landmark/structure_spawner/setup/distress/xeno_door, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/security/south) "uTA" = ( /obj/effect/landmark/xeno_spawn, /turf/open/floor/corsat/squareswood/north, /area/varadero/interior_protected/vessel) +"uTK" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/turf/open/gm/coast/beachcorner2/south_west, +/area/varadero/exterior/pontoon_beach/lz) "uTV" = ( /turf/open/floor/shiva/wred/west, /area/varadero/interior/medical) @@ -26447,6 +25976,27 @@ /obj/effect/landmark/survivor_spawner, /turf/open/floor/carpet, /area/varadero/interior/chapel) +"uUv" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/pontoon_beach) +"uUw" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/obj/structure/platform_decoration/metal/kutjevo/east, +/obj/structure/prop/invuln/minecart_tracks, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/exterior/lz1_near) "uUF" = ( /obj/structure/barricade/handrail/wire{ layer = 3.1 @@ -26535,6 +26085,15 @@ /obj/structure/pipes/binary/passive_gate, /turf/open/gm/river/desert/deep/no_slowdown, /area/varadero/interior/maintenance/north) +"uXu" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail/wire{ + layer = 3.1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/pool) "uXw" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -26601,6 +26160,12 @@ }, /turf/open/floor/shiva/yellowfull/west, /area/varadero/interior/cargo) +"vaj" = ( +/obj/structure/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "vap" = ( /obj/structure/machinery/alarm{ pixel_y = 24 @@ -26631,6 +26196,10 @@ }, /turf/open/floor/shiva/purple/east, /area/varadero/interior/hall_NW) +"vbE" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/floor/strata/grey_multi_tiles, +/area/varadero/interior_protected/vessel) "vbH" = ( /obj/effect/overlay/palmtree_r{ icon_state = "palm2" @@ -26706,6 +26275,14 @@ /obj/item/device/flashlight/lamp/tripod, /turf/open/gm/dirt, /area/varadero/interior_protected/caves) +"vdU" = ( +/obj/item/stack/tile/plasteel{ + layer = 2.89; + pixel_x = 17; + pixel_y = 16 + }, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/security/north) "vdV" = ( /obj/item/tool/warning_cone{ pixel_x = -9 @@ -26861,12 +26438,12 @@ }, /turf/open/floor/wood, /area/varadero/interior/court) -"viK" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 +"viu" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/pontoon_beach) "viP" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -26908,22 +26485,6 @@ }, /turf/open/floor/freezerfloor, /area/varadero/interior/cargo) -"vjO" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/flora/bush/ausbushes/var3/sparsegrass, -/obj/effect/landmark/lv624/fog_blocker{ - time_to_dispel = 25000 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/monsoon) -"vjZ" = ( -/obj/structure/platform_decoration/kutjevo, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/farocean) "vke" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Underground Visitor Entrance" @@ -26946,10 +26507,6 @@ /obj/item/lightstick/variant/planted, /turf/open/gm/river/ocean/deep_ocean, /area/varadero/exterior/farocean) -"vlw" = ( -/obj/structure/barricade/wooden, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "vlB" = ( /obj/structure/largecrate/random/barrel/white, /turf/open/gm/dirt, @@ -26967,6 +26524,11 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva/north, /area/varadero/interior/electrical) +"vmk" = ( +/obj/structure/surface/rack, +/obj/effect/landmark/objective_landmark/far, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "vmw" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, /turf/open/gm/dirt, @@ -27060,12 +26622,6 @@ /obj/item/stack/sheet/wood, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/caves/east) -"vqR" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/comms4) "vqU" = ( /obj/effect/landmark/corpsespawner/chef, /obj/effect/decal/cleanable/blood, @@ -27163,18 +26719,6 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/shiva/red/northeast, /area/varadero/interior/security) -"vus" = ( -/obj/structure/stairs/perspective{ - color = "#6b675e"; - icon_state = "p_stair_full" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior_protected/vessel) "vuA" = ( /obj/structure/barricade/handrail/wire{ dir = 4 @@ -27227,6 +26771,10 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance/research) +"vwV" = ( +/obj/structure/window/framed/colony/reinforced, +/turf/open/floor/plating, +/area/varadero/interior/maintenance/security/south) "vxi" = ( /obj/effect/decal/cleanable/blood/oil/streak, /turf/open/auto_turf/sand_white/layer1, @@ -27245,15 +26793,6 @@ }, /turf/open/gm/dirt, /area/varadero/exterior/eastbeach) -"vyy" = ( -/obj/structure/catwalk, -/obj/structure/platform{ - layer = 2.15; - density = 0; - climb_delay = 0 - }, -/turf/open/gm/river/desert/deep/no_slowdown, -/area/varadero/interior/maintenance/north) "vyI" = ( /obj/structure/catwalk, /obj/structure/filtration/flacculation_arm{ @@ -27281,21 +26820,12 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/hall_SE) -"vzB" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 +"vzz" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 }, -/obj/item/tool/warning_cone, -/obj/item/lightstick/red/spoke/planted{ - pixel_x = 10; - pixel_y = 2; - explo_proof = 1; - unacidable = 1 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/pontoon_beach) +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/pontoon_beach/lz) "vzH" = ( /obj/structure/barricade/handrail/wire{ layer = 3.1 @@ -27320,6 +26850,18 @@ /obj/structure/machinery/light, /turf/open/floor/shiva/red, /area/varadero/interior/security) +"vAt" = ( +/obj/structure/prop/invuln/lattice_prop{ + icon_state = "lattice12"; + pixel_x = 16; + pixel_y = -8 + }, +/obj/structure/barricade/handrail/wire{ + dir = 4 + }, +/obj/effect/sentry_landmark/lz_2/bottom_left, +/turf/open/floor/asteroidfloor/north, +/area/varadero/exterior/eastbeach) "vAz" = ( /obj/structure/prop/invuln/overhead_pipe{ dir = 4; @@ -27356,17 +26898,6 @@ /obj/effect/landmark/objective_landmark/far, /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/research) -"vBC" = ( -/obj/structure/platform/kutjevo/rock{ - dir = 1 - }, -/obj/structure/platform/kutjevo/rock, -/obj/structure/prop/invuln/lattice_prop{ - icon_state = "lattice12"; - pixel_y = -3 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/interior/cargo) "vBF" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -27469,21 +27000,6 @@ }, /turf/open/floor/freezerfloor, /area/varadero/interior/cargo) -"vDP" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/effect/landmark/lv624/fog_blocker{ - time_to_dispel = 25000 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/monsoon) "vEa" = ( /obj/structure/closet/crate/medical, /obj/item/tool/wirecutters/clippers, @@ -27492,25 +27008,6 @@ /obj/item/storage/firstaid/adv, /turf/open/floor/shiva/red/southeast, /area/varadero/interior/security) -"vEe" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/prop/rock/brown{ - explo_proof = 1; - unacidable = 1; - name = "sturdy rock(s)"; - desc = "A solidified collection of local minerals. When melted, becomes a substance best known as lava. These look particularly durable." - }, -/obj/item/lightstick/red/spoke/planted{ - pixel_x = -15; - pixel_y = 5; - explo_proof = 1; - unacidable = 1 - }, -/turf/open/gm/coast/south, -/area/varadero/exterior/pontoon_beach) "vEg" = ( /obj/structure/flora/bush/ausbushes/var3/fernybush, /turf/open/gm/river/ocean/deep_ocean, @@ -27531,23 +27028,6 @@ /obj/structure/window/framed/colony/reinforced, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance/north) -"vEU" = ( -/obj/structure/plasticflaps/mining, -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/prop/invuln/minecart_tracks{ - dir = 8 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/blocker/invisible_wall/water, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/oob) "vFl" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /turf/open/gm/dirt, @@ -27562,6 +27042,16 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/shiva/north, /area/varadero/interior/hall_N) +"vGb" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/item/shard{ + icon_state = "medium" + }, +/obj/effect/decal/cleanable/blood/oil, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) "vGn" = ( /obj/effect/overlay/palmtree_r{ pixel_x = -11; @@ -27570,6 +27060,15 @@ /obj/structure/flora/bush/ausbushes/var3/sparsegrass, /turf/open/gm/dirt, /area/varadero/exterior/pontoon_beach) +"vGP" = ( +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/obj/item/shard{ + icon_state = "medium" + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/pool) "vGQ" = ( /obj/effect/landmark/lv624/fog_blocker{ time_to_dispel = 25000 @@ -27590,32 +27089,14 @@ /obj/effect/landmark/corpsespawner/colonist/burst, /turf/open/floor/white, /area/varadero/interior/toilets) +"vJf" = ( +/obj/structure/flora/bush/ausbushes/var3/fullgrass, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/security/north) "vJg" = ( /obj/item/tool/shovel, /turf/open/gm/dirt/desert_dug, /area/varadero/exterior/lz1_near) -"vJk" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/prop/invuln/minecart_tracks{ - dir = 1 - }, -/obj/structure/blocker/invisible_wall/water, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/oob) -"vJp" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/structure/largecrate/supply/supplies/mre, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "vKv" = ( /obj/structure/window/framed/colony/reinforced/hull{ explo_proof = 1 @@ -27646,10 +27127,6 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/exterior/comms4) -"vLh" = ( -/obj/structure/platform_decoration/kutjevo, -/turf/open/gm/dirt, -/area/varadero/exterior/lz2_near) "vLk" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/disposalpipe/segment{ @@ -27726,6 +27203,10 @@ /obj/structure/prop/rock/brown, /turf/open/gm/dirt, /area/varadero/exterior/monsoon) +"vNF" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/gm/river/ocean/deep_ocean, +/area/varadero/exterior/comms4) "vNG" = ( /obj/structure/machinery/photocopier, /obj/structure/machinery/computer/cameras/telescreen/entertainment{ @@ -27768,6 +27249,19 @@ }, /turf/open/floor/shiva/floor3, /area/varadero/interior/security) +"vOF" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, +/obj/structure/flora/bush/desert{ + icon_state = "tree_2"; + pixel_x = -18; + pixel_y = -8 + }, +/obj/structure/prop/ice_colony/dense/planter_box/hydro{ + pixel_x = -17; + pixel_y = -19 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/pontoon_beach) "vOW" = ( /obj/item/clothing/suit/armor/vest, /turf/open/floor/wood, @@ -27778,18 +27272,6 @@ }, /turf/open/floor/shiva/floor3, /area/varadero/interior/administration) -"vPh" = ( -/obj/structure/stairs/perspective{ - color = "#6b675e"; - icon_state = "p_stair_full" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/floor/strata/grey_multi_tiles, -/area/varadero/interior_protected/vessel) "vPi" = ( /obj/structure/closet/secure_closet/personal, /obj/item/attachable/magnetic_harness, @@ -27831,31 +27313,20 @@ }, /turf/open/floor/carpet, /area/varadero/interior/chapel) -"vQF" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pontoon_beach/lz) -"vQK" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/exterior/lz1_near) "vQL" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/frame/light_fixture, /turf/open/floor/shiva/yellow/north, /area/varadero/interior/electrical) +"vRm" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/lz2_near) "vRI" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/disposalpipe/segment{ @@ -27992,14 +27463,6 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/closed/wall/rock/brown, /area/varadero/interior_protected/caves/central) -"vWn" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/coast/beachcorner/north_west, -/area/varadero/exterior/pontoon_beach/lz) "vWG" = ( /obj/structure/bed/chair, /obj/structure/machinery/storm_siren{ @@ -28007,10 +27470,6 @@ }, /turf/open/floor/shiva/floor3, /area/varadero/interior/hall_NW) -"vXx" = ( -/obj/effect/decal/cleanable/blood/xeno, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "vXG" = ( /obj/structure/closet/crate/construction, /obj/item/grown/log, @@ -28047,6 +27506,15 @@ }, /turf/open/gm/dirt, /area/varadero/exterior/eastbeach) +"vYO" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/turf/open/gm/river/ocean/deep_ocean, +/area/varadero/exterior/comms4) "vYQ" = ( /obj/structure/window/reinforced{ dir = 4; @@ -28107,37 +27575,10 @@ /obj/effect/landmark/objective_landmark/far, /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/hall_SE) -"vZN" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/stairs/perspective{ - color = "#b29082"; - dir = 8; - icon_state = "p_stair_ew_half_cap" - }, -/obj/item/lightstick/red/spoke/planted{ - pixel_x = 10; - pixel_y = 2; - explo_proof = 1; - unacidable = 1 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/pontoon_beach) "vZO" = ( /obj/effect/landmark/corpsespawner/miner, /turf/open/floor/white, /area/varadero/interior/toilets) -"vZR" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/ocean/deep_ocean, -/area/varadero/exterior/pontoon_beach/lz) "vZS" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva/floor3, @@ -28221,6 +27662,20 @@ /obj/structure/surface/table/reinforced/prison, /turf/open/floor/shiva/snow_mat/east, /area/varadero/interior/medical) +"wdt" = ( +/obj/structure/prop/invuln/minecart_tracks{ + dir = 1 + }, +/obj/structure/plasticflaps/mining, +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/obj/structure/blocker/invisible_wall/water, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/oob) "wdx" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/bed/chair/office/light{ @@ -28228,18 +27683,6 @@ }, /turf/open/floor/shiva/yellow/north, /area/varadero/interior/disposals) -"wdy" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/obj/structure/prop/invuln/minecart_tracks{ - dir = 4 - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/exterior/lz1_near) "wdI" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/shuttle/elevator, @@ -28249,6 +27692,13 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/shiva/blue/east, /area/varadero/interior/administration) +"wel" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/monsoon) "weG" = ( /obj/structure/catwalk, /turf/open/gm/river/desert/deep/no_slowdown, @@ -28276,24 +27726,6 @@ "wfr" = ( /turf/open/floor/shiva/purple/east, /area/varadero/interior/hall_NW) -"wft" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/prop/rock/brown{ - explo_proof = 1; - unacidable = 1; - name = "sturdy rock(s)"; - desc = "A solidified collection of local minerals. When melted, becomes a substance best known as lava. These look particularly durable." - }, -/turf/open/gm/dirt, -/area/varadero/exterior/pontoon_beach) "wfy" = ( /obj/structure/bedsheetbin{ icon_state = "linenbin-empty" @@ -28340,23 +27772,13 @@ }, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior_protected/maintenance/south) -"wgU" = ( -/obj/structure/prop/invuln/minecart_tracks{ - dir = 8 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 +"whi" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 }, -/obj/structure/blocker/invisible_wall/water, -/obj/structure/plasticflaps/mining, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/oob) +/obj/structure/prop/rock/brown, +/turf/open/gm/dirt, +/area/varadero/exterior/monsoon) "wic" = ( /obj/structure/machinery/alarm{ pixel_y = 24 @@ -28391,24 +27813,6 @@ "wjB" = ( /turf/open/floor/asteroidwarning, /area/varadero/interior/comms1) -"wjV" = ( -/obj/structure/window/framed/colony, -/turf/open/floor/plating, -/area/varadero/interior/maintenance/security) -"wkp" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/flora/bush/ausbushes/var3/stalkybush, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/interior_protected/caves) "wkq" = ( /obj/structure/machinery/photocopier, /obj/structure/machinery/firealarm{ @@ -28490,10 +27894,17 @@ }, /turf/open/floor/shiva/floor3, /area/varadero/interior/medical) +"wlW" = ( +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior/maintenance/security/south) "wmg" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva/purplefull/west, /area/varadero/interior/research) +"wmj" = ( +/obj/structure/surface/rack, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "wmt" = ( /obj/structure/largecrate/random/barrel/red, /turf/open/shuttle/elevator/grating, @@ -28515,12 +27926,6 @@ }, /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/hall_NW) -"wng" = ( -/obj/structure/pipes/standard/manifold/hidden/green{ - dir = 1 - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "wno" = ( /turf/open/floor/shiva/green/north, /area/varadero/interior/mess) @@ -28576,6 +27981,21 @@ /obj/structure/girder/displaced, /turf/open/gm/dirt, /area/varadero/exterior/eastbeach) +"wor" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/obj/structure/machinery/storm_siren{ + pixel_y = 5 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/pontoon_beach) "wot" = ( /turf/open/floor/shiva/floor3, /area/varadero/interior/records) @@ -28606,6 +28026,14 @@ }, /turf/open/floor/carpet, /area/varadero/interior/chapel) +"woQ" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, +/obj/structure/prop/invuln/minecart_tracks{ + dir = 4 + }, +/obj/structure/platform_decoration/metal/kutjevo/north, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/exterior/lz1_near) "wph" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/shiva, @@ -28626,6 +28054,11 @@ "wpr" = ( /turf/open/floor/shiva/red/west, /area/varadero/interior/medical) +"wpC" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/obj/structure/machinery/power/port_gen/pacman, +/turf/open/gm/dirt, +/area/varadero/exterior/lz1_near) "wpG" = ( /obj/effect/landmark/monkey_spawn, /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, @@ -28643,9 +28076,6 @@ /obj/item/weapon/gun/rifle/m41a, /turf/open/floor/carpet, /area/varadero/interior/bunks) -"wqb" = ( -/turf/closed/wall/r_wall, -/area/varadero/interior/maintenance/security) "wqc" = ( /obj/structure/prop/invuln/minecart_tracks{ dir = 1 @@ -28820,6 +28250,27 @@ /obj/item/storage/belt/marine/quackers, /turf/open/gm/river/shallow_ocean_shallow_ocean, /area/varadero/exterior/pool) +"wzb" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/gm/coast/east, +/area/varadero/exterior/comms4) +"wzs" = ( +/obj/structure/barricade/wooden{ + dir = 8 + }, +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) "wAx" = ( /obj/effect/landmark/corpsespawner/security, /obj/effect/decal/cleanable/blood, @@ -28898,6 +28349,15 @@ /obj/structure/barricade/wooden, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance/north) +"wEz" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/turf/open/gm/coast/beachcorner2/south_east, +/area/varadero/exterior/pontoon_beach) "wEL" = ( /obj/structure/pipes/standard/manifold/hidden/green, /turf/open/floor/shiva/floor3, @@ -28909,6 +28369,14 @@ }, /turf/open/floor/shiva/snow_mat, /area/varadero/interior/maintenance) +"wFt" = ( +/obj/structure/barricade/handrail/wire{ + dir = 8; + layer = 4 + }, +/obj/structure/platform/metal/almayer/north, +/turf/open/gm/river/desert/deep/covered, +/area/varadero/interior/maintenance/north) "wFx" = ( /obj/item/stack/tile/plasteel{ pixel_x = 8; @@ -28975,14 +28443,6 @@ }, /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/disposals) -"wIg" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/dirt/desert1, -/area/varadero/exterior/lz1_near) "wIm" = ( /obj/structure/disposalpipe/junction{ dir = 8; @@ -29000,25 +28460,6 @@ }, /turf/open/floor/shiva/bluefull/west, /area/varadero/interior/administration) -"wJl" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pontoon_beach) "wJu" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ id = "cargobay"; @@ -29040,6 +28481,14 @@ /obj/item/stack/sandbags/large_stack, /turf/open/gm/dirt, /area/varadero/exterior/lz1_near) +"wLm" = ( +/obj/structure/surface/rack, +/obj/item/fuel_cell, +/obj/item/fuel_cell, +/obj/item/fuel_cell, +/obj/item/fuel_cell, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) "wLq" = ( /turf/open/gm/river/shallow_ocean_shallow_ocean, /area/varadero/exterior/comms4) @@ -29076,10 +28525,6 @@ /obj/structure/window/framed/colony/reinforced, /turf/open/gm/grass/grass1/weedable, /area/varadero/interior/hall_SE) -"wMn" = ( -/obj/structure/reagent_dispensers/watertank, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "wMw" = ( /turf/open/floor/asteroidfloor/north, /area/varadero/exterior/lz1_near) @@ -29095,12 +28540,6 @@ }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/maintenance/south) -"wNI" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/turf/open/floor/strata/grey_multi_tiles, -/area/varadero/interior_protected/vessel) "wNV" = ( /obj/structure/surface/table, /obj/item/storage/box/masks, @@ -29134,43 +28573,14 @@ /obj/effect/landmark/objective_landmark/far, /turf/open/floor/shiva/floor3, /area/varadero/interior/security) -"wPl" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/shallow_ocean_shallow_ocean, -/area/varadero/exterior/pontoon_beach) -"wPv" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail/wire{ - layer = 3.1 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/lz1_near) +"wOU" = ( +/obj/structure/platform_decoration/metal/kutjevo, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/interior_protected/caves/digsite) "wPE" = ( /obj/effect/decal/cleanable/blood/oil/streak, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance/north) -"wPH" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/exterior/monsoon) "wQd" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -29210,22 +28620,6 @@ }, /turf/open/floor/shiva/greenfull/west, /area/varadero/interior/hall_N) -"wRR" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/prop/invuln/minecart_tracks{ - dir = 8 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/blocker/invisible_wall/water, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/oob) "wSx" = ( /turf/closed/wall, /area/varadero/interior/laundry) @@ -29235,12 +28629,10 @@ "wSM" = ( /turf/open/floor/shiva/multi_tiles, /area/varadero/interior_protected/caves/central) -"wSX" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/floor/shiva/yellow/north, -/area/varadero/interior/cargo) +"wTm" = ( +/obj/structure/platform_decoration/metal/kutjevo, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/pontoon_beach) "wTE" = ( /obj/structure/bed/chair{ icon_state = "chair_alt"; @@ -29262,6 +28654,12 @@ }, /turf/open/floor/shiva/yellowfull/west, /area/varadero/interior/disposals) +"wTR" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/interior_protected/caves) "wUj" = ( /obj/structure/window/framed/colony/reinforced, /turf/open/floor/shiva/multi_tiles/north, @@ -29356,16 +28754,6 @@ }, /turf/open/gm/coast/beachcorner/south_west, /area/varadero/exterior/lz1_near) -"wXs" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/maintenance/security) -"wXu" = ( -/obj/structure/surface/rack, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "wXC" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/floor/plating/icefloor/asteroidplating, @@ -29443,19 +28831,6 @@ }, /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/research) -"xce" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/floor/plating/bare_catwalk, -/area/varadero/exterior/farocean) "xcf" = ( /turf/closed/wall/r_wall/elevator, /area/varadero/interior/records) @@ -29492,12 +28867,24 @@ /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/electrical) -"xeO" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, +"xea" = ( +/obj/structure/surface/rack, +/obj/item/tool/screwdriver, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/north) +"xeJ" = ( +/obj/effect/sentry_landmark/lz_2/bottom_right, /turf/open/gm/dirt, -/area/varadero/exterior/monsoon) +/area/varadero/exterior/eastbeach) +"xeL" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/comms4) "xeU" = ( /obj/effect/landmark/lv624/fog_blocker{ time_to_dispel = 25000 @@ -29521,12 +28908,6 @@ /obj/structure/girder, /turf/open/gm/dirt, /area/varadero/exterior/eastbeach) -"xfD" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior_protected/caves/digsite) "xfQ" = ( /turf/open/gm/coast/beachcorner2/north_west, /area/varadero/exterior/monsoon) @@ -29564,6 +28945,12 @@ /obj/effect/overlay/palmtree_r, /turf/open/gm/dirt, /area/varadero/exterior/lz1_near) +"xhj" = ( +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/turf/open/gm/dirt, +/area/varadero/exterior/comms4) "xhs" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -29613,6 +29000,21 @@ /obj/effect/overlay/palmtree_r, /turf/open/auto_turf/sand_white/layer1, /area/varadero/exterior/monsoon) +"xkf" = ( +/obj/structure/prop/invuln/minecart_tracks{ + dir = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/structure/platform_decoration/metal/kutjevo/west, +/obj/structure/prop/invuln/minecart_tracks{ + dir = 5 + }, +/obj/structure/platform_decoration/metal/kutjevo, +/obj/structure/blocker/invisible_wall/water, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/oob) "xkj" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -29633,6 +29035,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/shiva/floor3, /area/varadero/interior/disposals) +"xlC" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/turf/closed/wall/wood, +/area/varadero/interior/beach_bar) "xml" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -29668,20 +29076,23 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/shiva/red/southwest, /area/varadero/interior/morgue) +"xoN" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/barricade/handrail{ + desc = "Your platforms look pretty heavy king, let me support them for you."; + dir = 1; + icon_state = "hr_kutjevo"; + name = "support struts" + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/pool) "xpe" = ( /obj/structure/surface/rack, /obj/item/tool/extinguisher, /turf/open/gm/dirt, /area/varadero/exterior/eastbeach) -"xpk" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/obj/item/stack/tile/plasteel{ - layer = 2.89; - pixel_x = 17; - pixel_y = 16 - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "xpw" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/circuitboard/computer/crew{ @@ -29699,6 +29110,10 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/floor/shiva/blue/west, /area/varadero/interior/technical_storage) +"xpD" = ( +/obj/structure/largecrate/random, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "xpP" = ( /turf/closed/wall/r_wall, /area/varadero/interior/comms1) @@ -29734,19 +29149,6 @@ }, /turf/open/floor/shiva/yellow, /area/varadero/interior/cargo) -"xqS" = ( -/obj/structure/stairs/perspective{ - color = "#6b675e"; - dir = 1; - icon_state = "p_stair_full" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/floor/strata/grey_multi_tiles, -/area/varadero/interior_protected/vessel) "xqY" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -29762,20 +29164,6 @@ }, /turf/open/floor/shiva/yellow/east, /area/varadero/interior/cargo) -"xrl" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/barricade/handrail{ - desc = "Your platforms look pretty heavy king, let me support them for you."; - dir = 1; - icon_state = "hr_kutjevo"; - name = "support struts" - }, -/turf/open/gm/river/ocean/deep_ocean, -/area/varadero/exterior/farocean) "xrA" = ( /obj/structure/machinery/vending/coffee, /turf/open/floor/shiva/purplefull/west, @@ -29855,6 +29243,16 @@ /obj/structure/window/framed/colony/reinforced, /turf/open/floor/plating, /area/varadero/interior/security) +"xwd" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/structure/sign/double/barsign{ + name = "The Salty Cutlass"; + desc = "Come drown your troubles away! Mind the sway." + }, +/turf/closed/wall/wood, +/area/varadero/interior/beach_bar) "xwk" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/packageWrap, @@ -29896,10 +29294,6 @@ }, /turf/open/floor/shiva/multi_tiles, /area/varadero/interior/bunks) -"xxs" = ( -/obj/structure/closet/crate, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "xxE" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -29966,10 +29360,6 @@ /obj/structure/machinery/door/airlock/multi_tile/elevator/research, /turf/open/shuttle/elevator/grating, /area/varadero/interior/hall_N) -"xza" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/interior/maintenance/security) "xzc" = ( /obj/structure/flora/bush/ausbushes/var3/ywflowers, /turf/open/gm/dirt/desert0, @@ -30071,17 +29461,6 @@ /obj/structure/prop/tower, /turf/open/gm/dirt, /area/varadero/exterior/lz2_near) -"xDd" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/lz2_near) "xDf" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 4 @@ -30105,6 +29484,10 @@ /obj/item/lightstick/variant/planted, /turf/open/gm/coast/south, /area/varadero/exterior/farocean) +"xDT" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, +/turf/open/gm/river/ocean/deep_ocean, +/area/varadero/exterior/pontoon_beach) "xEc" = ( /obj/effect/decal/cleanable/blood/oil, /obj/structure/machinery/light, @@ -30136,16 +29519,23 @@ "xFE" = ( /turf/open/floor/wood, /area/varadero/interior/records) +"xFI" = ( +/obj/structure/blocker/invisible_wall/water, +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/obj/item/lightstick/red/spoke/planted{ + pixel_x = 3; + pixel_y = 15; + explo_proof = 1; + unacidable = 1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/farocean) "xFO" = ( /obj/item/device/flashlight, /turf/open/floor/shiva/floor3, /area/varadero/interior/mess) -"xFS" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/turf/closed/wall/rock/brown, -/area/varadero/exterior/pontoon_beach) "xFZ" = ( /obj/structure/filingcabinet, /obj/structure/machinery/light{ @@ -30191,11 +29581,6 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/asteroidfloor/north, /area/varadero/exterior/lz1_near) -"xJt" = ( -/obj/structure/surface/table, -/obj/effect/spawner/random/toolbox, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "xJx" = ( /obj/structure/machinery/photocopier, /obj/structure/machinery/light{ @@ -30207,9 +29592,6 @@ /obj/structure/flora/bush/ausbushes/var3/stalkybush, /turf/open/gm/coast/beachcorner2/north_west, /area/varadero/exterior/lz2_near) -"xJZ" = ( -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "xKo" = ( /obj/structure/surface/table, /obj/item/storage/wallet/random{ @@ -30288,13 +29670,6 @@ /obj/structure/lz_sign/new_varadero, /turf/open/floor/asteroidfloor/north, /area/varadero/exterior/lz1_near) -"xLB" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/turf/open/gm/river/ocean/deep_ocean, -/area/varadero/exterior/pontoon_beach/lz) "xLE" = ( /obj/structure/noticeboard{ pixel_y = 32 @@ -30306,6 +29681,10 @@ /obj/structure/machinery/vending/coffee, /turf/open/floor/shiva/redfull/west, /area/varadero/interior/medical) +"xLQ" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, +/turf/open/floor/shiva/snow_mat, +/area/varadero/interior/maintenance) "xMq" = ( /obj/structure/pipes/standard/manifold/hidden/green, /turf/open/floor/shiva/floor3, @@ -30331,6 +29710,20 @@ "xNR" = ( /turf/closed/wall, /area/varadero/interior/bunks) +"xNX" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/obj/structure/prop/invuln/minecart_tracks{ + dir = 6 + }, +/obj/structure/platform_decoration/metal/kutjevo/north, +/obj/structure/blocker/invisible_wall/water, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/oob) "xNY" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -30362,13 +29755,6 @@ /obj/item/tool/wrench, /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/exterior/lz1_near) -"xOX" = ( -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/exterior/lz1_near) "xPj" = ( /obj/structure/machinery/light{ dir = 8 @@ -30415,24 +29801,19 @@ "xRF" = ( /turf/closed/wall, /area/varadero/interior/hall_N) +"xRO" = ( +/turf/closed/wall/r_wall, +/area/varadero/interior/maintenance/security/south) "xSl" = ( /obj/item/device/flashlight/lamp/tripod, /turf/open/gm/grass/grass1/weedable, /area/varadero/interior_protected/caves/central) -"xSZ" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8; - climb_delay = 1; - layer = 2.99 +"xSL" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 }, -/obj/item/lightstick/red/spoke/planted{ - pixel_x = -1; - pixel_y = 9; - explo_proof = 1; - unacidable = 1 - }, -/turf/open/gm/dirt, -/area/varadero/exterior/eastbeach) +/turf/open/gm/river/ocean/deep_ocean, +/area/varadero/exterior/farocean) "xTd" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 4 @@ -30443,6 +29824,14 @@ /obj/structure/prop/rock/brown, /turf/open/gm/river/shallow_ocean_shallow_ocean, /area/varadero/exterior/farocean) +"xTD" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8; + pixel_x = -6; + pixel_y = 3 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "xTH" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -30474,6 +29863,16 @@ "xUH" = ( /turf/open/floor/wood/wood_broken3, /area/varadero/interior/court) +"xUM" = ( +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/obj/structure/machinery/storm_siren{ + dir = 4; + pixel_x = -3 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/pontoon_beach) "xVe" = ( /obj/item/prop/helmetgarb/bullet_pipe{ pixel_x = -8; @@ -30576,6 +29975,15 @@ /obj/structure/prop/rock/brown, /turf/open/gm/dirt, /area/varadero/interior_protected/caves/swcaves) +"xZj" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/east{ + climb_delay = 1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/exterior/pontoon_beach) "xZv" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -30647,16 +30055,6 @@ /obj/item/device/flashlight/lamp, /turf/open/floor/carpet, /area/varadero/interior/library) -"ybt" = ( -/obj/structure/prop/ice_colony/dense/planter_box/plated{ - dir = 9; - icon_state = "planter_box_soil" - }, -/obj/structure/flora/bush/ausbushes/pointybush{ - pixel_y = 11 - }, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "ybY" = ( /obj/structure/surface/table, /obj/item/paper_bin, @@ -30722,11 +30120,6 @@ /obj/structure/window/reinforced, /turf/open/floor/strata/grey_multi_tiles, /area/varadero/interior_protected/vessel) -"yeF" = ( -/obj/item/reagent_container/glass/bucket/mopbucket, -/obj/item/tool/mop, -/turf/open/floor/plating/icefloor/asteroidplating, -/area/varadero/interior/maintenance/security) "yeG" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/frame/camera, @@ -30792,12 +30185,29 @@ }, /turf/open/floor/plating, /area/varadero/interior_protected/caves/digsite) +"ygh" = ( +/obj/structure/platform/metal/kutjevo_smooth{ + climb_delay = 1 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/exterior/lz1_near) "ygn" = ( /obj/structure/catwalk{ explo_proof = 1 }, /turf/open/gm/river/desert/deep/no_slowdown, /area/varadero/interior/maintenance/north) +"ygy" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/item/shard{ + icon_state = "large"; + pixel_x = -5; + pixel_y = -6 + }, +/turf/open/floor/plating/icefloor/asteroidplating, +/area/varadero/interior/maintenance/security/south) "ygT" = ( /obj/structure/surface/table, /obj/item/storage/firstaid/fire, @@ -30846,18 +30256,6 @@ /obj/structure/flora/bush/ausbushes/var3/brflowers, /turf/open/gm/grass/grass1/weedable, /area/varadero/interior_protected/caves/swcaves) -"yhZ" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4; - climb_delay = 1; - layer = 2.99 - }, -/obj/structure/platform/kutjevo/smooth{ - climb_delay = 1; - layer = 2.99 - }, -/turf/open/auto_turf/sand_white/layer1, -/area/varadero/exterior/lz2_near) "yil" = ( /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior/maintenance) @@ -30933,6 +30331,15 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/floor/shiva/floor3, /area/varadero/interior/medical) +"ykJ" = ( +/obj/structure/platform/metal/kutjevo_smooth/north{ + climb_delay = 1 + }, +/obj/structure/platform/metal/kutjevo_smooth/west{ + climb_delay = 1 + }, +/turf/open/gm/river/shallow_ocean_shallow_ocean, +/area/varadero/interior_protected/caves) "ykM" = ( /obj/effect/overlay/palmtree_r{ icon_state = "palm2" @@ -31989,9 +31396,9 @@ xCn oPQ xCn cBI -xCn -xCn -ljt +jQa +jQa +dCb pGs pGs pGs @@ -32171,10 +31578,10 @@ xCn oPQ xCn cBI -xCn -oPQ -oPQ -xCn +jQa +rgz +rgz +jQa pGs pGs pGs @@ -32353,12 +31760,12 @@ xCn srg xCn cBI -xCn -xCn -oPQ -kAL -xCn -fHk +jQa +jQa +rgz +qwE +jQa +abL jQa jQa jQa @@ -32535,12 +31942,12 @@ srg srg xCn fzc -xCn -oVt -xCn -xCn -kAL -xCn +jQa +hdh +jQa +jQa +qwE +jQa gxQ jQa jQa @@ -32717,12 +32124,12 @@ tqh tqh tqh uJT -srg -xCn -xCn -xCn -xCn -xCn +geo +jQa +jQa +jQa +jQa +jQa jQa jQa jQa @@ -32899,12 +32306,12 @@ mEA sBk ksn pGc -srg -xCn -xCn -xCn -xCn -xCn +geo +jQa +jQa +jQa +jQa +jQa jQa jQa jQa @@ -33081,12 +32488,12 @@ aJc hDA xrA pGc -srg -xCn -xCn -xCn -xCn -xCn +geo +jQa +jQa +jQa +jQa +jQa jQa jQa jQa @@ -33263,17 +32670,17 @@ gwC hDA tMx tqh -dxK -xCn -xCn -xCn -xCn -xCn -vYW -vYW -vYW -vYW -hto +xZa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +jQa +gxQ pGs jQa jQa @@ -33445,12 +32852,12 @@ gwC odD rjE fay -qul -qul -uHY -xCn -xCn -srg +pGs +pGs +gxQ +jQa +vYW +neq vYW vYW vYW @@ -33578,10 +32985,10 @@ rYC wBp wBp wBp -oNa -mYA -cLV -eCB +fgj +rsD +ekq +xFI klT klT klT @@ -33628,8 +33035,8 @@ ftA fay fay fay -ebr -ebr +pGs +pGs pKK vYW loA @@ -33760,7 +33167,7 @@ sNy sNy tER sNy -dWH +pms jhW jhW jhW @@ -33810,8 +33217,8 @@ hBX eEY xhx fay -ebr -ebr +pGs +pGs vYW vYW hto @@ -33942,7 +33349,7 @@ sNy sNy sNy sNy -nVv +uwW efw efw qVp @@ -33992,9 +33399,9 @@ eWR oXi gEy fay -ebr -ebr -ebr +pGs +pGs +pGs vYW vYW vYW @@ -34120,11 +33527,11 @@ wLq lyP lyP sNy -dhV -ozD -nFH -ozD -jpZ +jIK +quj +bWu +quj +rBJ byU byU qMY @@ -34174,9 +33581,9 @@ izs oyi wvI fay -ebr -ebr -ebr +pGs +pGs +pGs vYW vYW uQa @@ -34302,7 +33709,7 @@ lyP wLq sNy sNy -hlG +rCN pVz skp skp @@ -34356,8 +33763,8 @@ ltW qQF okB fay -ebr -ebr +pGs +pGs vYW vYW uQa @@ -34471,20 +33878,20 @@ sNy sNy sNy sNy -mLg -nFH -nFH -nFH -nFH -nFH -nFH -nFH -nFH -nFH -nFH -ozD -nFH -tdX +hYr +bWu +bWu +bWu +bWu +bWu +bWu +bWu +bWu +bWu +bWu +quj +bWu +gmH ifB lCK ifB @@ -34538,7 +33945,7 @@ ltW qQF eXr fay -ebr +pGs vYW neq vYW @@ -34653,7 +34060,7 @@ sNy sNy sNy sNy -sHJ +qJp ifB ifB ifB @@ -34835,20 +34242,20 @@ sNy sNy sNy sNy -dsC -rNf -mdy -nQR -nQR -nQR -nQR -nQR -nQR -qOO -rNf -mdy -nQR -pTQ +rUo +iwx +cZC +uqB +uqB +uqB +uqB +uqB +uqB +vYO +iwx +cZC +uqB +pxC ifB ifB ifB @@ -35017,20 +34424,20 @@ sNy wLq uTj sNy -dsC -rNf -izl +rUo +iwx +dYM sNy wLq sNy wLq lyP sNy -sHJ -rNf -izl +qJp +iwx +dYM ekO -aCd +eUk ifB ifB kYM @@ -35199,20 +34606,20 @@ sNy sNy sNy sNy -dsC -rNf -izl +rUo +iwx +dYM wLq sNy lyP lyP sNy uTj -sHJ -rNf -izl +qJp +iwx +dYM lyP -hlG +rCN ifB ifB ifB @@ -35381,20 +34788,20 @@ wLq tER sNy sNy -dsC -rNf -izl +rUo +iwx +dYM wLq sNy lyP sNy sNy sNy -sHJ -rNf -izl +qJp +iwx +dYM wLq -hlG +rCN ifB ifB ifB @@ -35563,20 +34970,20 @@ wLq wLq wLq wLq -dsC -plF -izl +rUo +oeC +dYM wLq uTj sNy sNy sNy sNy -sHJ -rNf -iVD +qJp +iwx +leB lyP -hlG +rCN ifB ifB kyI @@ -35744,21 +35151,21 @@ dpW oIc wLq wLq -dhV -mwm -rNf -iZj -vqR +jIK +fGp +iwx +fmG +sGp wLq wLq wLq llj -dhV -qCY -rNf -iZj -dkC -hlG +jIK +xeL +iwx +fmG +vNF +rCN xCM lCK ifB @@ -35926,21 +35333,21 @@ ykM dpW iIY oIc -dsC +rUo ifB ifB ifB -kVL +wzb iIY iIY pRV uTj -dsC +rUo ifB ifB ifB -iVD -hlG +leB +rCN kvS laN rGE @@ -36108,25 +35515,25 @@ nbB fQK nbB dpW -red +rfm ifB lFI ifB -nhX -gor -qoj -avX -ehT -kQy +iNO +xhj +ajS +qJh +hPs +pPE ifB lFI ifB -sZW -hnR -ptp -ptp -ptp -kRU +hHc +jvx +pGy +pGy +pGy +ffF efw efw qMY @@ -36280,7 +35687,7 @@ pGs pGs huF huF -eWp +alK lMB lMB lMB @@ -36462,7 +35869,7 @@ pGs pGs huF huF -oTX +coP tQT tQT fQW @@ -36644,7 +36051,7 @@ pGs pGs huF huF -cne +giu tQT tQT rMM @@ -36826,7 +36233,7 @@ huF huF huF huF -oTX +coP tQT tQT ssh @@ -37008,7 +36415,7 @@ huF huF huF huF -fOG +gJi lMB lMB vMq @@ -37175,22 +36582,22 @@ pGs pGs pGs pGs -knN -cWu -cWu -cWu -cWu -cWu -cWu -cWu -cWu -cWu -cWu -leG -cWu -cWu -cUF -oVp +bpP +bQQ +bQQ +bQQ +bQQ +bQQ +bQQ +bQQ +bQQ +bQQ +bQQ +xkf +bQQ +bQQ +wdt +tfp wqc jts arC @@ -37357,7 +36764,7 @@ pGs pGs pGs pGs -lPj +rxu huF huF huF @@ -37368,11 +36775,11 @@ huF huF huF huF -luz +iUn huF huF huF -cne +giu dQK wBY lMB @@ -37539,22 +36946,22 @@ pGs pGs huF huF -lPj +rxu huF huF huF huF huF huF -ebJ -ebJ -ebJ -ebJ -uOk +cwb +cwb +cwb +cwb +bhg huF rpu huF -oTX +coP lMB vUZ lMB @@ -37721,7 +37128,7 @@ pGs pGs huF huF -lPj +rxu huF huF huF @@ -37736,7 +37143,7 @@ huF huF rpu huF -oTX +coP lMB wBY lMB @@ -37769,7 +37176,7 @@ lSg gKw vLt miU -vBC +jcN gHT qul qul @@ -37799,9 +37206,9 @@ vvh qlj yks qul -kli -bTg -aYg +iUT +iYX +aPY qul qul qul @@ -37903,7 +37310,7 @@ pGs pGs huF huF -lPj +rxu huF huF huF @@ -37918,7 +37325,7 @@ huF huF huF huF -nPx +bOt arC lxr lMB @@ -37981,13 +37388,13 @@ qMY kYN yks qul -gMV +gxM eLZ -rIF -bTg -bTg -rLK -aYg +hij +iYX +iYX +eeP +aPY qul fay sDM @@ -38085,22 +37492,22 @@ pGs pGs huF huF -rbp -ebJ -ebJ -ebJ -ebJ -ebJ -ebJ -ebJ -ebJ -ebJ -ebJ -ebJ -ebJ -ebJ -mSS -jGT +uTg +cwb +cwb +cwb +cwb +cwb +cwb +cwb +cwb +cwb +cwb +cwb +cwb +cwb +pRC +boP wqc jRu lMB @@ -38163,13 +37570,13 @@ qMY kNN yks qul -edD -cym -cym -cym -cym -cym -nFp +sMW +fOm +fOm +fOm +fOm +fOm +fek qul fay rex @@ -38267,7 +37674,7 @@ pGs pGs huF huF -lPj +rxu huF huF huF @@ -38282,7 +37689,7 @@ huF huF huF huF -oTX +coP iah wBY lMB @@ -38449,7 +37856,7 @@ pGs pGs huF huF -lPj +rxu huF huF huF @@ -38464,7 +37871,7 @@ huF huF huF huF -cne +giu lMB wBY lMB @@ -38545,8 +37952,8 @@ nyJ bwz kZg kGM -kSD -mMX +qBk +gAd tDo uQa hto @@ -38631,7 +38038,7 @@ pGs pGs huF huF -lPj +rxu huF huF huF @@ -38647,11 +38054,11 @@ huF huF huF xpP -bJv -otL -nzS -lVa -wSX +iBX +bNx +rjs +sBl +hXB oke oke uQK @@ -38727,8 +38134,8 @@ kuX kuX uOL kGM -hbD -jtx +oEU +oUU lhB vYW uQa @@ -38813,7 +38220,7 @@ pGs pGs huF huF -lPj +rxu huF huF huF @@ -38830,7 +38237,7 @@ huF huF huF huF -mHM +nol huF huF uQi @@ -38909,8 +38316,8 @@ fHs kuX uOL kGM -hbD -dTS +oEU +wTR qyH vYW uQa @@ -38995,7 +38402,7 @@ pGs pGs huF huF -lPj +rxu huF huF huF @@ -39012,7 +38419,7 @@ huF huF huF huF -kGB +cpB huF huF ykc @@ -39091,8 +38498,8 @@ sDj kuX uOL kGM -wkp -tqa +imo +jRf ebr vYW vYW @@ -39177,7 +38584,7 @@ pGs pGs huF huF -lPj +rxu huF huF huF @@ -39194,7 +38601,7 @@ huF huF huF huF -lPj +rxu huF huF ykc @@ -39359,7 +38766,7 @@ pGs pGs huF huF -wRR +rxu huF huF huF @@ -39376,7 +38783,7 @@ pGs bZv iUZ huF -wgU +jrQ huF huF ykc @@ -39541,7 +38948,7 @@ pGs pGs huF huF -wRR +rxu huF huF huF @@ -39558,7 +38965,7 @@ lYr qjU gvo rlw -eWZ +rfg huF huF ykc @@ -39723,7 +39130,7 @@ pGs pGs huF huF -wRR +rxu huF huF huF @@ -39740,7 +39147,7 @@ lYr fwo lYr sQR -eWZ +rfg huF huF huF @@ -39905,7 +39312,7 @@ pGs pGs huF huF -wRR +rxu huF huF huF @@ -39922,7 +39329,7 @@ qyT sJm lYr tia -ten +uLv huF huF huF @@ -40087,7 +39494,7 @@ huF huF huF huF -wRR +rxu huF pGs pGs @@ -40184,8 +39591,8 @@ tEJ cNu upO gUP -clG -mMX +ykJ +gAd oAE uQa uQa @@ -40269,7 +39676,7 @@ huF huF huF huF -vEU +nol huF pGs pGs @@ -40299,19 +39706,19 @@ sDf oLM omj jMq -lEV +wFt ygn -alD +lMC aSU ghI -lEV +wFt ygn -alD +lMC aSU ghI -lEV +wFt ygn -alD +lMC hyr bLB mDl @@ -40366,8 +39773,8 @@ tEJ cNu qNP gUP -bPe -dTS +jBv +wTR oAE nHC vYW @@ -40444,15 +39851,15 @@ mPk mPk mPk mPk -itL +xSL kkF huF huF pGs bJI -ahb -wdy -vQK +dcC +woQ +sSM pGs pGs huF @@ -40479,7 +39886,7 @@ enU nOj uQK uXZ -lhn +fqS pNa liM ygn @@ -40494,7 +39901,7 @@ fys liM ygn uWW -vyy +ssI bLB joN jZE @@ -40548,8 +39955,8 @@ jjg cNu rMN gUP -hbD -dTS +oEU +wTR tDo ebr vYW @@ -40626,9 +40033,9 @@ mPk mPk mPk mPk -itL +xSL kkF -tOx +rxu huF pGs dfs @@ -40663,19 +40070,19 @@ lDN ykc ldr jMq -lGT +hpC ygn -uEF +hHb aSU ghI -lGT +hpC ygn -uEF +hHb aSU ghI -lGT +hpC ygn -uEF +hHb hyr vnm hfR @@ -40730,8 +40137,8 @@ tvv cNu rMN gUP -wkp -tqa +imo +jRf ebr ebr oAE @@ -40808,12 +40215,12 @@ mPk mPk mPk mPk -itL +xSL kkF -tOx +rxu huF pGs -ipZ +wpC lYr iSz fwo @@ -40990,17 +40397,17 @@ mPk mPk mPk mPk -itL +xSL kkF -tOx +rxu huF huF -tlE +dWP lYr iSz lYr lYr -hCw +aUS pbp loQ pDF @@ -41171,13 +40578,13 @@ mPk mPk mPk mPk -lUG -rqG +aPf +pjK kkF -sUj -vJk -lXT -oDX +xNX +gJP +cFv +uUw wcq mLB aTg @@ -41353,18 +40760,18 @@ mPk mPk mPk mPk -itL +xSL xfo xfo ydy xfo xfo -tlE +dWP fwo itT lYr -hkQ -bVQ +cUD +qaB pbp wMw wMw @@ -41535,17 +40942,17 @@ mPk mPk mPk mPk -itL +xSL aQq eCj pxa uKr ahg -wIg +hZq asx asx nKd -nDL +cmA new wMw wMw @@ -41564,11 +40971,11 @@ wMw wMw wMw wMw +cgX wMw wMw wMw -wMw -wMw +cgX wMw kME wMw @@ -41717,17 +41124,17 @@ mPk mPk mPk mPk -itL +xSL aQq boI clA miR nqQ -tlE +dWP asx asx jjZ -nDL +cmA wMw wMw wMw @@ -41825,7 +41232,7 @@ xlv xZD iJD gfp -ffY +riG gvR kyG ksX @@ -41899,17 +41306,17 @@ mPk mPk mPk mPk -itL +xSL aQq vLw qaE qdL ahg -tlE +dWP asx asx cQu -lqF +egb wMw wMw wMw @@ -41931,22 +41338,22 @@ wMw wMw wMw wMw -wMw +cgX wMw wMw nFB wMw sIQ +bOu wMw -wMw -wMw +bOu wMw oJm hyr hyr hyr uAt -lhn +fqS weG weG hyr @@ -42007,7 +41414,7 @@ nBl wKi bRi mBG -ffY +riG xZN kyG ghs @@ -42081,17 +41488,17 @@ mPk vlm fjv wBp -gpJ +cfQ xfo bGC qzq ahg nQA -tlE +dWP eRM tCG aEf -nDL +cmA wMw wMw wMw @@ -42189,7 +41596,7 @@ uzb wKi bRi mBG -ffY +riG fYH gTC fhh @@ -42263,17 +41670,17 @@ wBp fjv mfP ppU -bah +lql uZK kME wMw kME tzP -psd +rpF asx asx nKd -nDL +cmA wMw wMw wMw @@ -42303,7 +41710,7 @@ wMw wMw wMw wMw -wMw +bOu sTT bgE jTL @@ -42371,7 +41778,7 @@ qPG mCx aLc mBG -iSi +jFg tTN gTC kQb @@ -42445,17 +41852,17 @@ wBp mfP ppU ooP -kap +svz wMw wMw wMw mrC -hzK -eat +gzG +mTe asx asx jjZ -lqF +egb wMw iyd qFC @@ -42627,17 +42034,17 @@ ppU mfP sAW ooP -kap +svz wMw wMw wMw mrC -qhQ -jhM +cqu +jBD asx asx cQu -nDL +cmA wMw pbp wCc @@ -42809,17 +42216,17 @@ mfP mfP ooP mfP -kap +svz wMw wMw wMw wMw tzP -jhu -fFH -lNL -fFH -wPv +lFp +llU +bjv +llU +fMj wMw pbp sHV @@ -42991,7 +42398,7 @@ mfP mfP mfP mfP -kap +svz sSz miT wMw @@ -43173,7 +42580,7 @@ sAW mfP mfP mfP -kap +svz cmU wMw wMw @@ -43355,7 +42762,7 @@ mfP mfP mfP ooP -kap +svz rgZ olD olD @@ -43537,16 +42944,16 @@ mfP mfP ooP ooP -tOB +vzz tpV asx cfq -qAI -pEo -ohC -euS -vWn -fWE +oyq +uez +uTK +rAb +qhd +hxg ezx inj pbp @@ -43719,16 +43126,16 @@ mfP mfP ooP mfP -tOB +vzz lZR aCo lZR -aBY +pjr ooP vLI pYH haR -kap +svz wMw tZr pbp @@ -43901,16 +43308,16 @@ mfP mfP mfP mfP -xLB +tBn gnC mYR asx -aBY +pjr ooP vzi ooP ooP -kap +svz wMw ygY pbp @@ -44083,16 +43490,16 @@ dXg mfP ooP mfP -ssw -vQF -xOX -lId -tyV +mWm +iUg +ygh +csl +oho ooP vzi vzi vLI -kap +svz oLa vUQ pbp @@ -44124,7 +43531,7 @@ wMw wMw xXr wMw -plm +kQD wMw rSA wMw @@ -44196,7 +43603,7 @@ uuv wSx rjH wOC -gMm +mWt iFb kxe awJ @@ -44266,15 +43673,15 @@ mfP mfP mfP mfP -xLB -xOX -bCM -kMe -kMe -kMe -kMe -kMe -cEm +tBn +ygh +sDx +jLk +jLk +jLk +jLk +jLk +oZo fZB wMw pbp @@ -44448,9 +43855,9 @@ dXg dXg mfP mfP -tOB -xOX -tkV +vzz +ygh +qVq asx asx asx @@ -44630,7 +44037,7 @@ dXg dXg dXg dXg -tOB +vzz asx asx kzo @@ -44668,7 +44075,7 @@ miF mrC wMw wMw -wMw +dii wMw xVQ kyz @@ -44812,9 +44219,9 @@ qwQ qwQ qwQ dXg -xFS -vZR -apt +qhE +bcF +egU dKy qVD fXu @@ -44996,12 +44403,12 @@ qgm lTR dXg dXg -xFS -eqg -bJV -bJV -bJV -qTs +qhE +gEH +viu +viu +viu +wEz asx asx xOI @@ -45183,21 +44590,24 @@ qwQ qwQ qwQ pAX -rMl +iOM asx fZB asx wMw wMw +nrm wMw wMw wMw wMw +nrm wMw wMw wMw wMw wMw +nrm wMw wMw wMw @@ -45206,10 +44616,7 @@ wMw wMw wMw wMw -wMw -wMw -wMw -wMw +dii wMw wMw mrC @@ -45365,12 +44772,12 @@ qwQ qwQ qwQ qwQ -btU +nYY asx asx wCR -gsQ -icb +uvu +rSf wMw wMw wMw @@ -45547,11 +44954,11 @@ qwQ qwQ qwQ qwQ -ebN -eha -tNy -gXf -unH +xDT +sjb +sLr +uvY +qIs kKX oJb wfK @@ -45576,7 +44983,7 @@ bJI oJb wfK wfK -fWR +qlE bJI bJI bJI @@ -45624,7 +45031,7 @@ pGj iIc aAC wSL -axv +uXu lDh jQe mHa @@ -45730,9 +45137,9 @@ qwQ qwQ lTR qwQ -eDY -tNy -gPL +pFZ +sLr +aDg hKK srU sUp @@ -45743,24 +45150,24 @@ bJI asx fZB asx -pUi +gxa rIG lYr awr lYr aHu -tEc +gga asx viY asx -gfc +nsU sFN lYr lYr lYr kRH bJI -rgf +hsE asx aMC hLt @@ -45806,7 +45213,7 @@ vDf gvJ sLO lum -lxR +tcV rpN jQe xvj @@ -45912,37 +45319,37 @@ qwQ qwQ qwQ lTR -eDY -tNy -oLZ +pFZ +sLr +faT sUK eGX wXc sJm bVS kRH -eOa +iJh asx dlr asx -itQ +idh qKZ qyJ vAZ vmw kRH -eOa +iJh svG dlr asx -itQ +idh qKZ qyJ fwo lYr hZE bVX -eOa +iJh asx aMC hLt @@ -45988,7 +45395,7 @@ oRD wSL vVz wSL -hlF +gyu hLQ boV dkl @@ -46094,38 +45501,38 @@ qwQ qwQ qwQ qwQ -eDY -tNy -oLZ +pFZ +sLr +faT qwQ lTR scL dOS rfV lnO -fHf -eha -tNy -eXg -jLS +kpe +sjb +sLr +uUv +cNC lTR scL oGv lsN lnO -fHf -eha -tNy -eXg -jLS +kpe +sjb +sLr +uUv +cNC lTR scL oGv rKM lnO lTR -fHf -wPl +kpe +msS aMC kqA kqA @@ -46170,7 +45577,7 @@ qio qfL wSL wyE -axv +uXu hLY boV nLI @@ -46276,9 +45683,9 @@ qwQ qwQ qwQ qwQ -eDY -tNy -oLZ +pFZ +sLr +faT qwQ lTR scL @@ -46286,9 +45693,9 @@ gDI jSX fLY lTR -eDY -tNy -oLZ +pFZ +sLr +faT lTR lTR scL @@ -46296,9 +45703,9 @@ kvC jSX fLY lTR -eDY -tNy -oLZ +pFZ +sLr +faT lTR lTR scL @@ -46307,13 +45714,13 @@ oGv lnO lTR dXg -fHf -jEG -hET -hET -koZ -hET -wft +kpe +bSG +oCP +oCP +kSw +oCP +nGf aMC sNT giN @@ -46352,7 +45759,7 @@ qio rja gvJ szS -axv +uXu lDh boV dkl @@ -46458,9 +45865,9 @@ pAX qwQ qwQ uYJ -eDY -tNy -oLZ +pFZ +sLr +faT qwQ qwQ eGX @@ -46468,9 +45875,9 @@ hKK fLY lTR qwQ -eDY -tNy -oLZ +pFZ +sLr +faT lTR lTR eGX @@ -46478,9 +45885,9 @@ hKK fLY lTR lTR -eDY -jzL -oLZ +pFZ +jZZ +faT lTR lTR scL @@ -46495,7 +45902,7 @@ hKK bbG hKK hKK -gdJ +bYn vKv bZA giN @@ -46530,11 +45937,11 @@ tDF bzf gyz clX -azr +xoN aAC wSL wSL -axv +uXu edu boV nLI @@ -46640,9 +46047,9 @@ lTR qwQ qwQ lTR -eDY -tNy -oLZ +pFZ +sLr +faT qwQ qwQ lTR @@ -46650,9 +46057,9 @@ qwQ qwQ qwQ lTR -eDY -tNy -oLZ +pFZ +sLr +faT lTR lTR lTR @@ -46660,8 +46067,8 @@ lTR lTR lTR lTR -eDY -iAP +pFZ +knw sgn dXg dXg @@ -46677,7 +46084,7 @@ lTR lTR lTR aTY -qsb +cxn vKv hsl iSW @@ -46712,11 +46119,11 @@ dkl dkl mOx iZT -roT +lDA gdO wSL gvJ -hlF +gyu suE dkV sff @@ -46738,7 +46145,7 @@ bkM chs chs chs -rCs +uDd ixr ixr ixr @@ -46822,9 +46229,9 @@ qwQ lTR qwQ qwQ -eDY -tNy -oLZ +pFZ +sLr +faT qwQ qwQ qwQ @@ -46832,9 +46239,9 @@ aqh qwQ lTR qwQ -eDY -tNy -oLZ +pFZ +sLr +faT lTR lTR lTR @@ -46842,7 +46249,7 @@ aTY lTR lTR lTR -eDY +pFZ cpF cpF dXg @@ -46859,7 +46266,7 @@ lTR aTY lTR lTR -vEe +seV vKv hsl giN @@ -46894,11 +46301,11 @@ qXO tso bbW qQk -per -mVY -opP -lMl -pRR +rhq +usT +vGP +hfQ +iYC rpN aXz oXm @@ -47004,9 +46411,9 @@ qwQ qwQ qwQ qwQ -eDY -tNy -oLZ +pFZ +sLr +faT qwQ pAX lTR @@ -47014,9 +46421,9 @@ lTR qwQ dXg qwQ -eDY -tNy -oLZ +pFZ +sLr +faT lTR lTR aTY @@ -47024,7 +46431,7 @@ lTR lTR lTR lTR -fHf +kpe cpF lTR lTR @@ -47041,7 +46448,7 @@ lTR lTR lTR gVO -bEY +tJI aMC hyr giN @@ -47077,9 +46484,9 @@ tso qBO eUh izP -khB +oHX nTH -pNT +oBl izP eUh aXz @@ -47186,9 +46593,9 @@ qwQ qwQ qwQ qwQ -eDY -tNy -oLZ +pFZ +sLr +faT qwQ dXg qwQ @@ -47196,9 +46603,9 @@ qwQ dXg qwQ qwQ -eDY -tNy -oLZ +pFZ +sLr +faT lTR lTR lTR @@ -47259,9 +46666,9 @@ azh fEb nLI nLI -ovp -mIQ -fnX +xLQ +sZD +ndF ujR dkl boV @@ -47368,9 +46775,9 @@ qwQ qwQ lTR qwQ -eDY -tNy -oLZ +pFZ +sLr +faT qwQ dXg dXg @@ -47378,9 +46785,9 @@ qwQ dXg qwQ aqh -eDY -tNy -oLZ +pFZ +sLr +faT lTR lTR lTR @@ -47388,7 +46795,7 @@ lTR lTR lTR lTR -eDY +pFZ cpF lTR lTR @@ -47550,9 +46957,9 @@ qwQ qwQ qwQ qwQ -eDY -tNy -oLZ +pFZ +sLr +faT qwQ lTR lTR @@ -47560,9 +46967,9 @@ qwQ qwQ qwQ qwQ -eDY -tNy -oLZ +pFZ +sLr +faT nFD lTR lTR @@ -47572,7 +46979,7 @@ lTR lTR lTR stl -caD +ceH lTR scL oGv @@ -47732,9 +47139,9 @@ qwQ qwQ qwQ qwQ -eDY -tNy -oLZ +pFZ +sLr +faT qwQ qwQ qwQ @@ -47742,9 +47149,9 @@ qwQ qwQ qwQ lTR -eDY -tNy -oLZ +pFZ +sLr +faT aTY lTR lTR @@ -47914,9 +47321,9 @@ qwQ dXg qwQ qwQ -eDY -tNy -oLZ +pFZ +sLr +faT qwQ aqh lTR @@ -47924,9 +47331,9 @@ qwQ qwQ lTR qwQ -eDY -tNy -oLZ +pFZ +sLr +faT lTR lTR aTY @@ -48096,9 +47503,9 @@ lTR dXg qwQ qwQ -eDY -tNy -oLZ +pFZ +sLr +faT pAX qwQ qwQ @@ -48106,9 +47513,9 @@ qwQ uoh lTR qwQ -eDY -tNy -oLZ +pFZ +sLr +faT lTR lTR lTR @@ -48278,19 +47685,19 @@ dXg lTR qwQ pAX -eDY -tNy -wJl -rlI -rlI -rlI -rlI -rlI -rlI -rlI -mEy -tNy -oLZ +pFZ +sLr +pfU +qcQ +qcQ +qcQ +qcQ +qcQ +qcQ +qcQ +xZj +sLr +faT lTR lTR lTR @@ -48460,7 +47867,7 @@ dXg qwQ qwQ lTR -eDY +pFZ vss vss vss @@ -48471,8 +47878,8 @@ vss vss vss vss -tNy -oLZ +sLr +faT lTR lTR lTR @@ -48642,19 +48049,19 @@ dXg qwQ qwQ lTR -eDY -tNy -qLf -bJV -bJV -bJV -bJV -bJV -bJV -bJV -eha -tNy -oLZ +pFZ +sLr +rEi +viu +viu +viu +viu +viu +viu +viu +sjb +sLr +faT daS lTR lTR @@ -48824,19 +48231,19 @@ lTR vEg qwQ qwQ -eDY -tNy -nhY -rlI -rlI -rlI -rlI -bvF -rlI -hAI -qDr -tNy -oLZ +pFZ +sLr +imq +qcQ +qcQ +qcQ +qcQ +qxt +qcQ +giY +ihw +sLr +faT lTR lTR lTR @@ -49006,19 +48413,19 @@ qwQ qwQ qwQ qwQ -eDY -tNy -ctE +pFZ +sLr +aeJ gYh gYh tSK eQm gYh -rHE -uKY -eDY -tNy -oLZ +xlC +oTf +pFZ +sLr +faT lTR aTY lTR @@ -49188,19 +48595,19 @@ lTR qwQ qwQ lTR -eDY -tNy -ctE +pFZ +sLr +aeJ gYh oKi opd iEe diK -rHE -oLZ -eDY -tNy -oLZ +xlC +faT +pFZ +sLr +faT lTR lTR lTR @@ -49370,19 +48777,19 @@ qwQ qwQ lTR qwQ -eDY -tNy -ctE +pFZ +sLr +aeJ gYh dlh ncn lXv sFc -rHE -oLZ -eDY -tNy -oLZ +xlC +faT +pFZ +sLr +faT lTR lTR lTR @@ -49406,13 +48813,13 @@ lTR lTR scL oGv -foQ -hET -vzB +aUz +oCP +mjf ufn -vZN -nHy -hET +iKQ +rLS +oCP pGs pGs bgE @@ -49552,19 +48959,19 @@ qwQ qwQ qwQ qwQ -eDY -tNy -ctE -rHE +pFZ +sLr +aeJ +xlC psk gyE anA uqU -ipi -oLZ -eDY -tNy -oLZ +xwd +faT +pFZ +sLr +faT lTR lTR lTR @@ -49734,19 +49141,19 @@ qwQ qwQ lTR qwQ -eDY -tNy -bLl -rHE +pFZ +sLr +tWK +xlC rjM gLw hso ijO -rHE -wJl -mEy -tNy -oLZ +xlC +pfU +xZj +sLr +faT lTR uoh lTR @@ -49916,7 +49323,7 @@ qwQ qwQ lTR lTR -eDY +pFZ vss vss gLw @@ -49927,8 +49334,8 @@ pNk aSt vss vss -tNy -oLZ +sLr +faT lTR lTR lTR @@ -50004,19 +49411,19 @@ qhZ wVf qhZ wVf -wjV -abE -wjV -cdb -cdb +nCJ +rNR +nCJ +lBn +lBn slG fUJ kAm -cdb -wjV -cdb -wjV -abE +lBn +nCJ +lBn +nCJ +rNR pYn pYn kgw @@ -50098,7 +49505,7 @@ lTR dXg dXg qwQ -eDY +pFZ vss czA gLw @@ -50109,14 +49516,14 @@ gLw gLw czA vss -tNy -wJl -rlI -rlI -rlI -rlI +sLr +pfU +qcQ +qcQ +qcQ +qcQ lTR -rlI +qcQ lTR lTR lTR @@ -50155,20 +49562,20 @@ ftF bEX pnL juW -gDh -xJZ -xJZ -xJZ -xJZ -xJZ -xJZ -gDh -uEc -viK -gAV -xJZ -wqb -kBZ +fsU +mnC +mnC +mnC +mnC +mnC +mnC +fsU +cmL +hPm +ist +mnC +fEZ +htt hPj wVf wdb @@ -50186,19 +49593,19 @@ phd cHf qDw wVf -pBS -viK -xJZ -yeF -cdb -cdb -wjV -cdb -cdb -kqE -cdb -rRq -usB +mMd +gUX +eVy +qYw +lBn +lBn +nCJ +lBn +lBn +vmk +lBn +ret +jQi pYn qTz bjP @@ -50280,17 +49687,17 @@ dXg lTR dXg qwQ -eDY -tNy -aJD +pFZ +sLr +dKW eQm jFt qCE abu tnD hFM -qLf -eha +rEi +sjb vss vss vss @@ -50337,20 +49744,20 @@ eFJ trh qdk wUj -xJZ -xJZ -xJZ -xJZ -xJZ -xJZ -xJZ -xJZ -xJZ -viK -gAV -xJZ -wqb -kBZ +mnC +mnC +mnC +mnC +mnC +mnC +mnC +mnC +mnC +hPm +ist +mnC +fEZ +htt hPj wVf xLE @@ -50368,19 +49775,19 @@ xOo xOo nHA qhZ -uqw -viK -xJZ -xJZ -xJZ -ccU -sCA -aKk -xJZ -xJZ -cdb -wMn -viK +bbF +gUX +eVy +eVy +eVy +jZF +rPp +fwt +eVy +eVy +lBn +sbG +gUX lhJ wot jvh @@ -50462,24 +49869,24 @@ lTR dXg lTR qwQ -eDY -tNy -ctE +pFZ +sLr +aeJ hFM fQh gLw oMg mhf eQm -oLZ -eDY -tNy -qLf -bJV -bJV -bJV +faT +pFZ +sLr +rEi +viu +viu +viu lTR -bJV +viu lTR lTR lTR @@ -50519,20 +49926,20 @@ hus wuR rVS kSN -lVc -lVc -lVc -lVc -lVc -uTq -lVc -lVc -lVc -qRP -xJZ -xJZ -wqb -kBZ +tyc +tyc +tyc +tyc +tyc +doF +tyc +tyc +tyc +ajm +mnC +mnC +fEZ +htt wVf wVf idw @@ -50550,19 +49957,19 @@ xOo iIL qDs wVf -qvO -viK -xJZ -xJZ -xJZ -xJZ -jew -iXR -xJZ -xJZ -cYB -gDh -viK +pSu +gUX +eVy +eVy +eVy +eVy +xTD +aRg +eVy +eVy +qTL +xpD +gUX kgw nXB jvh @@ -50644,19 +50051,19 @@ qwQ lTR lTR qwQ -eDY -tNy -ctE +pFZ +sLr +aeJ gYh xuJ fgW npF trB gYh -eBm -eDY -tNy -oLZ +wor +pFZ +sLr +faT lTR lTR lTR @@ -50701,20 +50108,20 @@ eFJ trh qdk wUj -gtz -sKu -xJZ -xJZ -xJZ -xJZ -xJZ -xJZ -xJZ -mvA -xJZ -xJZ -wqb -kBZ +wzs +mts +mnC +mnC +mnC +mnC +mnC +mnC +mnC +dME +mnC +mnC +fEZ +htt wVf swj idw @@ -50732,19 +50139,19 @@ aiR qhZ wVf wVf -okI -lab -lVc -lVc -lVc -jfw -okJ -gjz -lVc -iFZ -xJZ -xJZ -viK +tWZ +rDM +cNK +cNK +cNK +uqb +orx +aOh +cNK +tUA +eVy +eVy +gUX pYn diQ hhW @@ -50826,19 +50233,19 @@ qwQ qwQ dXg qwQ -eDY -tNy -ctE +pFZ +sLr +aeJ hFM aSt xQJ uVR saQ hFM -oLZ -eDY -tNy -oLZ +faT +pFZ +sLr +faT dXg dXg lTR @@ -50883,20 +50290,20 @@ ktN che qdk juW -wqb -crC -xJZ -ryD -xJZ -ryD -joV -wqb -wqb -viK -xJZ -tBm -wqb -kBZ +fEZ +fwF +mnC +gWu +mnC +gWu +vJf +fEZ +fEZ +hPm +mnC +dLO +fEZ +htt wVf unw idw @@ -50923,10 +50330,10 @@ wVf vOr qhZ wVf -viK -xJZ -xJZ -viK +gUX +eVy +eVy +gUX pYn pYn kgw @@ -51008,19 +50415,19 @@ qwQ qwQ lTR qwQ -eDY -tNy -ctE +pFZ +sLr +aeJ gYh hFM gYh gYh hFM gYh -uKY -eDY -tNy -oLZ +oTf +pFZ +sLr +faT dXg lTR nFD @@ -51028,9 +50435,9 @@ lTR lTR lTR dXg -eDY +pFZ vss -caD +ceH lTR scL oGv @@ -51065,20 +50472,20 @@ eFJ trh qdk juW -kBZ -kBZ -joV -keY -xJZ -ryD -ryD -ryD -ryD -viK -xJZ -wXu -wqb -kBZ +htt +htt +vJf +aqO +mnC +gWu +gWu +gWu +gWu +hPm +mnC +lrJ +fEZ +htt wVf wVf tiw @@ -51105,16 +50512,16 @@ jZw xMq vnU qhZ -viK -xJZ -mdj -icJ -cYB -eoq -xJZ -uEc -xJZ -iGM +gUX +eVy +tlc +ygy +qTL +hVi +eVy +vaj +eVy +nhM pYn jjl nkF @@ -51190,19 +50597,19 @@ qwQ qwQ qwQ qwQ -eDY -tNy -lmS -bJV -bJV -bJV -qmF -bJV -bJV -nHH -eDY -tNy -oLZ +pFZ +sLr +qlS +viu +viu +viu +xUM +viu +viu +vOF +pFZ +sLr +faT lTR lTR lTR @@ -51211,8 +50618,8 @@ dXg lTR dXg lTR -tNy -caD +sLr +ceH gVO uTu rfV @@ -51247,20 +50654,20 @@ eFJ trh qdk juW -kBZ -kBZ -kBZ -xJZ -quP -ryD -fbr -ryD -ryD -viK -sHO -ryD -wqb -kBZ +htt +htt +htt +mnC +udb +gWu +cSB +gWu +gWu +hPm +vdU +gWu +fEZ +htt hPj wVf wVf @@ -51287,17 +50694,17 @@ mnc xMq agJ qhZ -lab -lVc -lVc -pfr -pbw -lVc -lVc -qjg -lVc -iFZ -pIj +rDM +cNK +cNK +kmN +pJw +cNK +cNK +iRg +cNK +tUA +jdn pYn pYn pYn @@ -51372,19 +50779,19 @@ lTR lTR lTR qwQ -eDY -tNy -wJl -rlI -rlI -rlI -rlI -rlI -rlI -rlI -mEy -tNy -dyo +pFZ +sLr +pfU +qcQ +qcQ +qcQ +qcQ +qcQ +qcQ +qcQ +xZj +sLr +jFJ jaF jaF jaF @@ -51429,20 +50836,20 @@ ftF bEX pnL juW -kBZ -kBZ -kBZ -xJZ -xJZ -ryD -ryD -ryD -ryD -viK -xJZ -ryD -ryD -kBZ +htt +htt +htt +mnC +mnC +gWu +gWu +gWu +gWu +hPm +mnC +gWu +gWu +htt hPj hHR idw @@ -51469,17 +50876,17 @@ wVf bdJ wVf wVf -gfj -fEA -xJZ -xJZ -xJZ -xJZ -xJZ -xJZ -vlw -viK -wXu +gFc +anx +eVy +eVy +eVy +eVy +eVy +eVy +jsg +gUX +wmj vHs vHs vHs @@ -51554,7 +50961,7 @@ qwQ lTR dXg qwQ -eDY +pFZ vss vss vss @@ -51565,8 +50972,8 @@ vss vss vss vss -tNy -hNq +sLr +siC oGv oGv oGv @@ -51614,17 +51021,17 @@ wOO wOO wOO wOO -kBZ -kBZ -ryD -ryD -ryD -ryD -lDm -xJZ -joV -ryD -kBZ +htt +htt +gWu +gWu +gWu +gWu +ukb +mnC +vJf +gWu +htt hPj wVf dtu @@ -51659,9 +51066,9 @@ wVf wVf wVf wVf -xJZ -viK -xJZ +eVy +gUX +eVy vHs eBs xcf @@ -51736,19 +51143,19 @@ dXg dXg lTR qwQ -eDY -tNy -qLf -bJV -bJV -bJV -bJV -bJV -bJV -bJV -eha -tNy -hNq +pFZ +sLr +rEi +viu +viu +viu +viu +viu +viu +viu +sjb +sLr +siC hXR oGv oGv @@ -51796,17 +51203,17 @@ cud kOS dWl wOO -kBZ -kBZ -kBZ -ryD -kBZ -wqb -smE -xJZ -ryD -jeW -joV +htt +htt +htt +gWu +htt +fEZ +kZu +mnC +gWu +qJZ +vJf hPj wVf aHM @@ -51841,9 +51248,9 @@ ixh xKL baH wVf -xJZ -viK -xJZ +eVy +gUX +eVy vHs imz mwD @@ -51918,9 +51325,9 @@ lTR qwQ qwQ qwQ -eDY -tNy -oLZ +pFZ +sLr +faT lTR qwQ dXg @@ -51928,9 +51335,9 @@ qwQ qwQ lTR dXg -eDY -tNy -hNq +pFZ +sLr +siC oGv oGv hXR @@ -51978,17 +51385,17 @@ vmc wYF rsB wOO -kBZ -kBZ -kBZ -kBZ -kBZ -wqb -viK -xJZ -ryD -ryD -ryD +htt +htt +htt +htt +htt +fEZ +hPm +mnC +gWu +gWu +gWu wVf wVf rpT @@ -52023,9 +51430,9 @@ cKC xOo jcC wVf -xJZ -viK -oef +eVy +gUX +lIM fEz fpY eQC @@ -52100,9 +51507,9 @@ qwQ qwQ qwQ lTR -eDY -tNy -oLZ +pFZ +sLr +faT qwQ lTR dXg @@ -52110,9 +51517,9 @@ dXg qwQ qwQ dXg -eDY -tNy -hNq +pFZ +sLr +siC oGv upH oGv @@ -52162,15 +51569,15 @@ rsB poE tlT hlp -kBZ -kBZ -kBZ -wqb -viK -xJZ -ryD -ryD -ryD +htt +htt +htt +fEZ +hPm +mnC +gWu +gWu +gWu sPs cYa lVB @@ -52205,9 +51612,9 @@ xOo qEa iqW wVf -xJZ -viK -oef +eVy +gUX +lIM jgY kWB kWB @@ -52282,9 +51689,9 @@ qwQ qwQ qwQ qwQ -eDY -tNy -mIU +pFZ +sLr +bbU jaF jaF jaF @@ -52292,9 +51699,9 @@ jaF qgm vEg qwQ -eDY -tNy -jdu +pFZ +sLr +jCg hXR oGv oGv @@ -52344,15 +51751,15 @@ jaL poE tlT mQh -kBZ -kBZ -ryD -hcI -wXs -xJZ -ryD -ryD -ryD +htt +htt +gWu +tYZ +mms +mnC +gWu +gWu +gWu sPs etE swi @@ -52387,9 +51794,9 @@ gwG xOo mAP wVf -xJZ -tYw -oef +eVy +lMy +lIM jgY kWB wmt @@ -52464,9 +51871,9 @@ qwQ qwQ qwQ lTR -eDY -tNy -igB +pFZ +sLr +mNj oGv oGv oGv @@ -52474,9 +51881,9 @@ oGv lnO lTR lTR -eDY -tNy -igB +pFZ +sLr +mNj oGv oGv tmC @@ -52526,15 +51933,15 @@ cil cuc tlT mrT -kBZ -ryD -ryD -ryD -wXs -xJZ -ryD -ryD -ryD +htt +gWu +gWu +gWu +mms +mnC +gWu +gWu +gWu wVf wVf pIC @@ -52569,9 +51976,9 @@ cur syb gEO wVf -rDD -viK -oef +dLn +gUX +lIM jgY kWB cAx @@ -52646,9 +52053,9 @@ lTR qwQ qwQ lTR -eDY -tNy -igB +pFZ +sLr +mNj oGv lsN tmC @@ -52656,9 +52063,9 @@ hXR pfd jaF jaF -tGw -tNy -igB +rnx +sLr +mNj oGv hXR oGv @@ -52668,7 +52075,7 @@ oGv oGv oGv stl -mmO +aXd oGv oGv gfk @@ -52708,26 +52115,26 @@ aIq tlT eGL mrT -kBZ -tkF -ryD -ryD -wXs -xJZ -ryD -ryD +htt +dZn +gWu +gWu +mms +mnC +gWu +gWu eyt eyt -wVf +ouy wVf wVf wVf eyt -wqb -wXu -viK -xJZ -wqb +ouy +wmj +gUX +eVy +xRO eyt eyt eyt @@ -52751,9 +52158,9 @@ wVf wVf wVf wVf -sKu -viK -xJZ +bde +gUX +eVy vHs imz wDv @@ -52828,9 +52235,9 @@ qwQ dXg qwQ qwQ -btU -tNy -igB +nYY +sLr +mNj hXR rMb oGv @@ -52838,9 +52245,9 @@ oGv oGv oGv oGv -eoj -tNy -igB +uAO +sLr +mNj oGv oGv oGv @@ -52848,9 +52255,9 @@ rKM fkd oGv hXR -svt +mFw vss -mmO +aXd dOS oGv dXg @@ -52890,26 +52297,26 @@ cil wae sdZ hwZ -kBZ -kBZ -ryD -ryD -apj -xJZ -ryD -ryD -kbQ +htt +htt +gWu +gWu +qsJ +mnC +gWu +gWu +gWu kbQ eyt eyt eyt eyt eyt -wqb -xJZ -viK -xJZ -wqb +ouy +eVy +gUX +eVy +xRO eyt eyt eyt @@ -52933,9 +52340,9 @@ ieu qAr mIG wVf -eFW -viK -xJZ +eWa +gUX +eVy vHs dmN iYi @@ -52954,7 +52361,7 @@ bkM eQr iaM hbi -gMm +mWt xxk iFb mCF @@ -53009,30 +52416,30 @@ qwQ dXg dXg qwQ -tqV -mEy -tNy -jKW -hej +ozY +xZj +sLr +qTg +lPR dOS oGv oGv rKM oGv -fZX -nOM -tNy -jKW -hej +wTm +hxW +sLr +qTg +lPR rMb oGv oGv oGv oGv oGv -svt -tNy -mmO +mFw +sLr +aXd oGv oGv oGv @@ -53076,26 +52483,26 @@ wOO wOO oSX wOO -jPM -xJZ -xJZ -ryD -lFk +hwr +mnC +mnC +gWu +qAa kbQ kbQ eyt eyt jqw eyt -wqb -xJZ -viK -xJZ -wqb -wqb -wqb -wqb -wqb +ouy +eVy +gUX +eVy +xRO +xRO +xRO +xRO +xRO wVf wVf xvF @@ -53115,9 +52522,9 @@ wpM vpV nmN wVf -xJZ -viK -xJZ +eVy +gUX +eVy vHs vHs vHs @@ -53191,27 +52598,27 @@ pdK kgp pdK pdK -gVP +rSh aQN jzB aQN -geK +fHA qNu wlB wlB wlB ghW -mnU +hpv aQN jzB aQN -geK +fHA wlB wlB lTg ghW wlB -mnU +hpv suY aQN hMg @@ -53258,31 +52665,31 @@ eGd pkT pAZ wOO -rWY -xJZ -xJZ -ryD -kbQ +pGb +mnC +mnC +gWu +gWu kbQ kbQ kbQ jqw kbQ eyt -wqb -rDD -wng -lVc -lVc -lVc -lVc -lVc -elO -lVc -lVc -lVc -lVc -lVc +ouy +dLn +oZv +cNK +cNK +cNK +cNK +cNK +riV +cNK +cNK +cNK +cNK +cNK gRS enH eKw @@ -53297,10 +52704,10 @@ pRy vpV mIG obS -xJZ -hfn -ryD -xJZ +eVy +bLn +wlW +eVy kfG eyt eyt @@ -53373,27 +52780,27 @@ kgp pdK pdK fpq -kVq +hcG aQN hQV aQN -geK +fHA wlB lTg wlB wlB wlB -mnU +hpv aQN ocz aQN -geK +fHA wlB wlB wlB wlB wlB -mnU +hpv wlB aHw aQN @@ -53440,31 +52847,31 @@ fEu fEu pCO oSX -viK -xJZ -xJZ -wqb -tVj +hPm +mnC +mnC +fEZ +mnC kbQ kbQ kbQ kbQ kbQ lFk -bPk -xJZ -viK -xJZ -sxY -xJZ -xJZ -xJZ -xJZ -xJZ -xJZ -xJZ -xJZ -xJZ +lFE +eVy +gUX +eVy +hpx +eVy +eVy +eVy +eVy +eVy +eVy +eVy +eVy +eVy qhZ rqn kGF @@ -53479,10 +52886,10 @@ tdy vpV dNY obS -ryD -viK -xJZ -xJZ +wlW +gUX +eVy +eVy kfG eyt eyt @@ -53555,22 +52962,22 @@ urD pdK pdK nsN -mnU +hpv aQN aQN aQN -geK -vLh +fHA +fZQ hDw qZV qZV oyl -mnU +hpv aQN aQN aQN -geK -vLh +fHA +fZQ hDw qZV qZV @@ -53622,31 +53029,31 @@ lur fEu thp oSX -viK -xJZ -ryD -ryD -tVj +hPm +mnC +gWu +gWu +mnC kbQ jqw kbQ kbQ kbQ ofC -uvr -xJZ -viK -xJZ -xJZ -sny -vlw -xJZ -xJZ -xxs -iXR -xJZ -xJZ -gDh +nZP +eVy +gUX +eVy +eVy +eJD +jsg +eVy +eVy +sDX +aRg +eVy +eVy +xpD qhZ beE orb @@ -53661,10 +53068,10 @@ bUg vpV lNq obS -ryD -wXs -xJZ -ryD +wlW +cKb +eVy +wlW kfG xAx eyt @@ -53737,26 +53144,26 @@ pdK pdK urD nsN -bys -kkt -hsa -ksu -njC -riM +hlN +lCj +cwt +vRm +nXF +eCU aQN aQN aQN -hsa -xDd -rUc -hsa -ksu -bVe -yhZ +cwt +dfc +tiK +cwt +vRm +nON +bWE aQN aQN aQN -hsa +cwt wlB aQN aQN @@ -53804,22 +53211,22 @@ rTv fEu thp oSX -mZk -xJZ -xJZ -imu +kZL +mnC +mnC +oBb +mnC tVj tVj tVj tVj tVj tVj -tVj -uvr -xJZ -viK -xJZ -wqb +nZP +eVy +gUX +eVy +xRO eyt eyt eyt @@ -53843,10 +53250,10 @@ fHx vpV qVS wVf -rWY -viK -xJZ -xJZ +jIi +gUX +eVy +eVy vph qIF sgk @@ -53986,22 +53393,22 @@ cbg fEu swM wOO -viK -xJZ -xJZ -wqb -tVj +hPm +mnC +mnC +fEZ +mnC tVj qIF kbQ qIF tTU kbQ -uvr -xJZ -viK -gDh -wqb +nZP +eVy +gUX +xpD +xRO eyt eyt eyt @@ -54025,10 +53432,10 @@ jhv aQu ocr wVf -ybt -viK -xJZ -vlw +nkK +gUX +eVy +jsg qIF kbQ kbQ @@ -54168,22 +53575,22 @@ osr aDZ aDZ nOg -pfr -lVc -lVc -iFZ -kbQ +tkR +tyc +tyc +bIR +gWu kbQ kbQ kbQ kbQ sgk eyt -wqb -xJZ -viK -xJZ -wqb +ouy +eVy +gUX +eVy +xRO eyt eyt eyt @@ -54207,10 +53614,10 @@ twh aqb ptP wVf -mNT -viK -xJZ -xJZ +lNy +gUX +eVy +eVy kfG nMJ uqW @@ -54350,22 +53757,22 @@ rpI rrr rrr wOO -fga -uwJ -xJZ -viK -kbQ +iVi +xea +mnC +hPm +gWu kbQ qIF kbQ qIF uet eyt -wqb -rpd -viK -xJZ -wqb +ouy +iQM +gUX +eVy +xRO eyt eyt eyt @@ -54389,10 +53796,10 @@ wVf wVf wVf wVf -rDD -viK -xJZ -xJZ +dLn +gUX +eVy +eVy kbQ kbQ eyt @@ -54513,7 +53920,7 @@ cFw nwq gDr cFw -mcB +rCa oSX oIC jtU @@ -54532,22 +53939,22 @@ uZa mEB mEB oSX -dJI -xJZ -xJZ -viK -ryD +wLm +mnC +mnC +hPm +gWu ouy ofC qIF jJf cFz eyt -wqb -xJZ -viK -xJZ -wqb +ouy +eVy +gUX +eVy +xRO eyt eyt jqw @@ -54570,11 +53977,11 @@ wVf eyt eyt eyt -wqb -xJZ -viK -xJZ -xJZ +xRO +sLl +gUX +eVy +eVy kbQ kbQ kbQ @@ -54675,7 +54082,7 @@ iQr iQr iQr tCV -eJN +vAt vuA vuA bcD @@ -54695,7 +54102,7 @@ cFw cFw cFw cFw -kuO +etJ slE cqC sPh @@ -54714,22 +54121,22 @@ wOO wOO wOO wOO -wqb -xJZ -xJZ -viK -xJZ +fEZ +mnC +mnC +hPm +mnC tCA kbQ kbQ vcR eyt eyt -wqb -xJZ -viK -xJZ -wqb +ouy +eVy +gUX +eVy +xRO eyt eyt eyt @@ -54751,12 +54158,12 @@ kTI wVf eyt eyt -wqb -wqb -xJZ -viK -xJZ -xJZ +xRO +xRO +eVy +gUX +eVy +eVy kfG ofC kbQ @@ -54847,10 +54254,10 @@ wlB aQN wlB wlB -bbK +fqD wlB iQr -iQr +iSB bSQ qNu wlB @@ -54861,7 +54268,7 @@ aKJ mrR cFw cFw -dYW +svP jks cFw cFw @@ -54877,7 +54284,7 @@ mUz nwq cFw cFw -uFO +clc slE slE oSX @@ -54890,28 +54297,28 @@ enu iQS cRZ vVH -kBZ -kBZ -kBZ -kBZ -kBZ -kBZ -wqb -gDh -xJZ -viK -xJZ +htt +htt +htt +htt +htt +htt +fEZ +fsU +mnC +hPm +mnC tCA kbQ kbQ eyt eyt eyt -wqb -xJZ -viK -wXu -wqb +ouy +eVy +gUX +wmj +xRO eyt eyt eyt @@ -54933,26 +54340,26 @@ gnZ wVf eyt eyt -wqb -oJW -xJZ -eQa -lVc -lVc -lVc -lVc -lVc -mCe -lVc -lVc -lVc -pfr -lVc -feR -lVc -pfr -vJp -lVc +xRO +atL +eVy +hID +cNK +cNK +cNK +cNK +cNK +fdQ +cNK +cNK +cNK +kmN +cNK +cyP +cNK +kmN +rKZ +cNK mUP fnj baa @@ -55059,41 +54466,41 @@ jks cFw cFw nwq -gaG -qEt -ihX -qEt -xSZ -qEt -biS +dLA +nVU +dko +nVU +nzu +nVU +odf vVH dsz enu iQS wxD vVH -kBZ -kBZ -kBZ -kBZ -kBZ -kBZ -wqb -rDD -xJZ -viK -stw +htt +htt +htt +htt +htt +htt +fEZ +bDC +mnC +hPm +itw ouy kbQ kbQ kbQ eyt eyt -wqb -rDD -viK -gha -wqb +ouy +dLn +gUX +rIr +xRO eyt eyt kbQ @@ -55115,26 +54522,26 @@ ycz wVf eyt eyt -wqb -qQd -xJZ -viK -xJZ -vlw -xJZ -xJZ -ryD -xJZ -xJZ -xJZ -xJZ -xJZ -ryD -xJZ -xJZ -xJZ -xJZ -xJZ +xRO +dHG +eVy +gUX +eVy +jsg +eVy +eVy +wlW +eVy +eVy +eVy +eVy +eVy +wlW +eVy +eVy +eVy +eVy +eVy cto tuZ sgl @@ -55196,7 +54603,7 @@ wlB wlB lTg wlB -wlB +fUD wlB wlB jwX @@ -55247,35 +54654,35 @@ cFw cFw nwq nwq -oep +qcv vVH won vSu iQS wxD vVH -kBZ -kBZ -kBZ -kBZ -kBZ -kBZ -wqb -bFD -xJZ -viK -xJZ +htt +htt +htt +htt +htt +htt +fEZ +uGo +mnC +hPm +mnC lFE kbQ kbQ kbQ eyt eyt -wqb -xJZ -viK -xJZ -wqb +ouy +eVy +gUX +eVy +xRO eyt eyt jqw @@ -55297,26 +54704,26 @@ wVf wVf eyt eyt -wqb -wqb -xJZ -viK -ouP -vlw -pOg -xJZ -xJZ -wXu -ryD -ryD -xJZ -xJZ -xJZ -gDh -vlw -ryD -vXx -xJZ +xRO +xRO +eVy +gUX +gOJ +jsg +bTK +eVy +eVy +wmj +wlW +wlW +eVy +eVy +eVy +xpD +jsg +wlW +eEF +eVy fLu iaM pyz @@ -55372,7 +54779,7 @@ dYd wlB kAH lTg -wlB +fUD wlB wlB wlB @@ -55382,7 +54789,7 @@ wlB lTg wlB wlB -mdg +enS wlB beK cVq @@ -55429,35 +54836,35 @@ nwq wUF cFw cFw -uFO +clc vVH iQS aQY iQS iQS vVH -kBZ -kBZ -kBZ -kBZ -kBZ -kBZ -wqb -wqb -xJZ -viK -sKu +htt +htt +htt +htt +htt +htt +fEZ +fEZ +mnC +hPm +mts ouy kbQ kbQ kbQ eyt eyt -wqb -rWY -viK -xJZ -bPk +ouy +jIi +gUX +eVy +fld jqw kbQ kbQ @@ -55480,10 +54887,10 @@ kbQ eyt eyt eyt -wqb -xJZ -viK -xJZ +xRO +eVy +gUX +eVy ouy ouy ouy @@ -55611,35 +55018,35 @@ cFw cFw cFw dgY -kuO +etJ vVH iQS fnl iQS iQS vVH -kBZ -kBZ -kBZ -kBZ -kBZ -kBZ -kBZ -wqb -xJZ -viK -gDh +htt +htt +htt +htt +htt +htt +htt +fEZ +mnC +hPm +fsU ouy sgk kbQ qIF eyt eyt -wqb -oJW -viK -xJZ -wqb +ouy +atL +gUX +eVy +xRO kbQ sgk kbQ @@ -55663,9 +55070,9 @@ jqw eyt eyt eyt -rDD -viK -xJZ +dLn +gUX +eVy ouy eyt eyt @@ -55760,7 +55167,7 @@ wlB wlB tfc tCV -iQr +iSB wlB ghW wlB @@ -55793,35 +55200,35 @@ cFw cFw dvT cFw -kuO +etJ vVH iQS enu apH iQS vVH -kBZ -wqb -wqb -wqb -wqb -kBZ -kBZ -wqb -xJZ -viK -gDh +htt +vVH +vVH +vVH +vVH +htt +htt +fEZ +mnC +hPm +fsU lFE sgk kbQ jqw eyt eyt -wqb -xJZ -viK -xJZ -tFQ +ouy +eVy +gUX +eVy +hzj iyv tTU jqw @@ -55845,9 +55252,9 @@ kbQ eyt eyt eyt -xJZ -wXs -xJZ +eVy +cKb +eVy ouy eyt kbQ @@ -55949,7 +55356,7 @@ wlB wlB nCl wlB -xmL +atu cFw cFw cFw @@ -55975,7 +55382,7 @@ jks cFw cFw cFw -kuO +etJ vVH nxl enu @@ -55987,49 +55394,49 @@ rql qcD kAl vVH -wqb -kBZ -wqb -xJZ -viK -klf +vVH +htt +fEZ +mnC +hPm +kkR ouy kbQ sgk kbQ eyt -wqb -xxs -xJZ -viK -xJZ -tWA -tWA -tLu -tLu -wqb -wqb -tWA -gey -uvr -tWA -wqb -wqb -wqb -wqb -tLu -tLu -xJZ -xJZ -xJZ -wqb -tLu -wqb -wqb -wqb -xJZ -viK -xJZ +ouy +sDX +eVy +gUX +eVy +uTv +uTv +vwV +vwV +xRO +xRO +uTv +jGt +kyA +uTv +xRO +xRO +xRO +xRO +vwV +vwV +eVy +eVy +eVy +xRO +vwV +xRO +xRO +xRO +eVy +gUX +eVy ouy eyt qIF @@ -56157,7 +55564,7 @@ jks jks cFw cFw -kuO +etJ uti kxU enu @@ -56169,49 +55576,49 @@ jXn iQS iQS tkr -imu -xJZ -xJZ -xJZ -viK -xJZ +oBb +mnC +mnC +mnC +hPm +mnC ouy tCA kbQ tCA -wqb -wqb -xJZ -xJZ -viK -xJZ -xJZ -xJZ -xJZ -xJZ -wXu -xJZ -ryD -ryD -xJZ -keY -xJZ -vlw -xJZ -xJZ -xJZ -xJZ -xJZ -xJZ -xJZ -xJZ -xJZ -xJZ -xJZ -xJZ -xJZ -wXs -xJZ +ouy +ouy +eVy +eVy +gUX +eVy +eVy +eVy +eVy +eVy +wmj +eVy +wlW +wlW +eVy +jti +eVy +jsg +eVy +eVy +eVy +eVy +eVy +eVy +eVy +eVy +eVy +eVy +eVy +eVy +eVy +cKb +eVy kbQ kbQ kbQ @@ -56339,7 +55746,7 @@ jks jks cFw nwq -ezU +gjm uti sPD hdV @@ -56351,49 +55758,49 @@ pDW pDW pDW pDW -lVc -lVc -lVc -lVc -pfr -lVc -lVc -lVc -lVc -lVc -lVc -pbw -lVc -lVc -pfr -nch -lVc -lVc -lVc -lVc -xpk -lVc -elO -lVc -lVc -lVc -lVc -lVc -lVc -xza -lVc -lVc -lVc -elO -lVc -lVc -lVc -tlM -lVc -lVc -lVc -cpC -xJZ +tyc +tyc +tyc +tyc +tkR +tyc +tyc +tyc +tyc +tyc +tyc +pJw +cNK +cNK +kmN +liN +cNK +cNK +cNK +cNK +cQm +cNK +riV +cNK +cNK +cNK +cNK +cNK +cNK +mqs +cNK +cNK +cNK +riV +cNK +cNK +cNK +gWj +cNK +cNK +cNK +nyk +eVy kbQ ofC kbQ @@ -56521,7 +55928,7 @@ jks cFw cFw nwq -kuO +etJ uti fmy iQS @@ -56533,49 +55940,49 @@ iQS axs iQS iQS -xJZ -xJZ -xJZ -xJZ -xJZ -ryD -ryD -oPV -xJZ -xJZ -eKF -bPk -xJZ -xJZ -xJZ -xJZ -xJZ -xJZ -vlw -xJZ -xJZ -xJZ -xJZ -sny -xJZ -xJZ -xJZ -xJZ -xJZ -xJt -xJZ -xJZ -sny -xJZ -xJZ -xJZ -xJZ -vlw -xJZ -xJZ -xJZ -vXx -ryD +mnC +mnC +mnC +mnC +mnC +gWu +gWu +fiY +mnC +mnC +eer +fld +eVy +eVy +eVy +eVy +eVy +eVy +jsg +eVy +eVy +eVy +eVy +eJD +eVy +eVy +eVy +eVy +eVy +bKZ +eVy +eVy +eJD +eVy +eVy +eVy +eVy +jsg +eVy +eVy +eVy +eEF +wlW kbQ kbQ kbQ @@ -56703,7 +56110,7 @@ nRU jjj jjj mcp -tdt +tJx xAg xAg bSD @@ -56715,46 +56122,46 @@ vVH vVH vVH vVH -gfu -xJZ -xJZ -gfu -sny -sVr -ryD -ryD -xJZ -iLc -dUL -bPk -sny -xJZ -xJZ -mHh -wqb -wqb -tLu -tLu -wqb -wqb -wqb -wqb -bPk -tLu -tWA -gey -tWA -wqb -wqb -bPk -wqb -bPk -wqb -wqb -tLu -bPk -bPk -wqb +mmG +mnC +mnC +mmG +oLW +qHo +gWu +gWu +mnC +sIW +dxV +fld +eJD +eVy +eVy +iNA +xRO +xRO +vwV +vwV +xRO +xRO +xRO +xRO +fld +vwV +uTv +jGt +uTv +xRO +xRO +fld +xRO +fld +xRO +xRO +vwV +fld +fld +xRO iwT wVp iwT @@ -56885,23 +56292,23 @@ jks cFw eHs cFw -bSj +cSL aoC xAg uti uti uti vVH -gCZ -gfe -bzz -fNm +fkM +deV +hPY +rEJ vVH -oET -slA -gfG -oET -oET +jwW +fAt +qbB +jwW +jwW iwT iwT iwT @@ -57070,19 +56477,19 @@ cFw bGU pGs pGs -tgC -oAJ -sxL -bzz -aer +biY +bmL +whi +hPY +qmh rvD rvD -wPH -ekE -oET -oET -oET -oET +qIn +rxO +jwW +jwW +jwW +jwW jqw kbQ ofC @@ -57260,7 +56667,7 @@ rvD rvD bGU rvD -xeO +nJx eyt eyt eyt @@ -57951,7 +57358,7 @@ kgp kgp kgp wlB -cFw +xeJ cFw xmL cFw @@ -58188,20 +57595,20 @@ eyt eyt eyt eyt -qTh +orB ouy qaX rTi rTi ouy -nhI -vjO -rsO -bzz -gfe -oAJ -liz -vDP +iWw +nnB +bfe +hPY +deV +bmL +wel +siw ouy cwk sCp @@ -58370,20 +57777,20 @@ rvD bGU rvD rvD -xeO -bzz -uSF -dFC -mVn -hti -qEc +nJx +hPY +kyH +asV +vGb +iQX +jKr bGU rvD aSj fPJ bGU oBq -kjr +kLk kVE ibi dRI @@ -58565,7 +57972,7 @@ cVd huE lzT bGU -rKS +cNc vEi dir xHz @@ -58747,7 +58154,7 @@ sDH huE lzT lzT -gzm +qtC rTi sCp inV @@ -58861,7 +58268,7 @@ hPq kgp nCl wlB -nwq +jTi cFw ihY ihY @@ -58929,12 +58336,12 @@ pYK fFw pYI huE -xeO -uoU -bzz -fXA -mVj -cql +nJx +aAl +hPY +mxK +kdr +uEw pGs pGs pGs @@ -59405,7 +58812,7 @@ aQN tMZ pvQ lTg -aQN +oCM wlB kyp cFh @@ -63329,8 +62736,8 @@ brT uvd uvd uvd -wNI -xqS +nMN +fVo rco kjI kjI @@ -63345,8 +62752,8 @@ kjI kjI atM pTc -lvt -lFr +pyR +iEO uvd uvd uvd @@ -63693,8 +63100,8 @@ brT uvd uvd uvd -eIr -uxi +lOL +dPB rco kjI snS @@ -63709,8 +63116,8 @@ kjI snS snS hTQ -vPh -nau +lJJ +vbE uvd uvd ulv @@ -64969,7 +64376,7 @@ uvd uvd brT gRU -mLJ +wOU avD brT brT @@ -64982,7 +64389,7 @@ brT brT brT avD -bhU +hxb bsf uvd uvd @@ -65151,8 +64558,8 @@ ulv uvd brT vdV -tPE -qza +fFb +haY kjI rco kjI @@ -65163,8 +64570,8 @@ snS kjI hTQ kjI -vus -xfD +dXi +rJp mMz ulv uvd @@ -65306,22 +64713,22 @@ mPk mPk mPk mPk -itL -xce -byF -xce -xce -xce -xce -xce -byF -xce -xce -xce -xce -xce -xce -gBP +xSL +oXd +nSW +oXd +oXd +oXd +oXd +oXd +nSW +oXd +oXd +oXd +oXd +oXd +oXd +glM hXq hXq hXq @@ -65515,8 +64922,8 @@ kEK eiK ulv bsf -jwf -ehM +rdU +hfA kjI rco eRQ @@ -65527,8 +64934,8 @@ kjI kjI qAd kjI -cXa -rYi +mCM +iKU bsf brT uvd @@ -65697,7 +65104,7 @@ ulv ulv ulv bsf -jXp +hPA avD avD brT @@ -65710,7 +65117,7 @@ yaC brT avD avD -xfD +rJp bsf ulv uvd @@ -66944,24 +66351,24 @@ mPk mPk mPk mPk -itL -lwm -tjs -lwm -lwm -lwm -lwm -lwm -tjs -lwm -lwm -lwm -lwm -lwm -tjs -lwm -lwm -hjK +xSL +nYS +nzT +nYS +nYS +nYS +nYS +nYS +nzT +nYS +nYS +nYS +nYS +nYS +nzT +nYS +nYS +tyj stK hXq hXq @@ -67136,11 +66543,11 @@ mPk pRa pRa mPk -vjZ -aAr +pJR +aDS fGN wFJ -xrl +qvk pRa hfZ iWj @@ -67318,11 +66725,11 @@ pRa pRa pRa pRa -itL +xSL kif fGN fGN -xrl +qvk pRa mPk xDE @@ -67500,11 +66907,11 @@ pRa pRa mPk pRa -kWf -cKB -mdM -mdM -hjf +nAR +pvC +agh +agh +rTH pRa fDH ymb diff --git a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm index 886f1ee7c1b9..927aa971785a 100644 --- a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm +++ b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm @@ -26,6 +26,10 @@ /obj/structure/disposaloutlet, /turf/open/floor/interior/plastic, /area/strata/ag/exterior/paths/far_north_outpost) +"aai" = ( +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/strata/orange_cover, +/area/strata/ag/interior/outpost/canteen) "aaj" = ( /obj/item/storage/large_holster/machete/full, /obj/structure/largecrate/random/barrel/green, @@ -79,16 +83,6 @@ }, /turf/open/floor/strata/floor3, /area/strata/ug/interior/jungle/structures/research/old_tunnels) -"aau" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 8 - }, -/obj/effect/blocker/sorokyne_cold_water, -/turf/open/gm/river, -/area/strata/ag/exterior/paths/far_north_outpost) "aav" = ( /obj/structure/largecrate/random/barrel/green, /turf/open/auto_turf/snow/brown_base/layer3, @@ -105,13 +99,6 @@ /obj/effect/landmark/corpsespawner/upp, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/interior/outside/bball/cave) -"aay" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/effect/blocker/sorokyne_cold_water, -/turf/open/gm/river, -/area/strata/ag/exterior/paths/far_north_outpost) "aaz" = ( /obj/structure/machinery/power/monitor{ name = "Main Power Grid Monitoring" @@ -152,16 +139,6 @@ /obj/effect/decal/cleanable/blood/gibs/core, /turf/open/floor/interior/plastic, /area/strata/ag/interior/outside/wooden_hospital) -"aaE" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 4 - }, -/obj/effect/blocker/sorokyne_cold_water, -/turf/open/gm/river, -/area/strata/ag/exterior/paths/far_north_outpost) "aaF" = ( /obj/structure/largecrate/random/barrel/green, /turf/open/auto_turf/snow/brown_base/layer1, @@ -173,13 +150,6 @@ /obj/structure/surface/table/reinforced/prison, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/interior/outside/bball/cave) -"aaH" = ( -/obj/structure/platform_decoration/strata{ - dir = 4 - }, -/obj/effect/blocker/sorokyne_cold_water, -/turf/open/gm/river, -/area/strata/ag/exterior/paths/far_north_outpost) "aaI" = ( /obj/effect/blocker/sorokyne_cold_water, /turf/open/gm/river, @@ -332,13 +302,10 @@ /obj/structure/flora/grass/tallgrass/ice, /turf/open/auto_turf/ice/layer1, /area/strata/ag/interior/outside/bball/cave) -"abq" = ( -/obj/structure/platform_decoration/strata{ - dir = 8 - }, -/obj/effect/blocker/sorokyne_cold_water, -/turf/open/gm/river, -/area/strata/ag/exterior/paths/far_north_outpost) +"abp" = ( +/obj/structure/machinery/light, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/security) "abr" = ( /obj/effect/decal/cleanable/blood, /turf/open/auto_turf/snow/brown_base/layer1, @@ -363,11 +330,6 @@ /obj/effect/decal/cleanable/blood, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/interior/outside/bball/cave) -"abw" = ( -/obj/structure/platform_decoration/strata, -/obj/effect/blocker/sorokyne_cold_water, -/turf/open/gm/river, -/area/strata/ag/exterior/paths/far_north_outpost) "aby" = ( /obj/structure/machinery/camera/autoname{ dir = 8 @@ -460,19 +422,6 @@ }, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/interior/outside/bball/cave) -"abO" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 8 - }, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/paths/far_north_outpost) "abP" = ( /obj/structure/barricade/handrail/strata{ dir = 8 @@ -485,16 +434,6 @@ }, /turf/open/floor/strata/fake_wood, /area/strata/ag/exterior/paths/far_north_outpost) -"abR" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/paths/far_north_outpost) "abT" = ( /obj/structure/surface/rack, /obj/item/storage/pill_bottle/bicaridine, @@ -549,11 +488,6 @@ }, /turf/open/floor/strata/white_cyan2/west, /area/strata/ug/interior/jungle/structures/research) -"acc" = ( -/obj/structure/platform/strata, -/obj/effect/blocker/sorokyne_cold_water, -/turf/open/gm/river, -/area/strata/ag/exterior/paths/far_north_outpost) "acd" = ( /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/blood/gibs/core, @@ -565,33 +499,6 @@ }, /turf/open/asphalt/cement, /area/strata/ug/interior/outpost/platform) -"acg" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/obj/structure/platform_decoration/strata{ - dir = 4 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/paths/far_north_outpost) -"ach" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/paths/far_north_outpost) -"aci" = ( -/obj/structure/flora/grass/tallgrass/ice/corner{ - dir = 4 - }, -/obj/structure/platform_decoration/strata{ - dir = 1 - }, -/obj/effect/blocker/sorokyne_cold_water, -/turf/open/gm/river, -/area/strata/ag/exterior/paths/far_north_outpost) "acj" = ( /obj/effect/decal/cleanable/vomit, /turf/open/floor/strata/fake_wood, @@ -652,35 +559,6 @@ /obj/structure/inflatable/door, /turf/open/auto_turf/ice/layer1, /area/strata/ag/interior/outside/bball) -"acu" = ( -/obj/structure/flora/grass/tallgrass/ice/corner{ - dir = 8 - }, -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/effect/blocker/sorokyne_cold_water, -/turf/open/gm/river, -/area/strata/ag/exterior/paths/far_north_outpost) -"acv" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata, -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/paths/far_north_outpost) -"acw" = ( -/obj/structure/flora/grass/tallgrass/ice/corner{ - dir = 4 - }, -/obj/structure/platform/strata{ - dir = 8 - }, -/obj/structure/platform/strata, -/obj/effect/blocker/sorokyne_cold_water, -/turf/open/gm/river, -/area/strata/ag/exterior/paths/far_north_outpost) "acx" = ( /obj/structure/bed/nest, /obj/effect/landmark/corpsespawner/doctor, @@ -751,10 +629,6 @@ }, /turf/open/floor/strata/floor3, /area/strata/ag/interior/outside/bball) -"acM" = ( -/obj/structure/machinery/light/small, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/canteen/personal_storage) "acO" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 8 @@ -806,10 +680,6 @@ /obj/effect/blocker/sorokyne_cold_water, /turf/open/gm/river, /area/strata/ag/exterior/marsh/water) -"acY" = ( -/obj/structure/platform/strata/metal, -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/landing_zones/near_lz1) "acZ" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/paper_bin, @@ -1011,20 +881,6 @@ "adH" = ( /turf/open/floor/strata/blue1, /area/strata/ag/interior/outside/bball) -"adI" = ( -/obj/structure/flora/grass/tallgrass/ice, -/obj/structure/platform/strata, -/obj/effect/blocker/sorokyne_cold_water, -/turf/open/gm/river, -/area/strata/ag/exterior/paths/far_north_outpost) -"adJ" = ( -/obj/structure/flora/grass/tallgrass/ice/corner{ - dir = 10 - }, -/obj/structure/platform/strata, -/obj/effect/blocker/sorokyne_cold_water, -/turf/open/gm/river, -/area/strata/ag/exterior/paths/far_north_outpost) "adK" = ( /obj/structure/bed/chair{ dir = 8 @@ -1672,16 +1528,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/auto_turf/strata_grass/layer0_mud_alt, /area/strata/ug/interior/jungle/structures/research/old_tunnels) +"agj" = ( +/obj/structure/platform/metal/strata/north, +/turf/open/floor/strata/multi_tiles/southwest, +/area/strata/ag/interior/outpost/foyer) "agl" = ( /obj/structure/inflatable/popped/door, /turf/open/floor/strata/floor3/east, /area/strata/ug/interior/jungle/structures/research) -"agm" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/hallways/south) "agn" = ( /obj/structure/barricade/handrail/strata, /turf/open/floor/plating, @@ -1749,17 +1603,6 @@ }, /turf/open/floor/strata/floor3, /area/strata/ag/interior/mining_outpost/flight_control) -"agA" = ( -/obj/effect/particle_effect/steam, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/river) "agB" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /obj/structure/pipes/vents/pump{ @@ -2040,12 +1883,6 @@ /obj/effect/blocker/sorokyne_cold_water, /turf/open/gm/river, /area/strata/ag/exterior/marsh/river) -"ahB" = ( -/obj/effect/particle_effect/steam, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform_decoration/strata, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/river) "ahH" = ( /obj/item/stack/catwalk, /obj/effect/decal/cleanable/blood/oil, @@ -2366,18 +2203,6 @@ /obj/structure/machinery/weather_siren, /turf/closed/wall/strata_outpost, /area/strata/ag/interior/outside/bball) -"aiM" = ( -/obj/structure/window/framed/strata/reinforced, -/turf/open/floor/strata/multi_tiles/southeast, -/area/strata/ag/interior/outpost/canteen/personal_storage) -"aiP" = ( -/obj/effect/particle_effect/steam, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/river) "aiU" = ( /obj/structure/machinery/computer/cameras{ dir = 4 @@ -2431,15 +2256,6 @@ /obj/structure/machinery/washing_machine, /turf/open/floor/strata/blue1, /area/strata/ug/interior/jungle/structures/research) -"ajf" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/turf/open/auto_turf/strata_grass/layer0, -/area/strata/ug/interior/jungle/platform/south) "ajg" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony, /turf/open/floor/strata/multi_tiles, @@ -2520,28 +2336,6 @@ /obj/structure/surface/rack, /turf/open/floor/strata/multi_tiles/west, /area/strata/ag/interior/mining_outpost/maintenance) -"ajw" = ( -/obj/effect/particle_effect/steam, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata, -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/river) -"ajx" = ( -/obj/structure/closet/secure_closet/personal, -/turf/open/floor/strata/blue1, -/area/strata/ag/interior/outpost/canteen/personal_storage) -"ajy" = ( -/obj/structure/closet/secure_closet/personal, -/turf/open/floor/prison/darkyellowfull2, -/area/strata/ag/interior/outpost/canteen/personal_storage) -"ajz" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/device/lightreplacer, -/turf/open/floor/strata/multi_tiles/southwest, -/area/strata/ag/interior/outpost/canteen/personal_storage) "ajC" = ( /obj/effect/decal/cleanable/blood{ icon_state = "gib6" @@ -2646,37 +2440,16 @@ /obj/structure/surface/table/reinforced/almayer_B, /turf/open/floor/strata/white_cyan1, /area/strata/ag/interior/mining_outpost/canteen) -"ajV" = ( -/obj/structure/machinery/washing_machine, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/canteen/personal_storage) -"ajW" = ( -/obj/item/stack/rods, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/north) -"ajX" = ( -/obj/structure/closet/wardrobe/suit, -/turf/open/floor/strata/blue1, -/area/strata/ag/interior/outpost/canteen/personal_storage) -"ajY" = ( -/obj/structure/closet/wardrobe/red, -/obj/item/clothing/suit/imperium_monk, -/turf/open/floor/strata/red1, -/area/strata/ag/interior/outpost/canteen/personal_storage) -"ajZ" = ( -/obj/structure/closet/secure_closet/personal, -/obj/item/clothing/suit/storage/bomber, -/turf/open/floor/strata/red1, -/area/strata/ag/interior/outpost/canteen/personal_storage) "aka" = ( /obj/structure/flora/grass/tallgrass/ice/corner, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/paths/far_north_outpost) -"akb" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/device/mass_spectrometer, -/turf/open/floor/strata/multi_tiles/southwest, -/area/strata/ag/interior/outpost/canteen/personal_storage) +"akc" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 10 + }, +/turf/open/floor/strata/floor3/east, +/area/strata/ag/interior/outpost/engi/drome) "akf" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -2745,28 +2518,6 @@ /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/strata/red1, /area/strata/ag/interior/mining_outpost/flight_control) -"akr" = ( -/obj/structure/machinery/light/small{ - dir = 8 - }, -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata, -/obj/effect/blocker/sorokyne_cold_water, -/turf/open/gm/river, -/area/strata/ag/interior/landing_zones/near_lz1) -"aks" = ( -/obj/structure/machinery/light/small{ - dir = 4 - }, -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata, -/obj/effect/blocker/sorokyne_cold_water, -/turf/open/gm/river, -/area/strata/ag/interior/landing_zones/near_lz1) "akt" = ( /obj/structure/reagent_dispensers/fueltank, /obj/structure/machinery/light/small{ @@ -2774,16 +2525,6 @@ }, /turf/open/floor/strata/multi_tiles, /area/strata/ag/interior/mining_outpost/hive) -"aku" = ( -/obj/structure/bed/chair, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/mining_outpost/hallways) -"akv" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 8 - }, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/mining_outpost/hallways) "akw" = ( /obj/item/stack/sandbags, /turf/open/floor/strata/white_cyan1/east, @@ -2817,19 +2558,6 @@ }, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/paths/far_north_outpost) -"akC" = ( -/obj/structure/closet/wardrobe/engineering_yellow, -/turf/open/floor/prison/darkyellowfull2, -/area/strata/ag/interior/outpost/canteen/personal_storage) -"akD" = ( -/obj/structure/closet/secure_closet/personal, -/obj/item/clothing/suit/storage/apron/overalls, -/turf/open/floor/strata/red1, -/area/strata/ag/interior/outpost/canteen/personal_storage) -"akE" = ( -/obj/structure/sign/nosmoking_1, -/turf/closed/wall/strata_outpost, -/area/strata/ag/interior/outpost/canteen/personal_storage) "akG" = ( /obj/structure/barricade/snow{ dir = 1 @@ -2842,6 +2570,11 @@ }, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/paths/far_north_outpost) +"akJ" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata/east, +/turf/open/gm/river, +/area/strata/ag/exterior/landing_zones/near_lz2) "akK" = ( /obj/structure/machinery/light/small, /turf/open/floor/strata/red1, @@ -2903,39 +2636,6 @@ }, /turf/open/floor/strata/multi_tiles, /area/strata/ag/interior/mining_outpost/hive) -"akX" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/mining_outpost/hallways) -"akY" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/snacks/cubancarp, -/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor/strata/cyan1/east, -/area/strata/ag/interior/mining_outpost/hallways) -"ala" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/snacks/fishfingers, -/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor/strata/cyan1/east, -/area/strata/ag/interior/mining_outpost/hallways) -"alb" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/mining_outpost/hallways) -"alc" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/snacks/meatballspagetti, -/obj/effect/landmark/objective_landmark/science, -/turf/open/floor/strata/cyan1/east, -/area/strata/ag/interior/mining_outpost/hallways) -"ald" = ( -/turf/closed/wall/strata_outpost/reinforced, -/area/strata/ag/interior/outpost/canteen/personal_storage) "ale" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/reagent_container/food/snacks/toastedsandwich, @@ -2967,22 +2667,6 @@ /obj/structure/barricade/snow, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/paths/far_north_outpost) -"alk" = ( -/obj/structure/closet/wardrobe/medic_white, -/turf/open/floor/strata/cyan1/east, -/area/strata/ag/interior/outpost/canteen/personal_storage) -"alm" = ( -/obj/structure/closet/secure_closet/personal, -/turf/open/floor/strata/red1, -/area/strata/ag/interior/outpost/canteen/personal_storage) -"aln" = ( -/obj/structure/pipes/vents/pump, -/turf/open/floor/strata/multi_tiles/southwest, -/area/strata/ag/interior/outpost/canteen/personal_storage) -"alo" = ( -/obj/effect/decal/strata_decals/catwalk/prison, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/canteen/personal_storage) "alp" = ( /obj/structure/machinery/door/airlock/almayer/medical/glass/colony{ name = "\improper Chunkeez Diner door" @@ -2993,16 +2677,6 @@ /obj/item/stool, /turf/open/floor/strata/white_cyan1, /area/strata/ag/interior/mining_outpost/canteen) -"alr" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/strata/blue1, -/area/strata/ag/interior/outpost/canteen/personal_storage) -"als" = ( -/obj/structure/closet/secure_closet/personal, -/turf/open/floor/strata/multi_tiles/southwest, -/area/strata/ag/interior/outpost/canteen/personal_storage) "alu" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/strata/floor3/east, @@ -3026,21 +2700,6 @@ "alz" = ( /turf/closed/wall/strata_outpost/reinforced/hull, /area/strata/ag/interior/landing_zones/near_lz1) -"alA" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 8 - }, -/turf/open/floor/strata/red1, -/area/strata/ag/interior/landing_zones/near_lz1) -"alB" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 4 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/strata/red1, -/area/strata/ag/interior/landing_zones/near_lz1) "alC" = ( /turf/open/floor/strata/red1, /area/strata/ag/interior/landing_zones/near_lz1) @@ -3058,36 +2717,12 @@ "alH" = ( /turf/closed/wall/strata_outpost/reinforced, /area/strata/ag/interior/mountain) -"alI" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/snacks/mushroompizzaslice, -/turf/open/floor/strata/cyan1/east, -/area/strata/ag/interior/mining_outpost/hallways) -"alJ" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/mining_outpost/hallways) -"alK" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/snacks/omelette, -/turf/open/floor/strata/cyan1/east, -/area/strata/ag/interior/mining_outpost/hallways) "alL" = ( /obj/structure/machinery/camera/autoname{ dir = 8 }, /turf/open/floor/strata/white_cyan1/east, /area/strata/ag/interior/mining_outpost/canteen) -"alM" = ( -/obj/structure/pipes/vents/pump/on, -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/floor/strata/floor3/east, -/area/strata/ag/exterior/outpost_decks) "alN" = ( /obj/effect/decal/cleanable/blood, /obj/effect/decal/strata_decals/catwalk/prison, @@ -3109,10 +2744,6 @@ /obj/structure/barricade/snow, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/paths/far_north_outpost) -"alT" = ( -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/outpost/canteen/personal_storage) "alV" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -3123,27 +2754,6 @@ }, /turf/open/floor/greengrid, /area/strata/ag/interior/mining_outpost/central) -"alW" = ( -/obj/effect/decal/strata_decals/catwalk/prison, -/obj/structure/curtain/open/shower, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/canteen/personal_storage) -"alX" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/multi_tiles/southwest, -/area/strata/ag/interior/outpost/hallways/north) -"alY" = ( -/obj/effect/decal/strata_decals/catwalk/prison, -/obj/effect/landmark/survivor_spawner, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/canteen/personal_storage) -"alZ" = ( -/obj/structure/closet/secure_closet/personal, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/strata/multi_tiles/southwest, -/area/strata/ag/interior/outpost/canteen/personal_storage) "amc" = ( /obj/effect/decal/cleanable/blood{ layer = 3 @@ -3178,13 +2788,6 @@ "amj" = ( /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/interior/restricted) -"aml" = ( -/obj/item/lightstick/planted, -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer4, -/area/strata/ag/interior/restricted) "amm" = ( /obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer1, @@ -3193,13 +2796,6 @@ /obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/paths/far_north_outpost) -"amo" = ( -/obj/structure/largecrate/random/barrel/green, -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/interior/restricted) "amp" = ( /obj/structure/surface/rack, /obj/item/clothing/suit/storage/snow_suit, @@ -3212,31 +2808,11 @@ /obj/structure/pipes/vents/pump, /turf/open/floor/strata, /area/strata/ag/interior/landing_zones/near_lz1) -"ams" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/mining_outpost/hallways) -"amt" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/mining_outpost/hallways) "amu" = ( /obj/structure/prop/almayer/computers/sensor_computer1, /obj/structure/blocker/invisible_wall, /turf/closed/wall/strata_outpost/reinforced, /area/strata/ag/interior/outside/checkpoints/north_armor) -"amv" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/prison/darkyellowfull2, -/area/strata/ag/exterior/outpost_decks) "amw" = ( /obj/effect/decal/cleanable/blood, /turf/open/auto_turf/snow/brown_base/layer0, @@ -3257,23 +2833,11 @@ /obj/structure/window/framed/strata, /turf/open/floor/strata, /area/strata/ug/interior/outpost/underground_dorms/sec2) -"amG" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 8 - }, -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/auto_turf/strata_grass/layer0, -/area/strata/ug/interior/jungle/platform/south) "amK" = ( /obj/effect/blocker/sorokyne_cold_water, /obj/effect/blocker/sorokyne_cold_water, /turf/open/gm/river, /area/strata/ag/exterior/marsh/river) -"amM" = ( -/obj/structure/bedsheetbin, -/obj/structure/machinery/power/apc/no_power/north, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/canteen/personal_storage) "amN" = ( /obj/effect/decal/cleanable/blood, /obj/structure/machinery/light{ @@ -3281,21 +2845,6 @@ }, /turf/open/floor/strata/fake_wood, /area/strata/ag/interior/outpost/canteen) -"amO" = ( -/turf/open/floor/strata/blue1, -/area/strata/ag/interior/outpost/canteen/personal_storage) -"amP" = ( -/obj/structure/machinery/shower{ - dir = 1 - }, -/turf/open/floor/interior/plastic, -/area/strata/ag/interior/outpost/canteen/personal_storage) -"amU" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer4, -/area/strata/ag/interior/restricted) "amX" = ( /obj/structure/flora/bush/ausbushes/grassybush{ icon_state = "fullgrass_1" @@ -3321,12 +2870,6 @@ /obj/item/stack/sheet/metal/medium_stack, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/interior/outpost/engi/drome) -"anb" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/interior/restricted) "anc" = ( /obj/structure/pipes/standard/simple/hidden/cyan, /obj/structure/stairs/perspective{ @@ -3368,27 +2911,10 @@ }, /turf/open/floor/strata, /area/strata/ag/interior/landing_zones/near_lz1) -"ank" = ( -/obj/structure/pipes/standard/manifold/fourway/hidden/cyan, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/mining_outpost/hallways) "anl" = ( /obj/structure/window/framed/strata/reinforced, /turf/open/floor/strata/white_cyan1, /area/strata/ag/interior/mining_outpost/canteen) -"anm" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/mining_outpost/hallways) -"ano" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1 - }, -/turf/open/floor/strata/cyan2/east, -/area/strata/ag/interior/mining_outpost/hallways) "anp" = ( /obj/structure/machinery/light{ dir = 1 @@ -3495,9 +3021,6 @@ }, /turf/open/floor/prison/darkredfull2, /area/strata/ag/interior/mining_outpost/canteen) -"anG" = ( -/turf/closed/wall/strata_outpost/reinforced/hull, -/area/strata/ag/interior/outpost/canteen/personal_storage) "anI" = ( /obj/structure/machinery/vending/snack, /turf/open/floor/strata/fake_wood, @@ -3506,53 +3029,10 @@ /obj/structure/sign/safety/galley, /turf/closed/wall/strata_outpost/reinforced, /area/strata/ag/exterior/paths/north_outpost) -"anK" = ( -/obj/structure/machinery/washing_machine, -/obj/item/facepaint/skull, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/canteen/personal_storage) -"anL" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/canteen/personal_storage) -"anM" = ( -/obj/effect/decal/strata_decals/catwalk/prison, -/obj/structure/pipes/standard/simple/hidden/cyan, -/obj/structure/curtain/open/shower, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/hallways/north) -"anN" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/interior/restricted) -"anP" = ( -/obj/structure/bedsheetbin, -/obj/item/device/binoculars/range, -/turf/open/floor/strata/blue1, -/area/strata/ag/interior/outpost/canteen/personal_storage) -"anR" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited, -/turf/closed/wall/strata_outpost, -/area/strata/ag/interior/outpost/canteen/personal_storage) "anS" = ( /obj/structure/barricade/snow, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/paths/far_north_outpost) -"anU" = ( -/obj/structure/sign/safety/medical, -/turf/closed/wall/strata_outpost, -/area/strata/ag/interior/outpost/canteen/personal_storage) -"anV" = ( -/obj/structure/curtain/open/shower, -/turf/open/floor/strata/blue1, -/area/strata/ag/interior/outpost/canteen/personal_storage) -"anW" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/obj/structure/curtain/open/shower, -/turf/open/floor/strata/blue1, -/area/strata/ag/interior/outpost/canteen/personal_storage) "aoa" = ( /obj/structure/flora/bush/ausbushes/grassybush{ icon_state = "pointybush_1" @@ -3666,36 +3146,6 @@ /obj/structure/machinery/vending/coffee, /turf/open/floor/strata/fake_wood, /area/strata/ag/interior/outpost/security) -"aoI" = ( -/obj/structure/window/framed/strata/reinforced, -/turf/open/floor/strata/multi_tiles/southeast, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"aoJ" = ( -/obj/structure/machinery/washing_machine, -/obj/structure/machinery/camera/autoname{ - dir = 4 - }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/canteen/personal_storage) -"aoL" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/hallways/north) -"aoM" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/hallways/north) -"aoO" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 9 - }, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/hallways/north) "aoP" = ( /obj/structure/stairs/perspective{ color = "#6e6e6e"; @@ -3857,51 +3307,6 @@ "apz" = ( /turf/open/auto_turf/snow/brown_base/layer4, /area/strata/ag/exterior/paths/far_north_outpost) -"apA" = ( -/obj/effect/particle_effect/steam, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/river) -"apC" = ( -/obj/structure/closet/secure_closet/personal, -/obj/item/clothing/suit/radiation, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"apD" = ( -/obj/structure/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"apE" = ( -/obj/structure/machinery/washing_machine, -/obj/item/clothing/suit/bluetag, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/canteen/personal_storage) -"apF" = ( -/obj/structure/machinery/light, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/hallways/north) -"apI" = ( -/obj/structure/curtain/open/shower, -/turf/open/floor/interior/plastic, -/area/strata/ag/interior/outpost/canteen/personal_storage) -"apJ" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform/strata/metal, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/hallways/north) -"apK" = ( -/obj/effect/decal/cleanable/greenglow, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/hallways/north) "apL" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/toy/deck, @@ -4120,33 +3525,6 @@ }, /turf/open/floor/strata/multi_tiles, /area/strata/ag/interior/mining_outpost/maintenance) -"aqE" = ( -/obj/structure/closet/secure_closet/personal, -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"aqG" = ( -/obj/structure/machinery/computer/communications{ - dir = 4 - }, -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/canteen/personal_storage) -"aqI" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/hallways/north) -"aqJ" = ( -/obj/structure/closet/secure_closet/personal, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/canteen/personal_storage) -"aqK" = ( -/obj/item/stool, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/canteen/personal_storage) "aqL" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/toy/deck, @@ -4161,14 +3539,6 @@ /obj/structure/machinery/light, /turf/open/floor/strata/floor3/east, /area/strata/ag/exterior/outpost_decks) -"aqP" = ( -/obj/item/device/aicard, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/canteen/personal_storage) -"aqQ" = ( -/obj/item/stack/sandbags/large_stack, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/canteen/personal_storage) "aqR" = ( /obj/structure/stairs/perspective{ color = "#6e6e6e"; @@ -4245,12 +3615,6 @@ /obj/structure/machinery/power/port_gen/pacman/super, /turf/open/floor/prison/floor_plate, /area/strata/ag/interior/mining_outpost/central) -"arj" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/mining_outpost/central) "ark" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 @@ -4396,16 +3760,6 @@ /obj/effect/decal/cleanable/blood/gibs/xeno/body, /turf/open/floor/strata/fake_wood, /area/strata/ag/interior/outpost/canteen) -"arK" = ( -/obj/structure/platform/strata/metal, -/turf/open/auto_turf/strata_grass/layer0_mud_alt, -/area/strata/ug/interior/jungle/structures/research/old_tunnels) -"arL" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 1 - }, -/turf/open/auto_turf/strata_grass/layer0_mud_alt, -/area/strata/ug/interior/jungle/structures/research/old_tunnels) "arM" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/auto_turf/strata_grass/layer1, @@ -4464,10 +3818,10 @@ "arY" = ( /turf/open/floor/strata/fake_wood, /area/strata/ag/interior/mining_outpost/central) -"asb" = ( -/obj/structure/platform/strata/metal, -/turf/open/floor/strata/multi_tiles, -/area/strata/ag/interior/mining_outpost/central) +"asa" = ( +/obj/structure/platform_decoration/metal/strata/west, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/engi/drome) "asc" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -4517,17 +3871,6 @@ }, /turf/open/asphalt/cement, /area/strata/ag/exterior/outpost_decks) -"asl" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - dir = 4; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/turf/open/asphalt/cement, -/area/strata/ag/exterior/outpost_decks) "asm" = ( /turf/open/asphalt/cement/cement14, /area/strata/ag/exterior/outpost_decks) @@ -4542,18 +3885,6 @@ "asp" = ( /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ug/interior/jungle/structures/research) -"asq" = ( -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/obj/structure/machinery/light/small{ - dir = 1 - }, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" - }, -/turf/open/floor/prison/darkyellowfull2, -/area/strata/ag/interior/outpost/engi) "ass" = ( /obj/structure/surface/rack, /obj/item/storage/box/donkpockets, @@ -4624,12 +3955,6 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ug/interior/jungle/structures/research) -"asE" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/red1, -/area/strata/ag/interior/outpost/hallways/north) "asF" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -4643,65 +3968,6 @@ /obj/item/ammo_magazine/rifle/type71, /turf/open/floor/strata/red1, /area/strata/ag/interior/outpost/security) -"asJ" = ( -/obj/structure/surface/rack, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"asK" = ( -/obj/structure/barricade/deployable{ - dir = 1 - }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/hallways/north) -"asL" = ( -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"asM" = ( -/obj/structure/machinery/power/apc/no_power/north, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"asN" = ( -/obj/structure/largecrate/random, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"asO" = ( -/obj/effect/decal/cleanable/blood, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"asP" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/phone{ - pixel_x = 8; - pixel_y = 6 - }, -/obj/item/device/flashlight/lamp, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"asR" = ( -/obj/structure/reagent_dispensers/water_cooler, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"asS" = ( -/obj/structure/machinery/vending/cigarette/colony, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/strata/white_cyan1/east, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"asT" = ( -/obj/structure/machinery/vending/snack, -/turf/open/floor/strata/white_cyan1/east, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"asU" = ( -/obj/structure/machinery/vending/coffee, -/turf/open/floor/strata/white_cyan1/east, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) "asV" = ( /obj/structure/surface/table/woodentable, /obj/item/device/defibrillator, @@ -4769,12 +4035,6 @@ }, /turf/open/asphalt/cement/cement9, /area/strata/ug/interior/jungle/structures/research/old_tunnels) -"atf" = ( -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/auto_turf/strata_grass/layer0_mud_alt, -/area/strata/ug/interior/jungle/structures/research/old_tunnels) "atg" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/spacecash/c500, @@ -4818,16 +4078,6 @@ }, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ug/interior/jungle/structures/research) -"ato" = ( -/obj/structure/flora/grass/tallgrass/ice, -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer3, -/area/strata/ag/exterior/paths/far_north_outpost) "atp" = ( /obj/structure/machinery/landinglight/ds1/delayone{ dir = 4 @@ -4872,28 +4122,6 @@ /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/strata, /area/strata/ag/interior/mining_outpost/central) -"atz" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 8 - }, -/turf/open/floor/strata/floor3/east, -/area/strata/ag/exterior/outpost_decks) -"atA" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/obj/structure/platform_decoration/strata/metal{ - dir = 4 - }, -/turf/open/floor/strata/floor3/east, -/area/strata/ag/exterior/outpost_decks) -"atB" = ( -/obj/structure/flora/grass/tallgrass/ice/corner{ - dir = 9 - }, -/obj/structure/platform_decoration/strata{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer3, -/area/strata/ag/exterior/paths/far_north_outpost) "atC" = ( /obj/structure/stairs/perspective{ color = "#6e6e6e"; @@ -4902,13 +4130,6 @@ }, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/paths/flight_control_exterior) -"atE" = ( -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/obj/effect/decal/strata_decals/catwalk/prison, -/turf/open/floor/greengrid, -/area/strata/ag/interior/outpost/engi) "atF" = ( /obj/structure/barricade/handrail/strata{ dir = 8 @@ -4936,10 +4157,6 @@ }, /turf/open/floor/strata/fake_wood, /area/strata/ag/interior/outpost/security) -"atL" = ( -/obj/effect/landmark/survivor_spawner, -/turf/open/floor/strata/red1, -/area/strata/ag/interior/outpost/hallways/north) "atO" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/cameras{ @@ -4947,24 +4164,6 @@ }, /turf/open/floor/strata, /area/strata/ag/interior/outpost/security) -"atP" = ( -/obj/effect/decal/cleanable/blood, -/obj/structure/coatrack, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"atQ" = ( -/obj/structure/barricade/deployable{ - dir = 1 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/north) -"atR" = ( -/obj/item/stack/rods, -/obj/structure/barricade/deployable{ - dir = 1 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/north) "atS" = ( /obj/item/stack/nanopaste, /turf/open/floor/interior/tatami, @@ -5095,11 +4294,6 @@ /obj/item/storage/box/explosive_mines, /turf/open/floor/strata/floor2, /area/strata/ug/interior/jungle/structures/research) -"aus" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/mining_outpost/hallways) "auv" = ( /obj/structure/sign/safety/restrictedarea, /turf/closed/wall/strata_outpost/reinforced, @@ -5163,12 +4357,6 @@ /obj/item/paper_bin, /turf/open/floor/strata/multi_tiles/southeast, /area/strata/ag/interior/outpost/security) -"auK" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 8 - }, -/turf/open/floor/strata/red1, -/area/strata/ag/interior/outpost/hallways/north) "auL" = ( /obj/structure/pipes/vents/pump{ dir = 8; @@ -5176,13 +4364,6 @@ }, /turf/open/floor/strata, /area/strata/ag/interior/outpost/security) -"auM" = ( -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/paths/flight_control_exterior) "auO" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/secure_data{ @@ -5190,49 +4371,10 @@ }, /turf/open/floor/strata, /area/strata/ag/interior/outpost/security) -"auP" = ( -/obj/structure/machinery/vending/cigarette/colony, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"auQ" = ( -/obj/structure/bed/chair, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/north) -"auR" = ( -/obj/structure/pipes/vents/pump{ - dir = 4 - }, -/turf/open/floor/strata/white_cyan1/east, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"auU" = ( -/obj/effect/decal/cleanable/blood/gibs/down, -/obj/item/dogtag, -/turf/open/floor/strata/white_cyan1/east, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"auV" = ( -/obj/item/clothing/gloves/white, -/turf/open/floor/strata/white_cyan1/east, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"auX" = ( -/obj/structure/pipes/vents/pump{ - dir = 8 - }, -/turf/open/floor/strata/white_cyan1/east, -/area/strata/ag/interior/outpost/hallways/north) "auY" = ( /obj/effect/decal/cleanable/blood/gibs/limb, /turf/open/floor/strata/fake_wood, /area/strata/ag/interior/outpost/canteen) -"auZ" = ( -/obj/structure/flora/grass/tallgrass/ice/corner{ - dir = 8 - }, -/obj/structure/platform_decoration/strata{ - dir = 4 - }, -/obj/effect/decal/cleanable/blood, -/turf/open/auto_turf/snow/brown_base/layer3, -/area/strata/ag/exterior/paths/far_north_outpost) "ava" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/structure/disposalpipe/segment{ @@ -5312,28 +4454,6 @@ }, /turf/open/floor/strata/floor3, /area/strata/ag/interior/landing_zones/near_lz1) -"avr" = ( -/obj/item/weapon/wirerod, -/obj/effect/decal/strata_decals/catwalk/prison, -/turf/open/floor/greengrid, -/area/strata/ag/interior/mining_outpost/hallways) -"avs" = ( -/obj/effect/decal/cleanable/blood, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/mining_outpost/hallways) -"avt" = ( -/obj/structure/machinery/light/small{ - dir = 1 - }, -/obj/item/stack/cable_coil/random, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/mining_outpost/hallways) -"avu" = ( -/obj/effect/decal/strata_decals/catwalk/prison, -/obj/effect/decal/cleanable/blood, -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/greengrid, -/area/strata/ag/interior/mining_outpost/hallways) "avv" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony, /turf/open/floor/prison/darkredfull2, @@ -5394,12 +4514,6 @@ }, /turf/open/asphalt/cement, /area/strata/ag/exterior/paths/mining_outpost_exterior) -"avH" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/strata/multi_tiles/southwest, -/area/strata/ag/interior/outpost/hallways/north) "avJ" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/structure/disposalpipe/segment{ @@ -5439,16 +4553,6 @@ }, /turf/open/floor/prison/darkyellowfull2, /area/strata/ag/interior/outpost/engi) -"avR" = ( -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/obj/structure/machinery/light/small, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" - }, -/turf/open/floor/prison/darkyellowfull2, -/area/strata/ag/interior/outpost/engi) "avS" = ( /obj/structure/barricade/handrail/strata{ dir = 8 @@ -5535,35 +4639,6 @@ /obj/structure/bed/chair/office/light, /turf/open/floor/strata/floor3, /area/strata/ag/interior/outpost/security) -"awi" = ( -/obj/structure/machinery/vending/snack, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"awj" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/trash/plate{ - pixel_x = 1; - pixel_y = 3 - }, -/turf/open/floor/strata/blue1, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"awk" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"awl" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/drinks/cans/space_mountain_wind, -/turf/open/floor/strata/red1, -/area/strata/ag/interior/outpost/hallways/north) -"awm" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/turf/open/floor/strata/white_cyan1/east, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) "awo" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony{ dir = 2 @@ -5578,18 +4653,6 @@ "awq" = ( /turf/open/auto_turf/snow/brown_base/layer4, /area/strata/ag/interior/restricted) -"awr" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/auto_turf/strata_grass/layer0_mud_alt, -/area/strata/ug/interior/jungle/structures/research/old_tunnels) -"aws" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 4 - }, -/turf/open/auto_turf/strata_grass/layer0_mud_alt, -/area/strata/ug/interior/jungle/structures/research/old_tunnels) "awt" = ( /obj/item/stack/sheet/metal/medium_stack, /turf/open/auto_turf/strata_grass/layer1, @@ -5652,41 +4715,9 @@ /obj/structure/largecrate/random/barrel/green, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ug/interior/jungle/structures/research) -"awG" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/obj/effect/decal/strata_decals/catwalk/prison, -/turf/open/floor/greengrid, -/area/strata/ag/interior/mining_outpost/hallways) -"awI" = ( -/obj/effect/decal/strata_decals/catwalk/prison, -/obj/effect/decal/cleanable/blood{ - dir = 4; - icon_state = "gib6" - }, -/turf/open/floor/greengrid, -/area/strata/ag/interior/mining_outpost/hallways) "awJ" = ( /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/paths/north_outpost) -"awK" = ( -/obj/effect/decal/cleanable/blood{ - dir = 4; - icon_state = "gib6" - }, -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/mining_outpost/hallways) -"awL" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1 - }, -/turf/open/floor/strata/multi_tiles/west, -/area/strata/ag/interior/mining_outpost/hallways) "awM" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 @@ -5707,19 +4738,6 @@ /obj/structure/barricade/handrail/strata, /turf/open/asphalt/cement, /area/strata/ag/exterior/paths/mining_outpost_exterior) -"awQ" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e" - }, -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/multi_tiles, -/area/strata/ag/exterior/paths/flight_control_exterior) "awR" = ( /obj/structure/barricade/handrail/strata{ dir = 4 @@ -5750,16 +4768,6 @@ }, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/interior/outside/bball) -"awW" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/floor/prison/darkyellowfull2, -/area/strata/ag/exterior/outpost_decks) "awX" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/radio, @@ -5778,13 +4786,6 @@ /obj/structure/closet/secure_closet/personal, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/interior/outside/bball) -"awZ" = ( -/obj/structure/flora/grass/tallgrass/ice, -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer3, -/area/strata/ag/exterior/paths/far_north_outpost) "axa" = ( /obj/effect/decal/cleanable/blood/oil/streak, /turf/open/floor/strata/floor3/east, @@ -5827,14 +4828,6 @@ }, /turf/open/floor/strata, /area/strata/ag/interior/outpost/engi) -"axi" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - dir = 1; - icon_state = "p_stair_sn_full_cap" - }, -/turf/open/floor/strata/multi_tiles/southwest, -/area/strata/ag/interior/outpost/hallways/north) "axj" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/flashlight/lamp/green, @@ -5879,23 +4872,10 @@ /obj/item/stack/sheet/metal/medium_stack, /turf/open/floor/strata/floor3, /area/strata/ag/interior/outpost/engi) -"axt" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/obj/structure/platform/strata/metal, -/turf/open/floor/prison/darkyellowfull2, -/area/strata/ag/interior/outpost/engi) "axu" = ( /obj/structure/closet/secure_closet/security/soro, /turf/open/floor/strata/red1, /area/strata/ag/interior/outside/checkpoints/outpost) -"axv" = ( -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/river) "axz" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 @@ -5922,41 +4902,6 @@ }, /turf/open/floor/strata/red1, /area/strata/ag/interior/outpost/security) -"axE" = ( -/obj/structure/machinery/vending/snack, -/obj/structure/machinery/camera/autoname{ - dir = 4 - }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"axF" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/drinks/bottle/vodka, -/obj/item/reagent_container/food/condiment/peppermill, -/turf/open/floor/strata/blue1, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"axG" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/trash/plate{ - pixel_x = 1; - pixel_y = 3 - }, -/obj/item/reagent_container/food/condiment/peppermill, -/obj/structure/bed/chair, -/turf/open/floor/strata/red1, -/area/strata/ag/interior/outpost/hallways/north) -"axH" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 8 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"axI" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 10 - }, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) "axJ" = ( /obj/item/device/t_scanner, /turf/open/floor/strata/fake_wood, @@ -6110,10 +5055,6 @@ /obj/effect/decal/strata_decals/catwalk/prison, /turf/open/floor/greengrid, /area/strata/ag/interior/mining_outpost/central) -"ayn" = ( -/obj/effect/decal/cleanable/blood, -/turf/open/floor/strata, -/area/strata/ag/interior/mining_outpost/hallways) "ayo" = ( /obj/structure/pipes/standard/simple/hidden/cyan, /turf/closed/wall/strata_outpost, @@ -6134,20 +5075,6 @@ /obj/structure/flora/grass/tallgrass/ice, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/paths/north_outpost) -"ayt" = ( -/obj/structure/flora/grass/tallgrass/ice, -/obj/structure/platform/strata{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer3, -/area/strata/ag/exterior/paths/north_outpost) -"ayu" = ( -/obj/structure/flora/grass/tallgrass/ice, -/obj/structure/platform_decoration/strata{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer3, -/area/strata/ag/exterior/paths/far_north_outpost) "ayv" = ( /obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer0, @@ -6170,12 +5097,6 @@ }, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/paths/north_outpost) -"ayA" = ( -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/floor/prison/darkyellowfull2, -/area/strata/ag/exterior/paths/flight_control_exterior) "ayC" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/structure/disposalpipe/segment{ @@ -6225,11 +5146,6 @@ }, /turf/open/floor/strata/floor3, /area/strata/ag/interior/outpost/engi) -"ayL" = ( -/obj/item/stack/rods, -/obj/structure/pipes/vents/pump/on, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/hallways/north) "ayM" = ( /obj/structure/machinery/light{ dir = 8 @@ -6255,14 +5171,6 @@ /obj/structure/machinery/door/airlock/almayer/maint/colony, /turf/open/floor/strata/multi_tiles/west, /area/strata/ag/interior/outpost/engi) -"ayW" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/obj/structure/machinery/door/airlock/almayer/security/colony{ - dir = 2; - name = "Security Barracks" - }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/north) "ayX" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 1 @@ -6282,45 +5190,12 @@ /obj/structure/machinery/light, /turf/open/floor/strata, /area/strata/ag/interior/outpost/admin) -"aze" = ( -/obj/effect/decal/cleanable/blood, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/north) -"azf" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/condiment/saltshaker, -/turf/open/floor/strata/blue1, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"azg" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/trash/plate{ - pixel_x = 1; - pixel_y = 3 - }, -/obj/item/reagent_container/food/condiment/saltshaker, -/turf/open/floor/strata/red1, -/area/strata/ag/interior/outpost/hallways/north) "azh" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 9 }, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/paths/north_outpost) -"azi" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/obj/effect/decal/cleanable/blood, -/obj/effect/decal/cleanable/blood/gibs/core, -/turf/open/floor/strata/white_cyan1/east, -/area/strata/ag/interior/outpost/hallways/north) -"azj" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) "azl" = ( /obj/item/reagent_container/glass/bucket/janibucket, /obj/structure/machinery/light/small, @@ -6509,22 +5384,6 @@ /obj/structure/fence, /turf/open/floor/prison/darkyellowfull2, /area/strata/ag/exterior/outpost_decks) -"aAe" = ( -/obj/structure/platform_decoration/strata/metal, -/turf/open/floor/strata/multi_tiles/west, -/area/strata/ag/exterior/outpost_decks) -"aAf" = ( -/obj/effect/decal/cleanable/blood/oil/streak, -/obj/structure/platform/strata/metal, -/turf/open/floor/strata, -/area/strata/ag/exterior/outpost_decks) -"aAg" = ( -/obj/effect/decal/cleanable/blood/oil/streak, -/obj/structure/platform_decoration/strata/metal{ - dir = 1 - }, -/turf/open/floor/strata/multi_tiles/west, -/area/strata/ag/exterior/outpost_decks) "aAh" = ( /obj/structure/filingcabinet, /obj/effect/landmark/objective_landmark/close, @@ -6561,13 +5420,6 @@ /obj/item/stack/sheet/metal/medium_stack, /turf/open/floor/strata, /area/strata/ag/interior/outpost/engi) -"aAp" = ( -/obj/effect/decal/cleanable/blood/gibs/xeno/down, -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 5 - }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/hallways/north) "aAs" = ( /obj/structure/barricade/handrail/strata, /obj/structure/pipes/standard/simple/hidden/cyan{ @@ -6649,23 +5501,6 @@ }, /turf/open/floor/strata/red1, /area/strata/ag/interior/outpost/security) -"aAJ" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"aAK" = ( -/obj/effect/decal/cleanable/blood, -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/white_cyan1/east, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"aAL" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) "aAM" = ( /obj/structure/machinery/cm_vending/sorted/marine_food, /turf/open/floor/strata/multi_tiles/southwest, @@ -6779,16 +5614,6 @@ }, /turf/open/floor/strata/multi_tiles, /area/strata/ag/interior/mining_outpost/hive) -"aBl" = ( -/obj/effect/decal/cleanable/blood{ - dir = 4; - icon_state = "gib6" - }, -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 8 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/mining_outpost/hallways) "aBm" = ( /obj/effect/decal/cleanable/blood{ dir = 4; @@ -6907,18 +5732,6 @@ }, /turf/open/floor/strata, /area/strata/ag/interior/outpost/engi) -"aBU" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" - }, -/turf/open/floor/prison/darkyellowfull2, -/area/strata/ag/interior/outpost/engi) "aBW" = ( /obj/structure/stairs/perspective{ color = "#6e6e6e"; @@ -6934,15 +5747,6 @@ /obj/structure/pipes/standard/simple/hidden/cyan, /turf/open/floor/prison/darkyellowfull2, /area/strata/ag/interior/outpost/engi) -"aBY" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" - }, -/turf/open/floor/prison/darkyellowfull2, -/area/strata/ag/interior/outpost/engi) "aBZ" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/strata/cyan2/east, @@ -6999,17 +5803,6 @@ }, /turf/open/floor/strata/red1, /area/strata/ag/interior/outpost/security) -"aCi" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/north) -"aCj" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/drinks/cans/ale, -/turf/open/floor/strata/cyan1/east, -/area/strata/ag/interior/outpost/hallways/north) "aCl" = ( /turf/closed/wall/strata_outpost/reinforced/hull, /area/strata/ag/interior/mining_outpost/central) @@ -7023,28 +5816,17 @@ /obj/structure/machinery/vending/sovietsoda, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/interior/outpost/maint) -"aCq" = ( -/obj/structure/machinery/space_heater, -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/floor/strata/floor3/east, -/area/strata/ug/interior/jungle/structures/ruin) +"aCp" = ( +/obj/structure/largecrate/random/barrel/green, +/obj/structure/platform/metal/strata/east, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/interior/restricted) "aCr" = ( /obj/structure/stairs/perspective{ color = "#6e6e6e" }, /turf/open/floor/strata/floor3/east, /area/strata/ug/interior/jungle/structures/ruin) -"aCs" = ( -/obj/structure/machinery/light/small{ - dir = 1 - }, -/obj/structure/platform_decoration/strata/metal{ - dir = 4 - }, -/turf/open/floor/strata/floor3/east, -/area/strata/ug/interior/jungle/structures/ruin) "aCt" = ( /obj/item/stack/rods, /obj/item/stack/sheet/metal/medium_stack, @@ -7099,12 +5881,6 @@ }, /turf/open/floor/strata/multi_tiles/southeast, /area/strata/ag/interior/mining_outpost/central) -"aCG" = ( -/obj/effect/decal/cleanable/blood, -/obj/structure/pipes/standard/simple/hidden/cyan, -/obj/effect/decal/cleanable/blood/gibs/core, -/turf/open/floor/strata, -/area/strata/ag/interior/mining_outpost/hallways) "aCH" = ( /obj/effect/decal/cleanable/blood, /obj/structure/pipes/vents/pump{ @@ -7167,35 +5943,16 @@ /obj/structure/prop/dam/truck/cargo, /turf/open/floor/strata/multi_tiles/west, /area/strata/ag/exterior/outpost_decks) -"aCU" = ( -/obj/structure/machinery/door/airlock/almayer/engineering/colony, -/turf/open/floor/strata/multi_tiles/west, -/area/strata/ag/interior/outpost/hallways/north) -"aCV" = ( -/obj/item/stack/rods, -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/hallways/north) -"aCW" = ( -/obj/item/stack/sheet/metal/medium_stack, -/obj/structure/pipes/standard/manifold/hidden/cyan, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/hallways/north) -"aCY" = ( -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/prison/darkyellowfull2, -/area/strata/ag/interior/outpost/hallways/north) "aDa" = ( /obj/structure/barricade/handrail/strata, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ug/interior/jungle/structures/research) +"aDc" = ( +/obj/structure/machinery/camera/autoname{ + dir = 8 + }, +/turf/open/floor/strata/floor3/east, +/area/strata/ag/interior/outpost/engi/drome) "aDd" = ( /obj/structure/stairs/perspective{ color = "#6e6e6e"; @@ -7234,34 +5991,6 @@ /obj/structure/window/framed/strata/reinforced, /turf/open/floor/strata/red1, /area/strata/ag/interior/outpost/security) -"aDk" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/obj/effect/decal/cleanable/blood, -/turf/open/floor/strata/white_cyan1/east, -/area/strata/ag/interior/outpost/hallways/north) -"aDl" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/trash/plate{ - pixel_x = 1; - pixel_y = 3 - }, -/obj/item/reagent_container/food/condiment/peppermill, -/turf/open/floor/strata/blue1, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"aDn" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/condiment/saltshaker, -/turf/open/floor/strata/cyan1/east, -/area/strata/ag/interior/outpost/hallways/north) -"aDo" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/obj/effect/decal/cleanable/blood, -/turf/open/floor/strata/white_cyan1/east, -/area/strata/ag/interior/outpost/hallways/north) "aDp" = ( /obj/effect/decal/cleanable/blood{ layer = 3 @@ -7315,21 +6044,10 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/strata/multi_tiles, /area/strata/ag/interior/mining_outpost/central) -"aDE" = ( -/turf/closed/wall/strata_outpost/reinforced/hull, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) "aDF" = ( /obj/structure/sign/double/maltesefalcon/left, /turf/closed/wall/strata_outpost, /area/strata/ag/interior/mining_outpost/central) -"aDG" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic, -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/mining_outpost/hallways) -"aDH" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/mining_outpost/hallways) "aDI" = ( /obj/structure/machinery/medical_pod/bodyscanner, /obj/structure/machinery/light/small{ @@ -7341,27 +6059,6 @@ /obj/structure/machinery/body_scanconsole, /turf/open/floor/strata/cyan1/east, /area/strata/ag/interior/mining_outpost/central) -"aDK" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/floor/strata/multi_tiles, -/area/strata/ag/exterior/paths/mining_outpost_exterior) -"aDL" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - dir = 4; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/turf/open/floor/strata/multi_tiles, -/area/strata/ag/exterior/paths/mining_outpost_exterior) "aDM" = ( /obj/structure/barricade/handrail/strata{ dir = 8 @@ -7414,24 +6111,6 @@ }, /turf/open/floor/strata/floor3/east, /area/strata/ag/exterior/outpost_decks) -"aDY" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 8 - }, -/turf/open/floor/strata/multi_tiles/west, -/area/strata/ag/exterior/outpost_decks) -"aDZ" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/floor/strata, -/area/strata/ag/exterior/outpost_decks) -"aEa" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 4 - }, -/turf/open/floor/strata/multi_tiles/west, -/area/strata/ag/exterior/outpost_decks) "aEb" = ( /obj/structure/bed/chair{ dir = 8 @@ -7454,37 +6133,6 @@ }, /turf/open/floor/strata/floor3, /area/strata/ag/interior/outpost/security) -"aEg" = ( -/obj/effect/decal/cleanable/blood{ - icon_state = "xgib6" - }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"aEh" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/snacks/carrotfries, -/turf/open/floor/strata/blue1, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"aEi" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/obj/effect/decal/cleanable/blood, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"aEj" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/obj/effect/decal/cleanable/blood, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"aEk" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/condiment/peppermill, -/obj/item/device/encryptionkey/dutch, -/turf/open/floor/strata/cyan1/east, -/area/strata/ag/interior/outpost/hallways/north) "aEm" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -7671,29 +6319,12 @@ /obj/structure/barricade/handrail/strata, /turf/open/floor/prison/darkyellowfull2, /area/strata/ag/interior/outpost/engi) -"aFd" = ( -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/floor/prison/darkyellowfull2, -/area/strata/ag/interior/outpost/engi) "aFf" = ( /obj/structure/pipes/standard/manifold/hidden/cyan{ dir = 1 }, /turf/open/floor/prison/darkyellowfull2, /area/strata/ag/interior/outpost/engi) -"aFi" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - icon_state = "p_stair_ew_full_cap"; - layer = 3.5 - }, -/turf/open/floor/prison/darkyellowfull2, -/area/strata/ag/interior/outpost/hallways/north) "aFj" = ( /obj/item/lightstick/red/spoke/planted{ layer = 3.1; @@ -7717,127 +6348,10 @@ }, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outpost/med) -"aFl" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 1 - }, -/turf/open/floor/strata/red1, -/area/strata/ag/interior/outpost/hallways/north) -"aFm" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 1 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/strata/red1, -/area/strata/ag/interior/outpost/hallways/north) -"aFn" = ( -/obj/effect/decal/cleanable/blood{ - layer = 3 - }, -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/red1, -/area/strata/ag/interior/outpost/hallways/north) -"aFo" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - dir = 8; - icon_state = "p_stair_full" - }, -/turf/open/floor/strata/red1, -/area/strata/ag/interior/outpost/hallways/north) -"aFp" = ( -/obj/effect/decal/cleanable/blood{ - icon_state = "xgib2" - }, -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - dir = 8; - icon_state = "p_stair_full" - }, -/turf/open/floor/strata/red1, -/area/strata/ag/interior/outpost/hallways/north) -"aFq" = ( -/obj/effect/decal/cleanable/blood{ - icon_state = "gibarm_flesh" - }, -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 1 - }, -/turf/open/floor/strata/red1, -/area/strata/ag/interior/outpost/hallways/north) -"aFr" = ( -/obj/effect/decal/cleanable/blood{ - icon_state = "xgib6" - }, -/obj/structure/barricade/wooden{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/red1, -/area/strata/ag/interior/outpost/hallways/north) -"aFs" = ( -/obj/effect/decal/cleanable/blood{ - layer = 3 - }, -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/north) -"aFt" = ( -/obj/structure/barricade/deployable{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/obj/structure/machinery/m56d_hmg/mg_turret{ - dir = 8 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/north) -"aFu" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/obj/structure/bed/chair{ - dir = 8 - }, -/obj/effect/landmark/survivor_spawner, -/turf/open/floor/strata/white_cyan1/east, -/area/strata/ag/interior/outpost/hallways/north) "aFv" = ( /obj/structure/machinery/light, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/paths/north_outpost) -"aFw" = ( -/obj/structure/pipes/standard/manifold/fourway/hidden/cyan, -/turf/open/floor/strata/white_cyan1/east, -/area/strata/ag/interior/outpost/hallways/north) -"aFx" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 4 - }, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/north) "aFz" = ( /obj/structure/machinery/light{ dir = 8 @@ -7973,54 +6487,10 @@ /obj/structure/machinery/space_heater, /turf/open/floor/prison/darkyellowfull2, /area/strata/ag/exterior/outpost_decks) -"aGd" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/outpost_decks) -"aGe" = ( -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/barricade/handrail/strata{ - layer = 3.1 - }, -/obj/structure/platform/strata/metal, -/turf/open/gm/river, -/area/strata/ag/exterior/outpost_decks) -"aGf" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/flora/grass/tallgrass/ice/corner{ - dir = 8; - layer = 2.9 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/paths/south_outpost) "aGh" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/strata/floor3/east, /area/strata/ag/exterior/outpost_decks) -"aGm" = ( -/obj/structure/machinery/door/airlock/almayer/engineering/colony{ - dir = 2 - }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/hallways/north) -"aGn" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/obj/structure/machinery/door/airlock/almayer/engineering/colony{ - dir = 2 - }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/hallways/north) "aGp" = ( /obj/structure/sign/safety/laser, /turf/closed/wall/strata_outpost/reinforced, @@ -8036,117 +6506,12 @@ "aGs" = ( /turf/closed/wall/strata_outpost/reinforced/hull, /area/strata/ag/interior/outpost/security) -"aGu" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 4 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/engi) -"aGw" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/north) -"aGx" = ( -/obj/effect/decal/strata_decals/catwalk/prison, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/strata/multi_tiles/southwest, -/area/strata/ag/interior/outpost/hallways/north) -"aGy" = ( -/obj/effect/decal/strata_decals/catwalk/prison, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/machinery/light, -/turf/open/floor/strata/multi_tiles/southwest, -/area/strata/ag/interior/outpost/hallways/north) -"aGz" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - dir = 8; - icon_state = "p_stair_full" - }, -/turf/open/floor/strata/multi_tiles/southwest, -/area/strata/ag/interior/outpost/hallways/north) "aGA" = ( /obj/structure/machinery/light{ dir = 4 }, /turf/open/floor/prison/darkyellowfull2, /area/strata/ag/exterior/outpost_decks) -"aGB" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - dir = 8; - icon_state = "p_stair_full" - }, -/turf/open/floor/strata/red1, -/area/strata/ag/interior/outpost/hallways/north) -"aGC" = ( -/obj/structure/machinery/light, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/north) -"aGD" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - dir = 8; - icon_state = "p_stair_full" - }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/north) -"aGE" = ( -/obj/item/stack/sheet/wood, -/turf/open/floor/strata/red1, -/area/strata/ag/interior/outpost/hallways/north) -"aGF" = ( -/obj/effect/decal/cleanable/blood{ - icon_state = "xtracks" - }, -/obj/structure/barricade/deployable{ - dir = 8 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/north) -"aGG" = ( -/obj/effect/decal/cleanable/blood{ - icon_state = "xtracks" - }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/north) -"aGH" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/trash/plate{ - pixel_x = 1; - pixel_y = 3 - }, -/obj/item/reagent_container/food/condiment/saltshaker, -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/outpost/hallways/north) -"aGI" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/obj/effect/decal/cleanable/blood, -/obj/effect/decal/cleanable/blood/gibs/core, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/hallways/north) -"aGJ" = ( -/obj/item/stack/rods, -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/hallways/north) -"aGK" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/trash/plate{ - pixel_x = 1; - pixel_y = 3 - }, -/obj/item/reagent_container/food/condiment/saltshaker, -/turf/open/floor/prison/darkyellowfull2, -/area/strata/ag/interior/outpost/hallways/north) "aGM" = ( /obj/item/stack/sandbags, /obj/structure/barricade/handrail/strata{ @@ -8189,16 +6554,6 @@ /obj/structure/flora/bush/ausbushes/var3/fullgrass, /turf/open/gm/dirt, /area/strata/ug/interior/jungle/structures/research/south) -"aGX" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 1 - }, -/obj/structure/pipes/standard/simple/hidden/cyan, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/asphalt/cement/cement3, -/area/strata/ag/interior/landing_zones/lz1) "aGZ" = ( /obj/structure/machinery/light{ dir = 4 @@ -8293,18 +6648,6 @@ "aHq" = ( /turf/open/floor/strata/multi_tiles/west, /area/strata/ag/interior/mining_outpost/maintenance) -"aHr" = ( -/obj/structure/pipes/vents/pump{ - dir = 4 - }, -/turf/open/floor/prison/darkyellowfull2, -/area/strata/ag/interior/outpost/hallways/north) -"aHs" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/prison/darkyellowfull2, -/area/strata/ag/interior/outpost/hallways/north) "aHt" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_21" @@ -8321,72 +6664,13 @@ "aHv" = ( /turf/closed/wall/strata_outpost/reinforced, /area/strata/ag/interior/outpost/engi) -"aHy" = ( -/obj/item/lightstick/red/planted, -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer4, -/area/strata/ag/exterior/paths/flight_control_exterior) "aHz" = ( /turf/closed/wall/resin/membrane/strata/on_tiles, /area/strata/ag/interior/outside/bball/cave) -"aHB" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 4 - }, -/obj/structure/platform_decoration/strata/metal{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/auto_turf/snow/brown_base/layer3, -/area/strata/ag/exterior/paths/flight_control_exterior) -"aHC" = ( -/obj/item/lightstick/red/planted, -/obj/structure/platform/strata/metal{ - dir = 1 - }, +"aHE" = ( +/obj/structure/platform/metal/strata/north, /turf/open/auto_turf/snow/brown_base/layer4, -/area/strata/ag/exterior/paths/flight_control_exterior) -"aHD" = ( -/obj/structure/platform_decoration/strata/metal, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/north) -"aHJ" = ( -/obj/effect/decal/cleanable/blood{ - icon_state = "xgibdown1" - }, -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - dir = 8; - icon_state = "p_stair_full" - }, -/turf/open/floor/strata/red1, -/area/strata/ag/interior/outpost/hallways/north) -"aHK" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/obj/item/stack/sheet/wood, -/turf/open/floor/strata/red1, -/area/strata/ag/interior/outpost/hallways/north) -"aHL" = ( -/obj/structure/barricade/wooden{ - dir = 8 - }, -/turf/open/floor/strata/red1, -/area/strata/ag/interior/outpost/hallways/north) -"aHM" = ( -/obj/item/stool, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/north) -"aHN" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/drinks/bottle/vodka, -/obj/item/reagent_container/food/condiment/peppermill, -/turf/open/floor/prison/darkyellowfull2, -/area/strata/ag/interior/outpost/hallways/north) +/area/strata/ag/exterior/paths/mining_outpost_exterior) "aHO" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony, /turf/open/floor/strata/multi_tiles/west, @@ -8397,12 +6681,6 @@ "aHR" = ( /turf/open/floor/strata/multi_tiles/west, /area/strata/ag/interior/outpost/maint) -"aHS" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer4, -/area/strata/ag/exterior/paths/flight_control_exterior) "aHT" = ( /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/interior/outpost/maint) @@ -8444,21 +6722,6 @@ /obj/effect/decal/strata_decals/catwalk/prison, /turf/open/floor/strata/orange_cover, /area/strata/ag/interior/landing_zones/near_lz1) -"aIg" = ( -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/asphalt/cement/cement3, -/area/strata/ag/interior/landing_zones/lz1) -"aIi" = ( -/obj/structure/pipes/vents/pump{ - dir = 8 - }, -/obj/effect/landmark/xeno_hive_spawn, -/obj/effect/landmark/ert_spawns/groundside_xeno, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/mining_outpost/hallways) "aIj" = ( /obj/structure/bed/chair{ dir = 8 @@ -8495,12 +6758,6 @@ /obj/item/reagent_container/food/snacks/enchiladas, /turf/open/floor/strata/orange_tile, /area/strata/ag/interior/mining_outpost/central) -"aIo" = ( -/obj/structure/pipes/vents/pump/on{ - dir = 4 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/mining_outpost/hallways) "aIp" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/pizzabox/mushroom, @@ -8517,35 +6774,10 @@ }, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/paths/flight_control_exterior) -"aIz" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer3, -/area/strata/ag/exterior/paths/flight_control_exterior) "aIC" = ( /obj/effect/decal/cleanable/blood, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/paths/flight_control_exterior) -"aIG" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer3, -/area/strata/ag/exterior/paths/flight_control_exterior) -"aIH" = ( -/obj/effect/decal/cleanable/generic, -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/paths/flight_control_exterior) "aIL" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 10 @@ -8594,15 +6826,6 @@ /obj/item/stack/sheet/mineral/plastic, /turf/open/floor/strata/floor3, /area/strata/ag/interior/outpost/engi) -"aIX" = ( -/obj/structure/closet/secure_closet/engineering_personal, -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/obj/item/stack/sheet/plasteel/medium_stack, -/obj/effect/landmark/objective_landmark/science, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/engi) "aIZ" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/strata/multi_tiles/southwest, @@ -8611,24 +6834,22 @@ /obj/structure/pipes/standard/simple/hidden/cyan, /turf/open/floor/prison/darkyellowfull2, /area/strata/ag/interior/outpost/engi) -"aJc" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/blue3/southwest, -/area/strata/ag/interior/outpost/hallways/north) "aJd" = ( /obj/structure/sign/safety/terminal, /turf/closed/wall/strata_outpost, /area/strata/ag/interior/outpost/engi) -"aJf" = ( -/obj/structure/bed/sofa/vert/grey/top, -/turf/open/floor/strata/blue1, -/area/strata/ag/interior/outpost/hallways/north) -"aJl" = ( -/obj/structure/platform/strata/metal{ +"aJe" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/trash/plate{ + pixel_x = 1; + pixel_y = 3 + }, +/obj/item/reagent_container/food/condiment/peppermill, +/obj/structure/bed/chair{ dir = 4 }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/north) +/turf/open/floor/strata/orange_cover, +/area/strata/ag/interior/outpost/canteen) "aJm" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/barricade/handrail/strata{ @@ -8653,12 +6874,6 @@ }, /turf/open/floor/strata/blue1, /area/strata/ag/interior/outpost/admin) -"aJp" = ( -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer3, -/area/strata/ag/exterior/paths/flight_control_exterior) "aJr" = ( /obj/structure/machinery/computer/crew, /turf/open/floor/strata, @@ -8705,31 +6920,6 @@ /obj/structure/sign/safety/galley, /turf/closed/wall/strata_outpost, /area/strata/ag/interior/outpost/canteen/bar) -"aJC" = ( -/obj/effect/decal/cleanable/blood{ - icon_state = "xgib6" - }, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"aJD" = ( -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"aJE" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/obj/effect/decal/cleanable/blood/gibs/core, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"aJF" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/snacks/cheesecakeslice, -/turf/open/floor/prison/darkyellowfull2, -/area/strata/ag/interior/outpost/hallways/north) "aJG" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony, /turf/open/floor/strata/multi_tiles/southwest, @@ -8771,14 +6961,6 @@ /obj/item/storage/toolbox/syndicate, /turf/open/floor/strata/orange_tile, /area/strata/ag/interior/mining_outpost/central) -"aJS" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/obj/effect/decal/cleanable/blood/gibs/core, -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/orange_edge/east, -/area/strata/ag/interior/mining_outpost/hallways) "aJT" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/drinks/bottle/vodka, @@ -8838,13 +7020,6 @@ }, /turf/open/asphalt/cement, /area/strata/ag/exterior/paths/flight_control_exterior) -"aKf" = ( -/obj/item/lightstick/planted, -/obj/structure/platform_decoration/strata/metal{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/paths/flight_control_exterior) "aKi" = ( /obj/structure/machinery/power/terminal{ dir = 4 @@ -8859,18 +7034,6 @@ }, /turf/open/floor/strata/floor3/east, /area/strata/ag/exterior/outpost_decks) -"aKk" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer4, -/area/strata/ag/exterior/paths/flight_control_exterior) -"aKl" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer3, -/area/strata/ag/exterior/paths/flight_control_exterior) "aKm" = ( /obj/structure/stairs/perspective{ color = "#6e6e6e"; @@ -8891,47 +7054,6 @@ /obj/structure/pipes/vents/pump, /turf/open/floor/prison/darkyellowfull2, /area/strata/ag/interior/outpost/engi) -"aKr" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/floor/prison/darkyellowfull2, -/area/strata/ag/interior/outpost/engi) -"aKs" = ( -/obj/effect/decal/cleanable/generic, -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/paths/flight_control_exterior) -"aKt" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/paths/far_north_outpost) -"aKu" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/water_marshes) -"aKv" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ - dir = 1 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/water) "aKw" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/strata/multi_tiles/southwest, @@ -8968,10 +7090,6 @@ /obj/structure/window/framed/strata, /turf/open/floor/strata/multi_tiles/west, /area/strata/ag/interior/outpost/engi) -"aKC" = ( -/obj/structure/bed/sofa/vert/grey/bot, -/turf/open/floor/strata/blue1, -/area/strata/ag/interior/outpost/hallways/north) "aKD" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/communications{ @@ -9029,9 +7147,6 @@ }, /turf/open/floor/strata/multi_tiles/southeast, /area/strata/ag/interior/outpost/admin) -"aKP" = ( -/turf/open/floor/strata/white_cyan1/east, -/area/strata/ag/interior/outpost/hallways/north) "aKQ" = ( /obj/structure/machinery/chem_dispenser/soda/beer, /obj/structure/surface/table/reinforced/prison, @@ -9060,15 +7175,6 @@ /obj/item/lightstick/planted, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/paths/flight_control_exterior) -"aKW" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/white_cyan1/east, -/area/strata/ag/interior/outpost/hallways/north) "aKX" = ( /obj/structure/bed/chair/comfy{ dir = 1 @@ -9133,11 +7239,6 @@ }, /turf/open/floor/strata/orange_edge/west, /area/strata/ag/interior/mining_outpost/central) -"aLj" = ( -/obj/effect/decal/cleanable/blood, -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/orange_edge/east, -/area/strata/ag/interior/mining_outpost/hallways) "aLk" = ( /obj/item/clothing/shoes/snow, /obj/structure/surface/rack, @@ -9157,20 +7258,6 @@ /obj/structure/sign/poster, /turf/closed/wall/strata_outpost/reinforced, /area/strata/ag/interior/mining_outpost/central) -"aLo" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - icon_state = "p_stair_ew_full_cap"; - layer = 3.5 - }, -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/floor/strata/multi_tiles, -/area/strata/ag/exterior/paths/mining_outpost_exterior) -"aLp" = ( -/turf/open/floor/strata/multi_tiles/west, -/area/strata/ag/interior/mining_outpost/hallways) "aLq" = ( /turf/open/floor/strata, /area/strata/ag/interior/mining_outpost/south_dormitories) @@ -9211,24 +7298,16 @@ }, /turf/closed/wall/strata_outpost, /area/strata/ag/interior/mountain) -"aLy" = ( -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/paths/mining_outpost_exterior) -"aLz" = ( -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/paths/mining_outpost_exterior) "aLB" = ( /obj/structure/machinery/camera/autoname{ dir = 4 }, /turf/open/floor/strata/floor3/east, /area/strata/ag/exterior/outpost_decks) +"aLD" = ( +/obj/structure/platform/metal/strata, +/turf/open/gm/river, +/area/strata/ag/interior/outside/engineering/parts_storage) "aLF" = ( /obj/structure/machinery/cm_vending/sorted/tech/tool_storage, /turf/open/floor/strata, @@ -9252,15 +7331,6 @@ /obj/item/lightstick/planted, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/paths/flight_control_exterior) -"aLM" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer4, -/area/strata/ag/exterior/paths/mining_outpost_exterior) "aLO" = ( /obj/structure/pipes/standard/simple/hidden/cyan, /turf/open/floor/strata/floor3, @@ -9346,15 +7416,6 @@ }, /turf/open/floor/strata/blue3/north, /area/strata/ag/interior/outpost/admin) -"aMg" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/blue3/north, -/area/strata/ag/interior/outpost/hallways/north) -"aMh" = ( -/turf/open/floor/strata/blue4/north, -/area/strata/ag/interior/outpost/hallways/north) "aMi" = ( /obj/structure/machinery/cm_vending/sorted/boozeomat, /turf/open/floor/strata/white_cyan1/east, @@ -9387,20 +7448,6 @@ "aMn" = ( /turf/open/floor/strata/floor3, /area/strata/ag/interior/outpost/canteen/bar) -"aMo" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/drinks/bottle/vodka, -/obj/item/reagent_container/food/condiment/saltshaker, -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"aMp" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/condiment/saltshaker, -/turf/open/floor/prison/darkyellowfull2, -/area/strata/ag/interior/outpost/hallways/north) "aMq" = ( /obj/item/stack/sandbags, /turf/open/floor/strata/white_cyan2/west, @@ -9477,46 +7524,6 @@ }, /turf/closed/wall/strata_outpost/reinforced, /area/strata/ag/interior/mining_outpost/central) -"aMG" = ( -/obj/item/lightstick/red/planted, -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/paths/mining_outpost_exterior) -"aMH" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/paths/mining_outpost_exterior) -"aMI" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/paths/mining_outpost_exterior) -"aMJ" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/paths/mining_outpost_exterior) -"aMK" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform/strata/metal, -/turf/open/asphalt/cement, -/area/strata/ag/exterior/paths/mining_outpost_exterior) -"aML" = ( -/obj/structure/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/mining_outpost/hallways) "aMM" = ( /obj/structure/machinery/computer/station_alert{ dir = 4; @@ -9553,31 +7560,6 @@ }, /turf/open/floor/prison/darkyellowfull2, /area/strata/ag/interior/outpost/engi) -"aMS" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/paths/mining_outpost_exterior) -"aMT" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/paths/mining_outpost_exterior) -"aMU" = ( -/obj/item/lightstick/red/planted, -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/paths/mining_outpost_exterior) -"aMV" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer4, -/area/strata/ag/exterior/paths/mining_outpost_exterior) "aMW" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 @@ -9590,10 +7572,6 @@ }, /turf/open/floor/prison/darkyellowfull2, /area/strata/ag/interior/outpost/engi) -"aMY" = ( -/obj/structure/pipes/standard/manifold/fourway/hidden/cyan, -/turf/open/floor/prison/darkyellowfull2, -/area/strata/ag/interior/outpost/hallways/north) "aMZ" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 @@ -9622,13 +7600,6 @@ /obj/effect/decal/cleanable/generic, /turf/open/auto_turf/snow/brown_base/layer4, /area/strata/ag/exterior/paths/flight_control_exterior) -"aNe" = ( -/obj/item/bodybag/tarp/snow, -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/paths/mining_outpost_exterior) "aNf" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_10" @@ -9655,17 +7626,6 @@ "aNo" = ( /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/paths/mining_outpost_exterior) -"aNq" = ( -/obj/structure/platform_decoration/strata/metal, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/paths/mining_outpost_exterior) -"aNs" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/blue3/west, -/area/strata/ag/interior/outpost/hallways/north) -"aNt" = ( -/turf/open/floor/strata/blue3/east, -/area/strata/ag/interior/outpost/hallways/north) "aNu" = ( /turf/closed/wall/strata_outpost/reinforced/hull, /area/strata/ag/interior/outpost/engi) @@ -9675,53 +7635,6 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/strata/multi_tiles/west, /area/strata/ag/interior/outpost/canteen/bar) -"aNw" = ( -/obj/item/stool, -/turf/open/floor/strata/white_cyan1/east, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"aNx" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/trash/plate{ - pixel_x = 1; - pixel_y = 3 - }, -/obj/item/reagent_container/food/condiment/peppermill, -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"aNy" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/trash/plate{ - pixel_x = 1; - pixel_y = 3 - }, -/obj/item/reagent_container/food/condiment/peppermill, -/turf/open/floor/prison/darkyellowfull2, -/area/strata/ag/interior/outpost/hallways/north) -"aNz" = ( -/obj/structure/platform_decoration/strata{ - dir = 4 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/water) -"aNA" = ( -/obj/structure/flora/grass/tallgrass/ice/corner{ - dir = 5 - }, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/barricade/handrail/strata{ - layer = 3.1 - }, -/obj/structure/platform/strata/metal, -/turf/open/gm/river, -/area/strata/ag/exterior/outpost_decks) -"aNB" = ( -/obj/structure/platform/strata/metal, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/paths/mining_outpost_exterior) "aNC" = ( /obj/structure/closet/crate, /turf/open/floor/strata/multi_tiles/southwest, @@ -9786,13 +7699,6 @@ /obj/effect/decal/strata_decals/grime/grime3, /turf/open/asphalt/cement, /area/strata/ag/exterior/paths/mining_outpost_exterior) -"aNO" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/obj/structure/pipes/vents/pump, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/mining_outpost/hallways) "aNQ" = ( /obj/item/explosive/grenade/phosphorus, /obj/structure/surface/rack, @@ -9825,11 +7731,6 @@ /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/strata/floor3/east, /area/strata/ag/exterior/outpost_decks) -"aNU" = ( -/obj/item/lightstick/red/planted, -/obj/structure/platform/strata/metal, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/paths/mining_outpost_exterior) "aNV" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -9860,46 +7761,6 @@ /obj/structure/machinery/light, /turf/open/floor/strata, /area/strata/ag/interior/outpost/engi) -"aOb" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_21" - }, -/obj/structure/platform_decoration/strata/metal, -/obj/structure/machinery/light, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/engi) -"aOc" = ( -/obj/structure/platform/strata/metal, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/engi) -"aOd" = ( -/obj/structure/platform/strata/metal, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/engi) -"aOe" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 1 - }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/hallways/north) -"aOf" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/obj/structure/platform_decoration/strata/metal, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/hallways/north) -"aOg" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 - }, -/obj/structure/platform/strata/metal, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/engi) -"aOh" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 1 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/engi) "aOm" = ( /obj/structure/bed/chair/office/light{ dir = 8 @@ -9970,53 +7831,10 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/strata/multi_tiles, /area/strata/ag/interior/mining_outpost/central) -"aOx" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/obj/structure/machinery/camera/autoname{ - dir = 4 - }, -/turf/open/floor/strata/blue3/west, -/area/strata/ag/interior/outpost/hallways/north) -"aOy" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/drinks/cans/aspen, -/obj/structure/bed/chair{ - dir = 8 - }, -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"aOz" = ( -/obj/item/lightstick/red/planted, -/obj/structure/platform/strata/metal, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/paths/mining_outpost_exterior) -"aOA" = ( -/obj/effect/decal/cleanable/vomit, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"aOB" = ( -/obj/structure/platform/strata/metal, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/paths/mining_outpost_exterior) "aOD" = ( /obj/effect/decal/remains/xeno, /turf/open/auto_turf/ice/layer1, /area/strata/ag/interior/outside/bball/cave) -"aOE" = ( -/obj/item/lightstick/red/planted, -/obj/structure/platform/strata/metal, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/paths/mining_outpost_exterior) -"aOF" = ( -/obj/structure/platform/strata/metal, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/paths/flight_control_exterior) -"aOG" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/drinks/cans/sodawater, -/obj/effect/landmark/objective_landmark/science, -/turf/open/floor/prison/darkyellowfull2, -/area/strata/ag/interior/outpost/hallways/north) "aOJ" = ( /obj/structure/pipes/standard/simple/hidden/cyan, /turf/open/floor/strata/white_cyan1/east, @@ -10074,39 +7892,10 @@ }, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/paths/flight_control_exterior) -"aOX" = ( -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/paths/mining_outpost_exterior) "aOY" = ( /obj/item/tool/shovel/snow, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/paths/mining_outpost_exterior) -"aOZ" = ( -/obj/item/lightstick/red/planted, -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/paths/mining_outpost_exterior) -"aPa" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata, -/area/strata/ag/interior/mining_outpost/hallways) -"aPb" = ( -/obj/structure/filingcabinet, -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/mining_outpost/hallways) -"aPc" = ( -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/paths/flight_control_exterior) "aPd" = ( /obj/structure/machinery/weather_siren{ dir = 4; @@ -10139,23 +7928,9 @@ /obj/item/tool/extinguisher, /turf/open/floor/greengrid, /area/strata/ag/interior/mining_outpost/south_dormitories) -"aPl" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/mining_outpost/hallways) "aPm" = ( /turf/closed/wall/strata_outpost/reinforced/hull, /area/strata/ag/interior/outpost/admin) -"aPn" = ( -/obj/effect/decal/cleanable/generic, -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer4, -/area/strata/ag/exterior/paths/mining_outpost_exterior) "aPo" = ( /obj/structure/surface/rack, /obj/item/explosive/grenade/phosphorus, @@ -10177,12 +7952,6 @@ }, /turf/closed/wall/strata_outpost, /area/strata/ag/interior/mining_outpost/south_dormitories) -"aPr" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/paths/mining_outpost_exterior) "aPs" = ( /obj/item/lightstick/planted, /obj/structure/barricade/snow{ @@ -10240,19 +8009,6 @@ }, /turf/open/floor/prison/darkyellowfull2, /area/strata/ag/interior/outpost/engi) -"aPE" = ( -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/floor/strata/fake_wood, -/area/strata/ag/interior/outpost/hallways/north) -"aPF" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/turf/open/floor/strata/fake_wood, -/area/strata/ag/interior/outpost/hallways/north) "aPG" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -10265,12 +8021,6 @@ }, /turf/open/floor/prison/darkyellowfull2, /area/strata/ag/interior/outpost/engi) -"aPH" = ( -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/engi) "aPI" = ( /obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/strata, @@ -10343,25 +8093,6 @@ }, /turf/open/floor/strata/floor3, /area/strata/ag/interior/outpost/admin) -"aPT" = ( -/obj/effect/decal/cleanable/generic, -/obj/item/lightstick/red/planted, -/obj/structure/platform/strata/metal, -/obj/structure/barricade/handrail/strata{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/paths/mining_outpost_exterior) -"aPW" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/hallways/south) -"aPX" = ( -/obj/structure/platform/strata/metal, -/turf/open/auto_turf/snow/brown_base/layer4, -/area/strata/ag/exterior/paths/mining_outpost_exterior) "aPY" = ( /obj/structure/barricade/snow{ dir = 8 @@ -10369,20 +8100,6 @@ /obj/structure/blocker/invisible_wall, /turf/open/floor/interior/tatami, /area/strata/ag/interior/restricted) -"aQa" = ( -/obj/effect/decal/cleanable/generic, -/obj/structure/platform/strata/metal, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/paths/mining_outpost_exterior) -"aQb" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" - }, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/strata/blue1, -/area/strata/ag/interior/outpost/hallways/north) "aQc" = ( /obj/structure/barricade/wooden{ dir = 1 @@ -10392,43 +8109,6 @@ }, /turf/open/floor/strata/multi_tiles/southeast, /area/strata/ag/interior/outpost/canteen/bar) -"aQd" = ( -/obj/structure/machinery/vending/dinnerware, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"aQe" = ( -/obj/structure/bed/chair, -/turf/open/floor/strata/white_cyan1/east, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"aQf" = ( -/obj/effect/landmark/survivor_spawner, -/turf/open/floor/strata/white_cyan1/east, -/area/strata/ag/interior/outpost/hallways/north) -"aQg" = ( -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer4, -/area/strata/ag/exterior/paths/flight_control_exterior) -"aQh" = ( -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/paths/flight_control_exterior) -"aQi" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 8 - }, -/obj/structure/barricade/deployable, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/north) "aQj" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 @@ -10459,14 +8139,6 @@ }, /turf/open/floor/strata/fake_wood, /area/strata/ag/interior/outpost/canteen) -"aQn" = ( -/obj/structure/flora/grass/tallgrass/ice/corner, -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/paths/flight_control_exterior) "aQp" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -10549,14 +8221,6 @@ }, /turf/open/floor/strata/multi_tiles/southeast, /area/strata/ag/interior/mining_outpost/south_dormitories) -"aQH" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 4 - }, -/obj/structure/flora/grass/tallgrass/ice, -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/paths/flight_control_exterior) "aQI" = ( /obj/structure/flora/grass/tallgrass/ice, /turf/open/auto_turf/snow/brown_base/layer0, @@ -10571,10 +8235,6 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/auto_turf/strata_grass/layer0, /area/strata/ug/interior/jungle/structures/monitoring/west) -"aQP" = ( -/obj/structure/platform/strata/metal, -/turf/open/floor/strata/multi_tiles/southwest, -/area/strata/ag/interior/outpost/foyer) "aQQ" = ( /turf/open/floor/strata/fake_wood, /area/strata/ag/interior/outpost/engi) @@ -10608,13 +8268,6 @@ /obj/item/weapon/gun/pistol/t73, /turf/open/floor/strata/fake_wood, /area/strata/ag/interior/outpost/engi) -"aQX" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/obj/structure/machinery/light, -/turf/open/floor/strata/white_cyan1/east, -/area/strata/ag/interior/mining_outpost/hallways) "aQY" = ( /obj/structure/barricade/handrail/strata{ dir = 8 @@ -10668,26 +8321,6 @@ /obj/effect/decal/strata_decals/catwalk/prison, /turf/open/floor/strata, /area/strata/ag/interior/outpost/admin) -"aRi" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform_decoration/strata{ - dir = 4 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/water) -"aRj" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform_decoration/strata{ - dir = 8 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/water) -"aRm" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/turf/open/floor/strata/blue1, -/area/strata/ag/interior/outpost/hallways/north) "aRn" = ( /obj/structure/barricade/wooden{ dir = 8 @@ -10695,21 +8328,12 @@ /obj/effect/landmark/corpsespawner/chef, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/interior/outpost/canteen/bar) -"aRo" = ( -/obj/structure/largecrate/random, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/north) "aRp" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 1 }, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/paths/flight_control_exterior) -"aRq" = ( -/obj/structure/barricade/deployable, -/obj/structure/machinery/m56d_hmg, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/north) "aRr" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony, /turf/open/floor/strata/multi_tiles/west, @@ -10729,12 +8353,6 @@ }, /turf/open/asphalt/cement/cement4, /area/strata/ag/interior/landing_zones/lz1) -"aRy" = ( -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer3, -/area/strata/ag/exterior/paths/flight_control_exterior) "aRz" = ( /obj/effect/decal/cleanable/blood/oil, /obj/structure/machinery/landinglight/ds1/delayone{ @@ -10766,37 +8384,6 @@ /obj/structure/machinery/light, /turf/open/floor/strata/floor3, /area/strata/ag/interior/mining_outpost/south_dormitories) -"aRF" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan, -/turf/open/floor/strata, -/area/strata/ag/interior/mining_outpost/hallways) -"aRG" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 1 - }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/mining_outpost/hallways) -"aRI" = ( -/obj/structure/noticeboard{ - pixel_y = 32 - }, -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/mining_outpost/hallways) -"aRJ" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 1 - }, -/turf/open/floor/strata/fake_wood, -/area/strata/ag/interior/mining_outpost/hallways) -"aRK" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/fake_wood, -/area/strata/ag/interior/mining_outpost/hallways) "aRL" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 @@ -10820,11 +8407,11 @@ /obj/effect/decal/cleanable/blood, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/paths/flight_control_exterior) -"aRR" = ( -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer1, +"aRP" = ( +/obj/item/lightstick/red/planted, +/obj/structure/platform/metal/strata/north, +/obj/structure/platform/metal/strata/west, +/turf/open/auto_turf/snow/brown_base/layer4, /area/strata/ag/exterior/paths/flight_control_exterior) "aRV" = ( /obj/effect/decal/cleanable/blood, @@ -10838,19 +8425,6 @@ }, /turf/open/asphalt/cement, /area/strata/ag/interior/outpost/foyer) -"aRZ" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 4 - }, -/turf/open/floor/strata/fake_wood, -/area/strata/ag/interior/outpost/hallways/north) -"aSb" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/obj/structure/platform_decoration/strata/metal{ - dir = 8 - }, -/turf/open/floor/strata/fake_wood, -/area/strata/ag/interior/outpost/hallways/north) "aSc" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 6 @@ -10879,13 +8453,10 @@ /obj/structure/blocker/invisible_wall, /turf/open/auto_turf/ice/layer1, /area/strata/ag/interior/restricted) -"aSj" = ( -/obj/structure/platform_decoration/strata{ - dir = 1 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/water) +"aSh" = ( +/obj/structure/platform_decoration/metal/strata/north, +/turf/open/auto_turf/strata_grass/layer0_mud_alt, +/area/strata/ug/interior/jungle/structures/research/old_tunnels) "aSk" = ( /obj/structure/bed/chair/office/light{ dir = 4 @@ -10897,12 +8468,6 @@ /obj/item/storage/box/pizza, /turf/open/floor/strata/blue1, /area/strata/ag/interior/outpost/admin) -"aSm" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/paper_bin, -/obj/item/tool/pen/blue, -/turf/open/floor/strata/blue1, -/area/strata/ag/interior/outpost/hallways/north) "aSn" = ( /obj/item/reagent_container/spray/cleaner, /obj/structure/surface/rack, @@ -10931,10 +8496,6 @@ /obj/item/reagent_container/food/snacks/chawanmushi, /turf/open/floor/strata/multi_tiles/southeast, /area/strata/ag/interior/outpost/canteen/bar) -"aSr" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/multi_tiles/southeast, -/area/strata/ag/interior/outpost/hallways/north) "aSs" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -10987,13 +8548,6 @@ /obj/structure/flora/bush/ausbushes/var3/fullgrass, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/carplake/north) -"aSG" = ( -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/asphalt/cement/cement14, -/area/strata/ag/interior/landing_zones/lz1) "aSH" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/asphalt/cement/cement12, @@ -11003,18 +8557,6 @@ /obj/structure/pipes/standard/simple/hidden/cyan, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/paths/flight_control_exterior) -"aSK" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/paths/flight_control_exterior) -"aSL" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/paths/flight_control_exterior) "aSN" = ( /turf/open/asphalt/cement/cement15, /area/strata/ag/interior/landing_zones/lz1) @@ -11038,10 +8580,6 @@ }, /turf/closed/wall/strata_outpost/reinforced, /area/strata/ag/interior/mining_outpost/south_dormitories) -"aSS" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic, -/turf/open/floor/strata/multi_tiles/southeast, -/area/strata/ag/interior/mining_outpost/hallways) "aST" = ( /turf/open/floor/strata/multi_tiles/southeast, /area/strata/ag/interior/landing_zones/near_lz1) @@ -11051,16 +8589,6 @@ /obj/item/book/manual/engineering_guide, /turf/open/floor/strata/floor3, /area/strata/ag/interior/mining_outpost/south_dormitories) -"aSV" = ( -/obj/structure/machinery/light/small, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/mining_outpost/hallways) -"aSW" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/mining_outpost/hallways) "aSX" = ( /obj/effect/decal/cleanable/blood/oil, /obj/structure/machinery/landinglight/ds2{ @@ -11068,10 +8596,6 @@ }, /turf/open/asphalt/cement/cement4, /area/strata/ag/exterior/landing_zones/lz2) -"aSY" = ( -/obj/structure/largecrate/random/case/double, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/mining_outpost/hallways) "aSZ" = ( /obj/structure/surface/rack, /obj/item/inflatable, @@ -11132,13 +8656,14 @@ }, /turf/open/floor/strata/multi_tiles/southeast, /area/strata/ag/interior/outpost/foyer) -"aTv" = ( -/obj/structure/platform/strata{ - dir = 4 - }, -/obj/structure/blocker/invisible_wall, +"aTu" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata, +/obj/structure/platform/stone/strata/east, +/obj/structure/platform_decoration/stone/strata/east, /turf/open/gm/river, -/area/strata/ag/exterior/marsh/water) +/area/strata/ag/exterior/marsh/center) "aTy" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -11237,25 +8762,6 @@ /obj/structure/janitorialcart, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outside/engineering/parts_storage) -"aTQ" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 8 - }, -/turf/open/floor/strata/blue3/west, -/area/strata/ag/interior/outpost/hallways/north) -"aTR" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ - dir = 1 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/paths/far_north_outpost) -"aTT" = ( -/obj/structure/pipes/vents/pump{ - dir = 8 - }, -/turf/open/floor/strata/blue3/east, -/area/strata/ag/interior/outpost/hallways/north) "aTU" = ( /obj/structure/machinery/light{ dir = 4 @@ -11293,14 +8799,6 @@ }, /turf/open/floor/strata/cyan2/east, /area/strata/ag/interior/outpost/canteen/bar) -"aUb" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/obj/effect/decal/strata_decals/catwalk/prison, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/outpost/hallways/south) "aUc" = ( /obj/structure/sign/safety/galley, /turf/closed/wall/strata_outpost, @@ -11321,19 +8819,6 @@ "aUh" = ( /turf/open/gm/coast/east, /area/strata/ug/interior/jungle/carplake/north) -"aUn" = ( -/obj/structure/platform/strata/metal, -/turf/open/auto_turf/snow/brown_base/layer4, -/area/strata/ag/exterior/paths/flight_control_exterior) -"aUo" = ( -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 5 - }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/landing_zones/near_lz1) "aUp" = ( /turf/closed/wall/wood, /area/strata/ag/interior/outside/wooden_hospital) @@ -11368,31 +8853,6 @@ }, /turf/open/floor/strata/orange_cover, /area/strata/ag/exterior/marsh/river) -"aUx" = ( -/obj/structure/platform/strata/metal, -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - dir = 9; - icon_state = "p_stair_full" - }, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/paths/flight_control_exterior) -"aUz" = ( -/obj/structure/platform/strata/metal, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/paths/flight_control_exterior) -"aUA" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/paths/flight_control_exterior) -"aUC" = ( -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer4, -/area/strata/ag/exterior/paths/flight_control_exterior) "aUD" = ( /obj/structure/flora/grass/tallgrass/ice, /obj/effect/blocker/sorokyne_cold_water, @@ -11423,6 +8883,10 @@ "aUN" = ( /turf/open/floor/strata/fake_wood, /area/strata/ag/interior/outpost/foyer) +"aUO" = ( +/obj/structure/platform_decoration/metal/strata/east, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/paths/flight_control_exterior) "aUR" = ( /obj/structure/machinery/light{ dir = 4 @@ -11520,27 +8984,6 @@ /obj/structure/barricade/handrail/strata, /turf/open/floor/strata/blue1, /area/strata/ag/interior/outpost/admin) -"aVf" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/floor/strata/multi_tiles/southeast, -/area/strata/ag/interior/outpost/admin) -"aVg" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - dir = 4; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/turf/open/floor/strata/multi_tiles/southeast, -/area/strata/ag/interior/outpost/admin) "aVh" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 5 @@ -11577,12 +9020,6 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/strata/blue1, /area/strata/ag/interior/outpost/admin) -"aVp" = ( -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/paths/flight_control_exterior) "aVq" = ( /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/marsh/river) @@ -11622,28 +9059,12 @@ "aVB" = ( /turf/open/floor/strata/cyan2/east, /area/strata/ag/interior/outpost/canteen/bar) -"aVD" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - dir = 4; - icon_state = "p_stair_sn_full_cap" - }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/north) "aVE" = ( /obj/structure/surface/rack, /obj/item/book/manual/barman_recipes, /obj/item/book/manual/chef_recipes, /turf/open/floor/strata/orange_cover, /area/strata/ag/interior/outpost/maint) -"aVG" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - icon_state = "p_stair_sn_full_cap" - }, -/turf/open/floor/strata/multi_tiles/west, -/area/strata/ag/interior/outpost/canteen) "aVH" = ( /obj/effect/decal/strata_decals/catwalk/prison, /turf/open/floor/strata/orange_cover, @@ -11690,17 +9111,6 @@ "aVT" = ( /turf/open/gm/coast/beachcorner/north_east, /area/strata/ug/interior/jungle/structures/research/hot_springs) -"aVW" = ( -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/landing_zones/near_lz1) -"aVX" = ( -/obj/structure/platform_decoration/strata/metal, -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata, -/area/strata/ag/interior/landing_zones/near_lz1) "aVY" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/structure/barricade/handrail/strata{ @@ -11711,29 +9121,10 @@ "aVZ" = ( /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/interior/outside/administration) -"aWa" = ( -/obj/item/lightstick/red/planted, -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/paths/flight_control_exterior) "aWc" = ( /obj/effect/decal/cleanable/blood/gibs/core, /turf/open/auto_turf/ice/layer1, /area/strata/ag/interior/outside/bball/cave) -"aWd" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/paths/flight_control_exterior) -"aWe" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer3, -/area/strata/ag/exterior/paths/flight_control_exterior) "aWf" = ( /obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer1, @@ -11754,14 +9145,6 @@ }, /turf/open/floor/strata/multi_tiles/west, /area/strata/ag/exterior/marsh/river) -"aWk" = ( -/obj/effect/particle_effect/steam, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ - dir = 1 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/river) "aWl" = ( /obj/effect/decal/cleanable/blood, /obj/item/storage/backpack/satchel, @@ -11815,10 +9198,6 @@ "aWG" = ( /turf/open/floor/strata/floor3, /area/strata/ag/interior/outpost/foyer) -"aWH" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/hallways/north) "aWK" = ( /obj/structure/stairs/perspective{ color = "#6e6e6e"; @@ -11838,35 +9217,6 @@ /obj/structure/pipes/vents/pump, /turf/open/floor/strata, /area/strata/ag/interior/outpost/admin) -"aWQ" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 8 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/north) -"aWR" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/admin) -"aWS" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 4 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/admin) -"aWV" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - icon_state = "p_stair_ew_full_cap"; - layer = 3.5 - }, -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/admin) "aWW" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -11890,14 +9240,6 @@ }, /turf/open/floor/strata/white_cyan2/west, /area/strata/ag/interior/outpost/canteen/bar) -"aXb" = ( -/obj/structure/flora/grass/tallgrass/ice, -/obj/structure/platform_decoration/strata{ - dir = 1 - }, -/obj/effect/blocker/sorokyne_cold_water, -/turf/open/gm/river, -/area/strata/ag/exterior/paths/far_north_outpost) "aXc" = ( /obj/effect/decal/cleanable/blood, /obj/structure/pipes/standard/manifold/hidden/cyan{ @@ -11942,12 +9284,20 @@ /obj/structure/surface/table/reinforced/prison, /turf/open/floor/strata/cyan2/east, /area/strata/ag/interior/outpost/canteen/bar) +"aXj" = ( +/obj/structure/platform/metal/strata/west, +/turf/open/floor/strata/orange_cover, +/area/strata/ag/interior/landing_zones/near_lz1) "aXk" = ( /obj/effect/decal/cleanable/blood{ layer = 3 }, /turf/open/floor/strata, /area/strata/ag/interior/outpost/maint) +"aXl" = ( +/obj/structure/platform_decoration/stone/strata/north, +/turf/open/auto_turf/ice/layer1, +/area/strata/ag/exterior/landing_zones/near_lz2) "aXn" = ( /obj/structure/sink{ dir = 1; @@ -11979,19 +9329,6 @@ "aXu" = ( /turf/open/gm/coast/beachcorner/south_east, /area/strata/ug/interior/jungle/structures/research/hot_springs) -"aXv" = ( -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/obj/structure/platform/strata/metal, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/landing_zones/near_lz1) -"aXw" = ( -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/landing_zones/near_lz1) "aXx" = ( /obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/strata/floor3, @@ -12076,20 +9413,6 @@ /obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/caves/lz_caves) -"aYh" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/paths/flight_control_exterior) -"aYi" = ( -/obj/structure/platform_decoration/strata/metal, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/paths/flight_control_exterior) -"aYj" = ( -/obj/structure/platform/strata/metal, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/paths/flight_control_exterior) "aYm" = ( /obj/item/stack/sheet/metal/medium_stack, /turf/open/floor/strata, @@ -12120,6 +9443,10 @@ /obj/effect/decal/cleanable/blood/gibs/core, /turf/open/floor/strata, /area/strata/ag/exterior/outpost_decks) +"aYs" = ( +/obj/structure/platform/metal/strata, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/paths/flight_control_exterior) "aYu" = ( /obj/structure/disposalpipe/segment, /obj/item/stack/catwalk, @@ -12159,29 +9486,6 @@ /obj/structure/machinery/vending/security, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ug/interior/jungle/structures/research) -"aYB" = ( -/turf/open/floor/strata/multi_tiles, -/area/strata/ag/interior/outpost/hallways/north) -"aYD" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - dir = 8; - icon_state = "p_stair_ew_full_cap"; - layer = 3.5 - }, -/turf/open/floor/strata/multi_tiles, -/area/strata/ag/interior/outpost/hallways/north) -"aYE" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/multi_tiles, -/area/strata/ag/interior/outpost/hallways/north) -"aYH" = ( -/obj/effect/decal/cleanable/blood{ - icon_state = "gib6" - }, -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/blue1, -/area/strata/ag/interior/outpost/hallways/north) "aYO" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/strata/floor3, @@ -12190,20 +9494,6 @@ /obj/item/stack/sheet/wood, /turf/open/floor/strata, /area/strata/ug/interior/outpost/underground_dorms/admin1) -"aYR" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 9 - }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/hallways/north) -"aYT" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - dir = 8; - icon_state = "p_stair_full" - }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/hallways/north) "aYW" = ( /obj/item/stack/rods, /obj/structure/pipes/standard/simple/hidden/cyan{ @@ -12234,13 +9524,6 @@ "aZc" = ( /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/caves/lz_caves) -"aZe" = ( -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/obj/structure/platform/strata/metal, -/turf/open/auto_turf/snow/brown_base/layer3, -/area/strata/ag/exterior/paths/flight_control_exterior) "aZh" = ( /obj/structure/barricade/wooden{ dir = 4 @@ -12250,12 +9533,6 @@ }, /turf/open/floor/strata/white_cyan2/west, /area/strata/ag/interior/outpost/canteen/bar) -"aZi" = ( -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/paths/flight_control_exterior) "aZj" = ( /obj/item/lightstick/red/planted, /obj/structure/barricade/snow{ @@ -12279,12 +9556,6 @@ /obj/effect/decal/cleanable/blood/gibs/core, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/interior/outside/bball/cave) -"aZo" = ( -/obj/structure/platform_decoration/strata{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/caves/lz_caves) "aZp" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 @@ -12351,27 +9622,6 @@ /obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited, /turf/closed/wall/strata_outpost, /area/strata/ag/interior/outpost/maint) -"aZA" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/caves/lz_caves) -"aZB" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/caves/lz_caves) -"aZC" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/caves/lz_caves) "aZD" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic2, /turf/open/floor/strata/multi_tiles/southwest, @@ -12413,12 +9663,6 @@ /obj/item/stack/rods, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/platform/east) -"aZI" = ( -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/caves/lz_caves) "aZJ" = ( /obj/structure/surface/rack, /obj/item/tool/shovel/snow, @@ -12439,18 +9683,6 @@ "aZP" = ( /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/paths/flight_control_exterior) -"aZS" = ( -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/landing_zones/near_lz1) -"aZW" = ( -/obj/effect/particle_effect/steam, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/river) "aZZ" = ( /turf/open/floor/strata/blue1, /area/strata/ug/interior/jungle/structures/research) @@ -12467,12 +9699,6 @@ /obj/structure/prop/almayer/computers/mapping_computer, /turf/open/floor/strata/red1, /area/strata/ag/interior/outside/administration) -"baf" = ( -/obj/structure/platform_decoration/strata{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/caves/lz_caves) "bag" = ( /obj/structure/barricade/handrail/strata{ dir = 1 @@ -12482,12 +9708,6 @@ }, /turf/open/asphalt/cement, /area/strata/ag/interior/outside/administration) -"bah" = ( -/obj/structure/platform_decoration/strata{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/caves/lz_caves) "bai" = ( /obj/structure/fence, /turf/open/asphalt/cement/cement3, @@ -12518,60 +9738,18 @@ }, /turf/open/floor/plating, /area/strata/ag/exterior/outpost_decks) -"bao" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor/colony{ - dir = 1; - name = "\improper Airlock" - }, -/turf/open/floor/strata/multi_tiles/west, -/area/strata/ag/interior/outpost/hallways/north) "bap" = ( /obj/structure/bed/chair{ dir = 4 }, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/interior/outside/bball) -"baq" = ( -/obj/structure/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/strata/cyan2/east, -/area/strata/ag/interior/outpost/hallways/south) -"bar" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/multi_tiles, -/area/strata/ag/interior/outpost/hallways/north) "bas" = ( /obj/structure/machinery/light{ dir = 1 }, /turf/open/auto_turf/snow/brown_base/layer4, /area/strata/ag/exterior/paths/north_outpost) -"bat" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1 - }, -/turf/open/floor/strata/multi_tiles/west, -/area/strata/ag/interior/outpost/hallways/north) -"bau" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/multi_tiles, -/area/strata/ag/interior/outpost/hallways/north) "bav" = ( /obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer1, @@ -12634,47 +9812,6 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/auto_turf/ice/layer1, /area/strata/ag/interior/outside/bball) -"baN" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/hallways/north) -"baQ" = ( -/obj/structure/pipes/standard/manifold/fourway/hidden/cyan, -/turf/open/floor/strata/multi_tiles, -/area/strata/ag/interior/outpost/hallways/north) -"baR" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 1 - }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/hallways/north) -"baS" = ( -/obj/effect/decal/cleanable/blood{ - icon_state = "gib6" - }, -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/fake_wood, -/area/strata/ag/interior/outpost/hallways/north) -"baT" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/paths/flight_control_exterior) -"baU" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/paths/flight_control_exterior) -"baV" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/fake_wood, -/area/strata/ag/interior/outpost/hallways/north) "baX" = ( /obj/structure/barricade/handrail/strata{ dir = 8 @@ -12692,26 +9829,12 @@ /obj/structure/machinery/floodlight/landing, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/interior/outpost/engi/drome) -"bbc" = ( -/obj/structure/pipes/standard/manifold/fourway/hidden/cyan, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/north) -"bbd" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/blue1, -/area/strata/ag/interior/outpost/hallways/north) "bbe" = ( /obj/structure/barricade/handrail/strata{ dir = 4 }, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/interior/outpost/engi/drome) -"bbf" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan, -/turf/open/floor/strata/blue1, -/area/strata/ag/interior/outpost/hallways/north) "bbh" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 1 @@ -12733,13 +9856,6 @@ }, /turf/open/floor/strata/floor3, /area/strata/ag/interior/outpost/admin) -"bbl" = ( -/obj/structure/bed/stool, -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/hallways/north) "bbn" = ( /obj/structure/curtain/medical, /turf/open/floor/strata/floor2, @@ -12774,13 +9890,6 @@ /obj/item/reagent_container/food/condiment/enzyme, /turf/open/floor/strata/cyan2/east, /area/strata/ag/interior/outpost/canteen/bar) -"bbA" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/river) "bbB" = ( /obj/effect/decal/cleanable/blood, /obj/item/stack/sheet/wood, @@ -12866,21 +9975,16 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/gm/dirt, /area/strata/ug/interior/jungle/carplake/east) +"bbV" = ( +/obj/structure/platform/metal/strata/north, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/admin) "bbW" = ( /obj/structure/flora/bush/ausbushes/grassybush{ icon_state = "fullgrass_1" }, /turf/open/gm/dirt, /area/strata/ug/interior/jungle/structures/research/hot_springs) -"bbX" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e" - }, -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/landing_zones/near_lz1) "bbZ" = ( /obj/structure/flora/grass/tallgrass/ice/corner, /turf/open/auto_turf/snow/brown_base/layer1, @@ -12895,19 +9999,6 @@ /obj/structure/sign/nosmoking_2, /turf/closed/wall/strata_outpost, /area/strata/ag/exterior/caves/shed_five_caves) -"bce" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 4 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/landing_zones/near_lz1) -"bcf" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata, -/area/strata/ag/interior/landing_zones/near_lz1) "bcg" = ( /obj/item/lightstick/red/planted, /obj/structure/barricade/snow{ @@ -12928,12 +10019,6 @@ }, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/paths/flight_control_exterior) -"bck" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/landing_zones/near_lz1) "bcm" = ( /obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer2, @@ -12956,13 +10041,6 @@ }, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/interior/outpost/engi/drome) -"bcr" = ( -/obj/structure/platform/strata{ - dir = 4 - }, -/obj/effect/blocker/sorokyne_cold_water, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/water) "bcs" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 1 @@ -13075,19 +10153,6 @@ }, /turf/open/floor/strata/blue1, /area/strata/ug/interior/jungle/structures/research) -"bcU" = ( -/obj/structure/platform_decoration/strata, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/caves/lz_caves) -"bcV" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/marsh/spring_marshes) "bcW" = ( /obj/structure/barricade/snow{ dir = 8 @@ -13097,17 +10162,6 @@ }, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/paths/flight_control_exterior) -"bcX" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - icon_state = "p_stair_ew_full_cap"; - layer = 3.5 - }, -/turf/open/floor/strata/multi_tiles, -/area/strata/ag/exterior/outpost_decks) "bda" = ( /obj/structure/machinery/door/airlock/almayer/medical/glass/colony{ dir = 2; @@ -13220,139 +10274,28 @@ /obj/effect/decal/cleanable/generic, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/paths/flight_control_exterior) -"bdB" = ( -/obj/structure/platform/strata, -/obj/item/lightstick/red/planted, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/marsh/river) -"bdC" = ( -/obj/structure/platform_decoration/strata{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/marsh/river) "bdE" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited, /turf/closed/wall/strata_outpost, /area/strata/ag/interior/outpost/admin) -"bdG" = ( -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/marsh/spring_marshes) "bdI" = ( /obj/structure/sign/nosmoking_2, /turf/closed/wall/strata_outpost, /area/strata/ag/interior/outpost/admin) -"bdJ" = ( -/obj/structure/barricade/handrail/strata, -/obj/structure/surface/table/reinforced/prison, -/obj/item/toy/deck, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/south) -"bdK" = ( -/obj/structure/barricade/handrail/strata, -/obj/structure/bed/chair/comfy{ - dir = 8 - }, -/obj/structure/barricade/handrail/strata{ - dir = 4 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/south) "bdL" = ( /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/marsh/island_marshes) -"bdM" = ( -/obj/structure/platform_decoration/strata, -/obj/effect/blocker/sorokyne_cold_water, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/water) -"bdN" = ( -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/marsh/spring_marshes) -"bdO" = ( -/obj/structure/barricade/snow{ - dir = 8 - }, -/obj/structure/platform/strata/metal, -/turf/open/auto_turf/snow/brown_base/layer3, -/area/strata/ag/exterior/paths/flight_control_exterior) -"bdP" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/paths/flight_control_exterior) "bdQ" = ( /obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer4, /area/strata/ag/exterior/paths/flight_control_exterior) -"bdS" = ( -/obj/structure/largecrate/random, -/obj/item/storage/belt/utility/full, -/obj/structure/platform/strata, -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/marsh/river) -"bdT" = ( -/obj/structure/platform/strata, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/marsh/river) "bdU" = ( /obj/item/book/manual/security_space_law, /turf/open/floor/strata/red1, /area/strata/ag/interior/outside/checkpoints/outpost) -"bdV" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/marsh/spring_marshes) -"bdW" = ( -/obj/structure/platform_decoration/strata{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/marsh/spring_marshes) -"bdX" = ( -/obj/structure/platform_decoration/strata{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/marsh/spring_marshes) -"bdY" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/south) -"bdZ" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/marsh/spring_marshes) "bea" = ( /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/marsh/relay_marshes) -"bec" = ( -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/marsh/spring_marshes) "bed" = ( /obj/effect/decal/cleanable/generic, /turf/open/auto_turf/snow/brown_base/layer2, @@ -13370,51 +10313,16 @@ }, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/interior/outpost/engi/drome) -"beg" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - icon_state = "p_stair_full" - }, -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/outpost/hallways/south) -"beh" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - dir = 4; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/outpost/hallways/south) "bei" = ( /obj/effect/decal/cleanable/blood/oil, /obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/plating, /area/strata/ag/exterior/marsh/river) -"bek" = ( -/obj/structure/platform/strata, -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/marsh/river) "bel" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/snacks/cheesecakeslice, /turf/open/floor/interior/plastic, /area/strata/ag/interior/outside/wooden_hospital) -"bem" = ( -/obj/structure/barricade/handrail/strata{ - dir = 8 - }, -/obj/structure/barricade/handrail/strata, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_21" - }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/south) "ben" = ( /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/marsh/island_marshes) @@ -13524,10 +10432,6 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/strata, /area/strata/ag/interior/landing_zones/near_lz1) -"beK" = ( -/obj/structure/platform_decoration/strata/metal, -/turf/open/floor/strata, -/area/strata/ag/interior/landing_zones/near_lz1) "beL" = ( /obj/structure/machinery/weather_siren{ dir = 8; @@ -13628,47 +10532,13 @@ "bfd" = ( /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/caves/shed_five_caves) -"bfe" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/caves/shed_five_caves) -"bff" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/caves/shed_five_caves) "bfg" = ( /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/caves/shed_five_caves) -"bfh" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/caves/shed_five_caves) -"bfi" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/caves/shed_five_caves) "bfk" = ( /obj/structure/fence, /turf/open/auto_turf/ice/layer0, /area/strata/ag/exterior/landing_zones/near_lz2) -"bfl" = ( -/obj/structure/platform/strata, -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/marsh/spring_marshes) "bfm" = ( /obj/structure/window/reinforced/tinted, /turf/open/floor/strata/red1, @@ -13682,12 +10552,6 @@ }, /turf/open/floor/strata/fake_wood, /area/strata/ag/interior/outside/bball) -"bfo" = ( -/obj/structure/platform_decoration/strata{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/marsh/spring_marshes) "bfp" = ( /obj/effect/decal/cleanable/generic, /turf/open/auto_turf/snow/brown_base/layer3, @@ -13750,16 +10614,6 @@ }, /turf/open/floor/strata/multi_tiles/west, /area/strata/ag/interior/outpost/foyer) -"bfD" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/fake_wood, -/area/strata/ag/interior/outpost/hallways/south) -"bfE" = ( -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/marsh/spring_marshes) "bfF" = ( /obj/structure/machinery/light{ dir = 8 @@ -13818,54 +10672,23 @@ /obj/structure/window/framed/strata, /turf/open/floor/strata/multi_tiles/southeast, /area/strata/ag/interior/outpost/admin) +"bfW" = ( +/obj/structure/platform/metal/strata/north, +/turf/open/auto_turf/snow/brown_base/layer3, +/area/strata/ag/exterior/caves/shed_five_caves) "bfX" = ( /obj/structure/sign/safety/fire_haz, /turf/closed/wall/strata_outpost, /area/strata/ag/interior/outpost/admin) -"bga" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/hallways/south) -"bgb" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/hallways/south) -"bgc" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 8 - }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/hallways/south) -"bge" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 4 - }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/hallways/south) "bgf" = ( /obj/structure/machinery/light{ dir = 8 }, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ug/interior/outpost/platform) -"bgg" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/hallways/south) "bgh" = ( /turf/open/auto_turf/snow/brown_base/layer4, /area/strata/ag/exterior/paths/flight_control_exterior) -"bgi" = ( -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer3, -/area/strata/ag/exterior/caves/shed_five_caves) "bgj" = ( /obj/effect/decal/cleanable/blood/oil, /obj/structure/barricade/handrail/strata{ @@ -13880,12 +10703,6 @@ /obj/structure/machinery/floodlight/landing, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/marsh/crash) -"bgl" = ( -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/marsh/spring_marshes) "bgn" = ( /obj/effect/decal/remains/xeno, /obj/effect/decal/cleanable/blood{ @@ -13897,37 +10714,12 @@ /obj/structure/fence, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/marsh/water_marshes) -"bgr" = ( -/obj/structure/fence, -/obj/structure/platform_decoration/strata/metal{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/marsh/spring_marshes) -"bgs" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/marsh/spring_marshes) "bgt" = ( /obj/structure/stairs/perspective{ color = "#6e6e6e" }, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/marsh/spring_marshes) -"bgu" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/marsh/spring_marshes) -"bgv" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/marsh/spring_marshes) "bgw" = ( /obj/structure/pipes/standard/manifold/hidden/cyan{ dir = 8 @@ -13940,26 +10732,6 @@ }, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/marsh/spring_marshes) -"bgz" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/floor3/east, -/area/strata/ag/interior/outpost/canteen) -"bgA" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 10 - }, -/turf/open/floor/strata/floor3/east, -/area/strata/ag/interior/outpost/hallways/south) -"bgB" = ( -/obj/structure/platform/strata, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/paths/flight_control_exterior) -"bgF" = ( -/obj/structure/platform/strata, -/turf/open/auto_turf/snow/brown_base/layer4, -/area/strata/ag/exterior/paths/flight_control_exterior) "bgG" = ( /obj/effect/decal/cleanable/generic, /turf/open/auto_turf/snow/brown_base/layer3, @@ -14072,18 +10844,6 @@ /obj/structure/fence, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/vanyard) -"bhk" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/caves/shed_five_caves) -"bhp" = ( -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/landing_zones/near_lz1) "bhq" = ( /obj/structure/machinery/door/airlock/almayer/medical/glass/colony{ dir = 8; @@ -14091,21 +10851,6 @@ }, /turf/open/floor/strata/multi_tiles/west, /area/strata/ag/interior/landing_zones/near_lz1) -"bhr" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer3, -/area/strata/ag/exterior/caves/shed_five_caves) -"bhs" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer3, -/area/strata/ag/exterior/caves/shed_five_caves) "bht" = ( /obj/structure/barricade/handrail/strata{ dir = 8 @@ -14198,13 +10943,6 @@ }, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/marsh/river) -"bhK" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/river) "bhL" = ( /obj/item/clothing/shoes/snow, /obj/structure/surface/rack, @@ -14231,12 +10969,6 @@ "bhO" = ( /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/marsh/crash) -"bhP" = ( -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/marsh/spring_marshes) "bhQ" = ( /obj/structure/bed/chair, /turf/open/floor/strata/blue1, @@ -14262,13 +10994,6 @@ }, /turf/open/asphalt/cement, /area/strata/ag/interior/outpost/foyer) -"bhX" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform_decoration/strata/metal{ - dir = 4 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/river) "bhY" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 9 @@ -14285,33 +11010,10 @@ /obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/marsh/crash) -"bib" = ( -/obj/structure/inflatable/popped, -/turf/open/floor/strata/multi_tiles, -/area/strata/ag/interior/outpost/hallways/south) "bic" = ( /obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/marsh/crash) -"bif" = ( -/obj/structure/platform/strata, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/marsh/crash) -"big" = ( -/obj/structure/platform_decoration/strata{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/marsh/spring_marshes) -"bih" = ( -/obj/structure/platform_decoration/strata, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/marsh/spring_marshes) -"bii" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/obj/structure/inflatable/popped, -/turf/open/floor/strata/multi_tiles, -/area/strata/ag/interior/outpost/hallways/south) "bij" = ( /obj/structure/machinery/space_heater, /obj/structure/machinery/light{ @@ -14328,38 +11030,6 @@ /obj/item/clipboard, /turf/open/floor/strata/multi_tiles, /area/strata/ag/interior/outpost/foyer) -"bin" = ( -/obj/structure/platform/strata, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/marsh/spring_marshes) -"biq" = ( -/obj/structure/platform_decoration/strata, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/marsh/spring_marshes) -"bis" = ( -/obj/structure/platform/strata, -/turf/open/auto_turf/snow/brown_base/layer3, -/area/strata/ag/exterior/marsh/spring_marshes) -"bit" = ( -/obj/structure/flora/grass/tallgrass/ice/corner{ - dir = 6 - }, -/obj/structure/platform/strata, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/marsh/spring_marshes) -"biu" = ( -/obj/structure/flora/grass/tallgrass/ice/corner{ - dir = 10 - }, -/obj/structure/platform/strata, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/marsh/spring_marshes) -"biv" = ( -/obj/structure/platform_decoration/strata{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/vanyard) "biw" = ( /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/vanyard) @@ -14404,20 +11074,6 @@ }, /turf/open/floor/strata/floor3, /area/strata/ag/interior/outpost/admin) -"biE" = ( -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/caves/shed_five_caves) -"biF" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/effect/blocker/sorokyne_cold_water, -/obj/effect/blocker/sorokyne_cold_water, -/turf/open/gm/river, -/area/strata/ag/exterior/paths/far_north_outpost) "biG" = ( /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/marsh/river) @@ -14438,32 +11094,6 @@ }, /turf/open/floor/strata/floor3, /area/strata/ag/interior/outpost/admin) -"biN" = ( -/obj/structure/platform/strata, -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer3, -/area/strata/ag/exterior/marsh/spring_marshes) -"biP" = ( -/obj/structure/platform_decoration/strata{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/marsh/spring_marshes) -"biQ" = ( -/obj/item/lightstick/red/planted, -/obj/structure/platform/strata{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/vanyard) -"biR" = ( -/obj/structure/platform_decoration/strata{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/vanyard) "biT" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 @@ -14542,12 +11172,6 @@ }, /turf/open/floor/strata/orange_cover, /area/strata/ag/interior/outpost/engi/drome) -"bjh" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 6 - }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/hallways/south) "bjj" = ( /turf/open/auto_turf/ice/layer0, /area/strata/ag/exterior/marsh/river) @@ -14574,13 +11198,6 @@ }, /turf/open/floor/strata/multi_tiles/southeast, /area/strata/ag/interior/outpost/engi/drome) -"bjp" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor/colony{ - dir = 1; - name = "\improper Airlock" - }, -/turf/open/floor/strata/floor3/east, -/area/strata/ag/interior/outpost/hallways/south) "bjr" = ( /turf/open/asphalt/cement, /area/strata/ug/interior/outpost/platform) @@ -14588,27 +11205,12 @@ /obj/structure/flora/bush/ausbushes/var3/fullgrass, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/platform/east) -"bjv" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/crash) -"bjA" = ( -/obj/structure/platform_decoration/strata{ +"bjz" = ( +/obj/structure/bed/chair{ dir = 1 }, -/obj/effect/blocker/sorokyne_cold_water, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/river) +/turf/open/floor/strata/white_cyan2/west, +/area/strata/ag/interior/outpost/canteen) "bjB" = ( /obj/structure/largecrate/random, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, @@ -14619,48 +11221,6 @@ /obj/structure/pipes/standard/simple/hidden/cyan, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/caves/shed_five_caves) -"bjE" = ( -/obj/structure/platform_decoration/strata{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/marsh/crash) -"bjG" = ( -/obj/structure/platform/strata{ - dir = 8 - }, -/obj/structure/platform/strata, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/marsh/spring_marshes) -"bjH" = ( -/obj/effect/decal/cleanable/generic, -/obj/structure/platform_decoration/strata{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/marsh/spring_marshes) -"bjI" = ( -/obj/structure/platform_decoration/strata{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/marsh/spring_marshes) -"bjJ" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/marsh/spring_marshes) -"bjK" = ( -/obj/effect/decal/cleanable/generic, -/obj/structure/platform_decoration/strata{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer3, -/area/strata/ag/exterior/marsh/spring_marshes) "bjL" = ( /obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer0, @@ -14728,24 +11288,6 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, /turf/open/floor/strata/multi_tiles, /area/strata/ag/interior/mining_outpost/hive) -"bkb" = ( -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/caves/shed_five_caves) -"bkd" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/marsh/crash) -"bke" = ( -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer3, -/area/strata/ag/exterior/marsh/spring_marshes) "bkh" = ( /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/vanyard) @@ -14755,42 +11297,11 @@ }, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/caves/shed_five_caves) -"bkl" = ( -/obj/structure/platform/strata{ - dir = 8 - }, -/obj/structure/platform/strata, -/turf/open/auto_turf/snow/brown_base/layer3, -/area/strata/ag/exterior/marsh/spring_marshes) -"bkm" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer3, -/area/strata/ag/exterior/marsh/spring_marshes) -"bkn" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer4, -/area/strata/ag/exterior/marsh/spring_marshes) "bko" = ( /obj/effect/blocker/sorokyne_cold_water, /obj/effect/blocker/sorokyne_cold_water, /turf/open/gm/river, /area/strata/ag/exterior/marsh/water) -"bkp" = ( -/obj/item/lightstick/red/planted, -/obj/structure/platform/strata, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/vanyard) -"bkq" = ( -/obj/effect/decal/cleanable/blood/oil/streak, -/obj/structure/platform_decoration/strata{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/vanyard) "bkr" = ( /obj/effect/decal/cleanable/blood/oil/streak, /turf/open/auto_turf/snow/brown_base/layer1, @@ -14906,34 +11417,15 @@ }, /turf/open/floor/strata/multi_tiles, /area/strata/ag/interior/outpost/med) +"bkR" = ( +/obj/effect/decal/cleanable/blood, +/obj/item/tool/match, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/orange_cover, +/area/strata/ag/interior/mining_outpost/central) "bkT" = ( /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ug/interior/jungle/structures/research/old_tunnels) -"bkU" = ( -/obj/structure/largecrate/random/secure{ - layer = 3.1 - }, -/obj/structure/platform/strata{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/paths/south_outpost) -"bkX" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/paths/south_outpost) -"bkY" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/multi_tiles/southeast, -/area/strata/ag/interior/outpost/hallways/south) -"bkZ" = ( -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/canteen/personal_storage) "bla" = ( /obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer3, @@ -14993,67 +11485,20 @@ }, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/caves/shed_five_caves) -"blp" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/paths/south_outpost) -"blr" = ( -/obj/structure/platform_decoration/strata{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/paths/south_outpost) "bls" = ( /obj/structure/machinery/light/small, /turf/open/auto_turf/ice/layer0, /area/strata/ag/interior/outside/bball/cave) -"blu" = ( -/obj/effect/decal/cleanable/blood, -/obj/structure/platform/strata{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/paths/south_outpost) -"blv" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/machinery/space_heater, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/paths/south_outpost) -"blx" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/obj/structure/machinery/space_heater, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/paths/south_outpost) "bly" = ( /obj/structure/bookcase{ icon_state = "book-5" }, /turf/open/floor/interior/plastic, /area/strata/ag/interior/outside/wooden_hospital) -"blz" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/obj/structure/inflatable, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/paths/south_outpost) "blA" = ( /obj/structure/curtain/medical, /turf/open/floor/interior/tatami, /area/strata/ag/interior/outside/wooden_hospital) -"blB" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/obj/item/toy/deck, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/paths/south_outpost) "blD" = ( /obj/structure/closet/secure_closet/medical3{ req_access = null @@ -15064,13 +11509,6 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/floor/interior/plastic, /area/strata/ag/interior/outside/wooden_hospital) -"blE" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 4 - }, -/obj/structure/barricade/wooden, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/paths/south_outpost) "blF" = ( /obj/item/stack/sheet/wood, /turf/open/auto_turf/snow/brown_base/layer0, @@ -15095,25 +11533,6 @@ "blJ" = ( /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/paths/south_outpost) -"blK" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/paths/south_outpost) -"blL" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/paths/south_outpost) -"blM" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/obj/structure/bed/chair, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/paths/south_outpost) "blN" = ( /turf/open/floor/strata/blue1, /area/strata/ag/interior/outpost/admin) @@ -15136,11 +11555,6 @@ }, /turf/open/floor/strata, /area/strata/ag/interior/outpost/admin) -"blR" = ( -/obj/item/tool/pen/blue, -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/fake_wood, -/area/strata/ag/interior/outpost/hallways/south) "blS" = ( /obj/structure/pipes/standard/simple/hidden/cyan, /turf/open/floor/strata/floor3, @@ -15176,9 +11590,6 @@ /obj/structure/largecrate/random/barrel/red, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/marsh/crash) -"bmb" = ( -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/outpost/canteen) "bmc" = ( /obj/effect/decal/cleanable/blood/oil, /obj/structure/machinery/light/small, @@ -15191,13 +11602,6 @@ /obj/structure/machinery/door/airlock/almayer/engineering/colony, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/interior/outpost/admin) -"bmk" = ( -/obj/effect/decal/strata_decals/catwalk/prison, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/turf/open/floor/strata/multi_tiles/southwest, -/area/strata/ag/interior/outpost/hallways/south) "bml" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony{ dir = 2 @@ -15226,12 +11630,6 @@ /obj/structure/inflatable, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/paths/south_outpost) -"bms" = ( -/obj/structure/machinery/camera/autoname{ - dir = 8 - }, -/turf/open/floor/strata/floor3/east, -/area/strata/ag/interior/outpost/hallways/south) "bmt" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -15341,10 +11739,6 @@ /obj/structure/flora/grass/tallgrass/ice/corner, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/marsh/crash) -"bmX" = ( -/obj/structure/bedsheetbin, -/turf/open/floor/strata/blue1, -/area/strata/ag/interior/outpost/canteen/personal_storage) "bmY" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 10 @@ -15358,12 +11752,6 @@ /obj/structure/barricade/snow, /turf/open/floor/strata/floor3, /area/strata/ag/exterior/paths/far_north_outpost) -"bnb" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 8 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/landing_zones/near_lz1) "bnc" = ( /obj/structure/largecrate/random/barrel/red, /turf/open/auto_turf/snow/brown_base/layer0, @@ -15371,14 +11759,6 @@ "bnd" = ( /turf/closed/wall/resin/strata/on_tiles, /area/strata/ug/interior/jungle/structures/research/old_tunnels) -"bne" = ( -/obj/effect/particle_effect/steam, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform_decoration/strata/metal{ - dir = 4 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/river) "bng" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 8 @@ -15512,18 +11892,6 @@ }, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/marsh/spring_marshes) -"bnP" = ( -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/caves/shed_five_caves) -"bnQ" = ( -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/caves/shed_five_caves) "bnR" = ( /obj/structure/pipes/standard/simple/hidden/cyan, /turf/open/auto_turf/snow/brown_base/layer2, @@ -15747,21 +12115,6 @@ }, /turf/open/floor/strata/white_cyan1/east, /area/strata/ag/interior/outpost/canteen) -"boG" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/paths/south_outpost) -"boH" = ( -/obj/structure/flora/grass/tallgrass/ice/corner{ - dir = 5 - }, -/obj/structure/platform_decoration/strata{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/paths/south_outpost) "boI" = ( /obj/structure/flora/grass/tallgrass/ice, /obj/structure/barricade/snow{ @@ -15769,21 +12122,6 @@ }, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/paths/south_outpost) -"boJ" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform/strata/metal, -/turf/open/floor/strata/multi_tiles, -/area/strata/ag/exterior/outpost_decks) -"boL" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/floor/strata/multi_tiles/southwest, -/area/strata/ag/interior/outpost/foyer) "boM" = ( /obj/structure/flora/grass/tallgrass/ice, /obj/structure/barricade/snow{ @@ -15829,12 +12167,6 @@ }, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/paths/south_outpost) -"boT" = ( -/obj/structure/platform_decoration/strata{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/paths/south_outpost) "boU" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 6 @@ -15853,24 +12185,12 @@ }, /turf/open/floor/prison/darkredfull2, /area/strata/ag/interior/mining_outpost/canteen) -"boX" = ( -/obj/structure/platform_decoration/strata{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/paths/south_outpost) "boY" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 9 }, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/interior/outpost/foyer) -"bpa" = ( -/obj/structure/platform_decoration/strata{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/paths/south_outpost) "bpc" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 5 @@ -15965,18 +12285,6 @@ }, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/paths/south_outpost) -"bpx" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - dir = 1; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/pipes/standard/simple/hidden/cyan, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/hallways/south) "bpy" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/auto_turf/snow/brown_base/layer1, @@ -15998,10 +12306,6 @@ /obj/structure/inflatable/popped/door, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/paths/south_outpost) -"bpE" = ( -/obj/item/storage/briefcase, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/hallways/south) "bpF" = ( /obj/structure/closet/secure_closet/medical3{ req_access = null @@ -16041,34 +12345,6 @@ /obj/structure/pipes/vents/pump, /turf/open/floor/strata/blue1, /area/strata/ag/interior/outpost/admin) -"bpM" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - dir = 1; - icon_state = "p_stair_full" - }, -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/hallways/south) -"bpN" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - dir = 1; - icon_state = "p_stair_full" - }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/hallways/south) -"bpO" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - dir = 8; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/hallways/south) "bpP" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/paper_bin, @@ -16148,12 +12424,6 @@ /obj/item/stack/medical/splint, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/paths/south_outpost) -"bqh" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/strata/floor3/east, -/area/strata/ag/interior/outpost/canteen) "bqo" = ( /obj/structure/pipes/standard/simple/hidden/cyan, /turf/open/auto_turf/snow/brown_base/layer3, @@ -16222,16 +12492,6 @@ }, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/paths/south_outpost) -"bqM" = ( -/obj/structure/platform_decoration/strata, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/marsh/crash) -"bqN" = ( -/obj/structure/platform_decoration/strata{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/marsh/crash) "bqP" = ( /obj/item/trash/pistachios, /turf/open/auto_turf/snow/brown_base/layer1, @@ -16310,13 +12570,6 @@ /obj/structure/largecrate/random/barrel/yellow, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/paths/south_outpost) -"brm" = ( -/obj/structure/platform_decoration/strata{ - dir = 1 - }, -/obj/item/lightstick/red/planted, -/turf/open/auto_turf/snow/brown_base/layer4, -/area/strata/ag/exterior/paths/south_outpost) "brn" = ( /turf/open/asphalt/cement/cement12, /area/strata/ag/exterior/caves/lz_caves) @@ -16385,42 +12638,11 @@ /obj/structure/flora/grass/tallgrass/ice/corner, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/paths/south_outpost) -"brD" = ( -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/turf/open/floor/strata/multi_tiles/southwest, -/area/strata/ag/interior/outpost/foyer) -"brE" = ( -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/marsh/crash) -"brF" = ( -/obj/structure/platform/strata{ - dir = 8 - }, -/obj/structure/platform/strata, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/marsh/crash) "brG" = ( /obj/structure/pipes/standard/simple/hidden/cyan, /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/strata/multi_tiles, /area/strata/ag/interior/mining_outpost/hive) -"brH" = ( -/obj/structure/platform_decoration/strata{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/marsh/crash) -"brJ" = ( -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/marsh/center) "brK" = ( /obj/item/trash/pistachios, /turf/open/auto_turf/snow/brown_base/layer0, @@ -16461,12 +12683,6 @@ /obj/structure/prop/power_transformer, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/paths/north_outpost) -"brW" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/paths/south_outpost) "brX" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/auto_turf/snow/brown_base/layer1, @@ -16475,30 +12691,6 @@ /obj/structure/flora/grass/tallgrass/ice/corner, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/paths/south_outpost) -"bsa" = ( -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer4, -/area/strata/ag/exterior/marsh/crash) -"bsc" = ( -/obj/structure/platform_decoration/strata{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/marsh/center) -"bsd" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/marsh/center) -"bse" = ( -/obj/structure/platform_decoration/strata{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/marsh/center) "bsf" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 5 @@ -16526,13 +12718,6 @@ }, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/marsh/spring_marshes) -"bsn" = ( -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/obj/structure/platform/strata/metal, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/paths/south_outpost) "bso" = ( /obj/structure/pipes/standard/simple/hidden/cyan, /obj/structure/machinery/door/airlock/almayer/maint/colony{ @@ -16551,12 +12736,6 @@ /obj/item/stack/rods, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outpost/med) -"bsr" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/paths/south_outpost) "bss" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/strata/floor3/east, @@ -16566,17 +12745,6 @@ /obj/structure/machinery/door/airlock/almayer/medical/colony, /turf/open/floor/strata/multi_tiles/west, /area/strata/ag/interior/outpost/med) -"bsu" = ( -/obj/structure/platform_decoration/strata/metal, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/paths/south_outpost) -"bsv" = ( -/turf/open/floor/strata/white_cyan3/west, -/area/strata/ag/interior/outpost/hallways/south) -"bsw" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/white_cyan3/east, -/area/strata/ag/interior/outpost/hallways/south) "bsx" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited, /turf/closed/wall/strata_outpost, @@ -16604,10 +12772,6 @@ }, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/interior/outpost/admin) -"bsD" = ( -/obj/effect/decal/cleanable/blood, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/hallways/south) "bsG" = ( /obj/structure/bookcase{ icon_state = "book-5" @@ -16635,15 +12799,6 @@ }, /turf/open/floor/strata/blue1, /area/strata/ag/interior/outpost/admin) -"bsM" = ( -/obj/structure/platform/strata/metal, -/obj/item/lightstick/red/planted, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/paths/south_outpost) -"bsN" = ( -/obj/structure/platform/strata/metal, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/paths/south_outpost) "bsO" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -16657,21 +12812,6 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/paths/south_outpost) -"bsQ" = ( -/obj/structure/platform_decoration/strata{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/marsh/crash) -"bsR" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/marsh/crash) "bsS" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/paper_bin, @@ -16680,12 +12820,6 @@ }, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/interior/outside/bball) -"bsT" = ( -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/marsh/crash) "bsU" = ( /turf/open/auto_turf/snow/brown_base/layer4, /area/strata/ag/exterior/marsh/crash) @@ -16701,26 +12835,6 @@ }, /turf/open/floor/strata, /area/strata/ag/interior/outpost/engi/drome) -"bsX" = ( -/obj/effect/decal/cleanable/blood/oil, -/obj/structure/largecrate/random, -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/interior/outside/engineering/parts_storage_cave) -"bsY" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/outpost/hallways/south) -"bsZ" = ( -/obj/structure/platform_decoration/strata{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/marsh/crash) "bta" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 6 @@ -16755,13 +12869,6 @@ }, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/marsh/spring_marshes) -"btg" = ( -/obj/structure/largecrate/random, -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/interior/outside/engineering/parts_storage_cave) "bth" = ( /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/auto_turf/snow/brown_base/layer4, @@ -16776,19 +12883,6 @@ }, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/marsh/center) -"btl" = ( -/obj/structure/platform_decoration/strata, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/marsh/center) -"btm" = ( -/obj/effect/decal/cleanable/generic, -/obj/structure/platform/strata, -/turf/open/auto_turf/snow/brown_base/layer3, -/area/strata/ag/exterior/marsh/center) -"btn" = ( -/obj/structure/platform/strata, -/turf/open/auto_turf/snow/brown_base/layer3, -/area/strata/ag/exterior/marsh/center) "bto" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 8 @@ -16900,13 +12994,6 @@ }, /turf/open/asphalt/cement/cement15, /area/strata/ug/interior/outpost/platform) -"btN" = ( -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/auto_turf/strata_grass/layer0, -/area/strata/ug/interior/jungle/platform/east) "btO" = ( /obj/structure/flora/bush/ausbushes/ppflowers, /turf/open/auto_turf/strata_grass/layer1, @@ -17048,12 +13135,6 @@ }, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/marsh/center) -"buD" = ( -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/marsh/spring_marshes) "buF" = ( /obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer2, @@ -17074,18 +13155,6 @@ /obj/structure/fence, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/marsh/center) -"buK" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/marsh/spring_marshes) -"buM" = ( -/obj/structure/platform_decoration/strata{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/marsh/spring_marshes) "buN" = ( /turf/open/auto_turf/snow/brown_base/layer4, /area/strata/ag/interior/outside/engineering/parts_storage_exterior) @@ -17317,12 +13386,6 @@ }, /turf/open/floor/strata, /area/strata/ag/interior/outpost/engi/drome) -"bvR" = ( -/obj/structure/platform_decoration/strata{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/landing_zones/near_lz2) "bvU" = ( /obj/effect/decal/cleanable/ash, /obj/structure/barricade/wooden{ @@ -17334,18 +13397,6 @@ /obj/structure/bed/roller, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/interior/outside/engineering/parts_storage_cave) -"bvW" = ( -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/landing_zones/near_lz2) -"bvZ" = ( -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/landing_zones/near_lz2) "bwb" = ( /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/landing_zones/near_lz2) @@ -17361,17 +13412,6 @@ /obj/structure/largecrate/random, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/interior/outside/engineering/parts_storage_cave) -"bwf" = ( -/obj/structure/machinery/light/small, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"bwg" = ( -/obj/structure/platform_decoration/strata{ - dir = 4 - }, -/obj/effect/blocker/sorokyne_cold_water, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/water) "bwh" = ( /obj/structure/machinery/light{ dir = 8 @@ -17390,18 +13430,6 @@ }, /turf/open/asphalt/cement, /area/strata/ag/exterior/paths/mining_outpost_exterior) -"bwk" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" - }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/south) -"bwm" = ( -/obj/structure/platform_decoration/strata{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/landing_zones/near_lz2) "bwn" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -17417,24 +13445,6 @@ "bwp" = ( /turf/closed/wall/strata_outpost/reinforced/hull, /area/strata/ag/interior/outside/administration) -"bwq" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" - }, -/turf/open/floor/strata/floor3/east, -/area/strata/ag/interior/outpost/canteen) -"bwr" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/landing_zones/near_lz2) -"bws" = ( -/obj/structure/platform_decoration/strata{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/landing_zones/near_lz2) "bwt" = ( /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/landing_zones/near_lz2) @@ -17448,14 +13458,6 @@ }, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/landing_zones/near_lz2) -"bww" = ( -/obj/structure/platform_decoration/strata, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/landing_zones/near_lz2) -"bwx" = ( -/obj/structure/platform/strata, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/landing_zones/near_lz2) "bwy" = ( /obj/structure/machinery/sensortower{ pixel_x = -8 @@ -17468,18 +13470,6 @@ }, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/landing_zones/near_lz2) -"bwB" = ( -/obj/structure/platform_decoration/strata, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/landing_zones/near_lz2) -"bwC" = ( -/obj/structure/platform/strata, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/landing_zones/near_lz2) -"bwD" = ( -/obj/structure/platform/strata, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/landing_zones/near_lz2) "bwE" = ( /obj/structure/bed/chair{ dir = 8 @@ -17499,47 +13489,16 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/carplake/east) -"bwI" = ( -/obj/structure/platform_decoration/strata{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/landing_zones/near_lz2) "bwL" = ( /obj/effect/particle_effect/steam, /obj/effect/blocker/sorokyne_cold_water, /obj/structure/flora/grass/tallgrass/ice, /turf/open/gm/river, /area/strata/ag/exterior/marsh/river) -"bwO" = ( -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/landing_zones/near_lz2) -"bwP" = ( -/obj/structure/platform/strata, -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/landing_zones/near_lz2) -"bwQ" = ( -/obj/structure/platform_decoration/strata{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer4, -/area/strata/ag/exterior/landing_zones/near_lz2) "bwR" = ( /obj/structure/inflatable/door, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/interior/outside/bball) -"bwT" = ( -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/landing_zones/near_lz2) "bwU" = ( /obj/effect/particle_effect/steam, /obj/effect/blocker/sorokyne_cold_water, @@ -17548,39 +13507,6 @@ }, /turf/open/gm/river, /area/strata/ag/exterior/marsh/river) -"bwW" = ( -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/landing_zones/near_lz2) -"bwX" = ( -/obj/structure/platform_decoration/strata{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/landing_zones/near_lz2) -"bwY" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/landing_zones/near_lz2) -"bwZ" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/landing_zones/near_lz2) -"bxa" = ( -/obj/structure/platform_decoration/strata{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/landing_zones/near_lz2) "bxc" = ( /obj/effect/decal/cleanable/blood, /turf/open/auto_turf/snow/brown_base/layer0, @@ -17590,14 +13516,6 @@ /obj/effect/decal/cleanable/blood, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/marsh/relay_marshes) -"bxe" = ( -/obj/structure/flora/grass/tallgrass/ice, -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/effect/blocker/sorokyne_cold_water, -/turf/open/gm/river, -/area/strata/ag/exterior/paths/far_north_outpost) "bxg" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 6 @@ -17653,10 +13571,6 @@ "bxy" = ( /turf/open/auto_turf/snow/brown_base/layer4, /area/strata/ag/exterior/marsh/relay_marshes) -"bxz" = ( -/obj/structure/platform_decoration/strata, -/turf/open/auto_turf/snow/brown_base/layer4, -/area/strata/ag/exterior/landing_zones/near_lz2) "bxA" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 6 @@ -17671,10 +13585,6 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/landing_zones/near_lz2) -"bxD" = ( -/obj/structure/platform_decoration/strata, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/landing_zones/near_lz2) "bxE" = ( /obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/strata/floor3/east, @@ -17682,19 +13592,6 @@ "bxF" = ( /turf/open/floor/strata/multi_tiles/west, /area/strata/ag/interior/outside/administration) -"bxG" = ( -/obj/structure/platform/strata{ - dir = 4 - }, -/obj/structure/platform/strata, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/landing_zones/near_lz2) -"bxH" = ( -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer4, -/area/strata/ag/exterior/landing_zones/near_lz2) "bxI" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -17737,12 +13634,6 @@ }, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outpost/med) -"bxQ" = ( -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer4, -/area/strata/ag/exterior/landing_zones/near_lz2) "bxR" = ( /obj/structure/flora/grass/tallgrass/ice, /turf/open/auto_turf/snow/brown_base/layer0, @@ -17760,55 +13651,12 @@ }, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outpost/med) -"bxV" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/white_cyan3/west, -/area/strata/ag/interior/outpost/hallways/south) -"bxW" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/landing_zones/near_lz2) -"bxX" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan, -/turf/open/floor/strata/white_cyan3/northeast, -/area/strata/ag/interior/outpost/hallways/south) "bxY" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 10 }, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/marsh/island_marshes) -"bxZ" = ( -/obj/structure/platform/strata{ - dir = 8 - }, -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/landing_zones/near_lz2) -"bya" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/landing_zones/near_lz2) -"byb" = ( -/obj/structure/platform_decoration/strata{ - dir = 4 - }, -/obj/structure/platform_decoration/strata{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/landing_zones/near_lz2) "byc" = ( /obj/structure/flora/grass/tallgrass/ice/corner, /turf/open/auto_turf/snow/brown_base/layer1, @@ -17820,13 +13668,6 @@ "bye" = ( /turf/open/floor/strata/white_cyan3/north, /area/strata/ag/interior/outpost/med) -"byf" = ( -/obj/structure/platform/strata{ - dir = 4 - }, -/obj/structure/platform/strata, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/landing_zones/near_lz2) "byh" = ( /obj/structure/blocker/invisible_wall, /turf/open/auto_turf/snow/brown_base/layer1, @@ -17835,15 +13676,6 @@ /obj/structure/blocker/invisible_wall, /turf/open/auto_turf/snow/brown_base/layer4, /area/strata/ag/interior/restricted) -"byj" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/landing_zones/near_lz2) "byk" = ( /obj/structure/machinery/space_heater, /obj/structure/blocker/invisible_wall, @@ -17902,34 +13734,6 @@ }, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/structures/monitoring/east) -"byN" = ( -/obj/structure/platform_decoration/strata, -/obj/effect/blocker/sorokyne_cold_water, -/obj/effect/blocker/sorokyne_cold_water, -/turf/open/gm/river, -/area/strata/ag/exterior/paths/far_north_outpost) -"byO" = ( -/obj/structure/platform/strata, -/obj/effect/blocker/sorokyne_cold_water, -/obj/effect/blocker/sorokyne_cold_water, -/turf/open/gm/river, -/area/strata/ag/exterior/paths/far_north_outpost) -"byP" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata, -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/paths/far_north_outpost) -"byQ" = ( -/obj/structure/platform/strata, -/obj/structure/platform/strata{ - dir = 4 - }, -/obj/effect/blocker/sorokyne_cold_water, -/turf/open/gm/river, -/area/strata/ag/exterior/paths/far_north_outpost) "byY" = ( /obj/item/tool/pen/blue, /obj/structure/bed/chair/office/light, @@ -17978,10 +13782,6 @@ "bzl" = ( /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outpost/engi/drome) -"bzm" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/floor3/east, -/area/strata/ag/interior/outpost/hallways/south) "bzn" = ( /obj/effect/spawner/random/toolbox, /obj/structure/surface/rack, @@ -17999,17 +13799,6 @@ }, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/interior/outpost/engi/drome) -"bzq" = ( -/obj/effect/decal/strata_decals/catwalk/prison, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 8 - }, -/turf/open/floor/strata/multi_tiles/southwest, -/area/strata/ag/interior/outpost/hallways/south) "bzs" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 @@ -18082,16 +13871,6 @@ "bAr" = ( /turf/open/floor/strata/floor2, /area/strata/ug/interior/jungle/structures/research) -"bAu" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 8 - }, -/obj/effect/blocker/sorokyne_cold_water, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/water) "bAv" = ( /obj/effect/particle_effect/steam, /obj/effect/blocker/sorokyne_cold_water, @@ -18131,13 +13910,6 @@ /obj/structure/machinery/computer/emails, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outside/administration) -"bAI" = ( -/obj/structure/platform/strata{ - dir = 8 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/water) "bAJ" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 6 @@ -18182,16 +13954,21 @@ /obj/item/coin/uranium, /turf/open/asphalt/cement, /area/strata/ag/interior/outside/administration) +"bAQ" = ( +/obj/structure/surface/rack, +/obj/item/stack/sheet/glass, +/turf/open/floor/strata/floor3/east, +/area/strata/ag/interior/outpost/engi/drome) "bAS" = ( /obj/structure/prop/ice_colony/soil_net, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/marsh/center) -"bAT" = ( +"bBf" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 + dir = 5 }, -/turf/open/floor/strata/fake_wood, -/area/strata/ag/interior/outpost/hallways/south) +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/canteen) "bBg" = ( /obj/effect/decal/strata_decals/catwalk/prison, /turf/open/floor/strata/red1, @@ -18201,12 +13978,6 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/platform/east) -"bBB" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/white_cyan4/east, -/area/strata/ag/interior/outpost/hallways/south) "bBN" = ( /obj/structure/flora/bush/ausbushes/grassybush{ icon_state = "leafybush_2" @@ -18225,16 +13996,6 @@ /obj/effect/decal/strata_decals/catwalk/prison, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ug/interior/jungle/structures/research) -"bBT" = ( -/turf/open/floor/strata/white_cyan3, -/area/strata/ag/interior/outpost/hallways/south) -"bBU" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/white_cyan3/southwest, -/area/strata/ag/interior/outpost/hallways/south) -"bBV" = ( -/turf/open/floor/strata/white_cyan3/east, -/area/strata/ag/interior/outpost/hallways/south) "bBX" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/communications{ @@ -18259,24 +14020,10 @@ /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/strata/multi_tiles/southeast, /area/strata/ag/interior/outpost/med) -"bCd" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/effect/blocker/sorokyne_cold_water, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/water) "bCf" = ( /obj/structure/pipes/standard/simple/hidden/cyan, /turf/open/floor/strata/white_cyan2, /area/strata/ag/interior/outpost/med) -"bCh" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/obj/structure/machinery/light, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/mining_outpost/hallways) "bCm" = ( /obj/structure/filingcabinet, /obj/structure/machinery/light/small{ @@ -18305,16 +14052,6 @@ }, /turf/open/floor/strata/floor2, /area/strata/ag/interior/outpost/med) -"bCp" = ( -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/hallways/south) -"bCq" = ( -/turf/open/floor/strata/fake_wood, -/area/strata/ag/interior/outpost/hallways/south) -"bCt" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/hallways/south) "bCv" = ( /obj/structure/machinery/door/airlock/almayer/medical/colony{ dir = 1; @@ -18388,12 +14125,6 @@ /obj/structure/machinery/iv_drip, /turf/open/floor/interior/plastic, /area/strata/ag/interior/outside/wooden_hospital) -"bCY" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 1 - }, -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/outpost/hallways/south) "bDl" = ( /obj/structure/prop/ice_colony/surveying_device/measuring_device{ dir = 8; @@ -18408,14 +14139,6 @@ "bDn" = ( /turf/open/floor/strata/fake_wood, /area/strata/ug/interior/jungle/structures/research/old_tunnels) -"bDo" = ( -/obj/effect/decal/strata_decals/catwalk/prison, -/obj/structure/disposalpipe/segment, -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 9 - }, -/turf/open/floor/strata/multi_tiles/southwest, -/area/strata/ag/interior/outpost/hallways/south) "bDq" = ( /obj/structure/barricade/handrail/strata, /turf/open/floor/strata/floor3/east, @@ -18455,10 +14178,6 @@ }, /turf/open/floor/strata/fake_wood, /area/strata/ag/interior/outpost/engi/drome) -"bDA" = ( -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/strata/floor3/east, -/area/strata/ag/interior/outpost/canteen) "bDB" = ( /obj/item/trash/plate{ pixel_x = 1; @@ -18472,21 +14191,6 @@ }, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/outpost/platform) -"bDD" = ( -/obj/structure/flora/bush/ausbushes/ppflowers, -/obj/structure/platform_decoration/strata/metal{ - dir = 1 - }, -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/auto_turf/strata_grass/layer0, -/area/strata/ug/interior/jungle/platform/east) -"bDE" = ( -/obj/structure/platform_decoration/strata{ - dir = 8 - }, -/obj/effect/blocker/sorokyne_cold_water, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/water) "bDH" = ( /turf/open/gm/coast/beachcorner/south_east, /area/strata/ag/exterior/jungle/carplake_center) @@ -18526,14 +14230,12 @@ /obj/effect/landmark/objective_landmark/far, /turf/open/floor/strata/cyan1/east, /area/strata/ag/interior/outside/bball) -"bEh" = ( -/obj/structure/platform/strata{ - dir = 4 +"bEo" = ( +/obj/structure/machinery/light{ + dir = 1 }, -/obj/structure/platform/strata, -/obj/effect/blocker/sorokyne_cold_water, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/water) +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/mining_outpost/central) "bEy" = ( /obj/structure/largecrate/random, /turf/open/floor/strata/fake_wood, @@ -18553,14 +14255,6 @@ }, /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/marsh/river) -"bEV" = ( -/obj/effect/particle_effect/steam, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform_decoration/strata{ - dir = 1 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/river) "bFf" = ( /obj/structure/surface/rack, /obj/item/storage/firstaid/adv, @@ -18571,17 +14265,6 @@ /obj/item/ammo_magazine/rifle/type71, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/interior/outside/bball) -"bFi" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ - dir = 8 - }, -/obj/structure/platform/strata{ - dir = 1 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/center) "bFl" = ( /obj/effect/decal/warning_stripes{ icon_state = "NS-center" @@ -18604,6 +14287,11 @@ }, /turf/open/floor/strata/fake_wood, /area/strata/ag/interior/outside/bball) +"bFt" = ( +/obj/structure/platform/metal/strata/west, +/obj/structure/platform/metal/strata, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/paths/south_outpost) "bFv" = ( /turf/open/floor/strata/multi_tiles/west, /area/strata/ag/exterior/vanyard) @@ -18657,21 +14345,6 @@ /obj/structure/machinery/door/airlock/almayer/generic, /turf/open/floor/strata/multi_tiles/west, /area/strata/ag/interior/outside/administration) -"bGd" = ( -/obj/structure/pipes/vents/pump{ - dir = 8; - id_tag = "mining_outpost_pump" - }, -/turf/open/floor/strata/cyan3/west, -/area/strata/ag/interior/outpost/hallways/south) -"bGg" = ( -/obj/structure/platform/strata{ - dir = 8 - }, -/obj/structure/platform/strata, -/obj/effect/blocker/sorokyne_cold_water, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/water) "bGk" = ( /obj/structure/largecrate/random, /turf/open/floor/strata/floor3/east, @@ -18690,10 +14363,6 @@ }, /turf/open/floor/strata/floor2, /area/strata/ag/interior/outpost/med) -"bGs" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/white_cyan3/west, -/area/strata/ag/interior/outpost/hallways/south) "bGx" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/phone{ @@ -18750,12 +14419,6 @@ }, /turf/open/floor/strata/white_cyan2/west, /area/strata/ag/interior/outpost/security) -"bHp" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/fake_wood, -/area/strata/ag/interior/outpost/hallways/south) "bHr" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, @@ -18828,12 +14491,6 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outpost/engi/drome) -"bHQ" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/turf/open/floor/strata/floor3/east, -/area/strata/ag/interior/outpost/hallways/south) "bHS" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -18863,19 +14520,18 @@ }, /turf/open/floor/strata/fake_wood, /area/strata/ag/interior/outside/bball) -"bHW" = ( -/obj/structure/surface/rack, -/obj/item/stack/sheet/glass, -/turf/open/floor/strata/floor3/east, -/area/strata/ag/interior/outpost/hallways/south) "bHY" = ( /obj/structure/closet/secure_closet/personal, /turf/open/floor/strata/blue1, /area/strata/ag/interior/outside/bball) -"bIb" = ( -/obj/effect/decal/cleanable/ash, -/turf/open/floor/strata/floor3/east, -/area/strata/ag/interior/outpost/hallways/south) +"bIc" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/canteen) +"bIh" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan, +/turf/open/floor/strata/red1, +/area/strata/ag/interior/outpost/security) "bIp" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -18904,12 +14560,6 @@ /obj/item/clothing/head/hardhat/white, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/outpost/platform) -"bIu" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 8 - }, -/turf/open/auto_turf/strata_grass/layer0, -/area/strata/ug/interior/jungle/platform/south) "bIv" = ( /obj/structure/barricade/handrail/strata{ dir = 4 @@ -18953,6 +14603,10 @@ /obj/structure/pipes/standard/simple/hidden/cyan, /turf/open/floor/strata/multi_tiles, /area/strata/ag/interior/mining_outpost/hive) +"bIN" = ( +/obj/structure/platform/metal/strata/west, +/turf/open/floor/prison/darkyellowfull2, +/area/strata/ag/interior/outpost/engi) "bIV" = ( /obj/structure/machinery/weather_siren{ pixel_y = -8 @@ -18990,6 +14644,12 @@ }, /turf/open/floor/strata/red1, /area/strata/ag/interior/outside/bball) +"bJv" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata/west, +/obj/structure/platform/stone/strata, +/turf/open/gm/river, +/area/strata/ag/exterior/landing_zones/near_lz2) "bJy" = ( /obj/structure/reagent_dispensers/water_cooler, /obj/structure/machinery/camera/autoname{ @@ -18997,12 +14657,6 @@ }, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outside/administration) -"bJz" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/canteen/personal_storage) "bJC" = ( /obj/effect/decal/cleanable/cobweb, /turf/open/floor/strata/fake_wood, @@ -19059,10 +14713,6 @@ /obj/structure/machinery/light, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outpost/med) -"bKa" = ( -/obj/item/clipboard, -/turf/open/floor/strata/floor3/east, -/area/strata/ag/interior/outpost/hallways/south) "bKb" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/strata/multi_tiles, @@ -19096,6 +14746,19 @@ }, /turf/open/floor/strata/white_cyan2, /area/strata/ag/interior/outpost/med) +"bKE" = ( +/obj/item/reagent_container/food/drinks/cans/waterbottle, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/security) +"bKF" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan{ + dir = 1 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/strata/red1, +/area/strata/ag/interior/outpost/security) "bKK" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -19150,13 +14813,6 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/floor/strata/floor2, /area/strata/ag/interior/outpost/med) -"bKT" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 4 - }, -/obj/effect/decal/strata_decals/catwalk/prison, -/turf/open/floor/greengrid, -/area/strata/ag/interior/outside/engineering/parts_storage) "bKZ" = ( /obj/structure/pipes/standard/simple/hidden/cyan, /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, @@ -19178,14 +14834,6 @@ /obj/structure/floodgate, /turf/closed/wall/strata_ice/dirty, /area/strata/ag/exterior/paths/north_outpost) -"bLk" = ( -/obj/effect/decal/strata_decals/catwalk/prison, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/multi_tiles/southwest, -/area/strata/ag/interior/outpost/hallways/south) "bLo" = ( /turf/open/floor/strata/multi_tiles/southeast, /area/strata/ag/interior/outpost/engi/drome) @@ -19193,15 +14841,13 @@ /obj/structure/bedsheetbin, /turf/open/floor/strata/floor3, /area/strata/ag/interior/outside/bball) +"bLw" = ( +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/mining_outpost/canteen) "bLz" = ( /obj/structure/flora/bush/ausbushes/ppflowers, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/outpost/platform) -"bLA" = ( -/obj/item/device/radio, -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/outpost/hallways/south) "bLB" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/paper_bin, @@ -19241,13 +14887,17 @@ "bMd" = ( /turf/open/asphalt/cement/cement4, /area/strata/ag/exterior/tcomms/mining_caves) +"bMD" = ( +/obj/structure/flora/grass/tallgrass/ice/corner{ + dir = 4 + }, +/obj/structure/platform_decoration/stone/strata/north, +/obj/effect/blocker/sorokyne_cold_water, +/turf/open/gm/river, +/area/strata/ag/exterior/paths/far_north_outpost) "bME" = ( /turf/closed/wall/strata_outpost, /area/strata/ag/interior/mountain) -"bMF" = ( -/obj/structure/window/framed/strata/reinforced, -/turf/open/floor/strata/multi_tiles/west, -/area/strata/ag/interior/outpost/canteen/personal_storage) "bMG" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/asphalt/cement/cement4, @@ -19275,12 +14925,6 @@ /obj/structure/machinery/vending/snack, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outside/administration) -"bMZ" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/snacks/meatballsoup, -/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, -/turf/open/floor/strata/cyan1/east, -/area/strata/ag/interior/mining_outpost/hallways) "bNa" = ( /obj/structure/machinery/door/airlock/almayer/generic, /turf/open/floor/strata/cyan2/east, @@ -19324,15 +14968,6 @@ /obj/structure/barricade/handrail/strata, /turf/open/floor/strata/multi_tiles/southeast, /area/strata/ug/interior/jungle/structures/research) -"bOj" = ( -/obj/effect/decal/strata_decals/catwalk/prison, -/obj/structure/disposalpipe/segment, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/platform_decoration/strata/metal, -/turf/open/floor/plating, -/area/strata/ag/exterior/outpost_decks) "bOp" = ( /obj/structure/prop/almayer/computers/mapping_computer, /obj/structure/blocker/invisible_wall, @@ -19427,9 +15062,6 @@ /obj/structure/machinery/vending/coffee, /turf/open/floor/strata/orange_cover, /area/strata/ag/interior/outpost/engi/drome) -"bPf" = ( -/turf/closed/wall/strata_outpost, -/area/strata/ag/interior/outpost/canteen/personal_storage) "bPn" = ( /obj/structure/bed/chair/office/dark{ dir = 1 @@ -19484,23 +15116,6 @@ /obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/plating, /area/strata/ag/exterior/jungle/carplake_center) -"bPX" = ( -/obj/structure/closet/secure_closet/personal, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/strata/blue1, -/area/strata/ag/interior/outpost/canteen/personal_storage) -"bPY" = ( -/obj/structure/closet/secure_closet/personal, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/prison/darkyellowfull2, -/area/strata/ag/interior/outpost/canteen/personal_storage) -"bPZ" = ( -/turf/open/floor/strata/multi_tiles/southwest, -/area/strata/ag/interior/outpost/canteen/personal_storage) "bQa" = ( /obj/structure/pipes/standard/manifold/hidden/cyan{ dir = 1 @@ -19564,24 +15179,6 @@ /obj/structure/flora/bush/ausbushes/reedbush, /turf/open/gm/river, /area/strata/ug/interior/jungle/structures/monitoring/south) -"bQS" = ( -/obj/item/stool, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/canteen/personal_storage) -"bQT" = ( -/obj/effect/decal/cleanable/blood, -/turf/open/floor/strata/multi_tiles/southwest, -/area/strata/ag/interior/outpost/hallways/north) -"bQU" = ( -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/canteen/personal_storage) -"bRb" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/spring_marshes) "bRf" = ( /obj/structure/machinery/power/apc/power/south, /turf/open/asphalt/cement, @@ -19663,14 +15260,6 @@ /obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outpost/engi/drome) -"bSD" = ( -/obj/effect/decal/strata_decals/catwalk/prison, -/obj/structure/disposalpipe/segment, -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/turf/open/floor/plating, -/area/strata/ag/exterior/outpost_decks) "bSE" = ( /obj/structure/machinery/space_heater, /obj/structure/barricade/handrail/strata{ @@ -19713,12 +15302,6 @@ /obj/structure/window/framed/strata/reinforced, /turf/open/floor/strata/multi_tiles/west, /area/strata/ag/interior/outside/checkpoints/north_armor) -"bTb" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/floor/prison/darkyellowfull2, -/area/strata/ag/exterior/outpost_decks) "bTk" = ( /obj/structure/machinery/light, /turf/open/floor/strata/floor3, @@ -19726,6 +15309,10 @@ "bTl" = ( /turf/open/floor/strata/floor3, /area/strata/ag/exterior/paths/north_outpost) +"bTs" = ( +/obj/structure/platform/metal/strata, +/turf/open/auto_turf/snow/brown_base/layer4, +/area/strata/ag/exterior/paths/flight_control_exterior) "bTD" = ( /obj/structure/sign/nosmoking_1, /turf/closed/wall/strata_outpost, @@ -19751,12 +15338,6 @@ /obj/effect/landmark/yautja_teleport, /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/paths/south_outpost) -"bUb" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/strata/blue1, -/area/strata/ag/interior/outpost/hallways/north) "bUd" = ( /obj/structure/barricade/handrail/strata{ dir = 1 @@ -19783,41 +15364,12 @@ "bUo" = ( /turf/open/floor/strata/floor3/east, /area/strata/ug/interior/jungle/structures/research) -"bUp" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_21" - }, -/turf/open/floor/strata/floor2, -/area/strata/ag/interior/outpost/hallways/south) "bUs" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 }, /turf/open/floor/strata/white_cyan1/east, /area/strata/ag/interior/mining_outpost/canteen) -"bUt" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan, -/turf/open/floor/strata/white_cyan1/east, -/area/strata/ag/interior/mining_outpost/hallways) -"bUu" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 1 - }, -/turf/open/floor/strata/white_cyan1/east, -/area/strata/ag/interior/mining_outpost/hallways) -"bUv" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/floor2, -/area/strata/ag/interior/outpost/hallways/south) -"bUx" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/floor/strata/floor3/east, -/area/strata/ag/exterior/outpost_decks) "bUF" = ( /turf/open/floor/strata/floor3, /area/strata/ug/interior/jungle/structures/research/old_tunnels) @@ -19835,6 +15387,10 @@ /obj/structure/machinery/cm_vending/sorted/boozeomat, /turf/open/floor/strata/white_cyan2/west, /area/strata/ag/interior/mining_outpost/central) +"bUQ" = ( +/obj/structure/platform/stone/strata, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/paths/flight_control_exterior) "bUU" = ( /obj/structure/surface/rack, /obj/structure/machinery/light/small{ @@ -19883,13 +15439,6 @@ }, /turf/open/floor/strata/fake_wood, /area/strata/ag/interior/outside/checkpoints/north_armor) -"bVc" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/floor/prison/darkyellowfull2, -/area/strata/ag/exterior/outpost_decks) "bVd" = ( /obj/effect/decal/cleanable/blood{ icon_state = "xgib6" @@ -19913,22 +15462,10 @@ /obj/structure/barricade/handrail/strata, /turf/open/floor/strata/red1, /area/strata/ag/interior/outpost/security) -"bVr" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor/colony{ - name = "\improper Airlock" - }, -/turf/open/floor/strata/multi_tiles/southeast, -/area/strata/ag/interior/outpost/hallways/north) -"bVs" = ( -/turf/open/floor/strata/multi_tiles/southeast, -/area/strata/ag/interior/outpost/hallways/north) -"bVw" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/obj/structure/curtain/open/shower, -/turf/open/floor/interior/plastic, -/area/strata/ag/interior/outpost/hallways/north) +"bVu" = ( +/obj/structure/platform_decoration/stone/strata, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/marsh/center) "bVx" = ( /obj/structure/blocker/invisible_wall, /turf/open/auto_turf/ice/layer1, @@ -19941,6 +15478,11 @@ /obj/item/clothing/gloves/latex, /turf/open/floor/strata/floor2, /area/strata/ag/interior/outpost/med) +"bVG" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/obj/structure/platform_decoration/metal/strata, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/engi) "bVL" = ( /obj/structure/surface/rack, /obj/item/storage/box/condimentbottles, @@ -19956,6 +15498,12 @@ /obj/effect/decal/strata_decals/catwalk/prison, /turf/open/floor/greengrid, /area/strata/ag/interior/outpost/engi) +"bVR" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan{ + dir = 8 + }, +/turf/open/floor/strata/orange_cover, +/area/strata/ag/interior/outpost/engi/drome) "bVU" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/flashlight/lamp, @@ -19971,23 +15519,9 @@ }, /turf/closed/wall/strata_outpost/reinforced, /area/strata/ag/interior/outpost/security) -"bVX" = ( -/turf/closed/wall/strata_outpost/reinforced, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) "bWa" = ( /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/caves/lz_caves) -"bWc" = ( -/obj/item/stack/sandbags, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/hallways/north) -"bWd" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor/colony{ - dir = 1; - name = "\improper Airlock" - }, -/turf/open/floor/strata/multi_tiles/southwest, -/area/strata/ag/interior/outpost/hallways/north) "bWe" = ( /obj/item/lightstick/red/spoke/planted{ layer = 3.1; @@ -20047,18 +15581,6 @@ }, /turf/open/floor/strata/orange_cover, /area/strata/ag/interior/outpost/engi/drome) -"bWE" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 8 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/north) -"bWH" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 8 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/admin) "bWK" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -20074,9 +15596,6 @@ }, /turf/open/floor/strata/multi_tiles/southeast, /area/strata/ag/interior/outpost/security) -"bWN" = ( -/turf/closed/wall/strata_outpost, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) "bWZ" = ( /turf/open/floor/strata/multi_tiles/west, /area/strata/ag/interior/outpost/engi/drome) @@ -20139,6 +15658,14 @@ /obj/effect/spawner/random/tool, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/structures/research/old_tunnels) +"bXI" = ( +/obj/structure/platform_decoration/stone/strata/east, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/landing_zones/near_lz2) +"bXO" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/white_cyan3/southwest, +/area/strata/ag/interior/outpost/med) "bXQ" = ( /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ug/interior/jungle/structures/research) @@ -20161,17 +15688,6 @@ /obj/structure/pipes/standard/simple/hidden/cyan, /turf/open/floor/plating, /area/strata/ag/interior/mining_outpost/central) -"bYg" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - dir = 4; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/turf/open/floor/prison/darkyellowfull2, -/area/strata/ag/exterior/outpost_decks) "bYk" = ( /obj/structure/machinery/door/airlock/almayer/security/colony{ dir = 8 @@ -20267,6 +15783,10 @@ /obj/structure/machinery/light/small, /turf/open/floor/strata/white_cyan2/west, /area/strata/ag/interior/outpost/engi/drome) +"bZg" = ( +/obj/structure/platform/metal/strata/north, +/turf/open/auto_turf/strata_grass/layer0_mud_alt, +/area/strata/ug/interior/jungle/structures/research/old_tunnels) "bZh" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/strata/red1, @@ -20282,10 +15802,6 @@ }, /turf/open/floor/prison/darkyellowfull2, /area/strata/ag/exterior/outpost_decks) -"bZB" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) "bZC" = ( /obj/structure/machinery/light/small, /turf/open/floor/strata/white_cyan2/west, @@ -20293,19 +15809,6 @@ "bZD" = ( /turf/open/floor/strata/floor3, /area/strata/ag/interior/outpost/security) -"bZE" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/obj/effect/landmark/survivor_spawner, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"bZG" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) "bZH" = ( /obj/structure/sign/safety/galley, /turf/closed/wall/strata_outpost, @@ -20317,19 +15820,9 @@ /obj/item/device/whistle, /turf/open/floor/interior/tatami, /area/strata/ag/interior/outpost/canteen) -"bZL" = ( -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/floor/strata, -/area/strata/ag/exterior/outpost_decks) "bZN" = ( /turf/open/floor/strata, /area/strata/ug/interior/jungle/structures/research/old_tunnels) -"bZT" = ( -/obj/structure/platform/strata/metal, -/turf/open/auto_turf/strata_grass/layer0, -/area/strata/ug/interior/outpost/platform) "bZV" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 @@ -20357,10 +15850,6 @@ }, /turf/open/floor/strata/floor3, /area/strata/ag/interior/outpost/security) -"cad" = ( -/obj/structure/pipes/standard/manifold/fourway/hidden/cyan, -/turf/open/floor/strata/red1, -/area/strata/ag/interior/outpost/hallways/north) "caf" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 @@ -20382,12 +15871,6 @@ }, /turf/open/floor/strata/red1, /area/strata/ag/interior/outpost/security) -"cam" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) "cao" = ( /obj/structure/machinery/cm_vending/sorted/marine_food, /turf/open/floor/interior/plastic, @@ -20396,6 +15879,10 @@ /obj/structure/surface/table/woodentable, /turf/open/floor/interior/plastic, /area/strata/ag/interior/outpost/canteen) +"caw" = ( +/obj/effect/sentry_landmark/lz_2/bottom_left, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/landing_zones/near_lz2) "cay" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 @@ -20411,18 +15898,6 @@ "caE" = ( /turf/open/floor/strata/red1, /area/strata/ag/interior/mining_outpost/central) -"caI" = ( -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/turf/open/floor/prison/darkyellowfull2, -/area/strata/ag/exterior/paths/flight_control_exterior) -"caL" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) "caM" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic, /turf/open/floor/strata/multi_tiles/southeast, @@ -20466,10 +15941,6 @@ /obj/structure/barricade/handrail/strata, /turf/open/floor/strata/floor3, /area/strata/ag/interior/outpost/security) -"cbz" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan, -/turf/open/floor/strata/white_cyan1/east, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) "cbE" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -20479,6 +15950,11 @@ "cbF" = ( /turf/closed/wall/strata_outpost, /area/strata/ug/interior/jungle/structures/ruin) +"cbH" = ( +/obj/structure/platform/metal/strata/north, +/obj/structure/largecrate/random/barrel/white, +/turf/open/floor/strata/multi_tiles/southwest, +/area/strata/ag/exterior/outpost_decks) "cbL" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 4 @@ -20542,21 +16018,6 @@ /obj/structure/window/framed/strata/reinforced, /turf/open/floor/strata/multi_tiles/west, /area/strata/ag/interior/outpost/security) -"ccp" = ( -/turf/open/floor/strata/white_cyan1/east, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"ccq" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/trash/plate{ - pixel_x = 1; - pixel_y = 3 - }, -/obj/item/reagent_container/food/condiment/saltshaker, -/turf/open/floor/strata/blue1, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"ccr" = ( -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) "ccs" = ( /turf/open/floor/strata, /area/strata/ag/exterior/paths/flight_control_exterior) @@ -20585,26 +16046,6 @@ }, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/structures/research/south) -"ccH" = ( -/obj/effect/decal/strata_decals/catwalk/prison, -/obj/structure/disposalpipe/segment, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/turf/open/floor/plating, -/area/strata/ag/exterior/outpost_decks) -"ccI" = ( -/obj/effect/particle_effect/steam, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata, -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/river) "ccV" = ( /obj/structure/machinery/weather_siren{ dir = 1; @@ -20645,9 +16086,6 @@ }, /turf/open/floor/strata/red1, /area/strata/ag/interior/outpost/security) -"cdh" = ( -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) "cdj" = ( /obj/structure/bed/chair{ dir = 4 @@ -20773,12 +16211,6 @@ /obj/structure/machinery/smartfridge/drinks, /turf/open/floor/strata/orange_tile, /area/strata/ag/interior/mining_outpost/central) -"ceu" = ( -/obj/effect/decal/cleanable/blood, -/obj/item/tool/match, -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/mining_outpost/hallways) "cew" = ( /obj/structure/window/framed/strata/reinforced, /obj/structure/machinery/door/poddoor/shutters/almayer, @@ -20794,19 +16226,12 @@ }, /turf/open/floor/strata/red1, /area/strata/ag/interior/outpost/security) -"ceK" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/strata/red1, -/area/strata/ag/interior/outpost/hallways/north) -"ceL" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan, -/turf/open/floor/strata/red1, -/area/strata/ag/interior/outpost/hallways/north) +"ceJ" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/structure/largecrate/random, +/obj/structure/platform/metal/strata/west, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/interior/outside/engineering/parts_storage_cave) "ceM" = ( /obj/structure/pipes/standard/simple/hidden/cyan, /turf/open/floor/strata/multi_tiles/southeast, @@ -20819,12 +16244,6 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/structures/research/south) -"ceV" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/orange_edge/east, -/area/strata/ag/interior/mining_outpost/hallways) "ceW" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/structure/machinery/vending/cola, @@ -20883,22 +16302,6 @@ "cfx" = ( /turf/open/floor/strata, /area/strata/ag/interior/outpost/security) -"cfz" = ( -/obj/item/reagent_container/food/drinks/cans/waterbottle, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/north) -"cfB" = ( -/obj/effect/decal/cleanable/blood{ - icon_state = "xgibdown1" - }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/north) -"cfC" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) "cfD" = ( /obj/structure/machinery/vending/snack, /obj/structure/machinery/light/small{ @@ -20950,34 +16353,6 @@ /obj/structure/fence, /turf/open/floor/strata/multi_tiles/west, /area/strata/ag/interior/outpost/engi/drome) -"cge" = ( -/obj/structure/window/reinforced/tinted, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" - }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/admin) -"cgg" = ( -/obj/structure/window/reinforced/tinted, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/admin) -"cgm" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/food/condiment/peppermill, -/obj/effect/decal/cleanable/blood/gibs/down, -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/outpost/hallways/north) -"cgn" = ( -/obj/effect/decal/cleanable/blood, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/hallways/north) -"cgo" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) "cgp" = ( /obj/structure/bed/chair/comfy, /obj/structure/barricade/handrail/strata{ @@ -21039,11 +16414,6 @@ /obj/effect/landmark/objective_landmark/far, /turf/open/floor/strata/white_cyan2/west, /area/strata/ag/interior/outpost/admin) -"cgW" = ( -/obj/effect/decal/cleanable/blood, -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) "cgX" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/drinks/coffee, @@ -21219,14 +16589,6 @@ "cjb" = ( /turf/open/floor/strata, /area/strata/ag/interior/mining_outpost/flight_control) -"cjg" = ( -/obj/effect/decal/strata_decals/catwalk/prison, -/obj/structure/disposalpipe/segment, -/obj/structure/platform_decoration/strata/metal{ - dir = 8 - }, -/turf/open/floor/plating, -/area/strata/ag/exterior/outpost_decks) "cji" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -21244,13 +16606,15 @@ }, /turf/open/floor/strata/white_cyan1/east, /area/strata/ag/interior/outpost/canteen/bar) -"cjl" = ( -/obj/structure/bed/chair, -/turf/open/floor/strata/white_cyan1/east, -/area/strata/ag/interior/outpost/hallways/north) "cjn" = ( /turf/closed/wall/strata_outpost, /area/strata/ag/interior/outpost/canteen) +"cjo" = ( +/obj/structure/platform_decoration/metal/strata/east, +/obj/structure/flora/grass/tallgrass/ice, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/paths/flight_control_exterior) "cjq" = ( /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/interior/outside/bball) @@ -21278,12 +16642,6 @@ }, /turf/open/asphalt/cement, /area/strata/ag/exterior/paths/mining_outpost_exterior) -"cjz" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - dir = 1 - }, -/turf/open/floor/strata/multi_tiles/west, -/area/strata/ag/interior/mining_outpost/hallways) "cjA" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 @@ -21299,29 +16657,6 @@ }, /turf/open/asphalt/cement, /area/strata/ag/exterior/paths/flight_control_exterior) -"cjG" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/obj/structure/largecrate/random/barrel/white, -/turf/open/floor/strata/multi_tiles/southwest, -/area/strata/ag/exterior/outpost_decks) -"cjH" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/floor/strata/multi_tiles/southwest, -/area/strata/ag/exterior/outpost_decks) -"cjI" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/obj/structure/machinery/colony_floodlight, -/turf/open/floor/strata/multi_tiles/southwest, -/area/strata/ag/exterior/outpost_decks) "cjN" = ( /obj/structure/window/framed/strata, /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -21350,25 +16685,6 @@ }, /turf/open/floor/strata/multi_tiles/west, /area/strata/ag/interior/outpost/med) -"cjU" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/white_cyan3/north, -/area/strata/ag/interior/outpost/hallways/south) -"cjV" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan, -/turf/open/floor/strata/white_cyan3/north, -/area/strata/ag/interior/outpost/hallways/south) -"cjW" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/strata/white_cyan3/north, -/area/strata/ag/interior/outpost/hallways/south) "cjZ" = ( /obj/structure/window/framed/strata, /turf/open/floor/strata/multi_tiles/west, @@ -21395,28 +16711,14 @@ /obj/item/stool, /turf/open/floor/strata/floor3, /area/strata/ag/interior/outpost/canteen/bar) -"ckf" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) -"ckx" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 10 - }, -/turf/open/floor/strata/white_cyan3/north, -/area/strata/ag/interior/outpost/hallways/south) -"ckz" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/paper_bin, -/obj/item/tool/pen/blue, -/obj/item/phone{ - pixel_x = 8; - pixel_y = 6 +"ckl" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/effect/decal/cleanable/blood{ + dir = 4; + icon_state = "gib6" }, -/turf/open/floor/strata/white_cyan4/north, -/area/strata/ag/interior/outpost/hallways/south) +/turf/open/floor/greengrid, +/area/strata/ag/interior/mining_outpost/central) "ckA" = ( /obj/structure/surface/rack, /obj/item/paper_bin, @@ -21474,12 +16776,6 @@ /obj/structure/machinery/light_switch, /turf/closed/wall/strata_outpost, /area/strata/ag/interior/outpost/canteen/bar) -"ckM" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/white_cyan1/east, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) "ckN" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 @@ -21515,27 +16811,11 @@ }, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/interior/outpost/engi/drome) -"cle" = ( -/obj/effect/decal/strata_decals/catwalk/prison, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/multi_tiles/southwest, -/area/strata/ag/interior/outpost/hallways/south) "clg" = ( /turf/closed/shuttle/ert{ icon_state = "upp22" }, /area/strata/ag/interior/outpost/engi/drome/shuttle) -"cll" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 9 - }, -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/outpost/hallways/south) "clo" = ( /obj/structure/surface/table/reinforced/prison, /turf/open/floor/almayer/plate, @@ -21555,13 +16835,6 @@ icon_state = "upp23" }, /area/strata/ag/interior/outpost/engi/drome/shuttle) -"clv" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/outpost/hallways/south) "clw" = ( /obj/structure/pipes/standard/simple/hidden/cyan, /obj/structure/machinery/camera/autoname{ @@ -21599,10 +16872,6 @@ /obj/structure/bed/nest, /turf/closed/wall/strata_outpost/reinforced, /area/strata/ag/interior/mining_outpost/hive) -"clI" = ( -/obj/structure/machinery/vending/dinnerware, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) "clK" = ( /obj/structure/curtain/shower, /turf/open/floor/strata/blue1, @@ -21662,29 +16931,6 @@ "cmA" = ( /turf/open/asphalt/cement/cement12, /area/strata/ag/interior/landing_zones/lz1) -"cmB" = ( -/obj/structure/bed/nest, -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/floor/strata/multi_tiles, -/area/strata/ag/interior/mining_outpost/hive) -"cmC" = ( -/obj/structure/machinery/light/small, -/turf/open/floor/strata, -/area/strata/ag/interior/mining_outpost/hallways) -"cmD" = ( -/obj/effect/decal/strata_decals/grime/grime3{ - dir = 8 - }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/mining_outpost/hallways) -"cmE" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 - }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/mining_outpost/hallways) "cmF" = ( /obj/structure/surface/rack, /obj/item/inflatable/door, @@ -21705,16 +16951,6 @@ /obj/effect/decal/strata_decals/catwalk/prison, /turf/open/floor/plating, /area/strata/ag/exterior/outpost_decks) -"cnb" = ( -/obj/effect/decal/strata_decals/catwalk/prison, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/turf/open/floor/plating, -/area/strata/ag/exterior/outpost_decks) "cnc" = ( /obj/item/storage/box/rxglasses, /turf/open/floor/strata/white_cyan2/west, @@ -21730,34 +16966,6 @@ }, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/interior/outpost/med) -"cne" = ( -/obj/structure/machinery/camera/autoname{ - dir = 4 - }, -/turf/open/floor/strata/white_cyan4/east, -/area/strata/ag/interior/outpost/hallways/south) -"cnf" = ( -/obj/effect/decal/cleanable/greenglow, -/turf/open/floor/strata/white_cyan3, -/area/strata/ag/interior/outpost/hallways/south) -"cng" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/white_cyan3, -/area/strata/ag/interior/outpost/hallways/south) -"cnh" = ( -/obj/structure/machinery/light, -/turf/open/floor/strata/white_cyan3, -/area/strata/ag/interior/outpost/hallways/south) -"cni" = ( -/obj/structure/bed/roller, -/turf/open/floor/strata/white_cyan3, -/area/strata/ag/interior/outpost/hallways/south) -"cnk" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/turf/open/floor/strata/white_cyan3/east, -/area/strata/ag/interior/outpost/hallways/south) "cnm" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 10 @@ -21862,30 +17070,9 @@ /obj/item/stack/sheet/wood, /turf/open/floor/strata/white_cyan2/west, /area/strata/ag/interior/outpost/canteen/bar) -"col" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - icon_state = "p_stair_sn_full_cap" - }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/north) "cor" = ( /turf/open/gm/coast/west, /area/strata/ug/interior/jungle/carplake/north) -"cot" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 1 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/landing_zones/near_lz1) -"cou" = ( -/obj/effect/particle_effect/steam, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/river) "cov" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 @@ -21928,6 +17115,14 @@ /obj/structure/bed/chair/office/light, /turf/open/floor/strata, /area/strata/ag/interior/mining_outpost/flight_control) +"coQ" = ( +/obj/structure/pipes/vents/pump{ + dir = 8 + }, +/obj/effect/landmark/xeno_hive_spawn, +/obj/effect/landmark/ert_spawns/groundside_xeno, +/turf/open/floor/strata/white_cyan2/west, +/area/strata/ag/interior/mining_outpost/canteen) "coS" = ( /obj/structure/window/framed/strata/reinforced, /turf/open/floor/strata/floor3, @@ -21997,12 +17192,6 @@ /obj/effect/landmark/objective_landmark/far, /turf/open/floor/strata/red1, /area/strata/ag/interior/mining_outpost/flight_control) -"cpR" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/floor/strata/red1, -/area/strata/ag/interior/landing_zones/near_lz1) "cpU" = ( /turf/closed/wall/strata_outpost, /area/strata/ag/interior/outpost/maint) @@ -22033,25 +17222,27 @@ }, /turf/open/asphalt/cement, /area/strata/ag/interior/outside/administration) -"cqu" = ( -/obj/structure/platform_decoration/strata/metal{ +"cqB" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/communications{ + dir = 8; + icon_state = "commb" + }, +/obj/structure/pipes/standard/simple/hidden/cyan, +/obj/structure/barricade/handrail/strata{ dir = 4 }, -/turf/open/floor/strata/red1, -/area/strata/ag/interior/landing_zones/near_lz1) +/turf/open/floor/strata/orange_cover, +/area/strata/ag/interior/outpost/engi/drome) +"cqC" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata/multi_tiles/west, +/area/strata/ag/interior/outpost/med) "cqE" = ( /turf/open/floor/strata, /area/strata/ag/interior/landing_zones/near_lz1) -"cqG" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/river) "cqH" = ( /turf/open/floor/strata, /area/strata/ag/interior/outside/administration) @@ -22072,21 +17263,17 @@ "crb" = ( /turf/open/asphalt/cement/cement4, /area/strata/ag/interior/landing_zones/lz1) -"crd" = ( -/obj/effect/decal/strata_decals/catwalk/prison, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/outpost/hallways/south) -"crf" = ( -/obj/effect/decal/strata_decals/catwalk/prison, -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/outpost/hallways/south) "crk" = ( /obj/effect/glowshroom/single, /turf/open/asphalt/cement/cement12, /area/strata/ag/exterior/caves/lz_caves) +"cro" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/west, +/obj/structure/platform/stone/strata, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/spring_marshes) "crp" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor/colony{ name = "\improper Airlock" @@ -22118,16 +17305,6 @@ "crE" = ( /turf/open/floor/plating, /area/strata/ag/interior/landing_zones/lz1) -"crF" = ( -/obj/structure/pipes/vents/pump, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/hallways/south) -"crG" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/hallways/south) "crN" = ( /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/marsh/river) @@ -22164,9 +17341,6 @@ "crY" = ( /turf/closed/wall/strata_outpost/reinforced, /area/strata/ag/interior/mining_outpost/central) -"csi" = ( -/turf/open/floor/strata/floor3/east, -/area/strata/ag/interior/outpost/canteen) "csj" = ( /obj/structure/bed{ icon_state = "abed" @@ -22192,12 +17366,6 @@ }, /turf/open/floor/strata/floor3, /area/strata/ag/interior/landing_zones/near_lz1) -"csu" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/floor3/east, -/area/strata/ag/interior/outpost/hallways/south) "csA" = ( /obj/structure/bed/chair/office/light{ dir = 8 @@ -22254,10 +17422,6 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/strata/fake_wood, /area/strata/ag/interior/outpost/engi/drome) -"csV" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/floor3/east, -/area/strata/ag/interior/outpost/canteen) "csW" = ( /obj/structure/bed/chair/comfy{ dir = 1 @@ -22292,16 +17456,6 @@ }, /turf/open/floor/strata, /area/strata/ag/interior/landing_zones/near_lz1) -"cti" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/auto_turf/strata_grass/layer0, -/area/strata/ug/interior/jungle/platform/east) "ctl" = ( /obj/structure/machinery/vending/snack, /obj/structure/machinery/light, @@ -22317,12 +17471,6 @@ /obj/structure/machinery/light, /turf/open/floor/strata/fake_wood, /area/strata/ag/interior/mining_outpost/central) -"ctp" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/turf/open/floor/strata/floor2, -/area/strata/ag/interior/outpost/hallways/south) "ctx" = ( /turf/open/floor/strata/orange_cover, /area/strata/ag/exterior/marsh/river) @@ -22358,13 +17506,6 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/strata/orange_cover, /area/strata/ag/interior/mining_outpost/central) -"ctH" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 4 - }, -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/auto_turf/strata_grass/layer0, -/area/strata/ug/interior/jungle/platform/east) "ctI" = ( /obj/structure/pipes/standard/simple/hidden/cyan, /turf/open/asphalt/cement/cement3, @@ -22379,20 +17520,6 @@ "ctS" = ( /turf/open/floor/strata/fake_wood, /area/strata/ag/interior/outside/administration) -"ctZ" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 8 - }, -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/auto_turf/strata_grass/layer0, -/area/strata/ug/interior/jungle/platform/east) -"cuc" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/auto_turf/strata_grass/layer0, -/area/strata/ug/interior/jungle/platform/east) "cui" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 @@ -22403,12 +17530,12 @@ /obj/effect/decal/cleanable/blood/gibs/limb, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ug/interior/outpost/platform) -"cuy" = ( -/obj/structure/platform/strata{ - dir = 1 +"cuw" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan{ + dir = 8 }, -/turf/open/auto_turf/ice/layer1, -/area/strata/ag/exterior/marsh/spring_marshes) +/turf/open/floor/strata/white_cyan2/west, +/area/strata/ag/interior/mining_outpost/canteen) "cuz" = ( /obj/structure/extinguisher_cabinet, /turf/closed/wall/strata_outpost/reinforced, @@ -22425,6 +17552,10 @@ }, /turf/open/floor/strata/multi_tiles/southeast, /area/strata/ag/interior/outside/checkpoints/north) +"cuE" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan, +/turf/open/floor/prison/darkyellowfull2, +/area/strata/ag/interior/outpost/engi) "cuH" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -22438,6 +17569,10 @@ "cuP" = ( /turf/open/floor/strata, /area/strata/ag/exterior/outpost_decks) +"cuT" = ( +/obj/structure/platform/metal/strata/east, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/caves/shed_five_caves) "cuX" = ( /obj/structure/pipes/standard/simple/hidden/cyan, /turf/open/floor/strata, @@ -22453,12 +17588,6 @@ "cva" = ( /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/exterior/outpost_decks) -"cvb" = ( -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/turf/open/floor/strata/multi_tiles/southwest, -/area/strata/ag/exterior/outpost_decks) "cvc" = ( /obj/item/cell/high, /turf/open/floor/strata/white_cyan2/west, @@ -22476,15 +17605,6 @@ }, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/interior/outpost/med) -"cve" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 8 - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/strata/red1, -/area/strata/ag/interior/landing_zones/near_lz1) "cvf" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -22498,19 +17618,13 @@ }, /turf/open/floor/strata/cyan1/east, /area/strata/ag/interior/outpost/med) -"cvl" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor, -/turf/open/floor/strata/multi_tiles/southeast, -/area/strata/ag/interior/outpost/hallways/south) +"cvm" = ( +/obj/structure/curtain/open/shower, +/turf/open/floor/interior/plastic, +/area/strata/ag/interior/outpost/canteen) "cvn" = ( /turf/open/auto_turf/ice/layer0, /area/strata/ag/interior/outside/engineering/parts_storage_cave) -"cvA" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/hallways/south) "cvC" = ( /obj/structure/closet/firecloset/full, /turf/open/floor/strata/orange_cover, @@ -22518,13 +17632,6 @@ "cvG" = ( /turf/open/gm/coast/west, /area/strata/ag/exterior/jungle/carplake_center) -"cvY" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 4 - }, -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/auto_turf/strata_grass/layer1, -/area/strata/ug/interior/jungle/platform/east) "cwd" = ( /obj/structure/machinery/door/airlock/almayer/maint/colony{ dir = 2 @@ -22546,12 +17653,21 @@ /obj/structure/flora/bush/ausbushes/grassybush, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/platform/east) +"cwr" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/obj/structure/inflatable/popped, +/turf/open/floor/strata/multi_tiles, +/area/strata/ag/interior/outpost/foyer) "cww" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 5 }, /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/marsh/relay_marshes) +"cwA" = ( +/obj/structure/platform/metal/strata, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/paths/south_outpost) "cwD" = ( /turf/open/gm/dirt, /area/strata/ug/interior/jungle/structures/monitoring/west) @@ -22570,9 +17686,6 @@ "cwT" = ( /turf/closed/wall/strata_outpost/reinforced, /area/strata/ag/interior/outside/checkpoints/south) -"cxa" = ( -/turf/open/floor/strata/multi_tiles/west, -/area/strata/ag/interior/outpost/hallways/north) "cxf" = ( /obj/structure/machinery/vending/cigarette/colony, /turf/open/floor/strata/red1, @@ -22581,16 +17694,22 @@ /obj/structure/window/framed/strata, /turf/open/floor/strata/multi_tiles/southeast, /area/strata/ag/interior/outside/checkpoints/south) +"cxl" = ( +/obj/structure/platform/metal/strata/north, +/turf/open/floor/strata/red3, +/area/strata/ag/interior/outpost/med) "cxn" = ( /obj/structure/machinery/light{ dir = 1 }, /turf/open/asphalt/cement/cement14, /area/strata/ag/exterior/marsh/spring_marshes) -"cxx" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan, -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/outpost/hallways/south) +"cxr" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan{ + dir = 8 + }, +/turf/open/floor/strata/fake_wood, +/area/strata/ag/interior/outpost/admin) "cxA" = ( /turf/open/gm/coast/beachcorner/south_west, /area/strata/ag/exterior/jungle/carplake_center) @@ -22631,6 +17750,12 @@ }, /turf/open/floor/strata/multi_tiles/southeast, /area/strata/ag/interior/outpost/med) +"cyM" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/canteen) "cyQ" = ( /obj/structure/window/framed/strata, /turf/open/floor/strata, @@ -22649,6 +17774,10 @@ /obj/item/clothing/glasses/thermal/syndi, /turf/open/floor/strata/purp1, /area/strata/ug/interior/jungle/structures/monitoring) +"czT" = ( +/obj/structure/pipes/standard/manifold/fourway/hidden/cyan, +/turf/open/floor/strata/red1, +/area/strata/ag/interior/outpost/security) "cAq" = ( /obj/structure/flora/grass/tallgrass/ice, /turf/open/auto_turf/ice/layer1, @@ -22659,21 +17788,31 @@ /obj/structure/pipes/standard/simple/hidden/cyan, /turf/open/floor/plating, /area/strata/ag/interior/outside/engineering/parts_storage) -"cAw" = ( -/obj/item/stack/rods, -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 8 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/north) "cAK" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /turf/open/auto_turf/strata_grass/layer0, /area/strata/ug/interior/jungle/structures/monitoring/east) +"cBb" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/strata/west, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/admin) +"cBs" = ( +/obj/structure/platform_decoration/metal/strata/east, +/turf/open/auto_turf/snow/brown_base/layer3, +/area/strata/ag/exterior/paths/flight_control_exterior) "cBv" = ( /obj/item/stack/sheet/metal/medium_stack, /turf/open/auto_turf/strata_grass/layer0, /area/strata/ug/interior/outpost/platform) +"cBI" = ( +/obj/structure/machinery/light, +/turf/open/floor/strata/white_cyan2/west, +/area/strata/ag/interior/outpost/canteen) "cCE" = ( /obj/structure/cargo_container/watatsumi/right, /turf/open/auto_turf/strata_grass/layer1, @@ -22690,21 +17829,19 @@ /obj/item/lightstick/red/planted, /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/marsh/spring_marshes) -"cEa" = ( -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/north) +"cEs" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor/colony{ + dir = 1; + name = "\improper Airlock" + }, +/turf/open/floor/strata/multi_tiles/southwest, +/area/strata/ag/interior/outpost/canteen) "cEu" = ( /obj/structure/bed/nest, /obj/effect/decal/cleanable/blood/gibs/core, /obj/effect/landmark/corpsespawner/chef, /turf/open/floor/strata/multi_tiles, /area/strata/ag/interior/mining_outpost/hive) -"cFg" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata, -/turf/open/gm/river, -/area/strata/ag/exterior/landing_zones/near_lz2) "cFj" = ( /obj/structure/machinery/disposal, /turf/open/floor/strata/floor2, @@ -22720,15 +17857,22 @@ /obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/strata, /area/strata/ag/interior/outside/engineering/parts_storage) +"cGu" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/orange_edge/east, +/area/strata/ag/interior/mining_outpost/central) "cGL" = ( /obj/structure/closet/bodybag, /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/strata/cyan3/east, /area/strata/ag/interior/outpost/med) -"cHm" = ( -/obj/item/weapon/gun/pistol/t73, -/turf/open/floor/strata/white_cyan1/east, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) +"cGV" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/mining_outpost/central) "cHK" = ( /obj/structure/flora/pottedplant/random, /obj/structure/barricade/handrail/strata{ @@ -22740,6 +17884,10 @@ /obj/structure/pipes/standard/manifold/hidden/cyan, /turf/open/floor/strata/blue1, /area/strata/ag/interior/outpost/admin) +"cII" = ( +/obj/structure/bed/roller, +/turf/open/floor/strata/white_cyan3, +/area/strata/ag/interior/outpost/med) "cIM" = ( /obj/structure/machinery/door/airlock/prison{ dir = 1; @@ -22761,6 +17909,10 @@ /obj/item/reagent_container/food/drinks/bottle/sake, /turf/open/floor/strata/floor2, /area/strata/ag/interior/outpost/med) +"cKk" = ( +/obj/structure/machinery/vending/snack, +/turf/open/floor/strata/white_cyan1/east, +/area/strata/ag/interior/outpost/canteen) "cKS" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/structure/disposalpipe/segment, @@ -22779,22 +17931,30 @@ /obj/structure/barricade/handrail/strata, /turf/open/floor/strata/multi_tiles, /area/strata/ag/interior/mining_outpost/hive) -"cNg" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ - dir = 8 - }, -/obj/structure/platform/strata{ - dir = 4 +"cMP" = ( +/obj/structure/machinery/light/small{ + dir = 1 }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/river) +/obj/structure/platform_decoration/metal/strata/east, +/turf/open/floor/strata/floor3/east, +/area/strata/ug/interior/jungle/structures/ruin) "cOc" = ( /obj/structure/blocker/invisible_wall, /obj/structure/flora/bush/ausbushes/reedbush, /turf/open/gm/river, /area/strata/ug/interior) +"cOe" = ( +/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/strata/white_cyan1/east, +/area/strata/ag/interior/outpost/canteen) +"cOk" = ( +/obj/structure/platform/stone/strata/east, +/obj/structure/blocker/invisible_wall, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/water) "cOB" = ( /obj/effect/spawner/random/tool, /turf/open/floor/strata/multi_tiles/southwest, @@ -22802,12 +17962,6 @@ "cOI" = ( /turf/open/asphalt/cement/cement14, /area/strata/ag/exterior/landing_zones/lz2) -"cOR" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/white_cyan3/west, -/area/strata/ag/interior/outpost/hallways/south) "cOV" = ( /obj/structure/toilet{ dir = 8 @@ -22818,6 +17972,14 @@ /obj/structure/prop/ice_colony/surveying_device, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ug/interior/jungle/structures/monitoring) +"cPG" = ( +/obj/structure/platform/metal/strata, +/turf/open/floor/strata/orange_cover, +/area/strata/ag/interior/landing_zones/near_lz1) +"cPK" = ( +/obj/structure/platform_decoration/metal/strata/north, +/turf/open/floor/strata, +/area/strata/ag/interior/landing_zones/near_lz1) "cRw" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/strata/floor3/east, @@ -22833,9 +17995,6 @@ /obj/structure/machinery/vending/coffee, /turf/open/floor/strata/orange_cover, /area/strata/ag/interior/outpost/engi/drome) -"cSx" = ( -/turf/open/floor/strata/cyan2/east, -/area/strata/ag/interior/outpost/hallways/south) "cSP" = ( /obj/structure/prop/almayer/hangar_stencil, /obj/structure/pipes/standard/simple/hidden/cyan{ @@ -22843,6 +18002,19 @@ }, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outpost/engi/drome) +"cTE" = ( +/obj/structure/largecrate/random, +/obj/item/storage/belt/utility/full, +/obj/structure/platform/stone/strata, +/obj/structure/platform/stone/strata/west, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/marsh/river) +"cTL" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan{ + dir = 1 + }, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/engi) "cTN" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/objective{ @@ -22886,6 +18058,11 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, /turf/open/auto_turf/ice/layer1, /area/strata/ag/interior/outside/bball/cave) +"cVW" = ( +/obj/effect/decal/cleanable/generic, +/obj/structure/platform_decoration/stone/strata/north, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/marsh/spring_marshes) "cVZ" = ( /obj/structure/flora/grass/tallgrass/ice, /turf/open/auto_turf/snow/brown_base/layer1, @@ -22903,21 +18080,23 @@ /obj/item/tool/pen/blue, /turf/open/floor/strata/orange_cover, /area/strata/ag/interior/outpost/engi/drome) -"cXm" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/white_cyan1/east, -/area/strata/ag/interior/outpost/hallways/north) +"cWv" = ( +/obj/structure/closet/secure_closet/personal, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/canteen) +"cXx" = ( +/obj/structure/closet/secure_closet/personal, +/turf/open/floor/prison/darkyellowfull2, +/area/strata/ag/interior/outpost/canteen) +"cXN" = ( +/obj/structure/platform/metal/strata/north, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/paths/mining_outpost_exterior) "cXU" = ( /turf/closed/shuttle/ert{ icon_state = "upp2" }, /area/strata/ag/exterior/marsh/crash) -"cYw" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/south) "cYx" = ( /obj/structure/barricade/handrail/strata{ dir = 1 @@ -22930,6 +18109,16 @@ /obj/structure/pipes/standard/manifold/hidden/cyan, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/interior/mining_outpost/hive) +"cZd" = ( +/obj/structure/pipes/vents/pump/on, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/mining_outpost/south_dormitories) +"cZv" = ( +/obj/structure/barricade/deployable{ + dir = 1 + }, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/canteen) "cZH" = ( /obj/structure/machinery/landinglight/ds1/delaythree{ dir = 8 @@ -22943,12 +18132,13 @@ "daq" = ( /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/carplake/east) -"dbg" = ( -/obj/structure/platform_decoration/strata{ - dir = 1 +"dbd" = ( +/obj/structure/closet/secure_closet/personal, +/obj/structure/machinery/light{ + dir = 4 }, -/turf/open/auto_turf/ice/layer1, -/area/strata/ag/exterior/marsh/spring_marshes) +/turf/open/floor/strata/multi_tiles/southwest, +/area/strata/ag/interior/outpost/canteen) "dbv" = ( /obj/item/weapon/gun/revolver/cmb, /obj/structure/surface/rack{ @@ -22960,6 +18150,10 @@ /obj/structure/machinery/light, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outside/engineering/parts_storage) +"dca" = ( +/obj/structure/platform/stone/strata, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/landing_zones/near_lz2) "dcc" = ( /obj/structure/bed/chair/office/light{ dir = 8 @@ -22969,25 +18163,28 @@ }, /turf/open/floor/strata, /area/strata/ug/interior/outpost/underground_dorms/admin1) +"dcv" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 4; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/strata/east, +/turf/open/floor/strata/orange_cover, +/area/strata/ag/interior/outpost/admin) "dcX" = ( /obj/structure/surface/rack, /obj/item/stack/folding_barricade, /obj/effect/landmark/objective_landmark/close, /turf/open/floor/strata/red1, /area/strata/ag/interior/outside/checkpoints/north_armor) +"dcZ" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/orange_cover, +/area/strata/ag/interior/mining_outpost/central) "ddp" = ( /turf/closed/wall/strata_outpost/reinforced, /area/strata/ag/interior/mining_outpost/hive) -"ddI" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/obj/structure/barricade/handrail/strata{ - dir = 1 - }, -/obj/structure/barricade/handrail/strata{ - dir = 4 - }, -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/outpost/hallways/south) "ddK" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 @@ -23048,6 +18245,12 @@ "djW" = ( /turf/closed/wall/strata_ice/dirty, /area/strata/ag/exterior/paths/north_outpost) +"dkp" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/condiment/peppermill, +/obj/item/device/encryptionkey/dutch, +/turf/open/floor/strata/cyan1/east, +/area/strata/ag/interior/outpost/canteen) "dks" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/almayer/test_floor5, @@ -23057,22 +18260,21 @@ /obj/effect/spawner/random/toolbox, /turf/open/floor/strata/orange_cover, /area/strata/ag/interior/outside/engineering/parts_storage) +"dlb" = ( +/obj/item/lightstick/red/planted, +/obj/structure/platform/metal/strata/north, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/paths/mining_outpost_exterior) "dlL" = ( /obj/structure/flora/grass/tallgrass/jungle, /turf/open/auto_turf/strata_grass/layer0, /area/strata/ug/interior/outpost/platform) -"dmd" = ( -/obj/effect/particle_effect/steam, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata, -/obj/structure/platform/strata{ - dir = 8 +"dlZ" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/spring_marshes) -"dmK" = ( -/turf/open/floor/strata/cyan2/east, -/area/strata/ag/interior/mining_outpost/hallways) +/turf/open/floor/strata/fake_wood, +/area/strata/ag/interior/outpost/foyer) "dnz" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/clothing/mask/cigarette/cigar/cohiba, @@ -23107,15 +18309,10 @@ }, /turf/closed/wall/strata_outpost, /area/strata/ag/interior/outside/engineering/parts_storage) -"dpB" = ( -/obj/structure/flora/grass/tallgrass/jungle/corner{ - dir = 10 - }, -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/auto_turf/strata_grass/layer0, -/area/strata/ug/interior/outpost/platform) +"doZ" = ( +/obj/structure/platform/metal/strata/north, +/turf/open/floor/strata/red1, +/area/strata/ag/interior/landing_zones/near_lz1) "dqi" = ( /turf/open/auto_turf/ice/layer2, /area/strata/ag/exterior/marsh/water_marshes) @@ -23135,6 +18332,10 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ug/interior/jungle/structures/research) +"dqZ" = ( +/obj/structure/platform_decoration/stone/strata, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/marsh/spring_marshes) "drI" = ( /turf/open/floor/strata/floor3/east, /area/strata/ug/interior/outpost/underground_dorms/admin2) @@ -23144,24 +18345,29 @@ }, /turf/open/auto_turf/strata_grass/layer0, /area/strata/ug/interior/jungle/structures/monitoring/west) -"drS" = ( -/obj/effect/decal/strata_decals/catwalk/prison, -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/canteen/personal_storage) "dsx" = ( /obj/item/tool/wrench, /turf/open/floor/almayer/test_floor5, /area/strata/ag/interior/outpost/engi/drome/shuttle) -"dtt" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform/strata/metal, -/turf/open/floor/strata/multi_tiles/west, -/area/strata/ag/interior/outside/engineering/parts_storage) +"dsA" = ( +/obj/structure/platform/metal/strata/north, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/engi/drome) +"dsS" = ( +/obj/structure/platform_decoration/stone/strata/west, +/obj/structure/platform_decoration/stone/strata/east, +/obj/effect/blocker/sorokyne_cold_water, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/water) +"dtN" = ( +/obj/structure/platform/metal/strata/west, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/auto_turf/snow/brown_base/layer4, +/area/strata/ag/exterior/paths/flight_control_exterior) +"dud" = ( +/obj/structure/pipes/vents/pump, +/turf/open/floor/strata/white_cyan2/west, +/area/strata/ag/interior/outpost/canteen) "duq" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/effect/decal/strata_decals/catwalk/prison, @@ -23171,19 +18377,16 @@ /obj/item/tool/crowbar/red, /turf/open/floor/strata/floor2, /area/strata/ug/interior/jungle/structures/monitoring) -"dvf" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ +"dva" = ( +/obj/structure/platform_decoration/metal/strata/east, +/turf/open/auto_turf/strata_grass/layer0, +/area/strata/ug/interior/outpost/platform) +"dvq" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 }, -/obj/structure/platform/strata{ - dir = 8 - }, -/obj/effect/blocker/sorokyne_cold_water, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/water) +/turf/open/floor/strata/cyan1/east, +/area/strata/ag/interior/outpost/med) "dvR" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/cameras{ @@ -23191,6 +18394,12 @@ }, /turf/open/floor/strata/red1, /area/strata/ag/interior/outpost/engi/drome) +"dvV" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/metal/strata/north, +/obj/structure/platform/metal/strata/east, +/turf/open/gm/river, +/area/strata/ag/exterior/outpost_decks) "dvX" = ( /obj/effect/landmark/survivor_spawner, /turf/open/floor/strata/fake_wood, @@ -23199,6 +18408,27 @@ /obj/structure/machinery/optable, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outpost/med) +"dxe" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 4; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/strata/east, +/turf/open/floor/strata/multi_tiles/southwest, +/area/strata/ug/interior/outpost/platform) +"dxY" = ( +/obj/structure/barricade/deployable{ + dir = 1 + }, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/canteen) +"dyk" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/strata/blue1, +/area/strata/ag/interior/outpost/canteen) "dyA" = ( /obj/structure/barricade/deployable, /turf/open/floor/strata/white_cyan2/west, @@ -23215,6 +18445,10 @@ /obj/effect/landmark/survivor_spawner, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outpost/med) +"dAs" = ( +/obj/structure/platform_decoration/stone/strata/west, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/landing_zones/near_lz2) "dAV" = ( /obj/structure/flora/grass/tallgrass/jungle, /obj/effect/landmark/monkey_spawn, @@ -23226,20 +18460,6 @@ }, /turf/open/floor/strata, /area/strata/ag/interior/outpost/engi/drome) -"dBG" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - dir = 1; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/auto_turf/strata_grass/layer1, -/area/strata/ug/interior/outpost/platform) -"dBO" = ( -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/hallways/north) "dBV" = ( /obj/structure/largecrate/random/case/double, /obj/structure/pipes/standard/simple/hidden/cyan, @@ -23266,11 +18486,10 @@ /obj/structure/machinery/power/apc/no_power/west, /turf/open/asphalt/cement/cement3, /area/strata/ug/interior/outpost/platform) -"dDr" = ( -/obj/structure/bed/chair, -/obj/effect/landmark/objective_landmark/close, -/turf/open/floor/strata/white_cyan1/east, -/area/strata/ag/interior/outpost/hallways/north) +"dDM" = ( +/obj/structure/platform_decoration/metal/strata/east, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/engi/drome) "dDU" = ( /obj/structure/inflatable/popped/door, /obj/structure/pipes/standard/simple/hidden/cyan{ @@ -23278,15 +18497,6 @@ }, /turf/open/floor/strata/floor3/east, /area/strata/ag/exterior/outpost_decks) -"dDW" = ( -/obj/structure/platform/strata{ - dir = 8 - }, -/obj/structure/platform/strata, -/obj/effect/blocker/sorokyne_cold_water, -/obj/effect/blocker/sorokyne_cold_water, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/water) "dEa" = ( /turf/open/floor/strata/white_cyan2/west, /area/strata/ag/interior/outside/bball) @@ -23300,6 +18510,13 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/interior/outpost/engi/drome) +"dEC" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/strata/white_cyan2/west, +/area/strata/ag/interior/outpost/canteen) "dEE" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 9 @@ -23328,17 +18545,15 @@ }, /turf/open/auto_turf/strata_grass/layer0, /area/strata/ug/interior/jungle/structures/monitoring/east) -"dFU" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - icon_state = "p_stair_ew_full_cap"; - layer = 3.5 - }, -/obj/structure/platform/strata/metal{ - dir = 1 +"dFV" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/barricade/handrail/strata{ + layer = 3.1 }, -/turf/open/floor/strata/multi_tiles/west, -/area/strata/ag/interior/outside/engineering/parts_storage) +/obj/structure/platform/metal/strata/west, +/obj/structure/platform/metal/strata, +/turf/open/gm/river, +/area/strata/ag/exterior/outpost_decks) "dGv" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/strata/floor3/east, @@ -23346,15 +18561,11 @@ "dGO" = ( /turf/open/asphalt/cement/cement14, /area/strata/ug/interior/outpost/platform) -"dGU" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 1 - }, -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/paths/flight_control_exterior) +"dGW" = ( +/obj/structure/cryofeed/right, +/obj/structure/platform/metal/strata, +/turf/open/gm/river, +/area/strata/ag/interior/outside/engineering/parts_storage) "dIh" = ( /obj/structure/flora/bush/ausbushes/ausbush, /turf/open/gm/dirt, @@ -23367,16 +18578,20 @@ /obj/structure/curtain/medical, /turf/open/floor/strata/floor2, /area/strata/ug/interior/outpost/underground_dorms/sec1) -"dLx" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ +"dJW" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan{ dir = 4 }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/mining_outpost/hallways) +/turf/open/floor/prison/darkyellowfull2, +/area/strata/ag/interior/outpost/engi) "dLT" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/interior/outpost/engi) +"dMg" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor, +/turf/open/floor/strata/multi_tiles/southeast, +/area/strata/ag/interior/outpost/med) "dMw" = ( /obj/structure/cargo_container/wy/left, /turf/open/auto_turf/ice/layer1, @@ -23384,6 +18599,17 @@ "dMR" = ( /turf/closed/wall/strata_outpost/reinforced/hull, /area/strata/ag/exterior/marsh/water_marshes) +"dNd" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/drinks/cans/space_mountain_wind, +/turf/open/floor/strata/red1, +/area/strata/ag/interior/outpost/canteen) +"dNg" = ( +/obj/effect/particle_effect/steam, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform_decoration/stone/strata, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/river) "dNq" = ( /turf/open/gm/coast/north, /area/strata/ug/interior/jungle/platform/east) @@ -23401,6 +18627,14 @@ /obj/structure/prop/almayer/computers/sensor_computer3, /turf/closed/wall/strata_outpost/reinforced, /area/strata/ag/interior/restricted) +"dOM" = ( +/obj/structure/flora/grass/tallgrass/ice/corner{ + dir = 8 + }, +/obj/structure/platform/stone/strata/north, +/obj/effect/blocker/sorokyne_cold_water, +/turf/open/gm/river, +/area/strata/ag/exterior/paths/far_north_outpost) "dOO" = ( /turf/closed/wall/strata_outpost, /area/strata/ag/exterior/vanyard) @@ -23410,12 +18644,26 @@ }, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/carplake/east) +"dOT" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + icon_state = "p_stair_ew_full_cap"; + layer = 3.5 + }, +/obj/structure/platform/metal/stair_cut/strata_right, +/turf/open/floor/strata/multi_tiles/west, +/area/strata/ag/interior/outside/engineering/parts_storage) "dPf" = ( /obj/structure/flora/bush/ausbushes/grassybush{ icon_state = "fernybush_3" }, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/structures/research/hot_springs) +"dPu" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata/west, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/spring_marshes) "dQi" = ( /obj/item/stack/rods, /turf/open/floor/strata/white_cyan2/west, @@ -23445,6 +18693,13 @@ }, /turf/open/floor/strata, /area/strata/ug/interior/outpost/underground_dorms/sec2) +"dSQ" = ( +/obj/structure/pipes/vents/pump{ + dir = 8; + id_tag = "mining_outpost_pump" + }, +/turf/open/floor/strata/cyan3/west, +/area/strata/ag/interior/outpost/med) "dSU" = ( /obj/structure/flora/bush/ausbushes/grassybush{ icon_state = "fernybush_3" @@ -23463,6 +18718,12 @@ }, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/structures/research/hot_springs) +"dTI" = ( +/obj/effect/particle_effect/steam, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform_decoration/stone/strata/north, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/river) "dTN" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/strata/floor2, @@ -23473,6 +18734,12 @@ }, /turf/open/floor/strata/fake_wood, /area/strata/ag/interior/outside/bball) +"dVb" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata/white_cyan3/north, +/area/strata/ag/interior/outpost/med) "dVh" = ( /obj/structure/largecrate/random/secure, /turf/open/floor/strata/multi_tiles/southeast, @@ -23489,6 +18756,12 @@ /obj/effect/decal/strata_decals/catwalk/prison, /turf/open/gm/river, /area/strata/ug/interior/jungle/tearlake) +"dWj" = ( +/obj/structure/flora/grass/tallgrass/ice/corner, +/obj/structure/platform/metal/strata/west, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/paths/flight_control_exterior) "dWm" = ( /turf/closed/wall/strata_outpost/reinforced, /area/strata/ag/interior/outside/bball) @@ -23497,10 +18770,23 @@ /obj/item/weapon/gun/pistol/t73, /turf/open/floor/strata/red1, /area/strata/ag/interior/outpost/security) +"dWH" = ( +/obj/structure/platform_decoration/metal/strata/east, +/turf/open/floor/strata/fake_wood, +/area/strata/ag/interior/outpost/engi) "dXc" = ( /obj/effect/landmark/static_comms/net_one, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/paths/mining_outpost_exterior) +"dXH" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "xtracks" + }, +/obj/structure/barricade/deployable{ + dir = 8 + }, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/canteen) "dXQ" = ( /turf/open/floor/strata, /area/strata/ug/interior/outpost/underground_dorms/med1) @@ -23527,12 +18813,15 @@ /obj/structure/prop/turbine_extras/border, /turf/open/floor/strata/floor2, /area/strata/ug/interior/jungle/structures/monitoring) -"dZp" = ( +"dZA" = ( +/obj/structure/bed/chair{ + dir = 1 + }, /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 }, -/turf/open/floor/strata/floor3/east, -/area/strata/ag/interior/outpost/hallways/south) +/turf/open/floor/strata/white_cyan1/east, +/area/strata/ag/interior/outpost/canteen) "eai" = ( /obj/structure/stairs/perspective{ color = "#6e6e6e"; @@ -23550,6 +18839,21 @@ /obj/structure/machinery/power/port_gen/pacman/super, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/interior/outside/bball/cave) +"eco" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 9 + }, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/admin) +"ecB" = ( +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata, +/obj/effect/blocker/sorokyne_cold_water, +/turf/open/gm/river, +/area/strata/ag/interior/landing_zones/near_lz1) "eek" = ( /obj/structure/closet/secure_closet/personal, /obj/effect/decal/cleanable/blood, @@ -23561,6 +18865,9 @@ /obj/structure/machinery/microwave, /turf/open/floor/strata/white_cyan2/west, /area/strata/ug/interior/outpost/underground_dorms/sec1) +"eeS" = ( +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/engi/drome) "efR" = ( /obj/structure/cryofeed, /turf/open/gm/river, @@ -23572,6 +18879,12 @@ }, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ug/interior/outpost/platform) +"egf" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/strata/white_cyan2/west, +/area/strata/ag/interior/mining_outpost/canteen) "egh" = ( /obj/structure/flora/bush/ausbushes/grassybush{ icon_state = "fullgrass_1" @@ -23584,6 +18897,19 @@ }, /turf/open/auto_turf/strata_grass/layer0, /area/strata/ug/interior/jungle/tearlake) +"ehr" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/strata/white_cyan3/east, +/area/strata/ag/interior/outpost/med) +"ehu" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/obj/structure/machinery/door/airlock/almayer/engineering/colony{ + dir = 2 + }, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/engi) "ehH" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 8 @@ -23629,6 +18955,13 @@ }, /turf/open/auto_turf/ice/layer0, /area/strata/ag/exterior/marsh/relay_marshes) +"elD" = ( +/obj/structure/platform_decoration/metal/strata/west, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/strata/red1, +/area/strata/ag/interior/landing_zones/near_lz1) "emg" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/strata, @@ -23641,6 +18974,11 @@ /obj/structure/pipes/standard/simple/hidden/cyan, /turf/open/floor/strata/floor3/east, /area/strata/ag/exterior/outpost_decks) +"emu" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform_decoration/stone/strata/east, +/turf/open/gm/river, +/area/strata/ag/exterior/paths/far_north_outpost) "emv" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 6 @@ -23659,6 +18997,14 @@ }, /turf/open/floor/strata/multi_tiles, /area/strata/ag/interior/mining_outpost/central) +"emX" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/snacks/mushroompizzaslice, +/turf/open/floor/strata/cyan1/east, +/area/strata/ag/interior/mining_outpost/canteen) +"enJ" = ( +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/canteen) "enU" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -23681,6 +19027,15 @@ }, /turf/open/floor/plating, /area/strata/ag/interior/outside/engineering/parts_storage) +"epz" = ( +/obj/effect/sentry_landmark/lz_2/bottom_left, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/landing_zones/near_lz2) +"eqN" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/condiment/saltshaker, +/turf/open/floor/prison/darkyellowfull2, +/area/strata/ag/interior/outpost/canteen) "eqO" = ( /obj/structure/barricade/handrail/strata{ dir = 1 @@ -23698,12 +19053,20 @@ "erq" = ( /turf/open/gm/river, /area/strata/ag/interior/outside/engineering/parts_storage) -"euc" = ( -/obj/structure/platform_decoration/strata{ +"etQ" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor/colony{ + name = "\improper Airlock" + }, +/turf/open/floor/strata/multi_tiles/southeast, +/area/strata/ag/interior/outpost/engi/drome) +"euD" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/machinery/light{ dir = 4 }, -/turf/open/auto_turf/ice/layer1, -/area/strata/ag/exterior/marsh/spring_marshes) +/turf/open/floor/strata/orange_cover, +/area/strata/ag/interior/outpost/canteen) "euN" = ( /obj/structure/barricade/wooden{ dir = 4 @@ -23715,19 +19078,26 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/auto_turf/strata_grass/layer0_mud, /area/strata/ug/interior/jungle/tearlake) -"evI" = ( -/turf/open/floor/strata/floor2, -/area/strata/ag/interior/outpost/hallways/south) +"ewe" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/cyan2/east, +/area/strata/ag/interior/outpost/med) "ewk" = ( /obj/structure/machinery/camera/autoname/lz_camera, /turf/open/floor/plating, /area/strata/ag/exterior/landing_zones/lz2) -"exi" = ( -/obj/structure/pipes/vents/pump{ - dir = 4 - }, -/turf/open/floor/strata/floor3/east, -/area/strata/ag/interior/outpost/hallways/south) +"ewZ" = ( +/obj/structure/bed/chair, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/canteen) +"exj" = ( +/obj/structure/platform_decoration/stone/strata, +/turf/open/auto_turf/ice/layer1, +/area/strata/ag/interior/outside/engineering/parts_storage_cave) +"exl" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/white_cyan2/west, +/area/strata/ag/interior/outpost/canteen) "exx" = ( /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/strata/multi_tiles/southwest, @@ -23735,6 +19105,15 @@ "exO" = ( /turf/open/floor/strata/multi_tiles, /area/strata/ag/interior/mining_outpost/hive) +"eyg" = ( +/obj/effect/decal/cleanable/blood{ + layer = 3 + }, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/canteen) "eyA" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -23748,15 +19127,72 @@ /obj/structure/cargo_container/wy/right, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/platform/south) +"eyU" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/strata, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/admin) +"ezd" = ( +/obj/structure/barricade/deployable{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/obj/structure/machinery/m56d_hmg/mg_turret{ + dir = 8 + }, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/canteen) +"ezj" = ( +/obj/structure/platform/stone/strata/west, +/obj/structure/platform/stone/strata, +/obj/effect/blocker/sorokyne_cold_water, +/obj/effect/blocker/sorokyne_cold_water, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/water) "ezl" = ( /obj/structure/inflatable/door, /turf/open/floor/strata/orange_cover, /area/strata/ag/interior/outside/engineering/parts_storage) +"ezz" = ( +/obj/item/lightstick/red/planted, +/obj/structure/platform/metal/strata, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/paths/mining_outpost_exterior) +"ezG" = ( +/obj/structure/platform/stone/strata/east, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/landing_zones/near_lz2) "ezK" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/fuel_cell, /turf/open/auto_turf/ice/layer1, /area/strata/ag/interior/outside/bball/cave) +"ezZ" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 8; + icon_state = "p_stair_ew_full_cap"; + layer = 3.5 + }, +/obj/structure/platform/metal/stair_cut/strata_left, +/turf/open/floor/strata/multi_tiles/southwest, +/area/strata/ag/interior/outside/engineering/parts_storage) +"eAf" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 9 + }, +/turf/open/floor/strata/orange_cover, +/area/strata/ag/interior/outpost/engi/drome) +"eAz" = ( +/obj/structure/platform/metal/strata/east, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/paths/flight_control_exterior) "eBb" = ( /obj/structure/surface/table/woodentable, /obj/structure/machinery/light{ @@ -23777,6 +19213,12 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/generic2, /turf/open/floor/strata/orange_cover, /area/strata/ag/interior/outpost/maint) +"eCS" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/east, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/spring_marshes) "eCZ" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/structure/disposalpipe/segment{ @@ -23798,6 +19240,22 @@ /obj/structure/machinery/door/window/eastright, /turf/open/floor/strata/blue1, /area/strata/ug/interior/outpost/underground_dorms/admin1) +"eDO" = ( +/obj/structure/platform/metal/strata/east, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/orange_cover, +/area/strata/ag/interior/landing_zones/near_lz1) +"eEc" = ( +/obj/item/stool, +/obj/structure/machinery/light, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/canteen) +"eEr" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/strata/cyan3/west, +/area/strata/ag/interior/outpost/med) "eEO" = ( /obj/structure/prop/turbine_extras/left, /turf/open/floor/strata/floor2, @@ -23826,11 +19284,6 @@ /obj/item/device/flashlight, /turf/open/floor/strata/red3/north, /area/strata/ag/interior/outpost/med) -"eGq" = ( -/obj/structure/cryofeed, -/obj/structure/platform/strata/metal, -/turf/open/gm/river, -/area/strata/ag/interior/outside/engineering/parts_storage) "eGD" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -23854,16 +19307,15 @@ /obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/plating, /area/strata/ag/exterior/marsh/island_marshes) -"eHv" = ( -/obj/structure/platform/strata{ - dir = 8 +"eHp" = ( +/turf/open/floor/strata/blue1, +/area/strata/ag/interior/outpost/canteen) +"eHM" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 }, -/turf/open/auto_turf/ice/layer1, -/area/strata/ag/exterior/landing_zones/near_lz2) -"eHZ" = ( -/obj/effect/decal/strata_decals/catwalk/prison, -/turf/open/floor/greengrid, -/area/strata/ag/interior/mining_outpost/hallways) +/turf/open/floor/strata/floor2, +/area/strata/ag/interior/outpost/engi/drome) "eIB" = ( /obj/structure/flora/grass/tallgrass/jungle, /obj/structure/flora/grass/tallgrass/jungle/corner{ @@ -23871,6 +19323,12 @@ }, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/platform/south) +"eIP" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 10 + }, +/turf/open/floor/strata/white_cyan3/north, +/area/strata/ag/interior/outpost/med) "eIR" = ( /obj/effect/decal/warning_stripes{ icon_state = "E" @@ -23909,16 +19367,30 @@ }, /turf/open/auto_turf/ice/layer2, /area/strata/ag/exterior/marsh/spring_marshes) +"eKf" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 9 + }, +/turf/open/floor/strata/white_cyan2/west, +/area/strata/ag/interior/outpost/canteen) +"eKq" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/platform_decoration/metal/strata/west, +/turf/open/floor/plating, +/area/strata/ag/exterior/outpost_decks) +"eKB" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/east, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/crash) "eLF" = ( /obj/structure/window/framed/strata, /turf/open/floor/strata/multi_tiles/west, /area/strata/ag/interior/outside/checkpoints/south) -"eLQ" = ( -/obj/structure/machinery/camera/autoname{ - dir = 8 - }, -/turf/open/floor/strata/cyan3/west, -/area/strata/ag/interior/outpost/hallways/south) "eMZ" = ( /obj/structure/machinery/weather_siren{ dir = 8; @@ -23927,6 +19399,10 @@ }, /turf/closed/wall/strata_outpost, /area/strata/ag/exterior/vanyard) +"eNa" = ( +/obj/structure/platform/stone/strata, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/landing_zones/near_lz2) "eNz" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/guestpass, @@ -23947,6 +19423,11 @@ }, /turf/open/floor/strata/floor2, /area/strata/ug/interior/jungle/structures/monitoring) +"eNO" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/snacks/omelette, +/turf/open/floor/strata/cyan1/east, +/area/strata/ag/interior/mining_outpost/canteen) "eNW" = ( /obj/structure/machinery/weather_siren{ dir = 4; @@ -23976,19 +19457,33 @@ "eOK" = ( /turf/open/floor/strata/red1, /area/strata/ag/interior/outside/checkpoints/north) +"ePb" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan, +/turf/open/floor/strata/white_cyan1/east, +/area/strata/ag/interior/outpost/canteen) "ePf" = ( /obj/structure/window/framed/strata, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outpost/engi/drome) -"eRk" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - icon_state = "p_stair_sn_full_cap" +"ePE" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 }, -/obj/structure/platform/strata/metal{ - dir = 8 +/turf/open/floor/strata/white_cyan3/southwest, +/area/strata/ag/interior/outpost/med) +"eQo" = ( +/obj/structure/platform/stone/strata/north, +/obj/effect/blocker/sorokyne_cold_water, +/turf/open/gm/river, +/area/strata/ag/exterior/paths/far_north_outpost) +"eRA" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/strata, +/obj/structure/platform_decoration/metal/strata, +/turf/open/floor/plating, /area/strata/ag/exterior/outpost_decks) "eRJ" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited{ @@ -24008,6 +19503,12 @@ "eSK" = ( /turf/open/floor/strata/multi_tiles/southeast, /area/strata/ag/interior/outside/checkpoints/north) +"eSO" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 5 + }, +/turf/open/floor/strata/white_cyan2/west, +/area/strata/ag/interior/outpost/canteen) "eSR" = ( /obj/structure/machinery/computer/emails, /obj/structure/surface/table/almayer, @@ -24019,18 +19520,17 @@ /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/strata/red1, /area/strata/ag/interior/outside/checkpoints/north) +"eUV" = ( +/obj/structure/platform/metal/strata/east, +/obj/effect/decal/strata_decals/catwalk/prison, +/turf/open/floor/greengrid, +/area/strata/ug/interior/jungle/structures/monitoring) "eUW" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" }, /turf/open/floor/strata/fake_wood, /area/strata/ug/interior/jungle/structures/monitoring) -"eVc" = ( -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/auto_turf/strata_grass/layer0, -/area/strata/ug/interior/jungle/platform/south) "eVm" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 @@ -24051,16 +19551,22 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/interior/outside/bball/cave) +"eWA" = ( +/obj/effect/decal/cleanable/greenglow, +/turf/open/floor/strata/white_cyan2/west, +/area/strata/ag/interior/outpost/canteen) +"eXb" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/strata, +/area/strata/ag/interior/mining_outpost/central) +"eXc" = ( +/obj/structure/platform_decoration/metal/strata/west, +/turf/open/floor/strata, +/area/strata/ag/interior/landing_zones/near_lz1) "eXK" = ( /obj/structure/window/framed/strata/reinforced, /turf/open/floor/strata/floor3, /area/strata/ag/interior/outside/bball) -"eYz" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/hallways/north) "eYE" = ( /turf/closed/wall/strata_outpost, /area/strata/ag/interior/outside/checkpoints/north) @@ -24068,6 +19574,22 @@ /obj/structure/cargo_container/watatsumi/mid, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/platform/south) +"eZc" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/strata/white_cyan3/east, +/area/strata/ag/interior/outpost/med) +"eZf" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/turf/open/floor/strata/white_cyan2/west, +/area/strata/ag/interior/outpost/canteen) +"eZi" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 6 + }, +/turf/open/floor/prison/darkyellowfull2, +/area/strata/ag/interior/outpost/engi) "eZw" = ( /obj/structure/bed/chair{ dir = 4 @@ -24083,12 +19605,21 @@ /obj/effect/landmark/monkey_spawn, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/platform/east) -"fbd" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 +"fax" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/west, +/obj/structure/platform_decoration/stone/strata, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/river) +"fbq" = ( +/obj/structure/flora/grass/tallgrass/ice/corner{ + dir = 5 }, -/turf/open/floor/strata/red1, -/area/strata/ag/interior/outpost/hallways/north) +/obj/structure/platform_decoration/stone/strata/east, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/paths/south_outpost) "fbG" = ( /obj/effect/landmark/objective_landmark/science, /turf/open/floor/strata/floor2, @@ -24102,6 +19633,17 @@ /obj/structure/largecrate/random, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/interior/outpost/engi/drome) +"fcv" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/spray/cleaner, +/obj/structure/barricade/handrail/strata{ + dir = 4 + }, +/obj/structure/pipes/standard/manifold/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata/orange_cover, +/area/strata/ag/interior/outpost/engi/drome) "fcB" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -24111,6 +19653,32 @@ }, /turf/open/floor/prison/darkyellowfull2, /area/strata/ag/interior/outpost/engi) +"fcP" = ( +/obj/item/weapon/gun/pistol/t73, +/turf/open/floor/strata/white_cyan1/east, +/area/strata/ag/interior/outpost/canteen) +"fdL" = ( +/obj/structure/platform/metal/strata, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/engi) +"feA" = ( +/obj/structure/platform/metal/strata, +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 5; + icon_state = "p_stair_full" + }, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/paths/flight_control_exterior) +"ffS" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/drinks/bottle/vodka, +/obj/item/reagent_container/food/condiment/saltshaker, +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/strata/orange_cover, +/area/strata/ag/interior/outpost/canteen) "fhl" = ( /obj/structure/fence, /turf/open/asphalt/cement/cement15, @@ -24119,22 +19687,10 @@ /obj/structure/fence, /turf/open/asphalt/cement/cement1, /area/strata/ag/interior/outside/engineering/parts_storage_exterior) -"fil" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/south) "fiD" = ( /obj/structure/fence, /turf/open/asphalt/cement/cement4, /area/strata/ag/interior/outside/engineering/parts_storage_exterior) -"fjZ" = ( -/obj/structure/platform_decoration/strata{ - dir = 1 - }, -/turf/open/auto_turf/ice/layer1, -/area/strata/ag/exterior/landing_zones/near_lz2) "fkw" = ( /obj/structure/machinery/light{ dir = 8 @@ -24172,9 +19728,18 @@ /obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited, /turf/closed/wall/strata_outpost/reinforced, /area/strata/ag/interior/outpost/med) +"fma" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/foyer) "fno" = ( /turf/open/floor/strata/multi_tiles/southeast, /area/strata/ag/interior/mining_outpost/central) +"fov" = ( +/obj/structure/closet/secure_closet/personal, +/obj/item/clothing/suit/storage/bomber, +/turf/open/floor/strata/red1, +/area/strata/ag/interior/outpost/canteen) "fow" = ( /obj/structure/machinery/light{ dir = 4 @@ -24184,6 +19749,19 @@ "foN" = ( /turf/open/floor/strata/floor3/east, /area/strata/ag/exterior/outpost_decks) +"fpK" = ( +/obj/structure/platform_decoration/metal/strata/east, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/admin) +"fpQ" = ( +/obj/structure/barricade/handrail/strata{ + layer = 3.1 + }, +/obj/structure/platform/metal/strata/east, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/metal/strata, +/turf/open/gm/river, +/area/strata/ag/exterior/outpost_decks) "fqQ" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 9 @@ -24191,19 +19769,18 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/paths/far_north_outpost) -"fre" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 8 - }, -/obj/effect/decal/strata_decals/catwalk/prison, -/turf/open/floor/greengrid, -/area/strata/ug/interior/jungle/structures/monitoring) "frf" = ( /obj/structure/pipes/standard/manifold/hidden/cyan{ dir = 1 }, /turf/open/floor/strata/floor3/east, /area/strata/ag/exterior/outpost_decks) +"frn" = ( +/obj/effect/decal/cleanable/blood, +/obj/structure/pipes/standard/simple/hidden/cyan, +/obj/effect/decal/cleanable/blood/gibs/core, +/turf/open/floor/strata, +/area/strata/ag/interior/mining_outpost/central) "frL" = ( /obj/structure/pipes/standard/simple/hidden/cyan, /turf/open/floor/strata/blue1, @@ -24225,6 +19802,13 @@ }, /turf/open/floor/strata/purp2, /area/strata/ug/interior/jungle/structures/monitoring/south) +"fsI" = ( +/obj/effect/decal/cleanable/blood/gibs/xeno/down, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 5 + }, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/engi) "fsJ" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 6 @@ -24273,14 +19857,39 @@ /obj/effect/decal/cleanable/blood, /turf/open/auto_turf/strata_grass/layer0, /area/strata/ug/interior/outpost/platform) +"fvQ" = ( +/obj/structure/platform/metal/strata/north, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/interior/restricted) "fwc" = ( /obj/structure/dropship_equipment/mg_holder, /turf/open/floor/strata, /area/strata/ug/interior/outpost/underground_dorms/sec1) +"fwe" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/metal/strata/west, +/turf/open/gm/river, +/area/strata/ag/exterior/paths/far_north_outpost) "fwi" = ( /obj/structure/machinery/power/reactor/colony, /turf/open/floor/prison/floor_plate, /area/strata/ag/interior/mining_outpost/central) +"fwq" = ( +/obj/structure/window/reinforced/tinted, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/security) +"fwD" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + icon_state = "p_stair_sn_full_cap" + }, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/canteen) +"fwT" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/east, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/paths/south_outpost) "fwV" = ( /obj/structure/flora/grass/ice/brown/snowgrassbb_1, /turf/open/auto_turf/snow/brown_base/layer3, @@ -24302,17 +19911,23 @@ }, /turf/open/floor/strata/multi_tiles/west, /area/strata/ug/interior/outpost/underground_dorms/admin3) +"fyd" = ( +/obj/structure/pipes/standard/manifold/fourway/hidden/cyan, +/turf/open/floor/strata/multi_tiles, +/area/strata/ag/interior/outpost/foyer) "fyP" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/closed/wall/strata_outpost, /area/strata/ug/interior/jungle/platform/east) -"fyU" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 4 - }, -/obj/item/fuel_cell, -/turf/open/floor/strata/red2, -/area/strata/ag/interior/outpost/engi) +"fyZ" = ( +/obj/structure/platform/metal/strata/north, +/obj/structure/platform/metal/strata/west, +/turf/open/auto_turf/snow/brown_base/layer3, +/area/strata/ag/exterior/paths/flight_control_exterior) +"fzl" = ( +/obj/structure/platform_decoration/stone/strata, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/marsh/crash) "fzn" = ( /obj/structure/closet/secure_closet/freezer/fridge, /turf/open/floor/strata/white_cyan2/west, @@ -24323,16 +19938,6 @@ }, /turf/open/floor/strata, /area/strata/ag/exterior/outpost_decks) -"fzA" = ( -/obj/structure/machinery/light/small{ - dir = 1 - }, -/obj/structure/platform_decoration/strata/metal{ - dir = 4 - }, -/obj/effect/decal/strata_decals/catwalk/prison, -/turf/open/floor/greengrid, -/area/strata/ug/interior/jungle/structures/monitoring) "fzJ" = ( /obj/structure/curtain/medical, /turf/open/floor/strata/floor2, @@ -24402,23 +20007,32 @@ }, /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/marsh/spring_marshes) -"fCE" = ( -/obj/effect/decal/strata_decals/catwalk/prison, -/obj/structure/disposalpipe/segment{ +"fCF" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 }, -/obj/structure/platform_decoration/strata/metal{ - dir = 8 - }, -/turf/open/floor/plating, -/area/strata/ag/exterior/outpost_decks) +/obj/structure/machinery/light, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/mining_outpost/central) "fCI" = ( /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/marsh/crash) +"fDw" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/west, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/river) "fDG" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/paths/far_north_outpost) +"fEs" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/obj/structure/curtain/open/shower, +/turf/open/floor/strata/blue1, +/area/strata/ag/interior/outpost/canteen) "fEW" = ( /obj/effect/decal/cleanable/blood/oil, /obj/effect/landmark/objective_landmark/close, @@ -24436,25 +20050,23 @@ }, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/paths/south_outpost) -"fHp" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/mining_outpost/hallways) -"fHW" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 4 +"fGs" = ( +/obj/structure/platform/stone/strata/north, +/turf/open/auto_turf/ice/layer1, +/area/strata/ag/interior/outside/engineering/parts_storage_cave) +"fGG" = ( +/obj/structure/bed/chair{ + dir = 8 }, -/turf/open/auto_turf/strata_grass/layer0, -/area/strata/ug/interior/jungle/platform/south) +/turf/open/floor/strata/floor3/east, +/area/strata/ag/interior/outpost/engi/drome) +"fHa" = ( +/obj/structure/platform/stone/strata, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/landing_zones/near_lz2) "fHZ" = ( /turf/open/auto_turf/strata_grass/layer0_mud, /area/strata/ug/interior/jungle/tearlake) -"fIq" = ( -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/paths/flight_control_exterior) "fIF" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 @@ -24474,12 +20086,32 @@ }, /turf/open/floor/plating, /area/strata/ag/interior/outside/engineering/parts_storage) +"fIS" = ( +/obj/structure/platform_decoration/metal/strata/west, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/auto_turf/strata_grass/layer0, +/area/strata/ug/interior/jungle/platform/south) +"fIT" = ( +/obj/structure/platform/metal/strata/north, +/turf/open/auto_turf/snow/brown_base/layer4, +/area/strata/ag/exterior/paths/flight_control_exterior) "fJh" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 1 }, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/tearlake) +"fJN" = ( +/obj/structure/platform/metal/strata, +/turf/open/auto_turf/strata_grass/layer0_mud_alt, +/area/strata/ug/interior/jungle/structures/research/old_tunnels) +"fKi" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata/west, +/obj/structure/platform/stone/strata, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/center) "fKt" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/strata/multi_tiles/southwest, @@ -24487,12 +20119,12 @@ "fKT" = ( /turf/open/gm/river, /area/strata/ug/interior/jungle/structures/monitoring/south) -"fLc" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ +"fKW" = ( +/obj/structure/pipes/vents/pump{ dir = 4 }, -/turf/open/floor/strata/multi_tiles/southwest, -/area/strata/ag/interior/outpost/hallways/north) +/turf/open/floor/prison/darkyellowfull2, +/area/strata/ag/interior/outpost/engi) "fLl" = ( /obj/structure/bed/chair{ dir = 4 @@ -24502,6 +20134,15 @@ }, /turf/open/floor/strata, /area/strata/ug/interior/outpost/underground_dorms/sec1) +"fLZ" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/strata/white_cyan3/north, +/area/strata/ag/interior/outpost/med) "fMk" = ( /obj/structure/closet/secure_closet/medical3{ req_access = null @@ -24512,6 +20153,10 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/interior/outpost/med) +"fMp" = ( +/obj/structure/closet/wardrobe/medic_white, +/turf/open/floor/strata/cyan1/east, +/area/strata/ag/interior/outpost/canteen) "fMr" = ( /obj/structure/machinery/light{ dir = 8 @@ -24522,16 +20167,18 @@ /obj/structure/machinery/floodlight/landing, /turf/open/floor/strata, /area/strata/ug/interior/outpost/underground_dorms/sec1) -"fMP" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ - dir = 8 +"fMB" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "xgib6" }, -/obj/structure/platform_decoration/strata{ +/obj/structure/barricade/wooden{ dir = 8 }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/spring_marshes) +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata/red1, +/area/strata/ag/interior/outpost/security) "fMS" = ( /obj/structure/machinery/light{ dir = 8 @@ -24544,14 +20191,6 @@ "fNp" = ( /turf/closed/wall/strata_outpost/reinforced/hull, /area/strata/ag/exterior/paths/far_north_outpost) -"fNs" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata, -/obj/structure/platform_decoration/strata{ - dir = 4 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/landing_zones/near_lz2) "fNH" = ( /obj/item/reagent_container/food/drinks/cans/space_mountain_wind, /obj/structure/disposalpipe/segment{ @@ -24563,6 +20202,13 @@ "fOX" = ( /turf/open/asphalt/cement/cement14, /area/strata/ag/interior/outside/engineering/parts_storage_exterior) +"fOY" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/east, +/obj/effect/blocker/sorokyne_cold_water, +/obj/effect/blocker/sorokyne_cold_water, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/water) "fPO" = ( /turf/open/auto_turf/ice/layer1, /area/strata/ag/interior/mountain) @@ -24586,12 +20232,11 @@ }, /turf/open/floor/strata/blue1, /area/strata/ag/interior/outside/administration) -"fRi" = ( -/obj/structure/platform_decoration/strata{ - dir = 8 - }, -/turf/open/auto_turf/ice/layer0, -/area/strata/ag/exterior/marsh/spring_marshes) +"fRq" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/device/mass_spectrometer, +/turf/open/floor/strata/multi_tiles/southwest, +/area/strata/ag/interior/outpost/canteen) "fRv" = ( /turf/open/floor/strata/orange_cover, /area/strata/ag/exterior/marsh/crash) @@ -24616,10 +20261,21 @@ /obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/plating, /area/strata/ag/exterior/paths/flight_control_exterior) +"fTd" = ( +/obj/structure/platform_decoration/metal/strata/east, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/auto_turf/strata_grass/layer1, +/area/strata/ug/interior/jungle/platform/east) "fTJ" = ( /obj/item/lightstick/planted, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/caves/lz_caves) +"fVE" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/drinks/bottle/vodka, +/obj/item/reagent_container/food/condiment/peppermill, +/turf/open/floor/prison/darkyellowfull2, +/area/strata/ag/interior/outpost/canteen) "fVX" = ( /obj/structure/pipes/standard/manifold/hidden/cyan{ dir = 8 @@ -24629,6 +20285,24 @@ "fWs" = ( /turf/closed/wall/mineral/gold, /area/strata/ag/interior/outpost/med) +"fWD" = ( +/obj/structure/platform_decoration/metal/strata/north, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/paths/flight_control_exterior) +"fWF" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata/orange_cover, +/area/strata/ag/interior/outpost/engi/drome) +"fWM" = ( +/obj/structure/platform/metal/strata/west, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/landing_zones/near_lz1) +"fWR" = ( +/obj/structure/platform/stone/strata, +/turf/open/auto_turf/snow/brown_base/layer4, +/area/strata/ag/exterior/paths/flight_control_exterior) "fWV" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/drinks/bottle/sake, @@ -24651,6 +20325,11 @@ }, /turf/open/floor/strata/cyan1/east, /area/strata/ag/interior/outpost/med) +"fYk" = ( +/obj/structure/fence, +/obj/structure/platform_decoration/metal/strata/west, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/marsh/spring_marshes) "fYE" = ( /obj/structure/inflatable, /obj/structure/barricade/handrail/strata{ @@ -24666,10 +20345,6 @@ /obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/strata/orange_cover, /area/strata/ag/exterior/marsh/water_marshes) -"fZD" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/floor2, -/area/strata/ag/interior/outpost/hallways/south) "gab" = ( /turf/closed/shuttle/ert{ icon_state = "leftengine_1"; @@ -24693,6 +20368,13 @@ }, /turf/open/floor/strata, /area/strata/ag/interior/outpost/engi/drome) +"gbI" = ( +/obj/structure/platform_decoration/metal/strata/east, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/strata/red1, +/area/strata/ag/interior/landing_zones/near_lz1) "gbS" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -24704,10 +20386,26 @@ /obj/structure/barricade/handrail/strata, /turf/open/asphalt/cement/cement12, /area/strata/ag/interior/outpost/med) +"gcc" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/east, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/center) "gcj" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/gm/dirt, /area/strata/ug/interior/jungle/structures/monitoring/east) +"gcq" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e" + }, +/obj/structure/platform/metal/strata/west, +/obj/structure/platform/metal/strata/east, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/multi_tiles, +/area/strata/ag/exterior/paths/flight_control_exterior) "gcO" = ( /turf/open/floor/strata/red1, /area/strata/ag/interior/outside/checkpoints/north_armor) @@ -24718,6 +20416,11 @@ }, /turf/open/floor/strata/multi_tiles/southeast, /area/strata/ug/interior/jungle/structures/monitoring) +"gem" = ( +/obj/item/device/radio, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/orange_cover, +/area/strata/ag/interior/outpost/engi/drome) "gfd" = ( /obj/structure/barricade/handrail/wire{ layer = 3.5 @@ -24739,12 +20442,6 @@ "gfZ" = ( /turf/closed/wall/strata_outpost/reinforced, /area/strata/ag/exterior/marsh/spring_marshes) -"ggf" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/white_cyan3/east, -/area/strata/ag/interior/outpost/hallways/south) "ggr" = ( /obj/structure/filingcabinet, /obj/effect/landmark/objective_landmark/close, @@ -24799,18 +20496,38 @@ /obj/effect/decal/strata_decals/catwalk/prison, /turf/open/floor/greengrid, /area/strata/ug/interior/jungle/structures/monitoring) -"gjN" = ( +"gil" = ( +/obj/effect/decal/cleanable/blood/oil/streak, +/obj/structure/platform/metal/strata, +/turf/open/floor/strata, +/area/strata/ag/exterior/outpost_decks) +"giU" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata/orange_edge/east, +/area/strata/ag/interior/mining_outpost/central) +"gjv" = ( +/obj/structure/largecrate/random, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/canteen) +"gjw" = ( +/obj/structure/platform/stone/strata, /obj/effect/blocker/sorokyne_cold_water, /obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform_decoration/strata{ - dir = 8 - }, -/obj/structure/platform_decoration/strata, -/obj/structure/platform_decoration/strata{ - dir = 1 - }, /turf/open/gm/river, -/area/strata/ag/exterior/marsh/center) +/area/strata/ag/exterior/paths/far_north_outpost) +"gjC" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, +/obj/structure/inflatable/popped, +/turf/open/floor/strata/cyan4/east, +/area/strata/ag/interior/outpost/med) +"gjD" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan, +/turf/open/floor/strata, +/area/strata/ag/interior/mining_outpost/south_dormitories) "gjP" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, /turf/open/floor/strata/multi_tiles/southwest, @@ -24835,6 +20552,13 @@ }, /turf/open/floor/strata/red1, /area/strata/ug/interior/jungle/structures/monitoring) +"gls" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor/colony{ + dir = 1; + name = "\improper Airlock" + }, +/turf/open/floor/strata/multi_tiles/west, +/area/strata/ag/interior/outpost/med) "glG" = ( /obj/structure/machinery/power/port_gen/pacman/super, /turf/open/floor/strata/multi_tiles/southwest, @@ -24847,12 +20571,23 @@ }, /turf/closed/wall/strata_outpost/reinforced, /area/strata/ag/interior/outside/checkpoints/west) +"gmA" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata/north, +/obj/structure/platform_decoration/stone/strata/north, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/center) "gmB" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 }, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/structures/monitoring/east) +"gmG" = ( +/obj/structure/platform/stone/strata/north, +/turf/open/auto_turf/ice/layer0, +/area/strata/ag/exterior/marsh/spring_marshes) "gmU" = ( /turf/open/auto_turf/snow/brown_base/layer4, /area/strata/ag/exterior/marsh/island_marshes) @@ -24880,6 +20615,15 @@ /obj/structure/flora/grass/ice/brown/snowgrassbb_2, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/paths/north_outpost) +"gpl" = ( +/obj/structure/platform/metal/strata, +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 9; + icon_state = "p_stair_full" + }, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/paths/flight_control_exterior) "gpp" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 9 @@ -24896,25 +20640,20 @@ }, /turf/open/floor/strata/orange_cover, /area/strata/ag/interior/outpost/engi/drome) -"gqa" = ( -/obj/structure/machinery/space_heater, -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/floor/strata/floor3/east, -/area/strata/ug/interior/outpost/underground_dorms/admin3) -"gqF" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/communications{ - dir = 8; - icon_state = "commb" - }, -/obj/structure/pipes/standard/simple/hidden/cyan, -/obj/structure/barricade/handrail/strata{ - dir = 4 +"gqJ" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata/east, +/obj/structure/platform/stone/strata, +/turf/open/gm/river, +/area/strata/ag/exterior/landing_zones/near_lz2) +"gqV" = ( +/obj/structure/flora/grass/tallgrass/ice/corner{ + dir = 10 }, -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/outpost/hallways/south) +/obj/structure/platform/stone/strata, +/obj/effect/blocker/sorokyne_cold_water, +/turf/open/gm/river, +/area/strata/ag/exterior/paths/far_north_outpost) "grd" = ( /obj/structure/machinery/camera/autoname{ dir = 8 @@ -24927,42 +20666,52 @@ icon_state = "upp16" }, /area/strata/ag/interior/outpost/engi/drome/shuttle) -"grG" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/communications{ - dir = 8; - icon_state = "commb" +"grF" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "xgibdown1" }, -/obj/structure/platform/strata/metal{ - dir = 4 +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 8; + icon_state = "p_stair_full" }, -/turf/open/floor/strata/floor3/east, -/area/strata/ug/interior/outpost/underground_dorms/med2) +/turf/open/floor/strata/red1, +/area/strata/ag/interior/outpost/security) +"grK" = ( +/obj/structure/platform/stone/strata/west, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/landing_zones/near_lz2) +"grL" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/east, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/marsh/spring_marshes) "grP" = ( /obj/effect/landmark/corpsespawner/security/liaison, /turf/open/floor/strata/white_cyan1/east, /area/strata/ag/interior/outpost/canteen/bar) -"gtZ" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/gm/river, +"gsQ" = ( +/obj/structure/platform_decoration/stone/strata/north, +/turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/landing_zones/near_lz2) -"guz" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ - dir = 4 +"gto" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "gib6" }, -/obj/structure/platform_decoration/strata{ +/obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/center) +/turf/open/floor/strata/fake_wood, +/area/strata/ag/interior/outpost/foyer) +"guB" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 4; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/strata/east, +/turf/open/asphalt/cement, +/area/strata/ug/interior/outpost/platform) "guF" = ( /obj/structure/bed/chair/dropship/passenger{ dir = 4 @@ -24989,12 +20738,49 @@ /obj/structure/bookcase, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outside/engineering/parts_storage) +"gwY" = ( +/obj/structure/platform/metal/strata/north, +/turf/open/floor/plating, +/area/strata/ag/exterior/paths/mining_outpost_exterior) +"gya" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 8; + icon_state = "p_stair_full" + }, +/turf/open/floor/strata/red1, +/area/strata/ag/interior/outpost/security) +"gyo" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic, +/turf/open/floor/strata/multi_tiles/southeast, +/area/strata/ag/interior/mining_outpost/south_dormitories) +"gyz" = ( +/obj/structure/machinery/computer/communications{ + dir = 4 + }, +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/canteen) "gzd" = ( /turf/open/gm/coast/east, /area/strata/ug/interior/jungle/structures/monitoring/south) +"gzM" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/east, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/river) "gAm" = ( /turf/open/floor/strata/fake_wood, /area/strata/ag/interior/outpost/security) +"gAt" = ( +/obj/structure/platform_decoration/stone/strata/east, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/paths/south_outpost) "gAv" = ( /obj/structure/surface/rack{ layer = 2.5 @@ -25003,21 +20789,16 @@ /obj/item/storage/firstaid/regular, /turf/open/asphalt/cement, /area/strata/ag/interior/outside/engineering/parts_storage_exterior) -"gAx" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/multi_tiles/southeast, -/area/strata/ag/interior/outpost/admin) "gAD" = ( /obj/structure/machinery/iv_drip, /turf/open/floor/strata, /area/strata/ag/exterior/outpost_decks) +"gAO" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 6 + }, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/engi/drome) "gBj" = ( /obj/effect/decal/cleanable/blood, /turf/open/auto_turf/ice/layer1, @@ -25029,39 +20810,23 @@ /obj/item/stack/snow, /turf/open/floor/strata, /area/strata/ag/exterior/outpost_decks) -"gCJ" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/orange_edge/east, -/area/strata/ag/interior/mining_outpost/hallways) "gDg" = ( /obj/structure/prop/almayer/computers/sensor_computer2, /turf/closed/wall/strata_outpost/reinforced, /area/strata/ag/interior/restricted) -"gDS" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/prison/darkyellowfull2, -/area/strata/ag/interior/outpost/hallways/north) -"gEo" = ( -/obj/structure/flora/grass/tallgrass/ice, -/obj/structure/platform/strata{ - dir = 1 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/paths/south_outpost) +"gEN" = ( +/obj/structure/platform_decoration/stone/strata/east, +/obj/structure/platform_decoration/stone/strata/west, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/landing_zones/near_lz2) "gFf" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outside/engineering/parts_storage) -"gFH" = ( -/obj/structure/cryofeed/right, -/obj/structure/platform/strata/metal, -/turf/open/gm/river, -/area/strata/ag/interior/outside/engineering/parts_storage) +"gFg" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/security) "gFT" = ( /obj/structure/largecrate/random, /obj/structure/barricade/handrail/strata, @@ -25071,6 +20836,12 @@ /obj/effect/landmark/queen_spawn, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/interior/outside/bball/cave) +"gHA" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan{ + dir = 1 + }, +/turf/open/floor/strata/white_cyan3/north, +/area/strata/ag/interior/outpost/med) "gHQ" = ( /obj/item/stack/sheet/wood, /turf/open/floor/strata, @@ -25087,23 +20858,10 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, /turf/open/floor/almayer/plate, /area/strata/ug/interior/jungle/structures/research) -"gIL" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/floor/strata/floor3/east, -/area/strata/ag/exterior/outpost_decks) -"gIY" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/landing_zones/near_lz2) +"gJb" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/fake_wood, +/area/strata/ag/interior/outpost/foyer) "gLF" = ( /turf/closed/wall/strata_outpost/reinforced, /area/strata/ag/exterior/paths/north_outpost) @@ -25123,18 +20881,11 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/strata/ag/interior/outpost/engi/drome/shuttle) -"gNQ" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/north) -"gOe" = ( -/obj/structure/barricade/handrail/strata{ - dir = 4 - }, +"gNV" = ( +/obj/structure/closet/secure_closet/personal, +/obj/item/clothing/suit/radiation, /turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/hallways/north) +/area/strata/ag/interior/outpost/canteen) "gOi" = ( /obj/item/lightstick/red/planted, /obj/structure/pipes/standard/simple/hidden/cyan{ @@ -25147,15 +20898,6 @@ /obj/effect/landmark/structure_spawner/xvx_hive/xeno_core, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/interior/outside/bball/cave) -"gOu" = ( -/obj/structure/machinery/light/small{ - dir = 8 - }, -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/floor/strata/red3, -/area/strata/ag/interior/outpost/med) "gOC" = ( /obj/structure/machinery/power/reactor/colony, /turf/open/floor/strata/floor3/east, @@ -25174,6 +20916,10 @@ }, /turf/open/floor/almayer/plate, /area/strata/ag/interior/outpost/engi/drome/shuttle) +"gPI" = ( +/obj/item/stack/sheet/wood, +/turf/open/floor/strata/red1, +/area/strata/ag/interior/outpost/security) "gPL" = ( /obj/structure/inflatable, /turf/open/auto_turf/ice/layer1, @@ -25193,6 +20939,15 @@ }, /turf/open/floor/strata/white_cyan2/west, /area/strata/ug/interior/outpost/underground_dorms/sec2) +"gQF" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/strata/red1, +/area/strata/ag/interior/outpost/security) "gQG" = ( /obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/strata/multi_tiles, @@ -25208,15 +20963,21 @@ /obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/plating, /area/strata/ag/exterior/marsh/center) +"gSA" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/disposalpipe/segment, +/obj/structure/platform/metal/strata/east, +/turf/open/floor/plating, +/area/strata/ag/exterior/outpost_decks) +"gSP" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 6 + }, +/turf/open/floor/strata/floor3/east, +/area/strata/ag/interior/outpost/engi/drome) "gSR" = ( /turf/open/gm/coast/beachcorner2/north_east, /area/strata/ug/interior/jungle/structures/monitoring/south) -"gTa" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 4 - }, -/turf/open/auto_turf/strata_grass/layer0, -/area/strata/ug/interior/outpost/platform) "gTc" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ dir = 1 @@ -25228,13 +20989,6 @@ /obj/effect/landmark/survivor_spawner, /turf/open/floor/prison/darkyellowfull2, /area/strata/ag/exterior/outpost_decks) -"gTx" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform_decoration/strata{ - dir = 8 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/landing_zones/near_lz2) "gTB" = ( /obj/item/device/radio, /turf/open/floor/strata, @@ -25262,24 +21016,25 @@ /obj/structure/surface/rack, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outpost/engi/drome) +"gUB" = ( +/obj/structure/machinery/light/small, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/mining_outpost/south_dormitories) +"gUM" = ( +/obj/structure/platform_decoration/stone/strata/east, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/marsh/spring_marshes) "gUP" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 10 }, /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/marsh/crash) -"gVJ" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 8 - }, -/obj/structure/platform_decoration/strata, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/center) +"gUR" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/effect/landmark/survivor_spawner, +/turf/open/floor/strata/white_cyan2/west, +/area/strata/ag/interior/outpost/canteen) "gWg" = ( /turf/open/auto_turf/ice/layer0, /area/strata/ag/exterior/marsh/spring_marshes) @@ -25296,6 +21051,18 @@ }, /turf/open/floor/strata/purp2, /area/strata/ug/interior/jungle/structures/monitoring) +"gWG" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata, +/obj/structure/platform/stone/strata/west, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/center) +"gXu" = ( +/obj/effect/decal/cleanable/blood, +/obj/structure/coatrack, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/canteen) "gXX" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/clipboard, @@ -25304,19 +21071,21 @@ }, /turf/open/floor/strata/orange_cover, /area/strata/ag/interior/outpost/engi/drome) -"gYn" = ( -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/north) -"gYr" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 1 - }, -/turf/open/floor/strata/white_cyan1/east, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) "gZp" = ( /obj/item/tank/emergency_oxygen/engi, /turf/open/floor/almayer/plate, /area/strata/ag/exterior/marsh/crash) +"gZG" = ( +/obj/structure/platform/metal/strata/north, +/obj/structure/bed/chair, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/paths/south_outpost) +"gZI" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/west, +/turf/open/gm/river, +/area/strata/ag/exterior/paths/far_north_outpost) "gZP" = ( /obj/structure/machinery/colony_floodlight, /turf/open/floor/prison/darkyellowfull2, @@ -25329,6 +21098,10 @@ }, /turf/open/floor/strata/orange_cover, /area/strata/ag/interior/outpost/engi/drome) +"haC" = ( +/obj/structure/platform_decoration/metal/strata/west, +/turf/open/floor/strata/floor3/east, +/area/strata/ag/exterior/outpost_decks) "haN" = ( /obj/structure/largecrate/random, /obj/item/trash/pistachios, @@ -25339,23 +21112,41 @@ /obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/plating, /area/strata/ag/exterior/marsh/crash) -"haZ" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/microwave, -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/floor/strata/floor3/east, -/area/strata/ug/interior/outpost/underground_dorms/admin3) "hba" = ( /obj/effect/decal/cleanable/blood, /obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/strata, /area/strata/ug/interior/outpost/underground_dorms/admin2) +"hbo" = ( +/obj/item/stack/rods, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/engi) "hcg" = ( /obj/item/tool/pen/blue, /turf/open/floor/strata/floor3/east, /area/strata/ag/exterior/outpost_decks) +"hci" = ( +/obj/structure/platform_decoration/metal/strata/west, +/turf/open/floor/strata/multi_tiles/west, +/area/strata/ag/exterior/outpost_decks) +"hcu" = ( +/obj/structure/platform/metal/strata/east, +/obj/structure/machinery/light/small{ + dir = 1 + }, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/turf/open/floor/prison/darkyellowfull2, +/area/strata/ag/interior/outpost/engi) +"hcz" = ( +/obj/structure/platform/stone/strata/east, +/obj/structure/platform/stone/strata, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/landing_zones/near_lz2) "hcF" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -25377,17 +21168,31 @@ "hel" = ( /turf/open/floor/strata/floor3/east, /area/strata/ug/interior/outpost/underground_dorms/sec1) +"heA" = ( +/obj/structure/platform/stone/strata/east, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/marsh/center) +"heL" = ( +/obj/structure/pipes/standard/manifold/fourway/hidden/cyan, +/turf/open/floor/prison/darkyellowfull2, +/area/strata/ag/interior/outpost/engi) "heO" = ( /obj/structure/sign/safety/bulkhead_door, /turf/closed/wall/strata_outpost/reinforced, /area/strata/ag/interior/outside/bball) -"hfq" = ( -/obj/structure/platform/strata/metal{ - dir = 1 +"heQ" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 4; + icon_state = "p_stair_sn_full_cap" }, -/obj/effect/decal/strata_decals/catwalk/prison, -/turf/open/floor/greengrid, -/area/strata/ug/interior/jungle/structures/monitoring) +/obj/structure/platform/metal/strata/east, +/turf/open/floor/strata/floor3/east, +/area/strata/ag/exterior/outpost_decks) +"hfk" = ( +/obj/structure/platform_decoration/stone/strata/north, +/turf/open/auto_turf/snow/brown_base/layer4, +/area/strata/ag/exterior/landing_zones/near_lz2) "hfv" = ( /obj/structure/sink{ dir = 8; @@ -25415,17 +21220,11 @@ /obj/structure/sign/safety/ladder, /turf/closed/wall/strata_outpost/reinforced, /area/strata/ag/interior/outside/bball) -"hhW" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 8 - }, -/obj/structure/platform/strata, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/spring_marshes) +"hhH" = ( +/obj/structure/platform/metal/strata/north, +/obj/structure/platform/metal/strata/east, +/turf/open/floor/strata/multi_tiles/southwest, +/area/strata/ag/interior/outpost/foyer) "hhX" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 @@ -25436,32 +21235,48 @@ /obj/structure/flora/grass/ice/brown/snowgrassbb_3, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/marsh/water_marshes) +"hjd" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1 + }, +/turf/open/floor/strata/multi_tiles/west, +/area/strata/ag/interior/mining_outpost/central) +"hjA" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/strata/west, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/multi_tiles/southeast, +/area/strata/ag/interior/outpost/admin) "hjC" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited, /turf/closed/wall/strata_outpost, /area/strata/ug/interior/outpost/underground_dorms/sec2) -"hkn" = ( -/obj/structure/platform/strata/metal, -/obj/structure/barricade/handrail/wire{ - layer = 3.5 - }, -/turf/open/gm/river, -/area/strata/ag/interior/outside/engineering/parts_storage) -"hkA" = ( -/obj/structure/platform/strata{ +"hjW" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/mining_outpost/central) +"hkC" = ( +/obj/structure/machinery/light/small{ dir = 8 }, -/obj/effect/blocker/sorokyne_cold_water, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/water) +/obj/structure/platform/metal/strata/north, +/turf/open/floor/strata/red3, +/area/strata/ag/interior/outpost/med) +"hlZ" = ( +/obj/structure/platform/stone/strata/north, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/caves/lz_caves) "hmf" = ( /obj/structure/largecrate/random, /obj/structure/barricade/handrail/strata, /turf/open/floor/strata/floor3/east, /area/strata/ag/exterior/outpost_decks) -"hmh" = ( -/turf/open/floor/strata/multi_tiles/west, -/area/strata/ag/interior/outpost/hallways/south) "hms" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 8 @@ -25492,6 +21307,34 @@ }, /turf/open/floor/strata/orange_cover, /area/strata/ag/interior/outpost/engi/drome) +"hnF" = ( +/obj/structure/closet/secure_closet/personal, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/prison/darkyellowfull2, +/area/strata/ag/interior/outpost/canteen) +"hnO" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/storage/large_holster/machete/full, +/obj/item/storage/large_holster/machete/full, +/obj/item/storage/large_holster/machete/full, +/obj/effect/spawner/random/toolbox{ + pixel_y = 12 + }, +/obj/structure/platform_decoration/metal/strata/north, +/turf/open/floor/strata/red3/north, +/area/strata/ag/interior/outpost/med) +"hnX" = ( +/obj/structure/machinery/light, +/turf/open/floor/strata/white_cyan3, +/area/strata/ag/interior/outpost/med) +"hof" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata/floor2, +/area/strata/ag/interior/outpost/med) "hoG" = ( /obj/item/lightstick/red/planted, /turf/open/auto_turf/snow/brown_base/layer2, @@ -25504,23 +21347,31 @@ /obj/structure/curtain/medical, /turf/open/floor/strata/floor2, /area/strata/ug/interior/outpost/underground_dorms/med2) -"hqw" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ +"hqJ" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan{ dir = 1 }, -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/water_marshes) +/turf/open/floor/strata/white_cyan2/west, +/area/strata/ag/interior/outpost/canteen) +"hrF" = ( +/obj/structure/platform_decoration/stone/strata/west, +/turf/open/auto_turf/ice/layer1, +/area/strata/ag/interior/outside/engineering/parts_storage_cave) "hsg" = ( /obj/structure/surface/rack, /obj/effect/landmark/good_item, /obj/structure/barricade/handrail/strata, /turf/open/floor/strata/floor2, /area/strata/ug/interior/jungle/structures/monitoring) +"hsq" = ( +/obj/item/lightstick/red/planted, +/obj/structure/platform/stone/strata, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/vanyard) +"hsQ" = ( +/obj/structure/platform/metal/strata/east, +/turf/open/auto_turf/snow/brown_base/layer3, +/area/strata/ag/exterior/paths/flight_control_exterior) "hsV" = ( /obj/structure/machinery/space_heater, /turf/open/floor/strata, @@ -25529,18 +21380,17 @@ /obj/item/device/flashlight, /turf/open/floor/strata, /area/strata/ug/interior/outpost/underground_dorms/sec2) -"hto" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata, -/obj/structure/platform/strata{ +"htf" = ( +/obj/structure/pipes/vents/pump, +/turf/open/floor/strata/multi_tiles/southwest, +/area/strata/ag/interior/outpost/canteen) +"htp" = ( +/obj/structure/bed/chair{ dir = 8 }, -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/river) +/obj/effect/decal/cleanable/blood/gibs/core, +/turf/open/floor/strata/white_cyan2/west, +/area/strata/ag/interior/outpost/canteen) "htD" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /turf/open/auto_turf/strata_grass/layer1, @@ -25551,42 +21401,17 @@ }, /turf/open/asphalt/cement/cement3, /area/strata/ag/exterior/landing_zones/lz2) -"hux" = ( -/obj/structure/pipes/vents/pump{ - dir = 4 - }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/hallways/south) -"hvj" = ( -/obj/structure/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/strata/cyan3/west, -/area/strata/ag/interior/outpost/hallways/south) -"hvz" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/prison/darkyellowfull2, -/area/strata/ag/interior/outpost/hallways/north) -"hwD" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/auto_turf/strata_grass/layer0, -/area/strata/ug/interior/jungle/platform/south) +"hwo" = ( +/obj/item/clipboard, +/turf/open/floor/strata/floor3/east, +/area/strata/ag/interior/outpost/med) "hwI" = ( /turf/open/floor/strata, /area/strata/ug/interior/outpost/underground_dorms/admin1) -"hyh" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - dir = 4; - icon_state = "p_stair_sn_full_cap" - }, -/turf/open/floor/strata/multi_tiles/west, -/area/strata/ag/interior/outpost/canteen) +"hxj" = ( +/obj/structure/platform/stone/strata/north, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/paths/south_outpost) "hyu" = ( /obj/effect/landmark/corpsespawner/russian, /turf/open/auto_turf/strata_grass/layer0_mud, @@ -25597,6 +21422,17 @@ }, /turf/open/asphalt/cement/cement3, /area/strata/ag/exterior/landing_zones/lz2) +"hAq" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata/east, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/center) +"hAw" = ( +/obj/structure/platform/metal/strata, +/obj/item/lightstick/red/planted, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/paths/south_outpost) "hCp" = ( /obj/item/reagent_container/food/drinks/cans/beer, /turf/open/floor/strata/white_cyan1/east, @@ -25607,6 +21443,10 @@ }, /turf/open/floor/strata/multi_tiles/southeast, /area/strata/ug/interior/jungle/tearlake) +"hDK" = ( +/obj/structure/platform_decoration/metal/strata/east, +/turf/open/auto_turf/strata_grass/layer0, +/area/strata/ug/interior/jungle/platform/south) "hDX" = ( /obj/structure/stairs/perspective{ color = "#6e6e6e"; @@ -25620,6 +21460,11 @@ /obj/item/tool/mop, /turf/open/floor/strata, /area/strata/ag/interior/outpost/canteen) +"hEB" = ( +/obj/effect/decal/cleanable/generic, +/obj/structure/platform/metal/strata/east, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/paths/flight_control_exterior) "hEF" = ( /obj/structure/inflatable/door, /turf/open/floor/strata/multi_tiles/southwest, @@ -25634,37 +21479,12 @@ }, /turf/open/floor/strata/multi_tiles/southeast, /area/strata/ug/interior/jungle/tearlake) -"hFK" = ( -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/outpost/hallways/south) -"hGd" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/floor/strata/red3, -/area/strata/ag/interior/outpost/med) -"hGm" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - dir = 4; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/turf/open/asphalt/cement, -/area/strata/ug/interior/outpost/platform) "hGH" = ( /obj/structure/bed/chair{ dir = 4 }, /turf/open/asphalt/cement, /area/strata/ag/interior/outside/administration) -"hGO" = ( -/obj/structure/platform/strata, -/obj/effect/blocker/sorokyne_cold_water, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/water) "hHm" = ( /obj/item/stack/rods, /obj/structure/blocker/forcefield/multitile_vehicles, @@ -25692,12 +21512,13 @@ /obj/structure/largecrate/random/secure, /turf/open/floor/almayer/plate, /area/strata/ag/exterior/marsh/crash) +"hIl" = ( +/obj/structure/platform/metal/strata/north, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/paths/south_outpost) "hIt" = ( /turf/open/floor/strata/white_cyan2/west, /area/strata/ug/interior/outpost/underground_dorms/med1) -"hJg" = ( -/turf/open/floor/strata/red1, -/area/strata/ag/interior/outpost/hallways/north) "hJv" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 @@ -25714,10 +21535,29 @@ "hJT" = ( /turf/open/asphalt/cement/cement12, /area/strata/ag/exterior/paths/north_outpost) +"hKf" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/east, +/turf/open/auto_turf/ice/layer0, +/area/strata/ag/exterior/marsh/spring_marshes) +"hLc" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/paper_bin, +/obj/item/tool/pen/blue, +/obj/structure/pipes/standard/simple/hidden/cyan, +/obj/structure/barricade/handrail/strata{ + dir = 4 + }, +/turf/open/floor/strata/orange_cover, +/area/strata/ag/interior/outpost/engi/drome) "hLf" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/asphalt/cement, /area/strata/ag/interior/outside/engineering/parts_storage_exterior) +"hLX" = ( +/obj/structure/platform_decoration/stone/strata/east, +/turf/open/auto_turf/ice/layer1, +/area/strata/ag/exterior/marsh/spring_marshes) "hMs" = ( /obj/structure/flora/bush/ausbushes/grassybush, /turf/open/auto_turf/strata_grass/layer1, @@ -25726,6 +21566,20 @@ /obj/structure/flora/grass/tallgrass/ice/corner, /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/marsh/spring_marshes) +"hMQ" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 4; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/strata/east, +/turf/open/floor/prison/darkyellowfull2, +/area/strata/ag/exterior/outpost_decks) +"hNm" = ( +/obj/item/lightstick/red/planted, +/obj/structure/platform/metal/strata, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/paths/mining_outpost_exterior) "hNq" = ( /obj/item/lightstick/red/spoke/planted{ layer = 3.1; @@ -25743,6 +21597,10 @@ }, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/structures/monitoring/south) +"hNP" = ( +/obj/structure/platform_decoration/stone/strata/north, +/turf/open/auto_turf/ice/layer1, +/area/strata/ag/exterior/marsh/spring_marshes) "hOa" = ( /turf/open/gm/river, /area/strata/ag/exterior/jungle/carplake_center) @@ -25763,17 +21621,15 @@ "hPr" = ( /turf/open/auto_turf/ice/layer2, /area/strata/ag/exterior/landing_zones/near_lz2) +"hPv" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata/white_cyan3/east, +/area/strata/ag/interior/outpost/med) "hPK" = ( /turf/open/asphalt/cement, /area/strata/ag/exterior/caves/shed_five_caves) -"hPZ" = ( -/obj/structure/machinery/space_heater, -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/obj/structure/machinery/light/small, -/turf/open/floor/strata/floor3/east, -/area/strata/ug/interior/outpost/underground_dorms/med2) "hQq" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/structure/pipes/standard/manifold/hidden/cyan{ @@ -25805,6 +21661,24 @@ }, /turf/open/floor/strata/purp2, /area/strata/ug/interior/jungle/platform/south) +"hTr" = ( +/obj/structure/pipes/vents/pump{ + dir = 8 + }, +/turf/open/floor/strata/white_cyan1/east, +/area/strata/ag/interior/outpost/canteen) +"hTM" = ( +/obj/structure/flora/grass/tallgrass/ice/corner{ + dir = 1 + }, +/obj/structure/platform/metal/strata/east, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/barricade/handrail/strata{ + layer = 3.1 + }, +/obj/structure/platform/metal/strata, +/turf/open/gm/river, +/area/strata/ag/exterior/outpost_decks) "hTU" = ( /obj/structure/reagent_dispensers/water_cooler/stacks, /turf/open/floor/strata/floor3/east, @@ -25820,6 +21694,10 @@ /obj/structure/flora/bush/ausbushes/ausbush, /turf/open/gm/dirt, /area/strata/ug/interior/jungle/tearlake) +"hUp" = ( +/obj/structure/platform/metal/strata/east, +/turf/open/auto_turf/snow/brown_base/layer3, +/area/strata/ag/exterior/caves/shed_five_caves) "hUJ" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/structure/disposalpipe/segment{ @@ -25827,6 +21705,21 @@ }, /turf/open/floor/plating, /area/strata/ag/interior/outside/engineering/parts_storage) +"hVx" = ( +/obj/structure/platform/metal/strata/west, +/turf/open/auto_turf/snow/brown_base/layer4, +/area/strata/ag/exterior/paths/flight_control_exterior) +"hVK" = ( +/obj/structure/barricade/wooden{ + dir = 8 + }, +/turf/open/floor/strata/red1, +/area/strata/ag/interior/outpost/security) +"hVY" = ( +/obj/structure/platform/stone/strata/west, +/obj/structure/platform/stone/strata, +/turf/open/auto_turf/snow/brown_base/layer3, +/area/strata/ag/exterior/marsh/spring_marshes) "hWk" = ( /turf/open/gm/coast/beachcorner2/north_west, /area/strata/ag/exterior/jungle/carplake_center) @@ -25854,14 +21747,49 @@ }, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/interior/outpost/maint) +"iaa" = ( +/obj/structure/platform/metal/strata/east, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/paths/flight_control_exterior) +"iam" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata/white_cyan3/west, +/area/strata/ag/interior/outpost/med) "iau" = ( /obj/structure/curtain/open/medical, /turf/open/floor/strata, /area/strata/ag/interior/outpost/maint) +"iaB" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata/fake_wood, +/area/strata/ag/interior/mining_outpost/south_dormitories) +"iaK" = ( +/obj/structure/bedsheetbin, +/turf/open/floor/strata/blue1, +/area/strata/ag/interior/outpost/canteen) +"iaL" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/east, +/obj/effect/blocker/sorokyne_cold_water, +/turf/open/gm/river, +/area/strata/ag/exterior/paths/far_north_outpost) "ibh" = ( /obj/item/lightstick/red/planted, /turf/open/auto_turf/ice/layer2, /area/strata/ag/exterior/landing_zones/near_lz2) +"ibn" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/canteen) +"ibC" = ( +/obj/structure/filingcabinet, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/mining_outpost/south_dormitories) "ibE" = ( /obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/strata/floor3/east, @@ -25871,6 +21799,15 @@ /obj/effect/decal/cleanable/blood/gibs/core, /turf/open/floor/strata, /area/strata/ag/interior/outside/engineering/parts_storage) +"ibP" = ( +/obj/structure/platform/stone/strata, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/marsh/crash) +"icf" = ( +/obj/item/stack/rods, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/white_cyan2/west, +/area/strata/ag/interior/outpost/canteen) "ich" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -25906,12 +21843,38 @@ "icN" = ( /turf/closed/wall/strata_outpost, /area/strata/ag/interior/outpost/security) +"icZ" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/strata/blue1, +/area/strata/ag/interior/outpost/admin) "idq" = ( /obj/structure/machinery/camera/autoname{ dir = 8 }, /turf/open/floor/strata/purp2, /area/strata/ug/interior/jungle/structures/monitoring) +"idv" = ( +/obj/structure/machinery/washing_machine, +/obj/item/clothing/suit/bluetag, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/canteen) +"idO" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/phone{ + pixel_x = 8; + pixel_y = 6 + }, +/obj/item/device/flashlight/lamp, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/canteen) "idR" = ( /obj/structure/bed/sofa/vert/grey/bot, /turf/open/floor/strata/fake_wood, @@ -25919,13 +21882,35 @@ "idW" = ( /turf/closed/wall/strata_outpost/reinforced/hull, /area/strata/ug/interior/outpost/underground_dorms/sec1) -"igm" = ( -/obj/structure/bed/chair{ +"ieu" = ( +/obj/structure/flora/grass/tallgrass/ice/corner{ + dir = 1 + }, +/obj/structure/platform/stone/strata/west, +/turf/open/auto_turf/ice/layer1, +/area/strata/ag/exterior/marsh/spring_marshes) +"ifc" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + icon_state = "p_stair_full" + }, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/canteen) +"igf" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/orange_edge/east, -/area/strata/ag/interior/mining_outpost/hallways) +/turf/open/floor/strata/multi_tiles/southwest, +/area/strata/ag/interior/outpost/security) +"igy" = ( +/obj/structure/flora/grass/tallgrass/ice/corner{ + dir = 4 + }, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/metal/strata/north, +/turf/open/gm/river, +/area/strata/ag/exterior/outpost_decks) "ihd" = ( /obj/structure/bookcase{ icon_state = "book-5" @@ -25938,6 +21923,11 @@ }, /turf/open/floor/strata/floor3/east, /area/strata/ug/interior/outpost/underground_dorms/sec1) +"ihE" = ( +/obj/structure/platform/metal/strata/north, +/obj/structure/platform/metal/strata/east, +/turf/open/auto_turf/snow/brown_base/layer3, +/area/strata/ag/exterior/paths/flight_control_exterior) "ijf" = ( /turf/open/floor/strata/blue4/east, /area/strata/ag/interior/outpost/admin) @@ -25979,6 +21969,22 @@ }, /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/marsh/spring_marshes) +"ing" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/east, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/caves/lz_caves) +"ioa" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/cameras{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/cyan, +/obj/structure/barricade/handrail/strata{ + dir = 4 + }, +/turf/open/floor/strata/orange_cover, +/area/strata/ag/interior/outpost/engi/drome) "ioi" = ( /turf/open/floor/strata/multi_tiles, /area/strata/ug/interior/outpost/platform) @@ -26007,51 +22013,48 @@ /obj/structure/barricade/handrail/strata, /turf/open/floor/strata/floor2, /area/strata/ug/interior/jungle/structures/monitoring) +"ipH" = ( +/obj/structure/platform/metal/strata/north, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/paths/flight_control_exterior) "iqe" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" }, /turf/open/floor/strata, /area/strata/ug/interior/outpost/underground_dorms/sec1) -"iqy" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/hallways/north) "iqD" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/strata/multi_tiles/southeast, /area/strata/ag/interior/mining_outpost/central) -"iqV" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 8 - }, -/obj/structure/platform/strata{ +"iqY" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/center) +/obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor/colony{ + dir = 1; + name = "\improper Airlock" + }, +/turf/open/floor/strata/multi_tiles/west, +/area/strata/ag/interior/outpost/foyer) "iry" = ( /obj/structure/bed/chair/office/dark{ dir = 8 }, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outside/checkpoints/north) +"irA" = ( +/obj/structure/platform/metal/strata/east, +/obj/effect/decal/strata_decals/catwalk/prison, +/turf/open/floor/greengrid, +/area/strata/ag/interior/outpost/engi) "isa" = ( /turf/open/floor/strata, /area/strata/ag/interior/outside/checkpoints/north) -"isd" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/turf/open/auto_turf/ice/layer2, -/area/strata/ag/exterior/marsh/spring_marshes) +"ise" = ( +/obj/structure/platform/metal/strata/east, +/turf/open/floor/strata/multi_tiles/southwest, +/area/strata/ag/exterior/outpost_decks) "isj" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -26061,6 +22064,10 @@ "isu" = ( /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outside/checkpoints/north) +"isx" = ( +/obj/structure/platform/stone/strata/west, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/caves/lz_caves) "isY" = ( /obj/structure/machinery/space_heater, /obj/structure/machinery/light/small{ @@ -26083,6 +22090,13 @@ }, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/interior/outside/engineering/parts_storage) +"itQ" = ( +/obj/structure/machinery/vending/snack, +/obj/structure/machinery/camera/autoname{ + dir = 4 + }, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/canteen) "iuf" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /obj/structure/flora/pottedplant{ @@ -26111,6 +22125,10 @@ "ivF" = ( /turf/closed/wall/strata_outpost/reinforced/hull, /area/strata/ug/interior/outpost/underground_dorms/admin3) +"ivW" = ( +/obj/structure/platform/stone/strata, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/marsh/river) "ivY" = ( /obj/structure/flora/grass/tallgrass/ice/corner, /turf/open/auto_turf/ice/layer1, @@ -26133,18 +22151,11 @@ /obj/structure/closet/bodybag, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outside/engineering/parts_storage) -"ixu" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 8 - }, -/obj/structure/platform_decoration/strata, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/river) +"ixi" = ( +/obj/structure/platform/metal/strata/north, +/obj/structure/machinery/space_heater, +/turf/open/floor/strata/floor3/east, +/area/strata/ug/interior/outpost/underground_dorms/admin3) "ixD" = ( /turf/open/floor/strata/floor2, /area/strata/ug/interior/jungle/structures/monitoring) @@ -26174,11 +22185,20 @@ }, /turf/open/floor/strata/multi_tiles, /area/strata/ag/interior/mining_outpost/hive) +"izx" = ( +/obj/structure/platform_decoration/metal/strata/north, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/paths/flight_control_exterior) "iAA" = ( /obj/structure/closet/emcloset, /obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/strata, /area/strata/ag/interior/outside/engineering/parts_storage) +"iAQ" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform_decoration/stone/strata/west, +/turf/open/gm/river, +/area/strata/ag/exterior/landing_zones/near_lz2) "iBM" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/structure/disposalpipe/segment{ @@ -26203,6 +22223,12 @@ /obj/effect/landmark/objective_landmark/far, /turf/open/floor/interior/plastic, /area/strata/ag/exterior/paths/far_north_outpost) +"iCd" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata/floor3/east, +/area/strata/ag/interior/outpost/engi/drome) "iCt" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/structure/machinery/light/small{ @@ -26215,6 +22241,11 @@ /obj/item/storage/toolbox/electrical, /turf/open/floor/strata, /area/strata/ag/interior/outpost/engi/drome) +"iDE" = ( +/obj/structure/platform_decoration/metal/strata/east, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/engi/drome) "iEo" = ( /turf/closed/shuttle/ert{ icon_state = "upp8" @@ -26223,12 +22254,6 @@ "iEU" = ( /turf/closed/wall/strata_outpost, /area/strata/ug/interior/outpost/underground_dorms/med1) -"iGm" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/mining_outpost/hallways) "iGp" = ( /obj/structure/machinery/power/reactor/colony, /obj/structure/machinery/camera/autoname, @@ -26247,19 +22272,16 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/auto_turf/strata_grass/layer0, /area/strata/ug/interior/jungle/platform/south) -"iIz" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata, -/obj/structure/platform_decoration/strata{ - dir = 8 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/center) "iJh" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/paths/far_north_outpost) +"iJi" = ( +/obj/structure/platform_decoration/metal/strata/east, +/obj/structure/platform_decoration/metal/strata/west, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/auto_turf/snow/brown_base/layer3, +/area/strata/ag/exterior/paths/flight_control_exterior) "iJp" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/clothing/gloves/latex, @@ -26274,17 +22296,16 @@ /obj/structure/flora/grass/tallgrass/jungle, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/tearlake) -"iJJ" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform_decoration/strata{ +"iJG" = ( +/obj/structure/window/framed/strata/reinforced, +/turf/open/floor/strata/multi_tiles/southeast, +/area/strata/ag/interior/outpost/canteen) +"iKd" = ( +/obj/structure/machinery/light{ dir = 1 }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/center) +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/mining_outpost/south_dormitories) "iKI" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/auto_turf/snow/brown_base/layer0, @@ -26304,6 +22325,10 @@ "iLJ" = ( /turf/open/floor/prison/darkyellowfull2, /area/strata/ag/exterior/outpost_decks) +"iMd" = ( +/obj/structure/platform_decoration/stone/strata/east, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/vanyard) "iMn" = ( /obj/structure/surface/rack{ layer = 2.5 @@ -26340,6 +22365,10 @@ }, /turf/open/floor/strata/multi_tiles/southeast, /area/strata/ag/interior/outside/engineering/parts_storage) +"iOF" = ( +/obj/structure/platform/stone/strata/east, +/turf/open/auto_turf/ice/layer1, +/area/strata/ag/interior/outside/engineering/parts_storage_cave) "iPd" = ( /obj/structure/pipes/standard/simple/hidden/cyan, /turf/open/floor/strata/floor3/east, @@ -26366,6 +22395,17 @@ }, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/platform/south) +"iPR" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 10 + }, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/canteen) +"iQb" = ( +/obj/item/lightstick/red/planted, +/obj/structure/platform/stone/strata/north, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/vanyard) "iQi" = ( /obj/effect/decal/cleanable/blood/oil/streak, /obj/structure/pipes/standard/simple/hidden/cyan{ @@ -26378,14 +22418,13 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/floor/strata/blue1, /area/strata/ag/interior/outpost/admin) -"iQS" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/barricade/handrail/strata{ - layer = 3.1 - }, -/obj/structure/platform/strata/metal, -/turf/open/gm/river, -/area/strata/ag/exterior/outpost_decks) +"iQB" = ( +/obj/structure/closet/secure_closet/engineering_personal, +/obj/structure/platform/metal/strata/east, +/obj/item/stack/sheet/plasteel/medium_stack, +/obj/effect/landmark/objective_landmark/science, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/engi) "iRk" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/auto_turf/strata_grass/layer1, @@ -26404,17 +22443,31 @@ "iSe" = ( /turf/open/gm/coast/beachcorner/north_west, /area/strata/ug/interior/jungle/structures/monitoring/south) +"iSt" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan{ + dir = 1 + }, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/admin) +"iTu" = ( +/obj/structure/platform/stone/strata/north, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/landing_zones/near_lz2) "iTC" = ( /obj/structure/flora/grass/tallgrass/jungle, /turf/open/auto_turf/strata_grass/layer0, /area/strata/ug/interior/jungle/structures/monitoring/east) -"iTY" = ( -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/auto_turf/snow/brown_base/layer4, -/area/strata/ag/exterior/paths/flight_control_exterior) +"iTW" = ( +/obj/effect/particle_effect/steam, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/river) +"iUj" = ( +/obj/structure/platform/metal/strata/north, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/auto_turf/strata_grass/layer0, +/area/strata/ug/interior/jungle/platform/south) "iUw" = ( /obj/structure/prop/dam/crane/cargo, /turf/open/floor/strata, @@ -26437,6 +22490,12 @@ /obj/effect/landmark/objective_landmark/far, /turf/open/floor/strata/blue1, /area/strata/ag/interior/outpost/admin) +"iVy" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 5 + }, +/turf/open/floor/strata/multi_tiles/southwest, +/area/strata/ag/interior/outpost/med) "iVX" = ( /obj/effect/landmark/queen_spawn, /turf/open/auto_turf/strata_grass/layer1, @@ -26464,6 +22523,11 @@ }, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/structures/monitoring/east) +"iWY" = ( +/obj/structure/platform/metal/strata/west, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/asphalt/cement/cement3, +/area/strata/ag/interior/landing_zones/lz1) "iWZ" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 1 @@ -26484,6 +22548,14 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/platform/east) +"iXp" = ( +/obj/structure/platform/metal/strata/north, +/turf/open/floor/strata, +/area/strata/ag/exterior/outpost_decks) +"iYM" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/engi/drome) "iZa" = ( /obj/structure/closet/secure_closet/personal, /obj/structure/barricade/handrail/strata{ @@ -26509,10 +22581,23 @@ /obj/structure/flora/grass/tallgrass/ice, /turf/open/auto_turf/ice/layer2, /area/strata/ag/exterior/marsh/spring_marshes) +"jae" = ( +/obj/structure/platform/metal/strata, +/obj/structure/barricade/handrail/wire{ + layer = 3.5 + }, +/turf/open/gm/river, +/area/strata/ag/interior/outside/engineering/parts_storage) "jam" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/strata/cyan2/east, /area/strata/ag/interior/outpost/med) +"jar" = ( +/obj/effect/particle_effect/steam, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform_decoration/metal/strata/east, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/river) "jaZ" = ( /obj/structure/flora/bush/ausbushes/reedbush, /turf/open/gm/coast/north, @@ -26529,20 +22614,17 @@ }, /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/paths/south_outpost) -"jbI" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 4 - }, -/obj/effect/blocker/sorokyne_cold_water, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/water) "jdC" = ( /obj/structure/window/framed/strata, /turf/open/floor/strata, /area/strata/ag/interior/outpost/security) +"jeh" = ( +/obj/structure/platform/metal/strata/north, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/turf/open/floor/prison/darkyellowfull2, +/area/strata/ag/interior/outpost/engi) "jeF" = ( /obj/structure/machinery/space_heater, /turf/open/floor/strata/red1, @@ -26559,6 +22641,19 @@ }, /turf/open/floor/strata/floor3, /area/strata/ag/interior/mining_outpost/central) +"jfo" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/west, +/obj/effect/blocker/sorokyne_cold_water, +/turf/open/gm/river, +/area/strata/ag/exterior/paths/far_north_outpost) +"jfD" = ( +/obj/structure/platform/metal/strata/west, +/obj/structure/pipes/standard/manifold/hidden/cyan{ + dir = 4 + }, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/paths/flight_control_exterior) "jgI" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/structure/disposalpipe/segment, @@ -26575,9 +22670,36 @@ }, /turf/open/floor/strata/orange_cover, /area/strata/ag/exterior/marsh/river) +"jhb" = ( +/obj/structure/platform/metal/strata/north, +/obj/structure/platform/metal/strata/west, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/auto_turf/strata_grass/layer0, +/area/strata/ug/interior/jungle/platform/east) +"jhI" = ( +/obj/structure/platform_decoration/stone/strata/west, +/obj/structure/platform_decoration/stone/strata/north, +/obj/effect/blocker/sorokyne_cold_water, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/water) "jit" = ( /turf/open/asphalt/cement/cement2, /area/strata/ag/exterior/landing_zones/lz2) +"jiw" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata, +/obj/structure/platform/stone/strata/east, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/center) +"jiH" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/machinery/light, +/turf/open/floor/strata/multi_tiles/southwest, +/area/strata/ag/interior/outpost/engi) "jiQ" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/strata/purp2, @@ -26589,6 +22711,11 @@ "jjJ" = ( /turf/closed/wall/strata_outpost, /area/strata/ag/exterior/outpost_decks) +"jkb" = ( +/obj/structure/platform/metal/strata/east, +/obj/structure/platform/metal/strata, +/turf/open/auto_turf/snow/brown_base/layer3, +/area/strata/ag/exterior/paths/flight_control_exterior) "jkc" = ( /obj/structure/bed/chair{ dir = 8 @@ -26611,6 +22738,16 @@ "jkp" = ( /turf/open/floor/strata/white_cyan2/west, /area/strata/ag/interior/outpost/med) +"jkT" = ( +/obj/structure/platform/stone/strata/north, +/turf/open/auto_turf/snow/brown_base/layer4, +/area/strata/ag/exterior/marsh/spring_marshes) +"jkU" = ( +/obj/effect/particle_effect/steam, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata/north, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/spring_marshes) "jmx" = ( /obj/structure/flora/grass/tallgrass/jungle, /obj/effect/landmark/monkey_spawn, @@ -26643,6 +22780,30 @@ /obj/structure/prop/dam/drill, /turf/open/floor/plating, /area/strata/ag/exterior/marsh/crash) +"joL" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + icon_state = "p_stair_full" + }, +/turf/open/floor/strata/orange_cover, +/area/strata/ag/interior/outpost/admin) +"jpC" = ( +/obj/effect/sentry_landmark/lz_2/top_left, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/landing_zones/near_lz2) +"jpP" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/effect/decal/cleanable/blood, +/obj/effect/decal/cleanable/blood/gibs/core, +/turf/open/floor/strata/white_cyan2/west, +/area/strata/ag/interior/outpost/canteen) +"jpY" = ( +/obj/structure/platform/stone/strata, +/obj/structure/platform/stone/strata/west, +/turf/open/auto_turf/snow/brown_base/layer3, +/area/strata/ag/exterior/marsh/spring_marshes) "jqg" = ( /obj/structure/surface/rack, /obj/item/book/manual/detective, @@ -26667,21 +22828,21 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/auto_turf/snow/brown_base/layer4, /area/strata/ag/exterior/paths/far_north_outpost) -"jrU" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 8 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/water) +"jsc" = ( +/obj/structure/platform/stone/strata/north, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/landing_zones/near_lz2) "jsd" = ( /obj/structure/machinery/cm_vending/sorted/medical/no_access, /obj/structure/medical_supply_link, /turf/open/floor/strata/floor2, /area/strata/ag/interior/outpost/med) +"jsg" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata/white_cyan2/west, +/area/strata/ag/interior/outpost/canteen) "jso" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/strata/orange_cover, @@ -26690,17 +22851,12 @@ /obj/structure/closet/bodybag, /turf/open/auto_turf/ice/layer1, /area/strata/ag/interior/outside/engineering/parts_storage_cave) -"jsP" = ( +"jsx" = ( /obj/effect/blocker/sorokyne_cold_water, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 4 - }, +/obj/structure/platform/stone/strata, +/obj/structure/platform/stone/strata/east, /turf/open/gm/river, -/area/strata/ag/exterior/marsh/center) +/area/strata/ag/exterior/marsh/crash) "jsW" = ( /obj/structure/closet/bodybag/tarp/snow, /obj/structure/closet/bodybag/tarp/snow, @@ -26731,13 +22887,10 @@ /obj/structure/sign/safety/synth_storage, /turf/closed/wall/strata_outpost, /area/strata/ag/exterior/vanyard) -"jwv" = ( -/obj/structure/platform/strata/metal, -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/paths/flight_control_exterior) +"jvU" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/fake_wood, +/area/strata/ag/interior/outpost/admin) "jww" = ( /obj/structure/sign/safety/biohazard, /turf/closed/wall/strata_outpost/reinforced, @@ -26751,9 +22904,6 @@ /obj/structure/window/framed/strata, /turf/open/floor/strata/multi_tiles/west, /area/strata/ag/interior/mining_outpost/south_dormitories) -"jyw" = ( -/turf/open/floor/strata/multi_tiles/southwest, -/area/strata/ag/interior/outpost/hallways/north) "jyE" = ( /obj/structure/machinery/cm_vending/sorted/marine_food, /obj/structure/machinery/light, @@ -26773,19 +22923,10 @@ "jzV" = ( /turf/closed/wall/wood, /area/strata/ag/exterior/paths/far_north_outpost) -"jAo" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform_decoration/strata{ - dir = 1 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/landing_zones/near_lz2) -"jAE" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/strata/white_cyan3/east, -/area/strata/ag/interior/outpost/hallways/south) +"jAW" = ( +/obj/structure/platform_decoration/stone/strata/north, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/vanyard) "jBc" = ( /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/interior/outside/engineering/parts_storage_cave) @@ -26793,6 +22934,18 @@ /obj/structure/machinery/power/reactor/colony, /turf/open/floor/strata/floor3, /area/strata/ag/interior/outpost/admin) +"jBG" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/condiment/peppermill, +/obj/effect/decal/cleanable/blood/gibs/down, +/turf/open/floor/strata/orange_cover, +/area/strata/ag/interior/outpost/canteen) +"jBN" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/strata/multi_tiles/southwest, +/area/strata/ag/interior/outpost/canteen) "jBO" = ( /obj/structure/machinery/light, /obj/structure/pipes/standard/manifold/hidden/cyan, @@ -26814,20 +22967,6 @@ /obj/effect/decal/strata_decals/catwalk/prison, /turf/open/floor/greengrid, /area/strata/ug/interior/jungle/structures/monitoring) -"jDO" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - dir = 4; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/turf/open/floor/strata/multi_tiles/southwest, -/area/strata/ug/interior/outpost/platform) -"jEt" = ( -/turf/closed/wall/strata_outpost, -/area/strata/ag/interior/outpost/hallways/north) "jEB" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 @@ -26840,6 +22979,12 @@ }, /turf/closed/wall/strata_outpost/reinforced, /area/strata/ag/exterior/paths/north_outpost) +"jER" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata/north, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/center) "jEW" = ( /obj/structure/filingcabinet, /obj/structure/machinery/light/small{ @@ -26851,9 +22996,9 @@ /obj/effect/landmark/static_comms/net_two, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/marsh/center) -"jIv" = ( -/obj/structure/platform_decoration/strata/metal, -/turf/open/floor/strata/multi_tiles, +"jIn" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata, /area/strata/ag/interior/mining_outpost/central) "jIw" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, @@ -26867,6 +23012,10 @@ /obj/effect/acid_hole, /turf/closed/wall/strata_outpost, /area/strata/ag/interior/outside/engineering/parts_storage) +"jIV" = ( +/obj/structure/bed/sofa/vert/grey/bot, +/turf/open/floor/strata/blue1, +/area/strata/ag/interior/outpost/admin) "jJq" = ( /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/tcomms/mining_caves) @@ -26895,6 +23044,13 @@ }, /turf/open/floor/strata/multi_tiles/west, /area/strata/ag/exterior/outpost_decks) +"jLH" = ( +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/obj/structure/platform/metal/strata, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/engi) "jLY" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/paper_bin, @@ -26902,49 +23058,71 @@ /obj/structure/pipes/vents/pump/on, /turf/open/floor/strata/orange_cover, /area/strata/ag/interior/outpost/engi/drome) -"jMD" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata, -/obj/structure/platform/strata{ - dir = 4 - }, -/obj/structure/platform_decoration/strata{ - dir = 4 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/center) "jMV" = ( /obj/structure/machinery/light/small, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/interior/outside/engineering/parts_storage) +"jNa" = ( +/obj/structure/machinery/camera/autoname{ + dir = 4 + }, +/turf/open/floor/strata/white_cyan4/east, +/area/strata/ag/interior/outpost/med) +"jNs" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/trash/plate{ + pixel_x = 1; + pixel_y = 3 + }, +/obj/item/reagent_container/food/condiment/saltshaker, +/turf/open/floor/strata/red1, +/area/strata/ag/interior/outpost/canteen) +"jNE" = ( +/obj/structure/window/reinforced/tinted, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/security) "jNJ" = ( /obj/structure/machinery/disposal, /turf/open/floor/strata/purp2, /area/strata/ug/interior/jungle/structures/monitoring) -"jNO" = ( -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/south) +"jOc" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/multi_tiles/southwest, +/area/strata/ag/interior/outpost/engi/drome) "jOl" = ( /turf/closed/wall/strata_outpost/reinforced, /area/strata/ag/interior/mining_outpost/canteen) -"jOp" = ( -/obj/item/stool, -/obj/structure/machinery/light, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/canteen/personal_storage) -"jOV" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 8 - }, -/turf/open/auto_turf/strata_grass/layer0, -/area/strata/ug/interior/outpost/platform) "jPc" = ( /obj/structure/machinery/door/airlock/almayer/command{ dir = 2 }, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ug/interior/jungle/structures/monitoring) +"jPs" = ( +/obj/structure/platform_decoration/metal/strata/west, +/obj/effect/decal/strata_decals/catwalk/prison, +/turf/open/floor/greengrid, +/area/strata/ag/interior/outside/engineering/parts_storage) +"jPA" = ( +/obj/structure/platform/metal/strata/west, +/turf/open/floor/strata/fake_wood, +/area/strata/ag/interior/outpost/engi) +"jPC" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 4; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/strata/east, +/turf/open/asphalt/cement, +/area/strata/ag/exterior/outpost_decks) "jPQ" = ( /obj/structure/machinery/landinglight/ds2{ dir = 4 @@ -26963,6 +23141,10 @@ /obj/structure/flora/grass/tallgrass/jungle/corner, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/platform/south) +"jQj" = ( +/obj/structure/platform_decoration/stone/strata/east, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/caves/lz_caves) "jQx" = ( /obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/plating, @@ -26970,6 +23152,20 @@ "jRc" = ( /turf/open/gm/dirt, /area/strata/ag/exterior/jungle/carplake_center) +"jRs" = ( +/obj/structure/platform/metal/strata/north, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/marsh/spring_marshes) +"jRJ" = ( +/obj/structure/platform/metal/strata/north, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/metal/strata/west, +/turf/open/gm/river, +/area/strata/ag/exterior/outpost_decks) +"jSp" = ( +/obj/structure/pipes/vents/pump/on, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/mining_outpost/central) "jUa" = ( /obj/structure/blocker/invisible_wall, /turf/open/gm/coast/west, @@ -26984,18 +23180,33 @@ /obj/effect/landmark/survivor_spawner, /turf/open/floor/strata/cyan2/east, /area/strata/ag/interior/outpost/med) +"jUy" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + icon_state = "p_stair_ew_full_cap"; + layer = 3.5 + }, +/obj/structure/platform/metal/stair_cut/strata_right, +/turf/open/floor/strata/multi_tiles, +/area/strata/ag/exterior/paths/mining_outpost_exterior) "jUA" = ( /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/carplake/north) -"jUS" = ( -/obj/structure/flora/grass/tallgrass/ice/corner{ - dir = 1 +"jUG" = ( +/obj/effect/decal/cleanable/blood{ + layer = 3 }, -/obj/structure/platform/strata{ +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata/red1, +/area/strata/ag/interior/outpost/security) +"jUZ" = ( +/obj/structure/bed/chair{ dir = 8 }, -/turf/open/auto_turf/ice/layer1, -/area/strata/ag/exterior/marsh/spring_marshes) +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/canteen) "jVg" = ( /obj/effect/decal/cleanable/blood/oil, /obj/structure/machinery/power/apc/no_power/west, @@ -27008,6 +23219,12 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/strata/floor3/east, /area/strata/ag/exterior/outpost_decks) +"jVT" = ( +/obj/structure/platform/metal/strata/north, +/obj/structure/platform/metal/strata/east, +/obj/structure/machinery/colony_floodlight, +/turf/open/floor/strata/multi_tiles/southwest, +/area/strata/ag/exterior/outpost_decks) "jVU" = ( /obj/effect/landmark/corpsespawner/doctor, /obj/effect/decal/cleanable/blood, @@ -27070,12 +23287,6 @@ /obj/item/lightstick, /turf/open/floor/strata/floor3/east, /area/strata/ug/interior/outpost/underground_dorms/sec1) -"kbS" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/cyan2/east, -/area/strata/ag/interior/outpost/hallways/south) "kbU" = ( /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/blood{ @@ -27083,6 +23294,15 @@ }, /turf/open/floor/strata, /area/strata/ug/interior/outpost/underground_dorms/admin2) +"kcq" = ( +/obj/structure/flora/grass/tallgrass/ice/corner{ + dir = 4 + }, +/obj/structure/platform/stone/strata/west, +/obj/structure/platform/stone/strata, +/obj/effect/blocker/sorokyne_cold_water, +/turf/open/gm/river, +/area/strata/ag/exterior/paths/far_north_outpost) "kcy" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -27107,17 +23327,6 @@ /obj/structure/curtain/medical, /turf/open/floor/strata/floor2, /area/strata/ug/interior/outpost/underground_dorms/med1) -"kes" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/computer/cameras{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/cyan, -/obj/structure/barricade/handrail/strata{ - dir = 4 - }, -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/outpost/hallways/south) "kew" = ( /turf/open/floor/strata/floor3/east, /area/strata/ug/interior/jungle/tearlake) @@ -27176,6 +23385,12 @@ "khT" = ( /turf/closed/wall/strata_outpost, /area/strata/ug/interior/jungle/structures/monitoring) +"kif" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata/blue3/north, +/area/strata/ag/interior/outpost/admin) "kim" = ( /obj/structure/flora/grass/ice/brown/snowgrassbb_1, /turf/open/auto_turf/snow/brown_base/layer2, @@ -27195,6 +23410,18 @@ "kkL" = ( /turf/closed/wall/strata_ice/dirty, /area/strata/ag/exterior/landing_zones/near_lz2) +"klv" = ( +/obj/structure/platform/stone/strata/east, +/obj/structure/platform/stone/strata, +/obj/effect/blocker/sorokyne_cold_water, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/water) +"klD" = ( +/obj/structure/pipes/vents/pump/on{ + dir = 4 + }, +/turf/open/floor/strata, +/area/strata/ag/interior/mining_outpost/central) "klE" = ( /obj/structure/stairs/perspective{ color = "#6e6e6e"; @@ -27217,6 +23444,17 @@ }, /turf/open/floor/strata/fake_wood, /area/strata/ug/interior/jungle/structures/monitoring) +"kmz" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/strata/white_cyan1/east, +/area/strata/ag/interior/outpost/canteen) +"knu" = ( +/obj/structure/platform/metal/strata/north, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/marsh/spring_marshes) "knJ" = ( /obj/structure/machinery/door/airlock/prison{ dir = 1; @@ -27224,13 +23462,6 @@ }, /turf/open/floor/strata/multi_tiles/southeast, /area/strata/ug/interior/outpost/underground_dorms/sec1) -"koH" = ( -/obj/effect/decal/strata_decals/catwalk/prison, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/outpost/hallways/north) "kqt" = ( /obj/structure/machinery/door/airlock/prison{ dir = 1; @@ -27245,18 +23476,38 @@ }, /turf/open/floor/strata/orange_cover, /area/strata/ag/interior/outpost/engi/drome) -"ksA" = ( +"krT" = ( /obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform_decoration/strata, +/obj/structure/platform_decoration/stone/strata/west, /turf/open/gm/river, -/area/strata/ag/exterior/landing_zones/near_lz2) -"ktH" = ( -/obj/effect/decal/cleanable/blood{ - dir = 4; - icon_state = "gib6" - }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/mining_outpost/hallways) +/area/strata/ag/exterior/marsh/water) +"ksj" = ( +/obj/item/stool, +/turf/open/floor/strata/white_cyan1/east, +/area/strata/ag/interior/outpost/canteen) +"ksk" = ( +/obj/structure/platform/metal/strata/east, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/admin) +"ksV" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/east, +/obj/effect/blocker/sorokyne_cold_water, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/water) +"ksX" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata, +/obj/structure/platform/stone/strata/west, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/river) +"kuc" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/west, +/obj/effect/blocker/sorokyne_cold_water, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/water) "kuB" = ( /obj/structure/bed/chair/office/light{ dir = 4 @@ -27284,24 +23535,14 @@ "kvD" = ( /turf/closed/wall/strata_outpost/reinforced/hull, /area/strata/ag/exterior/marsh/island_marshes) +"kvW" = ( +/obj/structure/reagent_dispensers/water_cooler, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/canteen) "kwu" = ( /obj/effect/landmark/static_comms/net_two, /turf/open/asphalt/cement/cement3, /area/strata/ag/interior/outside/engineering/parts_storage_exterior) -"kwU" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/floor/plating, -/area/strata/ag/exterior/paths/mining_outpost_exterior) -"kxF" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform_decoration/strata{ - dir = 4 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/landing_zones/near_lz2) "kxN" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/gm/dirt, @@ -27309,12 +23550,6 @@ "kyr" = ( /turf/open/gm/dirt, /area/strata/ug/interior/jungle/structures/monitoring/east) -"kyT" = ( -/obj/structure/machinery/door/airlock/almayer/engineering/colony{ - dir = 2 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/north) "kyW" = ( /obj/structure/flora/bush/ausbushes/grassybush, /turf/open/auto_turf/strata_grass/layer1, @@ -27332,24 +23567,19 @@ /obj/effect/decal/cleanable/blood/gibs/core, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outside/engineering/parts_storage) -"kzE" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/obj/structure/machinery/door/airlock/almayer/medical/colony{ - dir = 2; - name = "Medical Airlock" - }, -/turf/open/floor/strata/multi_tiles/southeast, -/area/strata/ag/interior/outpost/hallways/south) "kAn" = ( /obj/structure/machinery/cm_vending/sorted/tech/tool_storage, /turf/open/floor/strata/orange_cover, /area/strata/ag/interior/outpost/engi/drome) -"kAY" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" - }, -/turf/open/floor/strata/blue1, -/area/strata/ag/interior/outpost/hallways/north) +"kAy" = ( +/obj/structure/platform_decoration/metal/strata/west, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/auto_turf/strata_grass/layer0, +/area/strata/ug/interior/jungle/platform/east) +"kBo" = ( +/obj/structure/platform/stone/strata/west, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/marsh/crash) "kBL" = ( /obj/structure/flora/grass/ice/brown/snowgrassbb_1, /turf/open/auto_turf/snow/brown_base/layer2, @@ -27389,6 +23619,17 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/strata/blue1, /area/strata/ug/interior/outpost/underground_dorms/admin2) +"kFZ" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/canteen) +"kGp" = ( +/obj/structure/platform/metal/strata/north, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/interior/restricted) "kHg" = ( /obj/structure/machinery/camera/autoname, /obj/structure/bed/chair{ @@ -27401,17 +23642,24 @@ /obj/structure/prop/dam/drill, /turf/open/floor/plating, /area/strata/ag/exterior/marsh/spring_marshes) -"kHV" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ +"kHG" = ( +/obj/structure/flora/grass/tallgrass/ice, +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/west, +/turf/open/auto_turf/snow/brown_base/layer3, +/area/strata/ag/exterior/paths/far_north_outpost) +"kIl" = ( +/obj/structure/bed/chair{ dir = 1 }, -/obj/structure/platform/strata{ - dir = 8 +/obj/structure/pipes/standard/manifold/hidden/cyan{ + dir = 4 }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/center) +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/canteen) "kIs" = ( /obj/structure/pipes/standard/manifold/hidden/cyan{ dir = 8 @@ -27440,6 +23688,13 @@ "kJd" = ( /turf/open/gm/coast/beachcorner2/south_east, /area/strata/ug/interior/jungle/platform/east) +"kKx" = ( +/obj/effect/particle_effect/steam, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata, +/obj/structure/platform/stone/strata/west, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/river) "kKI" = ( /turf/closed/wall/strata_outpost/reinforced/hull, /area/strata/ug/interior/outpost/underground_dorms/admin1) @@ -27450,18 +23705,18 @@ "kLM" = ( /turf/open/gm/coast/south, /area/strata/ug/interior/jungle/platform/east) +"kLR" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/turf/open/floor/strata/floor3/east, +/area/strata/ag/interior/outpost/engi/drome) "kLZ" = ( /obj/effect/blocker/sorokyne_cold_water, /obj/effect/blocker/sorokyne_cold_water, /obj/effect/blocker/sorokyne_cold_water, /turf/open/gm/river, /area/strata/ag/exterior/marsh/water) -"kMW" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 9 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/north) "kNJ" = ( /turf/open/gm/coast/beachcorner/south_west, /area/strata/ug/interior/jungle/structures/monitoring/south) @@ -27475,14 +23730,17 @@ }, /turf/open/floor/strata, /area/strata/ag/interior/outpost/admin) +"kOo" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/west, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/center) "kOr" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/strata, /area/strata/ag/interior/outside/engineering/parts_storage) -"kOu" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/outpost/hallways/south) "kPl" = ( /obj/structure/surface/table/reinforced/prison, /turf/open/floor/strata/floor3/east, @@ -27510,10 +23768,13 @@ /obj/effect/decal/cleanable/blood/gibs/core, /turf/open/floor/strata/multi_tiles, /area/strata/ag/interior/mining_outpost/hive) -"kRg" = ( -/obj/structure/pipes/vents/pump, -/turf/open/floor/strata/multi_tiles/southwest, -/area/strata/ag/interior/outpost/hallways/north) +"kRH" = ( +/obj/effect/particle_effect/steam, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/west, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/spring_marshes) "kRI" = ( /obj/structure/flora/bush/ausbushes/grassybush{ icon_state = "fernybush_3" @@ -27549,6 +23810,12 @@ "kSU" = ( /turf/closed/wall/strata_outpost/reinforced/hull, /area/strata/ag/interior/mining_outpost/flight_control) +"kTu" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/strata/white_cyan3/west, +/area/strata/ag/interior/outpost/med) "kTy" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/strata/multi_tiles, @@ -27566,14 +23833,10 @@ "kUC" = ( /turf/open/asphalt/cement/cement12, /area/strata/ag/interior/outside/bball) -"kUN" = ( -/obj/effect/decal/strata_decals/grime/grime2{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/cyan, -/obj/structure/machinery/power/apc/no_power/east, +"kUU" = ( +/obj/structure/platform/metal/strata/west, /turf/open/floor/strata, -/area/strata/ag/interior/mining_outpost/hallways) +/area/strata/ag/interior/outpost/engi) "kWS" = ( /obj/structure/flora/grass/ice/brown/snowgrassbb_3, /turf/open/auto_turf/snow/brown_base/layer2, @@ -27582,6 +23845,18 @@ /obj/structure/closet/secure_closet/freezer/fridge, /turf/open/floor/strata/white_cyan2/west, /area/strata/ug/interior/outpost/underground_dorms/sec1) +"kXj" = ( +/obj/structure/platform/metal/strata/east, +/obj/structure/machinery/light/small, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/turf/open/floor/prison/darkyellowfull2, +/area/strata/ag/interior/outpost/engi) +"kXm" = ( +/obj/structure/machinery/cm_vending/sorted/medical/no_access, +/turf/open/floor/strata/white_cyan3/east, +/area/strata/ag/interior/outpost/med) "kXx" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 4 @@ -27589,10 +23864,6 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/paths/far_north_outpost) -"kXR" = ( -/obj/effect/landmark/corpsespawner/doctor, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) "kYe" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 4 @@ -27608,15 +23879,13 @@ "kYx" = ( /turf/open/asphalt/cement/cement15, /area/strata/ag/exterior/landing_zones/lz2) -"kZL" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/obj/structure/platform/strata/metal{ - dir = 8 +"kYY" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/obj/structure/machinery/light{ + dir = 4 }, -/turf/open/auto_turf/strata_grass/layer0, -/area/strata/ug/interior/jungle/platform/south) +/turf/open/floor/strata/orange_cover, +/area/strata/ag/interior/outpost/engi/drome) "kZU" = ( /obj/structure/prop/dam/drill, /turf/open/floor/plating, @@ -27630,25 +23899,29 @@ /obj/structure/flora/bush/ausbushes/var3/fullgrass, /turf/open/auto_turf/strata_grass/layer0, /area/strata/ug/interior/jungle/structures/monitoring/south) -"laM" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata, -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/river) "laN" = ( /turf/open/auto_turf/snow/brown_base/layer4, /area/strata/ag/interior/outside/engineering/parts_storage_cave) "lbh" = ( /turf/open/asphalt/cement, /area/strata/ag/interior/outside/engineering/parts_storage_exterior) +"lbm" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata, +/obj/structure/platform/stone/strata/east, +/obj/structure/platform/stone/strata/west, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/center) "lbW" = ( /obj/structure/tunnel/maint_tunnel, /turf/open/floor/strata/floor3, /area/strata/ag/interior/outpost/admin) +"lck" = ( +/obj/structure/platform/metal/strata, +/obj/structure/machinery/light, +/turf/open/auto_turf/snow/brown_base/layer4, +/area/strata/ag/exterior/paths/mining_outpost_exterior) "lcq" = ( /obj/item/clothing/suit/storage/militia, /obj/item/clothing/suit/storage/snow_suit/doctor, @@ -27657,17 +23930,6 @@ "lcs" = ( /turf/closed/wall/strata_outpost/reinforced, /area/strata/ag/exterior/marsh/water_marshes) -"ldp" = ( -/obj/structure/flora/grass/tallgrass/ice, -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/outpost_decks) "ldO" = ( /turf/open/gm/coast/north, /area/strata/ug/interior/jungle/carplake/east) @@ -27675,12 +23937,26 @@ /obj/structure/flora/grass/tallgrass/ice/corner, /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/paths/south_outpost) +"led" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/metal/strata/north, +/turf/open/gm/river, +/area/strata/ag/exterior/outpost_decks) "lfj" = ( /obj/structure/barricade/handrail/strata{ dir = 4 }, /turf/open/asphalt/cement, /area/strata/ug/interior/outpost/platform) +"lfC" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1 + }, +/turf/open/floor/strata/multi_tiles/west, +/area/strata/ag/interior/outpost/foyer) "lfQ" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, /turf/open/auto_turf/strata_grass/layer1, @@ -27699,6 +23975,22 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/strata/multi_tiles, /area/strata/ag/interior/mining_outpost/maintenance) +"lgh" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/paper_bin, +/obj/item/tool/pen/blue, +/obj/item/phone{ + pixel_x = 8; + pixel_y = 6 + }, +/turf/open/floor/strata/white_cyan4/north, +/area/strata/ag/interior/outpost/med) +"lgj" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 6 + }, +/turf/open/floor/strata, +/area/strata/ag/interior/mining_outpost/central) "lgn" = ( /obj/structure/barricade/snow, /turf/open/auto_turf/snow/brown_base/layer1, @@ -27748,9 +24040,6 @@ /obj/structure/closet/bodybag/tarp, /turf/open/floor/prison/darkyellowfull2, /area/strata/ug/interior/outpost/underground_dorms/admin3) -"ljn" = ( -/turf/open/floor/strata/multi_tiles/southwest, -/area/strata/ag/interior/outpost/hallways/south) "lkl" = ( /obj/structure/filingcabinet, /obj/effect/landmark/objective_landmark/far, @@ -27760,12 +24049,6 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/closed/wall/wood, /area/strata/ug/interior/jungle/structures/research/old_tunnels) -"lkI" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/hallways/north) "llC" = ( /obj/structure/machinery/shower{ dir = 1 @@ -27781,20 +24064,34 @@ }, /turf/open/floor/strata/white_cyan2/west, /area/strata/ug/interior/outpost/underground_dorms/sec1) +"llJ" = ( +/obj/structure/platform/metal/strata/west, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/paths/flight_control_exterior) "lmv" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/auto_turf/strata_grass/layer0, /area/strata/ug/interior/jungle/platform/east) -"lmF" = ( -/obj/structure/pipes/vents/pump/on, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/mining_outpost/hallways) +"lmL" = ( +/obj/structure/platform/metal/strata/north, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/paths/mining_outpost_exterior) "lno" = ( /turf/closed/wall/strata_outpost, /area/strata/ug/interior/jungle/structures/monitoring/south) -"lou" = ( -/turf/open/floor/strata/blue1, -/area/strata/ag/interior/outpost/hallways/south) +"lnO" = ( +/obj/structure/platform/metal/strata/east, +/turf/open/auto_turf/strata_grass/layer0, +/area/strata/ug/interior/jungle/platform/south) +"lot" = ( +/obj/structure/platform/stone/strata/west, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/river) +"loC" = ( +/obj/structure/platform_decoration/stone/strata/west, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/paths/south_outpost) "loN" = ( /obj/effect/landmark/objective_landmark/close, /turf/open/floor/strata/fake_wood, @@ -27833,12 +24130,25 @@ }, /turf/open/floor/strata/white_cyan2/west, /area/strata/ug/interior/outpost/underground_dorms/admin3) +"lpB" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata, +/obj/structure/platform/stone/strata/north, +/turf/open/gm/river, +/area/strata/ag/exterior/landing_zones/near_lz2) "lqD" = ( /obj/structure/machinery/light/small{ dir = 4 }, /turf/open/floor/strata, /area/strata/ag/exterior/outpost_decks) +"lqV" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata/orange_cover, +/area/strata/ag/interior/outpost/engi/drome) "lqX" = ( /turf/closed/wall/strata_outpost/reinforced/hull, /area/strata/ag/interior/outside/checkpoints/north) @@ -27848,10 +24158,28 @@ }, /turf/open/asphalt/cement, /area/strata/ag/interior/outside/checkpoints/south) +"lrL" = ( +/obj/structure/platform_decoration/stone/strata, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/landing_zones/near_lz2) "lrO" = ( /obj/structure/cargo_container/wy/mid, /turf/open/auto_turf/ice/layer0, /area/strata/ag/exterior/marsh/spring_marshes) +"lso" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "xgib2" + }, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 8; + icon_state = "p_stair_full" + }, +/turf/open/floor/strata/red1, +/area/strata/ag/interior/outpost/security) "lsz" = ( /obj/effect/decal/cleanable/blood/gibs/core, /turf/open/auto_turf/ice/layer1, @@ -27863,6 +24191,14 @@ /obj/effect/spawner/random/tool, /turf/open/floor/strata, /area/strata/ug/interior/outpost/underground_dorms/sec1) +"ltw" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan, +/turf/open/floor/strata/white_cyan3/north, +/area/strata/ag/interior/outpost/med) +"lty" = ( +/obj/structure/platform/metal/strata/north, +/turf/open/gm/river, +/area/strata/ag/interior/outside/engineering/parts_storage) "ltZ" = ( /obj/structure/bed/roller, /obj/structure/sink{ @@ -27870,27 +24206,10 @@ }, /turf/open/floor/strata, /area/strata/ag/exterior/outpost_decks) -"luA" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform_decoration/strata{ - dir = 4 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/center) "lvj" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/marsh/river) -"lvw" = ( -/obj/effect/particle_effect/steam, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ - dir = 4 - }, -/obj/structure/platform/strata, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/spring_marshes) "lvE" = ( /obj/structure/stairs/perspective{ color = "#6e6e6e"; @@ -27918,20 +24237,20 @@ /obj/structure/machinery/photocopier, /turf/open/floor/strata, /area/strata/ug/interior/outpost/underground_dorms/admin1) -"lxZ" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/obj/effect/decal/strata_decals/catwalk/prison, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/outpost/hallways/north) "lyv" = ( /obj/structure/bookcase{ icon_state = "book-5" }, /turf/open/floor/strata, /area/strata/ug/interior/outpost/underground_dorms/med2) +"lyI" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/east, +/obj/structure/platform/stone/strata, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/river) "lyX" = ( /obj/structure/bed{ icon_state = "abed" @@ -27953,6 +24272,11 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/interior/outside/bball/cave) +"lzB" = ( +/obj/effect/decal/cleanable/generic, +/obj/structure/platform_decoration/stone/strata/north, +/turf/open/auto_turf/snow/brown_base/layer3, +/area/strata/ag/exterior/marsh/spring_marshes) "lzT" = ( /obj/structure/pipes/standard/simple/hidden/cyan, /obj/structure/machinery/door/airlock/almayer/generic{ @@ -27964,20 +24288,33 @@ /obj/structure/blocker/invisible_wall, /turf/closed/wall/wood, /area/strata/ag/interior/restricted) +"lAk" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/strata/white_cyan2/west, +/area/strata/ag/interior/outpost/canteen) +"lAq" = ( +/obj/structure/platform_decoration/metal/strata/north, +/obj/structure/pipes/standard/manifold/hidden/cyan{ + dir = 1 + }, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/paths/flight_control_exterior) "lAx" = ( /obj/structure/surface/rack{ layer = 2.5 }, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/platform/south) -"lDz" = ( -/obj/structure/cryofeed, -/obj/structure/platform/strata/metal, -/obj/structure/barricade/handrail/wire{ - layer = 3.5 - }, +"lDd" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform_decoration/stone/strata/east, /turf/open/gm/river, -/area/strata/ag/interior/outside/engineering/parts_storage) +/area/strata/ag/exterior/landing_zones/near_lz2) +"lDF" = ( +/obj/structure/platform_decoration/metal/strata/north, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/paths/south_outpost) "lEi" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/structure/barricade/handrail/strata{ @@ -27992,6 +24329,21 @@ /obj/structure/machinery/landinglight/ds2, /turf/open/asphalt/cement/cement12, /area/strata/ag/exterior/landing_zones/lz2) +"lEq" = ( +/obj/structure/closet/secure_closet/personal, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/strata/blue1, +/area/strata/ag/interior/outpost/canteen) +"lEJ" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/strata/west, +/turf/open/floor/prison/darkyellowfull2, +/area/strata/ag/exterior/outpost_decks) "lFy" = ( /obj/structure/closet/bodybag, /turf/open/floor/strata/floor3/east, @@ -28002,10 +24354,19 @@ }, /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/marsh/relay_marshes) +"lFZ" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/west, +/obj/structure/blocker/invisible_wall, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/water) "lGv" = ( /obj/structure/machinery/vending/coffee, /turf/open/floor/strata/red1, /area/strata/ag/interior/outside/checkpoints/north) +"lHk" = ( +/turf/open/floor/strata/white_cyan3/west, +/area/strata/ag/interior/outpost/med) "lHs" = ( /obj/effect/landmark/railgun_camera_pos, /turf/open/floor/strata, @@ -28022,6 +24383,10 @@ /obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/strata, /area/strata/ag/interior/outside/checkpoints/north) +"lIM" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan, +/turf/open/floor/strata/floor3/east, +/area/strata/ag/interior/outpost/engi/drome) "lJa" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/strata/floor2, @@ -28038,6 +24403,11 @@ /obj/structure/machinery/light, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/interior/outside/engineering/parts_storage_exterior) +"lJD" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/east, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/marsh/crash) "lJF" = ( /obj/structure/window/framed/strata, /turf/open/floor/strata/multi_tiles/west, @@ -28046,6 +24416,10 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/strata, /area/strata/ug/interior/outpost/underground_dorms/sec1) +"lJK" = ( +/obj/structure/platform/metal/strata, +/turf/open/floor/strata/multi_tiles/southwest, +/area/strata/ag/interior/outpost/foyer) "lKs" = ( /obj/structure/toilet{ dir = 1 @@ -28055,20 +24429,17 @@ "lKv" = ( /turf/open/floor/strata, /area/strata/ug/interior/outpost/underground_dorms/sec1) -"lLu" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/hallways/north) +"lKA" = ( +/obj/structure/platform/stone/strata/west, +/turf/open/auto_turf/ice/layer1, +/area/strata/ag/exterior/landing_zones/near_lz2) +"lLw" = ( +/turf/open/floor/strata/multi_tiles/west, +/area/strata/ag/interior/mining_outpost/central) "lLD" = ( /obj/structure/machinery/colony_floodlight, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/interior/outside/engineering/parts_storage_cave) -"lLN" = ( -/turf/open/floor/strata/white_cyan1/east, -/area/strata/ag/interior/mining_outpost/hallways) "lMB" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -28107,10 +24478,6 @@ /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/strata/red1, /area/strata/ag/interior/outside/checkpoints/north) -"lOB" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/blue1, -/area/strata/ag/interior/outpost/hallways/north) "lOI" = ( /obj/structure/sign/safety/security, /turf/closed/wall/strata_outpost/reinforced, @@ -28121,18 +24488,6 @@ }, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/marsh/spring_marshes) -"lOT" = ( -/obj/effect/particle_effect/steam, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata, -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/spring_marshes) "lPj" = ( /turf/open/floor/strata/orange_cover, /area/strata/ag/exterior/marsh/spring_marshes) @@ -28141,6 +24496,12 @@ /obj/structure/closet/secure_closet/security/soro, /turf/open/floor/strata/red1, /area/strata/ag/interior/outside/checkpoints/north) +"lPn" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/canteen) "lPF" = ( /obj/structure/flora/bush/ausbushes/grassybush{ icon_state = "fernybush_3" @@ -28165,18 +24526,27 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ug/interior/jungle/structures/monitoring) -"lRT" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 8 +"lRj" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/canteen) +"lRD" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan, +/turf/open/floor/strata/white_cyan1/east, +/area/strata/ag/interior/mining_outpost/canteen) +"lRU" = ( +/obj/structure/platform/metal/strata/north, +/obj/structure/platform/metal/strata/east, +/turf/open/auto_turf/strata_grass/layer0, +/area/strata/ug/interior/jungle/platform/south) +"lSk" = ( +/obj/structure/bed/chair{ + dir = 4 }, -/obj/effect/decal/strata_decals/catwalk/prison, -/turf/open/floor/greengrid, -/area/strata/ag/interior/outside/engineering/parts_storage) -"lTe" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/decal/strata_decals/catwalk/prison, -/turf/open/floor/strata/multi_tiles/southwest, -/area/strata/ag/interior/outpost/hallways/south) +/obj/effect/decal/cleanable/blood/gibs/core, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/orange_edge/east, +/area/strata/ag/interior/mining_outpost/central) "lTG" = ( /obj/structure/sign/safety/biohazard, /turf/closed/wall/strata_outpost/reinforced, @@ -28187,6 +24557,10 @@ "lTX" = ( /turf/open/asphalt/cement/cement3, /area/strata/ag/interior/outside/engineering/parts_storage_exterior) +"lUg" = ( +/obj/structure/platform_decoration/metal/strata/east, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/marsh/spring_marshes) "lUm" = ( /obj/structure/machinery/light{ dir = 1 @@ -28202,32 +24576,35 @@ }, /turf/open/floor/strata/fake_wood, /area/strata/ag/interior/outside/bball) +"lUv" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/strata/west, +/turf/open/floor/strata/multi_tiles/southwest, +/area/strata/ug/interior/outpost/platform) "lUw" = ( /obj/item/weapon/gun/pistol/t73, /turf/open/floor/strata, /area/strata/ag/exterior/outpost_decks) -"lVF" = ( +"lUF" = ( +/obj/structure/platform_decoration/stone/strata/north, /obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 8 - }, /turf/open/gm/river, -/area/strata/ag/exterior/landing_zones/near_lz2) +/area/strata/ag/exterior/marsh/water) "lVJ" = ( /obj/structure/machinery/light/small{ dir = 4 }, /turf/open/floor/strata/floor2, /area/strata/ug/interior/jungle/structures/monitoring) -"lWl" = ( -/obj/structure/bed/chair{ - dir = 8 +"lWc" = ( +/obj/structure/machinery/light{ + dir = 4 }, -/turf/open/floor/strata/white_cyan1/east, -/area/strata/ag/interior/outpost/hallways/north) +/turf/open/floor/strata/floor3/east, +/area/strata/ag/interior/outpost/engi/drome) "lWu" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 10 @@ -28246,6 +24623,22 @@ }, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/platform/east) +"lYC" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 1; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/pipes/standard/simple/hidden/cyan, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/engi/drome) +"lYR" = ( +/obj/structure/platform/metal/strata/east, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/paths/flight_control_exterior) "lZc" = ( /obj/structure/flora/grass/tallgrass/ice/corner, /turf/open/auto_turf/ice/layer2, @@ -28260,6 +24653,9 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/generic2, /turf/open/floor/strata/multi_tiles/west, /area/strata/ag/interior/outpost/maint) +"lZO" = ( +/turf/open/floor/strata/cyan3/west, +/area/strata/ag/interior/outpost/med) "mam" = ( /obj/item/ammo_magazine/revolver/cmb{ pixel_x = 6; @@ -28270,6 +24666,13 @@ }, /turf/open/floor/strata/multi_tiles, /area/strata/ag/interior/mining_outpost/hive) +"maw" = ( +/obj/structure/bed/sofa/vert/grey/top, +/obj/structure/pipes/vents/pump{ + dir = 8 + }, +/turf/open/floor/strata/blue1, +/area/strata/ag/interior/outpost/admin) "may" = ( /obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/strata/multi_tiles/southeast, @@ -28280,27 +24683,10 @@ }, /turf/open/floor/strata/red1, /area/strata/ag/interior/landing_zones/near_lz1) -"maP" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 8 - }, -/turf/open/floor/strata/multi_tiles/southwest, -/area/strata/ag/interior/outpost/hallways/south) -"maX" = ( -/obj/effect/decal/cleanable/blood/oil, -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/outpost/hallways/south) "mce" = ( /obj/structure/bed/chair, /turf/open/floor/strata/red1, /area/strata/ag/interior/outside/bball) -"mcv" = ( -/obj/structure/machinery/power/apc/no_power/south, -/turf/open/floor/strata/white_cyan3, -/area/strata/ag/interior/outpost/hallways/south) "mcD" = ( /obj/structure/surface/rack, /obj/item/weapon/gun/pistol/t73, @@ -28319,13 +24705,6 @@ }, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ug/interior/outpost/platform) -"mde" = ( -/obj/structure/platform_decoration/strata{ - dir = 1 - }, -/obj/effect/blocker/sorokyne_cold_water, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/water) "mdj" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 5 @@ -28340,17 +24719,13 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/strata/floor2, /area/strata/ug/interior/jungle/structures/research) -"mem" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; +"mes" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor/colony{ dir = 1; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/machinery/light{ - dir = 8 + name = "\improper Airlock" }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/hallways/south) +/turf/open/floor/strata/multi_tiles/west, +/area/strata/ag/interior/outpost/engi/drome) "meu" = ( /obj/effect/decal/warning_stripes{ icon_state = "N" @@ -28367,12 +24742,6 @@ "mfp" = ( /turf/closed/wall/strata_outpost/reinforced/hull, /area/strata/ag/interior/outside/checkpoints/south) -"mfv" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 8 - }, -/turf/open/floor/strata/cyan2/east, -/area/strata/ag/interior/outpost/hallways/south) "mfP" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 9 @@ -28387,6 +24756,16 @@ }, /turf/open/floor/strata/floor3, /area/strata/ag/interior/landing_zones/near_lz1) +"mgM" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/open/floor/strata/white_cyan2/west, +/area/strata/ag/interior/mining_outpost/canteen) +"mgV" = ( +/obj/structure/platform_decoration/stone/strata/west, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/marsh/spring_marshes) "mhc" = ( /obj/effect/decal/cleanable/blood/oil, /obj/effect/decal/cleanable/blood, @@ -28400,35 +24779,15 @@ }, /turf/open/floor/strata/floor3/east, /area/strata/ag/exterior/outpost_decks) -"mip" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 4 - }, -/obj/effect/blocker/sorokyne_cold_water, -/obj/effect/blocker/sorokyne_cold_water, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/water) "miy" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/tearlake) -"miI" = ( -/turf/open/floor/strata/multi_tiles/southeast, -/area/strata/ag/interior/mining_outpost/hallways) -"miL" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - dir = 4; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/turf/open/floor/strata/floor3/east, -/area/strata/ag/exterior/outpost_decks) +"miQ" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/white_cyan2/west, +/area/strata/ag/interior/outpost/canteen) "miR" = ( /obj/structure/barricade/handrail/strata{ dir = 8 @@ -28436,19 +24795,6 @@ /obj/structure/barricade/handrail/strata, /turf/open/floor/prison/darkyellowfull2, /area/strata/ag/exterior/outpost_decks) -"mjp" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 8 - }, -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/center) "mjt" = ( /obj/structure/stairs/perspective{ color = "#6e6e6e"; @@ -28457,6 +24803,14 @@ }, /turf/open/floor/strata/floor3/east, /area/strata/ag/exterior/outpost_decks) +"mjD" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/platform/metal/strata/east, +/turf/open/floor/plating, +/area/strata/ag/exterior/outpost_decks) "mjG" = ( /obj/structure/machinery/door/airlock/almayer/security/glass/colony, /turf/open/floor/strata/multi_tiles/west, @@ -28469,12 +24823,6 @@ /obj/effect/landmark/crap_item, /turf/open/floor/strata/purp2, /area/strata/ug/interior/jungle/structures/monitoring) -"mko" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/strata/floor3/east, -/area/strata/ag/interior/outpost/hallways/south) "mlq" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 @@ -28482,9 +24830,12 @@ /obj/structure/machinery/door/airlock/almayer/medical/colony, /turf/open/floor/strata/multi_tiles/west, /area/strata/ag/interior/outpost/med) -"mlS" = ( -/turf/open/floor/strata/blue1, -/area/strata/ag/interior/outpost/hallways/north) +"mmi" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "xgib6" + }, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/canteen) "mms" = ( /obj/effect/glowshroom, /obj/structure/barricade/handrail/strata{ @@ -28502,6 +24853,13 @@ "mnz" = ( /turf/closed/wall/strata_ice/dirty, /area/strata/ag/interior/outside/engineering/parts_storage_exterior) +"mnW" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + icon_state = "p_stair_sn_full_cap" + }, +/turf/open/floor/strata/multi_tiles/west, +/area/strata/ag/interior/outpost/engi/drome) "mnY" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 9 @@ -28514,35 +24872,33 @@ }, /turf/open/floor/strata/cyan2/east, /area/strata/ag/interior/outpost/med) +"moM" = ( +/obj/structure/platform/metal/strata, +/obj/structure/machinery/light, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/paths/mining_outpost_exterior) +"moS" = ( +/obj/structure/platform/metal/strata/west, +/obj/structure/platform/metal/strata, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/landing_zones/near_lz1) "mpk" = ( /turf/closed/shuttle/ert{ icon_state = "upp27" }, /area/strata/ag/exterior/marsh/crash) -"mpm" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 5 - }, -/turf/open/floor/strata/multi_tiles/southwest, -/area/strata/ag/interior/outpost/hallways/south) "mpr" = ( /obj/structure/sign/safety/maint, /turf/closed/wall/strata_outpost, /area/strata/ag/interior/outside/engineering/parts_storage) -"mqs" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/multi_tiles/southwest, -/area/strata/ag/interior/outpost/hallways/south) +"mpU" = ( +/obj/effect/sentry_landmark/lz_2/bottom_right, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/landing_zones/near_lz2) "mrp" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outside/engineering/parts_storage) -"mrv" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" - }, -/turf/open/floor/strata/floor3/east, -/area/strata/ag/interior/outpost/hallways/south) "mrz" = ( /obj/structure/closet/secure_closet/personal, /obj/effect/landmark/crap_item, @@ -28593,15 +24949,39 @@ /obj/structure/flora/grass/tallgrass/ice, /turf/open/auto_turf/ice/layer2, /area/strata/ag/exterior/marsh/center) -"mtm" = ( -/obj/structure/machinery/power/apc/no_power/west, -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/red1, -/area/strata/ag/interior/outpost/hallways/north) +"mte" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/east, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/water_marshes) +"mtq" = ( +/obj/structure/platform/stone/strata/north, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/marsh/spring_marshes) +"mty" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata/east, +/obj/structure/platform_decoration/stone/strata/east, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/center) +"mtL" = ( +/obj/item/lightstick/red/planted, +/obj/structure/platform/metal/strata/north, +/turf/open/auto_turf/snow/brown_base/layer4, +/area/strata/ag/exterior/paths/flight_control_exterior) "muf" = ( /obj/structure/flora/grass/tallgrass/jungle/corner, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/structures/monitoring/south) +"mul" = ( +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/turf/open/floor/strata, +/area/strata/ag/interior/mining_outpost/south_dormitories) "mvh" = ( /turf/open/auto_turf/ice/layer2, /area/strata/ag/exterior/marsh/relay_marshes) @@ -28620,6 +25000,11 @@ }, /turf/open/auto_turf/ice/layer0, /area/strata/ag/exterior/marsh/center) +"mwE" = ( +/obj/structure/largecrate/random, +/obj/structure/platform/metal/strata/west, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/interior/outside/engineering/parts_storage_cave) "mwW" = ( /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/marsh/relay_marshes) @@ -28639,9 +25024,11 @@ /obj/structure/sign/safety/storage, /turf/closed/wall/strata_outpost, /area/strata/ag/interior/outside/engineering/parts_storage) -"myV" = ( -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/mining_outpost/hallways) +"myt" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/obj/structure/platform_decoration/metal/strata/east, +/turf/open/floor/strata/floor3/east, +/area/strata/ag/exterior/outpost_decks) "mzp" = ( /obj/effect/decal/warning_stripes{ icon_state = "E" @@ -28658,6 +25045,22 @@ /obj/item/storage/briefcase, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outpost/med) +"mzH" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata/blue1, +/area/strata/ag/interior/outpost/foyer) +"mAj" = ( +/obj/effect/decal/cleanable/blood{ + dir = 4; + icon_state = "gib6" + }, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata, +/area/strata/ag/interior/mining_outpost/central) "mBb" = ( /obj/structure/pipes/standard/manifold/hidden/cyan, /turf/open/floor/strata/orange_cover, @@ -28675,6 +25078,13 @@ }, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/paths/flight_control_exterior) +"mBC" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, +/obj/item/stack/cable_coil/random, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/mining_outpost/central) "mCh" = ( /obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/plating, @@ -28692,17 +25102,18 @@ }, /turf/open/floor/strata/fake_wood, /area/strata/ag/interior/outpost/canteen) -"mEk" = ( -/obj/effect/particle_effect/steam, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/spring_marshes) "mEL" = ( /turf/open/floor/strata/multi_tiles/southeast, /area/strata/ag/exterior/outpost_decks) +"mFz" = ( +/obj/structure/platform_decoration/stone/strata/west, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/marsh/spring_marshes) +"mGe" = ( +/obj/structure/bedsheetbin, +/obj/item/device/binoculars/range, +/turf/open/floor/strata/blue1, +/area/strata/ag/interior/outpost/canteen) "mGA" = ( /turf/open/floor/strata/multi_tiles/west, /area/strata/ag/interior/outpost/med) @@ -28739,24 +25150,21 @@ "mII" = ( /turf/closed/wall/strata_outpost/reinforced/hull, /area/strata/ag/exterior/caves/shed_five_caves) -"mJq" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/blue1, -/area/strata/ag/interior/outpost/hallways/south) +"mJu" = ( +/turf/open/floor/strata/white_cyan3, +/area/strata/ag/interior/outpost/med) +"mJB" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/strata/west, +/turf/open/floor/strata/multi_tiles/southeast, +/area/strata/ag/interior/outpost/admin) "mKv" = ( /obj/structure/window/framed/strata, /turf/open/floor/strata/multi_tiles/west, /area/strata/ag/interior/outpost/med) -"mKA" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/paper_bin, -/obj/item/tool/pen/blue, -/obj/structure/pipes/standard/simple/hidden/cyan, -/obj/structure/barricade/handrail/strata{ - dir = 4 - }, -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/outpost/hallways/south) "mKX" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/almayer/plate, @@ -28768,6 +25176,10 @@ }, /turf/open/floor/prison/darkredfull2, /area/strata/ag/interior/outside/checkpoints/south) +"mLo" = ( +/obj/structure/platform/stone/strata/east, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/caves/shed_five_caves) "mLW" = ( /obj/structure/dropship_equipment/mg_holder, /turf/open/floor/strata/floor3/east, @@ -28786,16 +25198,11 @@ /obj/structure/flora/bush/ausbushes/lavendergrass, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/outpost/platform) -"mNG" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/floor/strata/multi_tiles/southwest, -/area/strata/ug/interior/outpost/platform) +"mNE" = ( +/obj/item/tool/pen/blue, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/fake_wood, +/area/strata/ag/interior/outpost/admin) "mOj" = ( /obj/structure/surface/rack, /obj/item/ammo_magazine/rifle/type71, @@ -28811,25 +25218,15 @@ }, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/tearlake) -"mPh" = ( -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/paths/flight_control_exterior) "mPj" = ( /turf/closed/shuttle/ert{ icon_state = "upp_leftengine" }, /area/strata/ag/interior/outpost/engi/drome/shuttle) -"mPz" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ - dir = 8 - }, -/obj/structure/platform/strata, -/turf/open/gm/river, -/area/strata/ag/exterior/landing_zones/near_lz2) +"mPX" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/admin) "mQe" = ( /turf/closed/shuttle/ert{ icon_state = "upp8" @@ -28858,12 +25255,38 @@ /obj/structure/flora/grass/ice/brown/snowgrassbb_3, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/marsh/spring_marshes) +"mRe" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/white_cyan3/west, +/area/strata/ag/interior/outpost/med) +"mRI" = ( +/obj/structure/platform/metal/strata/north, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/paths/flight_control_exterior) "mRN" = ( /obj/structure/machinery/light/small{ dir = 4 }, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ug/interior/jungle/structures/monitoring) +"mRS" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata/north, +/turf/open/gm/river, +/area/strata/ag/exterior/landing_zones/near_lz2) +"mSp" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/west, +/obj/structure/platform/stone/strata/east, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/center) +"mSH" = ( +/obj/effect/decal/cleanable/generic, +/obj/structure/platform/metal/strata, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/paths/mining_outpost_exterior) "mSK" = ( /obj/item/stack/sheet/metal/medium_stack, /obj/structure/disposalpipe/segment, @@ -28874,6 +25297,11 @@ icon_state = "upp9" }, /area/strata/ag/interior/outpost/engi/drome/shuttle) +"mUS" = ( +/obj/item/lightstick/red/planted, +/obj/structure/platform/metal/strata, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/paths/mining_outpost_exterior) "mUU" = ( /turf/closed/shuttle/ert{ icon_state = "upp_rightengine" @@ -28882,13 +25310,6 @@ "mWm" = ( /turf/closed/wall/strata_outpost/reinforced/hull, /area/strata/ug/interior) -"mWA" = ( -/obj/structure/machinery/door/airlock/almayer/security/colony{ - dir = 2; - name = "Security Barracks" - }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/north) "mWF" = ( /obj/structure/largecrate/random, /obj/structure/machinery/light{ @@ -28913,6 +25334,12 @@ }, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/structures/monitoring/east) +"mXu" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/strata/floor2, +/area/strata/ag/interior/outpost/engi/drome) "mYs" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 8 @@ -28923,6 +25350,12 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/strata/orange_cover, /area/strata/ag/exterior/marsh/water_marshes) +"mYQ" = ( +/obj/structure/pipes/vents/pump{ + dir = 8 + }, +/turf/open/floor/strata/orange_cover, +/area/strata/ag/interior/outpost/engi/drome) "mYV" = ( /obj/structure/flora/grass/tallgrass/jungle, /turf/open/auto_turf/strata_grass/layer0, @@ -28936,14 +25369,32 @@ }, /turf/open/floor/strata/blue1, /area/strata/ug/interior/outpost/underground_dorms/med1) +"mZh" = ( +/obj/structure/platform_decoration/stone/strata/west, +/turf/open/auto_turf/ice/layer0, +/area/strata/ag/exterior/marsh/spring_marshes) "nai" = ( /obj/structure/largecrate/random/barrel/white, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outpost/engi/drome) +"nap" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/snacks/carrotfries, +/turf/open/floor/strata/blue1, +/area/strata/ag/interior/outpost/canteen) "naw" = ( /obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/plating, /area/strata/ag/exterior/landing_zones/near_lz2) +"naL" = ( +/obj/structure/platform/metal/strata, +/turf/open/floor/strata/red3/north, +/area/strata/ag/interior/outpost/med) +"nbt" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/obj/item/stack/sheet/wood, +/turf/open/floor/strata/red1, +/area/strata/ag/interior/outpost/security) "ncp" = ( /obj/structure/desertdam/decals/road_stop, /turf/open/floor/strata/floor3/east, @@ -28951,12 +25402,6 @@ "ncQ" = ( /turf/closed/wall/strata_outpost/reinforced/hull, /area/strata/ag/interior/outside/bball/cave) -"ndC" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 6 - }, -/turf/open/floor/strata/floor3/east, -/area/strata/ag/interior/outpost/hallways/south) "ndS" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 @@ -28964,6 +25409,13 @@ /obj/item/tank/emergency_oxygen/engi, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outside/engineering/parts_storage) +"neE" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/east, +/obj/structure/platform/stone/strata/west, +/obj/effect/blocker/sorokyne_cold_water, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/water) "neL" = ( /obj/structure/bed/chair{ dir = 4 @@ -28974,15 +25426,44 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/closed/wall/resin/membrane/strata/on_tiles, /area/strata/ag/interior/outside/bball/cave) -"njA" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 1 +"nfU" = ( +/obj/structure/inflatable/popped/door, +/turf/open/floor/strata/multi_tiles/southwest, +/area/strata/ag/interior/outpost/med) +"nfV" = ( +/obj/structure/platform_decoration/stone/strata, +/obj/effect/blocker/sorokyne_cold_water, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/water) +"ngc" = ( +/obj/structure/cryofeed, +/obj/structure/platform/metal/strata, +/turf/open/gm/river, +/area/strata/ag/interior/outside/engineering/parts_storage) +"nis" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/west, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/landing_zones/near_lz2) +"niD" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 1; + icon_state = "p_stair_sn_full_cap" }, /obj/structure/machinery/light{ - dir = 1 + dir = 8 }, -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/outpost/hallways/south) +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/engi/drome) +"njn" = ( +/obj/structure/platform_decoration/metal/strata/north, +/turf/open/auto_turf/strata_grass/layer0, +/area/strata/ug/interior/outpost/platform) +"njL" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/mining_outpost/south_dormitories) "njW" = ( /obj/structure/pipes/standard/simple/hidden/cyan, /turf/open/auto_turf/ice/layer1, @@ -28996,15 +25477,16 @@ /obj/structure/floodgate, /turf/closed/wall/strata_outpost, /area/strata/ag/exterior/outpost_decks) -"nla" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata, -/obj/structure/platform/strata{ +"nlT" = ( +/obj/structure/barricade/handrail/strata, +/obj/structure/bed/chair/comfy{ dir = 8 }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/river) +/obj/structure/barricade/handrail/strata{ + dir = 4 + }, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/admin) "nmS" = ( /obj/structure/machinery/message_server, /turf/open/floor/strata, @@ -29013,6 +25495,15 @@ /obj/structure/bed/chair, /turf/open/floor/strata, /area/strata/ug/interior/outpost/underground_dorms/sec1) +"nnB" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 1; + icon_state = "p_stair_full" + }, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/engi/drome) "nnG" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 @@ -29020,20 +25511,12 @@ /obj/structure/machinery/light, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/structures/research/old_tunnels) -"nnY" = ( -/obj/effect/particle_effect/steam, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ - dir = 1 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/spring_marshes) -"nof" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 1 +"nnO" = ( +/obj/structure/bed/chair{ + dir = 8 }, -/turf/open/floor/strata/white_cyan3/north, -/area/strata/ag/interior/outpost/hallways/south) +/turf/open/floor/strata/white_cyan2/west, +/area/strata/ag/interior/mining_outpost/canteen) "nog" = ( /turf/closed/wall/strata_outpost/reinforced, /area/strata/ag/interior/landing_zones/near_lz1) @@ -29074,6 +25557,15 @@ }, /turf/open/floor/plating, /area/strata/ag/interior/outside/engineering/parts_storage) +"nql" = ( +/obj/structure/platform/stone/strata, +/turf/open/auto_turf/snow/brown_base/layer3, +/area/strata/ag/exterior/marsh/spring_marshes) +"nqS" = ( +/obj/item/lightstick/planted, +/obj/structure/platform_decoration/metal/strata/west, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/paths/flight_control_exterior) "nqX" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/auto_turf/strata_grass/layer1, @@ -29087,6 +25579,16 @@ /obj/structure/flora/grass/ice/brown/snowgrassbb_2, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/marsh/river) +"nrx" = ( +/obj/structure/barricade/handrail/strata, +/obj/structure/surface/table/reinforced/prison, +/obj/item/toy/deck, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/admin) +"nrM" = ( +/obj/structure/platform/metal/strata/east, +/turf/open/floor/prison/darkyellowfull2, +/area/strata/ag/exterior/paths/flight_control_exterior) "nrP" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 @@ -29094,6 +25596,13 @@ /obj/structure/machinery/door/airlock/almayer/maint/colony, /turf/open/floor/strata, /area/strata/ag/interior/outpost/engi/drome) +"nso" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/strata/white_cyan1/east, +/area/strata/ag/interior/outpost/canteen) "nsq" = ( /turf/open/gm/coast/south, /area/strata/ug/interior/jungle/carplake/east) @@ -29116,47 +25625,79 @@ }, /turf/open/floor/strata/multi_tiles, /area/strata/ag/interior/mining_outpost/hive) -"nun" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ +"nvd" = ( +/obj/structure/pipes/vents/pump{ dir = 1 }, -/obj/structure/platform/strata{ - dir = 4 - }, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/engi) +"nvH" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata/west, +/obj/structure/platform_decoration/stone/strata/west, /turf/open/gm/river, /area/strata/ag/exterior/marsh/spring_marshes) "nwv" = ( /obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/plating, /area/strata/ug/interior/jungle/carplake/north) +"nwN" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/mining_outpost/canteen) +"nxc" = ( +/obj/effect/sentry_landmark/lz_2/top_left, +/turf/open/auto_turf/ice/layer1, +/area/strata/ag/exterior/marsh/water_marshes) "nxh" = ( /obj/structure/surface/rack, /obj/item/paper_bin, /turf/open/floor/strata, /area/strata/ug/interior/outpost/underground_dorms/admin1) +"nxC" = ( +/obj/structure/machinery/door/airlock/almayer/engineering/colony{ + dir = 2 + }, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/engi) "nxF" = ( /turf/closed/shuttle/ert{ icon_state = "upp_leftengine" }, /area/strata/ag/exterior/marsh/crash) +"nxN" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 4; + icon_state = "p_stair_sn_full_cap" + }, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/canteen) "nyB" = ( /obj/structure/barricade/handrail/strata{ dir = 8 }, /turf/open/asphalt/cement/cement3, /area/strata/ug/interior/outpost/platform) +"nyP" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/strata/west, +/turf/open/floor/strata/floor3/east, +/area/strata/ag/exterior/outpost_decks) +"nzU" = ( +/turf/open/floor/strata/blue3/east, +/area/strata/ag/interior/outpost/admin) "nAf" = ( /turf/open/gm/coast/beachcorner2/south_west, /area/strata/ug/interior/jungle/carplake/east) -"nAM" = ( -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/auto_turf/ice/layer0, +"nAz" = ( +/obj/structure/platform/stone/strata/north, +/turf/open/auto_turf/ice/layer2, /area/strata/ag/exterior/marsh/spring_marshes) "nAV" = ( /obj/structure/flora/bush/ausbushes/grassybush{ @@ -29167,19 +25708,35 @@ "nAZ" = ( /turf/open/gm/river, /area/strata/ug/interior/jungle/carplake/east) -"nCD" = ( -/obj/effect/blocker/sorokyne_cold_water, +"nBe" = ( +/obj/effect/particle_effect/steam, /obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata, -/obj/structure/platform/strata{ - dir = 8 - }, +/obj/structure/platform/stone/strata/east, /turf/open/gm/river, -/area/strata/ag/exterior/marsh/center) +/area/strata/ag/exterior/marsh/spring_marshes) +"nBx" = ( +/obj/structure/platform/metal/strata/west, +/turf/open/auto_turf/strata_grass/layer0, +/area/strata/ug/interior/outpost/platform) +"nBB" = ( +/obj/structure/inflatable/popped, +/turf/open/floor/strata/multi_tiles, +/area/strata/ag/interior/outpost/foyer) "nCJ" = ( /obj/structure/machinery/constructable_frame, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/interior/outside/engineering/parts_storage) +"nCR" = ( +/obj/structure/flora/grass/tallgrass/ice/corner{ + dir = 5 + }, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/barricade/handrail/strata{ + layer = 3.1 + }, +/obj/structure/platform/metal/strata, +/turf/open/gm/river, +/area/strata/ag/exterior/outpost_decks) "nDj" = ( /obj/structure/bookcase{ icon_state = "book-5" @@ -29189,6 +25746,20 @@ }, /turf/open/floor/strata, /area/strata/ug/interior/outpost/underground_dorms/admin1) +"nDt" = ( +/obj/structure/platform/metal/strata/east, +/turf/open/auto_turf/snow/brown_base/layer4, +/area/strata/ag/exterior/paths/flight_control_exterior) +"nDx" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor/colony{ + dir = 1; + name = "\improper Airlock" + }, +/turf/open/floor/strata/multi_tiles/west, +/area/strata/ag/interior/outpost/engi/drome) "nEU" = ( /obj/structure/filingcabinet, /obj/structure/machinery/light/small{ @@ -29197,26 +25768,55 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outpost/med) +"nFd" = ( +/turf/open/floor/strata/multi_tiles, +/area/strata/ag/interior/outpost/foyer) +"nFE" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/trash/plate{ + pixel_x = 1; + pixel_y = 3 + }, +/obj/item/reagent_container/food/condiment/peppermill, +/obj/structure/bed/chair, +/turf/open/floor/strata/red1, +/area/strata/ag/interior/outpost/canteen) "nFN" = ( /obj/structure/machinery/vending/snack, /turf/open/floor/strata/cyan3/east, /area/strata/ag/interior/outpost/med) +"nFT" = ( +/obj/effect/particle_effect/steam, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/metal/strata/west, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/river) "nGi" = ( /obj/structure/cargo_container/grant/left, /turf/open/auto_turf/ice/layer0, /area/strata/ag/exterior/marsh/spring_marshes) +"nGk" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/trash/plate{ + pixel_x = 1; + pixel_y = 3 + }, +/obj/item/reagent_container/food/condiment/saltshaker, +/turf/open/floor/strata/orange_cover, +/area/strata/ag/interior/outpost/canteen) "nGm" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 4 }, /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/marsh/relay_marshes) -"nHE" = ( -/obj/effect/decal/cleanable/blood, -/obj/effect/decal/cleanable/blood/gibs/core, -/obj/structure/pipes/standard/manifold/hidden/cyan, -/turf/open/floor/strata, -/area/strata/ag/interior/mining_outpost/hallways) +"nGM" = ( +/obj/effect/particle_effect/steam, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata/east, +/obj/structure/platform_decoration/stone/strata/east, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/spring_marshes) "nIS" = ( /obj/structure/bed/chair/office/light{ dir = 8 @@ -29228,16 +25828,43 @@ /obj/item/dogtag, /turf/open/floor/strata/floor3, /area/strata/ag/interior/outpost/canteen/bar) -"nJO" = ( -/obj/structure/machinery/shower, -/turf/open/floor/interior/plastic, -/area/strata/ag/interior/outpost/canteen/personal_storage) +"nJr" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/obj/structure/machinery/camera/autoname{ + dir = 4 + }, +/turf/open/floor/strata/blue3/west, +/area/strata/ag/interior/outpost/admin) +"nJI" = ( +/obj/structure/platform/metal/strata, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/paths/mining_outpost_exterior) +"nKg" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 1; + icon_state = "p_stair_full" + }, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/engi/drome) "nLG" = ( /obj/structure/bed/chair{ dir = 4 }, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/platform/east) +"nLW" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata, +/obj/structure/platform_decoration/stone/strata/east, +/turf/open/gm/river, +/area/strata/ag/exterior/landing_zones/near_lz2) +"nLZ" = ( +/obj/effect/particle_effect/steam, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata/north, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/river) "nMO" = ( /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/interior/outside/bball/cave) @@ -29247,19 +25874,6 @@ /obj/item/book/manual/research_and_development, /turf/open/floor/strata/orange_cover, /area/strata/ag/interior/outpost/maint) -"nOA" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/outpost/hallways/south) -"nOE" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/strata/white_cyan3/east, -/area/strata/ag/interior/outpost/hallways/south) "nOW" = ( /obj/effect/decal/cleanable/generic, /turf/open/auto_turf/snow/brown_base/layer2, @@ -29300,6 +25914,14 @@ }, /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/marsh/center) +"nSL" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 4; + icon_state = "p_stair_sn_full_cap" + }, +/turf/open/floor/strata/multi_tiles/west, +/area/strata/ag/interior/outpost/engi/drome) "nSQ" = ( /obj/structure/cargo_container/wy/right, /turf/open/auto_turf/ice/layer0, @@ -29368,10 +25990,35 @@ /obj/structure/bed/roller, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/structures/monitoring/south) +"nXd" = ( +/obj/item/stack/sheet/metal/medium_stack, +/obj/structure/pipes/standard/manifold/hidden/cyan, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/engi) "nXq" = ( /obj/structure/machinery/power/apc/no_power/east, /turf/open/floor/plating, /area/strata/ug/interior/jungle/structures/research/hot_springs) +"nXR" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/drinks/cans/aspen, +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/strata/orange_cover, +/area/strata/ag/interior/outpost/canteen) +"nYA" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/white_cyan3/east, +/area/strata/ag/interior/outpost/med) +"nYH" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan, +/turf/open/floor/strata/white_cyan3, +/area/strata/ag/interior/outpost/med) +"nYL" = ( +/obj/structure/platform/metal/strata/north, +/turf/open/floor/prison/darkyellowfull2, +/area/strata/ag/interior/outpost/engi) "nYM" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/stack/barbed_wire, @@ -29385,6 +26032,16 @@ /obj/effect/decal/strata_decals/catwalk/prison, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/interior/outpost/engi/drome) +"nYV" = ( +/obj/structure/platform_decoration/metal/strata/east, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/paths/mining_outpost_exterior) +"nZu" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/metal/strata/east, +/obj/structure/platform_decoration/stone/strata/east, +/turf/open/gm/river, +/area/strata/ag/exterior/paths/far_north_outpost) "nZz" = ( /obj/structure/flora/grass/tallgrass/ice, /turf/open/auto_turf/snow/brown_base/layer3, @@ -29392,6 +26049,10 @@ "nZR" = ( /turf/closed/wall/strata_outpost/reinforced, /area/strata/ag/exterior/outpost_decks) +"nZU" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/mining_outpost/central) "oaR" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 8 @@ -29405,6 +26066,19 @@ }, /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/marsh/water_marshes) +"oaW" = ( +/obj/structure/platform_decoration/metal/strata/east, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/paths/flight_control_exterior) +"obt" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/structure/pipes/standard/manifold/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata/orange_edge/east, +/area/strata/ag/interior/mining_outpost/central) "ocw" = ( /obj/structure/machinery/weather_siren{ dir = 8; @@ -29440,6 +26114,9 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/interior/outside/bball/cave) +"odl" = ( +/turf/open/floor/strata/white_cyan3/east, +/area/strata/ag/interior/outpost/med) "odr" = ( /obj/structure/machinery/door/airlock/almayer/engineering/colony, /turf/open/floor/strata/multi_tiles/southwest, @@ -29448,15 +26125,13 @@ /obj/structure/machinery/landinglight/ds2/delayone, /turf/open/asphalt/cement/cement12, /area/strata/ag/exterior/landing_zones/lz2) +"oeu" = ( +/obj/item/storage/briefcase, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/admin) "oeA" = ( /turf/open/floor/almayer/plate, /area/strata/ag/exterior/marsh/crash) -"oeG" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/mining_outpost/hallways) "oeH" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, @@ -29484,6 +26159,17 @@ /obj/structure/pipes/standard/simple/hidden/cyan, /turf/open/floor/strata, /area/strata/ag/interior/outside/checkpoints/north) +"ofW" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + icon_state = "p_stair_ew_full_cap"; + layer = 3.5 + }, +/turf/open/floor/prison/darkyellowfull2, +/area/strata/ag/interior/outpost/engi) "ogw" = ( /obj/item/lightstick/red/planted, /obj/structure/pipes/standard/simple/hidden/cyan{ @@ -29491,6 +26177,11 @@ }, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/paths/flight_control_exterior) +"ogB" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/west, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/marsh/spring_marshes) "ogL" = ( /obj/structure/surface/rack, /obj/item/storage/firstaid/regular, @@ -29498,6 +26189,10 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/floor/strata/purp2, /area/strata/ug/interior/jungle/structures/monitoring) +"ohf" = ( +/obj/structure/platform_decoration/stone/strata/north, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/caves/lz_caves) "ohV" = ( /obj/structure/machinery/door/airlock/almayer/engineering/colony{ dir = 2 @@ -29505,6 +26200,10 @@ /obj/structure/pipes/standard/simple/hidden/cyan, /turf/open/floor/strata/multi_tiles/southeast, /area/strata/ag/interior/outside/engineering/parts_storage) +"ohY" = ( +/obj/structure/platform_decoration/metal/strata/north, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/engi) "oiF" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -29512,22 +26211,18 @@ /obj/structure/barricade/handrail/strata, /turf/open/asphalt/cement/cement12, /area/strata/ag/interior/outpost/med) -"oiV" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/outpost_decks) "ojB" = ( /obj/effect/decal/cleanable/blood{ icon_state = "xgib2" }, /turf/open/floor/strata/multi_tiles/southeast, /area/strata/ag/interior/mining_outpost/central) +"okz" = ( +/obj/structure/platform/stone/strata, +/obj/structure/platform/stone/strata/east, +/obj/effect/blocker/sorokyne_cold_water, +/turf/open/gm/river, +/area/strata/ag/exterior/paths/far_north_outpost) "okE" = ( /turf/closed/wall/strata_outpost/reinforced, /area/strata/ag/exterior/caves/shed_five_caves) @@ -29539,12 +26234,37 @@ icon_state = "upp20" }, /area/strata/ag/exterior/marsh/crash) +"okW" = ( +/obj/structure/platform/stone/strata, +/turf/open/auto_turf/snow/brown_base/layer3, +/area/strata/ag/exterior/marsh/center) "olh" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 }, /turf/open/floor/strata/orange_cover, /area/strata/ag/interior/outside/engineering/parts_storage) +"olk" = ( +/obj/structure/platform/stone/strata, +/obj/structure/platform/stone/strata/west, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/marsh/river) +"oln" = ( +/obj/structure/platform/metal/strata/north, +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/microwave{ + layer = 3 + }, +/turf/open/floor/strata/floor3/east, +/area/strata/ug/interior/outpost/underground_dorms/admin3) +"olo" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata, +/obj/structure/platform/stone/strata/west, +/obj/structure/platform/stone/strata/east, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/river) "olH" = ( /obj/structure/bed{ icon_state = "abed" @@ -29558,6 +26278,10 @@ }, /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/marsh/island_marshes) +"omK" = ( +/obj/structure/platform/metal/strata/east, +/turf/open/floor/strata, +/area/strata/ag/exterior/outpost_decks) "onq" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/auto_turf/ice/layer1, @@ -29565,6 +26289,10 @@ "onr" = ( /turf/open/floor/strata, /area/strata/ug/interior/outpost/underground_dorms/med2) +"onF" = ( +/obj/structure/platform/metal/strata/west, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/paths/flight_control_exterior) "ooc" = ( /obj/structure/stairs/perspective{ color = "#6e6e6e"; @@ -29610,6 +26338,13 @@ /obj/effect/decal/strata_decals/catwalk/prison, /turf/open/floor/greengrid, /area/strata/ag/interior/outpost/engi/drome) +"orV" = ( +/obj/effect/particle_effect/steam, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata, +/obj/structure/platform/stone/strata/west, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/spring_marshes) "orW" = ( /obj/structure/barricade/wooden{ dir = 4 @@ -29622,6 +26357,14 @@ }, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/platform/south) +"otL" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/obj/effect/decal/strata_decals/catwalk/prison, +/turf/open/floor/greengrid, +/area/strata/ag/interior/mining_outpost/central) +"otZ" = ( +/turf/open/floor/strata/blue4/north, +/area/strata/ag/interior/outpost/admin) "ouB" = ( /obj/structure/pipes/standard/simple/hidden/cyan, /turf/open/floor/strata, @@ -29635,10 +26378,40 @@ /obj/effect/landmark/monkey_spawn, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/structures/monitoring/south) +"owg" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/effect/decal/cleanable/blood, +/obj/effect/decal/cleanable/blood/gibs/core, +/turf/open/floor/strata/white_cyan1/east, +/area/strata/ag/interior/outpost/canteen) +"owo" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + icon_state = "p_stair_ew_full_cap"; + layer = 3.5 + }, +/obj/structure/platform/metal/stair_cut/strata_right, +/turf/open/floor/strata/multi_tiles, +/area/strata/ag/exterior/outpost_decks) "owp" = ( /obj/structure/sign/safety/security, /turf/closed/wall/strata_outpost, /area/strata/ag/interior/landing_zones/near_lz1) +"owy" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan{ + dir = 1 + }, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/foyer) +"owH" = ( +/obj/structure/platform/metal/strata, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 5 + }, +/turf/open/auto_turf/snow/brown_base/layer4, +/area/strata/ag/exterior/paths/flight_control_exterior) "oxE" = ( /obj/structure/surface/rack, /obj/item/storage/pill_bottle/bicaridine, @@ -29663,6 +26436,10 @@ }, /turf/open/floor/strata, /area/strata/ug/interior/outpost/underground_dorms/med1) +"ozg" = ( +/obj/structure/platform/metal/strata/north, +/turf/open/floor/strata/orange_cover, +/area/strata/ag/interior/landing_zones/near_lz1) "ozr" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 1 @@ -29673,6 +26450,10 @@ "ozP" = ( /turf/closed/wall/strata_outpost/reinforced/hull, /area/strata/ug/interior/jungle/tearlake) +"ozT" = ( +/obj/structure/platform/metal/strata/west, +/turf/open/auto_turf/snow/brown_base/layer3, +/area/strata/ag/exterior/paths/flight_control_exterior) "oBn" = ( /obj/structure/window/framed/strata/reinforced, /turf/open/floor/strata/multi_tiles/west, @@ -29681,13 +26462,15 @@ /obj/item/stack/rods, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outpost/engi/drome) -"oCc" = ( -/obj/item/fuel_cell, -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/floor/strata/red2, -/area/strata/ag/interior/outpost/engi) +"oCD" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata, +/area/strata/ag/interior/mining_outpost/south_dormitories) +"oDp" = ( +/obj/structure/platform/metal/strata/north, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/auto_turf/strata_grass/layer0_mud_alt, +/area/strata/ug/interior/jungle/structures/research/old_tunnels) "oDw" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/auto_turf/strata_grass/layer1, @@ -29699,10 +26482,26 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/platform/south) +"oFc" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata/fake_wood, +/area/strata/ag/interior/outpost/med) +"oFz" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/curtain/open/shower, +/turf/open/floor/strata/white_cyan2/west, +/area/strata/ag/interior/outpost/canteen) "oFG" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/asphalt/cement/cement12, /area/strata/ag/exterior/landing_zones/lz2) +"oGQ" = ( +/obj/structure/platform_decoration/stone/strata/east, +/obj/structure/blocker/invisible_wall, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/water) "oGW" = ( /obj/structure/inflatable/popped, /turf/open/floor/strata/orange_cover, @@ -29718,6 +26517,15 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outside/engineering/parts_storage) +"oIj" = ( +/obj/structure/platform/metal/strata/north, +/obj/structure/machinery/space_heater, +/turf/open/floor/strata, +/area/strata/ug/interior/outpost/underground_dorms/sec2) +"oIm" = ( +/obj/item/clothing/gloves/white, +/turf/open/floor/strata/white_cyan1/east, +/area/strata/ag/interior/outpost/canteen) "oIv" = ( /obj/structure/closet/secure_closet/engineering_personal, /obj/effect/landmark/objective_landmark/medium, @@ -29728,32 +26536,37 @@ /obj/effect/spawner/random/tool, /turf/open/floor/strata/blue1, /area/strata/ug/interior/outpost/underground_dorms/admin2) +"oIJ" = ( +/turf/open/floor/strata/orange_cover, +/area/strata/ag/interior/mining_outpost/central) "oIU" = ( /obj/structure/flora/bush/ausbushes/grassybush{ icon_state = "fullgrass_1" }, /turf/open/auto_turf/strata_grass/layer0, /area/strata/ug/interior/jungle/structures/monitoring/west) -"oJk" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/red1, -/area/strata/ag/interior/outpost/hallways/north) +"oJm" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/admin) "oJD" = ( /obj/item/stack/rods, /turf/open/asphalt/cement/cement12, /area/strata/ug/interior/outpost/platform) -"oJH" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 5 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/north) -"oKd" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 4 +"oKa" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 8; + icon_state = "p_stair_sn_full_cap" }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/north) +/turf/open/floor/strata/multi_tiles/southwest, +/area/strata/ag/interior/outpost/engi) +"oKj" = ( +/obj/structure/platform_decoration/metal/strata/west, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/paths/mining_outpost_exterior) "oKl" = ( /obj/structure/flora/grass/ice/brown/snowgrassbb_3, /turf/open/auto_turf/snow/brown_base/layer2, @@ -29761,12 +26574,20 @@ "oKo" = ( /turf/closed/wall/strata_outpost, /area/strata/ag/interior/outpost/engi) +"oKr" = ( +/obj/effect/sentry_landmark/lz_2/top_left, +/turf/open/auto_turf/ice/layer1, +/area/strata/ag/exterior/landing_zones/near_lz2) "oKV" = ( /obj/structure/machinery/light{ dir = 1 }, /turf/open/asphalt/cement/cement1, /area/strata/ag/exterior/outpost_decks) +"oLp" = ( +/obj/structure/platform/stone/strata/north, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/paths/south_outpost) "oLv" = ( /obj/effect/decal/cleanable/blood{ dir = 4; @@ -29774,12 +26595,6 @@ }, /turf/open/asphalt/cement, /area/strata/ag/exterior/paths/mining_outpost_exterior) -"oLz" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/floor/strata/floor3/east, -/area/strata/ag/exterior/outpost_decks) "oMa" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/asphalt/cement/cement12, @@ -29793,6 +26608,14 @@ }, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/paths/flight_control_exterior) +"oMx" = ( +/obj/structure/platform/stone/strata/west, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/landing_zones/near_lz2) +"oMX" = ( +/obj/structure/platform/metal/strata/north, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/caves/shed_five_caves) "oMZ" = ( /obj/structure/toilet{ dir = 8 @@ -29800,6 +26623,13 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/strata/orange_cover, /area/strata/ag/interior/outside/engineering/parts_storage) +"oNd" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/canteen) "oOr" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 6 @@ -29818,10 +26648,6 @@ }, /turf/open/floor/strata/floor3/east, /area/strata/ag/exterior/outpost_decks) -"oOS" = ( -/obj/effect/decal/strata_decals/catwalk/prison, -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/outpost/hallways/north) "oOX" = ( /obj/structure/reagent_dispensers/water_cooler, /obj/effect/decal/strata_decals/grime/grime4, @@ -29868,29 +26694,75 @@ /obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/plating, /area/strata/ug/interior/jungle/platform/east) +"oRg" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/metal/strata/north, +/obj/structure/platform/metal/strata/west, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/river) +"oRl" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "xgib6" + }, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/canteen) "oRm" = ( /obj/structure/inflatable/popped/door, /turf/open/floor/strata/floor3/east, /area/strata/ag/exterior/outpost_decks) +"oRH" = ( +/obj/structure/machinery/power/apc/no_power/south, +/turf/open/floor/strata/white_cyan3, +/area/strata/ag/interior/outpost/med) +"oRS" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/white_cyan2/west, +/area/strata/ag/interior/mining_outpost/canteen) +"oSC" = ( +/obj/structure/platform/metal/strata/north, +/turf/open/floor/strata/multi_tiles, +/area/strata/ag/interior/mining_outpost/hive) "oSN" = ( /obj/structure/barricade/handrail/strata{ dir = 1 }, /turf/open/asphalt/cement/cement4, /area/strata/ug/interior/outpost/platform) -"oSP" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ - dir = 1 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/spring_marshes) "oSV" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 }, /turf/open/floor/strata, /area/strata/ag/interior/outpost/admin) +"oTt" = ( +/obj/structure/platform_decoration/stone/strata/east, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/landing_zones/near_lz2) +"oUt" = ( +/obj/structure/platform/stone/strata/west, +/obj/effect/blocker/sorokyne_cold_water, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/water) +"oUB" = ( +/obj/effect/decal/cleanable/blood/gibs/down, +/obj/item/dogtag, +/turf/open/floor/strata/white_cyan1/east, +/area/strata/ag/interior/outpost/canteen) +"oUD" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/turf/open/floor/strata/floor3/east, +/area/strata/ag/interior/outpost/engi/drome) "oUS" = ( /turf/open/floor/strata/red1, /area/strata/ag/interior/outside/administration) @@ -29898,6 +26770,13 @@ /obj/effect/decal/strata_decals/catwalk/prison, /turf/open/floor/greengrid, /area/strata/ag/exterior/outpost_decks) +"oVH" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/strata/multi_tiles/southwest, +/area/strata/ag/interior/outpost/engi) "oVR" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/structure/disposalpipe/segment, @@ -29906,12 +26785,6 @@ }, /turf/open/floor/plating, /area/strata/ag/interior/outside/engineering/parts_storage) -"oVZ" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/hallways/north) "oWt" = ( /obj/structure/pipes/vents/pump{ dir = 8 @@ -29924,6 +26797,10 @@ }, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/interior/outside/engineering/parts_storage_exterior) +"oWK" = ( +/obj/structure/machinery/light/small, +/turf/open/floor/strata, +/area/strata/ag/interior/mining_outpost/south_dormitories) "oWO" = ( /obj/structure/window/reinforced/tinted{ dir = 8 @@ -29953,6 +26830,14 @@ /obj/structure/machinery/vending/cigarette/colony, /turf/open/floor/strata/floor2, /area/strata/ug/interior/jungle/structures/monitoring) +"oZy" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 8; + icon_state = "p_stair_full" + }, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/security) "oZD" = ( /obj/item/lightstick, /obj/effect/decal/cleanable/blood, @@ -29967,6 +26852,10 @@ /obj/structure/flora/grass/tallgrass/jungle/corner, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/platform/south) +"pbi" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited, +/turf/closed/wall/strata_outpost, +/area/strata/ag/interior/outpost/canteen) "pbC" = ( /obj/effect/spawner/random/toolbox, /obj/structure/surface/rack, @@ -29979,51 +26868,68 @@ }, /turf/open/floor/strata/floor3/east, /area/strata/ag/exterior/outpost_decks) -"pbF" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/obj/structure/cryofeed, -/turf/open/gm/river, -/area/strata/ag/interior/outside/engineering/parts_storage) "pbR" = ( /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/marsh/water_marshes) +"pcD" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata, +/turf/open/gm/river, +/area/strata/ag/exterior/landing_zones/near_lz2) "pdc" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/auto_turf/strata_grass/layer0, /area/strata/ug/interior/jungle/tearlake) +"pdQ" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "gib6" + }, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/blue1, +/area/strata/ag/interior/outpost/admin) "pex" = ( /turf/open/gm/coast/beachcorner2/north_east, /area/strata/ug/interior/jungle/tearlake) +"peJ" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan{ + dir = 8 + }, +/turf/open/floor/strata/blue3/west, +/area/strata/ag/interior/outpost/admin) +"pfo" = ( +/obj/structure/machinery/vending/snack, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/canteen) +"pfu" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/structure/pipes/vents/pump, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/mining_outpost/south_dormitories) "pfz" = ( /turf/open/auto_turf/strata_grass/layer0_mud, /area/strata/ug/interior/jungle/structures/monitoring/south) -"pfQ" = ( -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/landing_zones/near_lz1) -"pfS" = ( -/obj/structure/curtain/medical, -/turf/open/floor/strata/floor2, -/area/strata/ag/interior/outpost/hallways/south) "pge" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 4 }, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/platform/south) -"pgW" = ( -/obj/effect/decal/strata_decals/grime/grime3, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/mining_outpost/hallways) "phD" = ( /obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/strata, /area/strata/ug/interior/outpost/underground_dorms/admin3) +"phP" = ( +/obj/structure/platform/stone/strata, +/obj/structure/platform/stone/strata/west, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/marsh/spring_marshes) +"pil" = ( +/obj/effect/decal/cleanable/blood/oil/streak, +/obj/structure/platform_decoration/metal/strata/north, +/turf/open/floor/strata/multi_tiles/west, +/area/strata/ag/exterior/outpost_decks) "piu" = ( /obj/structure/surface/rack, /obj/structure/machinery/light/small{ @@ -30031,63 +26937,69 @@ }, /turf/open/floor/strata/orange_cover, /area/strata/ag/interior/outpost/maint) +"piA" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/strata/white_cyan2/west, +/area/strata/ag/interior/outpost/canteen) "piD" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/snacks/cheesecakeslice, /obj/effect/landmark/crap_item, /turf/open/floor/strata, /area/strata/ug/interior/outpost/underground_dorms/admin1) -"piO" = ( -/obj/effect/particle_effect/steam, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 4 - }, -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/spring_marshes) "piY" = ( /turf/open/auto_turf/strata_grass/layer1, /area/strata/ag/exterior/jungle/carplake_center) -"pje" = ( -/obj/structure/cryofeed/right, -/obj/structure/platform/strata/metal, -/obj/structure/barricade/handrail/wire{ - layer = 3.5 - }, -/turf/open/gm/river, -/area/strata/ag/interior/outside/engineering/parts_storage) +"pja" = ( +/obj/structure/bed/chair, +/turf/open/floor/strata/white_cyan1/east, +/area/strata/ag/interior/outpost/canteen) +"pjm" = ( +/obj/effect/decal/cleanable/generic, +/obj/structure/platform/metal/strata/west, +/turf/open/auto_turf/snow/brown_base/layer4, +/area/strata/ag/exterior/paths/mining_outpost_exterior) +"pjx" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/multi_tiles/southwest, +/area/strata/ag/interior/outpost/med) "pjB" = ( /obj/structure/cargo_container/wy/left, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/platform/south) -"pkA" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 5 +"pjH" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform_decoration/stone/strata/east, +/obj/structure/platform_decoration/stone/strata/north, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/spring_marshes) +"pjQ" = ( +/obj/structure/platform_decoration/metal/strata, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/engi) +"pjU" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan{ + dir = 8 }, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/canteen/personal_storage) -"pkG" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan, -/turf/open/floor/strata/cyan1/east, -/area/strata/ag/interior/outpost/hallways/south) +/obj/structure/barricade/deployable, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/canteen) +"pkE" = ( +/obj/structure/platform/metal/strata/north, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/caves/shed_five_caves) "pkO" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 5 }, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/caves/lz_caves) -"plC" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/cyan1/east, -/area/strata/ag/interior/outpost/hallways/south) +"plh" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/blue3/west, +/area/strata/ag/interior/outpost/admin) "plI" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 4 @@ -30113,18 +27025,32 @@ }, /turf/open/floor/strata/multi_tiles/southeast, /area/strata/ug/interior/jungle/structures/monitoring) +"pmV" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/mining_outpost/central) "png" = ( /obj/structure/flora/grass/tallgrass/jungle, /obj/effect/landmark/monkey_spawn, /turf/open/auto_turf/strata_grass/layer0, /area/strata/ug/interior/jungle/structures/monitoring/west) -"pnn" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ +"pnD" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/obj/structure/machinery/light{ dir = 4 }, -/obj/structure/machinery/light, -/turf/open/floor/strata/multi_tiles, -/area/strata/ag/interior/outpost/hallways/north) +/turf/open/floor/strata/white_cyan3/east, +/area/strata/ag/interior/outpost/med) +"pnE" = ( +/obj/structure/platform_decoration/metal/strata, +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/barricade/handrail/wire{ + layer = 3.5 + }, +/turf/open/floor/greengrid, +/area/strata/ag/interior/outside/engineering/parts_storage) "pnP" = ( /obj/structure/machinery/shower{ dir = 8 @@ -30153,6 +27079,11 @@ }, /turf/open/floor/strata/floor3/east, /area/strata/ug/interior/outpost/underground_dorms/med2) +"poG" = ( +/obj/structure/platform/stone/strata, +/obj/item/lightstick/red/planted, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/marsh/river) "ppe" = ( /turf/open/asphalt/cement/cement1, /area/strata/ag/exterior/landing_zones/lz2) @@ -30160,18 +27091,6 @@ /obj/structure/machinery/light, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/interior/outpost/engi/drome) -"ppC" = ( -/obj/structure/pipes/standard/manifold/fourway/hidden/cyan, -/turf/open/floor/strata/white_cyan3/west, -/area/strata/ag/interior/outpost/hallways/south) -"pqy" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ - dir = 4 - }, -/obj/structure/platform/strata, -/turf/open/gm/river, -/area/strata/ag/exterior/landing_zones/near_lz2) "pqE" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/auto_turf/strata_grass/layer0, @@ -30190,28 +27109,25 @@ /obj/structure/flora/bush/ausbushes/var3/sparsegrass, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/outpost/platform) -"pro" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor/colony{ - dir = 1; - name = "\improper Airlock" +"prA" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "xgibdown1" }, -/turf/open/floor/strata/multi_tiles/west, -/area/strata/ag/interior/outpost/hallways/south) +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/security) "prN" = ( /obj/structure/sign/safety/security, /turf/closed/wall/strata_outpost, /area/strata/ag/interior/outside/checkpoints/west) -"psl" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata, -/obj/structure/platform/strata{ - dir = 4 +"prQ" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + icon_state = "p_stair_ew_full_cap"; + layer = 3.5 }, -/turf/open/gm/river, -/area/strata/ag/exterior/landing_zones/near_lz2) +/obj/structure/platform/metal/strata/north, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/admin) "psv" = ( /obj/structure/surface/rack, /obj/item/weapon/gun/pistol/t73, @@ -30245,21 +27161,6 @@ }, /turf/open/floor/strata/purp2, /area/strata/ug/interior/jungle/carplake/east) -"psV" = ( -/obj/effect/particle_effect/steam, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata, -/obj/structure/platform_decoration/strata{ - dir = 4 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/spring_marshes) -"ptr" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/multi_tiles/west, -/area/strata/ag/interior/outpost/hallways/south) "ptT" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -30272,13 +27173,10 @@ }, /turf/open/floor/strata/floor3/east, /area/strata/ug/interior/jungle/structures/research) -"pug" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/admin) +"puA" = ( +/obj/structure/platform/metal/strata/west, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/marsh/spring_marshes) "puV" = ( /obj/structure/window/framed/strata, /turf/open/floor/strata/multi_tiles/southwest, @@ -30294,6 +27192,12 @@ /obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/plating, /area/strata/ug/interior/jungle/structures/research/south) +"pvc" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan{ + dir = 1 + }, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/mining_outpost/south_dormitories) "pvz" = ( /obj/structure/machinery/light, /turf/open/floor/strata, @@ -30301,10 +27205,6 @@ "pvA" = ( /turf/open/auto_turf/ice/layer0, /area/strata/ag/exterior/marsh/relay_marshes) -"pvY" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan, -/turf/open/floor/strata/floor3/east, -/area/strata/ag/interior/outpost/hallways/south) "pwn" = ( /obj/structure/largecrate/guns/russian, /obj/structure/barricade/handrail/strata{ @@ -30312,25 +27212,20 @@ }, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outside/engineering/parts_storage) -"pwz" = ( -/obj/structure/bed/chair/office/light{ - dir = 8 - }, -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/floor3/east, -/area/strata/ag/interior/outpost/hallways/south) -"pwQ" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/hallways/north) "pwW" = ( /obj/structure/flora/bush/ausbushes/grassybush{ icon_state = "fullgrass_1" }, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/platform/east) +"pxj" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 8; + icon_state = "p_stair_full" + }, +/turf/open/floor/strata/multi_tiles/southwest, +/area/strata/ag/interior/outpost/engi) "pzb" = ( /obj/structure/stairs/perspective{ color = "#6e6e6e"; @@ -30342,31 +27237,50 @@ /obj/structure/prop/ice_colony/surveying_device/measuring_device, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ug/interior/jungle/structures/monitoring) +"pzX" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan, +/turf/open/floor/strata/white_cyan3/northeast, +/area/strata/ag/interior/outpost/med) "pAc" = ( /turf/closed/wall/strata_outpost, /area/strata/ug/interior) -"pAM" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/reagent_container/spray/cleaner, -/obj/structure/barricade/handrail/strata{ - dir = 4 - }, -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/outpost/hallways/south) +"pAr" = ( +/obj/structure/platform_decoration/stone/strata/east, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/marsh/spring_marshes) +"pAF" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform_decoration/stone/strata/east, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/center) "pAR" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /obj/structure/machinery/light/small, /turf/open/floor/strata/multi_tiles, /area/strata/ag/interior/mining_outpost/central) +"pAS" = ( +/turf/open/floor/strata/blue1, +/area/strata/ag/interior/outpost/foyer) "pAY" = ( /obj/structure/machinery/light{ dir = 4 }, /turf/open/floor/strata/floor2, /area/strata/ug/interior/jungle/structures/research) +"pAZ" = ( +/obj/effect/sentry_landmark/lz_2/top_right, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/landing_zones/near_lz2) +"pBW" = ( +/obj/structure/platform/stone/strata/east, +/obj/structure/platform/stone/strata, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/landing_zones/near_lz2) +"pDa" = ( +/obj/structure/platform_decoration/stone/strata, +/turf/open/auto_turf/snow/brown_base/layer4, +/area/strata/ag/exterior/landing_zones/near_lz2) "pDb" = ( /obj/structure/dropship_equipment/sentry_holder, /turf/open/floor/strata/floor3/east, @@ -30388,16 +27302,6 @@ }, /turf/open/floor/plating/platebot, /area/strata/ag/interior/outpost/engi/drome/shuttle) -"pDY" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 1 - }, -/obj/effect/decal/strata_decals/catwalk/prison, -/obj/structure/barricade/handrail/wire{ - layer = 3.5 - }, -/turf/open/floor/greengrid, -/area/strata/ag/interior/outside/engineering/parts_storage) "pEm" = ( /obj/structure/barricade/wooden{ dir = 1 @@ -30427,6 +27331,10 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/prison/darkyellowfull2, /area/strata/ag/exterior/outpost_decks) +"pFd" = ( +/obj/structure/platform/metal/strata, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/paths/flight_control_exterior) "pFi" = ( /obj/structure/largecrate/random/barrel/green, /obj/structure/disposalpipe/segment{ @@ -30435,6 +27343,13 @@ }, /turf/open/floor/plating/platebot, /area/strata/ag/interior/outpost/engi/drome/shuttle) +"pFm" = ( +/obj/structure/platform_decoration/stone/strata, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/landing_zones/near_lz2) +"pFV" = ( +/turf/open/floor/strata/multi_tiles/southeast, +/area/strata/ag/interior/mining_outpost/south_dormitories) "pGf" = ( /obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/plating, @@ -30478,28 +27393,36 @@ }, /turf/open/floor/strata/fake_wood, /area/strata/ag/interior/outpost/canteen) -"pIy" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 4 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/mining_outpost/central) -"pJz" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, +"pJo" = ( +/obj/structure/platform/metal/strata/east, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/paths/mining_outpost_exterior) +"pJr" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/east, /turf/open/gm/river, -/area/strata/ag/interior/outside/engineering/parts_storage) +/area/strata/ag/exterior/landing_zones/near_lz2) "pJA" = ( /turf/open/gm/coast/west, /area/strata/ug/interior/jungle/platform/east) -"pKq" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ - dir = 1 +"pLe" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/machinery/computer/communications{ + dir = 8; + icon_state = "commb" }, -/turf/open/gm/river, -/area/strata/ag/exterior/landing_zones/near_lz2) +/obj/structure/platform/metal/strata/east, +/turf/open/floor/strata/floor3/east, +/area/strata/ug/interior/outpost/underground_dorms/med2) +"pLw" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/strata/west, +/turf/open/asphalt/cement, +/area/strata/ug/interior/outpost/platform) "pLA" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/gm/dirt, @@ -30521,19 +27444,12 @@ }, /turf/open/floor/strata, /area/strata/ag/exterior/outpost_decks) -"pMU" = ( -/obj/structure/tunnel/maint_tunnel{ - pixel_y = 16 - }, -/turf/open/floor/strata/multi_tiles/southwest, -/area/strata/ag/interior/outpost/canteen/personal_storage) -"pNL" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - icon_state = "p_stair_full" - }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/north) +"pMO" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/paper_bin, +/obj/item/tool/pen/blue, +/turf/open/floor/strata/blue1, +/area/strata/ag/interior/outpost/admin) "pNT" = ( /obj/structure/flora/grass/tallgrass/jungle, /turf/open/auto_turf/strata_grass/layer1, @@ -30563,12 +27479,6 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/strata/floor2, /area/strata/ug/interior/outpost/underground_dorms/admin2) -"pOW" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/white_cyan3/east, -/area/strata/ag/interior/outpost/hallways/south) "pPi" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/auto_turf/strata_grass/layer0, @@ -30581,6 +27491,12 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/closed/wall/strata_outpost, /area/strata/ug/interior/outpost/platform) +"pRd" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata/multi_tiles, +/area/strata/ag/interior/outpost/foyer) "pRj" = ( /turf/closed/wall/strata_outpost, /area/strata/ag/interior/outside/checkpoints/outpost) @@ -30605,6 +27521,13 @@ "pSw" = ( /turf/open/gm/coast/east, /area/strata/ug/interior/jungle/carplake/east) +"pTP" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/west, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/water_marshes) "pTR" = ( /obj/structure/barricade/snow, /turf/open/auto_turf/snow/brown_base/layer2, @@ -30622,6 +27545,10 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/strata, /area/strata/ug/interior/outpost/underground_dorms/admin2) +"pUY" = ( +/obj/structure/platform/metal/strata/west, +/turf/open/floor/strata, +/area/strata/ag/exterior/outpost_decks) "pVf" = ( /turf/open/floor/strata/multi_tiles/southeast, /area/strata/ag/interior/outpost/canteen) @@ -30637,16 +27564,6 @@ /obj/structure/window/framed/strata, /turf/open/floor/strata/multi_tiles/southeast, /area/strata/ag/interior/outside/engineering/parts_storage) -"pWp" = ( -/obj/structure/platform_decoration/strata{ - dir = 8 - }, -/obj/structure/platform_decoration/strata{ - dir = 4 - }, -/obj/effect/blocker/sorokyne_cold_water, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/water) "pWz" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 @@ -30661,17 +27578,28 @@ }, /turf/open/floor/strata/multi_tiles/southeast, /area/strata/ag/interior/outside/engineering/parts_storage) +"pWR" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/metal/strata/north, +/obj/structure/platform/metal/strata/west, +/turf/open/gm/river, +/area/strata/ag/exterior/outpost_decks) +"pXp" = ( +/obj/structure/platform/metal/strata, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/auto_turf/strata_grass/layer0_mud_alt, +/area/strata/ug/interior/jungle/structures/research/old_tunnels) "pXB" = ( /obj/effect/decal/cleanable/blood/oil, /obj/effect/decal/cleanable/blood/gibs/core, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outside/checkpoints/south) -"pYG" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 6 +"pYE" = ( +/obj/structure/machinery/light/small{ + dir = 4 }, -/turf/open/floor/strata, -/area/strata/ag/interior/mining_outpost/hallways) +/turf/open/floor/strata/cyan2/east, +/area/strata/ag/interior/outpost/med) "pYI" = ( /turf/open/floor/strata/floor3/east, /area/strata/ug/interior/outpost/underground_dorms/admin1) @@ -30683,10 +27611,6 @@ /obj/structure/sign/safety/outpatient, /turf/closed/wall/strata_outpost, /area/strata/ag/interior/mining_outpost/central) -"pZe" = ( -/obj/structure/platform/strata/metal, -/turf/open/gm/river, -/area/strata/ag/interior/outside/engineering/parts_storage) "pZh" = ( /obj/structure/blocker/invisible_wall, /turf/open/gm/coast/beachcorner2/north_west, @@ -30703,6 +27627,19 @@ /obj/effect/decal/cleanable/blood, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/platform/south) +"pZZ" = ( +/obj/structure/platform_decoration/stone/strata/north, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/marsh/crash) +"qaq" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/mining_outpost/central) +"qax" = ( +/turf/open/floor/strata/orange_cover, +/area/strata/ag/interior/mining_outpost/south_dormitories) "qbk" = ( /obj/structure/machinery/landinglight/ds2/delaytwo{ dir = 1 @@ -30734,6 +27671,10 @@ /obj/structure/flora/bush/ausbushes/reedbush, /turf/open/gm/coast/beachcorner2/north_east, /area/strata/ug/interior/jungle/structures/monitoring/south) +"qcM" = ( +/obj/structure/platform_decoration/stone/strata/west, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/paths/south_outpost) "qcO" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -30763,21 +27704,32 @@ }, /turf/open/auto_turf/ice/layer2, /area/strata/ag/exterior/marsh/relay_marshes) -"qeI" = ( -/obj/structure/machinery/light/small{ +"qeO" = ( +/obj/effect/decal/cleanable/blood{ + dir = 4; + icon_state = "gib6" + }, +/obj/structure/pipes/standard/manifold/hidden/cyan{ dir = 8 }, -/obj/structure/platform/strata/metal, -/turf/open/floor/strata/red3/north, -/area/strata/ag/interior/outpost/med) -"qfi" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata, -/obj/structure/platform/strata{ +/turf/open/floor/strata, +/area/strata/ag/interior/mining_outpost/central) +"qft" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan{ + dir = 1 + }, +/turf/open/floor/strata/white_cyan1/east, +/area/strata/ag/interior/outpost/canteen) +"qfy" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/crash) +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/effect/landmark/survivor_spawner, +/turf/open/floor/strata/white_cyan1/east, +/area/strata/ag/interior/outpost/canteen) "qfC" = ( /turf/open/floor/strata, /area/strata/ag/interior/outside/engineering/parts_storage) @@ -30804,6 +27756,10 @@ /obj/effect/landmark/corpsespawner/engineer, /turf/open/floor/greengrid, /area/strata/ag/interior/outpost/engi) +"qhC" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/engi/drome) "qin" = ( /obj/structure/machinery/door/airlock/strata/autoname{ dir = 1 @@ -30814,6 +27770,15 @@ /obj/structure/barricade/handrail/strata, /turf/open/asphalt/cement/cement12, /area/strata/ag/exterior/marsh/spring_marshes) +"qjL" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1 + }, +/turf/open/floor/strata/cyan2/east, +/area/strata/ag/interior/mining_outpost/canteen) "qjS" = ( /obj/structure/machinery/space_heater, /obj/structure/machinery/light, @@ -30836,6 +27801,10 @@ "qlq" = ( /turf/open/floor/strata/floor3/east, /area/strata/ug/interior/outpost/underground_dorms/med1) +"qlx" = ( +/obj/structure/bed/chair, +/turf/open/floor/strata/white_cyan2/west, +/area/strata/ag/interior/mining_outpost/canteen) "qmw" = ( /obj/structure/sign/safety/storage, /turf/closed/wall/strata_outpost/reinforced/hull, @@ -30845,17 +27814,37 @@ /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/strata/floor3/east, /area/strata/ag/exterior/outpost_decks) +"qnl" = ( +/obj/structure/bed/stool, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/admin) "qns" = ( /obj/structure/machinery/light/small{ dir = 1 }, /turf/open/floor/strata/white_cyan2/west, /area/strata/ug/interior/outpost/underground_dorms/med1) +"qnH" = ( +/obj/structure/platform_decoration/metal/strata/west, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/paths/flight_control_exterior) +"qoh" = ( +/obj/structure/platform/stone/strata/north, +/turf/open/auto_turf/snow/brown_base/layer3, +/area/strata/ag/exterior/marsh/spring_marshes) "qot" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/strata/ag/interior/outside/engineering/parts_storage) +"qow" = ( +/obj/effect/decal/cleanable/blood, +/obj/structure/platform/stone/strata/north, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/paths/south_outpost) "qoD" = ( /obj/item/lightstick/red/spoke/planted{ layer = 3.1; @@ -30873,34 +27862,74 @@ }, /turf/open/floor/strata/purp2, /area/strata/ug/interior/jungle/structures/monitoring/east) +"qpw" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/drinks/bottle/vodka, +/obj/item/reagent_container/food/condiment/peppermill, +/turf/open/floor/strata/blue1, +/area/strata/ag/interior/outpost/canteen) +"qqO" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/blue3/southwest, +/area/strata/ag/interior/outpost/admin) +"qrb" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/west, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/landing_zones/near_lz2) "qrz" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/asphalt/cement/cement3, /area/strata/ug/interior/outpost/platform) +"qsu" = ( +/obj/item/lightstick/red/planted, +/obj/structure/platform/metal/strata/north, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/paths/mining_outpost_exterior) +"qsz" = ( +/obj/structure/machinery/power/apc/no_power/west, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/red1, +/area/strata/ag/interior/outpost/security) "qsI" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/effect/landmark/objective_landmark/far, /turf/open/floor/greengrid, /area/strata/ug/interior/jungle/structures/monitoring) +"qsY" = ( +/obj/structure/flora/grass/tallgrass/ice, +/obj/structure/platform/stone/strata, +/obj/effect/blocker/sorokyne_cold_water, +/turf/open/gm/river, +/area/strata/ag/exterior/paths/far_north_outpost) "qsZ" = ( /turf/open/floor/strata/floor3/east, /area/strata/ag/exterior/paths/flight_control_exterior) -"qtn" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata, -/obj/structure/platform/strata{ - dir = 4 - }, -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/center) -"quT" = ( -/obj/structure/inflatable/popped/door, +"qtc" = ( +/obj/structure/platform_decoration/metal/strata/east, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/admin) +"qtj" = ( +/obj/effect/decal/cleanable/blood, /turf/open/floor/strata/multi_tiles/southwest, -/area/strata/ag/interior/outpost/hallways/south) +/area/strata/ag/interior/outpost/canteen) +"qtq" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 9 + }, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/engi) +"qve" = ( +/obj/structure/machinery/light/small, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/canteen) +"qvk" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/disposalpipe/segment, +/obj/structure/platform_decoration/metal/strata/west, +/turf/open/floor/plating, +/area/strata/ag/exterior/outpost_decks) "qvy" = ( /obj/structure/flora/grass/ice/brown/snowgrassbb_2, /turf/open/auto_turf/snow/brown_base/layer2, @@ -30930,13 +27959,22 @@ /obj/structure/blocker/invisible_wall, /turf/open/floor/interior/tatami, /area/strata/ag/interior/restricted) +"qxp" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata, +/obj/structure/platform_decoration/stone/strata/west, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/center) "qxr" = ( /turf/open/gm/coast/beachcorner2/north_west, /area/strata/ug/interior/jungle/tearlake) -"qxt" = ( -/obj/structure/machinery/cm_vending/sorted/medical/no_access, -/turf/open/floor/strata/white_cyan3/east, -/area/strata/ag/interior/outpost/hallways/south) +"qxy" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/engi/drome) "qxD" = ( /obj/structure/machinery/weather_siren{ dir = 4; @@ -30945,6 +27983,27 @@ }, /turf/closed/wall/strata_outpost/reinforced, /area/strata/ag/interior/mountain) +"qxF" = ( +/obj/structure/closet/secure_closet/personal, +/turf/open/floor/strata/multi_tiles/southwest, +/area/strata/ag/interior/outpost/canteen) +"qyp" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan{ + dir = 1 + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/strata/orange_cover, +/area/strata/ag/interior/outpost/engi/drome) +"qyq" = ( +/obj/structure/platform/metal/strata, +/turf/open/auto_turf/snow/brown_base/layer4, +/area/strata/ag/exterior/paths/mining_outpost_exterior) +"qza" = ( +/obj/structure/machinery/vending/dinnerware, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/canteen) "qzd" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 4 @@ -30962,13 +28021,11 @@ /obj/item/storage/pill_bottle/spaceacillin, /turf/open/floor/strata/cyan2/east, /area/strata/ag/interior/outpost/med) -"qzv" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/white_cyan3/northeast, -/area/strata/ag/interior/outpost/hallways/south) -"qAd" = ( -/turf/open/floor/strata/cyan1/east, -/area/strata/ag/interior/outpost/hallways/south) +"qAq" = ( +/obj/structure/platform_decoration/metal/strata/east, +/obj/item/fuel_cell, +/turf/open/floor/strata/red2, +/area/strata/ag/interior/outpost/engi) "qAr" = ( /obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/strata/floor2, @@ -30979,6 +28036,11 @@ }, /turf/open/auto_turf/snow/brown_base/layer4, /area/strata/ag/exterior/paths/flight_control_exterior) +"qAX" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata/north, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/water) "qBd" = ( /obj/structure/flora/grass/tallgrass/jungle, /turf/open/auto_turf/strata_grass/layer0, @@ -30992,6 +28054,12 @@ /obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/strata/blue1, /area/strata/ag/interior/outpost/admin) +"qBQ" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata, +/obj/structure/platform/metal/strata/west, +/turf/open/gm/river, +/area/strata/ag/exterior/paths/far_north_outpost) "qCv" = ( /obj/structure/pipes/standard/manifold/fourway/hidden/cyan, /turf/open/floor/strata/floor3/east, @@ -31004,6 +28072,11 @@ /obj/structure/machinery/power/reactor/colony, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outside/checkpoints/south) +"qDM" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform_decoration/metal/strata/east, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/river) "qFH" = ( /obj/structure/filingcabinet, /turf/open/floor/strata/floor2, @@ -31014,14 +28087,28 @@ }, /turf/open/floor/strata/multi_tiles/southeast, /area/strata/ug/interior/jungle/structures/monitoring) +"qFZ" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/effect/decal/cleanable/blood, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/greengrid, +/area/strata/ag/interior/mining_outpost/central) +"qGi" = ( +/obj/effect/decal/strata_decals/grime/grime3, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/mining_outpost/central) "qGK" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/asphalt/cement/cement1, /area/strata/ug/interior/outpost/platform) -"qHc" = ( -/obj/structure/curtain/open/shower, -/turf/open/floor/interior/plastic, -/area/strata/ag/interior/outpost/hallways/north) +"qHk" = ( +/obj/structure/machinery/washing_machine, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/canteen) +"qIi" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/multi_tiles/southwest, +/area/strata/ag/interior/outpost/canteen) "qIt" = ( /obj/structure/barricade/handrail/strata{ dir = 4 @@ -31029,13 +28116,16 @@ /obj/structure/barricade/handrail/strata, /turf/open/asphalt/cement/cement1, /area/strata/ug/interior/outpost/platform) -"qIV" = ( -/obj/structure/bed/sofa/vert/grey/top, -/obj/structure/pipes/vents/pump{ +"qIC" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan{ dir = 8 }, -/turf/open/floor/strata/blue1, -/area/strata/ag/interior/outpost/hallways/north) +/turf/open/floor/strata/multi_tiles/southwest, +/area/strata/ag/interior/outpost/med) +"qIG" = ( +/obj/structure/platform_decoration/stone/strata/west, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/landing_zones/near_lz2) "qJi" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/prison/darkyellowfull2, @@ -31045,6 +28135,16 @@ /obj/effect/decal/cleanable/blood/gibs/limb, /turf/open/floor/strata, /area/strata/ag/interior/outpost/engi/drome) +"qJM" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/snacks/cheesecakeslice, +/turf/open/floor/prison/darkyellowfull2, +/area/strata/ag/interior/outpost/canteen) +"qKk" = ( +/obj/structure/flora/grass/tallgrass/ice, +/obj/structure/platform/stone/strata/north, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/paths/south_outpost) "qKx" = ( /turf/open/asphalt/cement, /area/strata/ag/exterior/vanyard) @@ -31077,10 +28177,24 @@ /obj/structure/pipes/standard/simple/hidden/cyan, /turf/open/floor/strata/multi_tiles/southeast, /area/strata/ag/interior/outpost/admin) +"qNu" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/structure/platform/metal/strata, +/turf/open/floor/prison/darkyellowfull2, +/area/strata/ag/interior/outpost/engi) "qNS" = ( /obj/structure/inflatable/popped/door, /turf/open/floor/strata/multi_tiles/west, /area/strata/ag/exterior/outpost_decks) +"qNX" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/west, +/obj/structure/platform/stone/strata/east, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/center) "qOj" = ( /turf/open/asphalt/cement/cement3, /area/strata/ag/exterior/landing_zones/lz2) @@ -31120,6 +28234,16 @@ "qPu" = ( /turf/open/auto_turf/ice/layer0, /area/strata/ag/exterior/marsh/water_marshes) +"qPA" = ( +/obj/structure/flora/grass/tallgrass/ice, +/obj/structure/platform/stone/strata/west, +/turf/open/auto_turf/snow/brown_base/layer3, +/area/strata/ag/exterior/paths/far_north_outpost) +"qPN" = ( +/obj/item/lightstick/red/planted, +/obj/structure/platform/metal/strata/east, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/paths/mining_outpost_exterior) "qQq" = ( /obj/structure/closet/bodybag, /obj/effect/decal/cleanable/blood/gibs/body, @@ -31129,6 +28253,10 @@ /obj/structure/machinery/light/small, /turf/open/asphalt/cement/cement15, /area/strata/ug/interior/outpost/platform) +"qQx" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/fake_wood, +/area/strata/ag/interior/outpost/med) "qQN" = ( /obj/structure/closet/bodybag, /obj/effect/decal/cleanable/blood/gibs/down, @@ -31137,6 +28265,11 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/strata, /area/strata/ag/exterior/outpost_decks) +"qQR" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/obj/structure/platform/metal/strata/east, +/turf/open/floor/strata/fake_wood, +/area/strata/ag/interior/outpost/engi) "qRj" = ( /obj/structure/filingcabinet, /obj/structure/barricade/handrail/strata{ @@ -31145,31 +28278,31 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/strata/blue1, /area/strata/ag/interior/outpost/admin) -"qRF" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/white_cyan3/southwest, -/area/strata/ag/interior/outpost/hallways/south) +"qRl" = ( +/obj/structure/platform_decoration/stone/strata/west, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/marsh/spring_marshes) +"qSc" = ( +/obj/item/lightstick/red/planted, +/obj/structure/platform/metal/strata/west, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/paths/flight_control_exterior) "qSo" = ( /turf/closed/shuttle/ert{ icon_state = "upp4" }, /area/strata/ag/exterior/marsh/crash) +"qSC" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan, +/turf/open/floor/strata, +/area/strata/ag/interior/mining_outpost/central) "qSH" = ( /turf/closed/wall/strata_outpost/reinforced, /area/strata/ag/interior/outside/checkpoints/north_armor) -"qTk" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/barricade/handrail/strata{ - layer = 3.1 - }, -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/obj/structure/platform/strata/metal, -/turf/open/gm/river, -/area/strata/ag/exterior/outpost_decks) +"qSS" = ( +/obj/structure/surface/table/reinforced/prison, +/turf/open/floor/strata/floor3/east, +/area/strata/ag/interior/outpost/engi/drome) "qTp" = ( /obj/structure/largecrate/random/barrel/yellow, /obj/structure/machinery/camera/autoname{ @@ -31190,17 +28323,42 @@ }, /turf/open/floor/strata, /area/strata/ug/interior/outpost/underground_dorms/med2) +"qTS" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/trash/plate{ + pixel_x = 1; + pixel_y = 3 + }, +/obj/item/reagent_container/food/condiment/peppermill, +/turf/open/floor/strata/blue1, +/area/strata/ag/interior/outpost/canteen) "qTV" = ( /obj/effect/decal/cleanable/blood/oil, /obj/structure/machinery/recharge_station, /turf/open/floor/strata/floor3/east, /area/strata/ag/exterior/vanyard) +"qUq" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata, +/obj/structure/platform/metal/strata/east, +/turf/open/gm/river, +/area/strata/ag/exterior/paths/far_north_outpost) "qUB" = ( /obj/structure/bed/chair{ dir = 1 }, /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/marsh/spring_marshes) +"qUH" = ( +/obj/structure/closet/wardrobe/suit, +/turf/open/floor/strata/blue1, +/area/strata/ag/interior/outpost/canteen) +"qUL" = ( +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/turf/open/floor/strata/floor3/east, +/area/strata/ag/interior/outpost/med) "qUQ" = ( /obj/structure/flora/bush/ausbushes/lavendergrass, /turf/open/auto_turf/strata_grass/layer1, @@ -31208,22 +28366,41 @@ "qUW" = ( /turf/open/floor/strata/white_cyan1/east, /area/strata/ag/interior/mining_outpost/canteen) -"qVb" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/north) "qVc" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 10 }, /turf/open/floor/strata/blue1, /area/strata/ag/interior/outpost/admin) +"qVY" = ( +/obj/structure/cryofeed/right, +/obj/structure/platform/metal/strata, +/obj/structure/barricade/handrail/wire{ + layer = 3.5 + }, +/turf/open/gm/river, +/area/strata/ag/interior/outside/engineering/parts_storage) +"qVZ" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/structure/pipes/standard/manifold/hidden/cyan{ + dir = 8 + }, +/turf/open/floor/strata/multi_tiles/southwest, +/area/strata/ag/interior/outpost/engi/drome) "qWc" = ( /obj/structure/machinery/light/small{ dir = 4 }, /turf/open/floor/strata/floor3/east, /area/strata/ug/interior/outpost/underground_dorms/med1) +"qWw" = ( +/obj/effect/decal/cleanable/greenglow, +/turf/open/floor/strata/white_cyan3, +/area/strata/ag/interior/outpost/med) "qWC" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/flora/pottedplant{ @@ -31236,19 +28413,23 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ug/interior/jungle/structures/research) +"qWT" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan{ + dir = 8 + }, +/turf/open/floor/strata/cyan2/east, +/area/strata/ag/interior/outpost/med) "qWY" = ( /obj/structure/machinery/light{ dir = 4 }, /turf/open/floor/strata/floor3, /area/strata/ag/interior/landing_zones/near_lz1) -"qXN" = ( -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/obj/effect/decal/strata_decals/catwalk/prison, -/turf/open/floor/greengrid, -/area/strata/ug/interior/jungle/structures/monitoring) +"qXa" = ( +/obj/structure/platform/metal/strata/north, +/obj/item/toy/deck, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/paths/south_outpost) "qXY" = ( /obj/structure/computerframe, /obj/structure/barricade/handrail/strata{ @@ -31261,13 +28442,6 @@ /obj/effect/decal/cleanable/blood/gibs/core, /turf/open/floor/strata, /area/strata/ag/exterior/outpost_decks) -"qYF" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/landing_zones/near_lz2) "qYZ" = ( /obj/item/weapon/gun/rifle/type71/carbine, /obj/effect/decal/cleanable/blood/gibs/core, @@ -31277,6 +28451,17 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/strata, /area/strata/ag/exterior/outpost_decks) +"raD" = ( +/obj/structure/flora/grass/tallgrass/ice/corner{ + dir = 9 + }, +/obj/structure/platform_decoration/stone/strata/east, +/turf/open/auto_turf/snow/brown_base/layer3, +/area/strata/ag/exterior/paths/far_north_outpost) +"raG" = ( +/obj/structure/closet/wardrobe/engineering_yellow, +/turf/open/floor/prison/darkyellowfull2, +/area/strata/ag/interior/outpost/canteen) "rba" = ( /obj/structure/closet, /obj/effect/landmark/objective_landmark/far, @@ -31288,20 +28473,33 @@ }, /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/marsh/center) +"rcK" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 8; + icon_state = "p_stair_ew_full_cap"; + layer = 3.5 + }, +/turf/open/floor/strata/multi_tiles, +/area/strata/ag/interior/outpost/foyer) +"rcX" = ( +/obj/structure/bed/chair, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/strata/white_cyan1/east, +/area/strata/ag/interior/outpost/canteen) "rdm" = ( /obj/structure/largecrate/random, /turf/open/floor/strata, /area/strata/ag/exterior/outpost_decks) -"reb" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/asphalt/cement, -/area/strata/ug/interior/outpost/platform) +"rdt" = ( +/obj/structure/platform/stone/strata/east, +/turf/open/auto_turf/snow/brown_base/layer4, +/area/strata/ag/exterior/landing_zones/near_lz2) +"rdL" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform_decoration/stone/strata/east, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/water) "rel" = ( /obj/structure/stairs/perspective{ color = "#6e6e6e"; @@ -31315,15 +28513,6 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/strata/floor3/east, /area/strata/ag/exterior/caves/shed_five_caves) -"rfN" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/obj/structure/pipes/vents/pump{ - dir = 8 - }, -/turf/open/floor/strata/white_cyan1/east, -/area/strata/ag/interior/outpost/hallways/north) "rgt" = ( /obj/structure/stairs/perspective{ color = "#6e6e6e"; @@ -31336,6 +28525,15 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ug/interior/outpost/platform) +"rgA" = ( +/obj/structure/platform/metal/strata/west, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/barricade/handrail/strata{ + layer = 3.1 + }, +/obj/structure/platform/metal/strata, +/turf/open/gm/river, +/area/strata/ag/exterior/outpost_decks) "rgH" = ( /obj/structure/barricade/snow{ dir = 8 @@ -31356,6 +28554,10 @@ }, /turf/open/asphalt/cement/cement1, /area/strata/ag/interior/landing_zones/lz1) +"rhw" = ( +/obj/item/stack/sandbags/large_stack, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/canteen) "rhJ" = ( /obj/structure/barricade/handrail/strata{ dir = 8 @@ -31363,27 +28565,10 @@ /obj/structure/barricade/handrail/strata, /turf/open/asphalt/cement/cement14, /area/strata/ug/interior/outpost/platform) -"riM" = ( -/obj/structure/flora/grass/tallgrass/ice/corner{ - dir = 1 - }, -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/barricade/handrail/strata{ - layer = 3.1 - }, -/obj/structure/platform/strata/metal, -/turf/open/gm/river, -/area/strata/ag/exterior/outpost_decks) -"riS" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor/colony{ - dir = 1; - name = "\improper Airlock" - }, -/turf/open/floor/strata/multi_tiles/west, -/area/strata/ag/interior/outpost/hallways/south) +"riQ" = ( +/obj/effect/landmark/corpsespawner/doctor, +/turf/open/floor/strata/white_cyan2/west, +/area/strata/ag/interior/outpost/canteen) "riY" = ( /obj/structure/pipes/vents/pump{ dir = 8; @@ -31417,6 +28602,15 @@ }, /turf/open/asphalt/cement/cement4, /area/strata/ug/interior/outpost/platform) +"rkU" = ( +/obj/structure/platform/stone/strata/west, +/obj/structure/platform/stone/strata/east, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/landing_zones/near_lz2) +"rmT" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/multi_tiles, +/area/strata/ag/interior/outpost/foyer) "rni" = ( /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/marsh/spring_marshes) @@ -31432,12 +28626,24 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/auto_turf/strata_grass/layer0_mud_alt, /area/strata/ug/interior/jungle/structures/research/old_tunnels) +"ros" = ( +/obj/effect/decal/cleanable/ash, +/turf/open/floor/strata/floor3/east, +/area/strata/ag/interior/outpost/engi/drome) "roI" = ( /obj/structure/machinery/light{ dir = 8 }, /turf/open/floor/strata, /area/strata/ag/interior/outpost/engi) +"rpa" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, +/obj/structure/platform_decoration/metal/strata/east, +/obj/effect/decal/strata_decals/catwalk/prison, +/turf/open/floor/greengrid, +/area/strata/ug/interior/jungle/structures/monitoring) "rpp" = ( /obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/strata/floor3, @@ -31459,9 +28665,14 @@ "rpX" = ( /turf/open/asphalt/cement/cement4, /area/strata/ug/interior/outpost/platform) -"rqr" = ( -/turf/open/floor/strata/fake_wood, -/area/strata/ag/interior/outpost/hallways/north) +"rqs" = ( +/obj/structure/platform/stone/strata/west, +/turf/open/auto_turf/snow/brown_base/layer4, +/area/strata/ag/exterior/landing_zones/near_lz2) +"rqH" = ( +/obj/structure/platform/metal/strata/west, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/paths/flight_control_exterior) "rqL" = ( /obj/item/tool/wrench, /turf/open/floor/strata, @@ -31470,30 +28681,59 @@ /obj/structure/flora/grass/tallgrass/jungle/corner, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/tearlake) -"rrV" = ( -/obj/structure/platform/strata{ - dir = 1 +"rrM" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 }, -/turf/open/auto_turf/ice/layer0, -/area/strata/ag/exterior/marsh/spring_marshes) +/obj/structure/machinery/light, +/turf/open/floor/strata/multi_tiles, +/area/strata/ag/interior/outpost/foyer) +"rrN" = ( +/obj/structure/platform/metal/strata/east, +/turf/open/floor/strata/orange_cover, +/area/strata/ag/interior/landing_zones/near_lz1) "rsm" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 1 }, /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/marsh/center) +"rts" = ( +/obj/structure/flora/grass/tallgrass/ice/corner{ + dir = 8 + }, +/obj/structure/platform_decoration/stone/strata/east, +/obj/effect/decal/cleanable/blood, +/turf/open/auto_turf/snow/brown_base/layer3, +/area/strata/ag/exterior/paths/far_north_outpost) "rtX" = ( /turf/closed/wall/strata_outpost/reinforced/hull, /area/strata/ag/exterior/caves/lz_caves) "run" = ( /turf/closed/wall/strata_outpost, /area/strata/ag/interior/outside/checkpoints/north_armor) +"rus" = ( +/obj/structure/platform/stone/strata/west, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/marsh/spring_marshes) "ruM" = ( /turf/open/gm/coast/beachcorner/south_east, /area/strata/ug/interior/jungle/structures/monitoring/south) +"rvj" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic, +/turf/open/floor/strata/orange_cover, +/area/strata/ag/interior/mining_outpost/central) "rvD" = ( /turf/open/gm/coast/beachcorner2/south_west, /area/strata/ug/interior/jungle/structures/monitoring/south) +"rvR" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/strata/west, +/turf/open/floor/strata, +/area/strata/ag/exterior/outpost_decks) "rwg" = ( /obj/structure/window/framed/strata, /turf/open/floor/strata/multi_tiles/west, @@ -31506,9 +28746,22 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/strata/fake_wood, /area/strata/ug/interior/jungle/structures/research/old_tunnels) +"rxj" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "gibarm_flesh" + }, +/obj/structure/pipes/standard/manifold/hidden/cyan{ + dir = 1 + }, +/turf/open/floor/strata/red1, +/area/strata/ag/interior/outpost/security) "rxp" = ( /turf/closed/wall/strata_outpost, /area/strata/ug/interior/outpost/underground_dorms/admin3) +"rxB" = ( +/obj/structure/platform_decoration/metal/strata/east, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/engi) "rxL" = ( /obj/item/clothing/shoes/snow, /obj/structure/surface/rack, @@ -31521,14 +28774,11 @@ }, /turf/open/floor/plating, /area/strata/ag/exterior/landing_zones/near_lz2) -"ryf" = ( -/obj/structure/platform_decoration/strata/metal, -/obj/effect/decal/strata_decals/catwalk/prison, -/obj/structure/barricade/handrail/wire{ - layer = 3.5 - }, -/turf/open/floor/greengrid, -/area/strata/ag/interior/outside/engineering/parts_storage) +"ryh" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/condiment/saltshaker, +/turf/open/floor/strata/cyan1/east, +/area/strata/ag/interior/outpost/canteen) "ryw" = ( /obj/structure/machinery/weather_siren{ dir = 8; @@ -31551,16 +28801,45 @@ /obj/structure/barricade/handrail/strata, /turf/open/floor/strata/orange_cover, /area/strata/ag/interior/outpost/engi/drome) +"rzy" = ( +/obj/structure/platform_decoration/metal/strata, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/paths/mining_outpost_exterior) "rzG" = ( /obj/structure/barricade/handrail/strata, /turf/open/floor/strata/orange_cover, /area/strata/ag/interior/outpost/engi/drome) -"rAv" = ( -/obj/structure/platform/strata{ - dir = 4 +"rzY" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 8; + icon_state = "p_stair_full" }, -/turf/open/auto_turf/ice/layer1, -/area/strata/ag/interior/outside/engineering/parts_storage_cave) +/obj/structure/platform/metal/strata, +/turf/open/floor/strata/multi_tiles/west, +/area/strata/ag/interior/outside/engineering/parts_storage) +"rAX" = ( +/obj/effect/decal/cleanable/vomit, +/turf/open/floor/strata/white_cyan2/west, +/area/strata/ag/interior/outpost/canteen) +"rBp" = ( +/obj/structure/flora/grass/tallgrass/ice, +/obj/structure/platform/stone/strata/north, +/turf/open/auto_turf/snow/brown_base/layer3, +/area/strata/ag/exterior/paths/north_outpost) +"rCl" = ( +/obj/structure/bed/nest, +/obj/structure/platform/metal/strata/north, +/turf/open/floor/strata/multi_tiles, +/area/strata/ag/interior/mining_outpost/hive) +"rCQ" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/strata/west, +/turf/open/floor/strata/multi_tiles, +/area/strata/ag/exterior/paths/mining_outpost_exterior) "rDl" = ( /obj/structure/barricade/handrail/strata{ dir = 4 @@ -31569,18 +28848,29 @@ /obj/structure/pipes/standard/simple/hidden/cyan, /turf/open/floor/strata/orange_cover, /area/strata/ag/interior/outpost/engi/drome) -"rEr" = ( -/obj/structure/platform/strata/metal{ - dir = 1 +"rEx" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/obj/structure/platform/metal/strata/west, +/obj/structure/machinery/light{ + dir = 8 }, -/turf/open/auto_turf/strata_grass/layer0, -/area/strata/ug/interior/outpost/platform) +/turf/open/floor/prison/darkyellowfull2, +/area/strata/ag/exterior/outpost_decks) +"rEL" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/turf/open/floor/strata/orange_cover, +/area/strata/ag/interior/outpost/engi/drome) "rFn" = ( /turf/closed/shuttle/ert{ icon_state = "leftengine_2"; opacity = 0 }, /area/strata/ag/interior/outpost/engi/drome/shuttle) +"rFN" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/obj/structure/platform_decoration/metal/strata/west, +/turf/open/floor/strata/fake_wood, +/area/strata/ag/interior/outpost/engi) "rFZ" = ( /obj/effect/decal/cleanable/blood/gibs/limb, /obj/structure/flora/grass/tallgrass/jungle/corner{ @@ -31596,12 +28886,33 @@ /obj/effect/decal/cleanable/blood/gibs/core, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outside/engineering/parts_storage) +"rHO" = ( +/obj/structure/sign/nosmoking_1, +/turf/closed/wall/strata_outpost, +/area/strata/ag/interior/outpost/canteen) +"rHV" = ( +/obj/structure/flora/grass/tallgrass/ice/corner{ + dir = 10 + }, +/obj/structure/platform/stone/strata, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/marsh/spring_marshes) "rHX" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 4 }, /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/marsh/water_marshes) +"rId" = ( +/obj/structure/curtain/open/medical, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/floor2, +/area/strata/ag/interior/outpost/med) +"rIC" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/drinks/cans/ale, +/turf/open/floor/strata/cyan1/east, +/area/strata/ag/interior/outpost/canteen) "rIM" = ( /turf/open/gm/coast/south, /area/strata/ug/interior/jungle/carplake/north) @@ -31612,13 +28923,21 @@ /obj/structure/fence, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/marsh/spring_marshes) -"rLg" = ( -/obj/structure/machinery/light/small{ +"rJu" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform_decoration/stone/strata, +/turf/open/gm/river, +/area/strata/ag/exterior/landing_zones/near_lz2) +"rJJ" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan{ dir = 4 }, -/obj/structure/inflatable/popped, -/turf/open/floor/strata/cyan4/east, -/area/strata/ag/interior/outpost/hallways/south) +/turf/open/floor/strata/fake_wood, +/area/strata/ag/interior/outpost/med) +"rJX" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/white_cyan3/northeast, +/area/strata/ag/interior/outpost/med) "rLn" = ( /obj/effect/landmark/survivor_spawner, /turf/open/floor/plating/warnplate, @@ -31635,6 +28954,10 @@ opacity = 0 }, /area/strata/ag/interior/outpost/engi/drome/shuttle) +"rMx" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/white_cyan2/west, +/area/strata/ag/interior/mining_outpost/canteen) "rMy" = ( /obj/structure/bed{ icon_state = "abed" @@ -31660,6 +28983,15 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/floor/strata/floor2, /area/strata/ag/interior/outpost/med) +"rMX" = ( +/obj/structure/platform/metal/strata/north, +/obj/structure/machinery/space_heater, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/paths/south_outpost) +"rMY" = ( +/obj/structure/pipes/vents/pump, +/turf/open/floor/strata/red1, +/area/strata/ag/interior/outpost/security) "rNI" = ( /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/landing_zones/near_lz2) @@ -31668,14 +29000,18 @@ /obj/structure/barricade/handrail/strata, /turf/open/floor/greengrid, /area/strata/ug/interior/jungle/structures/monitoring) +"rOr" = ( +/obj/structure/platform_decoration/metal/strata/east, +/obj/structure/barricade/wooden, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/paths/south_outpost) "rOB" = ( /turf/closed/wall/strata_outpost/reinforced, /area/strata/ag/exterior/vanyard) -"rPA" = ( -/obj/structure/platform/strata/metal, -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/auto_turf/strata_grass/layer0_mud_alt, -/area/strata/ug/interior/jungle/structures/research/old_tunnels) +"rPH" = ( +/obj/structure/platform/metal/strata/west, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/paths/mining_outpost_exterior) "rQV" = ( /obj/structure/stairs/perspective{ color = "#6e6e6e"; @@ -31687,12 +29023,6 @@ }, /turf/open/floor/strata/floor3, /area/strata/ag/interior/mining_outpost/flight_control) -"rQX" = ( -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/auto_turf/ice/layer1, -/area/strata/ag/exterior/marsh/spring_marshes) "rRl" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/auto_turf/strata_grass/layer1, @@ -31704,16 +29034,20 @@ /obj/effect/landmark/objective_landmark/science, /turf/open/floor/strata/multi_tiles, /area/strata/ag/interior/mining_outpost/hive) +"rRC" = ( +/obj/structure/machinery/vending/cigarette/colony, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/canteen) "rSl" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/platform/south) -"rSB" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 +"rSv" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan{ + dir = 1 }, -/turf/open/floor/strata/white_cyan1/east, -/area/strata/ag/interior/mining_outpost/hallways) +/turf/open/floor/strata/orange_cover, +/area/strata/ag/interior/outpost/engi/drome) "rSE" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 @@ -31721,19 +29055,27 @@ /obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/strata/fake_wood, /area/strata/ag/interior/outside/checkpoints/outpost) -"rTf" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/obj/structure/pipes/vents/pump{ - dir = 4 - }, -/turf/open/floor/strata/floor3/east, -/area/strata/ag/interior/outpost/canteen) +"rTj" = ( +/obj/structure/flora/grass/tallgrass/ice, +/obj/structure/platform_decoration/stone/strata/east, +/turf/open/auto_turf/snow/brown_base/layer3, +/area/strata/ag/exterior/paths/far_north_outpost) +"rTA" = ( +/obj/structure/platform_decoration/stone/strata/north, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/marsh/crash) "rTC" = ( /obj/structure/pipes/standard/manifold/fourway/hidden/cyan, /turf/open/floor/strata/orange_cover, /area/strata/ag/interior/outpost/engi/drome) +"rTL" = ( +/obj/structure/platform/stone/strata/east, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/landing_zones/near_lz2) +"rTR" = ( +/obj/structure/platform/stone/strata/west, +/turf/open/auto_turf/ice/layer1, +/area/strata/ag/exterior/marsh/spring_marshes) "rUb" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 9 @@ -31749,18 +29091,10 @@ "rUM" = ( /turf/closed/wall/strata_outpost, /area/strata/ug/interior/jungle/tearlake) -"rUQ" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - dir = 8; - icon_state = "p_stair_ew_full_cap"; - layer = 3.5 - }, -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/floor/strata/multi_tiles/southwest, -/area/strata/ag/interior/outside/engineering/parts_storage) +"rWc" = ( +/obj/structure/platform/stone/strata/north, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/caves/lz_caves) "rWk" = ( /obj/structure/sink{ dir = 8; @@ -31771,10 +29105,11 @@ }, /turf/open/floor/strata/white_cyan2/west, /area/strata/ug/interior/outpost/underground_dorms/sec2) -"rXk" = ( -/obj/structure/pipes/vents/pump, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/hallways/north) +"rWB" = ( +/obj/structure/platform/metal/strata/north, +/obj/structure/cryofeed, +/turf/open/gm/river, +/area/strata/ag/interior/outside/engineering/parts_storage) "rXy" = ( /obj/structure/largecrate/random/barrel/yellow, /obj/effect/decal/cleanable/blood/oil, @@ -31791,10 +29126,19 @@ }, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/paths/flight_control_exterior) -"rZD" = ( +"rYp" = ( +/obj/effect/decal/cleanable/generic, +/obj/structure/platform/metal/strata/west, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/paths/flight_control_exterior) +"rZr" = ( +/obj/structure/platform_decoration/metal/strata/east, +/turf/open/auto_turf/snow/brown_base/layer4, +/area/strata/ag/exterior/paths/flight_control_exterior) +"rZs" = ( /obj/structure/pipes/standard/manifold/hidden/cyan, -/turf/open/floor/strata/white_cyan3, -/area/strata/ag/interior/outpost/hallways/south) +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/foyer) "rZF" = ( /turf/closed/wall/strata_outpost/reinforced/hull, /area/strata/ag/exterior/paths/flight_control_exterior) @@ -31816,6 +29160,12 @@ "saY" = ( /turf/open/gm/river, /area/strata/ug/interior/jungle/tearlake) +"sbA" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/strata/white_cyan2/west, +/area/strata/ag/interior/outpost/canteen) "sbU" = ( /obj/structure/pipes/standard/simple/hidden/cyan, /obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited{ @@ -31840,26 +29190,55 @@ }, /turf/open/floor/strata/purp2, /area/strata/ug/interior/jungle/structures/monitoring) +"sch" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata/white_cyan3/west, +/area/strata/ag/interior/outpost/med) "scp" = ( /obj/item/fuel_cell, /turf/open/floor/strata/red2, /area/strata/ag/interior/outpost/engi) -"scM" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan, -/turf/open/floor/prison/darkyellowfull2, -/area/strata/ag/interior/outpost/hallways/north) +"scA" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata/north, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/spring_marshes) +"scZ" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata, +/obj/structure/platform/stone/strata/west, +/turf/open/gm/river, +/area/strata/ag/exterior/landing_zones/near_lz2) "seb" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/interior/outside/bball/cave) -"sen" = ( +"sem" = ( /obj/structure/stairs/perspective{ color = "#6e6e6e"; - dir = 8; + dir = 4; icon_state = "p_stair_sn_full_cap" }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/hallways/south) +/obj/structure/platform/metal/strata/east, +/turf/open/floor/strata/multi_tiles, +/area/strata/ag/exterior/paths/mining_outpost_exterior) +"ser" = ( +/obj/structure/pipes/standard/manifold/fourway/hidden/cyan, +/turf/open/floor/strata/white_cyan1/east, +/area/strata/ag/interior/outpost/canteen) +"set" = ( +/obj/structure/platform_decoration/metal/strata, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/paths/flight_control_exterior) +"sfZ" = ( +/obj/structure/platform/metal/strata, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/paths/flight_control_exterior) "sgq" = ( /obj/structure/bed{ icon_state = "abed" @@ -31873,6 +29252,10 @@ "sgG" = ( /turf/closed/wall/strata_outpost/reinforced/hull, /area/strata/ag/interior/outside/engineering/parts_storage) +"sgO" = ( +/obj/structure/platform_decoration/metal/strata/north, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/paths/south_outpost) "sha" = ( /obj/effect/decal/cleanable/blood, /turf/open/auto_turf/ice/layer0, @@ -31889,6 +29272,12 @@ /obj/effect/decal/cleanable/blood/gibs/limb, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ug/interior/outpost/platform) +"shA" = ( +/obj/structure/platform/stone/strata/north, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/metal/strata/west, +/turf/open/gm/river, +/area/strata/ag/exterior/paths/far_north_outpost) "sig" = ( /obj/structure/pipes/standard/simple/hidden/cyan, /turf/open/auto_turf/snow/brown_base/layer0, @@ -31897,6 +29286,10 @@ /obj/structure/inflatable, /turf/open/floor/strata/cyan3/east, /area/strata/ag/interior/outpost/med) +"sit" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/canteen) "sjp" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -31906,24 +29299,27 @@ }, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outpost/engi/drome) -"sjS" = ( -/obj/structure/pipes/vents/pump{ - dir = 8 +"sjW" = ( +/obj/structure/bed/sofa/vert/grey/top, +/turf/open/floor/strata/blue1, +/area/strata/ag/interior/outpost/admin) +"skh" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan{ + dir = 1 }, -/turf/open/floor/strata/floor3/east, -/area/strata/ag/interior/outpost/hallways/south) +/turf/open/floor/strata/fake_wood, +/area/strata/ag/interior/mining_outpost/south_dormitories) "ski" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/storage/toolbox/mechanical, /obj/item/device/flashlight, /turf/open/floor/strata, /area/strata/ag/interior/outpost/engi/drome) -"skl" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor/colony{ - name = "\improper Airlock" - }, -/turf/open/floor/strata/multi_tiles/southeast, -/area/strata/ag/interior/outpost/hallways/south) +"skm" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/metal/strata/north, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/river) "skJ" = ( /obj/effect/decal/cleanable/blood/oil, /obj/structure/machinery/landinglight/ds2{ @@ -31931,6 +29327,18 @@ }, /turf/open/asphalt/cement/cement1, /area/strata/ag/exterior/landing_zones/lz2) +"skM" = ( +/obj/structure/platform_decoration/stone/strata/west, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/paths/south_outpost) +"skT" = ( +/obj/structure/machinery/door/airlock/almayer/engineering/colony, +/turf/open/floor/strata/multi_tiles/west, +/area/strata/ag/interior/outpost/engi) +"sle" = ( +/obj/structure/platform/metal/strata/east, +/turf/open/floor/strata/multi_tiles/southwest, +/area/strata/ag/interior/outpost/foyer) "sly" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -31938,12 +29346,6 @@ }, /turf/open/floor/plating, /area/strata/ag/interior/outside/engineering/parts_storage) -"slL" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/open/floor/strata/white_cyan1/east, -/area/strata/ag/interior/outpost/hallways/north) "smd" = ( /obj/structure/flora/bush/ausbushes/grassybush{ icon_state = "brflowers_1" @@ -31955,6 +29357,15 @@ /obj/item/toy/deck, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/platform/south) +"smV" = ( +/obj/structure/platform_decoration/stone/strata/north, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/marsh/spring_marshes) +"snR" = ( +/obj/structure/platform/metal/strata/north, +/obj/structure/platform/metal/strata/east, +/turf/open/auto_turf/snow/brown_base/layer3, +/area/strata/ag/exterior/caves/shed_five_caves) "snV" = ( /turf/closed/wall/strata_outpost/reinforced, /area/strata/ug/interior/outpost/platform) @@ -31966,6 +29377,12 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ug/interior/jungle/structures/research) +"sop" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata, +/obj/structure/platform/stone/strata/east, +/turf/open/gm/river, +/area/strata/ag/exterior/landing_zones/near_lz2) "sot" = ( /obj/structure/barricade/handrail/strata{ dir = 1 @@ -32007,6 +29424,14 @@ /obj/structure/machinery/light, /turf/open/floor/strata/orange_cover, /area/strata/ag/interior/outside/engineering/parts_storage) +"ssb" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/east, +/obj/structure/platform/stone/strata, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/center) "ssd" = ( /turf/open/gm/coast/east, /area/strata/ug/interior/jungle/platform/east) @@ -32024,6 +29449,10 @@ "ssE" = ( /turf/open/floor/strata/orange_cover, /area/strata/ag/exterior/vanyard) +"stb" = ( +/obj/structure/platform_decoration/stone/strata/east, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/marsh/center) "stf" = ( /turf/open/gm/coast/west, /area/strata/ug/interior/jungle/carplake/east) @@ -32036,11 +29465,10 @@ }, /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/marsh/center) -"suF" = ( -/obj/structure/platform/strata/metal, -/obj/structure/machinery/light, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/paths/mining_outpost_exterior) +"stX" = ( +/obj/structure/platform/stone/strata/west, +/turf/open/auto_turf/snow/brown_base/layer3, +/area/strata/ag/exterior/marsh/spring_marshes) "svg" = ( /obj/effect/decal/cleanable/blood, /obj/structure/machinery/camera/autoname{ @@ -32053,16 +29481,21 @@ /obj/structure/fence, /turf/open/asphalt/cement/cement9, /area/strata/ag/interior/outside/engineering/parts_storage_exterior) +"swK" = ( +/obj/structure/largecrate/random/secure{ + layer = 3.1 + }, +/obj/structure/platform/stone/strata/north, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/paths/south_outpost) "swQ" = ( /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outside/checkpoints/south) -"sxr" = ( +"sxe" = ( +/obj/structure/platform/stone/strata/north, /obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform_decoration/strata{ - dir = 4 - }, /turf/open/gm/river, -/area/strata/ag/exterior/paths/far_north_outpost) +/area/strata/ag/exterior/marsh/water) "sxT" = ( /obj/item/stack/rods, /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, @@ -32073,6 +29506,16 @@ /obj/effect/landmark/monkey_spawn, /turf/open/floor/strata/purp2, /area/strata/ug/interior/jungle/structures/monitoring) +"syh" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor/colony{ + name = "\improper Airlock" + }, +/turf/open/floor/strata/multi_tiles/southeast, +/area/strata/ag/interior/outpost/canteen) +"sys" = ( +/obj/structure/platform_decoration/metal/strata, +/turf/open/floor/strata/multi_tiles, +/area/strata/ag/interior/mining_outpost/central) "syU" = ( /obj/structure/machinery/space_heater, /turf/open/floor/strata, @@ -32094,6 +29537,17 @@ "sAv" = ( /turf/closed/wall/strata_outpost/reinforced/hull, /area/strata/ug/interior/outpost/underground_dorms/med1) +"sBe" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata/multi_tiles, +/area/strata/ag/interior/outpost/foyer) "sBf" = ( /obj/structure/stairs/perspective{ color = "#6e6e6e"; @@ -32116,12 +29570,15 @@ /obj/structure/surface/table/reinforced/prison, /turf/open/floor/strata/purp2, /area/strata/ug/interior/jungle/structures/monitoring) -"sCO" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 6 - }, -/turf/open/floor/prison/darkyellowfull2, -/area/strata/ag/interior/outpost/hallways/north) +"sCl" = ( +/obj/item/stack/rods, +/obj/structure/pipes/vents/pump/on, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/engi) +"sDh" = ( +/obj/structure/platform_decoration/metal/strata/east, +/turf/open/floor/strata, +/area/strata/ag/interior/mining_outpost/central) "sDs" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -32134,20 +29591,24 @@ }, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outpost/med) -"sEG" = ( -/obj/structure/platform_decoration/strata{ - dir = 8 - }, -/obj/structure/platform_decoration/strata{ - dir = 1 - }, -/obj/effect/blocker/sorokyne_cold_water, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/water) +"sEs" = ( +/obj/structure/platform_decoration/metal/strata/east, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/auto_turf/strata_grass/layer0, +/area/strata/ug/interior/jungle/platform/east) "sEV" = ( /obj/structure/flora/bush/ausbushes/grassybush, /turf/open/gm/dirt, /area/strata/ug/interior/jungle/structures/monitoring/west) +"sFp" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata, +/obj/effect/blocker/sorokyne_cold_water, +/turf/open/gm/river, +/area/strata/ag/interior/landing_zones/near_lz1) "sFB" = ( /obj/structure/machinery/landinglight/ds2{ dir = 1 @@ -32166,6 +29627,11 @@ }, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/structures/monitoring/south) +"sFZ" = ( +/obj/effect/decal/cleanable/blood, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/white_cyan2/west, +/area/strata/ag/interior/outpost/canteen) "sGb" = ( /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/marsh/spring_marshes) @@ -32181,6 +29647,11 @@ /obj/structure/largecrate/random/case/small, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outside/engineering/parts_storage) +"sHN" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata/north, +/turf/open/gm/river, +/area/strata/ag/exterior/paths/far_north_outpost) "sHP" = ( /turf/closed/wall/strata_outpost, /area/strata/ug/interior/outpost/underground_dorms/sec1) @@ -32193,6 +29664,12 @@ /obj/structure/pipes/standard/manifold/hidden/cyan, /turf/open/floor/strata, /area/strata/ag/interior/mining_outpost/central) +"sJP" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/snacks/cubancarp, +/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, +/turf/open/floor/strata/cyan1/east, +/area/strata/ag/interior/mining_outpost/canteen) "sKX" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /turf/open/auto_turf/strata_grass/layer1, @@ -32201,6 +29678,11 @@ /obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/plating, /area/strata/ug/interior/jungle/structures/monitoring/west) +"sMf" = ( +/obj/structure/platform/metal/strata/west, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/paths/flight_control_exterior) "sMj" = ( /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/strata, @@ -32212,16 +29694,30 @@ /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/almayer/test_floor5, /area/strata/ag/exterior/marsh/crash) -"sNz" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/south) +"sNq" = ( +/obj/item/bodybag/tarp/snow, +/obj/structure/platform/metal/strata/west, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/paths/mining_outpost_exterior) +"sNM" = ( +/obj/item/lightstick/planted, +/obj/structure/platform/metal/strata/east, +/turf/open/auto_turf/snow/brown_base/layer4, +/area/strata/ag/interior/restricted) +"sOb" = ( +/obj/structure/platform/metal/strata/north, +/obj/structure/inflatable, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/paths/south_outpost) "sOB" = ( /obj/effect/decal/cleanable/blood/gibs/limb, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/exterior/outpost_decks) +"sOU" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/mining_outpost/central) "sPD" = ( /obj/structure/bed{ icon_state = "abed" @@ -32235,6 +29731,13 @@ "sPF" = ( /turf/open/floor/strata, /area/strata/ug/interior/outpost/platform) +"sPP" = ( +/obj/item/stack/rods, +/obj/structure/pipes/standard/manifold/hidden/cyan{ + dir = 8 + }, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/engi) "sQs" = ( /turf/open/asphalt/cement/cement9, /area/strata/ag/exterior/landing_zones/lz2) @@ -32252,6 +29755,12 @@ }, /turf/open/floor/strata/floor2, /area/strata/ug/interior/jungle/structures/monitoring) +"sRw" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/west, +/turf/open/gm/river, +/area/strata/ag/exterior/landing_zones/near_lz2) "sRz" = ( /obj/structure/inflatable, /obj/structure/barricade/handrail/strata, @@ -32263,13 +29772,30 @@ }, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/structures/monitoring/west) +"sRV" = ( +/obj/structure/platform/stone/strata/north, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/marsh/crash) "sRX" = ( /turf/open/floor/strata/floor3/east, /area/strata/ug/interior/outpost/underground_dorms/med2) +"sSs" = ( +/obj/structure/platform/stone/strata/north, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/landing_zones/near_lz2) "sSv" = ( /obj/structure/pipes/standard/simple/hidden/cyan, /turf/open/asphalt/cement/cement12, /area/strata/ag/exterior/marsh/spring_marshes) +"sSM" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 1; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/strata/west, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/paths/south_outpost) "sSZ" = ( /obj/effect/decal/cleanable/blood{ icon_state = "xgib4" @@ -32282,6 +29808,11 @@ }, /turf/open/gm/dirt, /area/strata/ug/interior/jungle/structures/monitoring/south) +"sTF" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/device/lightreplacer, +/turf/open/floor/strata/multi_tiles/southwest, +/area/strata/ag/interior/outpost/canteen) "sTZ" = ( /obj/structure/machinery/power/apc/no_power/west, /turf/open/floor/strata/multi_tiles/southwest, @@ -32292,9 +29823,21 @@ /obj/structure/pipes/standard/simple/hidden/cyan, /turf/open/floor/plating, /area/strata/ag/exterior/outpost_decks) +"sUY" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/obj/structure/machinery/light, +/turf/open/floor/strata/white_cyan1/east, +/area/strata/ag/interior/mining_outpost/canteen) "sWt" = ( /turf/open/floor/strata/multi_tiles/southeast, /area/strata/ag/interior/mining_outpost/hive) +"sWz" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/obj/structure/platform/metal/strata/west, +/turf/open/floor/prison/darkyellowfull2, +/area/strata/ag/exterior/outpost_decks) "sWO" = ( /turf/open/asphalt/cement/cement15, /area/strata/ag/exterior/marsh/spring_marshes) @@ -32306,6 +29849,10 @@ /obj/structure/window/framed/strata, /turf/open/floor/strata/floor2, /area/strata/ug/interior/jungle/structures/monitoring) +"sXs" = ( +/obj/structure/platform/metal/strata/north, +/turf/open/floor/strata, +/area/strata/ag/interior/mining_outpost/central) "sXt" = ( /obj/structure/bed/chair{ dir = 8 @@ -32322,27 +29869,37 @@ }, /turf/open/floor/strata/floor3/east, /area/strata/ag/exterior/caves/shed_five_caves) -"sXF" = ( -/obj/effect/particle_effect/steam, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ +"sXz" = ( +/obj/structure/platform_decoration/metal/strata/east, +/turf/open/floor/strata/red1, +/area/strata/ag/interior/landing_zones/near_lz1) +"sXE" = ( +/obj/structure/bed/chair{ dir = 8 }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/spring_marshes) -"sXU" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ - dir = 1 +/obj/effect/decal/cleanable/blood, +/turf/open/floor/strata/white_cyan2/west, +/area/strata/ag/interior/outpost/canteen) +"sXL" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/structure/platform/strata{ - dir = 8 +/obj/structure/platform/metal/strata/east, +/turf/open/floor/plating, +/area/strata/ag/exterior/outpost_decks) +"sYe" = ( +/obj/structure/flora/grass/tallgrass/jungle/corner{ + dir = 10 }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/spring_marshes) +/obj/structure/platform/metal/strata/north, +/turf/open/auto_turf/strata_grass/layer0, +/area/strata/ug/interior/outpost/platform) +"sYU" = ( +/obj/structure/platform/metal/strata/north, +/turf/open/floor/strata/floor3/east, +/area/strata/ag/exterior/outpost_decks) "sZP" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -32355,10 +29912,30 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/strata/blue1, /area/strata/ag/interior/outpost/admin) +"tab" = ( +/obj/structure/machinery/door/airlock/almayer/engineering/colony{ + dir = 2 + }, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/engi) +"tad" = ( +/obj/structure/platform/stone/strata/north, +/turf/open/auto_turf/ice/layer1, +/area/strata/ag/exterior/marsh/spring_marshes) +"tao" = ( +/obj/structure/platform_decoration/metal/strata/west, +/obj/effect/decal/strata_decals/catwalk/prison, +/turf/open/floor/greengrid, +/area/strata/ug/interior/jungle/structures/monitoring) "tas" = ( /obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/plating, /area/strata/ug/interior/jungle/structures/research/old_tunnels) +"tax" = ( +/obj/structure/platform/metal/strata/north, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/auto_turf/strata_grass/layer0, +/area/strata/ug/interior/jungle/platform/east) "taL" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -32381,6 +29958,15 @@ }, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outside/engineering/parts_storage) +"tdy" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/strata, +/turf/open/floor/strata/multi_tiles, +/area/strata/ag/exterior/outpost_decks) "tdB" = ( /obj/item/explosive/grenade/high_explosive/upp, /obj/effect/decal/cleanable/blood, @@ -32389,6 +29975,10 @@ }, /turf/open/floor/strata/floor3/east, /area/strata/ug/interior/outpost/underground_dorms/admin2) +"tdG" = ( +/obj/structure/platform/metal/strata, +/turf/open/floor/strata/multi_tiles, +/area/strata/ag/interior/mining_outpost/central) "ter" = ( /obj/structure/flora/bush/ausbushes/grassybush{ icon_state = "fernybush_3" @@ -32401,9 +29991,6 @@ }, /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/paths/south_outpost) -"tfy" = ( -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/hallways/north) "tfB" = ( /obj/structure/closet/secure_closet/engineering_electrical, /obj/effect/landmark/objective_landmark/medium, @@ -32446,16 +30033,6 @@ /obj/item/weapon/gun/pistol/t73, /turf/open/floor/greengrid, /area/strata/ag/exterior/outpost_decks) -"thD" = ( -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/strata/floor3/east, -/area/strata/ag/interior/outpost/hallways/south) -"tio" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/mining_outpost/hallways) "tiE" = ( /obj/structure/barricade/handrail/strata{ dir = 8 @@ -32480,12 +30057,11 @@ }, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outside/engineering/parts_storage) -"tkq" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 1 - }, -/turf/open/auto_turf/strata_grass/layer0, -/area/strata/ug/interior/outpost/platform) +"tkX" = ( +/obj/structure/platform_decoration/stone/strata, +/obj/effect/blocker/sorokyne_cold_water, +/turf/open/gm/river, +/area/strata/ag/exterior/paths/far_north_outpost) "tlc" = ( /obj/structure/surface/rack, /obj/item/storage/box/beakers, @@ -32494,6 +30070,12 @@ /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/strata/floor3, /area/strata/ag/interior/outpost/engi) +"tlm" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/drinks/cans/sodawater, +/obj/effect/landmark/objective_landmark/science, +/turf/open/floor/prison/darkyellowfull2, +/area/strata/ag/interior/outpost/canteen) "tlo" = ( /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/blood/gibs/limb, @@ -32525,6 +30107,11 @@ /obj/structure/machinery/microwave, /turf/open/floor/strata/white_cyan2/west, /area/strata/ug/interior/outpost/underground_dorms/admin1) +"tnp" = ( +/obj/structure/platform/stone/strata, +/obj/effect/blocker/sorokyne_cold_water, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/water) "tnM" = ( /turf/open/asphalt/cement/cement12, /area/strata/ug/interior/outpost/platform) @@ -32536,6 +30123,12 @@ "toV" = ( /turf/open/gm/coast/beachcorner/north_east, /area/strata/ug/interior/jungle/tearlake) +"tpo" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan{ + dir = 1 + }, +/turf/open/floor/strata/white_cyan1/east, +/area/strata/ag/interior/mining_outpost/canteen) "tpW" = ( /obj/structure/flora/grass/tallgrass/jungle, /obj/effect/landmark/monkey_spawn, @@ -32545,48 +30138,41 @@ /obj/structure/flora/grass/ice/brown/snowgrassbb_3, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/paths/far_north_outpost) +"trg" = ( +/obj/structure/barricade/snow{ + dir = 8 + }, +/obj/structure/platform/metal/strata, +/turf/open/auto_turf/snow/brown_base/layer3, +/area/strata/ag/exterior/paths/flight_control_exterior) "trr" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_door, /turf/open/floor/strata/multi_tiles, /area/strata/ag/interior/mining_outpost/hive) -"tru" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 4 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/river) -"trz" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/river) "trM" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, /turf/open/floor/almayer/plate, /area/strata/ug/interior/jungle/structures/research) +"tsp" = ( +/obj/structure/platform_decoration/stone/strata, +/obj/effect/blocker/sorokyne_cold_water, +/obj/effect/blocker/sorokyne_cold_water, +/turf/open/gm/river, +/area/strata/ag/exterior/paths/far_north_outpost) "tsz" = ( /obj/structure/barricade/handrail/strata{ dir = 8 }, /turf/open/floor/strata/orange_edge/west, /area/strata/ag/exterior/outpost_decks) -"tsX" = ( -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/turf/open/floor/strata, -/area/strata/ag/exterior/outpost_decks) +"ttd" = ( +/obj/structure/platform/stone/strata/north, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/marsh/center) +"ttk" = ( +/obj/structure/platform_decoration/stone/strata/east, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/marsh/crash) "ttQ" = ( /obj/structure/machinery/light/small, /turf/open/floor/strata, @@ -32595,23 +30181,27 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/tearlake) +"tup" = ( +/obj/structure/platform_decoration/metal/strata/west, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/paths/south_outpost) "tuu" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 1 }, /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/paths/north_outpost) +"tuL" = ( +/obj/structure/flora/grass/tallgrass/ice/corner{ + dir = 6 + }, +/obj/structure/platform/stone/strata, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/marsh/spring_marshes) "tuV" = ( /obj/structure/machinery/fuelcell_recycler/full, /turf/open/floor/strata/floor3, /area/strata/ag/interior/outpost/engi) -"tvk" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/auto_turf/strata_grass/layer0_mud_alt, -/area/strata/ug/interior/jungle/structures/research/old_tunnels) "twa" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/asphalt/cement, @@ -32641,24 +30231,43 @@ }, /turf/open/floor/strata/fake_wood, /area/strata/ag/interior/outpost/canteen) -"tyD" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata, -/obj/structure/platform/strata{ - dir = 4 - }, +"tyZ" = ( +/obj/structure/platform_decoration/metal/strata/west, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata, +/area/strata/ag/interior/landing_zones/near_lz1) +"tAi" = ( +/obj/structure/platform/stone/strata/west, +/obj/structure/blocker/invisible_wall, /turf/open/gm/river, -/area/strata/ag/exterior/marsh/center) +/area/strata/ag/exterior/marsh/water) "tAs" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 }, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/paths/south_outpost) +"tAH" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform_decoration/stone/strata/north, +/turf/open/gm/river, +/area/strata/ag/exterior/landing_zones/near_lz2) "tAX" = ( /turf/open/auto_turf/ice/layer2, /area/strata/ag/exterior/marsh/spring_marshes) +"tBc" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 1; + icon_state = "p_stair_sn_full_cap" + }, +/turf/open/floor/strata/multi_tiles/southwest, +/area/strata/ag/interior/outpost/engi) +"tBi" = ( +/obj/effect/decal/cleanable/generic, +/obj/structure/platform/stone/strata, +/turf/open/auto_turf/snow/brown_base/layer3, +/area/strata/ag/exterior/marsh/center) "tBn" = ( /obj/structure/machinery/space_heater, /turf/open/auto_turf/ice/layer1, @@ -32670,6 +30279,13 @@ }, /turf/open/floor/strata/orange_cover, /area/strata/ag/interior/outside/engineering/parts_storage) +"tCk" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/obj/structure/curtain/open/shower, +/turf/open/floor/interior/plastic, +/area/strata/ag/interior/outpost/canteen) "tCI" = ( /obj/structure/window/framed/strata, /turf/open/floor/strata/multi_tiles/west, @@ -32686,10 +30302,36 @@ /obj/structure/flora/grass/ice/brown/snowgrassbb_1, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/marsh/center) +"tDw" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata/west, +/obj/structure/platform/stone/strata/east, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/river) +"tDH" = ( +/obj/structure/platform/stone/strata/east, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/marsh/spring_marshes) +"tDU" = ( +/obj/structure/platform/stone/strata/west, +/obj/structure/platform/stone/strata, +/obj/effect/blocker/sorokyne_cold_water, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/water) +"tDV" = ( +/obj/structure/platform/metal/strata/east, +/turf/open/floor/strata/multi_tiles, +/area/strata/ag/interior/mining_outpost/central) "tEf" = ( /obj/structure/window/framed/strata, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/interior/outside/engineering/parts_storage) +"tEq" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata/west, +/turf/open/gm/river, +/area/strata/ag/exterior/landing_zones/near_lz2) "tEC" = ( /obj/structure/sign/nosmoking_1, /turf/closed/wall/strata_outpost/reinforced, @@ -32700,15 +30342,13 @@ }, /turf/open/floor/strata, /area/strata/ag/interior/landing_zones/near_lz1) +"tFe" = ( +/obj/structure/platform/stone/strata/north, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/marsh/spring_marshes) "tFA" = ( /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/marsh/spring_marshes) -"tFS" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 10 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) "tGR" = ( /obj/structure/machinery/light{ dir = 1 @@ -32722,6 +30362,15 @@ }, /turf/open/floor/strata/multi_tiles/southeast, /area/strata/ug/interior/jungle/structures/monitoring) +"tHb" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 1; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/strata/west, +/turf/open/auto_turf/strata_grass/layer1, +/area/strata/ug/interior/outpost/platform) "tHv" = ( /obj/effect/landmark/static_comms/net_two, /turf/open/auto_turf/snow/brown_base/layer2, @@ -32735,10 +30384,21 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ug/interior/jungle/structures/monitoring) -"tIw" = ( -/obj/structure/pipes/vents/pump, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/canteen/personal_storage) +"tIV" = ( +/obj/structure/tunnel/maint_tunnel{ + pixel_y = 16 + }, +/turf/open/floor/strata/multi_tiles/southwest, +/area/strata/ag/interior/outpost/canteen) +"tJg" = ( +/obj/structure/noticeboard{ + pixel_y = 32 + }, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/mining_outpost/south_dormitories) "tJu" = ( /obj/item/ammo_magazine/rifle/type71, /turf/open/floor/strata/multi_tiles/southwest, @@ -32759,19 +30419,24 @@ /obj/structure/bed/sofa/vert/grey/top, /turf/open/floor/strata/fake_wood, /area/strata/ag/interior/landing_zones/near_lz1) -"tJR" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/north) "tJX" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 5 }, /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/marsh/water_marshes) +"tKx" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/west, +/obj/structure/platform_decoration/stone/strata, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/center) +"tKA" = ( +/obj/structure/platform_decoration/metal/strata, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/paths/south_outpost) "tKC" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/strata/multi_tiles/southeast, @@ -32791,6 +30456,15 @@ "tLI" = ( /turf/open/floor/strata/fake_wood, /area/strata/ug/interior/jungle/structures/monitoring) +"tMC" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 8; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/strata/east, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/paths/south_outpost) "tMP" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 10 @@ -32806,11 +30480,11 @@ /obj/structure/pipes/standard/simple/hidden/cyan, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/paths/south_outpost) -"tNr" = ( -/obj/structure/platform/strata/metal, -/obj/structure/machinery/light, -/turf/open/auto_turf/snow/brown_base/layer4, -/area/strata/ag/exterior/paths/mining_outpost_exterior) +"tNa" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/condiment/saltshaker, +/turf/open/floor/strata/blue1, +/area/strata/ag/interior/outpost/canteen) "tNz" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 9 @@ -32825,6 +30499,10 @@ /obj/structure/barricade/handrail/strata, /turf/open/asphalt/cement/cement14, /area/strata/ug/interior/outpost/platform) +"tOi" = ( +/obj/structure/platform/stone/strata/east, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/marsh/spring_marshes) "tOA" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/strata/orange_cover, @@ -32877,42 +30555,12 @@ /obj/structure/flora/grass/ice/brown/snowgrassbb_2, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/paths/far_north_outpost) -"tSi" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - dir = 1; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/paths/south_outpost) -"tSl" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/paths/far_north_outpost) "tSo" = ( /obj/structure/flora/bush/ausbushes/grassybush{ icon_state = "fernybush_3" }, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/tearlake) -"tSt" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 4 - }, -/obj/structure/platform/strata, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/center) "tSZ" = ( /obj/structure/window/framed/strata/reinforced, /turf/open/floor/strata/multi_tiles/southeast, @@ -32921,6 +30569,12 @@ /obj/structure/flora/bush/ausbushes/var3/sparsegrass, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/platform/east) +"tTu" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/strata, +/area/strata/ag/interior/mining_outpost/south_dormitories) "tTP" = ( /obj/structure/pipes/standard/simple/hidden/cyan, /turf/open/floor/strata/multi_tiles/west, @@ -32944,16 +30598,23 @@ /obj/structure/barricade/handrail/strata, /turf/open/floor/strata/fake_wood, /area/strata/ag/interior/outside/bball) -"tUZ" = ( -/obj/structure/platform/strata{ - dir = 1 +"tVd" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/flora/grass/tallgrass/ice/corner{ + dir = 8; + layer = 2.9 }, -/turf/open/auto_turf/ice/layer1, -/area/strata/ag/interior/outside/engineering/parts_storage_cave) +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/paths/south_outpost) "tVu" = ( /obj/structure/sign/safety/medical, /turf/closed/wall/strata_outpost, /area/strata/ag/interior/outpost/engi/drome) +"tVB" = ( +/obj/structure/platform/stone/strata, +/obj/effect/blocker/sorokyne_cold_water, +/turf/open/gm/river, +/area/strata/ag/exterior/paths/far_north_outpost) "tVN" = ( /obj/structure/largecrate/random/case/double, /obj/structure/machinery/light, @@ -32979,9 +30640,20 @@ }, /turf/open/asphalt/cement, /area/strata/ag/interior/outside/engineering/parts_storage_exterior) +"tWO" = ( +/obj/structure/platform/metal/strata/west, +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/open/floor/prison/darkyellowfull2, +/area/strata/ag/interior/outpost/engi) "tWY" = ( /turf/closed/wall/strata_outpost/reinforced, /area/strata/ag/interior/outside/engineering/parts_storage_exterior) +"tYg" = ( +/obj/structure/platform_decoration/metal/strata/west, +/turf/open/floor/strata/red1, +/area/strata/ag/interior/landing_zones/near_lz1) "tYB" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 5 @@ -32994,6 +30666,12 @@ }, /turf/open/auto_turf/ice/layer0, /area/strata/ag/exterior/marsh/center) +"tZm" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan{ + dir = 8 + }, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/canteen) "tZF" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -33006,10 +30684,20 @@ }, /turf/open/floor/strata/cyan2/east, /area/strata/ag/interior/outpost/med) +"uab" = ( +/obj/structure/platform_decoration/metal/strata/east, +/turf/open/floor/strata/multi_tiles/west, +/area/strata/ag/exterior/outpost_decks) "uad" = ( /obj/structure/largecrate/random, /turf/open/asphalt/cement/cement12, /area/strata/ag/interior/outside/engineering/parts_storage_exterior) +"uau" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata/red1, +/area/strata/ag/interior/outpost/security) "uaC" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 @@ -33025,6 +30713,11 @@ }, /turf/open/floor/strata, /area/strata/ag/exterior/outpost_decks) +"ubj" = ( +/obj/item/fuel_cell, +/obj/structure/platform/metal/strata/west, +/turf/open/floor/strata/red2, +/area/strata/ag/interior/outpost/engi) "ubo" = ( /obj/structure/surface/rack, /obj/item/tool/shovel/etool/folded, @@ -33066,6 +30759,12 @@ }, /turf/open/asphalt/cement, /area/strata/ag/exterior/outpost_decks) +"ueA" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata/white_cyan4/east, +/area/strata/ag/interior/outpost/med) "ueD" = ( /obj/structure/window/reinforced/tinted{ dir = 4 @@ -33076,32 +30775,28 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/strata/red1, /area/strata/ug/interior/outpost/underground_dorms/sec1) -"ueK" = ( -/obj/effect/particle_effect/steam, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ - dir = 4 - }, -/obj/structure/platform_decoration/strata{ - dir = 4 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/spring_marshes) "ueP" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/carplake/east) +"ufg" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/obj/structure/barricade/handrail/strata{ + dir = 1 + }, +/obj/structure/barricade/handrail/strata{ + dir = 4 + }, +/turf/open/floor/strata/orange_cover, +/area/strata/ag/interior/outpost/engi/drome) +"ufk" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/east, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/landing_zones/near_lz2) "ufG" = ( /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/paths/north_outpost) -"ufH" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - dir = 8; - icon_state = "p_stair_sn_full_cap" - }, -/turf/open/floor/strata/multi_tiles/southwest, -/area/strata/ag/interior/outpost/hallways/north) "ufI" = ( /obj/structure/stairs/perspective{ color = "#6e6e6e"; @@ -33110,6 +30805,14 @@ }, /turf/open/floor/prison/darkyellowfull2, /area/strata/ag/interior/outpost/engi) +"ufK" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/white_cyan3, +/area/strata/ag/interior/outpost/med) +"ufY" = ( +/obj/structure/pipes/standard/manifold/fourway/hidden/cyan, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/foyer) "ugH" = ( /obj/structure/closet/secure_closet/personal, /obj/item/storage/secure/briefcase, @@ -33122,6 +30825,12 @@ /obj/effect/decal/cleanable/blood/gibs/core, /turf/open/floor/strata, /area/strata/ag/exterior/outpost_decks) +"ugT" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/admin) "uhe" = ( /obj/structure/toilet{ dir = 1 @@ -33142,12 +30851,16 @@ "uhM" = ( /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/marsh/water_marshes) +"uic" = ( +/obj/effect/decal/cleanable/blood, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata/white_cyan1/east, +/area/strata/ag/interior/outpost/canteen) "uiE" = ( /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/paths/south_outpost) -"uiM" = ( -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/mining_outpost/hallways) "ujl" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 @@ -33165,18 +30878,14 @@ }, /turf/open/floor/strata, /area/strata/ag/exterior/outpost_decks) -"uls" = ( -/obj/effect/decal/strata_decals/catwalk/prison, -/obj/structure/disposalpipe/segment, -/turf/open/floor/strata/multi_tiles/southwest, -/area/strata/ag/interior/outpost/hallways/south) -"ulL" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/obj/structure/cryofeed/right, -/turf/open/gm/river, -/area/strata/ag/interior/outside/engineering/parts_storage) +"ukK" = ( +/obj/structure/platform/metal/strata/west, +/turf/open/auto_turf/strata_grass/layer0_mud_alt, +/area/strata/ug/interior/jungle/structures/research/old_tunnels) +"ulM" = ( +/obj/structure/window/framed/strata/reinforced, +/turf/open/floor/strata/multi_tiles/west, +/area/strata/ag/interior/outpost/canteen) "umE" = ( /obj/structure/toilet{ dir = 4 @@ -33192,12 +30901,15 @@ }, /turf/open/floor/strata/multi_tiles/west, /area/strata/ag/interior/outpost/security) -"unh" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/outpost/hallways/north) +"uns" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/metal/strata/west, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/river) +"uny" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/engi/drome) "unE" = ( /obj/structure/machinery/door/airlock/almayer/engineering/colony, /turf/open/floor/strata/multi_tiles/west, @@ -33207,6 +30919,19 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/strata/cyan1/east, /area/strata/ug/interior/outpost/underground_dorms/med1) +"unP" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform_decoration/stone/strata/west, +/obj/structure/platform_decoration/stone/strata, +/obj/structure/platform_decoration/stone/strata/north, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/center) +"uoB" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata/west, +/turf/open/gm/river, +/area/strata/ag/exterior/paths/far_north_outpost) "uoP" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/asphalt/cement/cement3, @@ -33231,24 +30956,10 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/strata/white_cyan2/west, /area/strata/ug/interior/outpost/underground_dorms/med2) -"urL" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 1 - }, -/turf/open/floor/prison/darkyellowfull2, -/area/strata/ag/interior/outpost/hallways/north) "urM" = ( /obj/structure/pipes/standard/manifold/hidden/cyan, /turf/open/floor/strata, /area/strata/ag/exterior/outpost_decks) -"urQ" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata, -/obj/structure/platform/strata{ - dir = 8 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/landing_zones/near_lz2) "usx" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/tool/plantspray/weeds, @@ -33261,12 +30972,6 @@ "usP" = ( /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/caves/lz_caves) -"utk" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 8 - }, -/turf/open/floor/strata/fake_wood, -/area/strata/ag/interior/outpost/hallways/south) "utn" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 @@ -33274,6 +30979,11 @@ /obj/structure/inflatable/door, /turf/open/floor/strata/multi_tiles/west, /area/strata/ag/exterior/outpost_decks) +"utx" = ( +/obj/structure/platform_decoration/metal/strata/east, +/obj/effect/decal/strata_decals/catwalk/prison, +/turf/open/floor/greengrid, +/area/strata/ag/interior/outside/engineering/parts_storage) "utX" = ( /obj/effect/decal/cleanable/cobweb, /obj/effect/decal/cleanable/dirt, @@ -33288,6 +30998,14 @@ "uux" = ( /turf/closed/wall/strata_outpost, /area/strata/ug/interior/jungle/structures/research) +"uuQ" = ( +/obj/structure/platform/metal/strata/west, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/paths/mining_outpost_exterior) +"uvp" = ( +/obj/structure/platform/stone/strata/west, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/landing_zones/near_lz2) "uvw" = ( /turf/open/auto_turf/strata_grass/layer0, /area/strata/ug/interior/jungle/structures/monitoring/west) @@ -33302,6 +31020,12 @@ /obj/structure/blocker/invisible_wall, /turf/open/gm/river, /area/strata/ag/exterior/marsh/water) +"uwy" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata/floor3/east, +/area/strata/ag/interior/outpost/med) "uxf" = ( /obj/structure/fence, /turf/open/auto_turf/ice/layer1, @@ -33314,13 +31038,26 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/strata/multi_tiles/west, /area/strata/ag/exterior/outpost_decks) +"uxw" = ( +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/med) +"uyb" = ( +/obj/structure/platform_decoration/stone/strata/east, +/obj/effect/blocker/sorokyne_cold_water, +/turf/open/gm/river, +/area/strata/ag/exterior/paths/far_north_outpost) "uyf" = ( /turf/open/floor/strata/fake_wood, /area/strata/ag/interior/outside/checkpoints/north_armor) -"uyp" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/south) +"uyG" = ( +/obj/structure/pipes/vents/pump{ + dir = 8 + }, +/turf/open/floor/strata/blue3/east, +/area/strata/ag/interior/outpost/admin) "uyQ" = ( /obj/structure/barricade/handrail/strata{ dir = 1 @@ -33330,6 +31067,14 @@ }, /turf/open/asphalt/cement/cement2, /area/strata/ug/interior/outpost/platform) +"uyS" = ( +/obj/structure/cryofeed, +/obj/structure/platform/metal/strata, +/obj/structure/barricade/handrail/wire{ + layer = 3.5 + }, +/turf/open/gm/river, +/area/strata/ag/interior/outside/engineering/parts_storage) "uzb" = ( /obj/structure/stairs/perspective{ color = "#6e6e6e" @@ -33343,16 +31088,19 @@ /obj/item/stack/catwalk, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outside/engineering/parts_storage) -"uzv" = ( -/obj/structure/flora/grass/tallgrass/ice/corner{ - dir = 4 - }, +"uBv" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/west, /obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata/metal{ - dir = 1 - }, +/obj/structure/platform/metal/strata/east, /turf/open/gm/river, -/area/strata/ag/exterior/outpost_decks) +/area/strata/ag/exterior/paths/far_north_outpost) +"uBw" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan{ + dir = 8 + }, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/admin) "uBz" = ( /obj/item/stack/sheet/wood, /obj/structure/pipes/standard/manifold/fourway/hidden/cyan, @@ -33362,6 +31110,21 @@ /obj/structure/cargo_container/grant/rightmid, /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/marsh/spring_marshes) +"uCe" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/trash/plate{ + pixel_x = 1; + pixel_y = 3 + }, +/obj/item/reagent_container/food/condiment/saltshaker, +/turf/open/floor/prison/darkyellowfull2, +/area/strata/ag/interior/outpost/canteen) +"uCH" = ( +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/mining_outpost/south_dormitories) "uCI" = ( /obj/structure/dispenser, /turf/open/floor/strata/floor3/east, @@ -33372,27 +31135,58 @@ }, /turf/open/floor/strata/floor2, /area/strata/ag/interior/restricted) -"uDU" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - dir = 4; - icon_state = "p_stair_sn_full_cap" +"uDl" = ( +/obj/structure/bed/chair{ + dir = 8 }, -/obj/structure/platform/strata/metal{ - dir = 4 +/obj/structure/pipes/vents/pump{ + dir = 8 }, -/obj/item/stack/sheet/wood, -/turf/open/floor/strata, -/area/strata/ag/exterior/outpost_decks) +/turf/open/floor/strata/white_cyan1/east, +/area/strata/ag/interior/outpost/canteen) "uEj" = ( /obj/structure/largecrate/random, /obj/item/toy/deck, /turf/open/floor/strata/orange_cover, /area/strata/ag/exterior/marsh/center) +"uEt" = ( +/obj/effect/decal/cleanable/generic, +/obj/item/lightstick/red/planted, +/obj/structure/platform/metal/strata, +/obj/structure/barricade/handrail/strata{ + dir = 8 + }, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/paths/mining_outpost_exterior) +"uER" = ( +/obj/structure/platform_decoration/metal/strata, +/turf/open/floor/strata/multi_tiles/west, +/area/strata/ag/exterior/outpost_decks) +"uFt" = ( +/obj/effect/particle_effect/steam, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata, +/obj/structure/platform/stone/strata/east, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/river) "uFT" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/strata/cyan1/east, /area/strata/ag/interior/outpost/med) +"uGb" = ( +/obj/structure/closet/secure_closet/personal, +/obj/effect/landmark/objective_landmark/close, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/canteen) +"uGp" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/strata, +/turf/open/floor/strata/multi_tiles/southwest, +/area/strata/ag/interior/outside/engineering/parts_storage) "uGx" = ( /obj/structure/sign/safety/security, /turf/closed/wall/strata_outpost/reinforced, @@ -33408,10 +31202,24 @@ /obj/effect/landmark/crap_item, /turf/open/floor/strata/purp2, /area/strata/ug/interior/jungle/structures/monitoring) +"uHQ" = ( +/obj/structure/platform_decoration/metal/strata/west, +/turf/open/auto_turf/snow/brown_base/layer4, +/area/strata/ag/interior/restricted) "uHX" = ( /obj/effect/decal/cleanable/cobweb2, /turf/open/floor/carpet, /area/strata/ag/interior/restricted) +"uIn" = ( +/obj/effect/decal/strata_decals/grime/grime3{ + dir = 8 + }, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/mining_outpost/south_dormitories) +"uII" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/floor3/east, +/area/strata/ag/interior/outpost/engi/drome) "uJY" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -33436,10 +31244,18 @@ }, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outpost/med) +"uLe" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan, +/turf/open/floor/strata/cyan1/east, +/area/strata/ag/interior/outpost/med) "uLl" = ( /obj/structure/largecrate/random/barrel/blue, /turf/open/floor/strata/purp2, /area/strata/ug/interior/jungle/structures/monitoring) +"uLF" = ( +/obj/structure/platform/stone/strata/north, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/marsh/spring_marshes) "uLJ" = ( /turf/open/floor/strata/white_cyan2/west, /area/strata/ug/interior/jungle/structures/monitoring) @@ -33460,6 +31276,32 @@ /obj/item/storage/firstaid/regular, /turf/open/floor/strata/floor3/east, /area/strata/ag/exterior/outpost_decks) +"uOJ" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/strata/white_cyan1/east, +/area/strata/ag/interior/outpost/canteen) +"uOX" = ( +/obj/structure/barricade/handrail/strata{ + dir = 8 + }, +/obj/structure/barricade/handrail/strata, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_21" + }, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/admin) +"uPz" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 4; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/strata/east, +/obj/item/stack/sheet/wood, +/turf/open/floor/strata, +/area/strata/ag/exterior/outpost_decks) "uPE" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 9 @@ -33479,6 +31321,10 @@ /obj/effect/decal/cleanable/blood/gibs/core, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/paths/south_outpost) +"uQi" = ( +/obj/structure/largecrate/random, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/canteen) "uRy" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 @@ -33510,10 +31356,10 @@ "uTv" = ( /turf/open/floor/strata/white_cyan2/west, /area/strata/ug/interior/outpost/underground_dorms/admin3) -"uTK" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/fake_wood, -/area/strata/ag/interior/outpost/hallways/north) +"uTC" = ( +/obj/structure/platform_decoration/stone/strata/north, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/landing_zones/near_lz2) "uTL" = ( /obj/structure/bed/chair/dropship/passenger{ dir = 8 @@ -33528,6 +31374,10 @@ /obj/effect/decal/cleanable/blood/gibs/core, /turf/open/floor/strata, /area/strata/ag/exterior/outpost_decks) +"uUT" = ( +/obj/structure/platform/metal/strata/east, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/caves/shed_five_caves) "uVv" = ( /turf/open/asphalt/cement/cement1, /area/strata/ug/interior/outpost/platform) @@ -33557,21 +31407,27 @@ "uXg" = ( /turf/closed/wall/strata_ice/jungle, /area/strata/ug/interior/jungle/platform/south) -"uXY" = ( -/obj/structure/platform/strata/metal{ - dir = 4 +"uYO" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/trash/plate{ + pixel_x = 1; + pixel_y = 3 }, -/turf/open/auto_turf/strata_grass/layer0, -/area/strata/ug/interior/jungle/platform/south) +/turf/open/floor/strata/blue1, +/area/strata/ag/interior/outpost/canteen) +"uZs" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 8; + icon_state = "p_stair_sn_full_cap" + }, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/engi/drome) "vaq" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/strata/red1, /area/strata/ug/interior/jungle/structures/research) -"vaW" = ( -/obj/structure/platform_decoration/strata, -/turf/open/auto_turf/ice/layer1, -/area/strata/ag/interior/outside/engineering/parts_storage_cave) "vaZ" = ( /obj/structure/flora/grass/ice/brown/snowgrassbb_1, /turf/open/auto_turf/snow/brown_base/layer3, @@ -33601,18 +31457,52 @@ }, /turf/open/floor/strata/purp2, /area/strata/ug/interior/jungle/structures/monitoring) +"vcr" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/pipes/standard/manifold/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata/multi_tiles/southwest, +/area/strata/ag/interior/outpost/engi/drome) +"vcS" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ + dir = 1 + }, +/turf/open/floor/strata/multi_tiles/west, +/area/strata/ag/interior/mining_outpost/south_dormitories) "vdi" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 10 }, /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/paths/north_outpost) +"vdv" = ( +/obj/effect/landmark/survivor_spawner, +/turf/open/floor/strata/white_cyan1/east, +/area/strata/ag/interior/outpost/canteen) +"veh" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 8; + icon_state = "p_stair_full" + }, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/admin) "veX" = ( /obj/structure/machinery/door/airlock/prison{ name = "Reinforced Airlock" }, /turf/open/floor/strata/multi_tiles/west, /area/strata/ug/interior/outpost/underground_dorms/med2) +"vfg" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/strata/blue1, +/area/strata/ag/interior/outpost/admin) "vgb" = ( /obj/structure/machinery/light, /turf/open/floor/strata/floor3/east, @@ -33626,6 +31516,17 @@ }, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/paths/flight_control_exterior) +"vgq" = ( +/obj/structure/platform_decoration/metal/strata/east, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/caves/shed_five_caves) +"vgJ" = ( +/obj/structure/flora/grass/tallgrass/ice, +/obj/structure/platform/metal/strata/north, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/metal/strata/east, +/turf/open/gm/river, +/area/strata/ag/exterior/outpost_decks) "vgW" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 9 @@ -33642,6 +31543,10 @@ /obj/item/storage/belt/knifepouch, /turf/open/floor/strata, /area/strata/ag/interior/outpost/engi/drome) +"vhz" = ( +/obj/structure/platform_decoration/stone/strata/north, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/marsh/spring_marshes) "vhG" = ( /obj/effect/landmark/monkey_spawn, /turf/open/auto_turf/strata_grass/layer1, @@ -33652,21 +31557,17 @@ "viA" = ( /turf/open/floor/strata, /area/strata/ug/interior/outpost/underground_dorms/sec2) -"viU" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/turf/open/floor/strata/multi_tiles/southwest, -/area/strata/ag/interior/outpost/foyer) "vjc" = ( /obj/structure/machinery/door/airlock/almayer/engineering/colony{ dir = 2 }, /turf/open/floor/strata/multi_tiles/southeast, /area/strata/ag/interior/outside/engineering/parts_storage) +"vjf" = ( +/obj/structure/closet/wardrobe/red, +/obj/item/clothing/suit/imperium_monk, +/turf/open/floor/strata/red1, +/area/strata/ag/interior/outpost/canteen) "vjD" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/food/snacks/monkeyburger, @@ -33694,6 +31595,10 @@ "vlm" = ( /turf/closed/wall/strata_outpost, /area/strata/ag/interior/outpost/med) +"vlu" = ( +/obj/structure/platform/stone/strata/west, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/marsh/spring_marshes) "vlC" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_nest, /turf/open/auto_turf/snow/brown_base/layer0, @@ -33708,6 +31613,10 @@ }, /turf/closed/wall/strata_outpost/reinforced/hull, /area/strata/ag/interior/mountain) +"vmk" = ( +/obj/structure/platform_decoration/stone/strata/west, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/caves/lz_caves) "vmm" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/light/small{ @@ -33716,10 +31625,11 @@ /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/strata/orange_cover, /area/strata/ag/interior/outside/engineering/parts_storage) -"vms" = ( -/obj/structure/platform/strata/metal, -/turf/open/floor/strata/red3/north, -/area/strata/ag/interior/outpost/med) +"vmo" = ( +/obj/structure/platform_decoration/stone/strata/east, +/obj/effect/blocker/sorokyne_cold_water, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/water) "vmI" = ( /obj/structure/window/framed/strata, /turf/open/floor/strata/multi_tiles/southeast, @@ -33732,35 +31642,19 @@ /obj/structure/curtain/open/medical, /turf/open/floor/strata/floor2, /area/strata/ag/interior/outpost/med) -"vnI" = ( -/obj/structure/curtain/open/medical, -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/floor2, -/area/strata/ag/interior/outpost/hallways/south) -"vnV" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - dir = 8; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/turf/open/auto_turf/snow/brown_base/layer0, -/area/strata/ag/exterior/paths/south_outpost) "voe" = ( /obj/structure/curtain/medical, /turf/open/floor/strata/floor2, /area/strata/ag/interior/outpost/med) -"vox" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ - dir = 8 - }, -/obj/structure/platform/strata, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/center) +"vol" = ( +/obj/structure/platform_decoration/metal/strata/west, +/turf/open/auto_turf/strata_grass/layer0, +/area/strata/ug/interior/outpost/platform) +"voK" = ( +/obj/effect/decal/cleanable/blood/oil/streak, +/obj/structure/platform_decoration/stone/strata/north, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/vanyard) "vpi" = ( /obj/structure/barricade/wooden{ dir = 8 @@ -33768,6 +31662,11 @@ /obj/structure/filingcabinet, /turf/open/auto_turf/ice/layer1, /area/strata/ag/interior/outside/engineering/parts_storage_cave) +"vpF" = ( +/obj/structure/platform/metal/strata/north, +/obj/structure/platform/metal/strata/west, +/turf/open/auto_turf/strata_grass/layer0, +/area/strata/ug/interior/jungle/platform/south) "vpG" = ( /obj/structure/sink{ dir = 8; @@ -33785,15 +31684,25 @@ /obj/effect/landmark/hunter_secondary, /turf/open/floor/plating, /area/strata/ag/exterior/landing_zones/lz2) +"vqA" = ( +/obj/structure/platform/metal/strata/west, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 5 + }, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/landing_zones/near_lz1) +"vqV" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/simple/hidden/cyan, +/obj/structure/curtain/open/shower, +/turf/open/floor/strata/white_cyan2/west, +/area/strata/ag/interior/outpost/canteen) "vrH" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 }, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outside/engineering/parts_storage) -"vrL" = ( -/turf/open/floor/strata, -/area/strata/ag/interior/mining_outpost/hallways) "vsc" = ( /turf/open/auto_turf/strata_grass/layer0, /area/strata/ug/interior/jungle/tearlake) @@ -33812,6 +31721,10 @@ }, /turf/open/asphalt/cement/cement3, /area/strata/ag/exterior/landing_zones/lz2) +"vsx" = ( +/obj/item/stool, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/canteen) "vsy" = ( /turf/open/floor/strata/purp2, /area/strata/ug/interior/jungle/structures/monitoring) @@ -33819,6 +31732,16 @@ /obj/item/reagent_container/food/snacks/donkpocket, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/interior/outside/engineering/parts_storage) +"vsR" = ( +/obj/effect/particle_effect/steam, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform_decoration/stone/strata/north, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/spring_marshes) +"vsT" = ( +/obj/structure/platform_decoration/metal/strata/west, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/paths/flight_control_exterior) "vsZ" = ( /obj/item/stack/medical/splint, /turf/open/floor/strata/multi_tiles/southwest, @@ -33837,6 +31760,12 @@ "vtz" = ( /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/interior/outpost/med) +"vtJ" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/snacks/meatballsoup, +/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, +/turf/open/floor/strata/cyan1/east, +/area/strata/ag/interior/mining_outpost/canteen) "vtM" = ( /obj/structure/machinery/weather_siren{ dir = 8; @@ -33848,14 +31777,11 @@ "vuJ" = ( /turf/open/auto_turf/strata_grass/layer0, /area/strata/ug/interior/jungle/structures/monitoring/east) -"vvh" = ( -/obj/effect/particle_effect/steam, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform_decoration/strata{ - dir = 1 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/spring_marshes) +"vvd" = ( +/obj/structure/platform/metal/strata/north, +/obj/structure/platform/metal/strata/east, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/caves/shed_five_caves) "vvl" = ( /obj/structure/largecrate/random/barrel/blue, /turf/open/auto_turf/strata_grass/layer1, @@ -33866,6 +31792,10 @@ }, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outpost/med) +"vvs" = ( +/obj/structure/platform/metal/strata, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/paths/flight_control_exterior) "vvB" = ( /obj/structure/filingcabinet, /obj/effect/landmark/objective_landmark/close, @@ -33882,19 +31812,27 @@ /obj/item/device/camera, /turf/open/floor/carpet, /area/strata/ag/interior/restricted) -"vwR" = ( -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/obj/structure/flora/grass/ice/brown/snowgrassbb_1, -/turf/open/auto_turf/snow/brown_base/layer2, -/area/strata/ag/exterior/paths/flight_control_exterior) -"vwV" = ( -/obj/structure/platform/strata/metal{ - dir = 8 +"vwg" = ( +/obj/effect/particle_effect/steam, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/east, +/obj/structure/platform/stone/strata/west, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/spring_marshes) +"vwn" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/trash/plate{ + pixel_x = 1; + pixel_y = 3 }, -/turf/open/auto_turf/strata_grass/layer0, -/area/strata/ug/interior/outpost/platform) +/obj/item/reagent_container/food/condiment/peppermill, +/turf/open/floor/prison/darkyellowfull2, +/area/strata/ag/interior/outpost/canteen) +"vwC" = ( +/obj/structure/curtain/open/shower, +/turf/open/floor/strata/blue1, +/area/strata/ag/interior/outpost/canteen) "vwX" = ( /obj/structure/machinery/centrifuge, /obj/structure/surface/table/reinforced/prison, @@ -33906,6 +31844,11 @@ "vxd" = ( /turf/closed/wall/strata_outpost, /area/strata/ag/interior/outside/engineering/parts_storage) +"vxC" = ( +/obj/structure/platform_decoration/stone/strata/west, +/obj/effect/blocker/sorokyne_cold_water, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/water) "vye" = ( /obj/structure/surface/rack{ layer = 2.5 @@ -33919,6 +31862,15 @@ /obj/structure/machinery/autolathe, /turf/open/floor/strata/purp2, /area/strata/ug/interior/jungle/structures/monitoring) +"vyL" = ( +/obj/structure/platform/metal/strata/north, +/obj/structure/platform/metal/strata/west, +/turf/open/auto_turf/snow/brown_base/layer4, +/area/strata/ag/exterior/paths/mining_outpost_exterior) +"vAw" = ( +/obj/structure/platform/metal/strata/north, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/paths/mining_outpost_exterior) "vBi" = ( /obj/structure/blocker/invisible_wall, /turf/open/gm/river, @@ -33931,6 +31883,13 @@ }, /turf/open/floor/strata, /area/strata/ag/interior/outpost/engi) +"vBG" = ( +/obj/effect/particle_effect/steam, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/metal/strata/north, +/obj/structure/platform/metal/strata/west, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/river) "vBV" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -33941,17 +31900,6 @@ /obj/item/clothing/shoes/jackboots, /turf/open/floor/strata/red3/north, /area/strata/ag/interior/outpost/med) -"vCl" = ( -/obj/structure/barricade/handrail/strata{ - layer = 3.1 - }, -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata/metal, -/turf/open/gm/river, -/area/strata/ag/exterior/outpost_decks) "vCD" = ( /obj/structure/bed/sofa/vert/grey/top, /obj/structure/barricade/handrail/strata{ @@ -33959,10 +31907,6 @@ }, /turf/open/floor/interior/plastic, /area/strata/ag/interior/outpost/canteen) -"vCN" = ( -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/strata/cyan2/east, -/area/strata/ag/interior/outpost/hallways/south) "vDm" = ( /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor/strata/multi_tiles/southwest, @@ -33973,6 +31917,12 @@ opacity = 0 }, /area/strata/ag/interior/outpost/engi/drome/shuttle) +"vDU" = ( +/obj/effect/particle_effect/steam, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata/east, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/river) "vEp" = ( /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/structures/research) @@ -33981,6 +31931,12 @@ icon_state = "upp1" }, /area/strata/ag/interior/outpost/engi/drome/shuttle) +"vEX" = ( +/obj/structure/machinery/shower{ + dir = 1 + }, +/turf/open/floor/interior/plastic, +/area/strata/ag/interior/outpost/canteen) "vFS" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/phone{ @@ -34009,22 +31965,41 @@ /obj/effect/decal/cleanable/blood, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/structures/monitoring/east) -"vHg" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 +"vHd" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor/colony{ + dir = 1; + name = "\improper Airlock" }, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/mining_outpost/hallways) +/turf/open/floor/strata/floor3/east, +/area/strata/ag/interior/outpost/engi/drome) "vHj" = ( /obj/structure/flora/grass/tallgrass/jungle, /obj/effect/landmark/monkey_spawn, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/structures/research/south) +"vHL" = ( +/obj/structure/platform/metal/strata, +/turf/open/auto_turf/strata_grass/layer0, +/area/strata/ug/interior/outpost/platform) +"vHP" = ( +/obj/structure/machinery/shower, +/turf/open/floor/interior/plastic, +/area/strata/ag/interior/outpost/canteen) "vId" = ( /obj/structure/machinery/space_heater, /obj/structure/barricade/handrail/strata, /turf/open/floor/strata/floor3/east, /area/strata/ag/exterior/outpost_decks) +"vIp" = ( +/obj/structure/platform_decoration/metal/strata/west, +/turf/open/auto_turf/strata_grass/layer0, +/area/strata/ug/interior/jungle/platform/south) +"vIZ" = ( +/obj/effect/particle_effect/steam, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/metal/strata/north, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/river) "vJj" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/shuttle/dropship/flight/lz2, @@ -34052,6 +32027,11 @@ /obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/prison/darkredfull2, /area/strata/ag/interior/outside/checkpoints/south) +"vKS" = ( +/obj/structure/platform_decoration/metal/strata, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata, +/area/strata/ag/interior/landing_zones/near_lz1) "vKV" = ( /turf/closed/wall/strata_ice/jungle, /area/strata/ug/interior/outpost/underground_dorms) @@ -34066,13 +32046,28 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/strata/red1, /area/strata/ag/interior/mining_outpost/flight_control) -"vMM" = ( -/turf/open/floor/prison/darkyellowfull2, -/area/strata/ag/interior/outpost/hallways/north) +"vMY" = ( +/obj/structure/platform/metal/strata/west, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/asphalt/cement/cement14, +/area/strata/ag/interior/landing_zones/lz1) +"vNl" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/snacks/meatballspagetti, +/obj/effect/landmark/objective_landmark/science, +/turf/open/floor/strata/cyan1/east, +/area/strata/ag/interior/mining_outpost/canteen) "vNG" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/strata/multi_tiles, /area/strata/ag/interior/mining_outpost/hive) +"vNW" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/strata/orange_cover, +/area/strata/ag/interior/outpost/canteen) "vOf" = ( /turf/closed/shuttle/ert{ icon_state = "rightengine_1"; @@ -34096,6 +32091,17 @@ "vPi" = ( /turf/closed/wall/strata_outpost/reinforced, /area/strata/ag/interior/outside/checkpoints/outpost) +"vPG" = ( +/obj/structure/surface/rack, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/canteen) +"vPN" = ( +/obj/structure/platform/metal/strata/west, +/turf/open/auto_turf/strata_grass/layer0, +/area/strata/ug/interior/jungle/platform/south) "vPQ" = ( /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/platform/south) @@ -34114,6 +32120,16 @@ icon_state = "upp_rightengine" }, /area/strata/ag/exterior/marsh/crash) +"vQM" = ( +/obj/structure/platform/stone/strata/east, +/obj/effect/blocker/sorokyne_cold_water, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/water) +"vRO" = ( +/obj/structure/platform/stone/strata/west, +/obj/structure/platform/stone/strata, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/marsh/crash) "vRP" = ( /obj/structure/stairs/perspective{ color = "#6e6e6e" @@ -34124,6 +32140,11 @@ /obj/structure/bed/medevac_stretcher, /turf/open/gm/dirt, /area/strata/ag/exterior/jungle/carplake_center) +"vTG" = ( +/obj/effect/decal/cleanable/blood, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/orange_edge/east, +/area/strata/ag/interior/mining_outpost/central) "vTN" = ( /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/blood/gibs/core, @@ -34132,12 +32153,29 @@ "vUp" = ( /turf/open/asphalt/cement/cement2, /area/strata/ag/interior/outside/engineering/parts_storage_exterior) +"vUy" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/med) +"vUM" = ( +/obj/structure/platform_decoration/stone/strata/north, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/marsh/river) +"vUP" = ( +/obj/structure/platform_decoration/stone/strata/north, +/obj/structure/blocker/invisible_wall, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/water) "vVK" = ( /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/structures/research/old_tunnels) -"vXc" = ( -/turf/open/floor/strata/floor3/east, -/area/strata/ag/interior/outpost/hallways/south) +"vXd" = ( +/obj/structure/closet/secure_closet/personal, +/obj/item/clothing/suit/storage/apron/overalls, +/turf/open/floor/strata/red1, +/area/strata/ag/interior/outpost/canteen) "vXt" = ( /obj/structure/flora/grass/ice/brown/snowgrassbb_2, /obj/structure/pipes/standard/simple/hidden/cyan{ @@ -34145,16 +32183,24 @@ }, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/paths/south_outpost) -"vXN" = ( -/obj/structure/platform/strata/metal{ +"vXx" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan{ dir = 1 }, -/turf/open/floor/strata/multi_tiles, -/area/strata/ag/interior/mining_outpost/hive) +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/mining_outpost/central) +"vYa" = ( +/obj/structure/sign/safety/medical, +/turf/closed/wall/strata_outpost, +/area/strata/ag/interior/outpost/canteen) "vYf" = ( /obj/structure/flora/grass/ice/brown/snowgrassbb_1, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/paths/flight_control_exterior) +"vYk" = ( +/obj/structure/platform/metal/strata, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/engi) "vYD" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" @@ -34172,19 +32218,16 @@ /obj/effect/decal/cleanable/blood/gibs/up, /turf/open/floor/strata, /area/strata/ag/exterior/outpost_decks) -"wab" = ( -/obj/structure/machinery/space_heater, -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/floor/strata, -/area/strata/ug/interior/outpost/underground_dorms/sec2) "waZ" = ( /obj/structure/machinery/light/small{ dir = 8 }, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/structures/monitoring/south) +"wbr" = ( +/obj/structure/platform/stone/strata, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/marsh/spring_marshes) "wbK" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor/colony{ dir = 1; @@ -34196,12 +32239,15 @@ /obj/structure/pipes/standard/simple/hidden/cyan, /turf/open/auto_turf/ice/layer0, /area/strata/ag/exterior/marsh/spring_marshes) -"wch" = ( -/obj/structure/pipes/vents/pump{ +"wcl" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/obj/structure/machinery/light{ dir = 1 }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/south) +/turf/open/floor/strata/white_cyan2/west, +/area/strata/ag/interior/outpost/canteen) "wdf" = ( /obj/structure/bookcase{ icon_state = "book-5" @@ -34212,6 +32258,9 @@ }, /turf/open/floor/strata/blue1, /area/strata/ag/interior/outpost/admin) +"wdr" = ( +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/med) "wdI" = ( /turf/open/asphalt/cement/cement12, /area/strata/ag/interior/outpost/med) @@ -34222,6 +32271,10 @@ }, /turf/open/floor/strata/orange_cover, /area/strata/ag/exterior/landing_zones/near_lz2) +"wfm" = ( +/obj/structure/platform_decoration/stone/strata/west, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/marsh/center) "wfv" = ( /obj/structure/stairs/perspective{ color = "#6e6e6e"; @@ -34235,6 +32288,15 @@ /obj/structure/blocker/invisible_wall, /turf/open/floor/interior/tatami, /area/strata/ag/interior/restricted) +"wfX" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 4; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/strata/east, +/turf/open/floor/strata/multi_tiles/southeast, +/area/strata/ag/interior/outpost/admin) "wgu" = ( /obj/item/weapon/gun/revolver/cmb, /turf/open/auto_turf/ice/layer1, @@ -34261,25 +32323,55 @@ /obj/structure/flora/bush/ausbushes/grassybush, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/outpost/platform) -"wim" = ( -/turf/open/floor/strata/multi_tiles/southeast, -/area/strata/ag/interior/outpost/hallways/south) +"wjq" = ( +/obj/structure/platform/metal/strata/north, +/turf/open/auto_turf/strata_grass/layer0, +/area/strata/ug/interior/outpost/platform) "wjv" = ( /obj/structure/flora/grass/ice/brown/snowgrassbb_2, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/marsh/center) -"wjF" = ( -/obj/structure/pipes/vents/pump, -/turf/open/floor/strata/red1, -/area/strata/ag/interior/outpost/hallways/north) +"wkl" = ( +/obj/structure/platform_decoration/metal/strata/north, +/obj/structure/pipes/standard/simple/hidden/cyan, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/asphalt/cement/cement3, +/area/strata/ag/interior/landing_zones/lz1) "wkv" = ( /obj/structure/flora/bush/ausbushes/genericbush, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/platform/east) +"wkU" = ( +/obj/structure/machinery/washing_machine, +/obj/structure/machinery/camera/autoname{ + dir = 4 + }, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/canteen) "wlj" = ( /obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/strata/white_cyan1/east, /area/strata/ag/interior/outpost/canteen) +"wly" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 10 + }, +/turf/open/floor/strata/white_cyan2/west, +/area/strata/ag/interior/outpost/canteen) +"wlH" = ( +/obj/structure/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/canteen) +"wmG" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/engi/drome) "wmX" = ( /obj/structure/sink{ pixel_y = 16 @@ -34289,9 +32381,26 @@ "wne" = ( /turf/open/gm/coast/beachcorner2/north_east, /area/strata/ug/interior/jungle/platform/east) +"wng" = ( +/obj/structure/platform/metal/strata/west, +/turf/open/floor/prison/darkyellowfull2, +/area/strata/ag/exterior/paths/flight_control_exterior) "wni" = ( /turf/open/asphalt/cement/cement4, /area/strata/ag/interior/outside/engineering/parts_storage_exterior) +"wnC" = ( +/obj/structure/platform/stone/strata/north, +/obj/structure/machinery/space_heater, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/paths/south_outpost) +"wnZ" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/obj/structure/machinery/door/airlock/almayer/security/colony{ + dir = 2; + name = "Security Barracks" + }, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/security) "wod" = ( /obj/item/tank/emergency_oxygen/engi, /turf/open/auto_turf/ice/layer1, @@ -34299,14 +32408,20 @@ "wol" = ( /turf/open/floor/strata/fake_wood, /area/strata/ag/interior/outside/bball) -"woP" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ - dir = 1 +"woo" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/multi_tiles/southeast, +/area/strata/ag/interior/outpost/med) +"woz" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan{ + dir = 4 }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/center) +/turf/open/floor/strata/cyan2/east, +/area/strata/ag/interior/outpost/med) +"woU" = ( +/obj/structure/bedsheetbin, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/canteen) "wpE" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 @@ -34316,14 +32431,23 @@ }, /turf/open/floor/strata/blue3/north, /area/strata/ag/interior/outpost/admin) -"wqm" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ - dir = 4 +"wpW" = ( +/obj/structure/machinery/washing_machine, +/obj/item/facepaint/skull, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/canteen) +"wqy" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 8; + icon_state = "p_stair_full" }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/center) +/turf/open/floor/strata/red1, +/area/strata/ag/interior/outpost/security) +"wqN" = ( +/obj/structure/platform_decoration/metal/strata/west, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/admin) "wrp" = ( /turf/closed/wall/strata_outpost, /area/strata/ag/interior/mining_outpost/flight_control) @@ -34337,13 +32461,10 @@ /obj/structure/flora/grass/tallgrass/ice/corner, /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/marsh/center) -"wsh" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/gm/river, -/area/strata/ag/exterior/outpost_decks) +"wrJ" = ( +/obj/structure/platform/metal/strata/west, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/marsh/spring_marshes) "wsi" = ( /obj/structure/morgue{ dir = 8 @@ -34367,6 +32488,19 @@ }, /turf/open/auto_turf/snow/brown_base/layer3, /area/strata/ag/exterior/marsh/spring_marshes) +"wss" = ( +/obj/structure/platform_decoration/metal/strata, +/turf/open/floor/strata, +/area/strata/ag/interior/landing_zones/near_lz1) +"wsC" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/reagent_container/food/snacks/fishfingers, +/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, +/turf/open/floor/strata/cyan1/east, +/area/strata/ag/interior/mining_outpost/canteen) +"wsH" = ( +/turf/open/floor/strata/multi_tiles/west, +/area/strata/ag/interior/mining_outpost/south_dormitories) "wto" = ( /obj/structure/machinery/door/airlock/almayer/security/colony{ dir = 2; @@ -34407,12 +32541,10 @@ "wvW" = ( /turf/closed/wall/strata_outpost/reinforced/hull, /area/strata/ag/interior/outside/checkpoints/west) -"wwO" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/strata/white_cyan3/west, -/area/strata/ag/interior/outpost/hallways/south) +"wwC" = ( +/obj/structure/pipes/standard/manifold/fourway/hidden/cyan, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/mining_outpost/central) "wxU" = ( /obj/structure/bed{ icon_state = "abed" @@ -34426,6 +32558,12 @@ /obj/item/stack/sheet/wood, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/exterior/outpost_decks) +"wyv" = ( +/obj/effect/decal/cleanable/blood{ + icon_state = "xtracks" + }, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/canteen) "wyx" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -34485,6 +32623,10 @@ /obj/structure/fence, /turf/open/asphalt/cement/cement2, /area/strata/ag/interior/outside/engineering/parts_storage_exterior) +"wDx" = ( +/obj/structure/platform/metal/strata/west, +/turf/open/floor/strata, +/area/strata/ag/interior/landing_zones/near_lz1) "wDF" = ( /obj/structure/machinery/light/small, /obj/effect/decal/cleanable/blood, @@ -34529,6 +32671,10 @@ "wGp" = ( /turf/closed/wall/strata_outpost/reinforced, /area/strata/ag/exterior/marsh/crash) +"wGP" = ( +/obj/structure/pipes/vents/pump, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/engi/drome) "wGS" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 6 @@ -34540,9 +32686,17 @@ /obj/item/stack/sheet/wood, /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/interior/outside/engineering/parts_storage_cave) +"wHS" = ( +/obj/structure/closet/secure_closet/personal, +/turf/open/floor/strata/blue1, +/area/strata/ag/interior/outpost/canteen) "wHW" = ( /turf/open/auto_turf/strata_grass/layer0_mud, /area/strata/ug/interior/jungle/structures/monitoring/east) +"wIy" = ( +/obj/structure/platform/metal/strata/north, +/turf/open/floor/prison/darkyellowfull2, +/area/strata/ag/exterior/outpost_decks) "wJL" = ( /obj/structure/window/framed/strata/reinforced, /turf/open/floor/strata/multi_tiles/southwest, @@ -34551,6 +32705,19 @@ /obj/structure/flora/grass/tallgrass/jungle, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/structures/monitoring/south) +"wKl" = ( +/obj/structure/platform/metal/strata/west, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/auto_turf/strata_grass/layer0, +/area/strata/ug/interior/jungle/platform/east) +"wKI" = ( +/obj/structure/platform/metal/strata/north, +/turf/open/floor/strata/multi_tiles/southwest, +/area/strata/ag/exterior/outpost_decks) +"wKO" = ( +/obj/structure/platform_decoration/stone/strata/west, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/marsh/crash) "wLj" = ( /obj/structure/stairs/perspective{ color = "#6e6e6e"; @@ -34579,14 +32746,14 @@ }, /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/marsh/spring_marshes) -"wPp" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata, -/obj/structure/platform/strata{ - dir = 1 +"wOg" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/disposalpipe/segment, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 9 }, -/turf/open/gm/river, -/area/strata/ag/exterior/landing_zones/near_lz2) +/turf/open/floor/strata/multi_tiles/southwest, +/area/strata/ag/interior/outpost/engi/drome) "wPq" = ( /obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/strata, @@ -34594,6 +32761,10 @@ "wPI" = ( /turf/open/asphalt/cement/cement9, /area/strata/ag/interior/outside/engineering/parts_storage_exterior) +"wQu" = ( +/obj/structure/platform_decoration/stone/strata, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/caves/lz_caves) "wQx" = ( /obj/structure/machinery/light{ dir = 1 @@ -34604,20 +32775,36 @@ /obj/effect/landmark/xeno_spawn, /turf/open/auto_turf/strata_grass/layer0, /area/strata/ug/interior/jungle/structures/monitoring/south) -"wQU" = ( +"wRE" = ( /obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 8 + dir = 4 }, -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/outpost/hallways/south) +/turf/open/floor/strata/white_cyan3/east, +/area/strata/ag/interior/outpost/med) "wSb" = ( /turf/open/auto_turf/snow/brown_base/layer0, /area/strata/ag/exterior/marsh/spring_marshes) +"wSf" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor/colony{ + name = "\improper Airlock" + }, +/turf/open/floor/strata/multi_tiles/southeast, +/area/strata/ag/interior/outpost/med) "wSu" = ( /obj/structure/flora/grass/tallgrass/jungle, /obj/effect/landmark/monkey_spawn, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/tearlake) +"wTv" = ( +/obj/structure/machinery/space_heater, +/obj/structure/platform/metal/strata/east, +/obj/structure/machinery/light/small, +/turf/open/floor/strata/floor3/east, +/area/strata/ug/interior/outpost/underground_dorms/med2) +"wTE" = ( +/obj/structure/platform/stone/strata/west, +/turf/open/auto_turf/snow/brown_base/layer4, +/area/strata/ag/exterior/marsh/crash) "wUa" = ( /obj/structure/surface/rack, /obj/effect/landmark/objective_landmark/medium, @@ -34627,13 +32814,10 @@ /obj/structure/machinery/light/small, /turf/open/floor/strata/multi_tiles, /area/strata/ag/interior/mining_outpost/hive) -"wUR" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/obj/effect/decal/cleanable/blood, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/hallways/north) +"wUS" = ( +/obj/structure/platform/stone/strata/east, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/marsh/spring_marshes) "wVf" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -34644,21 +32828,19 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/gm/dirt, /area/strata/ug/interior/jungle/structures/research/hot_springs) +"wWe" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/mining_outpost/south_dormitories) "wWx" = ( /obj/effect/decal/cleanable/blood{ icon_state = "xgib2" }, /turf/open/floor/strata/multi_tiles, /area/strata/ag/interior/mining_outpost/central) -"wWK" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform/strata/metal, -/turf/open/floor/strata/multi_tiles/southwest, -/area/strata/ag/interior/outside/engineering/parts_storage) "wWS" = ( /obj/structure/flora/grass/ice/brown/snowgrassbb_3, /obj/structure/pipes/standard/simple/hidden/cyan{ @@ -34670,6 +32852,12 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/strata, /area/strata/ug/interior/outpost/underground_dorms/admin1) +"wXe" = ( +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/engi/drome) "wXm" = ( /turf/open/auto_turf/strata_grass/layer0, /area/strata/ug/interior/jungle/platform/south) @@ -34680,10 +32868,11 @@ "wXw" = ( /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/marsh/water_marshes) -"wXL" = ( -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/strata/floor3, -/area/strata/ag/interior/mining_outpost/hallways) +"wYa" = ( +/obj/structure/platform/stone/strata/west, +/obj/structure/platform/stone/strata, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/marsh/spring_marshes) "wYx" = ( /turf/open/floor/carpet, /area/strata/ag/interior/restricted) @@ -34693,6 +32882,12 @@ }, /turf/closed/wall/strata_outpost/reinforced, /area/strata/ag/interior/outside/engineering/parts_storage) +"wZj" = ( +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/security) "wZk" = ( /obj/structure/flora/grass/tallgrass/jungle, /obj/effect/landmark/monkey_spawn, @@ -34710,6 +32905,23 @@ /obj/structure/machinery/recharge_station, /turf/open/floor/strata/floor3, /area/strata/ag/interior/outpost/admin) +"xaY" = ( +/obj/structure/platform_decoration/metal/strata/west, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/paths/mining_outpost_exterior) +"xbf" = ( +/obj/structure/barricade/deployable, +/obj/structure/machinery/m56d_hmg, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/canteen) +"xbt" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_21" + }, +/obj/structure/platform_decoration/metal/strata, +/obj/structure/machinery/light, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/engi) "xbT" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/structure/disposalpipe/segment{ @@ -34718,6 +32930,14 @@ /obj/structure/pipes/standard/manifold/hidden/cyan, /turf/open/floor/plating, /area/strata/ag/interior/outside/engineering/parts_storage) +"xcZ" = ( +/obj/structure/platform_decoration/metal/strata/north, +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/barricade/handrail/wire{ + layer = 3.5 + }, +/turf/open/floor/greengrid, +/area/strata/ag/interior/outside/engineering/parts_storage) "xdr" = ( /turf/closed/wall/strata_outpost, /area/strata/ag/exterior/caves/shed_five_caves) @@ -34738,12 +32958,6 @@ /obj/structure/closet/jcloset, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/interior/outside/engineering/parts_storage) -"xes" = ( -/obj/structure/platform_decoration/strata{ - dir = 8 - }, -/turf/open/auto_turf/ice/layer1, -/area/strata/ag/interior/outside/engineering/parts_storage_cave) "xeJ" = ( /obj/structure/flora/grass/tallgrass/ice/corner{ dir = 1 @@ -34760,6 +32974,10 @@ }, /turf/open/floor/strata/purp2, /area/strata/ug/interior/jungle/structures/monitoring) +"xgU" = ( +/obj/effect/sentry_landmark/lz_2/top_right, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/landing_zones/near_lz2) "xhA" = ( /obj/structure/machinery/power/apc/no_power/south, /turf/open/floor/strata/orange_cover, @@ -34775,12 +32993,15 @@ "xje" = ( /turf/open/asphalt/cement/cement1, /area/strata/ag/interior/outside/engineering/parts_storage_exterior) -"xjp" = ( -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/mining_outpost/hallways) "xjr" = ( /turf/open/auto_turf/strata_grass/layer0, /area/strata/ug/interior/jungle/platform/east) +"xjw" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/strata/white_cyan2/west, +/area/strata/ag/interior/outpost/canteen) "xjH" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -34791,6 +33012,10 @@ /obj/structure/flora/grass/tallgrass/jungle/corner, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/outpost/platform) +"xjX" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/admin) "xkj" = ( /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/platform/east) @@ -34800,9 +33025,14 @@ }, /turf/open/floor/strata/floor2, /area/strata/ag/interior/outpost/med) -"xlP" = ( -/turf/open/floor/strata/cyan3/west, -/area/strata/ag/interior/outpost/hallways/south) +"xlq" = ( +/obj/structure/platform/stone/strata/east, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/marsh/crash) +"xlF" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan, +/turf/open/floor/strata/white_cyan2/west, +/area/strata/ag/interior/outpost/canteen) "xlQ" = ( /obj/structure/machinery/door/airlock/almayer/command{ dir = 2 @@ -34816,6 +33046,11 @@ }, /turf/open/floor/strata, /area/strata/ug/interior/outpost/underground_dorms/admin1) +"xmN" = ( +/obj/structure/platform_decoration/stone/strata/west, +/obj/effect/blocker/sorokyne_cold_water, +/turf/open/gm/river, +/area/strata/ag/exterior/paths/far_north_outpost) "xmR" = ( /obj/structure/machinery/photocopier, /turf/open/floor/strata/floor3/east, @@ -34824,24 +33059,22 @@ /obj/structure/sign/safety/storage, /turf/closed/wall/strata_outpost, /area/strata/ag/exterior/caves/shed_five_caves) -"xnP" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/storage/large_holster/machete/full, -/obj/item/storage/large_holster/machete/full, -/obj/item/storage/large_holster/machete/full, -/obj/effect/spawner/random/toolbox{ - pixel_y = 12 - }, -/obj/structure/platform_decoration/strata/metal{ - dir = 1 - }, -/turf/open/floor/strata/red3/north, -/area/strata/ag/interior/outpost/med) +"xnL" = ( +/obj/structure/platform_decoration/metal/strata/east, +/turf/open/floor/strata, +/area/strata/ag/interior/landing_zones/near_lz1) "xnZ" = ( /obj/structure/surface/rack, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/strata/floor3/east, /area/strata/ag/exterior/outpost_decks) +"xop" = ( +/obj/item/stack/rods, +/obj/structure/barricade/deployable{ + dir = 1 + }, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/canteen) "xoE" = ( /obj/structure/largecrate/random, /obj/structure/barricade/handrail/strata{ @@ -34866,6 +33099,10 @@ /obj/structure/flora/grass/ice/brown/snowgrassbb_3, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/interior/outside/engineering/parts_storage_exterior) +"xrs" = ( +/obj/item/stool, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/canteen) "xrx" = ( /obj/structure/stairs/perspective{ color = "#6e6e6e"; @@ -34874,12 +33111,6 @@ }, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/interior/outside/engineering/parts_storage) -"xrW" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata/cyan2/east, -/area/strata/ag/interior/outpost/hallways/south) "xst" = ( /obj/structure/machinery/cryobag_recycler, /obj/structure/surface/table/reinforced/prison, @@ -34897,10 +33128,13 @@ }, /turf/open/floor/strata, /area/strata/ug/interior/outpost/underground_dorms/admin3) -"xuc" = ( -/obj/effect/decal/cleanable/blood, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/canteen/lower_cafeteria) +"xtV" = ( +/obj/structure/platform_decoration/stone/strata/north, +/obj/effect/blocker/sorokyne_cold_water, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/metal/strata/west, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/river) "xuq" = ( /obj/item/trash/plate{ pixel_x = 1; @@ -34909,23 +33143,38 @@ /obj/structure/surface/table/reinforced/prison, /turf/open/floor/strata/floor2, /area/strata/ug/interior/jungle/structures/monitoring) -"xuE" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/obj/structure/platform/strata/metal{ - dir = 8 +"xut" = ( +/obj/structure/platform_decoration/stone/strata/west, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/marsh/crash) +"xuD" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e" }, -/turf/open/gm/river, -/area/strata/ag/exterior/outpost_decks) +/obj/structure/platform/metal/strata/west, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/landing_zones/near_lz1) "xuY" = ( /turf/open/gm/coast/beachcorner/north_east, /area/strata/ug/interior/jungle/structures/monitoring/south) +"xvu" = ( +/obj/structure/platform/metal/strata/north, +/obj/structure/machinery/space_heater, +/turf/open/floor/strata/floor3/east, +/area/strata/ug/interior/jungle/structures/ruin) "xvy" = ( /obj/structure/window/framed/strata/reinforced, /turf/open/floor/strata/multi_tiles/southeast, /area/strata/ag/interior/outpost/engi) +"xvV" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/trash/plate{ + pixel_x = 1; + pixel_y = 3 + }, +/obj/item/reagent_container/food/condiment/saltshaker, +/turf/open/floor/strata/blue1, +/area/strata/ag/interior/outpost/canteen) "xwn" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/paper_bin, @@ -34935,6 +33184,13 @@ }, /turf/open/floor/strata/purp1, /area/strata/ug/interior/jungle/structures/monitoring) +"xwu" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/strata/white_cyan2/west, +/area/strata/ag/interior/outpost/canteen) "xxa" = ( /obj/structure/flora/grass/tallgrass/jungle/corner, /obj/effect/landmark/monkey_spawn, @@ -34957,10 +33213,22 @@ /obj/structure/pipes/standard/simple/hidden/cyan, /turf/open/asphalt/cement/cement12, /area/strata/ag/interior/outside/engineering/parts_storage_exterior) +"xzq" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/barricade/handrail/strata{ + layer = 3.1 + }, +/obj/structure/platform/metal/strata, +/turf/open/gm/river, +/area/strata/ag/exterior/outpost_decks) "xzL" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_wall, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/interior/outside/bball/cave) +"xzP" = ( +/obj/structure/platform_decoration/metal/strata, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/admin) "xzR" = ( /turf/open/floor/plating, /area/strata/ag/exterior/marsh/crash) @@ -34970,6 +33238,12 @@ }, /turf/open/auto_turf/ice/layer0, /area/strata/ag/exterior/marsh/island_marshes) +"xAf" = ( +/obj/structure/machinery/camera/autoname{ + dir = 8 + }, +/turf/open/floor/strata/cyan3/west, +/area/strata/ag/interior/outpost/med) "xAp" = ( /obj/effect/decal/cleanable/blood/gibs/limb, /turf/open/floor/strata/floor3/east, @@ -34981,6 +33255,24 @@ }, /turf/open/floor/strata/floor2, /area/strata/ag/interior/outpost/med) +"xAO" = ( +/obj/structure/pipes/standard/simple/hidden/cyan, +/obj/structure/platform/metal/strata/west, +/turf/open/floor/strata/floor3/east, +/area/strata/ag/exterior/outpost_decks) +"xBs" = ( +/obj/structure/platform_decoration/metal/strata/north, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/engi) +"xBD" = ( +/obj/item/weapon/wirerod, +/obj/effect/decal/strata_decals/catwalk/prison, +/turf/open/floor/greengrid, +/area/strata/ag/interior/mining_outpost/central) +"xBG" = ( +/obj/item/stool, +/turf/open/floor/strata/white_cyan2/west, +/area/strata/ag/interior/outpost/canteen) "xBN" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 @@ -35016,6 +33308,12 @@ /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/strata/multi_tiles, /area/strata/ag/interior/mining_outpost/hive) +"xEl" = ( +/obj/structure/flora/grass/tallgrass/ice, +/obj/structure/platform/stone/strata/north, +/obj/effect/blocker/sorokyne_cold_water, +/turf/open/gm/river, +/area/strata/ag/exterior/paths/far_north_outpost) "xEV" = ( /obj/structure/flora/grass/ice/brown/snowgrassbb_1, /turf/open/auto_turf/snow/brown_base/layer3, @@ -35067,21 +33365,18 @@ /obj/structure/machinery/landinglight/ds2/delaythree, /turf/open/asphalt/cement/cement12, /area/strata/ag/exterior/landing_zones/lz2) +"xGI" = ( +/obj/structure/flora/grass/tallgrass/ice, +/obj/structure/platform_decoration/stone/strata/north, +/obj/effect/blocker/sorokyne_cold_water, +/turf/open/gm/river, +/area/strata/ag/exterior/paths/far_north_outpost) "xHw" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22" }, /turf/open/floor/strata, /area/strata/ug/interior/outpost/underground_dorms/med1) -"xHW" = ( -/obj/structure/platform/strata/metal, -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - dir = 5; - icon_state = "p_stair_full" - }, -/turf/open/auto_turf/snow/brown_base/layer1, -/area/strata/ag/exterior/paths/flight_control_exterior) "xId" = ( /obj/structure/flora/bush/ausbushes/grassybush, /obj/structure/blocker/forcefield/multitile_vehicles, @@ -35120,6 +33415,10 @@ /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/strata, /area/strata/ag/exterior/outpost_decks) +"xKt" = ( +/obj/structure/platform/stone/strata/west, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/caves/shed_five_caves) "xKv" = ( /obj/structure/machinery/camera/autoname{ dir = 1 @@ -35133,16 +33432,14 @@ /obj/structure/machinery/door/airlock/almayer/engineering/colony, /turf/open/floor/strata/multi_tiles/west, /area/strata/ag/interior/outside/engineering/parts_storage) -"xKy" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform_decoration/strata{ - dir = 4 - }, -/obj/structure/platform_decoration/strata{ - dir = 1 +"xKA" = ( +/obj/structure/platform/metal/strata/north, +/obj/structure/platform/metal/strata/west, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" }, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/spring_marshes) +/turf/open/floor/prison/darkyellowfull2, +/area/strata/ag/interior/outpost/engi) "xKC" = ( /obj/structure/machinery/light{ dir = 8 @@ -35155,17 +33452,15 @@ /obj/effect/decal/cleanable/blood/gibs/body, /turf/open/floor/strata, /area/strata/ag/exterior/outpost_decks) -"xLd" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 1 - }, -/turf/open/floor/strata/white_cyan2/west, -/area/strata/ag/interior/outpost/hallways/north) "xLB" = ( /obj/effect/decal/cleanable/blood, /obj/item/stack/sheet/wood, /turf/open/floor/strata, /area/strata/ug/interior/outpost/underground_dorms/sec1) +"xLG" = ( +/obj/structure/platform_decoration/stone/strata, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/marsh/spring_marshes) "xLH" = ( /obj/structure/cryofeed/right, /turf/open/gm/river, @@ -35176,10 +33471,44 @@ }, /turf/open/floor/strata/floor2, /area/strata/ug/interior/jungle/structures/monitoring) +"xLK" = ( +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/structure/platform/metal/strata, +/turf/open/floor/strata/red3/north, +/area/strata/ag/interior/outpost/med) +"xMq" = ( +/obj/structure/platform/metal/strata, +/turf/open/auto_turf/snow/brown_base/layer0, +/area/strata/ag/exterior/paths/mining_outpost_exterior) +"xME" = ( +/obj/effect/particle_effect/steam, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata, +/obj/structure/platform_decoration/stone/strata/east, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/spring_marshes) +"xMP" = ( +/obj/structure/platform_decoration/stone/strata, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/landing_zones/near_lz2) "xMR" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/strata/multi_tiles/west, /area/strata/ag/exterior/marsh/river) +"xNE" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/foyer) +"xNN" = ( +/obj/effect/decal/strata_decals/grime/grime2{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/cyan, +/obj/structure/machinery/power/apc/no_power/east, +/turf/open/floor/strata, +/area/strata/ag/interior/mining_outpost/central) "xOa" = ( /obj/structure/pipes/standard/simple/hidden/cyan, /turf/open/floor/strata/multi_tiles/southwest, @@ -35194,18 +33523,6 @@ /obj/effect/decal/cleanable/blood/gibs/core, /turf/open/floor/strata, /area/strata/ag/exterior/outpost_decks) -"xOx" = ( -/obj/effect/blocker/sorokyne_cold_water, -/obj/effect/blocker/sorokyne_cold_water, -/obj/structure/platform/strata{ - dir = 1 - }, -/obj/structure/platform/strata{ - dir = 4 - }, -/obj/structure/platform/strata, -/turf/open/gm/river, -/area/strata/ag/exterior/marsh/river) "xOL" = ( /obj/structure/flora/grass/ice/brown/snowgrassbb_2, /turf/open/auto_turf/snow/brown_base/layer2, @@ -35214,10 +33531,21 @@ /obj/structure/machinery/door/airlock/almayer/security/glass/colony, /turf/open/floor/strata/multi_tiles/west, /area/strata/ag/interior/outside/checkpoints/north) +"xPl" = ( +/obj/structure/platform_decoration/metal/strata/west, +/turf/open/auto_turf/snow/brown_base/layer1, +/area/strata/ag/exterior/caves/shed_five_caves) "xPv" = ( /obj/effect/decal/cleanable/blood, /turf/open/floor/strata, /area/strata/ug/interior/outpost/underground_dorms/admin2) +"xPz" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata/west, +/obj/structure/platform/stone/strata/north, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/center) "xPT" = ( /obj/item/reagent_container/food/drinks/cans/cola, /turf/open/auto_turf/ice/layer1, @@ -35233,11 +33561,6 @@ }, /turf/open/floor/strata/multi_tiles/southeast, /area/strata/ag/interior/outside/checkpoints/north_armor) -"xQu" = ( -/obj/effect/decal/strata_decals/catwalk/prison, -/obj/structure/pipes/standard/simple/hidden/cyan, -/turf/open/floor/greengrid, -/area/strata/ag/interior/mining_outpost/hallways) "xRl" = ( /obj/structure/bed/chair/dropship/passenger{ dir = 8 @@ -35258,13 +33581,45 @@ }, /turf/open/floor/strata/floor3/east, /area/strata/ug/interior/outpost/underground_dorms/sec1) +"xRA" = ( +/obj/effect/landmark/survivor_spawner, +/turf/open/floor/strata/red1, +/area/strata/ag/interior/outpost/security) +"xRP" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/engi/drome) "xRR" = ( /obj/structure/machinery/disposal, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/interior/outpost/engi/drome) +"xSh" = ( +/obj/structure/platform/metal/strata/west, +/obj/structure/flora/grass/ice/brown/snowgrassbb_1, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/paths/flight_control_exterior) +"xSq" = ( +/obj/structure/platform_decoration/stone/strata/north, +/obj/item/lightstick/red/planted, +/turf/open/auto_turf/snow/brown_base/layer4, +/area/strata/ag/exterior/paths/south_outpost) +"xSs" = ( +/obj/structure/platform/stone/strata/north, +/obj/effect/blocker/sorokyne_cold_water, +/obj/effect/blocker/sorokyne_cold_water, +/turf/open/gm/river, +/area/strata/ag/exterior/paths/far_north_outpost) "xSJ" = ( /turf/open/floor/strata/white_cyan2/west, /area/strata/ag/interior/mining_outpost/canteen) +"xSL" = ( +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/turf/open/floor/strata/white_cyan1/east, +/area/strata/ag/interior/outpost/canteen) "xTh" = ( /obj/structure/pipes/standard/simple/hidden/cyan, /obj/structure/machinery/door/airlock/almayer/maint/colony{ @@ -35294,13 +33649,10 @@ /obj/item/weapon/gun/pistol/t73, /turf/open/floor/strata/red1, /area/strata/ug/interior/jungle/structures/monitoring) -"xVF" = ( -/obj/structure/platform/strata/metal, -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 5 - }, -/turf/open/auto_turf/snow/brown_base/layer4, -/area/strata/ag/exterior/paths/flight_control_exterior) +"xUY" = ( +/obj/item/device/aicard, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/canteen) "xVQ" = ( /obj/structure/bed/chair/dropship/passenger{ dir = 4 @@ -35317,25 +33669,48 @@ /obj/effect/decal/cleanable/blood/gibs/limb, /turf/open/floor/strata, /area/strata/ag/exterior/outpost_decks) -"xWS" = ( -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/mining_outpost/hallways) +"xWQ" = ( +/obj/structure/pipes/standard/manifold/fourway/hidden/cyan, +/turf/open/floor/strata/white_cyan3/west, +/area/strata/ag/interior/outpost/med) +"xXf" = ( +/obj/structure/pipes/vents/pump/on, +/obj/structure/platform/metal/strata/west, +/turf/open/floor/strata/floor3/east, +/area/strata/ag/exterior/outpost_decks) "xXi" = ( /obj/effect/decal/cleanable/blood/gibs/body, /obj/effect/decal/cleanable/blood/gibs/core, /turf/open/floor/strata, /area/strata/ag/exterior/outpost_decks) +"xXj" = ( +/obj/structure/platform/metal/strata/north, +/turf/open/auto_turf/snow/brown_base/layer3, +/area/strata/ag/exterior/paths/flight_control_exterior) "xXo" = ( /obj/structure/barricade/wooden, /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/platform/south) +"xXX" = ( +/turf/open/floor/strata/fake_wood, +/area/strata/ag/interior/outpost/med) +"xYk" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata, +/obj/structure/platform/stone/strata/east, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/river) "xYw" = ( /obj/item/clothing/mask/cigarette/cigar/cohiba, /turf/open/floor/strata, /area/strata/ag/exterior/outpost_decks) +"xYB" = ( +/obj/structure/pipes/standard/manifold/hidden/cyan{ + dir = 1 + }, +/turf/open/floor/strata/red1, +/area/strata/ag/interior/outpost/security) "xZg" = ( /obj/structure/flora/grass/tallgrass/jungle, /obj/structure/flora/grass/tallgrass/jungle, @@ -35347,31 +33722,69 @@ }, /turf/open/floor/strata/floor3/east, /area/strata/ag/interior/outside/engineering/parts_storage) +"xZC" = ( +/obj/structure/machinery/vending/dinnerware, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/strata, +/area/strata/ag/interior/outpost/canteen) +"xZF" = ( +/obj/effect/particle_effect/steam, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata/east, +/obj/structure/platform/stone/strata, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/spring_marshes) "yah" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/strata/multi_tiles/southwest, /area/strata/ag/interior/outside/bball) -"yaC" = ( -/obj/structure/pipes/vents/pump{ - dir = 8 - }, -/turf/open/floor/strata/orange_cover, -/area/strata/ag/interior/outpost/hallways/south) "ybh" = ( /obj/structure/surface/rack, /turf/open/floor/strata/multi_tiles, /area/strata/ag/interior/mining_outpost/central) +"ybw" = ( +/obj/structure/closet/secure_closet/personal, +/turf/open/floor/strata/red1, +/area/strata/ag/interior/outpost/canteen) "ybN" = ( /obj/structure/window/framed/strata, /turf/open/floor/strata/multi_tiles/southeast, /area/strata/ag/interior/outside/checkpoints/outpost) +"ybR" = ( +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/west, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/spring_marshes) +"ybS" = ( +/obj/structure/platform_decoration/metal/strata/east, +/turf/open/auto_turf/strata_grass/layer0_mud_alt, +/area/strata/ug/interior/jungle/structures/research/old_tunnels) "yca" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/floor/strata/fake_wood, /area/strata/ug/interior/jungle/structures/monitoring) -"ycy" = ( -/turf/closed/wall/strata_outpost, -/area/strata/ag/interior/outpost/hallways/south) +"ycw" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 8; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/outpost/engi/drome) +"ycZ" = ( +/obj/effect/particle_effect/steam, +/obj/effect/blocker/sorokyne_cold_water, +/obj/structure/platform/stone/strata, +/obj/structure/platform/stone/strata/north, +/obj/structure/platform/stone/strata/west, +/turf/open/gm/river, +/area/strata/ag/exterior/marsh/spring_marshes) "yde" = ( /obj/structure/machinery/power/apc/no_power/north, /turf/open/floor/strata, @@ -35392,12 +33805,6 @@ "ydJ" = ( /turf/closed/wall/strata_outpost, /area/strata/ag/interior/outside/checkpoints/west) -"ydR" = ( -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/turf/open/floor/strata/multi_tiles, -/area/strata/ag/interior/mining_outpost/central) "ydV" = ( /obj/effect/decal/cleanable/blood{ icon_state = "xgib2" @@ -35410,9 +33817,34 @@ }, /turf/open/asphalt/cement/cement4, /area/strata/ag/exterior/landing_zones/lz2) +"yeK" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/strata/floor3, +/area/strata/ag/interior/mining_outpost/south_dormitories) +"yfx" = ( +/obj/structure/bed/chair/office/light{ + dir = 8 + }, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/strata/floor3/east, +/area/strata/ag/interior/outpost/engi/drome) "yfI" = ( /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/marsh/relay_marshes) +"yfQ" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/effect/landmark/survivor_spawner, +/turf/open/floor/strata/white_cyan2/west, +/area/strata/ag/interior/outpost/canteen) +"ygo" = ( +/obj/structure/platform/metal/strata/north, +/obj/effect/decal/strata_decals/catwalk/prison, +/turf/open/floor/greengrid, +/area/strata/ug/interior/jungle/structures/monitoring) "ygq" = ( /turf/closed/wall/strata_outpost, /area/strata/ug/interior/outpost/underground_dorms/admin2) @@ -35421,12 +33853,6 @@ /obj/effect/landmark/objective_landmark/close, /turf/open/floor/strata/floor3, /area/strata/ag/interior/mining_outpost/flight_control) -"ygB" = ( -/obj/structure/pipes/standard/manifold/hidden/cyan{ - dir = 1 - }, -/turf/open/floor/strata, -/area/strata/ag/interior/outpost/hallways/north) "yhJ" = ( /obj/structure/largecrate/random, /turf/open/floor/strata/floor3/east, @@ -35442,6 +33868,26 @@ /obj/structure/flora/pottedplant/random, /turf/open/floor/strata/multi_tiles/southeast, /area/strata/ug/interior/jungle/tearlake) +"yjl" = ( +/obj/structure/flora/bush/ausbushes/ppflowers, +/obj/structure/platform_decoration/metal/strata/north, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/auto_turf/strata_grass/layer0, +/area/strata/ug/interior/jungle/platform/east) +"yju" = ( +/obj/structure/platform/stone/strata, +/obj/structure/platform/stone/strata/west, +/turf/open/auto_turf/snow/brown_base/layer2, +/area/strata/ag/exterior/landing_zones/near_lz2) +"yjA" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/strata, +/turf/open/asphalt/cement, +/area/strata/ag/exterior/paths/mining_outpost_exterior) "yjG" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, /turf/open/auto_turf/strata_grass/layer1, @@ -35454,6 +33900,11 @@ }, /turf/closed/wall/strata_outpost, /area/strata/ag/exterior/caves/shed_five_caves) +"ykM" = ( +/obj/structure/platform/metal/strata/north, +/obj/structure/cryofeed/right, +/turf/open/gm/river, +/area/strata/ag/interior/outside/engineering/parts_storage) "ykU" = ( /obj/structure/closet/bodybag, /turf/open/floor/strata/cyan3/east, @@ -35868,7 +34319,7 @@ wrp wrp wrp wrp -alA +tYg cqE ang aoj @@ -36043,7 +34494,7 @@ coO coO ako coS -cpR +doZ cqE anh aok @@ -36062,27 +34513,27 @@ ctI azy ctI ctI -aGX -aIg -aIg -aIg -aIg -aIg -aIg -aIg -aIg -aSG -aUo -aVW -aXv +wkl +iWY +iWY +iWY +iWY +iWY +iWY +iWY +iWY +vMY +vqA +fWM +moS aIf -bbX -aVW -aVW -aVW -aVW -aVW -aVW +xuD +fWM +fWM +fWM +fWM +fWM +fWM nog bAe bAe @@ -36097,9 +34548,9 @@ aac aac aac cmg -ixu -cNg -hto +fax +tDw +olo fkG aac aac @@ -36117,8 +34568,8 @@ aac aac aac jXQ -bjv -qfi +eKB +jsx gUP aac aac @@ -36218,7 +34669,7 @@ cjb coP coV coS -cpR +doZ cqE cnv crb @@ -36249,9 +34700,9 @@ apc cmA cnv cqE -cot -aZS -bce +cPK +wDx +xnL beJ cqE cqE @@ -36272,7 +34723,7 @@ bET bET aac cmg -xOx +lyI crN crN bhJ @@ -36393,7 +34844,7 @@ cof cjb akp coS -cpR +doZ cqE cnv crb @@ -36427,10 +34878,10 @@ cqE cqE cqE cqE -beK -bhp -bhp -bnb +wss +rrN +rrN +eXc cqE aoj nog @@ -36442,8 +34893,8 @@ aac aac aac cmg -trz -nla +fDw +ksX crN aac nTS @@ -36485,7 +34936,7 @@ aac aac aac aac -aKv +qAX acX acX acX @@ -36568,7 +35019,7 @@ cjb coP akq coS -cpR +doZ cqE cnv crb @@ -36602,10 +35053,10 @@ cqE aQv aQv cqE -acY +cPG aQv aQv -bck +ozg cqE aoj aoj @@ -36617,8 +35068,8 @@ aac aac aac cmg -tru -laM +gzM +xYk crN bjN bjN @@ -36660,7 +35111,7 @@ aac aac aac aac -bCd +sxe acX acX acX @@ -36687,11 +35138,11 @@ aac bVx bVx bVx -jrU -bAI -bAI -bAI -bAI +lFZ +tAi +tAi +tAi +tAi aac aab "} @@ -36743,7 +35194,7 @@ coO coO coV coS -cpR +doZ cqE cnv crb @@ -36777,10 +35228,10 @@ cqE aQv aQv cqE -acY +cPG aQv aQv -bck +ozg beJ aST cqE @@ -36815,10 +35266,10 @@ bhN bhN bhN bhN -bqM -brE -brE -bsQ +fzl +xlq +xlq +xut bgS bgS bgS @@ -36835,13 +35286,13 @@ uxf bzV hms rUb -bCd +sxe acX -bdM -bcr -bcr -bcr -bDE +nfV +vQM +vQM +vQM +vxC bko acX acX @@ -36859,10 +35310,10 @@ aac aac aac bVx -jrU -bAI -bAI -aNz +lFZ +tAi +tAi +oGQ uvZ uvZ uvZ @@ -36918,7 +35369,7 @@ coS coS wrp wrp -alB +gbI amq ani crb @@ -36952,10 +35403,10 @@ cqE cqE cqE cqE -cot -aXw -aXw -bce +cPK +aXj +aXj +xnL cqE aST cqE @@ -36990,11 +35441,11 @@ bhN qvy bhN bgS -bif +ibP aac fCI -bsR -bjE +lJD +wKO bgS bgS bgS @@ -37010,14 +35461,14 @@ uxf qPu wXw wXw -jbI -bDE -hGO +ksV +vxC +tnp wXw wXw wXw -jbI -bDE +ksV +vxC bko acX acX @@ -37033,8 +35484,8 @@ aac bVx bVx bVx -jrU -aNz +lFZ +oGQ uvZ uvZ uvZ @@ -37165,11 +35616,11 @@ bgS bhN bgS bgS -bif +ibP fCI bgS fCI -bkd +sRV bgS bgS bgS @@ -37186,13 +35637,13 @@ wXw wXw uhM wXw -jbI -bEh +ksV +klv wXw qPu wXw oaV -bCd +sxe bko acX acX @@ -37204,11 +35655,11 @@ acX acX uvZ uvZ -aSj -bAI -bAI -bAI -aNz +vUP +tAi +tAi +tAi +oGQ uvZ uvZ uvZ @@ -37298,10 +35749,10 @@ crE fuA aSH coX -aVX -pfQ -pfQ -bcf +vKS +eDO +eDO +tyZ cqM cqM cqM @@ -37340,11 +35791,11 @@ bgS bgS bgS bhN -bqN -brF +pZZ +vRO xzR wGp -bkd +sRV bgS bgS bgS @@ -37367,7 +35818,7 @@ dqi wXw stw wXw -bCd +sxe acX bko acX @@ -37473,10 +35924,10 @@ crE dnS cmA cnv -acY +cPG aQv aQv -bck +ozg cqE aQv aQv @@ -37516,10 +35967,10 @@ bgS bgS bhN bgS -brH -bsa -bsT -bsZ +rTA +wTE +kBo +ttk bgS bgS fCI @@ -37536,13 +35987,13 @@ wXw uhM wXw uhM -bAu -dDW +kuc +ezj wXw dqi wXw wXw -bCd +sxe acX bko acX @@ -37618,7 +36069,7 @@ coS coS wrp wrp -cve +elD cqE cnv crb @@ -37648,10 +36099,10 @@ crE aRz cmA cnv -acY +cPG aQv aQv -bck +ozg beJ aQv aQv @@ -37710,14 +36161,14 @@ buG wXw uhM wXw -dvf -pWp -mde -bGg +neE +dsS +lUF +tDU wXw wXw -bAu -bwg +kuc +vmo acX bko acX @@ -37735,13 +36186,13 @@ aac aac aac aac -aTv -aTv -aTv -aTv -aTv -aTv -aTv +cOk +cOk +cOk +cOk +cOk +cOk +cOk aac aab "} @@ -37793,7 +36244,7 @@ coO coU cpq coS -cpR +doZ cqE cnv crb @@ -37823,10 +36274,10 @@ crE crW cmA cnv -cot -aXw -aXw -bce +cPK +aXj +aXj +xnL cqE cqE cqE @@ -37880,18 +36331,18 @@ bhO bgS buS wXw -aKu +pTP aac uhM wXw qPu wXw -mip -bcr -sEG -hkA -hkA -bwg +fOY +vQM +jhI +oUt +oUt +vmo acX acX acX @@ -37900,8 +36351,8 @@ acX acX bko acX -bdM -aRj +nfV +krT aac aac aac @@ -37968,7 +36419,7 @@ cjb cjb coV coS -cpR +doZ cqE cnv crb @@ -38055,7 +36506,7 @@ bgS bhO bgS wXw -hqw +mte aac uhM uhM @@ -38063,8 +36514,8 @@ wXw qPu wXw wXw -jbI -bDE +ksV +vxC acX acX acX @@ -38074,8 +36525,8 @@ kLZ bko bko acX -bdM -bEh +nfV +klv aac aac aac @@ -38143,7 +36594,7 @@ cof cjb cpE coS -cpR +doZ cqE cnv crb @@ -38184,8 +36635,8 @@ nog nog nog nog -axv -ccI +lot +kKx bAe caX aZv @@ -38239,17 +36690,17 @@ wXw uhM dqi wXw -jbI -bDE +ksV +vxC acX bko bko bko acX acX -bdM -bcr -bEh +nfV +vQM +klv cwS aac aac @@ -38318,7 +36769,7 @@ cjb coP akq coS -cpR +doZ cqE cnv crb @@ -38360,8 +36811,8 @@ aac aac aac aoQ -bEV -ccI +dTI +kKx bAe bIH bjj @@ -38415,14 +36866,14 @@ wXw uhM dqi wXw -bCd +sxe acX bko acX acX bko acX -hGO +tnp kvD eHo xAc @@ -38493,7 +36944,7 @@ coO coO coV coS -cpR +doZ cqE cnv crt @@ -38526,18 +36977,18 @@ cnv aoj aXy aUt -cqG -bbA -bbA -bjA -bne +oRg +uns +uns +xtV +jar brb bwL bwL bAv bnm -bEV -ccI +dTI +kKx bAe bIH aVq @@ -38590,14 +37041,14 @@ uhM wXw uhM wXw -jbI -bcr -bDE +ksV +vQM +vxC acX acX acX -bdM -bEh +nfV +klv cwS mvD cTQ @@ -38668,7 +37119,7 @@ ajg wrp wrp wrp -cqu +sXz cqE coX aol @@ -38701,7 +37152,7 @@ aUq aoj aXy aUt -bhK +skm ahA ahA amK @@ -38718,7 +37169,7 @@ bbh aVq aZx aZx -bdB +poG crN crN aVq @@ -38767,11 +37218,11 @@ wXw aac aac aac -aRi +rdL acX acX -bdM -bEh +nfV +klv cwS xAc cTQ @@ -38841,7 +37292,7 @@ ahs sIZ sIZ akV -akr +ecB tSZ alC cqE @@ -38876,7 +37327,7 @@ aUr aUr azx aUt -bhK +skm ahA ahA bnm @@ -38893,8 +37344,8 @@ bbh aVq aZx aVq -bdC -bdS +vUM +cTE lZf aVq bjN @@ -38945,7 +37396,7 @@ aac acX acX acX -hGO +tnp aac aac cTQ @@ -39016,7 +37467,7 @@ ahs sIZ cry akV -aks +sFp tSZ alC cqE @@ -39051,10 +37502,10 @@ aUs aVY lEi cfi -bhK -ahB -aiP -aiP +skm +dNg +vDU +vDU aac aac aac @@ -39069,7 +37520,7 @@ aVq aZx aVq aZx -bdT +ivW bjj crN aVq @@ -39223,11 +37674,11 @@ aQv cnv aSQ aUt -agA -apA -apA -bhX -aZW +vBG +nFT +nFT +qDM +iTW crN bjB bnn @@ -39244,8 +37695,8 @@ aZx bcv bcK aZx -bdC -bek +vUM +olk bjj crN aVq @@ -39398,11 +37849,11 @@ aQv aRA azx aUt -cou +vIZ bnm -ahB -aiP -ajw +dNg +vDU +uFt crN bjj aZv @@ -39420,8 +37871,8 @@ bbZ bcO bcK aZx -bdC -bek +vUM +olk lZf bgk bgS @@ -39473,13 +37924,13 @@ aac aac aac aac -gIY -gIY -gIY -urQ +tEq +tEq +tEq +scZ rNI -lVF -gIY +sRw +tEq aac aac aac @@ -39537,7 +37988,7 @@ cnO bjY xDX cnO -cmB +rCl coY xDX bjY @@ -39573,9 +38024,9 @@ aQv cnv azx aac -cou +vIZ bnm -aZW +iTW crN crN aVq @@ -39596,7 +38047,7 @@ bcO bcO bcK aZx -bdT +ivW crN tFA tFA @@ -39651,10 +38102,10 @@ aac bNj bNj bNj -cFg +pcD rNI -gtZ -gTx +pJr +iAQ bNj bNj bNj @@ -39712,7 +38163,7 @@ cLE qKU agB cnO -cmB +rCl aiB ajj ntw @@ -39748,9 +38199,9 @@ aQw ani aac aac -cou +vIZ bnm -aZW +iTW crN aWf crN @@ -39771,8 +38222,8 @@ bcO bcO bcs aZx -bdC -bfl +vUM +phP sGb tAX sGb @@ -39825,11 +38276,11 @@ aac aac bNj bNj -ksA -psl +rJu +sop bwt rNI -pKq +mRS bNj bNj bNj @@ -39894,8 +38345,8 @@ ajM coZ akW bSJ -fHp -ank +hjW +wwC aCE app apY @@ -39903,8 +38354,8 @@ aCE arW arW aun -fHp -awG +hjW +otL ayk arW arW @@ -39918,8 +38369,8 @@ chq aMB aJP ctC -iGm -eHZ +iKd +aPh pWz aSR aUu @@ -39947,9 +38398,9 @@ bcO bcs aVq tFA -bfo -bgl -bdW +vhz +rus +gUM wSb sGb sGb @@ -39998,19 +38449,19 @@ xxS rNI aac aac -qYF -qYF -pqy +akJ +akJ +gqJ rNI xTU bwt -gtZ -qYF -qYF -gTx +pJr +akJ +akJ +iAQ bNj bNj -cFg +pcD iLr aac aac @@ -40062,15 +38513,15 @@ cnO cEu rRx cnO -vXN +oSC kRb cnO qKU exO ddp crY -iGm -dLx +bEo +qaq ctC eOI apZ @@ -40078,8 +38529,8 @@ ctC arX atr auo -eHZ -ktH +cbj +aLh ayj ctK atr @@ -40093,10 +38544,10 @@ aIn aLf aMB aNJ -xjp -eHZ -oeG -aSS +qax +aPh +clW +gyo ctx cty xMR @@ -40126,7 +38577,7 @@ tFA wSb tFA tFA -bih +dqZ sGb tAX sGb @@ -40149,8 +38600,8 @@ aac bur coC rGp -kHV -luA +kOo +pAF aac aac aac @@ -40182,10 +38633,10 @@ rNI rNI rNI rNI -gtZ -gTx +pJr +iAQ bNj -cFg +pcD iLr rNI byn @@ -40237,15 +38688,15 @@ cnO aiE agD crz -vXN +oSC bHD exO kRb cnO ddp bXW -myV -dLx +bWy +qaq ctC afW aFO @@ -40253,8 +38704,8 @@ ctC arY arY caE -myV -awI +bWy +ckl caE arY cto @@ -40268,10 +38719,10 @@ chq aLf aMB fno -myV -eHZ -dLx -miI +ckX +aPh +cov +pFV spJ cty cty @@ -40301,7 +38752,7 @@ tFA wSb tFA tFA -bin +wbr sGb sGb sGb @@ -40324,7 +38775,7 @@ aac aac stF aUX -woP +jER pqH aac aac @@ -40349,18 +38800,18 @@ rNI rNI xxS rNI -lVF -gIY -mPz +sRw +tEq +bJv rNI -lVF -gIY -mPz +sRw +tEq +bJv rNI rNI -pKq +mRS bNj -cFg +pcD iLr xxS byo @@ -40419,8 +38870,8 @@ jPT cnO ddp alG -lmF -anm +jSp +nZU ctC afW aqa @@ -40428,8 +38879,8 @@ ctC arX atr auo -eHZ -myV +cbj +bWy ayj ctK atr @@ -40443,8 +38894,8 @@ chr bWy aMB cjv -myV -lmF +ckX +cZd aRD aSR aUv @@ -40476,9 +38927,9 @@ tFA tFA wSb wSb -big -bdG -bjG +smV +vlu +wYa sGb sGb djr @@ -40495,7 +38946,7 @@ bnj bur bnj coC -woP +jER aac aac aac @@ -40524,18 +38975,18 @@ aac rNI rNI rNI -pKq +mRS bNj -cFg +pcD rNI -pKq +mRS bNj -jAo -urQ +tAH +scZ rNI -gtZ -qYF -pqy +pJr +akJ +gqJ rNI rNI byp @@ -40594,8 +39045,8 @@ ddp ddp ddp bXW -myV -dLx +bWy +qaq ctC afW aFO @@ -40603,8 +39054,8 @@ ctC arY arY ctD -myV -eHZ +bWy +cbj caE azB azB @@ -40618,14 +39069,14 @@ fWV aLg aMB cjv -myV -eHZ +ckX +aPh cov aac aac -aWk +nLZ bnm -aZW +iTW bjj aWg crN @@ -40653,24 +39104,24 @@ wSb wSb mne rni -bjH -bjG +cVW +wYa sGb sGb gWg sGb sGb -hhW +cro fCD aac aac aac aac -brJ -bsc +heA +wfm coC oqQ -woP +jER aac aac bur @@ -40692,21 +39143,21 @@ wXw wXw wXw qPu -fjZ -eHv -eHv +aXl +lKA +lKA aac aac -gIY -gIY -kxF -ksA -psl +tEq +tEq +lDd +rJu +sop xxS -pKq +mRS bNj bNj -cFg +pcD xxS rNI rNI @@ -40769,8 +39220,8 @@ cnO ajQ ddp crY -myV -bCh +bWy +fCF ctC ctC emU @@ -40778,8 +39229,8 @@ ctC ctC ctC jqg -avr -myV +xBD +bWy bPs azC azC @@ -40793,14 +39244,14 @@ aJQ aLh aMB cjv -xjp -eHZ +qax +aPh clW cnB aac -aWk +nLZ bnm -aZW +iTW crN aVq crN @@ -40829,23 +39280,23 @@ wSb tFA rni kim -bis +nql sGb sGb sGb sGb -sXU -xKy -bRb +ybR +pjH +dPu aac aac aac bnj coC -bsd +ttd rGp -kHV -luA +kOo +pAF aac bur buf @@ -40865,7 +39316,7 @@ aac wXw qPu uhM -wXw +nxc rNI rNI bvE @@ -40875,17 +39326,17 @@ aac bNj bNj bNj -cFg +pcD rNI rNI -pKq +mRS bNj bNj -cFg +pcD rNI -lVF -gIY -mPz +sRw +tEq +bJv rNI xxS xxS @@ -40944,8 +39395,8 @@ brG bIL akW bSJ -fHp -anm +hjW +nZU bUM ctC aFO @@ -40953,8 +39404,8 @@ fno dVh ctC aup -myV -eHZ +bWy +cbj bPs azD azD @@ -40968,8 +39419,8 @@ ceq aLi aMD crY -iGm -eHZ +iKd +aPh cov cjw aac @@ -41001,15 +39452,15 @@ tFA wSb wSb tFA -biq -bhP -bjI -big -bkl +xLG +tDH +qRl +smV +hVY cJy lQu sGb -oSP +scA wGS kYe aac @@ -41017,9 +39468,9 @@ aac aac bnj rGp -bsd +ttd coC -jsP +gcc aac aac bur @@ -41042,7 +39493,7 @@ uTt tJX bvE rNI -bvE +jpC rNI bxh aac @@ -41050,18 +39501,18 @@ aac bNj bNj bNj -cFg +pcD rNI rNI -pKq +mRS bNj bNj -pqy +gqJ rNI -pKq +mRS bNj -jAo -mPz +tAH +bJv rNI rNI rNI @@ -41119,8 +39570,8 @@ vNG akt ddp fno -myV -dLx +bWy +qaq bXW ctC aFO @@ -41128,23 +39579,23 @@ ojB iqD ctC auq -eHZ -pgW -myV -eHZ -myV -myV -aDG -xjp -xWS -vrL -aIo -vrL -vrL -xjp -aDG -myV -myV +cbj +qGi +bWy +cbj +bWy +bWy +rvj +oIJ +bZV +bPs +klD +bPs +bPs +oIJ +rvj +ckX +ckX cov aSU cnB @@ -41176,15 +39627,15 @@ wSb wSb wSb tFA -bis +nql cDL -bjJ -biP -dbg +grL +mgV +hNP aac xeJ sGb -oSP +scA nka aac aac @@ -41192,7 +39643,7 @@ aac aac bqP cJf -bsd +ttd coC bta aac @@ -41233,12 +39684,12 @@ aac aac iLr iLr -gtZ -gTx +pJr +iAQ bNj -jAo -gIY -mPz +tAH +tEq +bJv rNI rNI bvE @@ -41294,8 +39745,8 @@ ddp ddp ddp crY -iGm -aRG +bEo +vXx aoo aHa aqc @@ -41303,25 +39754,25 @@ fno dVh ctC ctF -avs -pYG -kUN -aPa -aBl -aCG -aDH -ceu -ceV -igm -gCJ -aJS -aLj -aDH -aDH -aPa -aPa -aRF -myV +cGV +lgj +xNN +jIn +qeO +frn +dcZ +bkR +giU +cGu +obt +lSk +vTG +dcZ +dcZ +oCD +oCD +gjD +ckX cnA aWl bXV @@ -41342,19 +39793,19 @@ baJ aYd usP aXP -bcU -bdN -bdX +wQu +wUS +mFz wSb tFA wSb wSb tFA tFA -bin +wbr sGb dMw -cuy +tad sGb aac aac @@ -41367,7 +39818,7 @@ aac aac bqQ brK -bse +stb bme btb btk @@ -41391,7 +39842,7 @@ aac aac bwA rNI -rNI +oKr bvE bvE bwv @@ -41413,8 +39864,8 @@ aac bNj bNj bNj -jAo -urQ +tAH +scZ rNI bvE aac @@ -41469,8 +39920,8 @@ bRs bRs bRs jOl -dmK -ano +bOs +qjL crY crY aFO @@ -41478,8 +39929,8 @@ afW pAR ctC ctC -avt -xWS +mBC +bZV aCl pYZ aBm @@ -41493,10 +39944,10 @@ aJT aMB oOX ctC -aPb -myV -dLx -aSV +ibC +ckX +cov +gUB cnB bXd aXB @@ -41519,17 +39970,17 @@ aXP aXP usP aYd -bdZ +tFe tFA tFA wSb wSb tFA tFA -bit +tuL sGb lrO -rrV +gmG sGb pax aac @@ -41568,7 +40019,7 @@ bvC xxS rNI rNI -bwm +qIG bvD bvD bvD @@ -41586,10 +40037,10 @@ bxo rNI aac aac -qYF -qYF -qYF -pqy +akJ +akJ +akJ +gqJ rNI bvE aac @@ -41644,8 +40095,8 @@ qUW qUW qUW qUW -lLN -rSB +qUW +bUs crY ybh aeD @@ -41653,8 +40104,8 @@ aeM aeM aeM aCE -avu -nHE +qFZ +sJd cew azG aBn @@ -41670,8 +40121,8 @@ aMF ctC cjw cnB -dLx -vrL +cov +aLq cnC aWm aXC @@ -41694,18 +40145,18 @@ aXP aXP usP bWa -bdV +mtq tFA tFA wSb wSb tFA wSb -biu +rHV sGb nSQ -nAM -fRi +hKf +mZh hpe aac aac @@ -41743,7 +40194,7 @@ rNI rNI rNI bvE -bwZ +sSs bvM bvD bvD @@ -41757,7 +40208,7 @@ bvE bvD mcX rxL -bvD +caw bvE rNI bvE @@ -41816,37 +40267,37 @@ cnO ddp ajn hCp -uiM -akX -akX -uiM -aQX +xSJ +egf +egf +xSJ +sUY crY eOI bKb lMC -jIv -ydR +sys +tDV ctC -myV -awK +bWy +mAj cew azH aBo aCI aDJ crY -aLM -aNe -aNe -aOX -aPn +vyL +sNq +sNq +rPH +pjm aKm cwd aPe aQx -aRG -aSW +pvc +mul cnB cjw cjw @@ -41861,7 +40312,7 @@ usP aYd usP usP -aZA +hlZ aXO usP aXP @@ -41869,18 +40320,18 @@ aXP usP usP bWa -bdV +mtq tFA tFA wSb wSb wSb wSb -bin +wbr sGb sGb sGb -cuy +tad qUB aac aac @@ -41918,7 +40369,7 @@ rNI hPr bvE aac -bwZ +sSs bvD bvD aac @@ -41928,7 +40379,7 @@ bxC bvD bvD bvD -bvD +caw bvM mcX rxL @@ -41991,37 +40442,37 @@ ddp ddp jOl bQs -aku -akY -alI -uiM -rSB +qlx +sJP +emX +xSJ +bUs aHa afW wWx afW -asb +tdG jfh bYE -eHZ -xWS +cbj +bZV cew azI oXH aCK cdK crY -aMV +aHE aNj aNm aOY xOL -aPT +uEt aNL aPh cjw -dLx -vrL +cov +aLq cnA clU aXD @@ -42036,26 +40487,26 @@ aYX usP aXP aXP -aZB +rWc usP aXP aXP usP usP bWa -bcV -bdW +ogB +gUM tFA rni tFA wSb wSb wSb -big -biN +smV +jpY gWg sGb -bkm +qoh tFA aac aac @@ -42093,7 +40544,7 @@ bvE bvE aac aac -bwZ +sSs bvM bvD aac @@ -42110,7 +40561,7 @@ bwt bwb jLc bwt -bwt +epz bwt aac aac @@ -42166,11 +40617,11 @@ ahT agJ ajo pDJ -akv -alJ -alJ -ams -bUt +cuw +oRS +oRS +rMx +lRD ctC ctC ctC @@ -42178,25 +40629,25 @@ afg ctC ctC ctC -aLp -awL +lLw +hjd ctC ctC crY crY crY aCl -kwU +gwY aNl aNo aNl aOY -tNr +lck cjw aPi cwd -dLx -cmC +cov +oWK cnB bXd aXE @@ -42211,14 +40662,14 @@ aYX usP usP aXO -aZC -baf +ing +vmk aXP aXP usP bWa -bcV -euc +ogB +hLX rni tFA rni @@ -42227,10 +40678,10 @@ wSb wSb wSb tFA -bis +nql sGb sGb -bkn +jkT tcN tcN aac @@ -42264,11 +40715,11 @@ bvD bvE bvD bvD -bvR -bvZ -bwT -bvZ -bxa +gsQ +uvp +grK +uvp +bXI bvD bvD bvD @@ -42341,11 +40792,11 @@ ahU xSJ ajp qUW -vHg -uiM -akX -uiM -rSB +ahU +xSJ +egf +xSJ +bUs ctB apr aqe @@ -42353,25 +40804,25 @@ cbj asc bXW ctC -myV -xWS +bWy +bZV alV ctC ciA aCL ciB abL -aMG +qsu aNm aNo dXc aNl -aPX +qyq cjx cjw cnB -aRI -cmD +tJg +uIn cnC aLq aXF @@ -42387,12 +40838,12 @@ aYd juL aYd ckZ -aZA +hlZ aXP usP usP ckZ -cuy +tad sGb sGb lOJ @@ -42402,10 +40853,10 @@ tcN wSb wSb tcN -big -biN +smV +jpY cDL -bdZ +tFe tFA tFA aac @@ -42415,8 +40866,8 @@ coC emv aac aac -wqm -iIz +hAq +qxp rbO ftr btc @@ -42505,8 +40956,8 @@ aac aac aac aac -bAu -hkA +kuc +oUt bHt afI xdE @@ -42516,37 +40967,37 @@ ahU dQi vjD qUW -aIi -ala -bMZ -uiM -bUu -aus -fHp -fHp -fHp -tio -fHp -aus -xQu -aRF -ayn -aSS +coQ +wsC +vtJ +xSJ +tpo +nwN +hjW +hjW +hjW +pmV +hjW +sOU +aEI +qSC +eXb +aNJ ciA ciA -aDK -aLy -aMH +rCQ +uuQ +nYV aNo aNo aNo aNl -aQa +mSH vnh aPk ckX -aRJ -cmE +skh +uCH cnB cjw cjw @@ -42562,12 +41013,12 @@ aYd tUu aYd bWa -aZB +rWc aXP aXP aYd bWa -isd +nAz sGb sGb fCD @@ -42578,9 +41029,9 @@ wSb wSb wSb tFA -bjK -bke -bdW +lzB +stX +gUM tFA wSb bme @@ -42591,8 +41042,8 @@ rbO qxD aac aUX -iJJ -nCD +gmA +gWG rbO nSJ bnh @@ -42679,8 +41130,8 @@ aac aac aac aac -bAu -bwg +kuc +vmo acX bHt afJ @@ -42691,37 +41142,37 @@ ahV aiF vjD qUW -uiM -alb -alb -uiM -rSB -myV -myV -myV -myV -myV -myV -myV -eHZ -xWS -vrL -miI +xSJ +nnO +nnO +xSJ +bUs +bLw +bWy +bWy +bWy +bWy +bWy +bWy +cbj +bZV +bPs +fno ciA ciA -aDL -aLz -aMI +sem +pJo +oKj aNo aNo aNo aNo -aOB +nJI vnh aPk ckX -aRK -myV +iaB +ckX cnA clU aXH @@ -42735,9 +41186,9 @@ brn aYZ usP aYd -aZo -aZI -bah +ohf +isx +jQj aXP usP aZc @@ -42766,9 +41217,9 @@ bme bnj bqA nSJ -jsP -gjN -qtn +gcc +unP +lbm rGp coC bur @@ -42853,8 +41304,8 @@ aac aac aac aac -bAu -bwg +kuc +vmo acX acX bHt @@ -42866,10 +41317,10 @@ ahW xSJ ajr qUW -uiM -akX -uiM -amt +xSJ +egf +xSJ +mgM bUs ctB bXW @@ -42878,25 +41329,25 @@ cbj aqf bXW ctC -iGm -xWS +bEo +bZV aym ctC ciA bwj aDM aEP -aMG +qsu aNo -aNq -aOZ -aPr -aOB +rzy +qPN +xaY +nJI cnB cjw aQy -aRK -aSV +iaB +gUB cnB coy aXB @@ -42942,7 +41393,7 @@ bme bnj bnh coC -tSt +ssb mvE aUX coC @@ -42956,7 +41407,7 @@ bnj coC rbO nSJ -wPp +lpB xTU rNI xTU @@ -43028,7 +41479,7 @@ aac aac aac aac -bCd +sxe acX acX acX @@ -43041,10 +41492,10 @@ bOs aiG bPv qUW -uiM -alc -alK -uiM +xSJ +vNl +eNO +xSJ anq aCl crY @@ -43053,25 +41504,25 @@ crY crY crY crY -aLp -awL +lLw +hjd ctC aHb aBq ctC ciA aER -aMJ +cXN aNo -aNB +xMq aJX -aMJ -aNB +cXN +xMq aOt cnA aQz -aRK -myV +iaB +ckX cnC aWn aXI @@ -43129,9 +41580,9 @@ ble ble btd coC -mjp -fMP -fNs +qNX +nvH +nLW hPr rNI bvE @@ -43203,7 +41654,7 @@ aac aac aac aac -bCd +sxe acX acX acX @@ -43216,10 +41667,10 @@ bNa aiH jOl bQv -uiM -alb -alb -uiM +xSJ +nnO +nnO +xSJ bUs axK crY @@ -43236,17 +41687,17 @@ yis ctC aDN aER -aMJ +cXN aNo -aPX +qyq aJY -aLo -aMK +jUy +yjA cjy cnA ckY -aRK -wXL +iaB +njL cnB cjw cjw @@ -43305,8 +41756,8 @@ ble bme coC tAX -nun -psl +eCS +sop rNI rNI xTU @@ -43378,7 +41829,7 @@ aac aac aac aac -bCd +sxe acX acX acX @@ -43411,17 +41862,17 @@ aBs ctC aDO aER -aMG +qsu aNo -aNU +ezz cjy ciA ciA ciA aQu aQA -aRK -myV +iaB +ckX cnA whO aXJ @@ -43553,8 +42004,8 @@ aac aac aac aac -jbI -bDE +ksV +vxC acX acX bHt @@ -43586,17 +42037,17 @@ aBt ctC aDO aER -aMV +aHE aNo -aNB +xMq cjy ciA ciA aNM cnA ckY -aRK -aSV +iaB +gUB cnB bXd aXE @@ -43729,8 +42180,8 @@ aac aac aac aac -jbI -bDE +ksV +vxC acX bHt bID @@ -43761,17 +42212,17 @@ ctC ctC afP aER -aMS +lmL aNo -aNB +xMq cjy ciA ciA aNN cnA aQD -aRK -myV +iaB +ckX cnC aLq aXK @@ -43813,8 +42264,8 @@ bnj bnN coC coC -bFi -vox +xPz +fKi aUX bur bur @@ -43826,8 +42277,8 @@ bme bme aac aac -buD -biP +tOi +mgV wSb rni tFA @@ -43905,8 +42356,8 @@ aac aac aac aac -jbI -bcr +ksV +vQM bUd bID xdE @@ -43924,7 +42375,7 @@ aqi brS jOl bWi -arj +sXs ash atw ctC @@ -43936,17 +42387,17 @@ aBu ctB oLv aER -aMT +vAw aNo -suF +moM cnB -aLp -cjz +wsH +vcS cjw cnB aQF -dLx -myV +cov +ckX cnB cjw cjw @@ -43987,26 +42438,26 @@ bAS bnj coC coC -gVJ -guz -tyD +tKx +mty +jiw ftr aUX bur ble ble -btl +bVu aac aac aac aac sGb sGb -buK +uLF tFA wSb wSb -bvE +pAZ bvD bvD bvD @@ -44099,7 +42550,7 @@ aqA aky jOl aqh -arj +sXs ash atx ctC @@ -44111,17 +42562,17 @@ aBv ctB ciA aER -aMU +dlb aNo -aOz +mUS vnh -myV -myV -aNO -aPl -aPa -aRF -vrL +ckX +ckX +pfu +wWe +oCD +gjD +aLq cjw aac aac @@ -44161,8 +42612,8 @@ ble bme bDl coC -iqV -jMD +mSp +aTu mvE cfF boE @@ -44170,14 +42621,14 @@ nSJ bur ble ble -btm +tBi sGb sGb sGb sGb gWg sGb -buK +uLF wSb tFA rni @@ -44274,7 +42725,7 @@ aqT brS jOl crY -pIy +sDh bXf bXZ aCE @@ -44286,17 +42737,17 @@ aBw ctB ciA aER -aMS +lmL aNo -aOB +nJI vnh -vrL -aML -vrL -myV -myV -dLx -aSY +aLq +tTu +aLq +ckX +ckX +cov +yeK cjw aac aac @@ -44345,14 +42796,14 @@ bur ble ble bnj -btn +okW sGb gWg gWg gWg sGb sGb -buK +uLF wSb rni tFA @@ -44461,9 +42912,9 @@ aHf ctC oLv aER -aMS +lmL aNo -aPX +qyq aKa aLr cjw @@ -44498,7 +42949,7 @@ xPg lqX mvm eYE -bgr +fYk rJr tFA wSb @@ -44524,10 +42975,10 @@ aac aac sGb aac -jUS -rQX -bdG -buM +ieu +rTR +vlu +pAr tFA tFA mQW @@ -44636,9 +43087,9 @@ ciA aES aDP aER -aMV +aHE aNo -aOB +nJI cjw aLs aMM @@ -44673,7 +43124,7 @@ cwF lNr eYE qjD -bgs +knu rni tFA wSb @@ -44707,7 +43158,7 @@ wSb tFA rni bvD -bvE +pAZ bvE bvE xTU @@ -44811,9 +43262,9 @@ aBx aCM ciB aEM -aMG +qsu aNo -aOE +hNm cjw aLt aMN @@ -44980,15 +43431,15 @@ aHq xdE avG awP -aHy -aQg -aIH -fIq -fIq -mPh -aYh +aRP +hVx +rYp +rqH +rqH +onF +oaW aZP -aOF +vvs cnB cjw cjw @@ -45023,7 +43474,7 @@ cwF lPk eYE qjD -bgs +knu rni tFA wSb @@ -45059,27 +43510,27 @@ wSb bvD bvD bvD -bvD +xgU bvD xTU bwt bwt -bwB -bwO -bwW -bwX +pFm +rTL +ezG +dAs bvE bvD bvD bvD bvD bvM -bxD -bxQ -bwW -bwW -bwW -bwm +xMP +rdt +ezG +ezG +ezG +qIG bvE bvD bvD @@ -45154,8 +43605,8 @@ xdE xdE auv xIM -awQ -aHB +gcq +iJi bch aTe bch @@ -45163,7 +43614,7 @@ bch bcB bcB bcB -xVF +owH aKb aLv aMO @@ -45198,7 +43649,7 @@ rwg lQT mvm bUX -bgu +jRs hoG tFA wSb @@ -45224,7 +43675,7 @@ aac aac wyV cpX -lOT +ycZ sGb wSb kjD @@ -45239,29 +43690,29 @@ bvE bwb jLc bwt -bwC +fHa rNI bvE -bwY -bwX +ufk +dAs bvD bvD bvD bvD xTU -bwD +dca aac rNI bvE aac -bya +iTu bvE bvE bvD -bww -bwO -bwO -bwX +lrL +rTL +rTL +dAs bwt bwt aac @@ -45330,7 +43781,7 @@ aac xdE ciB awR -aHC +mtL aZK aZK aZP @@ -45338,7 +43789,7 @@ aZP bbj bbj aZP -jwv +sfZ aKc afz afz @@ -45368,12 +43819,12 @@ aZP bdw aZK bcW -bdO +trg iym lXd lXd qkU -bgu +jRs rni wSb wSb @@ -45398,8 +43849,8 @@ aac aac aac xeJ -sXF -psV +kRH +xME sGb tAX bgx @@ -45414,29 +43865,29 @@ xFH aac bwt bwt -bwD +dca aac hPr bvE -bwZ +sSs bvD bvD bvD bvD -bxz -bxG +pDa +hcz rNI hPr rNI -bxZ -byb +rkU +gEN bwt bvD -bww -byf +lrL +pBW rNI aac -bwr +jsc bvD bvE aac @@ -45505,7 +43956,7 @@ aac aac aac aac -aHS +rZr bbj aZP aZP @@ -45513,13 +43964,13 @@ aKV aac aac aZK -dGU -aPc -auM -iTY -aQh -aQn -aQH +lAq +sMf +llJ +dtN +jfD +dWj +cjo ozr bcB bcB @@ -45543,12 +43994,12 @@ aZP bdw aZK aZK -bdP -fIq -vwR -bec -bfE -bgv +fWD +rqH +xSh +wrJ +puA +lUg tFA wSb wSb @@ -45573,9 +44024,9 @@ bte wsn ehH cpX -nnY -vvh -dmd +jkU +vsR +orV sGb bjO wSb @@ -45589,29 +44040,29 @@ qfC aac bwu xTU -bwI -bwP +uTC +yju aac rNI -bwZ +sSs bvD bvD bvD bvD -bwC +fHa rNI hPr rNI bxo rNI -bwZ +sSs bvD bvE -bwx +eNa xxS hPr rNI -bwr +jsc bvD bvE rNI @@ -45747,10 +44198,10 @@ wSb tFA hoG sGb -piO -ueK -mEk -lvw +vwg +nGM +nBe +xZF sGb rps wSb @@ -45765,28 +44216,28 @@ aac aac bwu xTU -bwQ -bwT -bwT -bxa +hfk +grK +grK +bXI bvD bvD bvD bvD -bwC +fHa aac rNI rNI -bxW -bvZ -bws +nis +uvp +oTt bvE bvE -bwx +eNa ibh rNI aac -bwr +jsc bvD bvE rNI @@ -45946,22 +44397,22 @@ kBL bwt bvE bvE +mpU bvD -bvD -bwI -bxH -bwT -bvZ -bxa +uTC +rqs +grK +uvp +bXI bvD bvE bvD bvD -bwx +eNa rNI aac -byj -bws +qrb +oTt bvE bvE aac @@ -46126,16 +44577,16 @@ bvD bvD bvD bvE -bvD +mpU bvD bvE bvE bvD bvD -bvR -bvZ -bvW -bws +gsQ +uvp +oMx +oTt bvE bvD bvE @@ -46248,20 +44699,20 @@ aZP aZP aZP bdw -biq -bdN -bhP -bdN -bdX +xLG +wUS +tDH +wUS +mFz bgx tFA -biq -bdN -bdN -bdN -bhP -bhP -bdX +xLG +wUS +wUS +wUS +tDH +tDH +mFz wSb wSb tFA @@ -46298,7 +44749,7 @@ naw bvE bvE bvD -bvD +mpU bvD bvE bvE @@ -46423,20 +44874,20 @@ aZP aZP aZK aXW -bgB +bUQ bhf bhf bhf -biQ +iQb bjR bkh -bkp +hsq bhf bhf bhf bhf bhf -bdV +mtq tFA wSb tcN @@ -46528,9 +44979,9 @@ aac aac aac aac -aml -amo -amU +sNM +aCp +uHQ ami amj amj @@ -46598,20 +45049,20 @@ aZP aZK bbj rYa -bgF +fWR bhh bhR -biv -biR +jAW +iMd bjS bkh -bkq -biR +voK +iMd biw tHv bhS bhf -bdV +mtq tFA wSb wSb @@ -46705,7 +45156,7 @@ cmo cmo cmo cmo -anb +kGp amj amj amj @@ -46732,8 +45183,8 @@ nZR nZR nZR aac -aVp -aKf +eAz +nqS aZK aZK aZP @@ -46773,7 +45224,7 @@ aZP aZK aZK qAU -bgF +fWR bhf bhS mDF @@ -46786,7 +45237,7 @@ biw bjd bhS bhf -bdV +mtq tFA wSb tFA @@ -46880,7 +45331,7 @@ utX qFH qWC cmo -anb +kGp aoA amj ami @@ -46908,7 +45359,7 @@ bZY ayx azV iLJ -aKk +fIT bbj bbj aZP @@ -46948,7 +45399,7 @@ aZP aZK bfa qAU -bgF +fWR bhf bhS bix @@ -46961,7 +45412,7 @@ bjd bkh bjd bhh -bdV +mtq tFA wSb tFA @@ -47083,7 +45534,7 @@ awS oVA oVA iLJ -aKk +fIT bbj bbj aZK @@ -47136,7 +45587,7 @@ eMZ unE fQo dOO -boG +hxj bmE blJ blJ @@ -47230,7 +45681,7 @@ uGH juY uGH cmo -anN +fvQ aoA amj ami @@ -47258,7 +45709,7 @@ awT oVA oVA iLJ -aKk +fIT bdA bbj aKV @@ -47311,7 +45762,7 @@ qTV qKx ibE sbW -boG +hxj blJ blJ tQg @@ -47405,7 +45856,7 @@ uGH uGH dTN cmo -anb +kGp amj iPw ami @@ -47425,15 +45876,15 @@ uyf uyf iJq vLn -asl -atz +jPC +haC ukx cuP foN iLJ iLJ iLJ -aKk +fIT bgh bbj aZK @@ -47486,7 +45937,7 @@ ajl opg xJb dOO -boH +fbq blJ blJ bmp @@ -47580,7 +46031,7 @@ vvV uNi wYx cmo -anb +kGp ami ami amj @@ -47601,14 +46052,14 @@ bRw run ark asm -bTb +wIy ukx cuP foN iLJ -aIz -aJp -aKl +fyZ +ozT +cBs iws bed bbj @@ -47624,7 +46075,7 @@ aac aac aac aac -aUn +bTs bCA cqQ chX @@ -47755,7 +46206,7 @@ wYx tmw uNi cmo -anb +kGp aoB ami amj @@ -47776,12 +46227,12 @@ qSH aql ark bXi -oLz +sYU ukx foN foN iLJ -baT +ipH bfa bbj bbj @@ -47799,7 +46250,7 @@ aac aac aac bgh -aUn +bTs cqr cqQ chX @@ -47930,7 +46381,7 @@ wYx dTN wYx cmo -anb +kGp amj amj arl @@ -47951,12 +46402,12 @@ sDs uGx ark bXi -bTb +wIy ukx foN -awW -ayA -baU +lEJ +wng +aUO aJV aZK bbj @@ -47974,7 +46425,7 @@ rZF aac bgh bdA -aUn +bTs cqr aVZ chX @@ -48126,7 +46577,7 @@ aps xQb udO bXi -oLz +sYU ukx foN aHu @@ -48149,7 +46600,7 @@ fTa bbj aTi tWf -aUx +gpl cqr cqQ crp @@ -48186,7 +46637,7 @@ aac aac aac aac -boT +skM bmp blJ blJ @@ -48301,7 +46752,7 @@ sDs aqo arn bXi -bTb +wIy uaQ iPd aHj @@ -48361,7 +46812,7 @@ aac bfd bhT bhT -boG +hxj bmp bpB blJ @@ -48476,7 +46927,7 @@ apu aqo arn bXi -oLz +sYU ukx foN aHu @@ -48513,7 +46964,7 @@ bAO cqQ cqQ bNh -aWe +xXj aZP aZP aZK @@ -48535,13 +46986,13 @@ aac fSr bfd bfc -bnP -bpa +xKt +gAt blJ blJ blJ bmp -bsu +tKA aac aac aac @@ -48651,12 +47102,12 @@ bTa aqp oKV asn -bTb +wIy bYK foN -bYg -caI -aWd +hMQ +nrM +vsT aZP aZP aZP @@ -48674,7 +47125,7 @@ aZP aZP aZP aXW -xHW +feA cqr aVZ fMr @@ -48688,7 +47139,7 @@ aac bcN bcN bNi -baT +ipH aZP aZP aZK @@ -48716,7 +47167,7 @@ bpA bpA bqE bmp -bsN +cwA wDq xTw fOX @@ -48818,20 +47269,20 @@ aac aac aac bGo -alM -amv -bUx -bVc -bUx -bVc -bUx -bVc -atA +xXf +rEx +xAO +sWz +xAO +sWz +xAO +sWz +myt urM foN foN iLJ -aSL +mRI aJW aZK bbj @@ -48849,7 +47300,7 @@ aZP aZP aZP bdw -aUz +aYs bag bcN bcN @@ -48860,10 +47311,10 @@ aac aac aac aac -mPh -mPh -mPh -baU +onF +onF +onF +aUO aZP aZK bgh @@ -48885,13 +47336,13 @@ bfc bfc bfc bfc -bnQ -boX +mLo +qcM blJ blJ tAs bmE -bsN +cwA fiD uul asd @@ -49006,10 +47457,10 @@ ukx cuP foN iLJ -aIG -aVp -aKs -aRR +ihE +eAz +hEB +lYR aac aac aac @@ -49018,19 +47469,19 @@ bbj vYf bbj aac -aRy -aRy -aRR -aSK +hsQ +hsQ +lYR +qnH aZP bdw -aUA -mPh -aWa -fIq -fIq -fIq -aYh +izx +onF +qSc +rqH +rqH +rqH +oaW bgh aac aac @@ -49061,12 +47512,12 @@ bfc bfc bfc bhT -boG +hxj blJ blJ tAs bmE -bsN +cwA fiD gAv lbh @@ -49196,7 +47647,7 @@ aac gZP iLJ iLJ -aSL +mRI aZP aIL bcB @@ -49236,12 +47687,12 @@ bfc bfc bhT bhT -boG +hxj blJ bmp fGc bmp -bsN +cwA fiD tWJ lbh @@ -49411,12 +47862,12 @@ bfc bhT aac aac -bpa +gAt blJ bmp vXt bmp -bsN +cwA fiD lbh lbh @@ -49571,7 +48022,7 @@ aac jZF iLJ iLJ -bfe +oMX bgJ bfd xdr @@ -49591,7 +48042,7 @@ blJ bmp gOi bmD -bsN +cwA fiD lbh lbh @@ -49745,8 +48196,8 @@ qsZ cuP fkw iLJ -gIL -bff +nyP +vgq bgJ bfd xhM @@ -49766,7 +48217,7 @@ blJ blJ tAs bmE -bsN +cwA svP fhW lbh @@ -49899,18 +48350,18 @@ iLJ aac aac aac -aUC -aVp -aWd +nDt +eAz +vsT aZP bdw bed aZP aZK aZP -aYi -aZi -aRR +set +iaa +lYR aac aac aDd @@ -49941,8 +48392,8 @@ blJ blJ mQD tQg -brW -bsn +lDF +bFt wni lbh asd @@ -50076,14 +48527,14 @@ aUE jZF iLJ iLJ -aSL +mRI aZK bdw aZP aZP aZP aZP -aUz +aYs iLJ iLJ aac @@ -50117,7 +48568,7 @@ blJ mQD blJ tQg -bsN +cwA wni lbh asd @@ -50251,14 +48702,14 @@ cfY cfY foN iLJ -aWe +xXj bed bdw aZP -aYi -aRR -aRR -aZe +set +lYR +lYR +jkb iLJ qmW aac @@ -50292,7 +48743,7 @@ bmp mQD blJ blJ -bsM +hAw wPI lbh asd @@ -50309,9 +48760,9 @@ xoE mms fuZ qXY -rUQ +ezZ xrx -wWK +uGp mms mms pwn @@ -50426,11 +48877,11 @@ aUF cuP foN iLJ -aSL +mRI aZP bdw aZP -aYj +pFd gZP iLJ bxI @@ -50445,8 +48896,8 @@ cmZ cuP fxM iLJ -miL -bfh +heQ +xPl bfc bfc bfc @@ -50467,8 +48918,8 @@ bmp mQD blJ blJ -brW -tSi +lDF +sSM lbh asd jIz @@ -50480,16 +48931,16 @@ vrH tOA vgb myk -pbF +rWB efR efR -lDz -bKT +uyS +utx gnG -pDY -pbF +xcZ +rWB efR -eGq +ngc hYc aac aac @@ -50601,11 +49052,11 @@ ukx aWs cRw xAp -bcX +owo bfu bkJ bfu -boJ +tdy iLJ foN fxM @@ -50621,10 +49072,10 @@ cuP frf iNf iLJ -bfi -bgi -biE -bfh +vvd +hUp +uUT +xPl bfd bfc bfd @@ -50655,16 +49106,16 @@ mBb vlG alu vxd -pJz +lty erq erq -hkn +jae vlG vlG gfd -pJz +lty erq -pZe +aLD hYc aac aac @@ -50799,7 +49250,7 @@ iLJ iLJ iLJ gZP -bhk +pkE bfd bfc bfc @@ -50830,16 +49281,16 @@ tjL tRC uCI vxd -ulL +ykM xLH xLH -pje -lRT +qVY +jPs gnG -ryf -ulL +pnE +ykM xLH -gFH +dGW hYc aac aac @@ -50974,7 +49425,7 @@ iPd iPd iPd tYB -bhr +bfW bkI bfd bfc @@ -50992,8 +49443,8 @@ blJ blJ blJ blJ -bsu -vnV +tKA +tMC lbh asd doO @@ -51009,9 +49460,9 @@ hYc hYc hYc hYc -dFU +dOT bYG -dtt +rzY hYc hYc hYc @@ -51149,12 +49600,12 @@ cuP cuP foN uaC -bhs -bgi -biE -biE -bkb -bfh +snR +hUp +uUT +uUT +cuT +xPl bkF bkL blm @@ -51167,7 +49618,7 @@ bmp blJ blJ blJ -bsM +hAw vUp lbh asd @@ -51342,7 +49793,7 @@ bnu blJ blJ blJ -bsN +cwA wni lbh asd @@ -51456,10 +49907,10 @@ mrG avK foN ccc -aAe -tsX -tsX -aDY +uER +omK +omK +hci ccc cuP cuP @@ -51487,10 +49938,10 @@ bxJ cuP cuP cva -bOj -bSD -ccH -cjg +eRA +gSA +sXL +qvk bNR cuY fAb @@ -51517,7 +49968,7 @@ bqq bmE blJ bmp -bsN +cwA wPI xje gRK @@ -51631,10 +50082,10 @@ gLF gLF cuP cuP -aAf +gil oVA mHo -aDZ +iXp cuP pvz oKo @@ -51649,8 +50100,8 @@ blb blb bfv blb -cxa -bao +aYw +iqY blb bfv blb @@ -51659,13 +50110,13 @@ blb blb blb vlm -hmh -riS +mGA +gls mKv itw bSE miR -cjG +cbH fBC cuZ cuP @@ -51692,9 +50143,9 @@ bmE aIs brk tQg -bsr -bsX -btg +sgO +ceJ +mwE aac aac aac @@ -51806,10 +50257,10 @@ aac jEO tGR cuP -aAf +gil mHo mHo -aDZ +iXp cuP cuP oKo @@ -51819,28 +50270,28 @@ aLH aIV aIV aPz -aQP +lJK aRW aTp aUK blb -aYB -bar +nFd +pRd blb bfw bhV bkO -boL +agj brB blb bJV -exi -mrv +qUL +rUn bJV vmI oOB nUX -cjG +cbH fBC cuP fBh @@ -51981,10 +50432,10 @@ aac aac cuP ccc -aAg -bZL -bZL -aEa +pil +pUY +pUY +uab ccc cuP oKo @@ -51992,30 +50443,30 @@ aIV aUV aUV aUV -aOb +xbt blb -aQP +lJK bfx bfx bfx blb -aYB -pnn +nFd +rrM blb bfx bfx bfx -viU -brD +hhH +sle blb bxM -bAT -bCq +oFc +xXX bJW vmI bSI nUX -cjH +wKI fBC cva fBC @@ -52031,7 +50482,7 @@ qTD nZR pEY foN -gEo +qKk aac bmy bmp @@ -52167,15 +50618,15 @@ aIV aUV aUV aUV -aOc +fdL blb brB agf bfy bfy bda -aYB -bar +nFd +pRd bda bfy bfy @@ -52184,16 +50635,16 @@ boN bsk vlm bxN -bAT -bCq +oFc +xXX bJX vlm foN nUX -cjI -cnb -cvb -fCE +jVT +mjD +ise +eKq cuP cuP cuP @@ -52206,7 +50657,7 @@ nZR nZR eqS foN -gEo +qKk bmA bpw bmp @@ -52342,15 +50793,15 @@ aIW aKp aJb aMQ -aOc +fdL oKo afH oKo blb bbq blb -cxa -bat +aYw +lfC blb aac aac @@ -52359,10 +50810,10 @@ boO bsl buU bxO -bAT -bCq -vXc -skl +oFc +xXX +mCx +wSf foN iLJ oHN @@ -52381,7 +50832,7 @@ mEL iLJ iLJ foN -gEo +qKk bmA bmA bnx @@ -52513,19 +50964,19 @@ cuP cuP cuP xvy -aIX +iQB aIV aIV aMW -aOc +fdL aPB aQQ oKo aTs aUM aWE -aYD -bau +rcK +sBe bdb bfz aTz @@ -52534,10 +50985,10 @@ boP bsq buV bxP -bAT -bCq -bKa -wim +oFc +xXX +hwo +bOE foN foN foN @@ -52556,7 +51007,7 @@ mEL foN foN foN -gEo +qKk bmA bmA bpf @@ -52692,15 +51143,15 @@ aUS bhZ dgB aMW -aOd +vYk aPC aQW oKo aTt aUN aUN -rqr -baV +aUN +dlZ aUN aUN aTy @@ -52709,8 +51160,8 @@ boQ vtz vlm bxT -dZp -vXc +uwy +mCx rUn vlm vlm @@ -52731,7 +51182,7 @@ pRj vtM pRj pRj -gEo +qKk bmA bmB bmp @@ -52858,8 +51309,8 @@ axc ayE aAh aHv -aCU -aCU +skT +skT aHv aHv aHt @@ -52867,15 +51318,15 @@ aIV aIV dgB aMW -aOd +vYk aPD aRb oKo aTt aUN aWF -aWH -baN +fma +rZs bdd aUN aTy @@ -52884,8 +51335,8 @@ vlm bst vlm kHg -bUv -evI +hof +bTF mCx aNa vlm @@ -52906,7 +51357,7 @@ jWi bdU psv ybN -aGf +tVd bmB bmD bmp @@ -53033,34 +51484,34 @@ axd dgB dgB roI -gYn -gYn -gYn -aGm -aHr -vMM -gYn -dBO -hvz -aOe -aPE -aPE -aRZ -rqr -rqr -dBO -aYB -bar -bsD -bCq -bib -cvl -bsv -bsv -bsv -bsv -bBB -evI +dgB +dgB +dgB +nxC +fKW +aUV +dgB +aIV +aMX +xBs +jPA +jPA +dWH +aUN +aUN +aWG +nFd +pRd +xNE +aUN +nBB +dMg +lHk +lHk +lHk +lHk +ueA +bTF dzG mzC vlm @@ -53081,7 +51532,7 @@ aot kuB uJY ybN -blp +oLp blJ bmE bnA @@ -53208,34 +51659,34 @@ haN ayF ouB aBM -cAw -qVb -qVb -aGn -aHs -gDS -qVb -aWH -aMY -aOf -aPF -aPF -aSb -uTK -uTK -aWH -aYE -baQ -bCt -bfD -bii -bkY -bsw -nOE -bsw -qzv -rZD -evI +sPP +ouB +ouB +ehu +dJW +aJb +ouB +aLO +heL +bVG +qQR +qQR +rFN +gJb +gJb +fma +rmT +fyd +fma +gJb +cwr +woo +nYA +pnD +nYA +rJX +nYH +bTF bTF bGr vlm @@ -53256,7 +51707,7 @@ adS rSE ant ybN -bkU +swK bpo bmF bnB @@ -53268,10 +51719,10 @@ bnD tQg gPL eFA -vaW -rAv -rAv -xes +exj +iOF +iOF +hrF gBj bul jBc @@ -53383,8 +51834,8 @@ axe wsj qJi dgB -gNQ -gYn +aMZ +dgB aEY aGp aHt @@ -53392,15 +51843,15 @@ aIV aIV dgB aMW -aOd +vYk aPG aQY oKo axm aUN aWG -dBO -baR +aWG +owy bdg ctl blc @@ -53409,14 +51860,14 @@ blb bsx bTF bye -qRF -bsv -bsv -bsv -bsv -wwO -bxV -cne +ePE +lHk +lHk +lHk +lHk +kTu +iam +jNa neL aDe neL @@ -53431,7 +51882,7 @@ aqn vvR axu ybN -bkU +swK blJ bmG bnC @@ -53440,13 +51891,13 @@ bpo blJ blJ blJ -brm +xSq aac aac aac bth xPT -tUZ +fGs jBc jBc vxc @@ -53558,8 +52009,8 @@ aHv oWQ aAj orc -fLc -gYn +aAt +dgB aOa aJd aHv @@ -53567,15 +52018,15 @@ oKo bhZ dgB aMZ -aOd +vYk aPC aQR aac aTy aUN aUN -rqr -baS +aUN +gto aUN npf blb @@ -53584,14 +52035,14 @@ boU bsy buY byv -ggf -bsw -bsw -bsw -bsw -bsw -bxX -bBT +wRE +nYA +nYA +nYA +nYA +nYA +pzX +mJu bTF cdG bTF @@ -53606,8 +52057,8 @@ hfP pRj vPi vPi -bkX -blr +fwT +loC bmH bnD boc @@ -53621,7 +52072,7 @@ aac aac bti laN -tUZ +fGs vxc bum aac @@ -53733,8 +52184,8 @@ axf dgB aAk aBO -fLc -ajW +aAt +oWQ aUV aGr dCb @@ -53742,15 +52193,15 @@ oKo aKx dgB aMZ -aOd +vYk aPC aQZ aac aTz bfz aYw -rqr -baV +aUN +dlZ vFS bil blb @@ -53765,8 +52216,8 @@ bTF bTF bTF cdG -cjU -cnf +dVb +qWw cvf fWs cvf @@ -53777,12 +52228,12 @@ ukx ras cuP xpK -xuE -qTk +pWR +dFV aac aac aac -blu +qow bmI bnC boi @@ -53908,8 +52359,8 @@ axg ayH aUV bXq -fLc -gYn +aAt +dgB aUV uWG dCb @@ -53917,15 +52368,15 @@ oKo aLP dgB aMX -aOd +vYk aPC aRa aac aac aUS aWK -rqr -baV +aUN +dlZ blb blb blb @@ -53940,8 +52391,8 @@ ryK bOx ryK bTF -cjU -bBT +dVb +mJu bTF cdG bTF @@ -53952,12 +52403,12 @@ uRy xKs cuP hmf -wsh -iQS +led +xzq xnZ oxE aac -blv +wnC bmJ bnC bok @@ -54083,8 +52534,8 @@ axg ayI aAm aBQ -aCV -jyw +hbo +bXq aUV vBs dCb @@ -54092,15 +52543,15 @@ oKo aLQ dgB aMX -aOd +vYk hHO aQQ aSc aTA aUT anc -qVb -bbc +aWL +ufY aWL aWL bsy @@ -54115,8 +52566,8 @@ ryK ryK ryK bTF -nof -cng +gHA +ufK cvg fXV jkc @@ -54127,12 +52578,12 @@ uRy xKD cuP wzZ -wsh -iQS +led +xzq foN tmi sRz -blx +rMX bmI bnC bol @@ -54258,8 +52709,8 @@ oKo tuV aAn aBR -aCW -dBO +nXd +aIV aFb oKo oKo @@ -54267,15 +52718,15 @@ oKo oKo oKo aFf -aOg +jLH aPD aRb aSd aTB oKo aoP -mlS -bbd +pAS +mzH bfy bfI aac @@ -54290,8 +52741,8 @@ bKC bOz vlm cdT -cjU -mcv +dVb +oRH che vlm vlm @@ -54302,12 +52753,12 @@ uTQ xOs cuP wzZ -wsh -iQS +led +xzq cRw cuP sRz -blz +sOb bmK bnB boo @@ -54433,8 +52884,8 @@ oKo ayK aAo aBS -gNQ -dBO +aMZ +aIV aUV aGr dCb @@ -54442,15 +52893,15 @@ oKo aKy aLR aMX -aOh -aPH -aPH -aPH -aPH +ohY +kUU +kUU +kUU +kUU aUU bfy -mlS -bbd +pAS +mzH bfy bfJ aac @@ -54465,24 +52916,24 @@ bKD bCf cyH buY -cjV -cni -cvl -evI -evI -skl +ltw +cII +dMg +bTF +bTF +wSf oqJ xJD ukx xTZ cuP wzZ -wsh -iQS +led +xzq jVD ras vhl -blB +qXa bmL bnF boq @@ -54599,17 +53050,17 @@ awJ ayw ayw ayw -kyT -jyw -gYn -gYn -jyw -axi -ayL -aAp -ajW -gNQ -dBO +tab +bXq +dgB +dgB +bXq +tBc +sCl +fsI +oWQ +aMZ +aIV aUV uWG dCb @@ -54624,8 +53075,8 @@ aJb aTC aUU biH -mlS -bbd +blN +bsK bdi cik cik @@ -54640,24 +53091,24 @@ bKL bOA vlm bTF -nof -cng -bkY -fZD -fZD -bkY +gHA +ufK +woo +buY +buY +woo hQq qYm vgW cuP cuP vId -oiV -vCl +dvV +fpQ qMQ euN iLJ -blL +hIl bmM bmM blJ @@ -54774,17 +53225,17 @@ ayw ayw ayw awJ -kyT -jyw -gYn -gYn -jyw -ufH -dBO -ygB -qVb -kMW -dBO +tab +bXq +dgB +dgB +bXq +oKa +aIV +cTL +ouB +qtq +aIV aUV vBs dCb @@ -54799,8 +53250,8 @@ aSe aMZ aUU biH -mlS -bbd +blN +bsK bdi bfV biD @@ -54815,8 +53266,8 @@ cjN vlm bTD kaP -cjU -cnh +dVb +hnX vlm mKv mKv @@ -54831,8 +53282,8 @@ tsz gha foN foN -eRk -blE +rvR +rOr blJ blJ bpU @@ -54950,16 +53401,16 @@ ayw awJ awJ oKo -asq -atE -atE -avR +hcu +irA +irA +kXj aNu rpp aMZ dgB -gYn -dBO +dgB +aIV aFb aJd oKo @@ -54974,8 +53425,8 @@ oKo aTD oKo aWO -lOB -bbf +frL +cIz bdi bfM biH @@ -54990,8 +53441,8 @@ bKM msG bTE bTF -cjU -bBT +dVb +mJu vlm jkf jkf @@ -55133,10 +53584,10 @@ axj aIV aMW aRb -gOe -gOe +aRb +aRb aFc -aKr +nYL aUV aUV aUV @@ -55149,8 +53600,8 @@ aUV aMX bop biH -aYH -bbd +pdQ +bsK azd bfN biI @@ -55165,8 +53616,8 @@ bGO vlm bTE bTF -nof -cng +gHA +ufK cyH gbS hcF @@ -55307,11 +53758,11 @@ avT aIV bXq aAs -aBU -aCY -aCY -aFd -aGu +xKA +tWO +tWO +bIN +rxB dgB dgB dgB @@ -55324,8 +53775,8 @@ dgB aMZ dgB biH -mlS -bbd +blN +bsK biH bfV biK @@ -55340,8 +53791,8 @@ bGO rpA bTF bTF -cjU -bBT +dVb +mJu bTD vlm vlm @@ -55356,8 +53807,8 @@ dSV fYE hcg foN -uDU -blK +uPz +tup bmS blJ bow @@ -55482,25 +53933,25 @@ bXq axn bXq aAs -aKr -gYn -gYn -sCO -qVb -qVb -qVb -qVb -qVb -bWE -qVb -qVb -oKd -qVb -oKd -qVb -qVb -lOB -bbf +nYL +dgB +dgB +eZi +ouB +bbs +bbs +bbs +bbs +uBw +bbs +bbs +oJm +bbs +oJm +bbs +bbs +frL +cIz bdk cik blV @@ -55515,8 +53966,8 @@ vlm cdD bTG bTF -cjU -bBT +dVb +mJu cFj ggH jmH @@ -55527,12 +53978,12 @@ vlm mKv mKv vlm -aGd -aGe +jRJ +rgA foN iLJ iLJ -blL +hIl tQg bmp uiE @@ -55658,40 +54109,40 @@ aIV bXq aAt aBW -gYn -gYn -urL -aGw -gYn -aJf -aKC -kAY -qIV -aKC -kAY -aJf -aKC -mlS -mlS -mlS -mlS -bbd -lou -wim -bCp -bCp -bpE -bsD -bCp -bCp -cvA -hux -bCp -wim -bUp -evI -cjU -bBT +dgB +dgB +aFf +nvd +biH +sjW +jIV +aLS +maw +jIV +aLS +sjW +jIV +blN +blN +blN +blN +bsK +blN +bfP +bll +bll +oeu +mPX +bll +bll +vUy +uxw +wdr +bOE +bGr +bTF +dVb +mJu bTF bOE mCx @@ -55702,12 +54153,12 @@ vmI qzf pEo vmI -uzv -aNA +igy +nCR foN cuP kzc -blM +gZG bmU bnI tBn @@ -55833,56 +54284,56 @@ aLO avU aAu aBX -qVb -qVb -scM -aGx -aHD -aJl -aJl -aJl -aJl -aJl -aJl -aJl -aJl -aJl -aJl -aWQ -dBO -baR -mJq -bkY -utk -blR -bfD -bfD -bfD -bfD -bfD -bHp -bfD -bkY -fZD -fZD -cjV -bBT +ouB +ouB +cuE +oVH +xzP +ksk +ksk +ksk +ksk +ksk +ksk +ksk +ksk +ksk +ksk +wqN +bll +iSt +frL +qNi +cxr +mNE +jvU +jvU +jvU +jvU +qQx +rJJ +qQx +woo +buY +buY +ltw +mJu bTF bOE mCx vlm -ptr -riS +cqC +gls vlm jUo tRf vmI -ldp -riM +vgJ +hTM foN ras iLJ -blL +hIl bmV bmE lsz @@ -56008,10 +54459,10 @@ axp bXq bXq ufI -cEa -gYn -hvz -aGy +orc +dgB +aMX +jiH cik aVn aKD @@ -56023,31 +54474,31 @@ qRj aKD aTG wuE -aWR -dBO -iqy -lou -wim -crG -bCp -agm -bCp -bCp -bCp -bCp -bCp -bCp -wim -evI -evI -cjU -bBT +bbV +bll +aMc +blN +bfP +aMc +bll +ugT +bll +bll +bll +wdr +wdr +wdr +bOE +bTF +bTF +dVb +mJu bTF bOE ryK mxa -plC -qAd +dvq +ryK vmI vyl fBY @@ -56182,11 +54633,11 @@ avW axq bXq aAv -aKr -gYn -aHD -aFi -aGz +nYL +dgB +pjQ +ofW +pxj cik blN blN @@ -56198,9 +54649,9 @@ blN aOu blN taa -aWR -dBO -gNQ +bbV +bll +oSV bdp cik biT @@ -56215,14 +54666,14 @@ eSx eSx bUJ vlm -cjW -bBT +fLZ +mJu cKc bOE ryK nST -pkG -qAd +uLe +ryK vlm mow jam @@ -56357,11 +54808,11 @@ avX axr ayN aAw -aBY +jeh aEb -axt -hvz -aGx +qNu +aMX +oVH cik bll bll @@ -56373,9 +54824,9 @@ bll bll blN aUZ -aWR -dBO -gNQ +bbV +bll +oSV bdq cik biU @@ -56390,14 +54841,14 @@ bKO bOF bUK ceG -cjU -cnf +dVb +qWw bTF bOE ryK ryK -plC -qAd +dvq +ryK vnC tZV fBY @@ -56530,13 +54981,13 @@ ijo auF ijo aHv -oCc -oCc -fyU +ubj +ubj +qAq scp oKo -hvz -gYn +aMX +dgB bfM biH jxc @@ -56548,9 +54999,9 @@ biH bll aTH aVa -aWR -dBO -bbl +bbV +bll +qnl bvl cik biV @@ -56565,14 +55016,14 @@ bKP bKR cvf ceG -cjU -bBT +dVb +mJu bTF bTF mGA mGA -ptr -hmh +cqC +mGA vnC tZV vyl @@ -56710,8 +55161,8 @@ oKo oKo oKo aHv -hvz -vMM +aMX +aUV cik aJm aKG @@ -56723,9 +55174,9 @@ aRf aYO aTI aUY -aWR -rXk -baN +bbV +aYO +xjX bds bfS biV @@ -56740,14 +55191,14 @@ mxu bOG bOG ceY -cjV -bBT +ltw +mJu oWt bTF bTF bTF -bUv -evI +hof +bTF vlm xAF voe @@ -56885,8 +55336,8 @@ aCa dLT bXq aEc -fbd -hJg +ceI +cdZ cik aJo aOu @@ -56898,9 +55349,9 @@ aRf bll bsK aVc -aWR -dBO -gNQ +bbV +bll +oSV bdt cik biW @@ -56915,31 +55366,31 @@ bKR bKR cvf ceG -ckx -bBU -cOR -bGs -bGs -bGs -ppC -bGs -vnI -kbS -vCN -vCN -mfv -kzE -mqs -maP -mqs -mqs -mqs -mqs -mqs -mpm -quT -ljn -ljn +eIP +bXO +sch +mRe +mRe +mRe +xWQ +mRe +rId +woz +ewe +ewe +qWT +cyH +pjx +qIC +pjx +pjx +pjx +pjx +pjx +iVy +nfU +vtz +vtz eSx aac aac @@ -57060,8 +55511,8 @@ bXq bXq bXq oKo -fbd -aGC +ceI +abp cik tCI tCI @@ -57073,9 +55524,9 @@ aRg bll aTK aVa -aWR -dBO -baR +bbV +bll +iSt frL bfU biX @@ -57090,31 +55541,31 @@ bKS bOH bVF ceG -ckz -qxt -cnk -cnk -jAE -bBV -pOW -jAE -pfS -cSx -baq -cSx -xrW -ycy -hvj -bGd -xlP -xlP -eLQ -xlP -xlP -bGd -rLg -ljn -ljn +lgh +kXm +ehr +ehr +eZc +odl +hPv +eZc +voe +vyl +pYE +vyl +tZV +vlm +eEr +dSQ +lZO +lZO +xAf +lZO +lZO +dSQ +gjC +vtz +vtz eSx aac aac @@ -57235,8 +55686,8 @@ afU uqY bXq aUS -aFl -qVb +xYB +gFg bfU blS bbk @@ -57248,9 +55699,9 @@ aRf bll bsK aUY -aWR -dBO -gNQ +bbV +bll +oSV aLS bfV blN @@ -57270,8 +55721,8 @@ bCz cRB tVu bCz -vXc -pro +bzl +nDx vlm vlm eSx @@ -57288,8 +55739,8 @@ vlm vlm vlm vlm -hmh -riS +mGA +gls vlm vlm vlm @@ -57410,8 +55861,8 @@ oKo oKo ayS oKo -fbd -gYn +ceI +cfx cik aJr oSV @@ -57423,9 +55874,9 @@ aRf bll bsK aVd -aWR -dBO -gNQ +bbV +bll +oSV bdu bfV biZ @@ -57445,8 +55896,8 @@ cnw cfg bCz jEW -hmh -ptr +bWZ +ckG vlm vsd aBp @@ -57462,10 +55913,10 @@ xjH nsB vlm gbU -gOu -ljn -ljn -qeI +hkC +vtz +vtz +xLK fkK vlm aad @@ -57585,8 +56036,8 @@ aAz ccn cdZ ijo -aFl -aGw +xYB +wZj cik aJs aKK @@ -57598,9 +56049,9 @@ aRg bll aTL aVa -aWR -dBO -bbl +bbV +bll +qnl bdv cik bja @@ -57620,8 +56071,8 @@ cfg cfg bCz loP -vXc -dZp +bzl +ckH vlm vsZ ryK @@ -57637,10 +56088,10 @@ mCx rMP vlm gbU -hGd -ljn -ljn -vms +cxl +vtz +vtz +naL fkK vlm aad @@ -57760,9 +56211,9 @@ gAm gAm cdc cdW -fbd -aGx -cge +ceI +igf +jNE bsG oSV bll @@ -57773,9 +56224,9 @@ aRf bll bsK aVe -aWR -gYn -bbl +bbV +biH +qnl bdv aac bjb @@ -57795,8 +56246,8 @@ cnx cnx aac jJv -hmh -ptr +bWZ +ckG vlm vtz xlg @@ -57812,10 +56263,10 @@ mCx pSc vlm oiF -hGd -ljn -ljn -xnP +cxl +vtz +vtz +hnO vlm vlm aad @@ -57935,9 +56386,9 @@ gAm gAm cdd cdX -fbd -aGx -cgg +ceI +igf +fwq iQt oSV aMb @@ -57947,10 +56398,10 @@ aPR aRf bll bsK -aVf -aWS -gYn -iqy +mJB +fpK +biH +aMc aac aac cik @@ -57970,8 +56421,8 @@ bCz aac aac jLY -bzm -pvY +uII +lIM vlm vtz aBp @@ -57987,9 +56438,9 @@ mCx nsB vlm gbU -hGd -ljn -ljn +cxl +vtz +vtz wAj vlm mWF @@ -58110,9 +56561,9 @@ cdZ cdZ cdc cdW -fbd -aGx -cgg +ceI +igf +fwq aJu oSV bll @@ -58122,10 +56573,10 @@ aPR biH bll bsK -aVg -bWH -gYn -iqy +wfX +wqN +biH +aMc bdE bfX cik @@ -58145,8 +56596,8 @@ cnK cSr csQ csQ -hmh -ptr +bWZ +ckG rpA vtz ryK @@ -58162,9 +56613,9 @@ xjH nsB vlm gbU -hGd -ljn -ljn +cxl +vtz +vtz eFO vlm bjr @@ -58285,9 +56736,9 @@ cco cco cco ijo -ceK -aGx -cgg +gQF +igf +fwq aJv aKL bbk @@ -58298,9 +56749,9 @@ bbs blS aTM aVj -aWR -dBO -iqy +bbV +bll +aMc bfV xaR cik @@ -58320,8 +56771,8 @@ bvB cUi csQ csQ -vXc -dZp +bzl +ckH aac vvB xlg @@ -58338,13 +56789,13 @@ eSx eSx wdI npW -ljn -ljn +vtz +vtz vBV vlm bjr tiU -dpB +sYe bPF bPF aad @@ -58460,9 +56911,9 @@ aAB aCb cfx cfx -fbd -aGx -cge +ceI +igf +jNE bsG biH aMc @@ -58473,9 +56924,9 @@ biH bll aTN wdf -aWR -dBO -iqy +bbV +bll +aMc bfV bll bjc @@ -58495,8 +56946,8 @@ bWZ cUT gpO csQ -hmh -ptr +bWZ +ckG aac aac eSx @@ -58513,13 +56964,13 @@ aiJ iEU iEU vlm -hmh -riS +mGA +gls vlm vlm bjr tiU -rEr +wjq xjO jmx bPF @@ -58619,24 +57070,24 @@ ayw aAR aAR bTl -mWA -hJg -hJg -wjF -oJk -mtm -oJk -asE -auK -oJk -cad -ayW -oJk -asE -oJk -oJk -ceL -gYn +wto +cdZ +cdZ +rMY +cdY +qsz +cdY +uau +fVX +cdY +czT +wnZ +cdY +uau +cdY +cdY +bIh +cfx cik cgT cik @@ -58647,10 +57098,10 @@ qBv bll bll qVc -gAx -pug -aWH -aYR +hjA +qtc +blS +eco cik bll bje @@ -58670,8 +57121,8 @@ bvz cWs bzl bzl -vXc -dZp +bzl +ckH rzx bvw hHZ @@ -58694,7 +57145,7 @@ ace bjr bjr tiU -rEr +wjq hJv dlL bPF @@ -58794,24 +57245,24 @@ ayw awJ aAR bTl -mWA -hJg -hJg -hJg -hJg -hJg -hJg -atL -fbd -hJg -fbd -mWA -hJg -hJg -hJg -hJg -fbd -gYn +wto +cdZ +cdZ +cdZ +cdZ +cdZ +cdZ +xRA +ceI +cdZ +ceI +wto +cdZ +cdZ +cdZ +cdZ +ceI +cfx cik cgU aKN @@ -58822,10 +57273,10 @@ aOu bll bll blN -aVg -bWH -dBO -dBO +wfX +wqN +bll +bll bdI jBp bjf @@ -58845,8 +57296,8 @@ bvz csQ bzl bzl -vXc -pwz +bzl +yfx csQ bvz bvz @@ -58869,7 +57320,7 @@ bjr bjr bjr tiU -rEr +wjq bmv iji iwH @@ -58985,8 +57436,8 @@ cco cco cco ijo -aFl -aGw +xYB +wZj cik cgT cik @@ -58998,9 +57449,9 @@ bll aSk blN aVn -aWV -aYT -apJ +prQ +veh +eyU cik cik cik @@ -59020,8 +57471,8 @@ bzl cYx bzl kdK -vXc -dZp +bzl +ckH rzG bHP bzl @@ -59044,7 +57495,7 @@ bjr bjr bjr tiU -rEr +wjq bmv wZZ cIM @@ -59160,8 +57611,8 @@ aAC aCc dWu cea -fbd -gYn +ceI +cfx cik aJw aKN @@ -59174,29 +57625,29 @@ aSl agw cik bll -dBO -dBO -bdJ -bga -bjh -kOu -bpx -wQU -fil -bzm -wQU -wQU -bLk -kOu -bLk -kOu -cle -kOu -ddI -gqF -kes -mKA -pAM +bll +bll +nrx +dsA +gAO +btC +lYC +bVR +wmG +uII +bVR +bVR +jOc +btC +jOc +btC +vcr +btC +ufg +cqB +ioa +hLc +fcv rDl btC bCN @@ -59212,14 +57663,14 @@ brd iEU aad wij -dBG +tHb bjr bjr bjr bjr bjr tiU -rEr +wjq bmv wZZ iwH @@ -59335,8 +57786,8 @@ aAD aCd aDf cea -fbd -cfz +ceI +bKE cik cgT cik @@ -59349,29 +57800,29 @@ tCI tCI cik eFF -mlS -dBO -bdK -bga -crG -hFK -bpN -nOA -jNO -vXc -nOA -sjS -vXc -vXc -vXc -vXc -vXc -vXc -thD -vXc -vXc -vXc -vXc +blN +bll +nlT +dsA +wXe +csQ +nKg +bCK +bvz +bzl +bCK +bHN +bzl +bzl +bzl +bzl +bzl +bzl +bHP +bzl +bzl +bzl +bzl bHN bzl bzl @@ -59394,7 +57845,7 @@ bjr bjr bjr lwI -rEr +wjq bmv wZZ iwH @@ -59510,32 +57961,32 @@ cdY aCe aDg ijo -aFm -qVb -oJk -aWH -lOB -aMg -aJc -aOx -aNs -aNs -aNs -aTQ -aNs -aNs -aNs -qVb -bdY -bgb -bgg -hFK -bpN -yaC -jNO -vXc -nOA -vXc +bKF +gFg +cdY +blS +frL +kif +qqO +nJr +plh +plh +plh +peJ +plh +plh +plh +bbs +cBb +iDE +qhC +csQ +nKg +mYQ +bvz +bzl +bCK +bzl orL orL bWZ @@ -59568,8 +58019,8 @@ bjr bjr bjr tnM -mNG -gTa +lUv +dva bmv wZZ aad @@ -59685,32 +58136,32 @@ gAm gAm aAD cea -aFn -gYn -hJg -unh -mlS -aMh -aNt -aNt -aNt -aNt -aNt -aTT -aNt -aNt -aNt -gYn -beg -bCp -crG -hFK -bpN +jUG +cfx +cdZ +ugT +blN +otZ +nzU +nzU +nzU +nzU +nzU +uyG +nzU +nzU +nzU +biH +joL +eeS +wXe +csQ +nKg csQ cgc bzl -nOA -vXc +bCK +bzl orL bPq bzl @@ -59860,32 +58311,32 @@ aAF aCf dWu cea -fbd -gYn -hJg -jEt -jEt -jEt -mlS -mlS -aQb -aRm -aSm -mlS -mlS -mlS -bUb -gYn -beh -bgc -crG -hFK -bpO +ceI +cfx +cdZ +cik +cik +cik +blN +blN +icZ +vfg +pMO +blN +blN +blN +aTU +biH +dcv +asa +wXe +csQ +ycw csQ bvz bzl -maX -vXc +lqV +bzl bLo csE baX @@ -60003,8 +58454,8 @@ ahZ jrA age ahZ -aKt -tSl +gZI +uoB aac agR agR @@ -60012,7 +58463,7 @@ ahZ ahZ ahZ aac -ayt +rBp ays aAV aAR @@ -60035,9 +58486,9 @@ aAG aCg aAD ijo -aFo -aGD -aGB +gya +oZy +wqy ckK aKQ aMi @@ -60050,17 +58501,17 @@ ckK cjZ cjZ ckK -gYn -bem -bga -nOA +biH +uOX +dsA +bCK bCz bCz bCz bvQ bzn -nOA -vXc +bCK +bzl orL csF baY @@ -60093,8 +58544,8 @@ aad bjr bjr tnM -jDO -jOV +dxe +vol wZZ wZZ rpX @@ -60177,17 +58628,17 @@ agR aac kXx akl -aKt -sxr +gZI +emu aaI aac agR agR agR ahZ -ato -awZ -ayu +kHG +qPA +rTj ays ays aAS @@ -60210,9 +58661,9 @@ azb azb aDi ijo -aFp -aGD -aHJ +lso +oZy +grF ckK aKR aMj @@ -60227,15 +58678,15 @@ aXa aac aac aac -bge -nOA +dDM +bCK bjl bpP bCz bwc bzo -nOA -thD +bCK +bHP orL csF baZ @@ -60262,7 +58713,7 @@ xFc bmv bmv wZZ -bZT +vHL rkI bjr bjr @@ -60274,7 +58725,7 @@ wij wZZ rpX tiU -hwD +iUj vPQ aad aad @@ -60352,15 +58803,15 @@ aac aac kYl akz -aTR +sHN aaI aac aac aac aac aac -ato -auZ +kHG +rts ali aiZ aiZ @@ -60385,9 +58836,9 @@ cbv bZD cbv bZD -aFq -qVb -aHK +rxj +gFg +nbt aJA aKS aMk @@ -60402,15 +58853,15 @@ aXc aYW bbv aac -bCp -nOA +eeS +bCK bLo bqe bCz bvz bzl -nOA -vXc +bCK +bzl orL csF fch @@ -60437,7 +58888,7 @@ bmv bmv bmv fli -bZT +vHL tQS cxS cxS @@ -60449,7 +58900,7 @@ wZZ pri rpX tiU -hwD +iUj vPQ aad aad @@ -60534,7 +58985,7 @@ aac aac aac aac -atB +raD agR age aka @@ -60560,9 +59011,9 @@ bZD cbv bZD aEf -fbd -cfB -hJg +ceI +prA +cdZ ckK cji aMl @@ -60577,15 +59028,15 @@ aXd aZb bbw aac -bCp -nOA +eeS +bCK bLo bLo bmo bvz bzl -nOA -bHQ +bCK +fGG orL csF gaA @@ -60612,9 +59063,9 @@ bmv bmv fuX bmv -tkq -vwV -vwV +njn +nBx +nBx aad aad aad @@ -60624,7 +59075,7 @@ wZZ wZZ rpX tiU -hwD +iUj vPQ lPF aad @@ -60735,9 +59186,9 @@ ijo aCh aCh ijo -aFr -aGE -aHL +fMB +gPI +hVK aJB aKT aMm @@ -60752,15 +59203,15 @@ aXe aZh bbx ckK -bCp -nOA +eeS +bCK bjl bpX bCz bvz bzp -nOA -bHW +bCK +bAQ orL csF bba @@ -60799,7 +59250,7 @@ wij wZZ rpX tiU -hwD +iUj vPQ vPQ vPQ @@ -60896,23 +59347,23 @@ ayw ayw ayw ayw -aoI -asL -bwf -bWN -asJ -atP -auP -awi -axE -asL -aAJ -asL -asL -aEg -aFs -aGF -gYn +iJG +enJ +qve +cjn +vPG +gXu +rRC +pfo +itQ +enJ +lPn +enJ +enJ +mmi +eyg +dXH +aHP ckK aKU aMn @@ -60927,15 +59378,15 @@ cpd aZp bby ckK -aPW -nOA +xRP +bCK bCz bCz bCz bCz nVs -nOA -bHW +bCK +bAQ orL csF gkt @@ -61071,30 +59522,30 @@ awJ ayw ayw ayw -bVr -aKP -aKP -bVr -asK -gYn -auQ -gYn -gYn -aze -gYn -aCi -gYn -gYn -aFt -aGG -aHM -aJC -cdh -cdh -cdh -ckf -aQd -clI +syh +chd +chd +syh +cZv +aHP +ewZ +aHP +aHP +ibn +aHP +cyM +aHP +aHP +ezd +wyv +vsx +oRl +aHP +aHP +aHP +jUZ +xZC +qza aac cnp fRX @@ -61102,15 +59553,15 @@ cpe aZq bbz ckK -bCp -nOA +eeS +bCK bmo agE oeQ bCz adh -nOA -vXc +bCK +bzl bLo csF bbe @@ -61225,7 +59676,7 @@ age agR ahZ aac -bxe +xEl aUD aUD aac @@ -61246,30 +59697,30 @@ awJ ayw aET ayw -bVs -aKP -aKP -bVs -dBO -atQ -aKP -aKP -aKP -slL -aKP -aKP -aDk -slL -aFu -dDr -aKP -ccp -awm -ccp -aNw -ccp -ccp -cdh +pVf +chd +chd +pVf +enJ +dxY +chd +chd +chd +cdj +chd +chd +kmz +cdj +qfy +rcX +chd +chd +uOJ +chd +ksj +chd +chd +aHP cmt cnr cok @@ -61277,15 +59728,15 @@ aXf aZr aVB ckK -bCp -nOA +eeS +bCK bCz oeQ bqb bCz nYM -nOA -bIb +bCK +ros orL bzl bzl @@ -61321,8 +59772,8 @@ wZZ rpX bjr kdm -kZL -eVc +vpF +vPN aad aad aad @@ -61400,7 +59851,7 @@ aac agR ahZ agR -acu +dOM acO aUD aac @@ -61414,37 +59865,37 @@ aac aac aac aac -ald -ald -bMF -bMF -bMF -ald +cdm +cdm +ulM +ulM +ulM +cdm anJ -bVX -apD -asL -aDE -asM -cdh -ccp -awj -axF -azf -auR -ccq -aDl -aEh -cXm -aGH -cgm -aJD -auR -aMo -aNx -aOy -ccp -cdh +cdm +wlH +enJ +cjn +enJ +aHP +chd +uYO +qpw +tNa +xSL +xvV +qTS +nap +ckN +nGk +jBG +aai +xSL +ffS +aJe +nXR +chd +aHP aSp cnr aVz @@ -61452,15 +59903,15 @@ aXg aZt bbB beq -bCt -cxx +iYM +crR bCz bST bqd bCz awX -nOA -vXc +bCK +bzl orL orL bWZ @@ -61495,8 +59946,8 @@ wZZ wZZ rpX tnM -reb -fHW +pLw +hDK vPQ vPQ rSl @@ -61575,10 +60026,10 @@ aac agR ahZ ahZ -aay +eQo aaI adl -adI +qsY aac aac ahZ @@ -61589,37 +60040,37 @@ aac aac aac aac -ald -ajV -akC -alk -alT -ald +cdm +qHk +raG +fMp +aai +cdm djW -bVX -aqE -apC -bWN -asN -ckf -ccp -awk -awk -awk -ckM -ccr -ccr -aEi -cXm -aGI -cgn -aJE -ckM -awk -ccr -aOA -ccp -cdh +cdm +uGb +gNV +cjn +uQi +jUZ +chd +sbA +sbA +sbA +ckN +cgY +cgY +sXE +ckN +jpP +lAk +htp +ckN +sbA +cgY +rAX +chd +aHP aSq cnr aVA @@ -61627,26 +60078,26 @@ aXh cnr bbC ber -crF -cxx +wGP +crR bCz bCz bCz bCz clx -nOA -exi -vXc -vXc -vXc -vXc -vXc -vXc -vXc -vXc -vXc -vXc -vXc +bCK +bIp +bzl +bzl +bzl +bzl +bzl +bzl +bzl +bzl +bzl +bzl +bzl bIp bzl bzl @@ -61750,10 +60201,10 @@ aac ahz ahz aiI -aay +eQo aaI aaI -adJ +gqV ahZ anS ahZ @@ -61763,38 +60214,38 @@ aac aac aac aac -ald -ald -ajX -bQU -bQU -acM -ald -ald -ald -bPf -bPf -bPf -asO -cdh -cHm -xuc -xuc -ccr -gYr -cgo -bZB -bZB -aFw -aGJ -lLu -cgW -cbz -ccr -ccr -ccr -aQe -cdh +cdm +cdm +qUH +enJ +enJ +qve +cdm +cdm +cdm +cjn +cjn +cjn +sit +aHP +fcP +lAk +lAk +cgY +qft +xwu +exl +exl +ser +icf +xwu +sFZ +ePb +cgY +cgY +cgY +pja +aHP ckK aTY aVB @@ -61802,26 +60253,26 @@ aXi aZu bbD ber -bCp -nOA -hFK -mem -hFK -bwk -bmk -bCY -bsY -bLA -kOu -kOu -kOu -clv -kOu -kOu -clv -kOu -kOu -kOu +eeS +bCK +csQ +niD +csQ +qxy +bzp +rSv +fWF +gem +btC +btC +btC +kYY +btC +btC +kYY +btC +btC +btC rTC btC btC @@ -61845,8 +60296,8 @@ bmv bmv rpX tnM -hGm -bIu +guB +vIp vPQ vPQ rSl @@ -61925,10 +60376,10 @@ agR agR aia aiK -aay +eQo aaI aaI -acc +tVB ahZ anS amm @@ -61938,38 +60389,38 @@ aac aac aac aac -ald -bPf -ajY -bQU -bQU -bQU -bPf -anK -aoJ -apE -bPf -bPf -asP -cdh -auU -ccr -ccr -caL -ckM -ccr -cfC -ccr -cXm -lkI -wUR -ccr -ckM -ccr -cfC -ccr -ccp -cdh +cdm +cjn +vjf +enJ +enJ +enJ +cjn +wpW +wkU +idv +cjn +cjn +idO +aHP +oUB +cgY +cgY +bjz +ckN +cgY +piA +cgY +ckN +piA +dEC +cgY +ckN +cgY +piA +cgY +chd +aHP ckK ckK cjZ @@ -61977,15 +60428,15 @@ cjZ cjZ cjZ bes -bCp -bCY -kOu -bpM -kOu -kOu -bzq -bDo -uls +eeS +rSv +btC +nnB +btC +btC +qVZ +wOg +bIq bIq bIq bYA @@ -61995,8 +60446,8 @@ cwn cwn bCz krm -ndC -bzm +gSP +uII sjp bzl bzl @@ -62021,10 +60472,10 @@ wZZ rpX bjr tNQ -ajf -uXY -uXY -amG +lRU +lnO +lnO +fIS vPQ vPQ wXm @@ -62099,11 +60550,11 @@ agR agR agR ahZ -aau -aaH +jfo +uyb aaI aaI -acc +tVB amw agR ahZ @@ -62113,54 +60564,54 @@ aac aac aac aac -ald -bPf -bkZ -bkZ -tIw -anL -anL -anL -pkA -bkZ -aqG -bPf -asL -cdh -auV -bZE -ccr -ccr -aAK -ccr -kXR -aEj -cXm -tfy -tfy -tfy -aKW -tfy -tfy -eYz -aKP -gYn -gYn -koH -col -col -col -col -crd -bCp -crG -hFK -sen -hFK -ctp -bUv -ctp -ctp +cdm +cjn +cgY +cgY +dud +exl +exl +exl +eSO +cgY +gyz +cjn +enJ +aHP +oIm +yfQ +cgY +cgY +uic +cgY +riQ +dEC +ckN +cgY +cgY +cgY +dZA +cgY +cgY +sbA +chd +aHP +aHP +vNW +fwD +fwD +fwD +fwD +vNW +eeS +wXe +csQ +uZs +csQ +mXu +eHM +mXu +mXu bLB bPt bPt @@ -62170,8 +60621,8 @@ cpi dvR kCf kzk -sNz -lTe +bsW +pGC pGC pGC pGC @@ -62199,7 +60650,7 @@ bjr nyB nyB rhJ -hwD +iUj vPQ vPQ vPQ @@ -62274,11 +60725,11 @@ agR agR ahZ ahZ -aay +eQo aaI aaI aaI -acc +tVB ahZ agR ahZ @@ -62288,47 +60739,47 @@ aac aac aac aac -ald -bPX -bQS -bQS -bQS -bQS -bQS -bkZ -oVZ -tfy -dBO -bVr -dBO -atR -aKP -awl -axG -azg -rfN -aCj -aDn -aEk -cXm -aGK -aHN -aJF -auX -aMp -aNy -aOG -aKP -aRo -gYn -oOS -pNL -pNL -pNL -pNL -crf -jNO -sNz +cdm +lEq +xBG +xBG +xBG +xBG +xBG +cgY +jsg +cgY +enJ +syh +enJ +xop +chd +dNd +nFE +jNs +uDl +rIC +ryh +dkp +ckN +uCe +fVE +qJM +hTr +eqN +vwn +tlm +chd +gjv +aHP +aUf +ifc +ifc +ifc +ifc +aUf +bvz +bsW csQ vOs csR @@ -62345,8 +60796,8 @@ cpY dvX kCf kAn -sNz -jNO +bsW +bvz ski vOi lJz @@ -62448,12 +60899,12 @@ aaW agR agR ahZ -aau -aaH +jfo +uyb aaI aaI -abw -byQ +tkX +okz aia ahZ amm @@ -62463,47 +60914,47 @@ aac aac aac aac -ald -ajx -bkZ -bkZ -bkZ -bkZ -bkZ -bkZ -xLd -pwQ -aqI -aSr -aWH -oJH -aKP -lWl -aKP -azi -aKP -cjl -aDo -aKP -cXm -lWl -lWl -lWl -aKP -lWl -cjl -lWl -aQf -aRq -gYn -oOS -pNL -pNL -pNL -pNL -crf -jNO -sNz +cdm +wHS +cgY +cgY +cgY +cgY +cgY +cgY +hqJ +exl +oNd +ceM +bIc +bBf +chd +uOJ +chd +owg +chd +pja +nso +chd +ckN +uOJ +uOJ +uOJ +chd +uOJ +pja +uOJ +vdv +xbf +aHP +aUf +ifc +ifc +ifc +ifc +aUf +bvz +bsW csQ vOs bLi @@ -62520,8 +60971,8 @@ bCz dzo bCz bCz -sNz -jNO +bsW +bvz vOs vOs vOs @@ -62623,11 +61074,11 @@ agR agR agR ahZ -aay +eQo aaI aaI aaI -acc +tVB ajc akH ahZ @@ -62638,47 +61089,47 @@ aac aac aac aac -ald -bPf -ajZ -akD -alm -anG -amM -bkZ -oVZ -apF -bPf -bPf -asR -tFS -aAL -aAL -axH -azj -aAL -aAL -aAL -aAL -aFx -qVb -qVb -qVb -qVb -qVb -tJR -qVb -aQi -qVb -aSr -lxZ -aVD -aVD -aVD -aVD -aUb -cYw -uyp +cdm +cjn +fov +vXd +ybw +cjn +woU +cgY +jsg +cBI +cjn +cjn +kvW +iPR +lRj +lRj +tZm +kFZ +lRj +lRj +lRj +lRj +kIl +lRj +lRj +lRj +lRj +lRj +kFZ +lRj +pjU +lRj +ceM +euD +nxN +nxN +nxN +nxN +euD +bvB +uny csQ vOs btG @@ -62695,8 +61146,8 @@ cqf dBe gXX kCf -nOA -jNO +bCK +bvz vOs aad aad @@ -62798,11 +61249,11 @@ agR agR agR ahZ -aaE -abq +iaL +xmN aaI aaI -acc +tVB aka afZ agR @@ -62813,23 +61264,23 @@ aac aac aac aac -ald -ajy -bkZ -bkZ -bkZ -bkZ -bkZ -bkZ -oVZ -tfy -aqJ -bPf -asS -ccp -ccp -ccp -ckM +cdm +cXx +cgY +cgY +cgY +cgY +cgY +cgY +jsg +cgY +cWv +cjn +cOe +chd +chd +chd +ckN cjn aAM aAM @@ -62852,9 +61303,9 @@ cpU cpU cpU cpU -hmh -ptr -bmb +bWZ +ckG +csQ vOs btI bwo @@ -62870,8 +61321,8 @@ bCK csQ haw kCf -nOA -jNO +bCK +bvz vOs aad aad @@ -62974,10 +61425,10 @@ agR agR agR amw -aay +eQo aaU aaI -acc +tVB ajh ahY agR @@ -62988,23 +61439,23 @@ aac aac aac aac -ald -bPY -bQS -bQS -bQS -bQS -bQS -bkZ -oVZ -tfy -aqK -bPf -asT -ccr -ccr -ccr -cam +cdm +hnF +xBG +xBG +xBG +xBG +xBG +cgY +jsg +cgY +xrs +cjn +cKk +cgY +cgY +cgY +jsg caM chd cdj @@ -63027,9 +61478,9 @@ piu aZw kCa cpU -jNO -sNz -bmb +bvz +bsW +csQ vOs bvL bHH @@ -63045,8 +61496,8 @@ crR cwn cwn vOs -njA -wch +qyp +cUi vOs aad wZZ @@ -63149,10 +61600,10 @@ agR agR agR agR -aay +eQo aaU aaI -acc +tVB ahZ apz agR @@ -63163,23 +61614,23 @@ aac aac aac aac -ald -ajy -bkZ -bkZ -bJz -bkZ -bkZ -bkZ -oVZ -cgn -aqJ -bPf -asU -ccr -ccr -bZG -axI +cdm +cXx +cgY +cgY +xjw +cgY +cgY +cgY +jsg +lAk +cWv +cjn +cfE +cgY +cgY +xjw +wly ceM aAO ceN @@ -63202,9 +61653,9 @@ aXk bbF bbF cpU -jNO -sNz -bmb +bvz +bsW +csQ vOs csT bzG @@ -63220,8 +61671,8 @@ crT dBV hgI btC -cll -jNO +eAf +bvz vOs mrM wZZ @@ -63324,10 +61775,10 @@ agR agR agR agR -aay +eQo aaU -abw -byQ +tkX +okz ahZ agR agR @@ -63338,17 +61789,17 @@ aac aac ali wvB -bPf -bPf -bmX -bmX -bPf -alW -alW -alW -oVZ -tfy -aqK +cjn +cjn +iaK +iaK +cjn +oFz +oFz +oFz +jsg +cgY +xrs cjn cjn chB @@ -63377,9 +61828,9 @@ nNR aZy bbG cpU -jNO -sNz -bmb +bvz +bsW +csQ vOs vOs vOs @@ -63395,8 +61846,8 @@ bvz bvz bvz bvz -jNO -jNO +bvz +bvz vOs wZZ bmv @@ -63418,9 +61869,9 @@ jWz jWz jWz kaw -grG +pLe rel -hPZ +wTv jWz rpX tnM @@ -63499,9 +61950,9 @@ agR agR ahZ agR -aay +eQo aaU -acc +tVB ajc akH tSb @@ -63513,17 +61964,17 @@ ahZ awb agR agR -aiM -pMU -bPZ -bPZ -bPZ -bPZ -bPZ -alW -oVZ -tfy -aqJ +iJG +tIV +vkG +vkG +vkG +vkG +vkG +oFz +jsg +cgY +cWv cjn eBb bYl @@ -63552,14 +62003,14 @@ cpU cpU cpU cpU -vXc -dZp -csi -rTf -bqh -bwq -bgz -csi +bzl +ckH +bzl +oUD +bPq +kLR +ckH +bzl bCz oeQ baA @@ -63570,9 +62021,9 @@ bvz bvz bvz bvz -jNO -jNO -skl +bvz +bvz +etQ bmv bmv bmv @@ -63674,9 +62125,9 @@ ahZ ahZ agS ahZ -aay +eQo aaU -acc +tVB aka aiZ akH @@ -63688,17 +62139,17 @@ agR ahZ amw ahZ -bVr -jyw -jyw -jyw -kRg -alX -alX -anM -aoL -cgn -jOp +syh +vkG +vkG +vkG +htf +qIi +qIi +vqV +xlF +lAk +eEc cjn bXC bYm @@ -63725,16 +62176,16 @@ eBz aHR aHR lZo -aVG -aUf -vXc -bgA -bzm -csu -bzm -bzm -pvY -bDA +mnW +rEL +bzl +akc +uII +iCd +uII +uII +lIM +qSS bCz bLH bQp @@ -63745,9 +62196,9 @@ csM dEX hni cvC -jNO -jNO -wim +bvz +bvz +bLo bmv xFc bmv @@ -63849,9 +62300,9 @@ ahZ ahZ ahZ ahZ -aay -byN -byQ +eQo +tsp +okz ajh aiZ afZ @@ -63863,17 +62314,17 @@ ahZ ahZ agR agR -bVs -jyw -bQT -avH -jyw -jyw -jyw -jEt -aoM -cgn -aqK +pVf +vkG +qtj +jBN +vkG +vkG +vkG +cjn +wcl +lAk +xrs cjn asV atS @@ -63900,16 +62351,16 @@ aVH aHR aHR aHR -hyh -aUf -vXc -vXc -bms -mko -vXc -vXc -bgA -csV +nSL +rEL +bzl +bzl +aDc +lWc +bzl +bzl +akc +uII bIr bLJ bQq @@ -63920,8 +62371,8 @@ vOs vOs vOs vOs -hmh -riS +bWZ +mes vOs bmv bmv @@ -64024,8 +62475,8 @@ ahZ ahZ ahZ ahZ -aay -byO +eQo +gjw akB alj ajh @@ -64038,17 +62489,17 @@ aiW akH agR agR -aiM -ajz -akb -akE -alo -bPZ -alo -bmX -oVZ -cgn -aqK +iJG +sTF +fRq +rHO +eZf +vkG +eZf +iaK +jsg +lAk +xrs arI asW atT @@ -64075,16 +62526,16 @@ cpU aVH aVH cpU -cdm -cdm -vXc -bjp -cdm -cdm -cdm -vXc -bjp -cdm +vOs +vOs +bzl +vHd +vOs +vOs +vOs +bzl +vHd +vOs vOs cwn cwn @@ -64199,8 +62650,8 @@ agR agH aiK agR -aay -acc +eQo +tVB akG alv age @@ -64213,17 +62664,17 @@ aac aac aac aac -ald -ald -ald -ald -alr -alo -amO -anP -oVZ -tfy -aqK +cdm +cdm +cdm +cdm +dyk +eZf +eHp +mGe +jsg +cgY +xrs cjn cdn atU @@ -64373,9 +62824,9 @@ ahZ amm ado ado -abO -acg -acv +uBv +nZu +qUq bAi bna amm @@ -64392,13 +62843,13 @@ aac aac aac alH -nJO -alo -amP -bPf -bVw -qHc -apI +vHP +eZf +vEX +cjn +tCk +cvm +cvm cjn asY atV @@ -64567,13 +63018,13 @@ aac aac aac alH -nJO -alo -amP -anR -oVZ -tfy -bQU +vHP +eZf +vEX +pbi +jsg +cgY +enJ amN cdn atW @@ -64742,13 +63193,13 @@ aac aac aac alH -nJO -alY -amP -anU -oVZ -tfy -bQU +vHP +gUR +vEX +vYa +jsg +cgY +enJ arJ asZ cdn @@ -64898,9 +63349,9 @@ ahZ amm ado ado -abR -ach -byP +shA +fwe +qBQ bAi bna amn @@ -64917,13 +63368,13 @@ aac aac aac alH -nJO -alo -amP -anR -oVZ -tfy -aqP +vHP +eZf +vEX +pbi +jsg +cgY +xUY bYU ata vCD @@ -64966,8 +63417,8 @@ rpX bjr bjr tiU -cti -btN +jhb +wKl aad aad srk @@ -65072,10 +63523,10 @@ apz agR ajc akH -aau -aaH -abw -byQ +jfo +uyb +tkX +okz ahZ alw ahZ @@ -65092,13 +63543,13 @@ aac aac aac alH -nJO -alo -amP -bPf -aoM -cgn -bQU +vHP +eZf +vEX +cjn +wcl +lAk +enJ cdn bZI bZI @@ -65141,7 +63592,7 @@ rpX bjr bjr kdm -cuc +tax cwq xkj aad @@ -65247,9 +63698,9 @@ age ajc aiZ afZ -aay +eQo aaI -acc +tVB ajc akH alR @@ -65267,13 +63718,13 @@ aac aac aac alH -amO -alo -amO -anV -oVZ -tfy -bQU +eHp +eZf +eHp +vwC +jsg +cgY +enJ bYU ata vCD @@ -65315,8 +63766,8 @@ wZZ rpX bjr tnM -reb -ctH +pLw +sEs xkj xkj xkj @@ -65422,9 +63873,9 @@ aiW aiZ aiZ afZ -aay +eQo aaI -byO +gjw ajh ahY agR @@ -65442,13 +63893,13 @@ aac aac aac alH -alo -aln -drS -anW -aoO -bWc -aqQ +eZf +htf +miQ +fEs +eKf +aMq +rhw bYU cdn cdn @@ -65597,9 +64048,9 @@ aac aac aiZ afZ -biF +xSs aaI -acc +tVB age agR ahZ @@ -65617,13 +64068,13 @@ aac aac aac bME -als -alZ -als -anV -tfy -apK -aqQ +qxF +dbd +qxF +vwC +cgY +eWA +rhw cdn cdn cdn @@ -65665,8 +64116,8 @@ wZZ rpX bjr tnM -hGm -ctZ +guB +kAy xjr xjr xkj @@ -65772,9 +64223,9 @@ aac aac aiZ afZ -biF +xSs aaU -acc +tVB age apz agR @@ -65795,10 +64246,10 @@ bME bME bME bME -bPf -jyw -bWd -bPf +cjn +vkG +cEs +cjn cjn atb cdn @@ -65841,7 +64292,7 @@ bjr bjr bjr tNQ -cuc +tax xkj xkj xkj @@ -65947,9 +64398,9 @@ aac aac aac aac -aay +eQo aaU -acc +tVB age tSb agR @@ -66016,7 +64467,7 @@ szX uVv uVv kdm -cuc +tax cwq xkj xkj @@ -66124,8 +64575,8 @@ aac aac aac aQT -aci -acw +bMD +kcq age adN bkT @@ -66181,17 +64632,17 @@ aXp aXp aad aad -btN -ctH +wKl +sEs lmv -bDD -btN +yjl +wKl aad srk aad aad aad -cvY +fTd xkj xkj cxJ @@ -66300,7 +64751,7 @@ aac aac aUD aUD -aXb +xGI aac adq adM @@ -66324,11 +64775,11 @@ pPk pPk pPk rok -rPA +pXp atd atY ave -tvk +oDp pPk pPk nqX @@ -66381,7 +64832,7 @@ cxW ugH ekh aHl -wab +oIj viA hsX viA @@ -66499,11 +64950,11 @@ bon bon bon bon -arK +fJN ate atZ avf -awr +bZg bon bon vVK @@ -66674,11 +65125,11 @@ agT bon bon bon -arL -atf -atf -atf -aws +aSh +ukK +ukK +ukK +ybS bon bon bon @@ -66924,7 +65375,7 @@ aad rxp oQe qwx -gqa +ixi eaO eaO ttQ @@ -67274,7 +65725,7 @@ aad rxp oQe sse -haZ +oln sXt xtw gTB @@ -68082,7 +66533,7 @@ vVK axV caV aBb -aCq +xvu aDw aCt aFI @@ -68432,7 +66883,7 @@ vVK cbF azu cbF -aCs +cMP aDy aEx aFJ @@ -70946,13 +69397,13 @@ khT rJf wbK khT -qXN -qXN -qXN -qXN -qXN -qXN -fre +eUV +eUV +eUV +eUV +eUV +eUV +tao jiQ uvw vit @@ -71127,7 +69578,7 @@ sQK sQK sQK ipd -hfq +ygo vsy vit iRk @@ -71302,7 +69753,7 @@ ixD ixD aCw ocE -hfq +ygo vsy vit vit @@ -71477,7 +69928,7 @@ khT khT khT ocE -hfq +ygo vsy vit aad @@ -71652,7 +70103,7 @@ vwX qOZ puV ocE -hfq +ygo vsy vit aad @@ -71827,7 +70278,7 @@ lZd sya puV ocE -hfq +ygo vsy aad aad @@ -72002,7 +70453,7 @@ gih sya puV hsg -hfq +ygo vsy khT khT @@ -72177,7 +70628,7 @@ lZd vyK puV hsg -hfq +ygo vsy pmT ixD @@ -72352,7 +70803,7 @@ vsy vsy khT khT -fzA +rpa vsy khT khT diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 09b418b4eb1b..096bbf03ca7e 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -696,6 +696,10 @@ "aeC" = ( /turf/open/floor/almayer/mono, /area/almayer/lifeboat_pumps/north2) +"aeD" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/upper/u_a_s) "aeE" = ( /obj/structure/window/framed/almayer/hull, /turf/open/floor/plating, @@ -848,6 +852,14 @@ "afm" = ( /turf/open/floor/almayer_hull/outerhull_dir/southeast, /area/space) +"afo" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/south1) "afr" = ( /turf/open/floor/almayer/red/northwest, /area/almayer/lifeboat_pumps/north1) @@ -1115,6 +1127,10 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/powered) +"ahn" = ( +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/almayer/dark_sterile, +/area/almayer/medical/upper_medical) "aho" = ( /obj/structure/window/framed/almayer, /turf/open/floor/plating, @@ -1234,6 +1250,16 @@ }, /turf/open/floor/almayer/plate, /area/almayer/living/cafeteria_officer) +"aio" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor/solid{ + dir = 1; + name = "Morgue Processing" + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/morgue) "aiq" = ( /turf/open/floor/almayer, /area/almayer/living/cafeteria_officer) @@ -1462,9 +1488,6 @@ "akw" = ( /turf/open/floor/almayer/dark_sterile, /area/almayer/medical/upper_medical) -"akx" = ( -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/upper_medical) "akz" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/emails{ @@ -1564,9 +1587,6 @@ "aly" = ( /turf/closed/wall/almayer, /area/almayer/shipboard/starboard_missiles) -"alD" = ( -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/upper_medical) "alE" = ( /turf/open/floor/almayer/sterile_green_side/southwest, /area/almayer/medical/upper_medical) @@ -1762,14 +1782,6 @@ }, /turf/open/floor/plating/almayer/no_build, /area/almayer/stair_clone) -"anp" = ( -/obj/structure/sign/safety/hazard{ - pixel_x = 15; - pixel_y = 32 - }, -/obj/structure/closet/secure_closet/guncabinet/red/armory_m4a3_pistol, -/turf/open/floor/almayer/redfull, -/area/almayer/medical/upper_medical) "anq" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -1789,14 +1801,6 @@ /obj/item/clothing/suit/storage/marine/light/vest, /turf/open/floor/almayer/redfull, /area/almayer/medical/upper_medical) -"anr" = ( -/obj/structure/sign/safety/intercom{ - pixel_x = 8; - pixel_y = 32 - }, -/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun, -/turf/open/floor/almayer/redfull, -/area/almayer/medical/upper_medical) "ans" = ( /turf/open/floor/almayer/sterile_green_side/west, /area/almayer/medical/upper_medical) @@ -1885,22 +1889,9 @@ "aom" = ( /turf/open/floor/almayer/silver/west, /area/almayer/command/cichallway) -"aop" = ( -/obj/structure/closet/secure_closet/personal/patient{ - name = "morgue closet" - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer/plate, -/area/almayer/medical/morgue) "aoq" = ( /turf/open/floor/almayer/plate, /area/almayer/medical/morgue) -"aor" = ( -/obj/structure/curtain/medical, -/turf/open/floor/almayer/plate, -/area/almayer/medical/morgue) "aos" = ( /turf/open/floor/almayer/sterile_green_side/northwest, /area/almayer/medical/upper_medical) @@ -2576,20 +2567,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plate, /area/almayer/living/briefing) -"asu" = ( -/obj/structure/sign/safety/hazard{ - pixel_x = 32; - pixel_y = -8 - }, -/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, -/turf/open/floor/almayer/redfull, -/area/almayer/medical/upper_medical) -"asw" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer/sterile_green_side/west, -/area/almayer/medical/upper_medical) "asA" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, @@ -2651,25 +2628,10 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering) -"asU" = ( -/obj/structure/morgue{ - dir = 8 - }, -/turf/open/floor/almayer/plate, -/area/almayer/medical/morgue) "asX" = ( /obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, /turf/open/floor/almayer/plate, /area/almayer/squads/charlie_delta_shared) -"asY" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/north2) "asZ" = ( /obj/structure/machinery/computer/cameras/almayer/ares{ dir = 4; @@ -2731,16 +2693,6 @@ /obj/structure/closet/secure_closet/staff_officer/armory/shotgun, /turf/open/floor/almayer/redfull, /area/almayer/command/cic) -"atp" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/north2) "atq" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering) @@ -2930,15 +2882,6 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/command/telecomms) -"auK" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/north1) "auL" = ( /obj/structure/surface/table/almayer, /obj/item/stack/sheet/plasteel{ @@ -3008,16 +2951,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/upper/midship_hallway) -"avc" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/north1) "avd" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -3171,45 +3104,25 @@ "awe" = ( /turf/open/floor/plating/almayer, /area/almayer/living/starboard_garden) +"awg" = ( +/obj/structure/machinery/power/apc/almayer/hardened/east, +/obj/structure/pipes/vents/pump/no_boom{ + dir = 8 + }, +/turf/open/floor/almayer, +/area/almayer/command/lifeboat) "awi" = ( /obj/structure/bed/chair{ dir = 8 }, /turf/open/floor/almayer/plate, /area/almayer/living/starboard_garden) -"awj" = ( -/obj/structure/machinery/photocopier, -/obj/structure/sign/safety/terminal{ - pixel_x = -17 - }, -/turf/open/floor/almayer/sterile_green_side/west, -/area/almayer/medical/upper_medical) "awk" = ( /turf/open/floor/almayer/silver, /area/almayer/command/cic) "awm" = ( /turf/open/floor/almayer/red/northwest, /area/almayer/command/cic) -"awn" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N" - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/medical/upper_medical) -"awp" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer{ - dir = 4; - id = "Research Armory"; - name = "\improper Armory Shutters" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/upper_medical) "awq" = ( /obj/structure/machinery/light{ dir = 1 @@ -3385,16 +3298,6 @@ }, /turf/open/floor/almayer/redcorner/west, /area/almayer/shipboard/weapon_room) -"axl" = ( -/obj/structure/machinery/door_control{ - dir = 1; - id = "Research Armory"; - name = "Research Armory"; - pixel_x = -27; - req_one_access_txt = "4;28" - }, -/turf/open/floor/almayer/sterile_green_side/southwest, -/area/almayer/medical/upper_medical) "axm" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -3564,19 +3467,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/mono, /area/almayer/lifeboat_pumps/north2) -"ayc" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 5; - layer = 3.51 - }, -/turf/open/floor/almayer/red/northwest, -/area/almayer/lifeboat_pumps/north2) "aye" = ( /obj/structure/bed/chair, /turf/open/floor/almayer/orange/north, @@ -3599,12 +3489,6 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering) -"ayn" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/almayer/red/north, -/area/almayer/lifeboat_pumps/north2) "ayo" = ( /obj/structure/machinery/door/airlock/almayer/secure/reinforced{ name = "\improper Evacuation Airlock PU-2"; @@ -3712,33 +3596,10 @@ }, /turf/open/floor/almayer/silver/east, /area/almayer/command/cic) -"ayQ" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/almayer/red/north, -/area/almayer/lifeboat_pumps/north2) -"ayR" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/almayer/red/north, -/area/almayer/lifeboat_pumps/north2) "ayV" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/orange/north, /area/almayer/engineering/upper_engineering) -"ayW" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" - }, -/obj/structure/sign/safety/medical{ - pixel_x = 8; - pixel_y = -32 - }, -/turf/open/floor/almayer/plate, -/area/almayer/medical/morgue) "ayX" = ( /obj/structure/surface/table/almayer, /obj/item/tool/extinguisher, @@ -3800,19 +3661,6 @@ /obj/item/cell/high, /turf/open/floor/almayer/plate, /area/almayer/engineering/upper_engineering) -"azk" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 9; - layer = 3.51 - }, -/turf/open/floor/almayer/red/northeast, -/area/almayer/lifeboat_pumps/north2) "azl" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/bluecorner/east, @@ -3955,6 +3803,14 @@ }, /turf/open/floor/almayer/silvercorner/east, /area/almayer/command/cic) +"aAm" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/target{ + desc = "'Such an insult (referring to Canton) can only be repaid in American blood. Mark my words, this will happen'-Kolonel Ganbaatar UPP Armed Forces"; + name = "Kolonel Ganbaatar" + }, +/turf/open/floor/almayer, +/area/almayer/hallways/hangar) "aAn" = ( /obj/structure/sign/safety/escapepod{ pixel_x = 8; @@ -4023,16 +3879,6 @@ /obj/structure/surface/table/reinforced/black, /turf/open/floor/almayer, /area/almayer/command/cic) -"aAG" = ( -/obj/structure/machinery/door/airlock/almayer/medical{ - access_modified = 1; - dir = 2; - name = "Morgue"; - req_access_txt = "25"; - req_one_access = null - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/morgue) "aAK" = ( /obj/structure/surface/table/almayer, /obj/item/device/camera, @@ -4111,9 +3957,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/command/telecomms) -"aBd" = ( -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/morgue) "aBe" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 4; @@ -4318,6 +4161,10 @@ }, /turf/open/floor/almayer/silver/southwest, /area/almayer/command/cic) +"aBV" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/floor/almayer/red, +/area/almayer/lifeboat_pumps/south1) "aBW" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -4397,20 +4244,6 @@ }, /turf/open/floor/almayer/silvercorner, /area/almayer/command/cic) -"aCo" = ( -/obj/structure/surface/table/almayer, -/obj/item/paper_bin/uscm, -/obj/item/tool/pen, -/obj/structure/sign/safety/terminal{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer/sterile_green_corner, -/area/almayer/medical/morgue) -"aCp" = ( -/obj/structure/machinery/power/apc/almayer/north, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/upper_medical) "aCt" = ( /obj/structure/bed/sofa/south/white/right, /turf/open/floor/almayer/sterile_green, @@ -4423,10 +4256,12 @@ /obj/structure/machinery/light, /turf/open/floor/almayer/green/east, /area/almayer/hallways/lower/port_midship_hallway) -"aCw" = ( -/obj/structure/window/framed/almayer/white, -/turf/open/floor/plating, -/area/almayer/medical/morgue) +"aCy" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/northwest, +/turf/open/floor/almayer/red/northeast, +/area/almayer/lifeboat_pumps/north1) "aCA" = ( /obj/structure/largecrate/random/barrel/white, /turf/open/floor/plating/plating_catwalk, @@ -4705,6 +4540,16 @@ /obj/item/clothing/head/helmet/marine/pilot, /turf/open/floor/almayer/redfull, /area/almayer/living/offices/flight) +"aEl" = ( +/obj/structure/machinery/door_control{ + id = "ARES Operations Left"; + name = "ARES Operations Shutter"; + pixel_x = -24; + pixel_y = -8; + req_one_access_txt = "91;92" + }, +/turf/open/floor/almayer/aicore/no_build/ai_silver/west, +/area/almayer/command/airoom) "aEm" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/working_joe{ @@ -4755,28 +4600,19 @@ }, /turf/open/floor/almayer/silver/southeast, /area/almayer/command/cic) +"aEJ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/almayer/plate, +/area/almayer/hallways/hangar) "aEM" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/computer/emails, /turf/open/floor/almayer, /area/almayer/living/numbertwobunks) -"aEN" = ( -/obj/structure/bed/chair/office/dark{ - dir = 4; - layer = 3.25 - }, -/turf/open/floor/almayer/dark_sterile, -/area/almayer/medical/morgue) -"aEO" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/med_data/laptop{ - dir = 8 - }, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer/sterile_green_side/east, -/area/almayer/medical/morgue) "aEQ" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/mono, @@ -4945,19 +4781,6 @@ /obj/structure/machinery/light, /turf/open/floor/almayer/plate, /area/almayer/engineering/upper_engineering) -"aFJ" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 5; - layer = 3.51 - }, -/turf/open/floor/almayer/red/northwest, -/area/almayer/lifeboat_pumps/north1) "aGa" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/toolbox, @@ -4988,16 +4811,6 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/command/cichallway) -"aGk" = ( -/obj/structure/machinery/door_control{ - id = "ARES Operations Left"; - name = "ARES Operations Shutter"; - pixel_x = -24; - pixel_y = -8; - req_one_access_txt = "91;92" - }, -/turf/open/floor/almayer/aicore/no_build/ai_silver/west, -/area/almayer/command/airoom) "aGm" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer/plate, @@ -5095,16 +4908,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/living/numbertwobunks) -"aGW" = ( -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/morgue) -"aGX" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" - }, -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/morgue) "aGY" = ( /turf/open/floor/almayer/plate, /area/almayer/living/numbertwobunks) @@ -5232,12 +5035,6 @@ }, /turf/open/floor/engine, /area/almayer/engineering/airmix) -"aHU" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/almayer/red/north, -/area/almayer/lifeboat_pumps/north1) "aHX" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out" @@ -5298,31 +5095,6 @@ /obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer, /area/almayer/squads/alpha_bravo_shared) -"aIr" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/almayer/red/north, -/area/almayer/lifeboat_pumps/north1) -"aIv" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/almayer/red/north, -/area/almayer/lifeboat_pumps/north1) -"aIw" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 9; - layer = 3.51 - }, -/turf/open/floor/almayer/red/northeast, -/area/almayer/lifeboat_pumps/north1) "aIx" = ( /obj/structure/flora/bush/ausbushes/ppflowers, /turf/open/floor/grass, @@ -5809,37 +5581,12 @@ }, /turf/open/floor/almayer, /area/almayer/command/cic) -"aLS" = ( -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 - }, -/obj/structure/bed/chair, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/upper_medical) "aLT" = ( /turf/closed/wall/almayer, /area/almayer/squads/alpha) "aLW" = ( /turf/open/floor/almayer, /area/almayer/shipboard/starboard_point_defense) -"aLZ" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/pen, -/obj/item/paper_bin/wy, -/obj/structure/machinery/computer/cameras/containment{ - dir = 4; - layer = 2.981; - name = "Research Cameras"; - pixel_y = 16 - }, -/obj/item/clothing/accessory/stethoscope, -/obj/structure/closet/secure_closet/professor_dummy{ - pixel_x = -32 - }, -/turf/open/floor/almayer/sterile_green_corner/west, -/area/almayer/medical/upper_medical) "aMd" = ( /obj/structure/filingcabinet/seeds{ density = 0; @@ -6166,12 +5913,6 @@ }, /turf/open/floor/almayer/orange, /area/almayer/engineering/upper_engineering) -"aOE" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/almayer/red/west, -/area/almayer/lifeboat_pumps/north2) "aOF" = ( /obj/structure/bed/chair{ dir = 1 @@ -6234,13 +5975,6 @@ /obj/structure/machinery/portable_atmospherics/canister/air, /turf/open/floor/almayer/cargo, /area/almayer/maint/upper/u_a_s) -"aOU" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/largecrate/random/barrel/blue, -/turf/open/floor/almayer/red/east, -/area/almayer/lifeboat_pumps/north2) "aOV" = ( /obj/structure/surface/table/almayer, /obj/item/storage/fancy/cigarettes/kpack, @@ -6491,6 +6225,12 @@ }, /turf/open/floor/almayer/sterile_green_side, /area/almayer/medical/upper_medical) +"aQE" = ( +/obj/structure/surface/table/almayer, +/obj/item/book/manual/medical_diagnostics_manual, +/obj/item/device/megaphone, +/turf/open/floor/almayer/sterile_green, +/area/almayer/medical/upper_medical) "aQF" = ( /turf/closed/wall/almayer, /area/almayer/living/offices) @@ -6659,38 +6399,6 @@ /obj/item/storage/box/drinkingglasses, /turf/open/floor/almayer/plate, /area/almayer/living/captain_mess) -"aRF" = ( -/obj/structure/machinery/door/airlock/almayer/medical{ - access_modified = 1; - dir = 2; - name = "Morgue Processing"; - req_access_txt = "25"; - req_one_access = null - }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 2 - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/morgue) -"aRJ" = ( -/obj/structure/ladder{ - height = 2; - id = "med1" - }, -/obj/structure/sign/safety/ladder{ - pixel_x = 23; - pixel_y = -32 - }, -/obj/structure/sign/safety/restrictedarea{ - pixel_x = -17; - pixel_y = -8 - }, -/obj/structure/sign/safety/refridgeration{ - pixel_x = -17; - pixel_y = 7 - }, -/turf/open/floor/plating/almayer, -/area/almayer/medical/upper_medical) "aRK" = ( /obj/structure/ladder{ height = 2; @@ -6715,12 +6423,6 @@ "aRP" = ( /turf/open/floor/almayer/orangecorner/north, /area/almayer/squads/bravo) -"aRS" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/almayer/sterile_green_corner/west, -/area/almayer/medical/upper_medical) "aRT" = ( /turf/open/floor/almayer, /area/almayer/squads/bravo) @@ -6880,12 +6582,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/command/cichallway) -"aTf" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/almayer/red/west, -/area/almayer/lifeboat_pumps/north1) "aTg" = ( /turf/open/floor/wood/ship, /area/almayer/shipboard/brig/chief_mp_office) @@ -7022,12 +6718,6 @@ }, /turf/open/floor/almayer/green/west, /area/almayer/living/offices) -"aUa" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/almayer/red/east, -/area/almayer/lifeboat_pumps/north1) "aUd" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/door/airlock/almayer/secure/reinforced{ @@ -7551,17 +7241,6 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/hallways/hangar) -"aYE" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 6; - layer = 3.51 - }, -/turf/open/floor/almayer/red/southeast, -/area/almayer/lifeboat_pumps/south2) "aYH" = ( /obj/structure/safe/cl_office, /turf/open/floor/wood/ship, @@ -8022,11 +7701,6 @@ }, /turf/open/floor/almayer/dark_sterile, /area/almayer/medical/operating_room_two) -"bcZ" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/box/masks, -/turf/open/floor/almayer/red/north, -/area/almayer/squads/alpha) "bda" = ( /obj/structure/machinery/door_control{ id = "or02"; @@ -8247,21 +7921,10 @@ "bev" = ( /turf/open/floor/almayer/dark_sterile, /area/almayer/medical/operating_room_one) -"bew" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/box/masks, -/turf/open/floor/almayer/orange, -/area/almayer/squads/bravo) "bez" = ( /obj/structure/closet/secure_closet/medical2, /turf/open/floor/almayer/sterile_green_corner/east, /area/almayer/medical/operating_room_one) -"beE" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/almayer/living/chapel) "beH" = ( /turf/open/floor/almayer, /area/almayer/living/briefing) @@ -8331,18 +7994,16 @@ }, /turf/open/floor/almayer/sterile_green_side/west, /area/almayer/medical/lower_medical_medbay) -"beZ" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/living/chapel) "bfd" = ( /obj/structure/machinery/light{ dir = 1 }, /turf/open/floor/almayer/green/north, /area/almayer/hallways/lower/port_midship_hallway) +"bfe" = ( +/obj/structure/platform/metal/almayer, +/turf/open/floor/almayer/red, +/area/almayer/lifeboat_pumps/north1) "bfl" = ( /turf/open/floor/almayer/silver/northeast, /area/almayer/living/cryo_cells) @@ -8656,10 +8317,6 @@ }, /turf/open/floor/almayer/silver/west, /area/almayer/living/cryo_cells) -"bho" = ( -/obj/structure/machinery/computer/med_data, -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/upper_medical) "bhq" = ( /obj/structure/machinery/light{ dir = 4 @@ -8669,6 +8326,16 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) +"bhu" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_a_p) +"bhw" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/engineering/upper_engineering/port) "bhx" = ( /obj/structure/bed/chair/wood/normal{ dir = 1 @@ -8759,15 +8426,6 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/medical/chemistry) -"biy" = ( -/obj/structure/pipes/unary/freezer, -/obj/structure/machinery/power/apc/almayer/north, -/obj/structure/sign/safety/autodoc{ - pixel_x = 20; - pixel_y = 32 - }, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/cryo_tubes) "biA" = ( /turf/closed/wall/almayer/white, /area/almayer/medical/operating_room_three) @@ -8805,12 +8463,6 @@ }, /turf/open/floor/almayer/red, /area/almayer/command/lifeboat) -"biL" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/almayer/red/east, -/area/almayer/lifeboat_pumps/north2) "biV" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 8 @@ -9508,6 +9160,11 @@ }, /turf/open/floor/almayer/mono, /area/almayer/squads/req) +"boF" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/medical/upper_medical) "boV" = ( /obj/structure/cargo_container/wy/left, /obj/structure/prop/almayer/minigun_crate{ @@ -9821,6 +9478,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/bravo) +"brB" = ( +/obj/structure/morgue{ + dir = 8 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer/test_floor5, +/area/almayer/medical/morgue) "brH" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -10234,6 +9900,12 @@ }, /turf/open/floor/almayer/plate, /area/almayer/shipboard/brig/general_equipment) +"bvT" = ( +/obj/structure/machinery/status_display{ + pixel_y = 30 + }, +/turf/open/gm/grass/grass1, +/area/almayer/medical/upper_medical) "bvX" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -10579,6 +10251,10 @@ /obj/effect/landmark/late_join, /turf/open/floor/almayer/silver/east, /area/almayer/living/cryo_cells) +"bzJ" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/upper/u_a_p) "bzQ" = ( /obj/structure/largecrate/random/case, /turf/open/floor/plating/plating_catwalk, @@ -10794,6 +10470,12 @@ /obj/structure/machinery/light, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) +"bBP" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 6 + }, +/turf/open/floor/almayer/orangecorner, +/area/almayer/engineering/upper_engineering/starboard) "bBQ" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/door_control{ @@ -10829,9 +10511,6 @@ }, /turf/open/floor/plating, /area/almayer/medical/lower_medical_lobby) -"bCe" = ( -/turf/open/floor/almayer/sterile_green_side/northeast, -/area/almayer/medical/lower_medical_lobby) "bCg" = ( /obj/structure/machinery/light{ dir = 8 @@ -10973,6 +10652,12 @@ }, /turf/open/floor/almayer/plate, /area/almayer/shipboard/weapon_room) +"bDm" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 4 + }, +/turf/open/floor/almayer/orange/northwest, +/area/almayer/engineering/upper_engineering/starboard) "bDn" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/closed/wall/almayer, @@ -11192,34 +10877,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/hallways/hangar) -"bED" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/machinery/landinglight/ds2{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/hangar) -"bEE" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/item/tool/warning_cone, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/hangar) "bEF" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -11230,19 +10887,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/red/southeast, /area/almayer/squads/alpha) -"bEK" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/machinery/landinglight/ds1/delaytwo{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/hangar) "bEN" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -11441,12 +11085,6 @@ }, /turf/open/floor/almayer/mono, /area/almayer/hallways/upper/starboard) -"bGc" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer/red/west, -/area/almayer/command/lifeboat) "bGn" = ( /obj/structure/barricade/plasteel/metal, /turf/open/floor/almayer/cargo, @@ -11727,6 +11365,19 @@ }, /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/navigation) +"bIE" = ( +/obj/effect/projector{ + name = "Almayer_AresUp"; + vector_x = -96; + vector_y = 65 + }, +/obj/structure/platform/metal/almayer/east, +/obj/structure/stairs{ + dir = 1; + icon_state = "ramptop" + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "bIJ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -11862,6 +11513,22 @@ }, /turf/open/floor/almayer, /area/almayer/squads/bravo) +"bJM" = ( +/obj/structure/machinery/computer/skills{ + req_one_access_txt = "200" + }, +/obj/structure/surface/table/woodentable/fancy, +/obj/item/tool/pen/clicky{ + pixel_x = 14; + plane = -5; + pixel_y = 2 + }, +/obj/item/tool/pen/clicky{ + pixel_x = 14; + pixel_y = 6 + }, +/turf/open/floor/carpet, +/area/almayer/command/corporateliaison) "bJS" = ( /obj/structure/surface/rack, /obj/item/tool/wrench, @@ -12023,11 +11690,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/shipboard/sea_office) -"bKX" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/box/masks, -/turf/open/floor/almayer/emerald/north, -/area/almayer/squads/charlie) "bLc" = ( /obj/structure/surface/rack, /obj/item/roller, @@ -12530,6 +12192,12 @@ "bNQ" = ( /turf/open/floor/almayer/plating_striped/west, /area/almayer/squads/req) +"bNR" = ( +/obj/structure/pipes/vents/pump/no_boom{ + dir = 8 + }, +/turf/open/floor/almayer, +/area/almayer/command/lifeboat) "bNS" = ( /obj/structure/machinery/prop/almayer/computer{ dir = 1 @@ -12753,6 +12421,20 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer/dark_sterile, /area/almayer/medical/lower_medical_medbay) +"bPA" = ( +/obj/structure/transmitter{ + name = "CMO Office Telephone"; + phone_category = "Offices"; + phone_id = "CMO Office"; + dir = 4; + pixel_x = -20 + }, +/obj/structure/sign/safety/commline_connection{ + pixel_x = -17; + pixel_y = 32 + }, +/turf/open/floor/almayer/sterile_green_side/west, +/area/almayer/medical/upper_medical) "bPC" = ( /obj/structure/sign/nosmoking_2{ pixel_x = 28 @@ -12898,6 +12580,13 @@ }, /turf/open/floor/almayer/sterile_green_side/northeast, /area/almayer/medical/lower_medical_medbay) +"bQO" = ( +/obj/structure/machinery/power/apc/almayer/east, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer/sterile_green, +/area/almayer/medical/lower_medical_lobby) "bQQ" = ( /obj/structure/sign/ROsign{ layer = 3 @@ -13429,12 +13118,6 @@ /obj/structure/machinery/light, /turf/open/floor/almayer/blue, /area/almayer/squads/delta) -"bVr" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/upper/u_a_p) "bVs" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -13448,11 +13131,6 @@ "bVw" = ( /turf/open/floor/almayer/bluecorner/east, /area/almayer/living/briefing) -"bVy" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/box/masks, -/turf/open/floor/almayer/blue, -/area/almayer/squads/delta) "bVE" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{ name = "\improper Medical Bay"; @@ -13766,21 +13444,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/starboard_midship_hallway) -"bZq" = ( -/obj/effect/projector{ - name = "Almayer_AresUp"; - vector_x = -96; - vector_y = 65 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/stairs{ - dir = 1; - icon_state = "ramptop" - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "bZr" = ( /turf/open/floor/almayer/plating_striped/north, /area/almayer/squads/req) @@ -13942,15 +13605,6 @@ }, /turf/open/floor/almayer/sterile_green_side, /area/almayer/medical/operating_room_three) -"cbc" = ( -/obj/structure/platform_decoration, -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_x = -14; - pixel_y = 13 - }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/upper/u_a_s) "cbg" = ( /obj/structure/machinery/door/airlock/almayer/command{ dir = 2; @@ -14079,6 +13733,10 @@ /obj/effect/landmark/late_join, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/cryo_cells) +"cdb" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/almayer, +/area/almayer/living/chapel) "cdf" = ( /obj/structure/machinery/camera/autoname/almayer{ name = "ship-grade camera" @@ -14216,6 +13874,12 @@ /obj/structure/bed/sofa/south/grey/left, /turf/open/floor/almayer/silver/northwest, /area/almayer/shipboard/brig/cic_hallway) +"cfe" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/northeast, +/turf/open/floor/almayer/red/northwest, +/area/almayer/lifeboat_pumps/south2) "cfk" = ( /obj/structure/machinery/firealarm{ dir = 4; @@ -14424,6 +14088,13 @@ /obj/structure/closet/secure_closet/guncabinet/red/mp_armory_shotgun, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/armory) +"chD" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/medical/morgue) "chL" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -14537,24 +14208,9 @@ /obj/structure/machinery/light, /turf/open/floor/almayer/green, /area/almayer/squads/req) -"ciu" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform, -/obj/structure/platform_decoration{ - dir = 10; - layer = 3.51 - }, -/turf/open/floor/almayer/red/southwest, -/area/almayer/lifeboat_pumps/north2) "civ" = ( /turf/open/floor/almayer/mono, /area/almayer/engineering/upper_engineering) -"ciw" = ( -/obj/structure/platform, -/turf/open/floor/almayer/red, -/area/almayer/lifeboat_pumps/north2) "cix" = ( /obj/structure/machinery/door/airlock/almayer/secure/reinforced{ dir = 2; @@ -14578,12 +14234,13 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_m_p) -"ciD" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/almayer/red, -/area/almayer/lifeboat_pumps/north2) +"ciC" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/tool/surgery/circular_saw, +/obj/item/tool/surgery/retractor, +/obj/item/tool/surgery/cautery, +/turf/open/floor/almayer/plate, +/area/almayer/medical/morgue) "ciN" = ( /turf/open/floor/almayer/silver/southeast, /area/almayer/shipboard/brig/cic_hallway) @@ -14622,10 +14279,6 @@ }, /turf/open/floor/almayer/emerald, /area/almayer/squads/charlie) -"cji" = ( -/obj/structure/platform_decoration, -/turf/open/floor/almayer/red, -/area/almayer/lifeboat_pumps/north2) "cjk" = ( /obj/structure/bed, /obj/structure/machinery/flasher{ @@ -14640,6 +14293,18 @@ /obj/item/tool/wet_sign, /turf/open/floor/almayer/plate, /area/almayer/maint/upper/u_a_p) +"cjs" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/obj/structure/machinery/power/apc/almayer/north, +/obj/structure/sign/safety/rewire{ + pixel_x = -20; + pixel_y = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/sterile_green_corner/north, +/area/almayer/medical/upper_medical) "cjt" = ( /turf/open/floor/almayer/orange, /area/almayer/engineering/lower) @@ -15024,17 +14689,6 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/powered) -"cmF" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 6; - layer = 3.51 - }, -/turf/open/floor/almayer/red/southeast, -/area/almayer/lifeboat_pumps/north2) "cmK" = ( /obj/structure/window/reinforced, /turf/open/floor/almayer/silver/west, @@ -15167,12 +14821,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/living/port_emb) -"cnP" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/upper/u_a_s) "cnR" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -15211,29 +14859,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer/test_floor4, /area/almayer/command/computerlab) -"cnV" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer/sterile_green_side/west, -/area/almayer/medical/morgue) -"cnW" = ( -/obj/structure/machinery/optable, -/turf/open/floor/almayer/dark_sterile, -/area/almayer/medical/morgue) -"cnZ" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/tool/surgery/scalpel, -/obj/item/tool/surgery/hemostat, -/turf/open/floor/almayer/sterile_green_corner/west, -/area/almayer/medical/morgue) -"coa" = ( -/obj/item/tool/surgery/circular_saw, -/obj/item/tool/surgery/cautery, -/obj/item/tool/surgery/retractor, -/obj/structure/surface/table/reinforced/prison, -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/morgue) "cod" = ( /obj/structure/machinery/cm_vending/clothing/dress{ density = 0; @@ -15295,12 +14920,6 @@ }, /turf/open/floor/carpet, /area/almayer/living/commandbunks) -"coH" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/engineering/lower/engine_core) "coJ" = ( /obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 10 @@ -15463,6 +15082,11 @@ "crD" = ( /turf/open/floor/almayer/greencorner/north, /area/almayer/squads/req) +"crL" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/platform_decoration/metal/almayer, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/hangar) "csd" = ( /obj/structure/closet/firecloset, /turf/open/floor/plating/plating_catwalk, @@ -15675,6 +15299,17 @@ /obj/structure/machinery/light, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) +"cxB" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/obj/item/device/autopsy_scanner, +/obj/item/tool/surgery/scalpel, +/obj/item/tool/surgery/hemostat, +/turf/open/floor/almayer/plate, +/area/almayer/medical/morgue) "cxF" = ( /obj/structure/barricade/handrail{ dir = 8 @@ -15719,6 +15354,14 @@ /obj/item/storage/firstaid/o2, /turf/open/floor/almayer/orange/southeast, /area/almayer/maint/upper/mess) +"cyO" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer/plating/northeast, +/area/almayer/engineering/lower/engine_core) "cyP" = ( /obj/structure/machinery/cm_vending/clothing/intelligence_officer{ density = 0; @@ -15732,12 +15375,6 @@ }, /turf/open/floor/plating, /area/almayer/maint/lower/constr) -"cyU" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/turf/open/floor/almayer/dark_sterile, -/area/almayer/medical/upper_medical) "cyZ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -15783,13 +15420,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/armory) -"cAz" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/item/stack/sheet/metal, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/upper/u_a_p) "cAF" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -15817,6 +15447,11 @@ }, /turf/open/floor/almayer/cargo, /area/almayer/engineering/upper_engineering/starboard) +"cBh" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/medical/morgue) "cBj" = ( /obj/structure/machinery/cryopod{ layer = 3.1; @@ -15866,13 +15501,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/chapel) -"cCD" = ( -/obj/structure/platform{ - dir = 8; - layer = 2.7 - }, -/turf/open/floor/almayer/uscm/directional/northwest, -/area/almayer/living/briefing) "cCE" = ( /obj/structure/machinery/firealarm{ pixel_y = 28 @@ -15956,6 +15584,12 @@ "cDP" = ( /turf/open/floor/almayer/silvercorner/north, /area/almayer/hallways/upper/midship_hallway) +"cDU" = ( +/obj/structure/morgue{ + dir = 8 + }, +/turf/open/floor/almayer/test_floor5, +/area/almayer/medical/morgue) "cDZ" = ( /obj/structure/surface/table/almayer, /obj/item/paper, @@ -16041,12 +15675,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/shipboard/weapon_room) -"cFn" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 - }, -/turf/open/floor/almayer/red, -/area/almayer/command/lifeboat) "cFC" = ( /obj/structure/machinery/light{ dir = 1 @@ -16299,6 +15927,10 @@ "cKL" = ( /turf/open/floor/almayer/orangecorner/west, /area/almayer/engineering/upper_engineering/port) +"cKV" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/floor/almayer/red, +/area/almayer/lifeboat_pumps/south2) "cLc" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -16384,12 +16016,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/upper/u_a_s) -"cMN" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer/orange/west, -/area/almayer/engineering/upper_engineering/starboard) "cMV" = ( /obj/structure/sign/prop1{ pixel_x = -32; @@ -16502,27 +16128,6 @@ /obj/structure/blocker/invisible_wall, /turf/open/floor/almayer_hull/outerhull_dir/east, /area/almayer/engineering/upper_engineering/starboard) -"cOV" = ( -/obj/effect/projector{ - name = "Almayer_AresDown"; - vector_x = 96; - vector_y = -65 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/stairs{ - dir = 1; - icon_state = "ramptop" - }, -/obj/structure/machinery/door_control{ - id = "ARES StairsUpper"; - name = "ARES Core Access"; - pixel_x = -24; - req_one_access_txt = "90;91;92" - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "cOY" = ( /obj/structure/machinery/status_display{ pixel_x = -32 @@ -16650,6 +16255,17 @@ "cRv" = ( /turf/open/floor/almayer/cargo, /area/almayer/shipboard/port_missiles) +"cRw" = ( +/obj/structure/bed/chair/office/dark{ + dir = 4 + }, +/obj/item/device/radio/intercom{ + freerange = 1; + name = "General Listening Channel"; + pixel_x = -28 + }, +/turf/open/floor/almayer/sterile_green_corner/west, +/area/almayer/medical/upper_medical) "cRK" = ( /obj/structure/desertdam/decals/road_edge{ pixel_x = 16 @@ -16740,6 +16356,17 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/upper/mess) +"cTW" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" + }, +/turf/open/floor/almayer/sterile_green_side/east, +/area/almayer/medical/upper_medical) "cTX" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -16753,6 +16380,11 @@ "cUo" = ( /turf/open/floor/almayer/plate, /area/almayer/lifeboat_pumps/north1) +"cUD" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/largecrate/random/barrel/blue, +/turf/open/floor/almayer/red/east, +/area/almayer/lifeboat_pumps/north2) "cVb" = ( /obj/structure/machinery/sentry_holder/almayer, /turf/open/floor/almayer/mono, @@ -16789,6 +16421,13 @@ /obj/effect/spawner/random/facepaint, /turf/open/floor/almayer/plate, /area/almayer/living/gym) +"cVL" = ( +/obj/structure/stairs{ + icon_state = "ramptop" + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/upper/u_a_p) "cVZ" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, @@ -16945,14 +16584,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/mp_bunks) -"cXW" = ( -/obj/structure/machinery/status_display{ - pixel_y = 30 - }, -/obj/structure/surface/table/almayer, -/obj/item/paper_bin/uscm, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/upper_medical) "cXX" = ( /obj/structure/disposalpipe/segment, /obj/structure/sign/safety/distribution_pipes{ @@ -16970,12 +16601,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/s_bow) -"cYu" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 - }, -/turf/open/floor/almayer/plate, -/area/almayer/command/lifeboat) "cYN" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -17175,6 +16800,12 @@ }, /turf/open/floor/almayer/plate, /area/almayer/engineering/upper_engineering/starboard) +"dbD" = ( +/obj/structure/platform/metal/almayer/east, +/obj/item/storage/firstaid/rad, +/obj/structure/surface/rack, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/upper/u_a_s) "dbX" = ( /turf/open/floor/almayer/orange/east, /area/almayer/maint/upper/mess) @@ -17260,15 +16891,13 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/hallways/upper/aft_hallway) -"deg" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/almayer/red, -/area/almayer/lifeboat_pumps/south2) "deq" = ( /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_m_s) +"deu" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/upper/u_a_s) "deD" = ( /obj/structure/machinery/prop/almayer/CICmap{ pixel_x = -5 @@ -17296,19 +16925,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/morgue) -"dfg" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" - }, -/obj/structure/pipes/vents/pump{ - dir = 1 - }, -/obj/item/tool/mop{ - pixel_x = -6; - pixel_y = 24 - }, -/turf/open/floor/almayer/plate, -/area/almayer/engineering/upper_engineering/starboard) "dfk" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -17378,6 +16994,24 @@ /obj/structure/bed/chair/bolted, /turf/open/floor/almayer/plating_striped, /area/almayer/shipboard/brig/execution) +"dhh" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = -12; + pixel_y = 2 + }, +/obj/structure/mirror{ + pixel_x = -27 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer/dark_sterile, +/area/almayer/medical/upper_medical) "dho" = ( /obj/structure/machinery/alarm/almayer{ dir = 1 @@ -17434,6 +17068,22 @@ }, /turf/open/floor/almayer/blue/north, /area/almayer/hallways/upper/fore_hallway) +"diy" = ( +/obj/item/device/flashlight/lamp/green{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/door_control/cl/office/evac{ + pixel_x = -5; + pixel_y = 4 + }, +/obj/structure/machinery/door_control/cl/quarter/windows{ + pixel_x = -5; + pixel_y = -3 + }, +/turf/open/floor/carpet, +/area/almayer/command/corporateliaison) "diz" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat/blastdoor{ id_tag = "Boat1-D4"; @@ -17442,6 +17092,19 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/engineering/upper_engineering/port) +"diD" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 + }, +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/repair_bay) "diJ" = ( /obj/structure/window/reinforced{ dir = 8; @@ -17501,6 +17164,12 @@ }, /turf/open/floor/almayer/aicore/no_build/ai_silver/west, /area/almayer/command/airoom) +"dkM" = ( +/obj/structure/machinery/light/double/blue{ + light_color = "#a7dbc7" + }, +/turf/open/gm/grass/grass1, +/area/almayer/medical/upper_medical) "dkO" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_Down2"; @@ -17539,6 +17208,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/bravo) +"dlL" = ( +/obj/structure/ladder{ + height = 1; + id = "med1" + }, +/turf/open/floor/plating/almayer, +/area/almayer/medical/lower_medical_lobby) "dlT" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer/mono, @@ -17711,27 +17387,20 @@ }, /turf/open/floor/almayer/mono, /area/almayer/lifeboat_pumps/north1) -"dpp" = ( -/obj/effect/projector{ - name = "Almayer_AresUp"; - vector_x = -96; - vector_y = 65 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/stairs{ - dir = 1; - icon_state = "ramptop" - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "dpA" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/starboard_aft_hallway) +"dpK" = ( +/obj/structure/machinery/photocopier, +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/sterile_green_side/west, +/area/almayer/medical/morgue) "dpO" = ( /obj/structure/machinery/cm_vending/clothing/marine/delta{ density = 0; @@ -17752,6 +17421,16 @@ "dqj" = ( /turf/open/floor/almayer/redcorner/east, /area/almayer/command/lifeboat) +"dqu" = ( +/obj/structure/machinery/landinglight/ds1{ + dir = 4 + }, +/obj/structure/platform_decoration/metal/almayer/north, +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/open/floor/almayer/plate, +/area/almayer/hallways/hangar) "dqw" = ( /turf/closed/wall/almayer/outer, /area/almayer/shipboard/weapon_room/notunnel) @@ -17846,12 +17525,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) -"dtZ" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/living/chapel) "duo" = ( /obj/structure/machinery/power/apc/almayer/west, /turf/open/floor/prison/kitchen, @@ -17889,6 +17562,9 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) +"duB" = ( +/turf/open/floor/almayer/sterile_green_corner/west, +/area/almayer/medical/upper_medical) "duF" = ( /obj/structure/closet/secure_closet/personal, /turf/open/floor/almayer/orange/north, @@ -17935,6 +17611,18 @@ "dvD" = ( /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_f_s) +"dvO" = ( +/obj/effect/step_trigger/teleporter_vector{ + name = "Almayer_AresDown"; + vector_x = 96; + vector_y = -65 + }, +/obj/structure/platform/metal/almayer/east, +/obj/structure/stairs{ + dir = 1 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "dvZ" = ( /obj/structure/machinery/door/airlock/almayer/maint, /obj/structure/disposalpipe/segment{ @@ -17967,13 +17655,6 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/maint/upper/u_f_s) -"dwA" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/sign/safety/bathunisex{ - pixel_x = 32 - }, -/turf/open/floor/almayer/mono, -/area/almayer/medical/upper_medical) "dwI" = ( /obj/structure/machinery/door/airlock/almayer/engineering{ dir = 1; @@ -17995,6 +17676,10 @@ "dxv" = ( /turf/open/floor/almayer/silvercorner/west, /area/almayer/command/computerlab) +"dxz" = ( +/obj/structure/platform/metal/almayer, +/turf/open/floor/almayer, +/area/almayer/living/briefing) "dxF" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_Down1"; @@ -18012,12 +17697,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/port_fore_hallway) -"dxK" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 - }, -/turf/open/floor/almayer/red/north, -/area/almayer/command/lifeboat) "dxT" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -18127,21 +17806,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_a_p) -"dAl" = ( -/obj/item/paper_bin/wy, -/obj/structure/surface/table/woodentable/fancy, -/obj/item/tool/pen/clicky, -/obj/item/tool/pen/clicky, -/obj/structure/machinery/status_display{ - pixel_x = -32 - }, -/obj/item/desk_bell{ - anchored = 1; - pixel_x = -8; - pixel_y = 8 - }, -/turf/open/floor/carpet, -/area/almayer/command/corporateliaison) "dAm" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -18354,16 +18018,6 @@ /obj/structure/closet/emcloset, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/stern) -"dDL" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/research/main_terminal{ - dir = 4 - }, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer/sterile_green_side/west, -/area/almayer/medical/upper_medical) "dDM" = ( /obj/effect/decal/cleanable/blood/oil, /obj/structure/machinery/light{ @@ -18509,6 +18163,9 @@ "dFR" = ( /turf/open/floor/almayer/silver/northwest, /area/almayer/command/cichallway) +"dFV" = ( +/turf/open/floor/almayer/sterile_green_side/southeast, +/area/almayer/medical/upper_medical) "dFW" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/cell_charger, @@ -18705,6 +18362,11 @@ }, /turf/open/floor/almayer/aicore/no_build/ai_silver/west, /area/almayer/command/airoom) +"dKe" = ( +/obj/structure/platform/metal/almayer/north, +/obj/item/tool/mop, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_a_p) "dKp" = ( /turf/open/floor/almayer/research/containment/corner/east, /area/almayer/medical/containment/cell/cl) @@ -18772,6 +18434,10 @@ }, /turf/open/floor/almayer/plating_striped, /area/almayer/shipboard/sea_office) +"dLv" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/almayer/red/west, +/area/almayer/lifeboat_pumps/south1) "dLz" = ( /obj/structure/closet/firecloset, /turf/open/floor/almayer/cargo, @@ -18895,12 +18561,6 @@ /obj/effect/spawner/random/toolbox, /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/starboard_umbilical) -"dPm" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer/plate, -/area/almayer/command/lifeboat) "dPq" = ( /obj/structure/surface/table/almayer, /obj/item/stack/sheet/cardboard{ @@ -18909,12 +18569,6 @@ }, /turf/open/floor/plating, /area/almayer/maint/lower/constr) -"dPC" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/command/lifeboat) "dPH" = ( /obj/structure/closet/secure_closet/engineering_welding, /obj/structure/machinery/light{ @@ -19062,14 +18716,6 @@ "dSI" = ( /turf/open/floor/almayer/bluecorner/west, /area/almayer/hallways/upper/midship_hallway) -"dSJ" = ( -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_x = -28 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/morgue) "dSX" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -19165,19 +18811,12 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/sterile_green_side/east, /area/almayer/medical/medical_science) -"dVH" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/machinery/light/small{ - dir = 8 - }, -/obj/structure/sign/safety/hvac_old{ - pixel_x = 8; - pixel_y = 32 +"dVD" = ( +/obj/structure/sign/safety/refridgeration{ + pixel_y = -32 }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/upper/u_a_p) +/turf/open/floor/almayer/green, +/area/almayer/hallways/upper/fore_hallway) "dVO" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/emails{ @@ -19329,6 +18968,18 @@ /obj/item/frame/fire_alarm, /turf/open/floor/almayer/orange/north, /area/almayer/engineering/lower) +"dYL" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/status_display{ + pixel_x = -32 + }, +/obj/item/desk_bell{ + anchored = 1; + pixel_x = -8; + pixel_y = 8 + }, +/turf/open/floor/carpet, +/area/almayer/command/corporateliaison) "dYR" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/reagentgrinder{ @@ -19373,6 +19024,14 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/lower/workshop/hangar) +"dZB" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/north2) "dZZ" = ( /obj/structure/surface/rack, /obj/item/tool/weldpack, @@ -19469,6 +19128,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_a_s) +"ech" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 2 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/upper_medical) "ecj" = ( /obj/structure/largecrate/supply/supplies/mre, /obj/structure/sign/safety/water{ @@ -19569,6 +19237,10 @@ /obj/structure/machinery/vending/dinnerware, /turf/open/floor/prison/kitchen, /area/almayer/living/grunt_rnr) +"eew" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/almayer/red/north, +/area/almayer/lifeboat_pumps/north1) "eeA" = ( /obj/structure/closet/emcloset, /turf/open/floor/almayer/plate, @@ -19587,6 +19259,12 @@ /obj/item/frame/table, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_a_p) +"efd" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/northeast, +/turf/open/floor/almayer/mono, +/area/almayer/medical/upper_medical) "efj" = ( /turf/open/floor/almayer/red/east, /area/almayer/hallways/upper/port) @@ -19598,6 +19276,10 @@ }, /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/port_umbilical) +"efl" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, +/turf/open/floor/almayer/orange/east, +/area/almayer/engineering/upper_engineering/port) "efC" = ( /obj/structure/machinery/firealarm{ pixel_y = 28 @@ -19623,6 +19305,18 @@ }, /turf/open/floor/almayer/plate, /area/almayer/squads/alpha) +"efL" = ( +/obj/effect/step_trigger/teleporter_vector{ + name = "Almayer_AresUp"; + vector_x = -96; + vector_y = 65 + }, +/obj/structure/platform/metal/almayer/west, +/obj/structure/stairs{ + dir = 1 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "efP" = ( /obj/structure/surface/table/almayer, /obj/item/toy/deck{ @@ -19683,11 +19377,6 @@ /obj/effect/step_trigger/clone_cleaner, /turf/open/floor/almayer/aicore/no_build/ai_silver/west, /area/almayer/command/airoom) -"egp" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/platform_decoration, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/hangar) "egt" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Chapel" @@ -19804,20 +19493,6 @@ }, /turf/open/floor/almayer/red/north, /area/almayer/shipboard/brig/processing) -"eii" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/step_trigger/teleporter_vector{ - name = "Almayer_AresUp"; - vector_x = -96; - vector_y = 65 - }, -/obj/structure/stairs{ - dir = 1 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "eim" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -20086,6 +19761,13 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/test_floor4, /area/almayer/maint/hull/lower/l_m_s) +"eos" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/repair_bay) "eox" = ( /obj/structure/machinery/light/small, /turf/open/floor/plating/plating_catwalk, @@ -20334,6 +20016,25 @@ }, /turf/open/floor/almayer, /area/almayer/squads/alpha_bravo_shared) +"esu" = ( +/obj/structure/ladder{ + height = 2; + id = "med1" + }, +/obj/structure/sign/safety/ladder{ + pixel_x = 23; + pixel_y = -32 + }, +/obj/structure/sign/safety/refridgeration{ + pixel_x = -17; + pixel_y = 7 + }, +/obj/structure/sign/safety/restrictedarea{ + pixel_x = -17; + pixel_y = -8 + }, +/turf/open/floor/plating/almayer, +/area/almayer/medical/upper_medical) "esC" = ( /obj/structure/toilet{ pixel_y = 13 @@ -20457,19 +20158,6 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/maint/hull/upper/u_f_s) -"euN" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out" - }, -/obj/structure/machinery/door_control{ - id = "ARES Mainframe Left"; - name = "ARES Mainframe Lockdown"; - pixel_x = 24; - pixel_y = 24; - req_one_access_txt = "91;92" - }, -/turf/open/floor/almayer/aicore/glowing/no_build, -/area/almayer/command/airoom) "euV" = ( /turf/open/floor/almayer/uscm/directional/logo_c/west, /area/almayer/command/cic) @@ -20619,10 +20307,6 @@ "eyD" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/starboard_hallway) -"eyG" = ( -/obj/structure/platform, -/turf/open/floor/almayer/red, -/area/almayer/lifeboat_pumps/south2) "eyM" = ( /obj/structure/largecrate/random/barrel/blue, /turf/open/floor/almayer/plate, @@ -20736,13 +20420,13 @@ "eAI" = ( /turf/open/floor/almayer/orangecorner/west, /area/almayer/engineering/lower/engine_core) -"eAL" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/red/north, -/area/almayer/command/lifeboat) "eAN" = ( /turf/open/floor/wood/ship, /area/almayer/command/corporateliaison) +"eAP" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/sterile_green_side/west, +/area/almayer/medical/upper_medical) "eAU" = ( /obj/structure/bed/chair{ dir = 8 @@ -20819,19 +20503,6 @@ /obj/item/storage/firstaid/adv, /turf/open/floor/almayer/sterile_green_side, /area/almayer/medical/lower_medical_medbay) -"eCo" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 5; - layer = 3.51 - }, -/turf/open/floor/almayer/red/northwest, -/area/almayer/lifeboat_pumps/south2) "eCt" = ( /obj/structure/closet/crate, /obj/item/stack/sheet/plasteel{ @@ -20865,13 +20536,6 @@ /obj/structure/machinery/door/airlock/almayer/maint, /turf/open/floor/almayer/test_floor4, /area/almayer/maint/upper/u_m_s) -"eDo" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - layer = 2.5 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/medical/upper_medical) "eDq" = ( /obj/structure/largecrate/random/secure, /turf/open/floor/almayer/plate, @@ -20941,6 +20605,12 @@ }, /turf/open/floor/almayer/plate, /area/almayer/squads/charlie) +"eFu" = ( +/obj/structure/pipes/standard/manifold/hidden/supply/no_boom{ + dir = 8 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/command/lifeboat) "eFG" = ( /obj/structure/machinery/light{ dir = 1 @@ -20997,26 +20667,6 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) -"eFY" = ( -/obj/structure/surface/table/woodentable/fancy, -/obj/item/ashtray/bronze{ - pixel_x = 2; - pixel_y = 9 - }, -/obj/structure/machinery/door_control/cl/office/window{ - pixel_x = 6; - pixel_y = 4 - }, -/obj/structure/machinery/door_control/cl/office/door{ - pixel_x = 6; - pixel_y = -3 - }, -/obj/item/spacecash/c500{ - pixel_x = -10; - pixel_y = 8 - }, -/turf/open/floor/carpet, -/area/almayer/command/corporateliaison) "eGq" = ( /obj/structure/largecrate/random/secure, /turf/open/floor/almayer/green/east, @@ -21030,10 +20680,17 @@ }, /turf/open/floor/almayer/aicore/no_build, /area/almayer/command/airoom) -"eGB" = ( -/obj/structure/platform_decoration, -/turf/open/floor/almayer, -/area/almayer/living/briefing) +"eGz" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/med_data/laptop{ + dir = 1; + pixel_y = -4 + }, +/obj/structure/sign/safety/terminal{ + pixel_x = -21 + }, +/turf/open/floor/almayer/sterile_green_corner/west, +/area/almayer/medical/morgue) "eGH" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -21263,6 +20920,11 @@ /obj/structure/machinery/computer/crew, /turf/open/floor/almayer/red, /area/almayer/shipboard/brig/perma) +"eMM" = ( +/obj/effect/step_trigger/clone_cleaner, +/obj/structure/platform_decoration/metal/almayer, +/turf/open/floor/almayer/aicore/no_build/ai_silver/east, +/area/almayer/command/airoom) "eMP" = ( /obj/structure/machinery/door/poddoor/almayer/open{ dir = 4; @@ -21512,6 +21174,15 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/lower/vehiclehangar) +"eSI" = ( +/obj/structure/machinery/door/airlock/almayer/secure/reinforced{ + dir = 2; + name = "\improper Lifeboat Control Bubble"; + req_access = null + }, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, +/turf/open/floor/almayer/test_floor4, +/area/almayer/command/lifeboat) "eSU" = ( /obj/structure/prop/almayer/name_stencil{ icon_state = "almayer1" @@ -21583,6 +21254,10 @@ /obj/structure/disposalpipe/trunk, /turf/open/floor/almayer/plate, /area/almayer/squads/charlie_delta_shared) +"eUj" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/upper/u_a_s) "eUn" = ( /obj/structure/machinery/chem_master, /turf/open/floor/almayer/sterile_green_corner, @@ -21732,6 +21407,14 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_m_s) +"eYi" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/south2) "eYj" = ( /obj/structure/machinery/light{ dir = 8 @@ -21806,12 +21489,6 @@ /obj/effect/landmark/start/synthetic, /turf/open/floor/almayer, /area/almayer/living/synthcloset) -"eYR" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/turf/open/floor/almayer/orangecorner/east, -/area/almayer/engineering/upper_engineering/port) "eYU" = ( /obj/structure/disposalpipe/up/almayer{ dir = 8; @@ -21835,17 +21512,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) -"eZp" = ( -/obj/structure/platform{ - dir = 4; - layer = 2.7 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/engineering/lower/engine_core) "eZC" = ( /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/starboard_fore_hallway) @@ -21864,6 +21530,18 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/port_aft_hallway) +"eZU" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/platform/metal/almayer/north, +/obj/structure/largecrate/random/case/double, +/obj/item/cell/crap{ + pixel_y = 14 + }, +/turf/open/floor/almayer/plate, +/area/almayer/hallways/hangar) "fag" = ( /obj/effect/decal/cleanable/blood, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -21972,13 +21650,6 @@ /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer/test_floor4, /area/almayer/shipboard/brig/processing) -"fbu" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/structure/platform, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/engineering/lower/engine_core) "fbw" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -21989,10 +21660,6 @@ /obj/structure/machinery/body_scanconsole, /turf/open/floor/almayer/sterile_green_side/northwest, /area/almayer/medical/lower_medical_medbay) -"fbB" = ( -/obj/structure/pipes/standard/manifold/fourway/hidden/supply, -/turf/open/floor/almayer/dark_sterile, -/area/almayer/medical/upper_medical) "fbC" = ( /obj/structure/closet/toolcloset, /turf/open/floor/almayer/orange/southeast, @@ -22302,16 +21969,6 @@ }, /turf/open/floor/almayer, /area/almayer/maint/hull/upper/u_f_s) -"fiE" = ( -/obj/structure/machinery/computer/cameras/containment/hidden{ - dir = 4; - pixel_x = -17 - }, -/obj/structure/surface/table/almayer, -/obj/item/storage/photo_album, -/obj/item/device/camera_film, -/turf/open/floor/almayer, -/area/almayer/command/corporateliaison) "fiQ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -22339,6 +21996,12 @@ }, /turf/open/floor/almayer/blue/west, /area/almayer/hallways/upper/midship_hallway) +"fky" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/northeast, +/turf/open/floor/almayer/red/northwest, +/area/almayer/lifeboat_pumps/north1) "fkK" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 @@ -22378,21 +22041,6 @@ }, /turf/open/floor/almayer/aicore/no_build, /area/almayer/command/airoom) -"flR" = ( -/obj/effect/projector{ - name = "Almayer_AresDown"; - vector_x = 96; - vector_y = -65 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/stairs{ - dir = 1; - icon_state = "ramptop" - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "flW" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/light{ @@ -22410,6 +22058,14 @@ /obj/effect/step_trigger/clone_cleaner, /turf/open/floor/almayer/greencorner/north, /area/almayer/hallways/lower/port_fore_hallway) +"fmp" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/north2) "fmv" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -22459,16 +22115,6 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/living/briefing) -"fnA" = ( -/obj/structure/surface/rack, -/obj/item/tool/crowbar, -/obj/item/device/radio, -/obj/item/device/flashlight, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer/redfull, -/area/almayer/medical/upper_medical) "fnH" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -22478,6 +22124,10 @@ "fnI" = ( /turf/open/floor/almayer/test_floor4, /area/almayer/squads/req) +"fod" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/floor/almayer/red, +/area/almayer/lifeboat_pumps/north2) "foC" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/disposalpipe/segment{ @@ -22497,6 +22147,13 @@ }, /turf/open/floor/almayer/emeraldcorner/east, /area/almayer/squads/charlie) +"foM" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 4; + name = "ship-grade camera" + }, +/turf/open/gm/grass/grass1, +/area/almayer/medical/upper_medical) "foN" = ( /obj/structure/bed/chair, /turf/open/floor/almayer, @@ -22550,6 +22207,12 @@ }, /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/starboard_aft_hallway) +"fpJ" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 4 + }, +/turf/open/floor/almayer/orange/west, +/area/almayer/engineering/upper_engineering/starboard) "fpM" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -22714,6 +22377,10 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/shipboard/starboard_point_defense) +"frD" = ( +/obj/structure/morgue, +/turf/open/floor/almayer/test_floor5, +/area/almayer/medical/morgue) "frF" = ( /obj/structure/pipes/vents/scrubber{ dir = 8 @@ -22794,6 +22461,14 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/orange/east, /area/almayer/hallways/lower/port_umbilical) +"fuV" = ( +/obj/structure/bed, +/obj/item/bedsheet/green, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer/mono, +/area/almayer/medical/upper_medical) "fuY" = ( /obj/structure/bed/chair/bolted{ dir = 1 @@ -22813,10 +22488,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/living/briefing) -"fvd" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/almayer/sterile_green_corner/west, -/area/almayer/medical/upper_medical) "fvf" = ( /turf/open/floor/almayer/silver/north, /area/almayer/living/briefing) @@ -22927,6 +22598,12 @@ }, /turf/open/floor/almayer/plate, /area/almayer/shipboard/weapon_room) +"fyi" = ( +/obj/structure/pipes/standard/manifold/hidden/supply/no_boom{ + dir = 1 + }, +/turf/open/floor/almayer/orange/east, +/area/almayer/engineering/upper_engineering/port) "fyp" = ( /obj/structure/machinery/cryopod{ layer = 3.1; @@ -22934,6 +22611,14 @@ }, /turf/open/floor/almayer/cargo, /area/almayer/shipboard/brig/cryo) +"fyA" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/almayer/plating/northeast, +/area/almayer/engineering/lower/engine_core) "fyD" = ( /obj/structure/machinery/light, /obj/structure/ladder{ @@ -23070,12 +22755,6 @@ /obj/item/organ/lungs/prosthetic, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_m_p) -"fCp" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/command/lifeboat) "fCG" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -23142,10 +22821,6 @@ /obj/effect/landmark/late_join/charlie, /turf/open/floor/almayer/plate, /area/almayer/squads/charlie) -"fDS" = ( -/obj/structure/platform_decoration, -/turf/open/floor/almayer/red, -/area/almayer/lifeboat_pumps/south1) "fDU" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -23175,10 +22850,6 @@ "fEk" = ( /turf/open/floor/almayer/test_floor4, /area/almayer/command/cichallway) -"fEC" = ( -/obj/structure/machinery/power/apc/almayer/south, -/turf/open/floor/almayer/plate, -/area/almayer/medical/morgue) "fEF" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -23195,11 +22866,6 @@ }, /turf/open/floor/almayer/mono, /area/almayer/lifeboat_pumps/south2) -"fFh" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/device/autopsy_scanner, -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/morgue) "fFD" = ( /obj/structure/window/reinforced{ dir = 4; @@ -23220,15 +22886,6 @@ }, /turf/open/floor/almayer/dark_sterile, /area/almayer/medical/lower_medical_medbay) -"fFO" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/structure/morgue{ - dir = 8 - }, -/turf/open/floor/almayer/plate, -/area/almayer/medical/morgue) "fFQ" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/spray/cleaner{ @@ -23315,6 +22972,24 @@ "fHF" = ( /turf/open/floor/almayer/greenfull, /area/almayer/living/offices) +"fID" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 4; + id = "CMO Shutters"; + name = "\improper CMO Office Shutters" + }, +/obj/structure/machinery/door/airlock/almayer/medical/glass{ + access_modified = 1; + name = "\improper CMO's Office"; + req_one_access = null; + req_one_access_txt = "1;5" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/upper_medical) "fIK" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -23539,6 +23214,10 @@ }, /turf/open/floor/almayer/bluefull, /area/almayer/living/briefing) +"fMr" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/almayer/uscm/directional/northwest, +/area/almayer/living/briefing) "fMt" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ id = "ARES Interior"; @@ -23635,12 +23314,6 @@ /obj/item/device/camera_film, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_f_s) -"fOL" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/turf/open/floor/almayer/sterile_green_side/southwest, -/area/almayer/medical/upper_medical) "fPn" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 @@ -23706,14 +23379,6 @@ }, /turf/open/floor/almayer/plating/northeast, /area/almayer/engineering/lower/engine_core) -"fQu" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - id = "CMO Shutters"; - name = "\improper CMO Office Shutters" - }, -/obj/structure/window/framed/almayer/white, -/turf/open/floor/plating, -/area/almayer/medical/upper_medical) "fQy" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -23746,6 +23411,10 @@ }, /turf/open/floor/almayer/cargo, /area/almayer/maint/hull/upper/u_f_s) +"fRo" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/almayer/red/west, +/area/almayer/lifeboat_pumps/south2) "fRr" = ( /obj/structure/machinery/light{ dir = 1 @@ -23765,6 +23434,21 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/lower/port_aft_hallway) +"fRQ" = ( +/obj/structure/ladder{ + height = 1; + id = "med2" + }, +/obj/structure/sign/safety/ladder{ + pixel_x = 32; + pixel_y = -8 + }, +/obj/structure/sign/safety/rewire{ + pixel_x = 32; + pixel_y = 7 + }, +/turf/open/floor/plating/almayer, +/area/almayer/medical/lower_medical_lobby) "fRS" = ( /obj/effect/landmark/start/warden, /obj/effect/decal/warning_stripes{ @@ -23787,6 +23471,21 @@ }, /turf/open/floor/almayer/red, /area/almayer/lifeboat_pumps/north1) +"fSr" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + name = "\improper Bathroom" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + layer = 2.5; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/upper_medical) "fSx" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -23862,13 +23561,6 @@ /obj/structure/largecrate/random/barrel/green, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_f_p) -"fVa" = ( -/obj/item/stack/catwalk, -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/plating, -/area/almayer/maint/hull/upper/u_a_p) "fVe" = ( /turf/closed/wall/almayer/outer, /area/almayer/maint/hull/upper/u_a_p) @@ -23926,13 +23618,9 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) -"fXg" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/morgue) +"fWK" = ( +/turf/open/floor/almayer/sterile_green_corner/north, +/area/almayer/medical/upper_medical) "fXx" = ( /obj/structure/surface/rack, /turf/open/floor/almayer/silver/southeast, @@ -23943,6 +23631,10 @@ }, /turf/open/floor/almayer/plate, /area/almayer/shipboard/starboard_point_defense) +"fXC" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/almayer/red, +/area/almayer/lifeboat_pumps/south2) "fXE" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/emails{ @@ -23972,9 +23664,6 @@ /obj/docking_port/stationary/emergency_response/port3, /turf/open/floor/almayer/plating/northeast, /area/almayer/shipboard/stern_point_defense) -"fYb" = ( -/turf/open/floor/almayer/sterile_green_side/west, -/area/almayer/medical/morgue) "fYf" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -23991,6 +23680,14 @@ /obj/item/device/radio, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_f_s) +"fYw" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/north1) "fYZ" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -24047,16 +23744,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/living/briefing) -"fZI" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/item/reagent_container/glass/bucket/mopbucket{ - pixel_x = 7; - pixel_y = -3 - }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/upper/u_a_p) "fZR" = ( /obj/structure/machinery/light/small, /turf/open/floor/plating/plating_catwalk, @@ -24085,6 +23772,14 @@ "gaJ" = ( /turf/closed/wall/almayer, /area/almayer/shipboard/brig/cryo) +"gaL" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + layer = 2.5; + pixel_y = 1 + }, +/turf/open/floor/almayer/sterile_green_side/north, +/area/almayer/medical/upper_medical) "gaQ" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -24112,30 +23807,6 @@ }, /turf/open/floor/almayer/aicore/no_build, /area/almayer/command/airoom) -"gbg" = ( -/obj/structure/sign/safety/terminal{ - pixel_x = 14; - pixel_y = 24 - }, -/obj/structure/sign/safety/laser{ - pixel_y = 24 - }, -/obj/structure/sign/safety/fibre_optics{ - pixel_x = 14; - pixel_y = 38 - }, -/obj/structure/sign/safety/rewire{ - pixel_y = 38 - }, -/obj/structure/machinery/door_control{ - id = "ARES Operations Right"; - name = "ARES Operations Shutter"; - pixel_x = -24; - pixel_y = -8; - req_one_access_txt = "91;92" - }, -/turf/open/floor/almayer/aicore/glowing/no_build/ai_floor3, -/area/almayer/command/airoom) "gbm" = ( /turf/open/floor/almayer/aicore/no_build/ai_silver/east, /area/almayer/command/airoom) @@ -24151,6 +23822,9 @@ "gbw" = ( /turf/open/floor/almayer/red/northeast, /area/almayer/shipboard/brig/processing) +"gbO" = ( +/turf/closed/wall/almayer/white/reinforced, +/area/almayer/medical/morgue) "gcm" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -24259,6 +23933,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/port_midship_hallway) +"geZ" = ( +/obj/structure/pipes/standard/manifold/hidden/supply/no_boom{ + dir = 1 + }, +/turf/open/floor/almayer/plate, +/area/almayer/command/lifeboat) "gfd" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -24331,6 +24011,10 @@ "ggt" = ( /turf/open/floor/almayer/silver/northeast, /area/almayer/shipboard/brig/cic_hallway) +"ggy" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/almayer/plating/northeast, +/area/almayer/engineering/lower/engine_core) "ggz" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer/dark_sterile, @@ -24377,6 +24061,30 @@ "ghF" = ( /turf/open/floor/almayer, /area/almayer/hallways/lower/vehiclehangar) +"gig" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/ashtray/bronze{ + pixel_x = 2; + pixel_y = 9 + }, +/obj/structure/machinery/door_control/cl/office/window{ + pixel_x = 6; + pixel_y = 4 + }, +/obj/structure/machinery/door_control/cl/office/door{ + pixel_x = 6; + pixel_y = -3 + }, +/obj/item/spacecash/c500{ + pixel_x = -10; + pixel_y = 8 + }, +/obj/item/paper_bin/wy{ + pixel_x = 17; + pixel_y = 6 + }, +/turf/open/floor/carpet, +/area/almayer/command/corporateliaison) "gii" = ( /obj/structure/bed/chair/bolted{ dir = 8 @@ -24399,6 +24107,9 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/orange/north, /area/almayer/squads/bravo) +"giz" = ( +/turf/open/floor/almayer/greenfull, +/area/almayer/hallways/upper/fore_hallway) "giD" = ( /obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/almayer/plate, @@ -24446,17 +24157,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/hallways/hangar) -"gjq" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform, -/obj/structure/platform_decoration{ - dir = 10; - layer = 3.51 - }, -/turf/open/floor/almayer/red/southwest, -/area/almayer/lifeboat_pumps/south1) "gjt" = ( /obj/structure/bed/chair/office/dark, /turf/open/floor/almayer/red/east, @@ -24515,6 +24215,12 @@ }, /turf/open/floor/almayer/plate, /area/almayer/command/cic) +"gkL" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform/metal/almayer, +/obj/structure/platform_decoration/metal/almayer/southwest, +/turf/open/floor/almayer/red/southwest, +/area/almayer/lifeboat_pumps/north2) "gll" = ( /obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer, @@ -24574,10 +24280,13 @@ /obj/structure/machinery/portable_atmospherics/canister/air, /turf/open/floor/almayer/plate, /area/almayer/shipboard/starboard_point_defense) -"gms" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/orange/southeast, -/area/almayer/engineering/upper_engineering/port) +"gnl" = ( +/obj/structure/bed/chair{ + dir = 8; + pixel_y = 3 + }, +/turf/open/floor/almayer/sterile_green_side, +/area/almayer/medical/upper_medical) "gnu" = ( /obj/structure/bed/chair{ dir = 4 @@ -24592,12 +24301,6 @@ "gnv" = ( /turf/open/floor/almayer/red/northeast, /area/almayer/lifeboat_pumps/south1) -"gnB" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/lower/repair_bay) "gnK" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /obj/structure/disposalpipe/junction{ @@ -24612,12 +24315,6 @@ /obj/item/frame/table, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_f_p) -"gof" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_p) "goj" = ( /obj/structure/machinery/door/poddoor/almayer/open{ dir = 2; @@ -24733,12 +24430,40 @@ "gpY" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/lifeboat_pumps/north1) +"gqg" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/almayer/mono, +/area/almayer/medical/upper_medical) +"gqm" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/bed/sofa/south/white/right, +/obj/effect/decal/cleanable/dirt, +/obj/item/toy/plush/therapy/random_color{ + pixel_y = -3 + }, +/obj/structure/sign/nosmoking_2{ + pixel_y = 29 + }, +/turf/open/floor/almayer/mono, +/area/almayer/medical/upper_medical) "gqt" = ( /obj/structure/sign/safety/storage{ pixel_x = -17 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_a_s) +"gqv" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/almayer/plate, +/area/almayer/hallways/hangar) "gqx" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -24754,6 +24479,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/upper/midship_hallway) +"gqA" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 5 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/command/lifeboat) "gqH" = ( /turf/open/floor/almayer/blue/southwest, /area/almayer/hallways/upper/midship_hallway) @@ -24780,12 +24511,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliaison) -"grd" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/upper/u_a_p) "gre" = ( /turf/open/floor/almayer/greencorner/north, /area/almayer/hallways/upper/fore_hallway) @@ -24822,6 +24547,10 @@ }, /turf/open/floor/plating, /area/almayer/maint/lower/constr) +"gsa" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/almayer/red/north, +/area/almayer/lifeboat_pumps/north2) "gsd" = ( /obj/structure/surface/table/almayer, /obj/item/tool/hand_labeler{ @@ -24954,6 +24683,25 @@ }, /turf/open/floor/almayer/red/west, /area/almayer/shipboard/brig/perma) +"gtY" = ( +/obj/effect/projector{ + name = "Almayer_AresDown"; + vector_x = 96; + vector_y = -65 + }, +/obj/structure/platform/metal/almayer/west, +/obj/structure/stairs{ + dir = 1; + icon_state = "ramptop" + }, +/obj/structure/machinery/door_control{ + id = "ARES StairsUpper"; + name = "ARES Core Access"; + pixel_x = -24; + req_one_access_txt = "90;91;92" + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "guo" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out"; @@ -24961,6 +24709,10 @@ }, /turf/open/floor/almayer/redfull, /area/almayer/lifeboat_pumps/south2) +"guI" = ( +/obj/structure/platform/metal/almayer, +/turf/open/floor/almayer/red, +/area/almayer/lifeboat_pumps/south1) "guK" = ( /obj/effect/projector{ name = "Almayer_Up3"; @@ -25140,12 +24892,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/hallways/lower/starboard_fore_hallway) -"gyv" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/living/briefing) "gyw" = ( /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/port_aft_hallway) @@ -25180,29 +24926,6 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north2) -"gzn" = ( -/obj/structure/machinery/landinglight/ds2/delaytwo{ - dir = 8 - }, -/obj/structure/platform_decoration, -/obj/structure/bed/chair{ - can_buckle = 0; - dir = 4 - }, -/obj/structure/bed/chair{ - can_buckle = 0; - dir = 4; - pixel_x = 1; - pixel_y = 3 - }, -/obj/structure/bed/chair{ - can_buckle = 0; - dir = 4; - pixel_x = 2; - pixel_y = 6 - }, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/hangar) "gzq" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/lower/engine_core) @@ -25224,13 +24947,6 @@ }, /turf/open/floor/plating, /area/almayer/living/pilotbunks) -"gzK" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/morgue) "gzM" = ( /obj/effect/step_trigger/clone_cleaner, /obj/structure/sign/safety/stairs{ @@ -25480,12 +25196,6 @@ /obj/structure/machinery/cm_vending/gear/commanding_officer, /turf/open/floor/almayer/cargo, /area/almayer/living/commandbunks) -"gGb" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/upper/u_a_p) "gGf" = ( /obj/structure/machinery/light{ dir = 1 @@ -25737,13 +25447,6 @@ "gKK" = ( /turf/open/floor/almayer/silvercorner, /area/almayer/hallways/lower/repair_bay) -"gKR" = ( -/obj/structure/closet/emcloset, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer/sterile_green_side/west, -/area/almayer/medical/upper_medical) "gKZ" = ( /obj/structure/surface/table/almayer, /obj/item/tool/wet_sign, @@ -25790,19 +25493,6 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/lower) -"gLE" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 9; - layer = 3.51 - }, -/turf/open/floor/almayer/red/northeast, -/area/almayer/lifeboat_pumps/south1) "gLG" = ( /obj/structure/machinery/light{ dir = 1 @@ -25954,6 +25644,19 @@ }, /turf/open/floor/plating, /area/almayer/maint/lower/constr) +"gOu" = ( +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22" + }, +/obj/item/tool/mop{ + pixel_x = -6; + pixel_y = 24 + }, +/obj/structure/pipes/vents/pump/no_boom{ + dir = 1 + }, +/turf/open/floor/almayer/plate, +/area/almayer/engineering/upper_engineering/starboard) "gOC" = ( /obj/structure/machinery/recharge_station, /turf/open/floor/almayer/orange/northeast, @@ -25996,22 +25699,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/vehiclehangar) -"gQk" = ( -/obj/structure/surface/table/almayer, -/obj/structure/sign/safety/terminal{ - pixel_x = -17 - }, -/obj/structure/machinery/faxmachine/corporate/liaison, -/turf/open/floor/wood/ship, -/area/almayer/command/corporateliaison) -"gQu" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/item/storage/firstaid/rad, -/obj/structure/surface/rack, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/upper/u_a_s) "gQF" = ( /obj/structure/bed/chair/comfy{ buckling_y = 2; @@ -26036,14 +25723,6 @@ /obj/item/tool/wet_sign, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_m_p) -"gRd" = ( -/obj/structure/platform, -/obj/structure/target{ - desc = "'Such an insult (referring to Canton) can only be repaid in American blood. Mark my words, this will happen'-Kolonel Ganbaatar UPP Armed Forces"; - name = "Kolonel Ganbaatar" - }, -/turf/open/floor/almayer, -/area/almayer/hallways/hangar) "gRJ" = ( /obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes{ @@ -26295,12 +25974,6 @@ }, /turf/open/floor/plating, /area/almayer/medical/upper_medical) -"gXl" = ( -/obj/structure/closet/secure_closet/personal/cabinet{ - req_access_txt = "5" - }, -/turf/open/floor/almayer/mono, -/area/almayer/medical/upper_medical) "gXs" = ( /obj/effect/step_trigger/ares_alert/terminals, /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -26341,21 +26014,6 @@ }, /turf/open/floor/almayer/silver, /area/almayer/hallways/lower/repair_bay) -"gYj" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 1 - }, -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/lower/repair_bay) "gYl" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -26384,19 +26042,17 @@ }, /turf/open/floor/almayer/red/north, /area/almayer/shipboard/brig/starboard_hallway) -"gYI" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/decal/cleanable/blood/oil/streak, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/upper/u_a_p) "gYU" = ( /obj/structure/machinery/light/small{ dir = 4 }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_a_p) +"gZk" = ( +/obj/structure/bed/sofa/south/white/right, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/sterile_green_corner, +/area/almayer/medical/upper_medical) "gZw" = ( /obj/structure/bed/sofa/vert/grey/bot, /turf/open/floor/almayer, @@ -26412,6 +26068,10 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/command/lifeboat) +"gZR" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/almayer/red/north, +/area/almayer/lifeboat_pumps/south2) "gZW" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -26419,10 +26079,6 @@ }, /turf/open/floor/almayer/red/east, /area/almayer/hallways/lower/port_fore_hallway) -"had" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/red, -/area/almayer/command/lifeboat) "hal" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 1 @@ -26484,6 +26140,14 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/redcorner, /area/almayer/shipboard/brig/starboard_hallway) +"hbg" = ( +/obj/structure/machinery/computer/med_data, +/obj/structure/sign/safety/terminal{ + pixel_x = 3; + pixel_y = 29 + }, +/turf/open/floor/almayer/sterile_green_side/north, +/area/almayer/medical/upper_medical) "hbl" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 @@ -26525,14 +26189,13 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_a_s) -"hbI" = ( -/obj/structure/sign/safety/ammunition{ - pixel_x = 32; - pixel_y = 7 +"hca" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" }, -/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, -/turf/open/floor/almayer/redfull, -/area/almayer/medical/upper_medical) +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/almayer/plating/northeast, +/area/almayer/engineering/lower/engine_core) "hcf" = ( /obj/item/bedsheet/brown{ layer = 3.2 @@ -26574,6 +26237,11 @@ }, /turf/open/floor/almayer/plate, /area/almayer/living/cryo_cells) +"hcA" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/medical/morgue) "hcI" = ( /obj/structure/machinery/cryopod{ pixel_y = 6 @@ -26649,6 +26317,10 @@ }, /turf/open/floor/almayer/plate, /area/almayer/shipboard/brig/armory) +"hex" = ( +/obj/structure/flora/bush/ausbushes/lavendergrass, +/turf/open/gm/grass/grass1, +/area/almayer/medical/upper_medical) "heK" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1; @@ -26692,6 +26364,21 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/lower/engine_core) +"hfk" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 4 + }, +/turf/open/floor/almayer/red/west, +/area/almayer/command/lifeboat) +"hfr" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/photocopier{ + layer = 2.9 + }, +/turf/open/floor/almayer/dark_sterile, +/area/almayer/medical/upper_medical) "hft" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /obj/structure/disposalpipe/segment{ @@ -26825,11 +26512,6 @@ /obj/structure/machinery/floodlight/landing, /turf/open/floor/almayer/plate, /area/almayer/hallways/hangar) -"hip" = ( -/obj/item/device/multitool, -/obj/structure/platform_decoration, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/engineering/lower/engine_core) "hiu" = ( /obj/structure/prop/invuln/lattice_prop{ icon_state = "lattice13"; @@ -26844,6 +26526,29 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/lifeboat_pumps/north1) +"hiB" = ( +/obj/effect/projector{ + name = "Almayer_AresDown"; + vector_x = 96; + vector_y = -65 + }, +/obj/structure/platform/metal/almayer/east, +/obj/structure/stairs{ + dir = 1; + icon_state = "ramptop" + }, +/obj/structure/machinery/door_control{ + id = "ARES StairsUpper"; + name = "ARES Core Access"; + pixel_x = 24; + req_one_access_txt = "90;91;92" + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) +"hiG" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/almayer/red/north, +/area/almayer/lifeboat_pumps/south2) "hiM" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -26878,6 +26583,14 @@ }, /turf/open/floor/almayer/cargo_arrow/west, /area/almayer/squads/delta) +"hjt" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/south1) "hjA" = ( /turf/open/floor/almayer/red/southwest, /area/almayer/shipboard/port_missiles) @@ -27043,16 +26756,6 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/command/cichallway) -"hlX" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/south2) "hme" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -27076,16 +26779,6 @@ /obj/structure/machinery/power/reactor, /turf/open/floor/almayer/test_floor4, /area/almayer/engineering/lower/engine_core) -"hmw" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/engineering/lower/engine_core) "hmy" = ( /obj/structure/machinery/light{ dir = 1 @@ -27215,6 +26908,12 @@ }, /turf/open/floor/almayer/mono, /area/almayer/hallways/lower/vehiclehangar) +"hoB" = ( +/obj/structure/machinery/chem_dispenser/corpsman{ + pixel_y = 3 + }, +/turf/open/floor/almayer/blue, +/area/almayer/squads/delta) "hoK" = ( /turf/open/floor/almayer/red/west, /area/almayer/shipboard/brig/starboard_hallway) @@ -27453,6 +27152,12 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_f_p) +"hts" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 4 + }, +/turf/open/floor/almayer/red/northeast, +/area/almayer/command/lifeboat) "htG" = ( /obj/item/tool/soap, /obj/structure/machinery/light/small{ @@ -27463,12 +27168,6 @@ }, /turf/open/floor/almayer/dark_sterile, /area/almayer/engineering/upper_engineering/port) -"htI" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/almayer/living/briefing) "htL" = ( /obj/structure/surface/table/almayer, /obj/item/prop/magazine/boots/n150{ @@ -27608,6 +27307,9 @@ /obj/structure/surface/table/reinforced/black, /turf/open/floor/almayer, /area/almayer/command/cic) +"hxt" = ( +/turf/open/floor/almayer/sterile_green_side/northeast, +/area/almayer/medical/morgue) "hxG" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -27642,6 +27344,24 @@ /obj/structure/largecrate/random/barrel/red, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_a_s) +"hyg" = ( +/obj/structure/platform/metal/almayer, +/obj/item/trash/cigbutt/ucigbutt{ + layer = 3.7; + pixel_x = 5; + pixel_y = 8 + }, +/obj/item/ashtray/plastic{ + layer = 3.4; + pixel_x = 4 + }, +/obj/structure/largecrate/random/case, +/obj/item/trash/cigbutt/ucigbutt{ + pixel_x = -6; + pixel_y = 7 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/hangar) "hyk" = ( /turf/open/floor/almayer/plate, /area/almayer/squads/charlie_delta_shared) @@ -27882,6 +27602,10 @@ }, /turf/open/floor/almayer/plate, /area/almayer/shipboard/brig/perma) +"hDq" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/almayer/cargo, +/area/almayer/medical/upper_medical) "hDw" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/emails{ @@ -27988,16 +27712,6 @@ /obj/structure/bed/chair/comfy, /turf/open/floor/almayer/sterile_green_side/west, /area/almayer/medical/medical_science) -"hFF" = ( -/obj/structure/machinery/door/airlock/almayer/medical{ - access_modified = 1; - name = "Autopsy"; - req_access_txt = "25"; - req_one_access = null - }, -/obj/structure/machinery/door/firedoor/border_only/almayer, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/morgue) "hGb" = ( /obj/structure/machinery/camera/autoname/almayer{ name = "ship-grade camera" @@ -28054,17 +27768,6 @@ /obj/item/storage/pouch/general/large, /turf/open/floor/almayer, /area/almayer/living/bridgebunks) -"hHr" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 6; - layer = 3.51 - }, -/turf/open/floor/almayer/red/southeast, -/area/almayer/lifeboat_pumps/south1) "hIp" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -28112,16 +27815,6 @@ }, /turf/open/floor/almayer/orange, /area/almayer/engineering/lower) -"hJk" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/south1) "hJD" = ( /obj/structure/bed/sofa/south/grey/right{ pixel_y = 12 @@ -28193,6 +27886,10 @@ /obj/structure/surface/table/almayer, /turf/open/floor/almayer/plate, /area/almayer/living/grunt_rnr) +"hLH" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/almayer/red/north, +/area/almayer/lifeboat_pumps/south2) "hLI" = ( /turf/open/floor/almayer/red, /area/almayer/living/cryo_cells) @@ -28256,6 +27953,15 @@ /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/squads/charlie) +"hNy" = ( +/obj/structure/machinery/cm_vending/sorted/medical/bolted, +/obj/structure/medical_supply_link/green, +/obj/structure/sign/safety/autodoc{ + pixel_x = 20; + pixel_y = -32 + }, +/turf/open/floor/almayer/sterile_green_side, +/area/almayer/medical/lower_medical_medbay) "hNB" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/airlock/almayer/maint/reinforced{ @@ -28388,16 +28094,6 @@ /obj/structure/reagent_dispensers/fueltank/custom, /turf/open/floor/almayer/cargo, /area/almayer/engineering/lower/workshop/hangar) -"hQU" = ( -/obj/structure/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/structure/sign/safety/intercom{ - pixel_x = -17 - }, -/turf/open/floor/almayer/plate, -/area/almayer/medical/morgue) "hQW" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -28478,12 +28174,6 @@ "hSk" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/port) -"hSt" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer/orange/west, -/area/almayer/engineering/upper_engineering/port) "hSv" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -28548,6 +28238,14 @@ }, /turf/open/floor/almayer/no_build, /area/almayer/shipboard/brig/processing) +"hTw" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/morgue) "hTF" = ( /obj/structure/machinery/suit_storage_unit/compression_suit/uscm{ isopen = 1; @@ -28609,6 +28307,14 @@ }, /turf/open/floor/almayer/dark_sterile, /area/almayer/shipboard/brig/medical) +"hUi" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/almayer/plating/northeast, +/area/almayer/engineering/lower/engine_core) "hUk" = ( /turf/open/floor/almayer/orange/southwest, /area/almayer/engineering/lower/engine_core) @@ -28669,12 +28375,6 @@ }, /turf/open/floor/almayer/sterile_green_side/southeast, /area/almayer/medical/medical_science) -"hVz" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/upper_medical) "hVL" = ( /obj/structure/largecrate/random/barrel/red, /turf/open/floor/almayer/plate, @@ -28688,26 +28388,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/upper/fore_hallway) -"hWq" = ( -/obj/structure/platform{ - layer = 3.1 - }, -/obj/item/trash/cigbutt/ucigbutt{ - layer = 3.7; - pixel_x = 5; - pixel_y = 8 - }, -/obj/item/ashtray/plastic{ - layer = 3.4; - pixel_x = 4 - }, -/obj/structure/largecrate/random/case, -/obj/item/trash/cigbutt/ucigbutt{ - pixel_x = -6; - pixel_y = 7 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/hangar) "hWr" = ( /obj/effect/landmark/start/marine/smartgunner/bravo, /obj/effect/landmark/late_join/bravo, @@ -28764,13 +28444,6 @@ /obj/structure/pipes/vents/scrubber, /turf/open/floor/almayer/blue/north, /area/almayer/command/cichallway) -"hWP" = ( -/obj/effect/step_trigger/clone_cleaner, -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/almayer/aicore/no_build/ai_silver/west, -/area/almayer/command/airoom) "hXb" = ( /turf/open/floor/almayer/cargo_arrow/north, /area/almayer/squads/charlie_delta_shared) @@ -28997,6 +28670,10 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/floor/almayer/plate, /area/almayer/maint/lower/s_bow) +"ibD" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/upper/u_a_p) "ibP" = ( /obj/structure/sign/safety/maint{ pixel_x = -19; @@ -29210,10 +28887,6 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/maint/lower/constr) -"ihw" = ( -/obj/structure/machinery/cm_vending/sorted/medical/blood, -/turf/open/floor/almayer/sterile_green_corner/north, -/area/almayer/medical/lower_medical_medbay) "ihI" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -29302,6 +28975,13 @@ }, /turf/open/floor/almayer/redfull, /area/almayer/living/briefing) +"ijP" = ( +/obj/structure/sign/safety/med_cryo{ + pixel_x = -6; + pixel_y = 32 + }, +/turf/open/floor/almayer/sterile_green_side/north, +/area/almayer/medical/lower_medical_medbay) "ijQ" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/door_control{ @@ -29343,6 +29023,19 @@ /obj/effect/landmark/yautja_teleport, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/s_bow) +"ikD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light/double/blue{ + dir = 4; + light_color = "#a7dbc7" + }, +/obj/structure/reagent_dispensers/water_cooler/stacks{ + pixel_y = 23; + pixel_x = -8; + density = 0 + }, +/turf/open/floor/almayer/sterile_green_corner, +/area/almayer/medical/upper_medical) "ikQ" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/tool/stamp/hop{ @@ -29401,10 +29094,6 @@ /obj/structure/machinery/light, /turf/open/floor/almayer/dark_sterile, /area/almayer/medical/lower_medical_lobby) -"imp" = ( -/obj/structure/filingcabinet/filingcabinet, -/turf/open/floor/almayer/sterile_green_side/west, -/area/almayer/medical/morgue) "imt" = ( /obj/structure/reagent_dispensers/water_cooler/stacks{ density = 0; @@ -29478,6 +29167,10 @@ }, /turf/open/floor/almayer/plate, /area/almayer/squads/alpha_bravo_shared) +"ioD" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/almayer, +/area/almayer/living/chapel) "ioH" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -29575,6 +29268,12 @@ }, /turf/open/floor/almayer/sterile_green, /area/almayer/medical/hydroponics) +"iqb" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 4 + }, +/turf/open/floor/almayer/orange/west, +/area/almayer/engineering/upper_engineering/port) "iqd" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -29622,12 +29321,6 @@ }, /turf/open/floor/almayer/aicore/no_build, /area/almayer/command/airoom) -"iry" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/almayer/red/west, -/area/almayer/lifeboat_pumps/south2) "irJ" = ( /obj/item/tool/wirecutters{ pixel_y = -7 @@ -29686,6 +29379,10 @@ /obj/structure/largecrate/random/secure, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_m_p) +"isH" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/almayer/red/north, +/area/almayer/lifeboat_pumps/south1) "isI" = ( /obj/structure/sign/nosmoking_2{ pixel_x = 32 @@ -29695,14 +29392,6 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/lifeboat_pumps/north1) -"isN" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/turf/open/floor/almayer/sterile_green_side/west, -/area/almayer/medical/morgue) "itg" = ( /obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 4 @@ -29804,12 +29493,6 @@ /obj/structure/closet, /turf/open/floor/almayer/plate, /area/almayer/living/port_emb) -"ivL" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_p) "ivM" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -29932,6 +29615,12 @@ }, /turf/open/floor/almayer/silver, /area/almayer/hallways/lower/repair_bay) +"iya" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 4 + }, +/turf/open/floor/almayer/orange/east, +/area/almayer/engineering/upper_engineering/starboard) "iyC" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -30023,6 +29712,10 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/p_bow) +"iBE" = ( +/obj/structure/flora/bush/ausbushes/ausbush, +/turf/open/gm/grass/grass1, +/area/almayer/medical/upper_medical) "iBY" = ( /obj/structure/machinery/vending/snack, /turf/open/floor/almayer/silver/southeast, @@ -30230,15 +29923,13 @@ }, /turf/open/floor/almayer/sterile_green_side/west, /area/almayer/medical/operating_room_four) -"iGQ" = ( -/obj/structure/machinery/landinglight/ds2/delayone{ - dir = 8 - }, -/obj/structure/platform{ - dir = 4 +"iGH" = ( +/obj/structure/window/framed/almayer/white, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 }, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/hangar) +/turf/open/floor/plating, +/area/almayer/medical/morgue) "iHc" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/notunnel) @@ -30254,14 +29945,6 @@ }, /turf/open/floor/almayer/cargo, /area/almayer/maint/upper/u_m_p) -"iIj" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/engineering/lower/engine_core) "iIl" = ( /obj/structure/sink{ dir = 8; @@ -30270,6 +29953,10 @@ }, /turf/open/floor/prison/kitchen, /area/almayer/living/grunt_rnr) +"iIt" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/almayer/red/north, +/area/almayer/lifeboat_pumps/north2) "iIO" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -30316,6 +30003,14 @@ }, /turf/open/floor/almayer/silver, /area/almayer/command/cichallway) +"iJP" = ( +/obj/structure/machinery/power/apc/almayer/north, +/obj/structure/sign/safety/autodoc{ + pixel_x = 20; + pixel_y = 32 + }, +/turf/open/floor/almayer/sterile_green_side/north, +/area/almayer/medical/lower_medical_medbay) "iJS" = ( /obj/structure/machinery/cm_vending/gear/tl{ density = 0; @@ -30377,29 +30072,10 @@ "iKM" = ( /turf/open/floor/almayer/mono, /area/almayer/engineering/port_atmos) -"iKV" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/reagent_dispensers/watertank, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/upper/u_a_s) -"iKZ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer/orange/east, -/area/almayer/engineering/upper_engineering/starboard) -"iLd" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/south1) +"iKN" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/almayer/red/east, +/area/almayer/lifeboat_pumps/south2) "iLf" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/disk_reader, @@ -30426,21 +30102,6 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/navigation) -"iLs" = ( -/obj/structure/ladder{ - height = 1; - id = "med2" - }, -/obj/structure/sign/safety/ladder{ - pixel_x = 32; - pixel_y = -8 - }, -/obj/structure/sign/safety/rewire{ - pixel_x = 32; - pixel_y = 7 - }, -/turf/open/floor/almayer/sterile_green_corner/east, -/area/almayer/medical/lower_medical_lobby) "iLG" = ( /obj/structure/disposalpipe/junction{ dir = 1; @@ -30462,12 +30123,6 @@ /obj/structure/machinery/cryopod/right, /turf/open/floor/almayer/cargo, /area/almayer/squads/bravo) -"iMx" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/almayer/red/north, -/area/almayer/lifeboat_pumps/south2) "iMD" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out" @@ -30566,12 +30221,6 @@ }, /turf/open/floor/almayer/silver/southwest, /area/almayer/living/briefing) -"iPD" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/command/lifeboat) "iPH" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -30811,12 +30460,16 @@ }, /turf/open/floor/almayer/silvercorner, /area/almayer/hallways/upper/midship_hallway) -"iSB" = ( -/obj/structure/platform_decoration{ +"iSy" = ( +/obj/structure/pipes/standard/manifold/hidden/supply/no_boom{ dir = 8 }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/upper/u_a_s) +/turf/open/floor/almayer/red, +/area/almayer/command/lifeboat) +"iSM" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/dark_sterile, +/area/almayer/medical/upper_medical) "iSV" = ( /obj/structure/machinery/door/airlock/almayer/maint{ access_modified = 1; @@ -30954,13 +30607,6 @@ }, /turf/open/floor/almayer/sterile_green_corner/west, /area/almayer/shipboard/brig/medical) -"iUW" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/item/tool/crowbar/red, -/turf/open/floor/almayer/orange/west, -/area/almayer/engineering/upper_engineering/starboard) "iUX" = ( /obj/structure/filingcabinet{ density = 0; @@ -31102,6 +30748,10 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/shipboard/panic) +"iXu" = ( +/obj/structure/pipes/vents/pump/no_boom, +/turf/open/floor/almayer/plate, +/area/almayer/command/lifeboat) "iXA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -31129,10 +30779,6 @@ /obj/item/book/manual/evaguide, /turf/open/floor/almayer, /area/almayer/living/briefing) -"iXW" = ( -/obj/structure/machinery/power/apc/almayer/east, -/turf/open/floor/almayer/sterile_green_corner, -/area/almayer/medical/lower_medical_lobby) "iYe" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -31165,6 +30811,14 @@ /obj/structure/bed/chair, /turf/open/floor/almayer/plate, /area/almayer/living/gym) +"iYO" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/machinery/cm_vending/sorted/medical/blood/bolted, +/obj/structure/medical_supply_link, +/turf/open/floor/almayer/sterile_green_side/north, +/area/almayer/medical/lockerroom) "iZd" = ( /obj/structure/largecrate/random/barrel/blue, /turf/open/floor/almayer/plate, @@ -31189,17 +30843,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/engineering/lower/workshop/hangar) -"iZP" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform, -/obj/structure/platform_decoration{ - dir = 10; - layer = 3.51 - }, -/turf/open/floor/almayer/red/southwest, -/area/almayer/lifeboat_pumps/north1) "iZU" = ( /obj/effect/decal/cleanable/blood/oil/streak, /obj/structure/disposalpipe/segment, @@ -31382,11 +31025,6 @@ "jcP" = ( /turf/open/floor/almayer/plating_striped, /area/almayer/engineering/upper_engineering/starboard) -"jdl" = ( -/obj/effect/step_trigger/clone_cleaner, -/obj/structure/platform_decoration, -/turf/open/floor/almayer/aicore/no_build/ai_silver/east, -/area/almayer/command/airoom) "jdm" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -31416,6 +31054,13 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/dark_sterile, /area/almayer/medical/operating_room_three) +"jdQ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/sterile_green_side, +/area/almayer/medical/upper_medical) "jdZ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -31493,6 +31138,30 @@ /obj/structure/bed/chair/bolted, /turf/open/floor/almayer/plate, /area/almayer/shipboard/brig/perma) +"jfH" = ( +/obj/structure/sign/safety/terminal{ + pixel_x = 14; + pixel_y = 24 + }, +/obj/structure/sign/safety/laser{ + pixel_y = 24 + }, +/obj/structure/sign/safety/fibre_optics{ + pixel_x = 14; + pixel_y = 38 + }, +/obj/structure/sign/safety/rewire{ + pixel_y = 38 + }, +/obj/structure/machinery/door_control{ + id = "ARES Operations Right"; + name = "ARES Operations Shutter"; + pixel_x = -24; + pixel_y = -8; + req_one_access_txt = "91;92" + }, +/turf/open/floor/almayer/aicore/glowing/no_build/ai_floor3, +/area/almayer/command/airoom) "jfK" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -31590,24 +31259,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/notunnel) -"jgy" = ( -/obj/effect/step_trigger/teleporter_vector{ - name = "Almayer_AresUp"; - vector_x = -96; - vector_y = 65 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/stairs{ - dir = 1 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) -"jgF" = ( -/obj/structure/platform, -/turf/open/floor/almayer/red, -/area/almayer/lifeboat_pumps/north1) "jgJ" = ( /turf/open/floor/almayer/blue/east, /area/almayer/command/cichallway) @@ -31752,6 +31403,23 @@ }, /turf/open/floor/almayer/redcorner/north, /area/almayer/shipboard/brig/lobby) +"jiz" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/closet/secure_closet/engineering_welding{ + req_one_access_txt = "7;23;27" + }, +/obj/structure/platform/metal/almayer/east, +/obj/structure/sign/safety/terminal{ + pixel_y = 32 + }, +/obj/structure/sign/safety/fire_haz{ + pixel_x = 15; + pixel_y = 32 + }, +/turf/open/floor/almayer/silver/northeast, +/area/almayer/hallways/lower/repair_bay) "jiM" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -31805,10 +31473,6 @@ }, /turf/open/floor/almayer/cargo/southwest, /area/almayer/engineering/starboard_atmos) -"jkl" = ( -/obj/structure/morgue, -/turf/open/floor/almayer/plate, -/area/almayer/medical/morgue) "jkq" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -31882,25 +31546,6 @@ }, /turf/open/floor/almayer/blue/north, /area/almayer/hallways/upper/fore_hallway) -"jkY" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/structure/closet/secure_closet/engineering_welding{ - req_one_access_txt = "7;23;27" - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/sign/safety/terminal{ - pixel_y = 32 - }, -/obj/structure/sign/safety/fire_haz{ - pixel_x = 15; - pixel_y = 32 - }, -/turf/open/floor/almayer/silver/northeast, -/area/almayer/hallways/lower/repair_bay) "jlc" = ( /turf/open/floor/almayer/red/north, /area/almayer/hallways/upper/starboard) @@ -31980,6 +31625,18 @@ }, /turf/open/floor/almayer/bluefull, /area/almayer/living/briefing) +"jmx" = ( +/obj/item/device/flashlight/lamp{ + pixel_y = 8 + }, +/obj/item/clothing/glasses/science{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/device/flash, +/obj/structure/surface/table/reinforced/almayer_B, +/turf/open/floor/almayer/mono, +/area/almayer/medical/upper_medical) "jmz" = ( /obj/structure/largecrate/random/case/double, /obj/structure/sign/safety/distribution_pipes{ @@ -32085,6 +31742,12 @@ }, /turf/open/floor/almayer/dark_sterile, /area/almayer/engineering/laundry) +"jpa" = ( +/obj/structure/bed/sofa/south/white/left, +/obj/structure/platform/metal/almayer, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/medical/upper_medical) "jpl" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -32161,6 +31824,12 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/lower/starboard_midship_hallway) +"jqu" = ( +/obj/structure/pipes/standard/manifold/hidden/supply/no_boom{ + dir = 8 + }, +/turf/open/floor/almayer/red/north, +/area/almayer/command/lifeboat) "jqP" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ id = "ARES Interior"; @@ -32356,12 +32025,6 @@ }, /turf/open/floor/almayer/mono, /area/almayer/hallways/lower/vehiclehangar) -"juX" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/almayer/red, -/area/almayer/lifeboat_pumps/north1) "jva" = ( /obj/structure/closet, /obj/structure/sign/safety/med_cryo{ @@ -32440,6 +32103,17 @@ /obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/plate, /area/almayer/shipboard/brig/cryo) +"jvQ" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/machinery/light/small{ + dir = 8 + }, +/obj/structure/sign/safety/hvac_old{ + pixel_x = 8; + pixel_y = 32 + }, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/upper/u_a_p) "jvX" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -32488,10 +32162,6 @@ /obj/structure/machinery/light, /turf/open/floor/almayer/red, /area/almayer/shipboard/brig/starboard_hallway) -"jwJ" = ( -/obj/structure/platform_decoration, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_p) "jwK" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer/red/north, @@ -32603,10 +32273,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/starboard_midship_hallway) -"jzZ" = ( -/obj/structure/platform_decoration, -/turf/open/floor/almayer/red, -/area/almayer/lifeboat_pumps/north1) "jAe" = ( /obj/structure/surface/rack, /obj/item/storage/beer_pack, @@ -32622,35 +32288,12 @@ }, /turf/open/floor/almayer/orangecorner, /area/almayer/hallways/lower/starboard_aft_hallway) -"jAz" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 6; - layer = 3.51 - }, -/turf/open/floor/almayer/red/southeast, -/area/almayer/lifeboat_pumps/north1) "jAB" = ( /obj/structure/machinery/light{ dir = 4 }, /turf/open/floor/almayer/green/east, /area/almayer/squads/req) -"jAJ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/engineering/upper_engineering/port) -"jBy" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer/sterile_green_side/east, -/area/almayer/medical/morgue) "jBO" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 4; @@ -32795,6 +32438,16 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/medical/medical_science) +"jFg" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/largecrate/random/case/double{ + layer = 2.98 + }, +/obj/structure/sign/safety/life_support{ + pixel_x = 32 + }, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/upper/u_a_s) "jFt" = ( /obj/structure/machinery/light/small, /obj/effect/decal/warning_stripes{ @@ -32856,6 +32509,12 @@ /obj/structure/closet/firecloset, /turf/open/floor/almayer/cargo, /area/almayer/engineering/upper_engineering/port) +"jGa" = ( +/obj/vehicle/powerloader, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/almayer/cargo, +/area/almayer/hallways/lower/repair_bay) "jGn" = ( /obj/structure/machinery/light{ dir = 1 @@ -32897,6 +32556,13 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cic_hallway) +"jHj" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer/sterile_green_side/north, +/area/almayer/medical/upper_medical) "jHn" = ( /obj/structure/largecrate/random/case, /turf/open/floor/almayer/plate, @@ -32913,13 +32579,6 @@ }, /turf/open/floor/almayer/orange/west, /area/almayer/engineering/upper_engineering/port) -"jHQ" = ( -/obj/structure/machinery/crema_switch{ - pixel_x = -24; - req_access_txt = "25" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/morgue) "jIs" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -32956,20 +32615,6 @@ "jKn" = ( /turf/open/floor/almayer/plating/northeast, /area/almayer/shipboard/port_missiles) -"jKz" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/largecrate/random/case/double, -/obj/item/cell/crap{ - pixel_y = 14 - }, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/hangar) "jKF" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/almayer/open{ @@ -32998,6 +32643,19 @@ /obj/item/facepaint/green, /turf/open/floor/almayer/plate, /area/almayer/squads/alpha) +"jLc" = ( +/obj/effect/projector{ + name = "Almayer_AresUp"; + vector_x = -96; + vector_y = 65 + }, +/obj/structure/platform/metal/almayer/west, +/obj/structure/stairs{ + dir = 1; + icon_state = "ramptop" + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "jLg" = ( /obj/structure/closet/emcloset, /turf/open/floor/almayer/cargo, @@ -33053,6 +32711,10 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) +"jMs" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_a_p) "jMx" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -33089,17 +32751,6 @@ }, /turf/open/floor/almayer, /area/almayer/command/lifeboat) -"jMR" = ( -/obj/structure/platform{ - dir = 4; - layer = 2.7 - }, -/obj/structure/stairs/perspective{ - dir = 9; - icon_state = "p_stair_full" - }, -/turf/open/floor/almayer, -/area/almayer/living/briefing) "jNc" = ( /obj/structure/machinery/door/airlock/almayer/research/glass/reinforced{ id = "Containment Cell 3"; @@ -33245,14 +32896,6 @@ /obj/structure/machinery/power/apc/almayer/south, /turf/open/floor/almayer/orange, /area/almayer/engineering/lower) -"jOG" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, -/turf/open/floor/almayer/sterile_green_side/east, -/area/almayer/medical/upper_medical) "jPd" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 1; @@ -33299,6 +32942,18 @@ "jQt" = ( /turf/open/floor/almayer/research/containment/floor2/west, /area/almayer/medical/containment/cell) +"jQx" = ( +/obj/structure/platform_decoration/metal/almayer, +/obj/structure/machinery/power/apc/almayer/east, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/upper/u_a_p) +"jQN" = ( +/obj/structure/flora/bush/ausbushes/ppflowers, +/obj/structure/machinery/status_display{ + pixel_x = -32 + }, +/turf/open/gm/grass/grass1, +/area/almayer/medical/upper_medical) "jRc" = ( /obj/structure/machinery/cm_vending/sorted/tech/tool_storage, /obj/structure/machinery/status_display{ @@ -33326,12 +32981,6 @@ }, /turf/closed/wall/almayer/outer, /area/space) -"jRC" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/almayer/orange/east, -/area/almayer/engineering/upper_engineering/port) "jRH" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -33343,16 +32992,6 @@ /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer/cargo, /area/almayer/engineering/upper_engineering/starboard) -"jRS" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/hangar) "jSc" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -33374,6 +33013,26 @@ }, /turf/open/floor/almayer/emerald/northwest, /area/almayer/squads/charlie) +"jSq" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/sterile_green, +/area/almayer/medical/upper_medical) +"jSs" = ( +/obj/structure/surface/table/reinforced/black, +/obj/item/storage/toolbox/mechanical, +/obj/item/stack/cable_coil{ + pixel_x = -7; + pixel_y = 11 + }, +/obj/item/device/helmet_visor{ + pixel_x = 8; + pixel_y = 13 + }, +/obj/structure/pipes/vents/scrubber/no_boom, +/turf/open/floor/almayer/plate, +/area/almayer/engineering/upper_engineering/port) "jSw" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 1; @@ -33415,12 +33074,10 @@ }, /turf/open/floor/almayer/green/west, /area/almayer/living/offices) -"jTj" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E" - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/medical/upper_medical) +"jTg" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/almayer/red/north, +/area/almayer/lifeboat_pumps/north2) "jTt" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -33685,6 +33342,18 @@ /obj/structure/surface/rack, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/p_stern) +"jYC" = ( +/obj/structure/machinery/door/airlock/almayer/research/reinforced{ + access_modified = 1; + name = "\improper CMO's Bedroom"; + req_one_access_txt = "1;5" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/upper_medical) "jYH" = ( /obj/structure/blocker/invisible_wall, /obj/effect/decal/warning_stripes{ @@ -33708,6 +33377,13 @@ }, /turf/open/floor/plating/almayer, /area/almayer/maint/hull/lower/p_bow) +"jZc" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/southwest, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/mono, +/area/almayer/medical/upper_medical) "jZd" = ( /obj/structure/pipes/vents/pump{ dir = 8; @@ -33772,10 +33448,6 @@ /obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer, /area/almayer/medical/containment/cell/cl) -"jZY" = ( -/obj/structure/closet/l3closet/virology, -/turf/open/floor/almayer/redfull, -/area/almayer/medical/upper_medical) "kac" = ( /obj/structure/surface/rack, /obj/item/storage/toolbox/mechanical, @@ -33834,6 +33506,14 @@ /obj/structure/machinery/power/apc/almayer/west, /turf/open/floor/almayer/silver/west, /area/almayer/hallways/upper/midship_hallway) +"kaP" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/turf/open/floor/almayer/plating/northeast, +/area/almayer/engineering/lower/engine_core) "kaQ" = ( /obj/structure/disposalpipe/junction, /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -33902,12 +33582,6 @@ /obj/structure/pipes/standard/simple/hidden/supply/no_boom, /turf/open/floor/almayer/sterile_green_side/southeast, /area/almayer/medical/containment) -"kbV" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/almayer/living/briefing) "kbX" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -34005,6 +33679,23 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/dark_sterile, /area/almayer/medical/lower_medical_lobby) +"kem" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/repair_bay) +"keA" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/platform_decoration/metal/almayer/east, +/obj/item/tool/warning_cone, +/turf/open/floor/almayer/plate, +/area/almayer/hallways/hangar) "keG" = ( /obj/structure/machinery/door/airlock/almayer/security{ dir = 2; @@ -34049,22 +33740,6 @@ "kfU" = ( /turf/open/floor/plating, /area/almayer/powered/agent) -"kgp" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/transmitter{ - name = "CMO Office Telephone"; - phone_category = "Offices"; - phone_id = "CMO Office"; - pixel_y = 29 - }, -/obj/structure/sign/safety/commline_connection{ - pixel_x = 23; - pixel_y = 32 - }, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/upper_medical) "kgs" = ( /obj/structure/window/framed/almayer/white, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ @@ -34124,16 +33799,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/squads/charlie_delta_shared) -"khf" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_ew_full_cap"; - layer = 3.5 - }, -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/engineering/lower/engine_core) "khD" = ( /turf/open/floor/almayer/plate, /area/almayer/living/offices/flight) @@ -34201,12 +33866,6 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/maint/hull/upper/u_a_s) -"kiT" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/almayer/red/west, -/area/almayer/lifeboat_pumps/south1) "kiU" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -34226,6 +33885,11 @@ }, /turf/open/floor/almayer/plate, /area/almayer/living/briefing) +"kjh" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/upper/u_a_s) "kjk" = ( /obj/structure/machinery/cryopod/right, /obj/structure/sign/safety/cryo{ @@ -34416,12 +34080,6 @@ }, /turf/open/floor/almayer/cargo_arrow/west, /area/almayer/living/gym) -"koB" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/morgue) "koC" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -34697,15 +34355,6 @@ }, /turf/open/floor/almayer/green, /area/almayer/hallways/lower/starboard_midship_hallway) -"ktI" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/almayer/silver/east, -/area/almayer/hallways/lower/repair_bay) "ktQ" = ( /obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 4 @@ -34824,6 +34473,13 @@ }, /turf/open/floor/almayer/dark_sterile, /area/almayer/medical/lower_medical_lobby) +"kwE" = ( +/obj/structure/stairs{ + icon_state = "ramptop" + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/upper/u_a_p) "kwQ" = ( /obj/item/tool/warning_cone{ pixel_y = 16 @@ -34856,6 +34512,13 @@ }, /turf/open/floor/almayer/dark_sterile, /area/almayer/engineering/laundry) +"kxA" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/turf/open/floor/almayer/sterile_green_side/southeast, +/area/almayer/medical/lower_medical_lobby) "kxL" = ( /obj/structure/closet/coffin/woodencrate, /obj/structure/largecrate/random/mini/wooden{ @@ -35018,12 +34681,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/living/port_emb) -"kzO" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/engineering/lower/engine_core) "kAh" = ( /obj/structure/sign/safety/restrictedarea{ pixel_x = -17 @@ -35048,12 +34705,14 @@ /obj/structure/closet/secure_closet/brig, /turf/open/floor/almayer/red, /area/almayer/shipboard/brig/processing) -"kAU" = ( -/obj/structure/platform{ - dir = 4 +"kAO" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/turf/open/floor/almayer/red/east, -/area/almayer/lifeboat_pumps/south2) +/turf/open/floor/almayer/plating/northeast, +/area/almayer/engineering/lower/engine_core) "kBo" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -35174,6 +34833,13 @@ }, /turf/open/floor/almayer/dark_sterile, /area/almayer/medical/containment) +"kDv" = ( +/obj/structure/closet/secure_closet/guncabinet/red/armory_shotgun, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer/redfull, +/area/almayer/medical/upper_medical) "kDH" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -35224,10 +34890,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/living/briefing) -"kEp" = ( -/obj/structure/filingcabinet/filingcabinet, -/turf/open/floor/almayer/sterile_green_corner/west, -/area/almayer/medical/morgue) "kEq" = ( /obj/structure/machinery/door/window/ultra{ dir = 8; @@ -35341,6 +35003,10 @@ }, /turf/open/floor/almayer/green/southeast, /area/almayer/living/grunt_rnr) +"kHm" = ( +/obj/structure/closet/secure_closet/CMO, +/turf/open/floor/almayer/mono, +/area/almayer/medical/upper_medical) "kHo" = ( /obj/item/device/camera{ pixel_x = 4; @@ -35354,18 +35020,6 @@ /obj/item/device/camera_film, /turf/open/floor/almayer/red/west, /area/almayer/shipboard/brig/starboard_hallway) -"kHS" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer/orange/east, -/area/almayer/engineering/upper_engineering/port) -"kHY" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/almayer/orange/north, -/area/almayer/engineering/upper_engineering/starboard) "kIf" = ( /obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/plating/plating_catwalk, @@ -35385,6 +35039,24 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_f_s) +"kIm" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" + }, +/obj/structure/machinery/door_control{ + id = "ARES Mainframe Left"; + name = "ARES Mainframe Lockdown"; + pixel_x = 24; + pixel_y = 24; + req_one_access_txt = "91;92" + }, +/turf/open/floor/almayer/aicore/glowing/no_build, +/area/almayer/command/airoom) +"kIz" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/machinery/power/apc/almayer/north, +/turf/open/floor/almayer/silver/north, +/area/almayer/hallways/lower/repair_bay) "kIP" = ( /obj/structure/machinery/cryopod/right{ pixel_y = 6 @@ -35428,6 +35100,10 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) +"kJs" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/upper/u_a_s) "kJH" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -35510,6 +35186,16 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/hallways/lower/starboard_fore_hallway) +"kLH" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + dir = 4; + id = "CMO Shutters"; + name = "\improper CMO Office Shutters" + }, +/obj/structure/window/framed/almayer/white, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/plating, +/area/almayer/medical/upper_medical) "kLP" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -35520,10 +35206,6 @@ }, /turf/open/floor/almayer/greencorner/west, /area/almayer/squads/req) -"kMa" = ( -/obj/structure/platform_decoration, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/upper/u_a_s) "kMp" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -35593,12 +35275,6 @@ }, /turf/open/floor/almayer/plating/northeast, /area/almayer/shipboard/panic) -"kNk" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/almayer, -/area/almayer/engineering/upper_engineering/starboard) "kNl" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -35712,6 +35388,10 @@ "kPa" = ( /turf/open/floor/almayer/greencorner/west, /area/almayer/hallways/upper/fore_hallway) +"kPb" = ( +/obj/structure/pipes/unary/freezer, +/turf/open/floor/almayer/sterile_green_side/north, +/area/almayer/medical/cryo_tubes) "kPx" = ( /obj/structure/surface/table/almayer, /obj/item/device/mass_spectrometer, @@ -35802,6 +35482,14 @@ /obj/structure/closet/firecloset, /turf/open/floor/almayer/cargo, /area/almayer/command/lifeboat) +"kRy" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/south1) "kRD" = ( /obj/item/reagent_container/glass/bucket/janibucket, /obj/structure/machinery/light{ @@ -35840,17 +35528,6 @@ }, /turf/open/floor/almayer/aicore/glowing/no_build/ai_floor3, /area/almayer/command/airoom) -"kRU" = ( -/obj/vehicle/powerloader, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/almayer/cargo, -/area/almayer/hallways/lower/repair_bay) "kSi" = ( /obj/structure/machinery/cm_vending/gear/intelligence_officer{ density = 0; @@ -35869,19 +35546,6 @@ /obj/item/reagent_container/glass/bucket/janibucket, /turf/open/floor/almayer/orange/southeast, /area/almayer/hallways/hangar) -"kSy" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/obj/structure/machinery/door_control{ - id = "ARES Mainframe Right"; - name = "ARES Mainframe Lockdown"; - pixel_x = -24; - pixel_y = 24; - req_one_access_txt = "91;92" - }, -/turf/open/floor/almayer/aicore/glowing/no_build, -/area/almayer/command/airoom) "kSA" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/poddoor/almayer{ @@ -36212,6 +35876,12 @@ }, /turf/open/floor/almayer/mono, /area/almayer/medical/hydroponics) +"kZY" = ( +/obj/structure/surface/table/almayer, +/obj/item/paper_bin/uscm, +/obj/item/tool/pen, +/turf/open/floor/almayer/sterile_green_corner/west, +/area/almayer/medical/morgue) "lab" = ( /obj/structure/surface/rack, /obj/item/reagent_container/glass/bucket/janibucket, @@ -36220,6 +35890,41 @@ "lah" = ( /turf/open/floor/almayer/emerald/southeast, /area/almayer/living/gym) +"lak" = ( +/obj/structure/surface/table/almayer, +/obj/structure/sign/poster{ + desc = "YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE."; + icon_state = "poster11"; + name = "YOU ALWAYS KNOW A WORKING JOE."; + pixel_x = 27; + serial_number = 11 + }, +/obj/item/trash/pistachios{ + layer = 2; + pixel_x = 6; + pixel_y = -6 + }, +/obj/structure/machinery/recharger{ + layer = 3.1; + pixel_y = 22 + }, +/obj/item/ammo_magazine/rifle/incendiary{ + current_rounds = 0; + desc = "A 10mm assault rifle magazine with ':D' drawn on the side"; + pixel_x = 10; + pixel_y = 2 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/machinery/computer/cameras/wooden_tv/broadcast{ + dir = 8; + layer = 3.2; + pixel_x = -3; + pixel_y = 6 + }, +/turf/open/floor/almayer/blue/southeast, +/area/almayer/living/port_emb) "lat" = ( /obj/structure/toilet{ dir = 1 @@ -36303,12 +36008,6 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) -"lbB" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer/orange/north, -/area/almayer/engineering/upper_engineering/port) "lbO" = ( /obj/structure/surface/rack, /turf/open/floor/almayer/plate, @@ -36525,6 +36224,12 @@ }, /turf/open/floor/almayer/plate, /area/almayer/living/briefing) +"lhi" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/southeast, +/turf/open/floor/almayer/red/southeast, +/area/almayer/lifeboat_pumps/south1) "lhj" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/safety/bulkhead_door{ @@ -36538,16 +36243,6 @@ "lht" = ( /turf/open/floor/almayer/orange/southeast, /area/almayer/engineering/upper_engineering/starboard) -"lhv" = ( -/obj/structure/machinery/door_control{ - id = "CMO Shutters"; - name = "Office Shutters"; - pixel_y = -20; - req_access_txt = "5" - }, -/obj/structure/machinery/computer/crew, -/turf/open/floor/almayer/sterile_green_corner/east, -/area/almayer/medical/upper_medical) "lhB" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -36600,6 +36295,30 @@ }, /turf/open/floor/almayer, /area/almayer/command/computerlab) +"liP" = ( +/obj/structure/sign/safety/rewire{ + pixel_y = 38 + }, +/obj/structure/sign/safety/fibre_optics{ + pixel_x = 14; + pixel_y = 38 + }, +/obj/structure/sign/safety/laser{ + pixel_y = 24 + }, +/obj/structure/sign/safety/terminal{ + pixel_x = 14; + pixel_y = 24 + }, +/obj/structure/machinery/door_control{ + id = "ARES Operations Left"; + name = "ARES Operations Shutter"; + pixel_x = 24; + pixel_y = -8; + req_one_access_txt = "91;92" + }, +/turf/open/floor/almayer/aicore/glowing/no_build/ai_floor3, +/area/almayer/command/airoom) "liY" = ( /obj/structure/machinery/flasher{ id = "Containment Cell 5"; @@ -36723,6 +36442,10 @@ /obj/structure/closet/emcloset, /turf/open/floor/almayer/cargo, /area/almayer/engineering/upper_engineering/starboard) +"lkn" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/repair_bay) "lkL" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -36773,12 +36496,6 @@ "llo" = ( /turf/open/floor/almayer/green/east, /area/almayer/hallways/upper/fore_hallway) -"llK" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/engineering/lower/engine_core) "llO" = ( /turf/open/floor/almayer/orange/east, /area/almayer/hallways/hangar) @@ -36788,11 +36505,6 @@ }, /turf/closed/wall/almayer, /area/almayer/hallways/lower/starboard_umbilical) -"lmi" = ( -/obj/structure/bed, -/obj/item/bedsheet/green, -/turf/open/floor/almayer/mono, -/area/almayer/medical/upper_medical) "lml" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 1; @@ -36868,30 +36580,6 @@ /obj/structure/window/reinforced, /turf/open/floor/prison/kitchen, /area/almayer/engineering/upper_engineering) -"lnS" = ( -/obj/structure/sign/safety/rewire{ - pixel_y = 38 - }, -/obj/structure/sign/safety/fibre_optics{ - pixel_x = 14; - pixel_y = 38 - }, -/obj/structure/sign/safety/laser{ - pixel_y = 24 - }, -/obj/structure/sign/safety/terminal{ - pixel_x = 14; - pixel_y = 24 - }, -/obj/structure/machinery/door_control{ - id = "ARES Operations Left"; - name = "ARES Operations Shutter"; - pixel_x = 24; - pixel_y = -8; - req_one_access_txt = "91;92" - }, -/turf/open/floor/almayer/aicore/glowing/no_build/ai_floor3, -/area/almayer/command/airoom) "lok" = ( /obj/structure/machinery/cm_vending/clothing/marine/charlie{ density = 0; @@ -37004,6 +36692,18 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/shipboard/panic) +"lpr" = ( +/obj/structure/surface/table/almayer, +/obj/structure/sign/safety/terminal{ + pixel_x = -17 + }, +/obj/structure/machinery/faxmachine/corporate/liaison, +/obj/item/paper/liaison_brief{ + pixel_y = 8; + pixel_x = -4 + }, +/turf/open/floor/wood/ship, +/area/almayer/command/corporateliaison) "lpt" = ( /turf/open/floor/almayer/blue, /area/almayer/squads/charlie_delta_shared) @@ -37109,6 +36809,11 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/command/cichallway) +"lsw" = ( +/obj/effect/step_trigger/clone_cleaner, +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/almayer/aicore/no_build/ai_silver/west, +/area/almayer/command/airoom) "lsD" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -37182,6 +36887,13 @@ /obj/item/reagent_container/ld50_syringe/choral, /turf/open/floor/almayer/plate, /area/almayer/shipboard/brig/execution_storage) +"ltP" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/almayer/silver/east, +/area/almayer/hallways/lower/repair_bay) "ltU" = ( /obj/structure/bed/chair{ dir = 8 @@ -37214,10 +36926,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/living/grunt_rnr) -"luY" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/orange/east, -/area/almayer/engineering/upper_engineering/starboard) "luZ" = ( /obj/structure/machinery/door/poddoor/almayer/open{ dir = 2; @@ -37403,6 +37111,12 @@ }, /turf/open/floor/almayer/red/north, /area/almayer/shipboard/brig/processing) +"lzf" = ( +/obj/structure/pipes/standard/manifold/hidden/supply/no_boom{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/command/lifeboat) "lzq" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -37460,6 +37174,14 @@ }, /turf/open/floor/carpet, /area/almayer/command/cichallway) +"lAP" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer/sterile_green_side/east, +/area/almayer/medical/upper_medical) "lAQ" = ( /obj/structure/machinery/cm_vending/gear/tl{ density = 0; @@ -37624,16 +37346,6 @@ }, /turf/open/floor/almayer/red/west, /area/almayer/shipboard/brig/lobby) -"lEF" = ( -/obj/structure/stairs{ - icon_state = "ramptop" - }, -/obj/structure/platform{ - dir = 4; - layer = 2.7 - }, -/turf/open/floor/almayer, -/area/almayer/living/chapel) "lEO" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -37659,22 +37371,6 @@ }, /turf/open/floor/almayer/blue/north, /area/almayer/living/port_emb) -"lFj" = ( -/obj/structure/machinery/door_control{ - id = "ARES Operations Right"; - name = "ARES Operations Shutter"; - pixel_x = 24; - pixel_y = -8; - req_one_access_txt = "91;92" - }, -/turf/open/floor/almayer/aicore/no_build/ai_silver/east, -/area/almayer/command/airoom) -"lFn" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_21" - }, -/turf/open/floor/almayer/sterile_green_corner/north, -/area/almayer/medical/morgue) "lFp" = ( /turf/closed/wall/almayer, /area/almayer/engineering/lower/workshop/hangar) @@ -37713,6 +37409,13 @@ }, /turf/open/floor/almayer/plate, /area/almayer/engineering/upper_engineering/port) +"lFB" = ( +/obj/structure/machinery/landinglight/ds1/delayone{ + dir = 4 + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/almayer/plate, +/area/almayer/hallways/hangar) "lFK" = ( /obj/structure/machinery/light{ dir = 8 @@ -37742,6 +37445,13 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/upper/midship_hallway) +"lGj" = ( +/obj/vehicle/powerloader, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform/metal/almayer/west, +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/almayer/cargo, +/area/almayer/hallways/lower/repair_bay) "lHk" = ( /obj/structure/closet/firecloset, /obj/effect/decal/warning_stripes{ @@ -37912,6 +37622,12 @@ }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliaison) +"lLc" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/northwest, +/turf/open/floor/almayer/red/northeast, +/area/almayer/lifeboat_pumps/north2) "lLl" = ( /obj/effect/step_trigger/clone_cleaner, /obj/structure/machinery/door_control{ @@ -37923,6 +37639,16 @@ }, /turf/open/floor/almayer/greencorner, /area/almayer/hallways/lower/port_fore_hallway) +"lLq" = ( +/obj/structure/machinery/door_control{ + id = "ARES Mainframe Right"; + name = "ARES Mainframe Lockdown"; + pixel_x = -24; + pixel_y = -24; + req_one_access_txt = "91;92" + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "lLt" = ( /turf/open/floor/almayer/orangecorner/east, /area/almayer/hallways/upper/midship_hallway) @@ -38037,6 +37763,10 @@ }, /turf/open/floor/almayer/plate, /area/almayer/squads/charlie) +"lNF" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/upper/u_a_s) "lNL" = ( /obj/item/tool/mop{ pixel_x = -6; @@ -38050,6 +37780,9 @@ /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/plating, /area/almayer/engineering/lower/workshop) +"lOh" = ( +/turf/open/floor/almayer/mono, +/area/almayer/medical/upper_medical) "lOn" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -38194,15 +37927,13 @@ /obj/structure/largecrate/random/barrel/green, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/p_bow) -"lRE" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 8 +"lRM" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1; + name = "ship-grade camera" }, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/south1) +/turf/open/floor/almayer/green, +/area/almayer/hallways/upper/fore_hallway) "lRP" = ( /obj/structure/surface/table/almayer, /obj/item/prop/helmetgarb/chaplain_patch, @@ -38276,6 +38007,13 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/chapel) +"lUq" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/sterile_green_side/southwest, +/area/almayer/medical/upper_medical) "lUA" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -38297,15 +38035,6 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south2) -"lVR" = ( -/obj/structure/stairs{ - icon_state = "ramptop" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/upper/u_a_p) "lVS" = ( /obj/structure/machinery/door/poddoor/shutters/almayer/open{ dir = 4; @@ -38344,12 +38073,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/command/cic) -"lVZ" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/lower/repair_bay) "lWr" = ( /obj/structure/largecrate/random/case, /turf/open/floor/almayer/red/northwest, @@ -38432,6 +38155,10 @@ }, /turf/open/floor/almayer/orange, /area/almayer/engineering/upper_engineering/port) +"lYr" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, +/turf/open/floor/almayer/red/north, +/area/almayer/command/lifeboat) "lYt" = ( /obj/structure/machinery/light/small{ dir = 8 @@ -38548,15 +38275,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliaison) -"maT" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer/sterile_green_side/east, -/area/almayer/medical/upper_medical) "mbx" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -38577,14 +38295,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/living/gym) -"mcW" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/box/gloves, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/morgue) "mdk" = ( /obj/structure/machinery/door/poddoor/railing{ dir = 4; @@ -38650,6 +38360,10 @@ }, /turf/open/floor/almayer/blue, /area/almayer/squads/delta) +"mev" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/almayer/red/east, +/area/almayer/lifeboat_pumps/north1) "meE" = ( /obj/structure/sign/safety/maint{ pixel_x = 32 @@ -38674,6 +38388,12 @@ damage_cap = 15000 }, /area/almayer/squads/alpha) +"mfI" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 4 + }, +/turf/open/floor/almayer/orange, +/area/almayer/engineering/upper_engineering/starboard) "mfL" = ( /obj/item/reagent_container/glass/bucket/janibucket{ pixel_x = -1; @@ -38745,12 +38465,6 @@ }, /turf/open/floor/almayer/cargo_arrow, /area/almayer/squads/charlie_delta_shared) -"mgX" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/upper/u_a_p) "mha" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -38778,12 +38492,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plate, /area/almayer/living/briefing) -"mhG" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/command/lifeboat) "mhI" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -39000,12 +38708,6 @@ "mlm" = ( /turf/open/floor/almayer/redfull, /area/almayer/living/cryo_cells) -"mlz" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/almayer/red, -/area/almayer/lifeboat_pumps/south1) "mlF" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -39022,6 +38724,10 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/command/corporateliaison) +"mlS" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/almayer/uscm/directional/southwest, +/area/almayer/living/briefing) "mmn" = ( /obj/structure/machinery/cm_vending/sorted/cargo_guns/intelligence_officer{ density = 0; @@ -39072,6 +38778,11 @@ "mnI" = ( /turf/open/floor/almayer/blue, /area/almayer/living/briefing) +"mnN" = ( +/obj/item/stack/catwalk, +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/plating, +/area/almayer/maint/hull/upper/u_a_p) "mnW" = ( /obj/structure/surface/table/almayer, /obj/item/device/reagent_scanner{ @@ -39238,12 +38949,6 @@ }, /turf/open/floor/almayer/dark_sterile, /area/almayer/medical/operating_room_two) -"mqZ" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/lower/repair_bay) "mrD" = ( /obj/structure/machinery/light{ dir = 1 @@ -39251,18 +38956,19 @@ /obj/structure/largecrate/random/barrel/blue, /turf/open/floor/almayer/plate, /area/almayer/hallways/hangar) -"mrL" = ( -/obj/structure/surface/rack, -/obj/item/storage/box/bodybags, -/obj/item/storage/box/bodybags, -/obj/item/storage/box/bodybags, -/obj/item/storage/box/bodybags, -/turf/open/floor/almayer/plate, -/area/almayer/medical/morgue) "mrM" = ( /obj/structure/closet/secure_closet/quartermaster_uscm, /turf/open/floor/almayer/green, /area/almayer/squads/req) +"msb" = ( +/obj/structure/machinery/light/small{ + dir = 4 + }, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 10 + }, +/turf/open/floor/almayer/orange/east, +/area/almayer/engineering/upper_engineering/port) "msg" = ( /obj/structure/machinery/light, /obj/structure/sign/safety/waterhazard{ @@ -39326,6 +39032,10 @@ }, /turf/open/floor/almayer/plate, /area/almayer/living/gym) +"mth" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/almayer/red/east, +/area/almayer/lifeboat_pumps/north2) "mtl" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/execution) @@ -39480,15 +39190,6 @@ "mwP" = ( /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/p_stern) -"mwQ" = ( -/obj/structure/machinery/landinglight/ds1/delayone{ - dir = 4 - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/hangar) "mwR" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_Down4"; @@ -39612,6 +39313,12 @@ /obj/structure/machinery/light, /turf/open/floor/almayer, /area/almayer/living/offices) +"mzE" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform/metal/almayer, +/obj/structure/platform_decoration/metal/almayer/southwest, +/turf/open/floor/almayer/red/southwest, +/area/almayer/lifeboat_pumps/south2) "mzF" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating/plating_catwalk, @@ -39653,20 +39360,6 @@ /obj/effect/spawner/random/tool, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south1) -"mAs" = ( -/obj/effect/step_trigger/teleporter_vector{ - name = "Almayer_AresDown"; - vector_x = 96; - vector_y = -65 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/stairs{ - dir = 1 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "mAF" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -39746,20 +39439,16 @@ }, /turf/open/floor/almayer/red/east, /area/almayer/shipboard/brig/processing) -"mBJ" = ( -/obj/structure/stairs{ - icon_state = "ramptop" - }, -/obj/structure/platform{ - dir = 8; - layer = 2.7 - }, -/turf/open/floor/almayer, -/area/almayer/living/chapel) "mBO" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer/orangefull, /area/almayer/living/briefing) +"mBV" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform/metal/almayer, +/obj/structure/platform_decoration/metal/almayer/southwest, +/turf/open/floor/almayer/red/southwest, +/area/almayer/lifeboat_pumps/north1) "mCg" = ( /turf/open/floor/almayer/plate, /area/almayer/maint/upper/u_a_p) @@ -39893,17 +39582,6 @@ }, /turf/open/floor/almayer/aicore/no_build/ai_silver/east, /area/almayer/command/airoom) -"mEE" = ( -/obj/structure/platform{ - dir = 4; - layer = 2.7 - }, -/obj/structure/stairs/perspective{ - dir = 10; - icon_state = "p_stair_full" - }, -/turf/open/floor/almayer, -/area/almayer/living/briefing) "mFc" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -39924,6 +39602,14 @@ }, /turf/open/floor/almayer/sterile_green_side/north, /area/almayer/medical/medical_science) +"mFv" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/north, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/medical/upper_medical) "mFL" = ( /obj/effect/projector{ name = "Almayer_Up1"; @@ -40078,20 +39764,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_m_s) -"mIi" = ( -/obj/effect/step_trigger/teleporter_vector{ - name = "Almayer_AresUp"; - vector_x = -96; - vector_y = 65 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/stairs{ - dir = 1 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "mIy" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -40296,6 +39968,16 @@ "mLg" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/port_umbilical) +"mLn" = ( +/obj/structure/morgue{ + dir = 8 + }, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" + }, +/turf/open/floor/almayer/test_floor5, +/area/almayer/medical/morgue) "mLz" = ( /obj/structure/machinery/door_control{ id = "pobunk1"; @@ -40330,6 +40012,12 @@ }, /turf/open/floor/almayer, /area/almayer/squads/req) +"mME" = ( +/obj/structure/surface/table/reinforced/black, +/obj/item/tank/oxygen, +/obj/structure/pipes/vents/pump/no_boom, +/turf/open/floor/almayer/plate, +/area/almayer/engineering/upper_engineering/port) "mMP" = ( /obj/effect/landmark/start/intel, /obj/effect/landmark/late_join/intel, @@ -40344,12 +40032,6 @@ }, /turf/open/floor/almayer/silver, /area/almayer/shipboard/brig/cic_hallway) -"mNm" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/hangar) "mNG" = ( /obj/structure/sign/safety/stairs{ pixel_x = 15; @@ -40367,14 +40049,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/starboard_fore_hallway) -"mNI" = ( -/obj/structure/machinery/door/window/westleft{ - dir = 2 - }, -/obj/structure/machinery/shower, -/obj/item/tool/soap, -/turf/open/floor/almayer/sterile, -/area/almayer/medical/upper_medical) "mNK" = ( /obj/structure/closet/secure_closet/brig/restraints, /turf/open/floor/almayer/red/west, @@ -40500,6 +40174,18 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/test_floor4, /area/almayer/maint/hull/lower/l_m_s) +"mQZ" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/southwest, +/obj/effect/decal/cleanable/dirt, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22"; + pixel_y = 12; + pixel_x = 2 + }, +/turf/open/floor/almayer/mono, +/area/almayer/medical/upper_medical) "mRn" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ id = "ARES Interior"; @@ -40518,6 +40204,12 @@ /obj/structure/machinery/door/poddoor/almayer/blended/ai_lockdown/aicore, /turf/open/floor/almayer/no_build/test_floor4, /area/almayer/command/airoom) +"mRo" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 4 + }, +/turf/open/floor/almayer/orange/north, +/area/almayer/engineering/upper_engineering/port) "mRq" = ( /obj/structure/surface/table/almayer, /obj/effect/decal/cleanable/dirt, @@ -40687,6 +40379,10 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) +"mUd" = ( +/obj/structure/machinery/optable, +/turf/open/floor/almayer/plate, +/area/almayer/medical/morgue) "mUq" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -40774,6 +40470,16 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/maint/upper/mess) +"mWq" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/door_control{ + id = "CMO Shutters"; + name = "Office Shutters"; + req_access_txt = "5"; + pixel_x = -29 + }, +/turf/open/floor/almayer/sterile_green_side/west, +/area/almayer/medical/upper_medical) "mWs" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -40910,6 +40616,13 @@ }, /turf/open/floor/almayer/plate, /area/almayer/shipboard/port_point_defense) +"mZC" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/sterile_green_corner/west, +/area/almayer/medical/upper_medical) "mZF" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ icon_state = "almayer_pdoor"; @@ -41076,12 +40789,6 @@ "ncl" = ( /turf/open/floor/almayer/red, /area/almayer/shipboard/brig/lobby) -"ncp" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/turf/open/floor/almayer/orange/southeast, -/area/almayer/engineering/upper_engineering/starboard) "ncx" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1; @@ -41169,12 +40876,6 @@ /obj/structure/bed/chair/bolted, /turf/open/floor/almayer/red/north, /area/almayer/shipboard/brig/processing) -"neE" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/hangar) "neG" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -41243,16 +40944,6 @@ /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer/red/northwest, /area/almayer/lifeboat_pumps/south1) -"ngl" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/north2) "ngn" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/emails{ @@ -41318,33 +41009,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/test_floor4, /area/almayer/hallways/lower/repair_bay) -"ngU" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/cleanable/blood/oil/streak, -/turf/open/floor/almayer, -/area/almayer/engineering/upper_engineering/starboard) -"ngV" = ( -/obj/structure/surface/rack, -/obj/item/reagent_container/food/snacks/monkeycube/wrapped/farwacube{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/reagent_container/food/snacks/monkeycube/wrapped/neaeracube{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/reagent_container/food/snacks/monkeycube/wrapped/stokcube{ - pixel_x = -4; - pixel_y = -4 - }, -/obj/item/reagent_container/food/snacks/monkeycube/wrapped/yirencube{ - pixel_x = 4; - pixel_y = -4 - }, -/turf/open/floor/almayer/plate, -/area/almayer/command/corporateliaison) "nhi" = ( /obj/structure/bed/chair/comfy, /obj/structure/window/reinforced/ultra, @@ -41487,6 +41151,10 @@ /obj/structure/bed/chair, /turf/open/floor/almayer/sterile_green, /area/almayer/medical/medical_science) +"niO" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/almayer/red/north, +/area/almayer/lifeboat_pumps/north1) "niR" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_10" @@ -41560,6 +41228,20 @@ /obj/structure/largecrate/random/barrel/red, /turf/open/floor/almayer/plate, /area/almayer/maint/upper/u_a_s) +"nki" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = -14; + pixel_y = 13 + }, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = 12; + pixel_y = 13 + }, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/upper/u_a_s) "nkj" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 8; @@ -41567,12 +41249,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_f_s) -"nkn" = ( -/obj/structure/pipes/vents/pump{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/command/lifeboat) "nks" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -41650,11 +41326,6 @@ /obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/plate, /area/almayer/maint/upper/u_f_s) -"nlW" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/largecrate/random/barrel/green, -/turf/open/floor/almayer/orange/northeast, -/area/almayer/engineering/upper_engineering/starboard) "nme" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -41728,6 +41399,29 @@ }, /turf/open/floor/almayer, /area/almayer/squads/alpha_bravo_shared) +"nnB" = ( +/obj/structure/machinery/landinglight/ds2/delaytwo{ + dir = 8 + }, +/obj/structure/platform_decoration/metal/almayer, +/obj/structure/bed/chair{ + can_buckle = 0; + dir = 4 + }, +/obj/structure/bed/chair{ + can_buckle = 0; + dir = 4; + pixel_x = 1; + pixel_y = 3 + }, +/obj/structure/bed/chair{ + can_buckle = 0; + dir = 4; + pixel_x = 2; + pixel_y = 6 + }, +/turf/open/floor/almayer/plate, +/area/almayer/hallways/hangar) "nnD" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_Down4"; @@ -41742,6 +41436,16 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/command/corporateliaison) +"nnU" = ( +/obj/structure/machinery/door_control{ + id = "ARES Operations Right"; + name = "ARES Operations Shutter"; + pixel_x = 24; + pixel_y = -8; + req_one_access_txt = "91;92" + }, +/turf/open/floor/almayer/aicore/no_build/ai_silver/east, +/area/almayer/command/airoom) "nnX" = ( /obj/structure/machinery/sentry_holder/almayer, /turf/open/floor/almayer/mono, @@ -41787,6 +41491,12 @@ "nou" = ( /turf/open/floor/almayer/orange/east, /area/almayer/engineering/lower) +"nov" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 5 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/engineering/upper_engineering/starboard) "noy" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -41890,16 +41600,6 @@ /obj/structure/closet/secure_closet/fridge/fish/stock, /turf/open/floor/almayer/plate, /area/almayer/living/grunt_rnr) -"nqV" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/north2) "nqW" = ( /obj/structure/sign/safety/nonpress_0g{ pixel_x = 32 @@ -41934,6 +41634,13 @@ }, /turf/open/floor/almayer/emeraldcorner/west, /area/almayer/squads/charlie) +"nrJ" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/south2) "nrN" = ( /obj/structure/machinery/sleep_console, /turf/open/floor/almayer/sterile_green_side, @@ -41944,6 +41651,15 @@ }, /turf/open/floor/almayer/orange/north, /area/almayer/engineering/upper_engineering/starboard) +"nrZ" = ( +/obj/structure/machinery/door_control{ + dir = 1; + id = "Research Armory"; + name = "Research Armory"; + req_one_access_txt = "4;28" + }, +/turf/closed/wall/almayer/white/reinforced, +/area/almayer/medical/upper_medical) "nsc" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -41987,6 +41703,13 @@ }, /turf/open/floor/almayer/dark_sterile, /area/almayer/living/captain_mess) +"nsW" = ( +/obj/structure/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/almayer/plate, +/area/almayer/medical/morgue) "nsY" = ( /turf/closed/wall/almayer, /area/almayer/living/port_emb) @@ -42034,6 +41757,19 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north2) +"nul" = ( +/obj/effect/projector{ + name = "Almayer_AresDown"; + vector_x = 96; + vector_y = -65 + }, +/obj/structure/platform/metal/almayer/east, +/obj/structure/stairs{ + dir = 1; + icon_state = "ramptop" + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "nux" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/poddoor/almayer/open{ @@ -42151,6 +41887,12 @@ }, /turf/open/floor/almayer/research/containment/corner/east, /area/almayer/medical/containment/cell) +"nwl" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 9 + }, +/turf/open/floor/almayer/orange/east, +/area/almayer/engineering/upper_engineering/starboard) "nwx" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/red, @@ -42208,6 +41950,10 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_a_p) +"nxr" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_a_p) "nxx" = ( /obj/structure/machinery/light, /turf/open/floor/almayer/orange, @@ -42240,21 +41986,18 @@ /obj/effect/step_trigger/clone_cleaner, /turf/open/floor/almayer/red/east, /area/almayer/hallways/upper/port) +"nyT" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 5 + }, +/turf/open/floor/almayer/orangecorner/east, +/area/almayer/engineering/upper_engineering/port) "nzt" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/port_aft_hallway) -"nzv" = ( -/obj/structure/filingcabinet/filingcabinet, -/obj/item/clipboard, -/obj/item/clipboard, -/obj/item/folder/black, -/obj/item/folder/black, -/obj/item/folder/white, -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/upper_medical) "nzD" = ( /obj/effect/step_trigger/clone_cleaner, /turf/open/floor/almayer, @@ -42295,6 +42038,19 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) +"nAx" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/obj/structure/machinery/door_control{ + id = "ARES Mainframe Right"; + name = "ARES Mainframe Lockdown"; + pixel_x = -24; + pixel_y = 24; + req_one_access_txt = "91;92" + }, +/turf/open/floor/almayer/aicore/glowing/no_build, +/area/almayer/command/airoom) "nAY" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -42598,6 +42354,20 @@ }, /turf/open/floor/almayer, /area/almayer/squads/alpha_bravo_shared) +"nFM" = ( +/obj/structure/filingcabinet/filingcabinet{ + density = 0; + pixel_x = -8; + pixel_y = 16 + }, +/obj/structure/filingcabinet/filingcabinet{ + density = 0; + pixel_x = 7; + pixel_y = 16 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/sterile_green_side/west, +/area/almayer/medical/morgue) "nFX" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ dir = 2; @@ -42831,12 +42601,25 @@ /obj/item/reagent_container/food/condiment/hotsauce/franks, /turf/open/floor/almayer/bluefull, /area/almayer/living/briefing) -"nMV" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = 25 +"nMR" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/dark_sterile, +/area/almayer/medical/morgue) +"nMX" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/upper_medical) +/obj/structure/machinery/landinglight/ds1/delaytwo{ + dir = 4 + }, +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/almayer/plate, +/area/almayer/hallways/hangar) +"nNe" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/almayer/red/north, +/area/almayer/lifeboat_pumps/north1) "nNg" = ( /obj/structure/bed, /obj/item/bedsheet/red, @@ -42902,23 +42685,12 @@ }, /turf/open/floor/almayer/plating/northeast, /area/almayer/engineering/upper_engineering) -"nOb" = ( -/obj/structure/surface/rack, -/obj/item/reagent_container/food/drinks/bottle/sake{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/reagent_container/food/drinks/bottle/sake{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/reagent_container/food/drinks/bottle/sake, -/obj/item/reagent_container/food/drinks/bottle/sake{ - pixel_x = -4 +"nOf" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 4 }, -/obj/structure/machinery/light, -/turf/open/floor/almayer/plate, -/area/almayer/command/corporateliaison) +/turf/open/floor/plating/almayer, +/area/almayer/engineering/upper_engineering/starboard) "nOp" = ( /obj/structure/disposalpipe/segment, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -43042,6 +42814,13 @@ "nQA" = ( /turf/open/floor/carpet, /area/almayer/command/corporateliaison) +"nQZ" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/north2) "nRA" = ( /obj/effect/projector{ name = "Almayer_Up4"; @@ -43106,6 +42885,29 @@ /obj/structure/pipes/vents/pump, /turf/open/floor/almayer/orangecorner/east, /area/almayer/hallways/upper/aft_hallway) +"nSC" = ( +/obj/structure/surface/rack, +/obj/item/reagent_container/food/snacks/monkeycube/wrapped/farwacube{ + pixel_x = 4; + pixel_y = 10 + }, +/obj/item/reagent_container/food/snacks/monkeycube/wrapped/neaeracube{ + pixel_x = -4; + pixel_y = 10 + }, +/obj/item/reagent_container/food/snacks/monkeycube/wrapped/stokcube{ + pixel_x = -4; + pixel_y = 2 + }, +/obj/item/reagent_container/food/snacks/monkeycube/wrapped/yirencube{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/item/storage/xeno_tag_case/full{ + pixel_y = -6 + }, +/turf/open/floor/almayer/plate, +/area/almayer/command/corporateliaison) "nSG" = ( /obj/structure/machinery/door_control{ id = "tcomms"; @@ -43118,6 +42920,10 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/command/telecomms) +"nSR" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/sterile_green_side/northeast, +/area/almayer/medical/upper_medical) "nSS" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -43157,6 +42963,10 @@ }, /turf/open/floor/almayer, /area/almayer/command/computerlab) +"nTw" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_a_p) "nTA" = ( /obj/structure/bed/chair/comfy/blue, /turf/open/floor/carpet, @@ -43236,12 +43046,6 @@ }, /turf/open/floor/almayer/mono, /area/almayer/lifeboat_pumps/south1) -"nUT" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/upper/u_a_s) "nVa" = ( /obj/structure/bed/chair, /obj/effect/decal/warning_stripes{ @@ -43314,6 +43118,13 @@ "nVR" = ( /turf/closed/wall/almayer, /area/almayer/shipboard/brig/perma) +"nVT" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" + }, +/turf/open/floor/almayer/sterile_green_side/east, +/area/almayer/medical/morgue) "nVX" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/lifeboat/blastdoor{ id_tag = "Boat2-D1"; @@ -43371,6 +43182,12 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/commandbunks) +"nXS" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 10 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/command/lifeboat) "nXU" = ( /obj/structure/machinery/door/airlock/almayer/marine/requisitions{ dir = 1; @@ -43478,12 +43295,6 @@ /obj/item/facepaint/black, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/charlie) -"nZG" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_p) "nZK" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -43506,6 +43317,14 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/sterile_green_side/northeast, /area/almayer/medical/upper_medical) +"oar" = ( +/obj/structure/machinery/firealarm{ + dir = 4; + pixel_x = 24 + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer/sterile_green_side/east, +/area/almayer/medical/upper_medical) "oaw" = ( /obj/structure/closet/firecloset, /obj/item/clothing/mask/gas, @@ -43644,12 +43463,6 @@ }, /turf/open/floor/almayer/cargo, /area/almayer/hallways/lower/vehiclehangar) -"odu" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer/red/southeast, -/area/almayer/command/lifeboat) "odB" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -43664,20 +43477,6 @@ }, /turf/open/floor/almayer/dark_sterile, /area/almayer/engineering/laundry) -"odG" = ( -/obj/structure/platform, -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_x = -14; - pixel_y = 13 - }, -/obj/structure/prop/invuln/overhead_pipe{ - dir = 4; - pixel_x = 12; - pixel_y = 13 - }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/upper/u_a_s) "odN" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer, @@ -43688,12 +43487,10 @@ }, /turf/open/floor/plating, /area/almayer/shipboard/sea_office) -"odV" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer/red/northeast, -/area/almayer/command/lifeboat) +"oed" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/almayer/cargo, +/area/almayer/medical/upper_medical) "oee" = ( /obj/structure/prop/invuln{ desc = "An inflated membrane. This one is puncture proof. Wow!"; @@ -43732,6 +43529,10 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_m_s) +"oeI" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/command/lifeboat) "oeM" = ( /obj/structure/surface/rack, /turf/open/floor/almayer/silver, @@ -43739,18 +43540,31 @@ "oeZ" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/medical) -"ofH" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 +"ofv" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 }, -/turf/open/floor/almayer/orange/east, -/area/almayer/engineering/upper_engineering/port) -"ofK" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/platform/metal/almayer/west, +/obj/structure/machinery/recharge_station{ + layer = 2.9 }, -/turf/open/floor/almayer/orange, -/area/almayer/engineering/upper_engineering/starboard) +/obj/structure/sign/safety/high_voltage{ + pixel_x = 15; + pixel_y = 32 + }, +/obj/structure/sign/safety/hazard{ + pixel_y = 32 + }, +/turf/open/floor/almayer/silver/north, +/area/almayer/hallways/lower/repair_bay) +"ofE" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5 + }, +/turf/open/floor/almayer/sterile_green_side/west, +/area/almayer/medical/upper_medical) "ofU" = ( /obj/effect/step_trigger/clone_cleaner, /obj/effect/decal/warning_stripes{ @@ -43915,13 +43729,6 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/maint/hull/upper/u_m_p) -"oir" = ( -/obj/structure/pipes/vents/pump{ - dir = 8 - }, -/obj/structure/machinery/power/apc/almayer/hardened/east, -/turf/open/floor/almayer, -/area/almayer/command/lifeboat) "oit" = ( /obj/effect/landmark/railgun_computer{ dir = 1 @@ -44046,10 +43853,6 @@ }, /turf/open/floor/almayer_hull/outerhull_dir, /area/space) -"okO" = ( -/obj/structure/machinery/cm_vending/clothing/senior_officer, -/turf/open/floor/almayer/mono, -/area/almayer/medical/upper_medical) "old" = ( /obj/structure/machinery/light/small, /obj/structure/largecrate/random/case/double, @@ -44182,27 +43985,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/charlie) -"onQ" = ( -/obj/structure/sign/safety/rewire{ - pixel_x = 8; - pixel_y = 32 - }, -/turf/open/floor/almayer/sterile_green_side/northeast, -/area/almayer/medical/upper_medical) -"onU" = ( -/obj/effect/step_trigger/teleporter_vector{ - name = "Almayer_AresDown"; - vector_x = 96; - vector_y = -65 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/stairs{ - dir = 1 - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "onY" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin/uscm, @@ -44247,6 +44029,19 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_m_s) +"ooX" = ( +/obj/effect/projector{ + name = "Almayer_AresDown"; + vector_x = 96; + vector_y = -65 + }, +/obj/structure/platform/metal/almayer/west, +/obj/structure/stairs{ + dir = 1; + icon_state = "ramptop" + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "opd" = ( /obj/structure/barricade/handrail, /turf/open/floor/almayer/test_floor5, @@ -44569,12 +44364,6 @@ /obj/structure/bed/sofa/vert/grey/bot, /turf/open/floor/almayer, /area/almayer/command/lifeboat) -"ouQ" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/almayer/red/north, -/area/almayer/lifeboat_pumps/south1) "ouU" = ( /obj/structure/surface/table/almayer, /obj/effect/spawner/random/toolbox, @@ -44692,15 +44481,6 @@ "oxy" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_a_s) -"oxz" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/lower/repair_bay) "oxU" = ( /obj/structure/machinery/photocopier, /turf/open/floor/almayer, @@ -44744,6 +44524,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plate, /area/almayer/squads/bravo) +"oyH" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/south2) "oyO" = ( /obj/structure/reagent_dispensers/watertank, /obj/structure/sign/safety/water{ @@ -44789,6 +44577,12 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/engineering/upper_engineering/starboard) +"ozS" = ( +/obj/structure/machinery/status_display{ + pixel_y = -30 + }, +/turf/open/gm/grass/grass1, +/area/almayer/medical/upper_medical) "ozT" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -44816,13 +44610,6 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/hallways/lower/port_umbilical) -"oAB" = ( -/obj/structure/platform{ - dir = 8; - layer = 2.7 - }, -/turf/open/floor/almayer/uscm/directional/southwest, -/area/almayer/living/briefing) "oAK" = ( /obj/structure/sign/safety/storage{ pixel_x = 8; @@ -44867,6 +44654,19 @@ }, /turf/open/floor/almayer/silver/west, /area/almayer/command/cichallway) +"oBC" = ( +/obj/structure/machinery/door/airlock/almayer/medical{ + access_modified = 1; + dir = 2; + name = "Morgue"; + req_access_txt = "25"; + req_one_access = null + }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 2 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/morgue) "oBD" = ( /obj/structure/pipes/vents/pump/no_boom/gas{ dir = 8; @@ -44914,6 +44714,10 @@ /obj/structure/bed/chair/comfy/delta, /turf/open/floor/almayer/bluefull, /area/almayer/living/briefing) +"oCI" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/hangar) "oCK" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -45098,6 +44902,14 @@ }, /turf/open/floor/almayer/red/north, /area/almayer/living/port_emb) +"oFc" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer/plating/northeast, +/area/almayer/engineering/lower/engine_core) "oFm" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/orange/east, @@ -45153,6 +44965,15 @@ "oGm" = ( /turf/open/floor/almayer/orange/east, /area/almayer/hallways/lower/starboard_umbilical) +"oGp" = ( +/obj/structure/toilet{ + dir = 4 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/medical/upper_medical) "oGx" = ( /obj/structure/closet/secure_closet/surgical{ pixel_x = 30 @@ -45173,12 +44994,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north1) -"oGF" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/lower/repair_bay) "oGI" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -45211,22 +45026,6 @@ }, /turf/open/floor/almayer/mono, /area/almayer/hallways/upper/fore_hallway) -"oGY" = ( -/obj/item/device/flashlight/lamp/green{ - pixel_x = 5; - pixel_y = 3 - }, -/obj/structure/surface/table/woodentable/fancy, -/obj/structure/machinery/door_control/cl/office/evac{ - pixel_x = -5; - pixel_y = 4 - }, -/obj/structure/machinery/door_control/cl/office/divider{ - pixel_x = -5; - pixel_y = -3 - }, -/turf/open/floor/carpet, -/area/almayer/command/corporateliaison) "oHc" = ( /obj/structure/machinery/light, /obj/effect/decal/warning_stripes{ @@ -45321,6 +45120,10 @@ "oIB" = ( /turf/closed/wall/almayer, /area/almayer/command/combat_correspondent) +"oIJ" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/almayer/red/west, +/area/almayer/lifeboat_pumps/north2) "oIY" = ( /obj/structure/largecrate/random/barrel, /turf/open/floor/almayer/plate, @@ -45351,6 +45154,26 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) +"oJD" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/item/paper_bin/wy{ + pixel_y = 8; + pixel_x = -7 + }, +/obj/structure/surface/table/almayer, +/obj/item/tool/pen{ + pixel_y = 4; + pixel_x = -8 + }, +/obj/item/folder/blue{ + pixel_y = 5; + pixel_x = 6 + }, +/obj/effect/landmark/map_item, +/turf/open/floor/almayer/sterile_green_corner/north, +/area/almayer/medical/upper_medical) "oJK" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -45377,6 +45200,12 @@ }, /turf/open/floor/prison/kitchen, /area/almayer/living/grunt_rnr) +"oKl" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/command/lifeboat) "oKv" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ layer = 1.9 @@ -45436,12 +45265,6 @@ "oLU" = ( /turf/open/floor/almayer/sterile_green_side/north, /area/almayer/medical/hydroponics) -"oMe" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer/plate, -/area/almayer/squads/req) "oMi" = ( /obj/structure/machinery/status_display{ pixel_y = 30 @@ -45495,16 +45318,6 @@ "oNp" = ( /turf/open/floor/almayer/test_floor4, /area/almayer/medical/hydroponics) -"oNJ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - layer = 2.5 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/medical/upper_medical) "oNK" = ( /obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/plating/plating_catwalk, @@ -45545,6 +45358,10 @@ }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliaison) +"oOo" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/almayer, +/area/almayer/living/briefing) "oOp" = ( /obj/structure/surface/table/almayer, /obj/item/tool/wirecutters, @@ -45558,6 +45375,12 @@ }, /turf/open/floor/almayer/red/east, /area/almayer/hallways/upper/starboard) +"oOD" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 6 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/command/lifeboat) "oON" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -45586,12 +45409,10 @@ }, /turf/open/floor/almayer/red/west, /area/almayer/hallways/upper/aft_hallway) -"oPf" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/command/lifeboat) +"oPc" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/almayer, +/area/almayer/living/briefing) "oPy" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_22"; @@ -45706,15 +45527,6 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/maint/hull/upper/u_f_s) -"oRy" = ( -/obj/structure/sign/safety/autodoc{ - pixel_x = 20; - pixel_y = -32 - }, -/obj/structure/machinery/cm_vending/sorted/medical/bolted, -/obj/structure/medical_supply_link/green, -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/lower_medical_medbay) "oRJ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -45736,6 +45548,10 @@ }, /turf/open/floor/almayer/plate, /area/almayer/living/gym) +"oRU" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_a_p) "oRV" = ( /obj/structure/blocker/invisible_wall, /obj/effect/decal/warning_stripes{ @@ -45822,15 +45638,6 @@ "oSM" = ( /turf/open/floor/almayer, /area/almayer/hallways/lower/port_midship_hallway) -"oSR" = ( -/obj/structure/stairs{ - icon_state = "ramptop" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/upper/u_a_p) "oTe" = ( /obj/item/prop/almayer/box, /obj/item/prop{ @@ -45872,16 +45679,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer/test_floor4, /area/almayer/hallways/lower/port_umbilical) -"oTO" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/engineering/lower/engine_core) "oUi" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -45897,13 +45694,6 @@ /obj/structure/machinery/light/small, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_a_p) -"oUz" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/machinery/power/apc/almayer/north, -/turf/open/floor/almayer/silver/north, -/area/almayer/hallways/lower/repair_bay) "oUG" = ( /obj/structure/machinery/light{ dir = 8 @@ -45949,6 +45739,23 @@ "oVo" = ( /turf/open/floor/almayer/plate, /area/almayer/maint/upper/u_a_s) +"oVx" = ( +/obj/structure/surface/rack, +/obj/item/storage/box/bodybags, +/obj/item/storage/box/bodybags, +/obj/item/storage/box/bodybags, +/obj/item/storage/box/bodybags, +/obj/item/storage/box/bodybags, +/obj/item/storage/box/bodybags, +/obj/item/storage/box/bodybags, +/obj/item/storage/box/bodybags, +/obj/structure/sign/safety/medical{ + pixel_x = 8; + pixel_y = -32 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/medical/morgue) "oVY" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -46271,6 +46078,13 @@ }, /turf/open/floor/almayer/plate, /area/almayer/command/cic) +"pbP" = ( +/obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer/redfull, +/area/almayer/medical/upper_medical) "pbV" = ( /turf/open/floor/almayer/emerald/north, /area/almayer/command/cic) @@ -46307,12 +46121,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/upper/fore_hallway) -"pcv" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 1 - }, -/turf/open/floor/almayer/orange/east, -/area/almayer/engineering/upper_engineering/port) "pcE" = ( /obj/structure/machinery/conveyor{ dir = 8; @@ -46352,16 +46160,6 @@ "pdp" = ( /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/p_bow) -"pdK" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/engineering/lower/engine_core) "pdT" = ( /obj/structure/pipes/vents/pump, /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ @@ -46396,15 +46194,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/navigation) -"pfc" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor{ - dir = 1 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/engineering/upper_engineering/starboard) "pfd" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/almayer/open{ @@ -46428,10 +46217,6 @@ /obj/structure/machinery/cm_vending/sorted/marine_food, /turf/open/floor/almayer, /area/almayer/maint/hull/upper/u_f_p) -"pfH" = ( -/obj/structure/platform_decoration, -/turf/open/floor/almayer/red, -/area/almayer/lifeboat_pumps/south2) "pfL" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -46535,6 +46320,13 @@ }, /turf/open/floor/almayer/plate, /area/almayer/shipboard/panic) +"phI" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/platform/metal/almayer, +/turf/open/floor/almayer/plating/northeast, +/area/almayer/engineering/lower/engine_core) "phN" = ( /obj/structure/disposalpipe/junction{ dir = 4; @@ -46594,12 +46386,6 @@ "pjz" = ( /turf/closed/wall/almayer, /area/almayer/maint/hull/upper/p_bow) -"pjF" = ( -/obj/structure/surface/table/almayer, -/obj/item/paper, -/obj/item/tool/lighter/random, -/turf/open/floor/almayer/plate, -/area/almayer/medical/morgue) "pjG" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -46635,6 +46421,10 @@ }, /turf/open/floor/almayer/orange/north, /area/almayer/engineering/lower) +"pkJ" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/medical/morgue) "pkS" = ( /obj/structure/stairs{ dir = 1; @@ -46655,6 +46445,10 @@ "plv" = ( /turf/open/floor/plating, /area/almayer/maint/hull/lower/l_m_p) +"ply" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/upper/u_a_p) "plK" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -46717,10 +46511,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) -"pnC" = ( -/obj/structure/machinery/cm_vending/sorted/medical/blood/bolted, -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/lower_medical_medbay) "pnL" = ( /obj/structure/machinery/constructable_frame{ icon_state = "box_2" @@ -46748,6 +46538,10 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_f_p) +"pot" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/upper/u_a_p) "poA" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/glass/bucket/mopbucket, @@ -46965,15 +46759,6 @@ /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/engineering/upper_engineering) -"pth" = ( -/obj/structure/surface/table/almayer, -/obj/item/folder/blue, -/obj/effect/landmark/map_item, -/obj/structure/pipes/vents/scrubber{ - dir = 8 - }, -/turf/open/floor/almayer/sterile_green_side/east, -/area/almayer/medical/upper_medical) "ptj" = ( /obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, /obj/structure/machinery/light, @@ -46989,13 +46774,6 @@ /obj/structure/bed/chair/bolted, /turf/open/floor/almayer/red/northeast, /area/almayer/shipboard/brig/processing) -"ptv" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/hangar) "ptA" = ( /obj/structure/stairs{ dir = 1; @@ -47020,16 +46798,6 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/maint/hull/upper/s_stern) -"ptZ" = ( -/obj/structure/platform{ - dir = 4; - layer = 2.7 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/engineering/lower/engine_core) "pub" = ( /obj/structure/sign/safety/distribution_pipes{ pixel_x = 32 @@ -47083,6 +46851,10 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/stern) +"pva" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/almayer/red, +/area/almayer/lifeboat_pumps/north1) "pvh" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /obj/item/tool/warning_cone{ @@ -47223,28 +46995,10 @@ }, /turf/open/floor/almayer/cargo_arrow/west, /area/almayer/squads/bravo) -"pyx" = ( -/obj/structure/machinery/door_display/research_cell{ - dir = 4; - id = "Containment Cell 4"; - name = "Control Panel"; - pixel_x = -15; - req_access_txt = "200" - }, -/obj/item/storage/fancy/cigarettes/blackpack{ - pixel_x = -1; - pixel_y = 1 - }, -/obj/structure/surface/table/woodentable/fancy, -/obj/item/storage/fancy/cigarettes/wypacket{ - pixel_x = 6; - pixel_y = 3 - }, -/obj/item/tool/lighter/zippo/gold{ - pixel_x = 2 - }, -/turf/open/floor/carpet, -/area/almayer/command/corporateliaison) +"pyq" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/almayer/plating/northeast, +/area/almayer/engineering/lower/engine_core) "pyy" = ( /obj/structure/filingcabinet, /turf/open/floor/almayer/plate, @@ -47287,6 +47041,12 @@ }, /turf/open/floor/almayer/red/southwest, /area/almayer/hallways/upper/port) +"pzg" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 4 + }, +/turf/open/floor/almayer/orange/east, +/area/almayer/engineering/upper_engineering/port) "pzj" = ( /obj/structure/machinery/door/poddoor/shutters/almayer/open{ dir = 4; @@ -47306,10 +47066,6 @@ /obj/docking_port/stationary/emergency_response/port1, /turf/open/floor/almayer/plating/northeast, /area/almayer/shipboard/starboard_point_defense) -"pzJ" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/plate, -/area/almayer/command/lifeboat) "pzM" = ( /turf/open/floor/almayer/plating/northeast, /area/almayer/engineering/lower/engine_core) @@ -47328,13 +47084,6 @@ "pAm" = ( /turf/open/floor/almayer, /area/almayer/engineering/lower/engine_core) -"pAV" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/item/tool/mop, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_p) "pBG" = ( /turf/closed/wall/almayer, /area/almayer/command/corporateliaison) @@ -47549,12 +47298,6 @@ }, /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) -"pHD" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/upper/u_a_p) "pHF" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -47716,6 +47459,15 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer/plate, /area/almayer/command/corporateliaison) +"pLo" = ( +/obj/structure/platform_decoration/metal/almayer, +/obj/structure/prop/invuln/overhead_pipe{ + dir = 4; + pixel_x = -14; + pixel_y = 13 + }, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/upper/u_a_s) "pLt" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -47802,12 +47554,6 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/command/cichallway) -"pNM" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/almayer/red/east, -/area/almayer/lifeboat_pumps/south1) "pNP" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -47849,6 +47595,13 @@ "pON" = ( /turf/open/floor/almayer/uscm/directional/west, /area/almayer/command/cic) +"pOQ" = ( +/obj/effect/decal/cleanable/blood/oil/streak, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/engineering/upper_engineering/starboard) "pOW" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -47936,6 +47689,14 @@ }, /turf/open/floor/almayer/plating/northeast, /area/almayer/hallways/lower/vehiclehangar) +"pQa" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/repair_bay) "pQc" = ( /obj/structure/window/framed/almayer, /turf/open/floor/plating, @@ -48046,6 +47807,13 @@ }, /turf/open/floor/plating, /area/almayer/engineering/lower/workshop) +"pSq" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/north1) "pSF" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -48169,6 +47937,11 @@ }, /turf/open/floor/almayer/redfull, /area/almayer/shipboard/brig/processing) +"pUF" = ( +/obj/structure/machinery/cm_vending/sorted/medical/blood/bolted, +/obj/structure/medical_supply_link/green, +/turf/open/floor/almayer/sterile_green_side, +/area/almayer/medical/lower_medical_medbay) "pVh" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -48237,6 +48010,10 @@ /obj/structure/surface/table/almayer, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_f_s) +"pWq" = ( +/obj/structure/machinery/computer/crew, +/turf/open/floor/almayer/sterile_green_corner, +/area/almayer/medical/upper_medical) "pWr" = ( /obj/structure/surface/rack, /obj/item/tool/minihoe{ @@ -48274,6 +48051,12 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/blue, /area/almayer/living/pilotbunks) +"pXh" = ( +/obj/structure/machinery/door/poddoor/almayer/blended/liaison{ + id = "RoomDivider" + }, +/turf/open/floor/almayer/plate, +/area/almayer/command/corporateliaison) "pXl" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -48381,6 +48164,13 @@ /obj/structure/bed/sofa/south/grey/left, /turf/open/floor/almayer/silver/north, /area/almayer/shipboard/brig/cic_hallway) +"qac" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/open/floor/almayer/plate, +/area/almayer/medical/morgue) "qam" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/warning_stripes{ @@ -48420,6 +48210,14 @@ }, /turf/open/floor/almayer/red, /area/almayer/living/briefing) +"qbr" = ( +/obj/structure/machinery/light, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer/sterile_green_side/east, +/area/almayer/medical/lower_medical_lobby) "qbw" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/upper/u_a_s) @@ -48467,6 +48265,12 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/engineering/upper_engineering/port) +"qcj" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 10 + }, +/turf/open/floor/almayer/orange/northeast, +/area/almayer/engineering/upper_engineering/port) "qck" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/machinery/computer/cameras/wooden_tv/almayer{ @@ -48598,20 +48402,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/command/lifeboat) -"qeK" = ( -/obj/structure/pipes/vents/scrubber, -/obj/structure/surface/table/reinforced/black, -/obj/item/storage/toolbox/mechanical, -/obj/item/stack/cable_coil{ - pixel_x = -7; - pixel_y = 11 - }, -/obj/item/device/helmet_visor{ - pixel_x = 8; - pixel_y = 13 - }, -/turf/open/floor/almayer/plate, -/area/almayer/engineering/upper_engineering/port) "qeY" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/toy/beach_ball/holoball, @@ -48743,20 +48533,6 @@ /obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/almayer/plate, /area/almayer/maint/upper/u_f_s) -"qhx" = ( -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" - }, -/obj/structure/sign/safety/ammunition{ - pixel_x = -17; - pixel_y = 7 - }, -/obj/structure/sign/safety/hazard{ - pixel_x = -17; - pixel_y = -8 - }, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/upper_medical) "qhD" = ( /obj/structure/closet{ name = "backpack storage" @@ -48871,12 +48647,6 @@ "qjN" = ( /turf/open/floor/almayer/dark_sterile, /area/almayer/medical/lower_medical_lobby) -"qjV" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/turf/open/floor/almayer/orange, -/area/almayer/engineering/upper_engineering/port) "qjY" = ( /obj/structure/machinery/door/window/eastleft{ req_one_access_txt = "2;21" @@ -48904,6 +48674,17 @@ /obj/effect/landmark/late_join/charlie, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/charlie) +"qkL" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/machinery/flasher{ + id = "briefing_flash"; + range = 12 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/uscm/directional/west, +/area/almayer/living/briefing) "qkP" = ( /obj/item/frame/light_fixture{ anchored = 1; @@ -49213,6 +48994,14 @@ /obj/structure/machinery/vending/hydroseeds, /turf/open/floor/almayer/green/east, /area/almayer/living/grunt_rnr) +"qpq" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/stairs/perspective{ + dir = 9; + icon_state = "p_stair_full" + }, +/turf/open/floor/almayer, +/area/almayer/living/briefing) "qpx" = ( /obj/structure/surface/table/almayer, /obj/structure/pipes/vents/scrubber, @@ -49252,6 +49041,12 @@ /obj/structure/machinery/light, /turf/open/floor/almayer, /area/almayer/hallways/lower/starboard_fore_hallway) +"qqh" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/southeast, +/turf/open/floor/almayer/red/southeast, +/area/almayer/lifeboat_pumps/south2) "qqn" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal3"; @@ -49308,6 +49103,18 @@ "qrv" = ( /turf/open/floor/almayer/silver, /area/almayer/command/computerlab) +"qrx" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/northwest, +/turf/open/floor/almayer/red/northeast, +/area/almayer/lifeboat_pumps/south2) +"qrE" = ( +/obj/structure/machinery/chem_dispenser/corpsman{ + pixel_y = 3 + }, +/turf/open/floor/almayer/orange, +/area/almayer/squads/bravo) "qsp" = ( /obj/structure/machinery/light/small, /turf/open/floor/plating/plating_catwalk, @@ -49348,14 +49155,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) -"quv" = ( -/obj/structure/pipes/standard/tank/oxygen, -/obj/structure/sign/safety/med_cryo{ - pixel_x = -6; - pixel_y = 32 - }, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/cryo_tubes) "quJ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -49472,21 +49271,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/living/offices) -"qwJ" = ( -/obj/effect/projector{ - name = "Almayer_AresDown"; - vector_x = 96; - vector_y = -65 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/stairs{ - dir = 1; - icon_state = "ramptop" - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "qwL" = ( /obj/structure/machinery/cryopod/right{ pixel_y = 6 @@ -49622,10 +49406,6 @@ "qyo" = ( /turf/open/floor/almayer/blue/north, /area/almayer/command/cichallway) -"qys" = ( -/obj/structure/platform, -/turf/open/floor/almayer/red, -/area/almayer/lifeboat_pumps/south1) "qyA" = ( /obj/structure/machinery/cm_vending/clothing/intelligence_officer{ density = 0; @@ -49735,13 +49515,6 @@ }, /turf/closed/wall/almayer/white/reinforced, /area/almayer/medical/medical_science) -"qAG" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/largecrate/random/case/double, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/upper/u_a_s) "qAK" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/ashtray/plastic, @@ -49778,6 +49551,32 @@ /obj/structure/largecrate/random/case/small, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_f_p) +"qBn" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/door_display/research_cell{ + dir = 4; + id = "Containment Cell 4"; + name = "Control Panel"; + pixel_x = -17; + req_access_txt = "200"; + pixel_y = 9 + }, +/obj/item/storage/photo_album, +/obj/structure/machinery/computer/cameras/containment/hidden{ + dir = 4; + pixel_x = -17; + pixel_y = -5; + plane = -5 + }, +/obj/item/device/camera_film{ + pixel_x = -3 + }, +/obj/structure/machinery/door_control/cl/office/divider{ + pixel_x = 7; + pixel_y = -7 + }, +/turf/open/floor/almayer, +/area/almayer/command/corporateliaison) "qBq" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 2; @@ -49819,6 +49618,11 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) +"qCu" = ( +/obj/structure/bed/sofa/south/white/right, +/obj/structure/platform/metal/almayer, +/turf/open/floor/almayer/mono, +/area/almayer/medical/upper_medical) "qCy" = ( /obj/effect/landmark/start/captain, /turf/open/floor/plating/plating_catwalk, @@ -49848,6 +49652,24 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/maint/hull/lower/l_m_s) +"qCS" = ( +/obj/structure/filingcabinet/filingcabinet{ + density = 0; + pixel_x = -8; + pixel_y = 16 + }, +/obj/structure/filingcabinet/filingcabinet{ + density = 0; + pixel_x = 7; + pixel_y = 16 + }, +/obj/item/folder/white, +/obj/item/folder/black, +/obj/item/folder/black, +/obj/item/clipboard, +/obj/item/clipboard, +/turf/open/floor/almayer/sterile_green_side/north, +/area/almayer/medical/upper_medical) "qCU" = ( /obj/structure/machinery/light{ dir = 4 @@ -49868,15 +49690,6 @@ /obj/effect/landmark/late_join/bravo, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/bravo) -"qDt" = ( -/obj/structure/machinery/door/airlock/almayer/secure/reinforced{ - dir = 2; - name = "\improper Lifeboat Control Bubble"; - req_access = null - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/test_floor4, -/area/almayer/command/lifeboat) "qDB" = ( /obj/structure/machinery/door/airlock/almayer/maint, /turf/open/floor/almayer/test_floor4, @@ -49957,6 +49770,10 @@ }, /turf/open/floor/almayer/red/west, /area/almayer/shipboard/brig/cells) +"qEB" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/almayer/red/east, +/area/almayer/lifeboat_pumps/south1) "qEL" = ( /obj/structure/surface/table/almayer, /obj/structure/largecrate/random/case/small{ @@ -50102,12 +49919,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/upper/u_m_p) -"qIa" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/upper/u_a_s) "qIf" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -50359,6 +50170,13 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_m_s) +"qMe" = ( +/obj/structure/stairs{ + icon_state = "ramptop" + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/almayer, +/area/almayer/living/chapel) "qMD" = ( /obj/structure/surface/table/almayer, /obj/item/storage/box/flashbangs, @@ -50526,15 +50344,6 @@ }, /turf/open/floor/almayer/red, /area/almayer/command/lifeboat) -"qQc" = ( -/obj/structure/closet/secure_closet/personal/patient{ - name = "morgue closet" - }, -/obj/structure/machinery/alarm/almayer{ - dir = 1 - }, -/turf/open/floor/almayer/plate, -/area/almayer/medical/morgue) "qQp" = ( /obj/structure/largecrate/supply, /turf/open/floor/almayer/mono, @@ -50559,6 +50368,14 @@ }, /turf/open/floor/almayer/blue/north, /area/almayer/hallways/upper/midship_hallway) +"qQL" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + layer = 2.5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/sterile_green_side/west, +/area/almayer/medical/upper_medical) "qQS" = ( /turf/open/floor/almayer/aicore/no_build, /area/almayer/command/airoom) @@ -50597,6 +50414,18 @@ /obj/structure/machinery/door/poddoor/shutters/almayer/cl/quarter/door, /turf/open/floor/almayer/test_floor4, /area/almayer/command/corporateliaison) +"qRO" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/stairs/perspective{ + dir = 10; + icon_state = "p_stair_full" + }, +/turf/open/floor/almayer, +/area/almayer/living/briefing) +"qRV" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, +/turf/open/floor/almayer/orange/southeast, +/area/almayer/engineering/upper_engineering/port) "qRX" = ( /obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 4 @@ -50652,6 +50481,10 @@ /obj/structure/largecrate/random/case, /turf/open/floor/almayer/plate, /area/almayer/maint/upper/u_f_p) +"qTB" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/medical/morgue) "qTQ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -50740,6 +50573,13 @@ /obj/item/tool/pen, /turf/open/floor/almayer/orange/north, /area/almayer/engineering/lower/workshop/hangar) +"qVg" = ( +/obj/structure/stairs{ + icon_state = "ramptop" + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/almayer, +/area/almayer/living/chapel) "qVC" = ( /obj/structure/surface/table/reinforced/almayer_B, /turf/open/floor/almayer/plate, @@ -50865,20 +50705,6 @@ }, /turf/open/floor/plating/almayer/no_build, /area/almayer/hallways/upper/port) -"qXZ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/hangar) "qYd" = ( /turf/open/floor/almayer/red/southeast, /area/almayer/lifeboat_pumps/south2) @@ -50899,10 +50725,6 @@ }, /turf/open/floor/plating/almayer/no_build, /area/almayer/stair_clone/upper) -"qYu" = ( -/obj/structure/pipes/vents/pump, -/turf/open/floor/almayer/plate, -/area/almayer/command/lifeboat) "qYz" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -51046,16 +50868,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_f_s) -"rby" = ( -/obj/structure/machinery/door_control{ - id = "ARES Mainframe Left"; - name = "ARES Mainframe Lockdown"; - pixel_x = 24; - pixel_y = -24; - req_one_access_txt = "91;92" - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "rbB" = ( /turf/open/floor/almayer/silvercorner, /area/almayer/command/computerlab) @@ -51087,6 +50899,10 @@ }, /turf/open/floor/almayer/cargo, /area/almayer/shipboard/brig/execution) +"rbP" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/almayer, +/area/almayer/living/chapel) "rbY" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -51112,6 +50928,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/almayer/maint/hull/upper/u_f_p) +"rcL" = ( +/obj/item/tool/crowbar/red, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 4 + }, +/turf/open/floor/almayer/orange/west, +/area/almayer/engineering/upper_engineering/starboard) "rcS" = ( /obj/structure/machinery/computer/cryopod/eng{ dir = 8 @@ -51302,6 +51125,16 @@ }, /turf/open/floor/almayer/dark_sterile, /area/almayer/living/port_emb) +"rfV" = ( +/obj/structure/sign/safety/medical{ + pixel_x = 15; + pixel_y = -32 + }, +/obj/structure/sign/safety/restrictedarea{ + pixel_y = -32 + }, +/turf/open/floor/almayer/green, +/area/almayer/hallways/upper/fore_hallway) "rfY" = ( /obj/structure/machinery/cryopod, /obj/structure/machinery/light{ @@ -51310,12 +51143,6 @@ }, /turf/open/floor/almayer/cargo, /area/almayer/shipboard/brig/cryo) -"rgk" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/upper/u_a_s) "rgt" = ( /turf/closed/wall/almayer, /area/almayer/hallways/lower/port_umbilical) @@ -51487,41 +51314,6 @@ }, /turf/open/floor/almayer/plating/northeast, /area/almayer/engineering/lower/engine_core) -"rjV" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/cameras/wooden_tv/broadcast{ - dir = 8; - layer = 3.2; - pixel_x = -3; - pixel_y = 6 - }, -/obj/structure/sign/poster{ - desc = "YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE."; - icon_state = "poster11"; - name = "YOU ALWAYS KNOW A WORKING JOE."; - pixel_x = 27; - serial_number = 11 - }, -/obj/item/trash/pistachios{ - layer = 2; - pixel_x = 6; - pixel_y = -6 - }, -/obj/structure/machinery/recharger{ - layer = 3.1; - pixel_y = 22 - }, -/obj/item/ammo_magazine/rifle/incendiary{ - current_rounds = 0; - desc = "A 10mm assault rifle magazine with ':D' drawn on the side"; - pixel_x = 10; - pixel_y = 2 - }, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer/blue/southeast, -/area/almayer/living/port_emb) "rjX" = ( /obj/structure/sign/safety/hvac_old{ pixel_x = 15; @@ -51543,6 +51335,11 @@ /obj/structure/pipes/vents/scrubber, /turf/open/floor/almayer, /area/almayer/living/gym) +"rkD" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/upper/u_a_p) "rkV" = ( /obj/structure/window/framed/almayer/hull/hijack_bustable, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ @@ -51610,12 +51407,6 @@ }, /turf/open/floor/almayer/sterile_green_side/east, /area/almayer/medical/medical_science) -"rmf" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/turf/open/floor/almayer/orangecorner, -/area/almayer/engineering/upper_engineering/starboard) "rmk" = ( /obj/structure/extinguisher_cabinet{ pixel_y = 26 @@ -51696,13 +51487,6 @@ }, /turf/open/floor/almayer/blue/north, /area/almayer/hallways/upper/midship_hallway) -"rnN" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/sign/nosmoking_2{ - pixel_x = 32 - }, -/turf/open/floor/almayer/sterile_green_side/east, -/area/almayer/medical/upper_medical) "rob" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -51774,6 +51558,10 @@ }, /turf/open/floor/almayer/silver/east, /area/almayer/command/cichallway) +"rqe" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/floor/almayer/red, +/area/almayer/lifeboat_pumps/north1) "rqj" = ( /obj/structure/sign/safety/maint{ pixel_x = 8; @@ -52043,6 +51831,11 @@ }, /turf/open/floor/almayer/dark_sterile, /area/almayer/living/port_emb) +"ruv" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/bed/sofa/south/white/left, +/turf/open/floor/almayer/mono, +/area/almayer/medical/upper_medical) "rux" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin/uscm, @@ -52068,6 +51861,10 @@ /obj/structure/largecrate/random, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/s_bow) +"rvN" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/sterile_green_side, +/area/almayer/medical/upper_medical) "rvT" = ( /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer/emerald, @@ -52106,6 +51903,10 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/lower) +"rwW" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/almayer/red/north, +/area/almayer/lifeboat_pumps/south1) "rwY" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -52191,13 +51992,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/upper/port) -"rzk" = ( -/obj/item/tool/screwdriver, -/obj/structure/platform_decoration{ - dir = 8 +"rzi" = ( +/obj/structure/pipes/vents/pump/no_boom{ + dir = 1 }, /turf/open/floor/almayer/plate, -/area/almayer/maint/hull/upper/u_a_p) +/area/almayer/command/lifeboat) "rzy" = ( /obj/structure/disposalpipe/junction, /obj/structure/pipes/standard/simple/hidden/supply, @@ -52260,10 +52060,6 @@ }, /turf/open/floor/almayer/cargo, /area/almayer/squads/alpha) -"rAP" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/orange/northeast, -/area/almayer/engineering/upper_engineering/starboard) "rAS" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/plating/plating_catwalk, @@ -52327,15 +52123,6 @@ }, /turf/open/floor/almayer/red/northwest, /area/almayer/hallways/upper/port) -"rCD" = ( -/obj/structure/machinery/light/small{ - dir = 4 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/almayer/orange/east, -/area/almayer/engineering/upper_engineering/port) "rCK" = ( /obj/structure/machinery/cryopod/right, /turf/open/floor/almayer/cargo, @@ -52348,12 +52135,6 @@ /obj/docking_port/stationary/escape_pod/east, /turf/open/floor/plating, /area/almayer/maint/upper/u_m_s) -"rDb" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/engineering/upper_engineering/port) "rDe" = ( /obj/structure/surface/table/almayer, /obj/structure/sign/safety/cryo{ @@ -52507,6 +52288,11 @@ }, /turf/open/floor/almayer/silver/west, /area/almayer/shipboard/brig/cic_hallway) +"rEZ" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/hangar) "rFg" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 1; @@ -52577,13 +52363,6 @@ }, /turf/open/floor/almayer/orange/east, /area/almayer/maint/upper/mess) -"rGU" = ( -/obj/structure/machinery/computer/skills{ - req_one_access_txt = "200" - }, -/obj/structure/surface/table/woodentable/fancy, -/turf/open/floor/carpet, -/area/almayer/command/corporateliaison) "rHc" = ( /turf/open/floor/carpet, /area/almayer/command/cichallway) @@ -52716,6 +52495,18 @@ /obj/effect/decal/cleanable/cobweb2, /turf/open/floor/almayer/cargo, /area/almayer/living/synthcloset) +"rJc" = ( +/obj/effect/step_trigger/teleporter_vector{ + name = "Almayer_AresUp"; + vector_x = -96; + vector_y = 65 + }, +/obj/structure/platform/metal/almayer/east, +/obj/structure/stairs{ + dir = 1 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "rJf" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer/test_floor4, @@ -52797,6 +52588,15 @@ }, /turf/open/floor/almayer/plate, /area/almayer/living/auxiliary_officer_office) +"rKF" = ( +/obj/structure/machinery/shower{ + pixel_y = 16 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/medical/upper_medical) "rKO" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -52931,6 +52731,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/delta) +"rNC" = ( +/obj/structure/flora/bush/ausbushes/grassybush, +/turf/open/gm/grass/grass1, +/area/almayer/medical/upper_medical) "rNK" = ( /obj/structure/surface/table/almayer, /turf/open/floor/almayer/orange, @@ -52968,6 +52772,12 @@ }, /turf/open/floor/almayer/plate, /area/almayer/command/cic) +"rOH" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/northeast, +/turf/open/floor/almayer/red/northwest, +/area/almayer/lifeboat_pumps/north2) "rOI" = ( /obj/structure/pipes/vents/pump{ dir = 8; @@ -53069,6 +52879,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/cargo_arrow/west, /area/almayer/squads/delta) +"rQU" = ( +/obj/structure/sign/nosmoking_2{ + pixel_x = 32 + }, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/sterile_green_side/east, +/area/almayer/medical/upper_medical) "rQV" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -53187,6 +53006,12 @@ /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer/test_floor4, /area/almayer/hallways/upper/fore_hallway) +"rTh" = ( +/obj/structure/machinery/chem_dispenser/corpsman{ + pixel_y = 3 + }, +/turf/open/floor/almayer/emerald/north, +/area/almayer/squads/charlie) "rTk" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -53378,6 +53203,12 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/maint/hull/upper/u_m_p) +"rXG" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 4 + }, +/turf/open/floor/almayer/red/southeast, +/area/almayer/command/lifeboat) "rXH" = ( /obj/structure/closet/firecloset, /turf/open/floor/almayer/plate, @@ -53499,6 +53330,14 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor/plating/almayer/no_build, /area/almayer/hallways/lower/port_fore_hallway) +"saB" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/almayer/plating/northeast, +/area/almayer/engineering/lower/engine_core) "saL" = ( /obj/structure/machinery/door/airlock/almayer/generic/corporate{ name = "Corporate Liaison's Closet" @@ -53550,6 +53389,17 @@ /obj/effect/landmark/late_join/police, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cryo) +"sbW" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/northeast, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22"; + pixel_y = 6; + pixel_x = 2 + }, +/turf/open/floor/almayer/mono, +/area/almayer/medical/upper_medical) "sbZ" = ( /obj/structure/machinery/camera/autoname/almayer{ name = "ship-grade camera" @@ -53589,16 +53439,6 @@ }, /turf/open/floor/almayer/cargo, /area/almayer/engineering/lower/engine_core) -"scu" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/north1) "scy" = ( /obj/structure/machinery/cryopod/right{ layer = 3.1; @@ -53656,16 +53496,6 @@ }, /turf/open/floor/almayer/red, /area/almayer/hallways/upper/starboard) -"sdn" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/obj/structure/mirror{ - pixel_x = 28 - }, -/turf/open/floor/almayer/sterile, -/area/almayer/medical/upper_medical) "sdu" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer/sterile_green_side/northwest, @@ -53687,13 +53517,6 @@ }, /turf/open/floor/almayer/blue, /area/almayer/squads/delta) -"sdO" = ( -/obj/structure/ladder{ - height = 1; - id = "med1" - }, -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/lower_medical_lobby) "seL" = ( /obj/structure/pipes/vents/pump{ dir = 8; @@ -53701,6 +53524,10 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/port_fore_hallway) +"sfl" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/u_a_p) "sfz" = ( /turf/open/floor/almayer/silver/north, /area/almayer/hallways/upper/midship_hallway) @@ -53841,33 +53668,6 @@ /obj/structure/machinery/autolathe, /turf/open/floor/almayer, /area/almayer/command/lifeboat) -"shp" = ( -/obj/structure/platform{ - dir = 8; - layer = 2.7 - }, -/obj/structure/machinery/flasher{ - id = "briefing_flash"; - range = 12 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer/uscm/directional/west, -/area/almayer/living/briefing) -"shs" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 9; - layer = 3.51 - }, -/turf/open/floor/almayer/red/northeast, -/area/almayer/lifeboat_pumps/south2) "sht" = ( /turf/open/floor/almayer, /area/almayer/living/pilotbunks) @@ -53996,12 +53796,6 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) -"skl" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 - }, -/turf/open/floor/almayer/dark_sterile, -/area/almayer/medical/upper_medical) "skn" = ( /turf/open/floor/almayer/plating_striped, /area/almayer/shipboard/sea_office) @@ -54082,6 +53876,16 @@ "smi" = ( /turf/open/floor/almayer/green, /area/almayer/living/grunt_rnr) +"smr" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/machinery/personal_gear_vendor{ + dir = 8; + pixel_x = -4 + }, +/turf/open/floor/almayer/plate, +/area/almayer/squads/req) "smw" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/computer/med_data/laptop{ @@ -54207,6 +54011,14 @@ /obj/structure/curtain/red, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_a_s) +"snO" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/north1) "snR" = ( /obj/structure/surface/table/almayer, /obj/effect/decal/warning_stripes{ @@ -54265,6 +54077,13 @@ /obj/structure/window/reinforced/toughened, /turf/open/floor/almayer/plate, /area/almayer/command/cic) +"spc" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/south1) "spd" = ( /obj/structure/sign/safety/storage{ pixel_x = 8; @@ -54286,13 +54105,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/engineering/lower) -"spK" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 1 - }, -/obj/structure/largecrate/random/secure, -/turf/open/floor/almayer/plate, -/area/almayer/engineering/upper_engineering/starboard) "spS" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -54348,6 +54160,17 @@ }, /turf/open/floor/almayer/orange/east, /area/almayer/engineering/upper_engineering) +"sqD" = ( +/obj/structure/machinery/light/double/blue{ + dir = 1; + light_color = "#a7dbc7" + }, +/turf/open/gm/grass/grass1, +/area/almayer/medical/upper_medical) +"sqJ" = ( +/obj/structure/platform/metal/almayer, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/upper/u_a_p) "sqW" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /obj/item/seeds/tomatoseed, @@ -54420,12 +54243,6 @@ /obj/structure/closet/secure_closet/guncabinet/red/cic_armory_shotgun, /turf/open/floor/almayer/redfull, /area/almayer/command/cic) -"ssX" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/command/lifeboat) "ssZ" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin/uscm, @@ -54475,6 +54292,12 @@ /obj/structure/closet/firecloset, /turf/open/floor/almayer/cargo, /area/almayer/hallways/lower/vehiclehangar) +"suq" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer/sterile_green_corner/east, +/area/almayer/medical/lower_medical_lobby) "suy" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -54510,22 +54333,12 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/floor/plating/almayer/no_build, /area/almayer/hallways/lower/starboard_midship_hallway) -"suY" = ( -/obj/structure/platform_decoration, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/engineering/lower/engine_core) "svf" = ( /obj/structure/machinery/light{ dir = 1 }, /turf/open/floor/almayer, /area/almayer/command/lifeboat) -"svl" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/turf/open/floor/almayer/plate, -/area/almayer/command/lifeboat) "svq" = ( /obj/structure/bed/chair{ dir = 4 @@ -54630,6 +54443,12 @@ }, /turf/open/floor/almayer/red/northeast, /area/almayer/hallways/upper/port) +"sxH" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 6 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/engineering/upper_engineering/port) "sxS" = ( /obj/structure/largecrate/random/secure, /turf/open/floor/plating/plating_catwalk, @@ -54677,10 +54496,21 @@ }, /turf/open/floor/almayer, /area/almayer/squads/delta) +"syM" = ( +/obj/structure/largecrate/random/secure, +/obj/structure/pipes/vents/scrubber/no_boom{ + dir = 1 + }, +/turf/open/floor/almayer/plate, +/area/almayer/engineering/upper_engineering/starboard) "syO" = ( /obj/structure/machinery/light, /turf/open/floor/almayer, /area/almayer/hallways/upper/midship_hallway) +"szd" = ( +/obj/structure/machinery/chem_dispenser/corpsman, +/turf/open/floor/almayer/sterile_green_side, +/area/almayer/medical/lower_medical_medbay) "szf" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -54750,6 +54580,10 @@ }, /turf/open/floor/almayer/blue, /area/almayer/squads/delta) +"sAs" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/repair_bay) "sAw" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/manifold/hidden/supply{ @@ -54757,6 +54591,10 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/upper_engineering) +"sAx" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/almayer/plating/northeast, +/area/almayer/engineering/lower/engine_core) "sAz" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -54799,6 +54637,12 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/shipboard/brig/processing) +"sBX" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform/metal/almayer, +/obj/structure/platform_decoration/metal/almayer/southwest, +/turf/open/floor/almayer/red/southwest, +/area/almayer/lifeboat_pumps/south1) "sBY" = ( /obj/item/tool/wet_sign, /obj/structure/disposalpipe/segment, @@ -55187,9 +55031,6 @@ }, /turf/open/floor/almayer/orange/north, /area/almayer/living/port_emb) -"sKa" = ( -/turf/open/floor/almayer/sterile_green_side/east, -/area/almayer/medical/morgue) "sKf" = ( /obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/orange/north, @@ -55221,16 +55062,6 @@ }, /turf/open/floor/plating/almayer, /area/almayer/medical/medical_science) -"sLo" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/north1) "sLx" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -55302,6 +55133,10 @@ /obj/structure/largecrate/supply/floodlights, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_a_p) +"sNQ" = ( +/obj/structure/pipes/standard/manifold/hidden/supply/no_boom, +/turf/open/floor/almayer/plate, +/area/almayer/command/lifeboat) "sNR" = ( /turf/closed/wall/almayer/research/containment/wall/corner, /area/almayer/medical/containment/cell/cl) @@ -55352,16 +55187,6 @@ /obj/item/clothing/suit/storage/hazardvest/yellow, /turf/open/floor/almayer/cargo/southwest, /area/almayer/engineering/upper_engineering) -"sOy" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/south1) "sOD" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -55383,13 +55208,11 @@ /obj/structure/closet/toolcloset, /turf/open/floor/almayer/orange/northwest, /area/almayer/maint/upper/mess) -"sOZ" = ( -/obj/structure/sign/safety/ammunition{ - pixel_y = 32 - }, -/obj/structure/closet/secure_closet/guncabinet/red/armory_m4a3_pistol, -/turf/open/floor/almayer/redfull, -/area/almayer/medical/upper_medical) +"sOQ" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/largecrate/random/case/double, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/upper/u_a_s) "sPa" = ( /obj/structure/surface/rack, /obj/item/stack/cable_coil, @@ -55442,10 +55265,6 @@ "sQF" = ( /turf/open/floor/almayer/red, /area/almayer/shipboard/port_missiles) -"sQO" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/almayer/plate, -/area/almayer/command/lifeboat) "sRZ" = ( /obj/effect/projector{ name = "Almayer_Down2"; @@ -55525,12 +55344,6 @@ }, /turf/open/floor/almayer/silver/northeast, /area/almayer/shipboard/brig/cic_hallway) -"sTw" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/living/briefing) "sTU" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -55584,6 +55397,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) +"sUy" = ( +/obj/structure/machinery/cm_vending/sorted/medical/blood, +/obj/structure/medical_supply_link, +/turf/open/floor/almayer/sterile_green_side/north, +/area/almayer/shipboard/brig/medical) +"sUz" = ( +/obj/structure/pipes/standard/manifold/hidden/supply/no_boom, +/turf/open/floor/almayer/orange/east, +/area/almayer/engineering/upper_engineering/starboard) "sUE" = ( /obj/structure/surface/table/reinforced/almayer_B, /turf/open/floor/almayer/bluefull, @@ -55614,6 +55436,12 @@ /obj/item/seeds/orangeseed, /turf/open/floor/almayer/green/north, /area/almayer/shipboard/brig/cells) +"sVs" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 10 + }, +/turf/open/floor/almayer/orange/east, +/area/almayer/engineering/upper_engineering/port) "sVv" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/red/north, @@ -55636,6 +55464,10 @@ "sVV" = ( /turf/open/floor/almayer, /area/almayer/hallways/upper/starboard) +"sVW" = ( +/obj/structure/platform/metal/almayer, +/turf/open/floor/almayer/red, +/area/almayer/lifeboat_pumps/north2) "sWb" = ( /obj/effect/projector{ name = "Almayer_Down2"; @@ -55760,17 +55592,6 @@ /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer/test_floor4, /area/almayer/hallways/lower/port_umbilical) -"sYw" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform, -/obj/structure/platform_decoration{ - dir = 10; - layer = 3.51 - }, -/turf/open/floor/almayer/red/southwest, -/area/almayer/lifeboat_pumps/south2) "sYD" = ( /obj/structure/machinery/status_display{ pixel_x = 16; @@ -55785,15 +55606,6 @@ /obj/structure/reagent_dispensers/fueltank/custom, /turf/open/floor/almayer/plate, /area/almayer/shipboard/port_point_defense) -"sYT" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 4; - id = "CMO Shutters"; - name = "\improper CMO Office Shutters" - }, -/obj/structure/window/framed/almayer/white, -/turf/open/floor/plating, -/area/almayer/medical/upper_medical) "sYU" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -55950,6 +55762,10 @@ }, /turf/open/floor/almayer/no_build/plate, /area/almayer/hallways/upper/starboard) +"tbc" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/almayer/red/north, +/area/almayer/lifeboat_pumps/south1) "tcd" = ( /obj/structure/surface/table/almayer, /obj/item/device/radio{ @@ -56144,6 +55960,12 @@ }, /turf/open/floor/almayer/research/containment/floor2/north, /area/almayer/medical/containment/cell) +"tfO" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 4 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/engineering/upper_engineering/port) "tfQ" = ( /obj/structure/machinery/light/small, /turf/open/floor/plating/plating_catwalk, @@ -56197,15 +56019,14 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/lower/port_midship_hallway) +"tgF" = ( +/obj/item/device/multitool, +/obj/structure/platform_decoration/metal/almayer, +/turf/open/floor/almayer/plating/northeast, +/area/almayer/engineering/lower/engine_core) "tgJ" = ( /turf/open/floor/almayer, /area/almayer/shipboard/brig/warden_office) -"tgK" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer/orange/northwest, -/area/almayer/engineering/upper_engineering/starboard) "tgV" = ( /obj/structure/bed, /obj/item/bedsheet/medical, @@ -56301,6 +56122,10 @@ }, /turf/open/floor/almayer/orange/east, /area/almayer/engineering/upper_engineering/port) +"tiD" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/almayer, +/area/almayer/living/briefing) "tiE" = ( /obj/structure/window/framed/almayer, /turf/open/floor/plating, @@ -56417,6 +56242,12 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/weapon_room) +"tks" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/southeast, +/turf/open/floor/almayer/red/southeast, +/area/almayer/lifeboat_pumps/north2) "tkF" = ( /obj/structure/machinery/light{ dir = 1 @@ -56706,6 +56537,10 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/hallways/lower/port_umbilical) +"tpL" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/upper/u_a_p) "tpR" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -56885,18 +56720,6 @@ }, /turf/open/floor/almayer/bluefull, /area/almayer/command/cichallway) -"tsC" = ( -/obj/item/storage/box/bodybags, -/obj/item/storage/box/bodybags, -/obj/item/storage/box/bodybags, -/obj/item/storage/box/bodybags, -/obj/structure/surface/table/almayer, -/obj/structure/sign/poster{ - icon_state = "poster8"; - pixel_y = 32 - }, -/turf/open/floor/almayer/sterile_green_corner/north, -/area/almayer/medical/upper_medical) "tsE" = ( /obj/structure/largecrate/random/barrel/blue, /turf/open/floor/plating/plating_catwalk, @@ -56935,39 +56758,6 @@ /obj/structure/largecrate/random/barrel/green, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_m_p) -"ttS" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/south2) -"ttX" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/firstaid/regular{ - pixel_x = 8; - pixel_y = -2 - }, -/obj/item/storage/box/drinkingglasses{ - pixel_x = -7 - }, -/obj/item/reagent_container/spray/cleaner{ - pixel_x = -10; - pixel_y = 14 - }, -/obj/item/storage/xeno_tag_case/full{ - pixel_y = 8 - }, -/turf/open/floor/almayer/plate, -/area/almayer/command/corporateliaison) -"tuf" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/almayer/red/north, -/area/almayer/lifeboat_pumps/south1) "tuk" = ( /obj/structure/machinery/computer/crew, /turf/open/floor/almayer/plate, @@ -57039,6 +56829,29 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/lower/starboard_midship_hallway) +"tvm" = ( +/obj/structure/surface/rack, +/obj/item/reagent_container/food/drinks/bottle/sake{ + pixel_y = -3; + pixel_x = 4; + plane = -5 + }, +/obj/item/reagent_container/food/drinks/bottle/sake{ + pixel_x = 4; + pixel_y = 5 + }, +/obj/item/reagent_container/food/drinks/bottle/sake{ + pixel_x = -4; + pixel_y = -3; + plane = -5 + }, +/obj/item/reagent_container/food/drinks/bottle/sake{ + pixel_x = -4; + pixel_y = 5 + }, +/obj/structure/machinery/light, +/turf/open/floor/almayer/plate, +/area/almayer/command/corporateliaison) "tvt" = ( /obj/structure/window/framed/almayer/hull, /turf/open/floor/plating, @@ -57172,18 +56985,10 @@ /obj/structure/bed/stool, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_m_s) -"txO" = ( -/obj/structure/machinery/landinglight/ds1{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 1 - }, -/obj/structure/bed/chair{ - dir = 1 - }, -/turf/open/floor/almayer/plate, -/area/almayer/hallways/hangar) +"txK" = ( +/obj/structure/platform/metal/almayer, +/turf/open/floor/almayer/red, +/area/almayer/lifeboat_pumps/south2) "txS" = ( /obj/structure/surface/table/almayer, /obj/item/fuel_cell, @@ -57246,14 +57051,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/lower/port_fore_hallway) -"tzx" = ( -/obj/structure/machinery/light{ - unacidable = 1; - unslashable = 1 - }, -/obj/structure/machinery/cm_vending/sorted/medical/blood/bolted, -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/lockerroom) "tzF" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/mono, @@ -57317,6 +57114,22 @@ }, /turf/open/floor/almayer/no_build/test_floor4, /area/almayer/command/airoom) +"tAw" = ( +/obj/structure/machinery/landinglight/ds2/delayone{ + dir = 8 + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/almayer/plate, +/area/almayer/hallways/hangar) +"tAC" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor{ + dir = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 4 + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/engineering/upper_engineering/starboard) "tAL" = ( /obj/structure/machinery/cryopod, /turf/open/floor/almayer/cargo, @@ -57365,20 +57178,23 @@ }, /turf/open/floor/almayer/plate, /area/almayer/shipboard/brig/execution_storage) -"tBU" = ( -/obj/structure/platform, -/obj/structure/largecrate/random/case/double{ - layer = 2.98 - }, -/obj/structure/sign/safety/life_support{ - pixel_x = 32 - }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/upper/u_a_s) "tBY" = ( /obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/plate, /area/almayer/maint/upper/mess) +"tCa" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, +/obj/structure/sign/safety/terminal{ + pixel_x = -10; + pixel_y = -27 + }, +/obj/structure/closet/secure_closet/professor_dummy{ + pixel_y = -30 + }, +/turf/open/floor/almayer/sterile_green_side, +/area/almayer/medical/upper_medical) "tCd" = ( /obj/item/folder/red{ desc = "A red folder. The previous contents are a mystery, though the number 28 has been written on the inside of each flap numerous times. Smells faintly of cough syrup."; @@ -57393,6 +57209,13 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/upper/u_m_p) +"tCf" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer/sterile_green_side/east, +/area/almayer/medical/upper_medical) "tCx" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/sign/safety/maint{ @@ -57433,6 +57256,10 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/shipboard/brig/starboard_hallway) +"tCK" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/floor/almayer/plating/northeast, +/area/almayer/engineering/lower/engine_core) "tCT" = ( /obj/structure/bed/chair/comfy/blue{ dir = 8 @@ -57452,19 +57279,6 @@ /obj/structure/reagent_dispensers/acidtank, /turf/open/floor/almayer/cargo, /area/almayer/engineering/lower/workshop/hangar) -"tEi" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/machinery/door_control{ - dir = 1; - id = "Research Armory"; - name = "Research Armory"; - pixel_x = 27; - req_one_access_txt = "4;28" - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/medical/upper_medical) "tEu" = ( /obj/structure/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -57838,6 +57652,18 @@ }, /turf/open/floor/almayer/plate, /area/almayer/living/briefing) +"tNr" = ( +/obj/effect/step_trigger/teleporter_vector{ + name = "Almayer_AresDown"; + vector_x = 96; + vector_y = -65 + }, +/obj/structure/platform/metal/almayer/west, +/obj/structure/stairs{ + dir = 1 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "tNw" = ( /obj/structure/surface/table/almayer, /obj/item/storage/pouch/tools/full, @@ -57973,6 +57799,11 @@ /obj/effect/landmark/late_join/chief_police, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cryo) +"tQG" = ( +/obj/structure/bed/sofa/south/white/left, +/obj/structure/machinery/camera/autoname/almayer, +/turf/open/floor/almayer/sterile_green_corner/north, +/area/almayer/medical/upper_medical) "tQL" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/machinery/light, @@ -58092,6 +57923,10 @@ "tUx" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) +"tUH" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/hangar) "tUK" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -58131,12 +57966,6 @@ }, /turf/open/floor/almayer/bluefull, /area/almayer/living/bridgebunks) -"tVn" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_p) "tVq" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -58193,23 +58022,6 @@ }, /turf/open/floor/almayer/silver, /area/almayer/hallways/lower/repair_bay) -"tWY" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - dir = 4; - id = "CMO Shutters"; - name = "\improper CMO Office Shutters" - }, -/obj/structure/machinery/door/airlock/almayer/medical/glass{ - access_modified = 1; - name = "\improper CMO's Office"; - req_one_access = null; - req_one_access_txt = "1;5" - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/upper_medical) "tXa" = ( /obj/item/storage/toolbox/mechanical{ pixel_y = 13 @@ -58261,6 +58073,15 @@ "tXo" = ( /turf/open/floor/almayer/redcorner, /area/almayer/hallways/lower/starboard_midship_hallway) +"tXL" = ( +/obj/structure/machinery/light{ + unacidable = 1; + unslashable = 1 + }, +/obj/structure/machinery/cm_vending/sorted/medical/blood/bolted, +/obj/structure/medical_supply_link/green, +/turf/open/floor/almayer/sterile_green_side, +/area/almayer/medical/lockerroom) "tXM" = ( /obj/structure/pipes/vents/pump{ dir = 8 @@ -58674,6 +58495,10 @@ }, /turf/open/floor/almayer/orange/west, /area/almayer/engineering/upper_engineering) +"ufA" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/almayer/red, +/area/almayer/lifeboat_pumps/north2) "ufJ" = ( /obj/structure/machinery/cryopod/right{ pixel_y = 6 @@ -58755,12 +58580,11 @@ /obj/structure/closet/secure_closet/guncabinet/red/mp_armory_m4ra_rifle, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/armory) -"uhM" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/engineering/upper_engineering/starboard) +"uhH" = ( +/obj/structure/bed/sofa/south/white, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/sterile_green_side/north, +/area/almayer/medical/upper_medical) "uhP" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out" @@ -58860,14 +58684,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/commandbunks) -"ulp" = ( -/obj/structure/platform, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/engineering/lower/engine_core) "uly" = ( /obj/structure/bed/stool, /turf/open/floor/almayer/plating_striped/east, @@ -58882,16 +58698,18 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/port_aft_hallway) +"ulK" = ( +/obj/structure/platform/metal/almayer/east, +/obj/item/reagent_container/glass/rag, +/obj/structure/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/upper/u_a_p) "ulZ" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/cargo_arrow, /area/almayer/living/offices) -"umh" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/almayer/red/north, -/area/almayer/lifeboat_pumps/south2) "umk" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -58901,6 +58719,10 @@ /obj/effect/spawner/random/tool, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_f_p) +"uml" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/floor/almayer, +/area/almayer/living/briefing) "umm" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/light/small, @@ -58972,15 +58794,6 @@ /obj/item/storage/bible, /turf/open/floor/almayer/plate, /area/almayer/living/pilotbunks) -"unZ" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/engineering/lower/engine_core) "uoi" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -59012,12 +58825,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/p_bow) -"upM" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer/dark_sterile, -/area/almayer/medical/upper_medical) "upO" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/almayer/cargo_arrow, @@ -59107,6 +58914,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/orange/southwest, /area/almayer/squads/bravo) +"uqH" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 9 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/command/lifeboat) "uqI" = ( /obj/structure/machinery/light{ pixel_x = 16 @@ -59161,6 +58974,14 @@ /obj/structure/closet/secure_closet/guncabinet/red/armory_m39_submachinegun, /turf/open/floor/almayer/redfull, /area/almayer/shipboard/panic) +"usr" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/south2) "usu" = ( /obj/structure/surface/rack, /obj/item/roller, @@ -59190,6 +59011,12 @@ /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer/orange/west, /area/almayer/engineering/lower) +"utl" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 9 + }, +/turf/open/floor/almayer/orange/southeast, +/area/almayer/engineering/upper_engineering/starboard) "utn" = ( /obj/structure/closet/secure_closet/engineering_welding, /turf/open/floor/almayer/orange/north, @@ -59242,6 +59069,10 @@ }, /turf/open/floor/almayer, /area/almayer/squads/bravo) +"uuk" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/almayer/red, +/area/almayer/lifeboat_pumps/south1) "uul" = ( /obj/structure/pipes/standard/cap/hidden{ dir = 4 @@ -59467,6 +59298,15 @@ }, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/south2) +"uxJ" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{ + name = "\improper Medical Bay"; + req_one_access = null; + dir = 1 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/upper_medical) "uxO" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal8"; @@ -59547,6 +59387,18 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) +"uAg" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/step_trigger/teleporter_vector{ + name = "Almayer_AresUp"; + vector_x = -96; + vector_y = 65 + }, +/obj/structure/stairs{ + dir = 1 + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "uAj" = ( /obj/structure/bed/chair, /obj/effect/decal/cleanable/dirt, @@ -59760,6 +59612,10 @@ }, /turf/open/floor/almayer/dark_sterile, /area/almayer/medical/lockerroom) +"uDK" = ( +/obj/structure/bed/chair/office/dark, +/turf/open/floor/almayer/sterile_green_side/southwest, +/area/almayer/medical/morgue) "uDW" = ( /obj/structure/machinery/cm_vending/clothing/tl/delta{ density = 0; @@ -59774,26 +59630,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/lower/port_aft_hallway) -"uES" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/machinery/recharge_station{ - layer = 2.9 - }, -/obj/structure/sign/safety/high_voltage{ - pixel_x = 15; - pixel_y = 32 - }, -/obj/structure/sign/safety/hazard{ - pixel_y = 32 - }, -/turf/open/floor/almayer/silver/north, -/area/almayer/hallways/lower/repair_bay) "uFd" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -59994,10 +59830,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/shipboard/starboard_point_defense) -"uLE" = ( -/obj/structure/machinery/cm_vending/sorted/medical/blood, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/shipboard/brig/medical) "uLG" = ( /obj/structure/closet/crate/freezer{ desc = "A freezer crate. Someone has written 'open on christmas' in marker on the top." @@ -60040,27 +59872,6 @@ }, /turf/open/floor/almayer/emerald, /area/almayer/living/port_emb) -"uMO" = ( -/obj/effect/projector{ - name = "Almayer_AresDown"; - vector_x = 96; - vector_y = -65 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/stairs{ - dir = 1; - icon_state = "ramptop" - }, -/obj/structure/machinery/door_control{ - id = "ARES StairsUpper"; - name = "ARES Core Access"; - pixel_x = 24; - req_one_access_txt = "90;91;92" - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "uMS" = ( /turf/open/floor/almayer/blue/northeast, /area/almayer/squads/delta) @@ -60100,6 +59911,14 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/plate, /area/almayer/living/briefing) +"uNJ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/machinery/light, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/sterile_green_corner/west, +/area/almayer/medical/upper_medical) "uNM" = ( /turf/open/floor/almayer/emeraldcorner/west, /area/almayer/living/briefing) @@ -60137,6 +59956,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/mono, /area/almayer/living/pilotbunks) +"uPf" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer/mono, +/area/almayer/medical/upper_medical) "uPr" = ( /turf/open/floor/almayer/blue/northeast, /area/almayer/living/basketball) @@ -60222,15 +60047,6 @@ }, /turf/open/floor/almayer/red/northwest, /area/almayer/command/lifeboat) -"uRt" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_22" - }, -/turf/open/floor/almayer/sterile_green_side/west, -/area/almayer/medical/upper_medical) "uRD" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -60303,17 +60119,6 @@ /obj/structure/largecrate/random/case/double, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_f_p) -"uSW" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 4; - layer = 2.7 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/engineering/lower/engine_core) "uTk" = ( /obj/structure/largecrate/random/secure, /turf/open/floor/plating, @@ -60480,6 +60285,9 @@ }, /turf/open/floor/almayer/aicore/no_build, /area/almayer/command/airoom) +"uUO" = ( +/turf/open/floor/almayer/sterile_green_side/east, +/area/almayer/medical/upper_medical) "uVc" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 1 @@ -60519,6 +60327,12 @@ }, /turf/open/floor/almayer/plating_striped/west, /area/almayer/living/cryo_cells) +"uVE" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 10 + }, +/turf/open/floor/almayer/orange/north, +/area/almayer/engineering/upper_engineering/starboard) "uVV" = ( /obj/structure/machinery/light{ dir = 4 @@ -60684,6 +60498,13 @@ }, /turf/open/floor/almayer/plate, /area/almayer/hallways/lower/port_fore_hallway) +"uYU" = ( +/obj/structure/machinery/light/double/blue{ + light_color = "#a7dbc7"; + dir = 4 + }, +/turf/open/floor/almayer/sterile_green_corner/east, +/area/almayer/medical/upper_medical) "uZm" = ( /obj/effect/projector{ name = "Almayer_Up2"; @@ -60703,12 +60524,6 @@ /obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer, /area/almayer/engineering/lower/workshop) -"uZH" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/turf/open/floor/almayer/orange/east, -/area/almayer/engineering/upper_engineering/starboard) "uZV" = ( /obj/structure/reagent_dispensers/fueltank/gas/methane{ anchored = 1 @@ -60719,6 +60534,12 @@ }, /turf/open/floor/almayer/cargo, /area/almayer/engineering/lower/workshop/hangar) +"uZY" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/northeast, +/turf/open/floor/almayer/red/northwest, +/area/almayer/lifeboat_pumps/south1) "uZZ" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Basketball Court" @@ -60999,6 +60820,12 @@ }, /turf/open/floor/almayer/orange/north, /area/almayer/squads/bravo) +"vfy" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 9 + }, +/turf/open/floor/almayer/orange, +/area/almayer/engineering/upper_engineering/port) "vfP" = ( /turf/open/floor/almayer/research/containment/corner/north, /area/almayer/medical/containment/cell) @@ -61138,15 +60965,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/living/chapel) -"vih" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/fancy/candle_box, -/obj/structure/sign/safety/medical{ - pixel_x = 8; - pixel_y = -32 - }, -/turf/open/floor/almayer/plate, -/area/almayer/medical/morgue) "vil" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -61303,6 +61121,27 @@ }, /turf/open/floor/almayer/plate, /area/almayer/living/captain_mess) +"vkf" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/light, +/obj/structure/machinery/computer/cameras/containment{ + dir = 8; + name = "Research Cameras"; + pixel_y = 10 + }, +/obj/structure/machinery/computer/research/main_terminal{ + dir = 8; + pixel_y = -3 + }, +/obj/structure/machinery/door_control{ + id = "CMO Shutters"; + name = "Office Shutters"; + req_access_txt = "5"; + pixel_x = -11; + pixel_y = -6 + }, +/turf/open/floor/almayer/sterile_green_side, +/area/almayer/medical/upper_medical) "vkp" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -61650,6 +61489,9 @@ }, /turf/open/floor/almayer/red/southwest, /area/almayer/hallways/lower/port_fore_hallway) +"vqB" = ( +/turf/open/floor/almayer/sterile_green_corner/east, +/area/almayer/medical/upper_medical) "vqC" = ( /obj/structure/pipes/vents/pump{ dir = 4 @@ -61675,10 +61517,6 @@ }, /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) -"vqK" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/almayer/orange/east, -/area/almayer/engineering/upper_engineering/starboard) "vqL" = ( /obj/item/clothing/under/shorts/black, /obj/structure/machinery/power/apc/almayer/west, @@ -61845,12 +61683,6 @@ /obj/structure/machinery/mech_bay_recharge_port, /turf/open/shuttle/dropship/light_grey_single_wide_up_to_down, /area/almayer/powered/agent) -"vtx" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper Bathroom" - }, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/upper_medical) "vtG" = ( /obj/structure/toilet{ dir = 4 @@ -62073,6 +61905,10 @@ "vxM" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/cryo) +"vxQ" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, +/turf/open/floor/almayer/red, +/area/almayer/command/lifeboat) "vxX" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/tool/wrench{ @@ -62218,6 +62054,13 @@ }, /turf/open/floor/almayer/plate, /area/almayer/living/grunt_rnr) +"vAe" = ( +/obj/structure/machinery/door/poddoor/shutters/almayer{ + id = "Research Armory"; + name = "\improper Armory Shutters" + }, +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/upper_medical) "vAg" = ( /obj/structure/largecrate/random/barrel/blue, /obj/structure/sign/safety/restrictedarea{ @@ -62299,6 +62142,11 @@ }, /turf/open/floor/almayer/no_build, /area/almayer/shipboard/brig/chief_mp_office) +"vBN" = ( +/obj/item/tool/screwdriver, +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/upper/u_a_p) "vBU" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -62400,6 +62248,14 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/lower/port_aft_hallway) +"vDu" = ( +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/north1) "vDz" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -62407,12 +62263,26 @@ /obj/structure/machinery/light, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_f_s) +"vDH" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/almayer, +/area/almayer/hallways/lower/repair_bay) "vDN" = ( /obj/structure/machinery/light/small{ dir = 1 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_m_p) +"vEc" = ( +/obj/structure/closet/secure_closet/personal/cabinet{ + req_access_txt = "5" + }, +/obj/item/clothing/accessory/stethoscope, +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer/mono, +/area/almayer/medical/upper_medical) "vEf" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -62512,6 +62382,11 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_f_p) +"vGb" = ( +/obj/structure/machinery/cm_vending/sorted/medical/blood, +/obj/structure/medical_supply_link/green, +/turf/open/floor/almayer/sterile_green_corner/north, +/area/almayer/medical/lower_medical_medbay) "vGn" = ( /turf/open/floor/almayer/red/north, /area/almayer/shipboard/brig/interrogation) @@ -62638,6 +62513,9 @@ }, /turf/open/floor/almayer/plate, /area/almayer/command/cic) +"vHK" = ( +/turf/open/gm/grass/grass1, +/area/almayer/medical/upper_medical) "vHO" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -62667,13 +62545,6 @@ /obj/item/device/flashlight, /turf/open/floor/almayer/redfull, /area/almayer/command/cic) -"vIf" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" - }, -/turf/open/floor/almayer/sterile_green_side, -/area/almayer/medical/upper_medical) "vIg" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer/test_floor4, @@ -62800,16 +62671,6 @@ }, /turf/open/floor/almayer/silver/west, /area/almayer/hallways/lower/repair_bay) -"vLz" = ( -/obj/structure/machinery/door_control{ - id = "ARES Mainframe Right"; - name = "ARES Mainframe Lockdown"; - pixel_x = -24; - pixel_y = -24; - req_one_access_txt = "91;92" - }, -/turf/open/floor/almayer/aicore/no_build, -/area/almayer/command/airoom) "vLA" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -62822,6 +62683,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/cargo_arrow/west, /area/almayer/squads/charlie) +"vLD" = ( +/obj/structure/platform/metal/almayer/west, +/obj/item/stack/sheet/metal, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/upper/u_a_p) +"vLJ" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/almayer/red/west, +/area/almayer/lifeboat_pumps/north1) "vMb" = ( /obj/item/stool{ pixel_x = -15; @@ -62911,6 +62781,17 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/cells) +"vNv" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/machinery/landinglight/ds2{ + dir = 8 + }, +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/almayer/plate, +/area/almayer/hallways/hangar) "vND" = ( /obj/structure/bed/chair{ dir = 8; @@ -62921,6 +62802,11 @@ }, /turf/open/floor/almayer, /area/almayer/squads/charlie) +"vNS" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/largecrate/random/case, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/upper/u_a_s) "vNT" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 1 @@ -62936,6 +62822,12 @@ /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, /area/almayer/lifeboat_pumps/north2) +"vOk" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/northwest, +/turf/open/floor/almayer/red/northeast, +/area/almayer/lifeboat_pumps/south1) "vOu" = ( /obj/structure/surface/table/almayer, /obj/item/weapon/gun/energy/taser, @@ -62980,6 +62872,12 @@ /obj/structure/machinery/door/poddoor/almayer/biohazard/white, /turf/open/floor/almayer/test_floor4, /area/almayer/medical/upper_medical) +"vOQ" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/engineering/upper_engineering/port) "vOV" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -63088,6 +62986,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/vehiclehangar) +"vQc" = ( +/obj/structure/machinery/chem_dispenser/corpsman{ + pixel_y = 3 + }, +/turf/open/floor/almayer/red/north, +/area/almayer/squads/alpha) "vQe" = ( /obj/effect/step_trigger/teleporter_vector{ name = "Almayer_Down2"; @@ -63107,12 +63011,6 @@ /obj/item/device/camera, /turf/open/floor/almayer, /area/almayer/command/computerlab) -"vQN" = ( -/obj/structure/sign/safety/restrictedarea{ - pixel_y = -32 - }, -/turf/open/floor/almayer/green, -/area/almayer/hallways/upper/fore_hallway) "vQR" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/wood/ship, @@ -63170,17 +63068,6 @@ }, /turf/open/floor/almayer/red/north, /area/almayer/hallways/upper/port) -"vRX" = ( -/obj/structure/surface/table/almayer, -/obj/item/book/manual/medical_diagnostics_manual, -/obj/item/device/megaphone, -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 - }, -/turf/open/floor/almayer/sterile_green_corner, -/area/almayer/medical/upper_medical) "vSl" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -63340,6 +63227,14 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_a_p) +"vUK" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/almayer, +/area/almayer/lifeboat_pumps/north2) "vUP" = ( /turf/closed/wall/almayer/reinforced, /area/almayer/shipboard/brig/cic_hallway) @@ -63481,6 +63376,14 @@ }, /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) +"vWD" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + layer = 2.5; + pixel_y = 2 + }, +/turf/open/floor/almayer/sterile_green_side/northwest, +/area/almayer/medical/upper_medical) "vWG" = ( /obj/structure/pipes/vents/pump, /obj/item/tool/soap, @@ -63552,16 +63455,6 @@ }, /turf/open/floor/almayer, /area/almayer/engineering/lower) -"vXv" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/flora/pottedplant{ - icon_state = "pottedplant_10"; - pixel_y = 14 - }, -/turf/open/floor/almayer/mono, -/area/almayer/medical/upper_medical) "vXF" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -63698,6 +63591,14 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_a_p) +"wae" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, +/turf/open/floor/almayer/orange/northeast, +/area/almayer/engineering/upper_engineering/starboard) +"waf" = ( +/obj/structure/flora/bush/ausbushes/ppflowers, +/turf/open/gm/grass/grass1, +/area/almayer/medical/upper_medical) "wan" = ( /obj/structure/surface/table/almayer, /obj/item/facepaint/brown, @@ -63811,6 +63712,10 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/s_bow) +"wcL" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/almayer, +/area/almayer/living/briefing) "wcN" = ( /obj/structure/machinery/status_display{ pixel_y = 30 @@ -63963,6 +63868,10 @@ "wfE" = ( /turf/closed/wall/almayer, /area/almayer/living/gym) +"wfO" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/upper/u_a_s) "wfZ" = ( /obj/structure/desertdam/decals/road_edge{ pixel_x = -12 @@ -64130,15 +64039,6 @@ /obj/structure/machinery/vending/cola, /turf/open/floor/almayer/orangefull, /area/almayer/engineering/upper_engineering) -"wjz" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/medical/upper_medical) "wjC" = ( /obj/structure/closet/firecloset, /obj/structure/machinery/power/apc/almayer/north, @@ -64298,16 +64198,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/command/cic) -"wlF" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/south2) "wlK" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -64318,6 +64208,13 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) +"wlR" = ( +/obj/structure/machinery/cm_vending/clothing/senior_officer{ + pixel_y = 20; + density = 0 + }, +/turf/open/floor/almayer/mono, +/area/almayer/medical/upper_medical) "wmg" = ( /obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/red/north, @@ -64434,6 +64331,12 @@ /obj/structure/machinery/blackbox_recorder, /turf/open/shuttle/dropship/light_grey_single_wide_up_to_down, /area/almayer/powered/agent) +"wpq" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 4 + }, +/turf/open/floor/almayer/plate, +/area/almayer/command/lifeboat) "wpt" = ( /obj/structure/machinery/door/poddoor/almayer/open{ dir = 4; @@ -64449,18 +64352,6 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/command/cic) -"wpu" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/device/flashlight/lamp{ - pixel_y = 8 - }, -/obj/item/clothing/glasses/science{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/device/flash, -/turf/open/floor/almayer/mono, -/area/almayer/medical/upper_medical) "wpI" = ( /turf/open/floor/almayer/green/east, /area/almayer/living/grunt_rnr) @@ -64484,6 +64375,21 @@ }, /turf/open/floor/almayer/plate, /area/almayer/hallways/hangar) +"wqq" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/almayer/silver/east, +/area/almayer/hallways/lower/repair_bay) "wqr" = ( /obj/structure/sign/safety/terminal{ pixel_x = 7; @@ -64501,13 +64407,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/lower/starboard_aft_hallway) -"wqW" = ( -/obj/structure/closet/secure_closet/CMO, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer/sterile_green_corner/north, -/area/almayer/medical/upper_medical) "wra" = ( /obj/structure/machinery/light/small{ dir = 4 @@ -64857,6 +64756,13 @@ /obj/item/tool/pen, /turf/open/floor/almayer/orange, /area/almayer/engineering/upper_engineering) +"wwO" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/almayer/plating/northeast, +/area/almayer/engineering/lower/engine_core) "wwW" = ( /obj/structure/machinery/camera/autoname/almayer/containment/hidden{ dir = 8; @@ -64964,11 +64870,24 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/test_floor4, /area/almayer/maint/hull/lower/l_m_s) +"wyK" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/southeast, +/turf/open/floor/almayer/red/southeast, +/area/almayer/lifeboat_pumps/north1) "wyQ" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/aicore_lockdown, /turf/open/floor/almayer/no_build/plating, /area/almayer/command/airoom) +"wzd" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/turf/open/floor/almayer/sterile_green_side/north, +/area/almayer/medical/upper_medical) "wzy" = ( /obj/effect/step_trigger/clone_cleaner, /turf/open/floor/plating/plating_catwalk, @@ -64989,6 +64908,10 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/medical/lower_medical_medbay) +"wAD" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, +/turf/open/floor/almayer/orange/east, +/area/almayer/engineering/upper_engineering/starboard) "wAE" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -65025,6 +64948,10 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/upper/starboard) +"wBP" = ( +/obj/structure/pipes/standard/tank/oxygen, +/turf/open/floor/almayer/sterile_green_side/north, +/area/almayer/medical/cryo_tubes) "wCe" = ( /obj/structure/machinery/light, /turf/open/floor/almayer/orangecorner, @@ -65115,13 +65042,6 @@ }, /turf/open/floor/almayer/green/north, /area/almayer/hallways/lower/port_midship_hallway) -"wDH" = ( -/obj/structure/morgue, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/almayer/plate, -/area/almayer/medical/morgue) "wDJ" = ( /turf/open/floor/almayer/emerald/north, /area/almayer/squads/charlie_delta_shared) @@ -65188,12 +65108,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/lower/starboard_midship_hallway) -"wEO" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/almayer/red/north, -/area/almayer/lifeboat_pumps/south2) "wET" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/secure_closet/guncabinet, @@ -65231,6 +65145,12 @@ "wFs" = ( /turf/closed/wall/almayer, /area/almayer/shipboard/brig/starboard_hallway) +"wFx" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/command/lifeboat) "wFz" = ( /obj/item/prop{ desc = "Predecessor to the M56 the M38 was known for its extreme reliability in the field. This particular M38D is fondly remembered for its stalwart defence of the hangar bay during the Arcturian commando raid of the USS Almayer on Io."; @@ -65252,6 +65172,14 @@ }, /turf/open/floor/almayer/plate, /area/almayer/shipboard/panic) +"wFO" = ( +/obj/structure/machinery/crema_switch{ + pixel_x = -24; + req_access_txt = "25" + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plate, +/area/almayer/medical/morgue) "wFQ" = ( /obj/structure/machinery/cm_vending/clothing/maintenance_technician, /turf/open/floor/almayer/plate, @@ -65341,6 +65269,14 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/upper/aft_hallway) +"wHC" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_ew_full_cap"; + layer = 3.5 + }, +/obj/structure/platform/metal/stair_cut/platform_right, +/turf/open/floor/almayer/plating/northeast, +/area/almayer/engineering/lower/engine_core) "wIr" = ( /obj/structure/machinery/cm_vending/clothing/senior_officer{ req_access = list(); @@ -65402,16 +65338,6 @@ /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/almayer/shipboard/brig/cryo) -"wJo" = ( -/obj/structure/machinery/door/airlock/almayer/research/reinforced{ - access_modified = 1; - dir = 1; - name = "\improper CMO's Bedroom"; - req_one_access_txt = "1;5" - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer/test_floor4, -/area/almayer/medical/upper_medical) "wJC" = ( /obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/plating/plating_catwalk, @@ -65527,16 +65453,6 @@ "wLm" = ( /turf/open/floor/almayer/plating_striped/east, /area/almayer/living/cryo_cells) -"wLu" = ( -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/lifeboat_pumps/south2) "wLy" = ( /obj/structure/pipes/vents/pump/no_boom{ name = "Secure Reinforced Air Vent"; @@ -65645,6 +65561,17 @@ }, /turf/open/floor/almayer/orange/east, /area/almayer/hallways/lower/starboard_midship_hallway) +"wMt" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/southwest, +/obj/structure/platform_decoration/metal/almayer/northeast, +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/turf/open/floor/almayer/mono, +/area/almayer/medical/upper_medical) "wMv" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -65740,36 +65667,18 @@ }, /turf/open/floor/almayer/plate, /area/almayer/command/lifeboat) -"wNT" = ( -/obj/structure/platform, -/turf/open/floor/almayer, -/area/almayer/living/briefing) "wOt" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/upper_engineering/starboard) -"wOv" = ( -/obj/structure/platform, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/upper/u_a_s) "wOK" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, /turf/open/floor/almayer/orange/southwest, /area/almayer/engineering/upper_engineering/port) -"wPa" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/item/reagent_container/glass/rag, -/obj/structure/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/upper/u_a_p) "wPf" = ( /obj/structure/sign/safety/reception{ pixel_x = 32; @@ -65828,6 +65737,17 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plate, /area/almayer/maint/upper/u_f_s) +"wQT" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/surface/table/almayer, +/obj/structure/flora/pottedplant{ + icon_state = "pottedplant_22"; + pixel_y = 16 + }, +/turf/open/floor/almayer/sterile_green_corner/east, +/area/almayer/medical/upper_medical) "wRf" = ( /obj/structure/machinery/light/small, /obj/structure/sign/safety/nonpress_0g{ @@ -65903,11 +65823,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/lobby) -"wSx" = ( -/obj/structure/platform_decoration, -/obj/structure/machinery/power/apc/almayer/east, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/upper/u_a_p) "wSB" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/upper/u_a_p) @@ -65998,15 +65913,6 @@ /obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/plate, /area/almayer/living/auxiliary_officer_office) -"wUd" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/box/gloves{ - pixel_x = 7; - pixel_y = 7 - }, -/obj/item/storage/fancy/candle_box, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/medical/morgue) "wUJ" = ( /obj/structure/largecrate/random/barrel/white, /turf/open/floor/almayer/plate, @@ -66156,10 +66062,12 @@ }, /turf/open/floor/almayer/mono, /area/almayer/lifeboat_pumps/north2) -"wXl" = ( -/obj/structure/platform, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/upper/u_a_p) +"wXo" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/engineering/upper_engineering/starboard) "wXz" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -66185,6 +66093,10 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/hallways/hangar) +"wXW" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, +/turf/open/floor/almayer/plate, +/area/almayer/command/lifeboat) "wYa" = ( /turf/open/floor/almayer/red/southwest, /area/almayer/lifeboat_pumps/north2) @@ -66251,12 +66163,6 @@ /obj/structure/pipes/vents/pump, /turf/open/floor/almayer, /area/almayer/shipboard/brig/perma) -"wZX" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/command/lifeboat) "xac" = ( /obj/structure/sign/safety/ladder{ pixel_x = 8; @@ -66346,6 +66252,13 @@ /obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_m_s) +"xbU" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer/plating/northeast, +/area/almayer/engineering/lower/engine_core) "xcI" = ( /obj/structure/sign/safety/water{ pixel_x = 8; @@ -66532,13 +66445,6 @@ }, /turf/open/floor/plating/almayer, /area/almayer/maint/hull/lower/l_a_p) -"xgJ" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/machinery/cm_vending/sorted/medical/blood/bolted, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/lockerroom) "xgN" = ( /obj/structure/bed/chair/comfy/bravo{ dir = 1 @@ -66550,12 +66456,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/living/briefing) -"xgP" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/almayer/mono, -/area/almayer/medical/upper_medical) "xgS" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -66747,6 +66647,11 @@ /obj/effect/step_trigger/clone_cleaner, /turf/open/floor/almayer/greencorner/east, /area/almayer/hallways/lower/starboard_fore_hallway) +"xlc" = ( +/obj/structure/largecrate/random/barrel/green, +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, +/turf/open/floor/almayer/orange/northeast, +/area/almayer/engineering/upper_engineering/starboard) "xlk" = ( /obj/structure/bed/chair, /turf/open/floor/almayer, @@ -66876,6 +66781,14 @@ "xoO" = ( /turf/open/floor/almayer/orange/southwest, /area/almayer/engineering/upper_engineering/port) +"xoS" = ( +/obj/item/paper_bin/uscm{ + pixel_y = 6; + pixel_x = 7 + }, +/obj/structure/surface/table/almayer, +/turf/open/floor/almayer/sterile_green_side, +/area/almayer/medical/upper_medical) "xpc" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 1; @@ -66931,20 +66844,19 @@ }, /turf/open/floor/almayer/plate, /area/almayer/hallways/hangar) -"xpZ" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/engineering/lower/engine_core) "xqh" = ( /obj/structure/surface/table/almayer, /obj/item/tool/weldingtool, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/upper/u_m_s) +"xql" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" + }, +/turf/open/floor/almayer/sterile_green_side/east, +/area/almayer/medical/upper_medical) "xqp" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -66980,14 +66892,6 @@ }, /turf/closed/wall/almayer, /area/almayer/command/securestorage) -"xqQ" = ( -/obj/structure/machinery/door/poddoor/almayer/blended{ - id = "RoomDivider"; - layer = 3.1; - name = "\improper Room Divider" - }, -/turf/open/floor/almayer/plate, -/area/almayer/command/corporateliaison) "xrg" = ( /obj/structure/sign/safety/hazard{ pixel_x = 32; @@ -67043,16 +66947,6 @@ }, /turf/open/floor/almayer/plate, /area/almayer/engineering/lower/workshop) -"xrT" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/lower/repair_bay) "xsi" = ( /obj/structure/stairs{ dir = 1 @@ -67087,12 +66981,6 @@ "xsw" = ( /turf/open/floor/almayer/sterile_green_side/southeast, /area/almayer/medical/lower_medical_medbay) -"xsz" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out" - }, -/turf/open/floor/almayer/plating/northeast, -/area/almayer/medical/upper_medical) "xsQ" = ( /obj/structure/surface/table/almayer, /obj/item/stack/sheet/glass{ @@ -67107,10 +66995,6 @@ /obj/item/weapon/dart/green, /turf/open/floor/plating, /area/almayer/maint/lower/constr) -"xtM" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer/sterile_green_side/southeast, -/area/almayer/medical/lower_medical_lobby) "xub" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -67249,6 +67133,13 @@ }, /turf/open/floor/almayer/plate, /area/almayer/living/grunt_rnr) +"xwq" = ( +/obj/structure/morgue, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer/test_floor5, +/area/almayer/medical/morgue) "xwE" = ( /obj/structure/bed/chair/comfy/alpha, /obj/effect/decal/cleanable/dirt, @@ -67509,19 +67400,6 @@ /obj/item/clipboard, /turf/open/floor/almayer/green/southwest, /area/almayer/squads/req) -"xAI" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 5; - layer = 3.51 - }, -/turf/open/floor/almayer/red/northwest, -/area/almayer/lifeboat_pumps/south1) "xAY" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -67680,6 +67558,23 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer/green, /area/almayer/hallways/upper/fore_hallway) +"xFE" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/firstaid/regular{ + pixel_y = 6 + }, +/obj/item/storage/box/drinkingglasses{ + pixel_x = -8 + }, +/obj/item/reagent_container/spray/cleaner{ + pixel_x = -10; + pixel_y = 14 + }, +/obj/item/storage/box/wy_mre{ + pixel_x = 8 + }, +/turf/open/floor/almayer/plate, +/area/almayer/command/corporateliaison) "xFP" = ( /turf/open/floor/almayer/red/northeast, /area/almayer/shipboard/starboard_missiles) @@ -67695,12 +67590,6 @@ /obj/item/seeds/goldappleseed, /turf/open/floor/almayer/green/north, /area/almayer/shipboard/brig/cells) -"xGm" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/hull/upper/u_a_p) "xGo" = ( /obj/structure/machinery/autolathe, /turf/open/floor/almayer/cargo, @@ -67885,6 +67774,16 @@ /obj/item/device/analyzer, /turf/open/floor/almayer/plate, /area/almayer/command/lifeboat) +"xJn" = ( +/obj/structure/machinery/door/airlock/almayer/generic/glass{ + name = "\improper Psychiatric Care Unit" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/machinery/door/firedoor/border_only/almayer, +/turf/open/floor/almayer/test_floor4, +/area/almayer/medical/upper_medical) "xJp" = ( /obj/structure/largecrate/random/barrel/yellow, /turf/open/floor/almayer/plate, @@ -67921,6 +67820,14 @@ }, /turf/open/floor/almayer/orange/east, /area/almayer/engineering/lower) +"xKh" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/item/reagent_container/glass/bucket/mopbucket{ + pixel_x = 7; + pixel_y = -3 + }, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/upper/u_a_p) "xKG" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -68122,13 +68029,6 @@ }, /turf/open/floor/almayer/cargo, /area/almayer/hallways/hangar) -"xNu" = ( -/obj/structure/toilet{ - dir = 1 - }, -/obj/structure/machinery/light, -/turf/open/floor/almayer/sterile, -/area/almayer/medical/upper_medical) "xNv" = ( /obj/structure/bed/chair/office/dark{ dir = 1 @@ -68187,34 +68087,11 @@ }, /turf/open/floor/almayer/research/containment/corner/east, /area/almayer/medical/containment/cell) -"xPn" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 1 - }, -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/almayer/silver/east, -/area/almayer/hallways/lower/repair_bay) "xPq" = ( /obj/structure/filingcabinet, /obj/item/folder/yellow, /turf/open/floor/almayer/orange/north, /area/almayer/engineering/lower/workshop/hangar) -"xPZ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/almayer/orange/northeast, -/area/almayer/engineering/upper_engineering/port) "xQa" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -68437,6 +68314,10 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer/silver, /area/almayer/command/cic) +"xUT" = ( +/obj/structure/platform/metal/almayer, +/turf/open/floor/almayer/plate, +/area/almayer/maint/hull/upper/u_a_s) "xUV" = ( /obj/structure/bed/chair{ dir = 4 @@ -68476,6 +68357,16 @@ "xVk" = ( /turf/open/space, /area/space/almayer/lifeboat_dock) +"xVo" = ( +/obj/structure/machinery/door_control{ + id = "ARES Mainframe Left"; + name = "ARES Mainframe Lockdown"; + pixel_x = 24; + pixel_y = -24; + req_one_access_txt = "91;92" + }, +/turf/open/floor/almayer/aicore/no_build, +/area/almayer/command/airoom) "xVF" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -68510,6 +68401,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/almayer/orange, /area/almayer/squads/alpha_bravo_shared) +"xWh" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/engineering/upper_engineering/starboard) "xWo" = ( /obj/structure/machinery/door/airlock/almayer/maint{ access_modified = 1; @@ -68657,20 +68554,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plate, /area/almayer/living/briefing) -"xZt" = ( -/obj/structure/sign/safety/refridgeration{ - pixel_y = -32 - }, -/obj/structure/sign/safety/medical{ - pixel_x = 15; - pixel_y = -32 - }, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" - }, -/turf/open/floor/almayer/green, -/area/almayer/hallways/upper/fore_hallway) "xZG" = ( /obj/structure/machinery/light{ dir = 4 @@ -68707,12 +68590,6 @@ }, /turf/open/floor/almayer/cargo, /area/almayer/squads/charlie) -"yac" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/almayer/red/north, -/area/almayer/lifeboat_pumps/south1) "yap" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -68795,6 +68672,10 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/processing) +"ybL" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/sterile_green_side/northwest, +/area/almayer/medical/upper_medical) "ybP" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -68856,21 +68737,6 @@ }, /turf/open/floor/almayer/blue/north, /area/almayer/squads/delta) -"ydf" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/largecrate/random/case, -/turf/open/floor/almayer/plate, -/area/almayer/maint/hull/upper/u_a_s) -"ydh" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 - }, -/obj/structure/surface/table/reinforced/black, -/obj/item/tank/oxygen, -/turf/open/floor/almayer/plate, -/area/almayer/engineering/upper_engineering/port) "ydz" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -69121,6 +68987,27 @@ }, /turf/open/floor/almayer/plate, /area/almayer/maint/hull/lower/l_m_s) +"yij" = ( +/obj/item/storage/fancy/cigarettes/blackpack{ + pixel_x = -1; + pixel_y = 1 + }, +/obj/structure/surface/table/woodentable/fancy, +/obj/item/storage/fancy/cigarettes/wypacket{ + pixel_x = 6; + pixel_y = 3 + }, +/obj/item/tool/lighter/zippo/gold{ + pixel_x = 2 + }, +/obj/structure/machinery/computer/cameras/wooden_tv/broadcast{ + dir = 4; + layer = 3.2; + pixel_x = -15; + pixel_y = 1 + }, +/turf/open/floor/carpet, +/area/almayer/command/corporateliaison) "yiu" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -69148,14 +69035,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/synthcloset) -"yjb" = ( -/obj/item/device/radio/intercom{ - freerange = 1; - name = "General Listening Channel"; - pixel_y = 28 - }, -/turf/open/floor/almayer/sterile_green_side/north, -/area/almayer/medical/morgue) "yjq" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ icon_state = "almayer_pdoor"; @@ -69201,16 +69080,6 @@ }, /turf/open/floor/almayer/test_floor4, /area/almayer/living/grunt_rnr) -"yko" = ( -/obj/vehicle/powerloader, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/almayer/cargo, -/area/almayer/hallways/lower/repair_bay) "ykv" = ( /obj/structure/machinery/door/poddoor/shutters/almayer/open{ id = "InnerShutter"; @@ -69224,6 +69093,10 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering/lower) +"yld" = ( +/obj/structure/pipes/standard/simple/hidden/supply/no_boom, +/turf/open/floor/almayer, +/area/almayer/command/lifeboat) "yle" = ( /obj/effect/landmark/start/marine/engineer/delta, /obj/effect/landmark/late_join/delta, @@ -72999,7 +72872,7 @@ aaa aaa aaa aaa -aaa +bdH aaa aab aaa @@ -73183,27 +73056,27 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aab aaa aaa @@ -73386,27 +73259,27 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aab aaa aaa @@ -73589,27 +73462,27 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aab aaa aaa @@ -73711,35 +73584,14 @@ aaa aaa aaa aaa -aab -aaa -aaa -"} -(23,1,1) = {" -aaa -aaa -aab -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aab aaa aaa +"} +(23,1,1) = {" aaa aaa +aab aaa aaa aaa @@ -73763,10 +73615,6 @@ aaa aaa aaa aaa -bdH -bdH -bdH -bdH aaa aaa aaa @@ -73788,6 +73636,10 @@ aaa aaa aaa aaa +bdH +bdH +bdH +bdH aaa aaa aaa @@ -73813,6 +73665,27 @@ aaa aaa aaa aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aab aaa aaa @@ -73995,27 +73868,27 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aab aaa aaa @@ -74198,27 +74071,27 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aab aaa aaa @@ -74401,27 +74274,27 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aab aaa aaa @@ -74604,27 +74477,27 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aab aaa aaa @@ -74807,27 +74680,27 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aab aaa aaa @@ -75010,27 +74883,27 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aab aaa aaa @@ -75213,27 +75086,27 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aab aaa aaa @@ -75416,27 +75289,27 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aab aaa aaa @@ -75619,27 +75492,27 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aab aaa aaa @@ -75822,27 +75695,27 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aab aaa aaa @@ -75988,53 +75861,23 @@ aaa aaa aaa aaa -bdH -bdH -bdH -bdH -aaa -aaa -aac -aaf -aaf -aaf -aaf -aaf -aaf -aaf -ajY -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +aaa +aaa +aac +aaf +aaf +aaf +aaf +aaf +aaf +aaf +ajY +aaa +aaa aaa aaa aaa @@ -76046,6 +75889,36 @@ aaa aaa aaa aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aab aaa aaa @@ -76228,27 +76101,27 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aab aaa aaa @@ -76431,27 +76304,27 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aab aaa aaa @@ -76634,27 +76507,27 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aab aaa aaa @@ -76837,27 +76710,27 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aab aaa aaa @@ -77040,27 +76913,27 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aab aaa aaa @@ -77244,25 +77117,25 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -77447,25 +77320,25 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -77650,25 +77523,25 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -77853,25 +77726,25 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -78056,25 +77929,25 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -78259,25 +78132,25 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -78462,25 +78335,25 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -78665,25 +78538,25 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -78868,25 +78741,25 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -79071,25 +78944,25 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -79274,25 +79147,25 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -79477,25 +79350,25 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -79680,25 +79553,25 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -79883,25 +79756,25 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -80086,25 +79959,25 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -80504,9 +80377,9 @@ aaa aaa aaa aaa -aaa -aaa -aaa +bdH +bdH +bdH aaa aaa aaa @@ -80703,17 +80576,17 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -80906,17 +80779,17 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -81109,17 +80982,17 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -81312,17 +81185,17 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -81473,7 +81346,7 @@ cqJ oJm tUK kTp -uLE +sUy nWS cTy oeZ @@ -81514,19 +81387,19 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aab aaa aaa @@ -81717,19 +81590,19 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aab aaa aaa @@ -81920,19 +81793,19 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aab aaa aaa @@ -82124,17 +81997,17 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -82327,17 +82200,17 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -82530,17 +82403,17 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -82733,17 +82606,17 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH +bdH aaa aab aaa @@ -82940,9 +82813,9 @@ aaa aaa aaa aaa -aaa -aaa -aaa +bdH +bdH +bdH aaa aaa aaa @@ -88462,7 +88335,7 @@ sGw dvD xzB eWs -kRU +lGj dON oJj vLp @@ -88868,10 +88741,10 @@ sGw fzx dWJ eWs -yko +jGa qlL -oxz -gnB +eos +lkn vnY mRH jHt @@ -88895,9 +88768,9 @@ vbf vbf vbf yeN -gzn -iGQ -bED +nnB +tAw +vNv baM bcb bHB @@ -89074,7 +88947,7 @@ eWs kqm vnY wjL -oGF +vDH gKK dBR jHt @@ -89098,9 +88971,9 @@ sIU gdp lcV lcV -hWq +hyg hif -jKz +eZU xyw bcc bHB @@ -89274,10 +89147,10 @@ sGw dvD kFU eWs -oUz -mqZ -mqZ -lVZ +kIz +kem +kem +sAs ctQ wer pKW @@ -89301,9 +89174,9 @@ btO btO btO btO -neE -mNm -bEE +oCI +tUH +keA rOc fVz bHB @@ -89477,9 +89350,9 @@ sGw xzB xer eWs -uES -xrT -gYj +ofv +pQa +diD vnY ctQ wer @@ -90086,9 +89959,9 @@ sGw oGf dvD eWs -jkY -ktI -xPn +jiz +ltP +wqq xyQ ixT hBG @@ -90519,9 +90392,9 @@ kRP bvf bvf bvf -egp -ptv -qXZ +crL +rEZ +gqv vsF bGJ hBF @@ -90722,9 +90595,9 @@ cSx nPB hYG ggh -gRd +aAm hif -jRS +aEJ xyw bGK bHB @@ -90925,9 +90798,9 @@ bkh ohE vWJ qUL -txO -mwQ -bEK +dqu +lFB +nMX baS bGL bHB @@ -92822,11 +92695,11 @@ dpo ajI add add -aFJ -aTf -aTf -aTf -iZP +fky +vLJ +vLJ +vLJ +mBV add add ajI @@ -92868,11 +92741,11 @@ aJU tiW aJU qQp -xAI -kiT -kiT -kiT -gjq +uZY +dLv +dLv +dLv +sBX aJU aJU tiW @@ -93025,11 +92898,11 @@ myl ajI add fsU -aHU +niO aTm xxB aTm -jgF +bfe fsU add ajI @@ -93071,11 +92944,11 @@ aJU tiW aJU gBW -ouQ +rwW iun sfA vPm -qys +guI gBW aJU tiW @@ -93227,13 +93100,13 @@ aee avd acW awW -auK -aIr +pSq +eew aTm cpP aTm -juX -scu +pva +vDu awW acW aeZ @@ -93273,13 +93146,13 @@ yhI tTu sgU baw -lRE -tuf +spc +isH vbB aqB vbB -mlz -sOy +uuk +afo baw sgU xVF @@ -93430,13 +93303,13 @@ aec avd acW awW -avc -aIv +snO +nNe aTm cpP cbM -jzZ -sLo +rqe +fYw awW acW afr @@ -93476,13 +93349,13 @@ csI goL sgU baw -hJk -yac +hjt +tbc vbB aqB vbB -fDS -iLd +aBV +kRy baw sgU xVF @@ -93634,11 +93507,11 @@ tGj ajI add fsU -aHU +niO aTm fnk aTm -jgF +bfe fsU add ajI @@ -93680,11 +93553,11 @@ aJU tiW aJU gBW -ouQ +rwW vbB aqB tBq -qys +guI gBW aJU tiW @@ -93837,11 +93710,11 @@ aeY ajI add add -aIw -aUa -aUa -aUa -jAz +aCy +mev +mev +mev +wyK add add ajI @@ -93883,11 +93756,11 @@ aJU tiW aJU aJU -gLE -pNM -pNM -pNM -hHr +vOk +qEB +qEB +qEB +lhi aJU aJU tiW @@ -94780,11 +94653,11 @@ qjN qjN oWf gfW -xgJ +iYO fdZ bnS fdZ -tzx +tXL gfW rZt qyP @@ -95680,6 +95553,7 @@ gLl gvu xCB tJm +giz aoe aoe aoe @@ -95697,9 +95571,8 @@ aoe aoe aoe aoe -aoe -aoe -hwB +giz +gvu xCB kaj vIo @@ -95882,27 +95755,27 @@ qhg gLl pzw xCB -tJm +rfV aoe -aoh -jHQ -jkl -jkl -jkl -wDH -dSJ -hQU -pjF -mcW -vih aoe -imp -fYb -cnV -isN -cnZ +wFO +frD +frD +frD +frD +nsW +frD +frD +xwq +frD +vbS +iGH +nFM +dpK +kZY +aoe aoe -gvu +hwB xCB tJm vIo @@ -96085,25 +95958,25 @@ gtI kYF dME nbH -tJm +dVD aoe -vbS -arb -aoq +aoh +qTB +qTB aoq aoq aoq -arb ccs aoq aoq aoq -aor -aEi -aEi -cnW +aoq +aoq +iGH +nMR aEi -coa +uDK +eGz aoe lXR nbH @@ -96287,26 +96160,26 @@ gxm gxm gxm lXR -nbH -tJm -aoe -qQc -fXg -dfa -dfa -dfa -dfa +lYS +mzn +hSI +cBh +pMp +chD +hcA +hcA dfa -gzK +qac arb arb arb -aor -sKa -sKa -jBy +pkJ +qTB +oBC +nVT +hxt aEi -fFh +aHa aoe gvu nbH @@ -96493,22 +96366,22 @@ gpp xCB tJm aoe -vbS -koB -asU -asU -asU -asU -arb -fEC aoe aoe -aCw aoe aoe -aoe -aoe -hFF +qTB +qTB +aoq +aoq +qTB +qTB +oVx +gbO +gbO +gbO +hTw +aio aoe aoe gvu @@ -96610,8 +96483,8 @@ gGJ qjN qjN qjN -qjN -xtM +kxA +qbr baZ sbE jZe @@ -96694,25 +96567,25 @@ aps gxm sHC nbH -tJm -aoe -aop -koB -jkl -jkl -jkl -jkl -arb -ayW -aoe -lFn -imp -kEp +lRM +ajl +rKF +dhh +oGp aoe -tsC -uRt +cDU +mLn +cDU +brB +cxB +mUd +ciC +gbO +kDv +vAe +jHj aQz -aRJ +esu ajl gvu nbH @@ -96813,8 +96686,8 @@ nyj tlA bwT cle -bCe -sdO +suq +dlL bCd hBW dxJ @@ -96896,25 +96769,25 @@ aps aps gxm gvu -lYS -mzn -hSI -pMp -gzK -aoq -aoq -aoq -aoq -aoq -aoq -aAG -aBd -aEi -aGW -aRF -akx -akw -aQz +nbH +tJm +ajl +ajl +fSr +ajl +aoe +aoe +aoe +aoe +aoe +aoe +aoe +aoe +gbO +anq +vAe +jHj +jdQ aRK ajl aUB @@ -97016,8 +96889,8 @@ cbu quT kan kan -iXW -iLs +bQO +fRQ bCd knm jZe @@ -97100,25 +96973,25 @@ asm gxm gvu lSN -xZt -aoe -pjF -wUd -asU -asU -asU -fFO -mrL -mrL -aoe -yjb -aEN -aGX -aoe -aLS -akw -fOL -aRS +tJm +ajl +wlR +lOh +wub +jmx +ajl +ajl +ajl +foM +jQN +iBE +ajl +sqf +pbP +vAe +jHj +lUq +uNJ ajl sHC xCB @@ -97303,25 +97176,25 @@ asm gxm gvu nbH -vQN -sqf -sqf -sqf -sqf -sqf -sqf -sqf +tJm ajl +vEc +kHm +uPf +fuV ajl ajl -aCo -aEO -aHa -aoe -cXW -upM +sqD +hex +wMt +vHK +dkM +sqf +sqf +nrZ +gaL akw -alD +iSM vEx dME nbH @@ -97507,24 +97380,24 @@ gxm gvu nbH tJm -sqf -anp -wjz -fnA -jZY -jZY -sqf -wpu -okO ajl ajl ajl +jYC ajl ajl +hex +vHK +efd +mFv +jZc +rNC +vHK ajl -ajl -onQ -alD +tQG +aos +akw +gnl ajl bgN nbH @@ -97710,26 +97583,26 @@ gxm gvu xCB tJm -sqf -sOZ -oNJ -eDo -eDo -eDo -sqf -vXv -wub -gXl ajl -wqW -awj -dDL -aLZ +oJD +bPA +axm +cRw ajl -aCp -alD +bvT +sbW +gqg +jSq +boF +mQZ +ozS ajl -evM +uhH +akw +akw +xoS +gWG +gvu xCB tJm gxm @@ -97913,24 +97786,24 @@ gxm gvu lSN kaj -sqf -anq -awn -xsz -jTj -jTj -sqf -lmi -xgP -dwA -wJo -cyU -eme -skl -nzv -fQu -akx -alD +ajl +qCS +akw +hfr +vkf +ajl +iBE +ruv +fWK +axm +duB +jpa +waf +ajl +gZk +nSR +dFV +wQT gWG gvu xCB @@ -98116,26 +97989,26 @@ gxm gvu xCB tJm -sqf -anr -awn -tEi -asu -hbI -sqf ajl -vtx +hbg +eme +ahn +tCa ajl ajl -kgp -fbB -cyU -bho -fQu -akx -alD -gWG -gvu +gqm +iSM +axm +akw +qCu +ajl +ajl +ajl +ech +uxJ +ajl +ajl +evM xCB tJm gxm @@ -98319,24 +98192,24 @@ gxm hwB xCB tJm -sqf -sqf -awp -sqf -sqf -sqf -sqf -mNI -sdn -xNu ajl -vRX -pth +pWq +uUO axm -lhv +vqB +aQE ajl -hVz -alD +ajl +ikD +axm +uYU +ajl +ajl +oed +hDq +wzd +alE +mZC ajl lXR xCB @@ -98523,23 +98396,23 @@ atz nbH tyC ajl -qhx -akw -axl -gKR -fvd -ajl +kLH +kLH +fID +kLH +kLH ajl ajl ajl +xJn ajl -sYT -sYT -tWY -sYT ajl -nMV -vIf +cjs +qQL +ofE +vWD +akw +rvN ajl hwB nbH @@ -98631,9 +98504,9 @@ bkE bQM rlZ izY -rlZ -rlZ -rlZ +xsw +bZn +kFv izY rlZ hZN @@ -98726,23 +98599,23 @@ gre nbH dME bVE -aos -akw -akw -akw -alE -ans ans -asw ans +axm ans +eAP +mWq ans ans axm ans -ans -aos -alE +eAP +ybL +akw +akw +akw +akw +akw bVE dME nbH @@ -98834,9 +98707,9 @@ bkE bRP rlZ rlZ -xsw -bZn -kFv +hNy +kan +iJP rlZ rlZ siW @@ -98930,20 +98803,20 @@ hWa cEG aEe akA +lAP +cTW akA -akA -akA -jOG +oar akA akA akA +rQU akA -rnN akA akA -maT -akA +xql akA +tCf oap aSb aEe @@ -99037,9 +98910,9 @@ bst cjW rlZ rlZ -oRy -kan -biy +pUF +dBH +kPb boX rlZ vMG @@ -99232,7 +99105,7 @@ qPk wKN qPk kan -ihw +vGb beW lkW biF @@ -99240,7 +99113,7 @@ vhX akQ rlZ rlZ -pnC +szd dBH bky ryt @@ -99567,7 +99440,7 @@ rdZ bCs pBG rLp -ttX +xFE pBG vpf mRU @@ -99646,7 +99519,7 @@ vhX gDW rlZ rlZ -wYr +szd dBH bky ryt @@ -99849,9 +99722,9 @@ xMs cjW rlZ rlZ -kSC -kan -quv +wYr +dBH +wBP rZB rlZ wxc @@ -99973,7 +99846,7 @@ rdZ rdZ pBG cVq -nOb +tvm pBG vpI mRU @@ -100052,9 +99925,9 @@ bgw eXb rlZ rlZ -thP -beW -bgP +kSC +kan +ijP rlZ rlZ hAU @@ -100176,7 +100049,7 @@ rdZ rdZ pBG dzp -ngV +nSC pBG jtU jtU @@ -100255,9 +100128,9 @@ bgw fbw rlZ rlZ -pqD -pqD -pqD +thP +beW +bgP rlZ rlZ rFH @@ -100458,9 +100331,9 @@ bgy fxZ rlZ aZK -vYt -fDj -eBZ +pqD +pqD +pqD hBc rlZ pKZ @@ -100579,8 +100452,8 @@ pBG gqQ cHG nQA -dAl -pyx +dYL +yij lKO pBG lEf @@ -100661,9 +100534,9 @@ bgw icw qni klH -tgV -tgV -tgV +vYt +fDj +eBZ klH qni uah @@ -100782,10 +100655,10 @@ qvL wmP wmP dRP -eFY +gig nQA eAN -xqQ +pXh rfb cXF rLU @@ -100864,9 +100737,9 @@ bgw jxi rlZ rlZ -rlZ -rlZ -rlZ +tgV +tgV +tgV rlZ rlZ nrN @@ -100985,10 +100858,10 @@ pBG lvb eAN jVg -rGU +bJM xCf eAN -xqQ +pXh rLv bHk vZw @@ -101188,10 +101061,10 @@ pBG hEl eAN fQS -oGY +diy neT eAN -xqQ +pXh cNH vzp vZw @@ -101394,7 +101267,7 @@ jVg nQA nQA eAN -xqQ +pXh rfb bHk vZw @@ -101597,7 +101470,7 @@ epJ jML jML fnH -xqQ +pXh rLv pRy wwW @@ -102023,7 +101896,7 @@ bdH bdH bdH bdH -aaa +bdH aaa aaa aaa @@ -102199,14 +102072,14 @@ lXl yiu bBH fKh -gQk +lpr trU oNY fdx pBG pVF ppF -fiE +qBn pBG jtU jtU @@ -102635,7 +102508,7 @@ bdH aaa aaa aaa -aaa +bdH aaa aaa aaa @@ -102976,8 +102849,8 @@ aNi cYT aNm cYT -lEF -beZ +qMe +cdb vif bhx aOR @@ -103040,7 +102913,7 @@ aaa aaa aaa aaa -aaa +bdH aaa aaa aaa @@ -103180,7 +103053,7 @@ aZe aNm aNm lRP -beE +ioD bhx bhx hMi @@ -103383,7 +103256,7 @@ aZr aNm aNm lTE -beE +ioD bhx bhx aOR @@ -103586,7 +103459,7 @@ aZs aNm aNm mwL -beE +ioD bhx bhx aOR @@ -103788,8 +103661,8 @@ aNi jWr aNm jWr -mBJ -dtZ +qVg +rbP bhx bhx wWg @@ -103908,11 +103781,11 @@ bmr beH beH beH -eGB -jMR +uml +qpq ufh -mEE -sTw +qRO +wcL beH beH beH @@ -104111,11 +103984,11 @@ boq boq boq boq -wNT +dxz pVB hsg iPv -kbV +oOo uMk uMk uMk @@ -104314,11 +104187,11 @@ boq boq boq boq -wNT +dxz vBp kNl nhi -kbV +oOo uMk uMk uMk @@ -104517,11 +104390,11 @@ boq boq boq boq -wNT +dxz vBp hWs nhi -kbV +oOo uMk uMk uMk @@ -104720,11 +104593,11 @@ boq boq boq boq -wNT +dxz pUA wga mfM -kbV +oOo uMk uMk uMk @@ -104923,11 +104796,11 @@ beH beH duv beH -htI -cCD -shp -oAB -gyv +tiD +fMr +qkL +mlS +oPc beH duv beH @@ -105567,7 +105440,7 @@ jJk wLG tyb sZH -rjV +lak ivz nsY qZy @@ -107254,10 +107127,10 @@ xIj qdJ xIj mOi -onU -onU -qwJ -cOV +tNr +tNr +ooX +gtY imS rxl xQV @@ -107660,10 +107533,10 @@ xIj yiu xIj mOi -mAs -mAs -flR -uMO +dvO +dvO +nul +hiB tFe xVc xQV @@ -108579,7 +108452,7 @@ bGw bNA bKA bdj -oMe +smr bdj bKA bNA @@ -110076,11 +109949,11 @@ ahz ajs aeC aeC -ayc -aOE -aOE -aOE -ciu +rOH +oIJ +oIJ +oIJ +gkL aeC aeC ajs @@ -110124,11 +109997,11 @@ vcE kUV vcE vcE -eCo -iry -iry -iry -sYw +cfe +fRo +fRo +fRo +mzE vcE vcE kUV @@ -110279,11 +110152,11 @@ pMk ajs aeC wXh -ayn +iIt atr lMy aex -ciw +sVW wXh aeC ydz @@ -110327,11 +110200,11 @@ sSl kkx vcE kpo -iMx +gZR tGi cea bXe -eyG +txK kpo vcE kUV @@ -110481,13 +110354,13 @@ nGY gyU ajk aeA -asY -ayQ +nQZ +gsa atr iDK atr -ciD -ngl +ufA +dZB aeA ajk aeA @@ -110529,13 +110402,13 @@ qYd lJY xVS lJY -ttS -wEO +nrJ +hiG faO cOd bXe -deg -wLu +fXC +usr lJY xVS kPH @@ -110580,7 +110453,7 @@ jEM jEM bCk aLT -bcZ +vQc bdr bdC beR @@ -110594,7 +110467,7 @@ bnt bpG brs aRT -bew +qrE aQL atH dAm @@ -110624,7 +110497,7 @@ wwv sIR brq bJC -bKX +rTh cfo cgs chk @@ -110638,7 +110511,7 @@ cll clE clK clg -bVy +hoB bSJ ljv ljv @@ -110684,13 +110557,13 @@ dEJ gyU ajk aeA -atp -ayR +vUK +jTg atr iDK atr -cji -nqV +fod +fmp aeA ajk ily @@ -110732,13 +110605,13 @@ yat cBb xVS lJY -hlX -umh +eYi +hLH bXe cOd tGi -pfH -wlF +cKV +oyH lJY xVS kPH @@ -110888,11 +110761,11 @@ gCB ajs aeC wXh -ayn +iIt atr rmG bXz -ciw +sVW wXh aeC ajs @@ -110936,11 +110809,11 @@ dHe kUV vcE kpo -iMx +gZR bXe sZY mzF -eyG +txK kpo vcE kUV @@ -111091,11 +110964,11 @@ aeB ajs aeC aeC -azk -aOU -biL -biL -cmF +lLc +cUD +mth +mth +tks aeC aeC ajs @@ -111139,11 +111012,11 @@ vcE kUV vcE vcE -shs -kAU -kAU -kAU -aYE +qrx +iKN +iKN +iKN +qqh vcE vcE kUV @@ -112966,12 +112839,12 @@ yat fPF jei nNT -jwJ -mgX -nZG -nZG -nZG -xGm +bhu +ply +oRU +oRU +oRU +sfl jei fVe aag @@ -113169,12 +113042,12 @@ loP kNq fJp aPO -wXl +sqJ dJe unQ nxe tjH -tVn +nxr oUx fVe aag @@ -113326,9 +113199,9 @@ wIu wXJ taw oNK -kMa -qIa -iSB +lNF +aeD +kJs oxy oQL hdy @@ -113372,12 +113245,12 @@ loP ang hqu aPO -wXl +sqJ fJp iCD iCD iCD -tVn +nxr jei fVe aag @@ -113529,9 +113402,9 @@ taw taw taw wTn -wOv +xUT tuJ -iKV +kjh oxy oQL oFr @@ -113575,12 +113448,12 @@ loP fvo jei aPO -wXl +sqJ kNq jcE jei -lVR -pHD +kwE +tpL dhp fVe aag @@ -113732,12 +113605,12 @@ hEr oQL kiR oxy -wOv +xUT qlu -qAG +sOQ oxy -kMa -gQu +lNF +dbD cMx nDH qbw @@ -113778,12 +113651,12 @@ loP nSk jei aPO -wXl +sqJ kNq cke hqu -oSR -fZI +cVL +xKh jei fVe aag @@ -113935,11 +113808,11 @@ hEr xBS taw tTG -wOv +xUT wIu -ydf +vNS oxy -wOv +xUT ixu cMx tNY @@ -113981,12 +113854,12 @@ loP kNq fJp nOx -wXl +sqJ kNq kNq kNq kNq -pAV +dKe jei fVe aag @@ -114138,11 +114011,11 @@ oqc smw taw oxy -rgk -nUT -cnP +wfO +eUj +deu oxy -wOv +xUT qlu cMx qbU @@ -114184,12 +114057,12 @@ oHx aPO iXB aPO -gof -bVr -ivL -ivL -ivL -fVa +jMs +bzJ +nTw +nTw +nTw +mnN jei fVe aag @@ -114345,7 +114218,7 @@ oQL oQL lUQ oxy -tBU +jFg iDs cMx qbU @@ -114387,12 +114260,12 @@ loP kNq hnt aPO -wSx -gYI -wPa -gYI -gYI -rzk +jQx +rkD +ulK +rkD +rkD +vBN jei fVe aag @@ -114595,7 +114468,7 @@ yat kNq kNq kNq -gGb +ibD oUx fVe aag @@ -114798,7 +114671,7 @@ yat tiY qAK xGK -gGb +ibD jei fVe aag @@ -115001,7 +114874,7 @@ yat jei ltm oAT -gGb +ibD cmV fVe aag @@ -115204,7 +115077,7 @@ yat jei ltm ejj -gGb +ibD jei fVe aag @@ -115406,8 +115279,8 @@ flD yat xQe jei -lVR -pHD +kwE +tpL dhp fVe aag @@ -115609,8 +115482,8 @@ tie yat cfm jei -oSR -grd +cVL +pot jei fVe aag @@ -115813,7 +115686,7 @@ yat kNq fJp ekz -gGb +ibD oUx fVe aag @@ -116013,10 +115886,10 @@ kNq spd kNq kNq -dVH -cAz -bVr -pHD +jvQ +vLD +bzJ +tpL jei fVe aag @@ -116369,9 +116242,9 @@ aag fTl pWw hbE -cbc -qIa -qIa +pLo +aeD +aeD taw ptK afX @@ -116572,7 +116445,7 @@ aag fTl prX oYs -odG +nki biC qlu taw @@ -119017,8 +118890,8 @@ aaa aad uMc bNM -rmf -uZH +bBP +nwl bFt kPG kPG @@ -119050,8 +118923,8 @@ tim uWV ttd nLk -rCD -eYR +msb +nyT uIv pql ajZ @@ -119220,7 +119093,7 @@ aac aag cuC blJ -pfc +tAC ptK ptK ucp @@ -119254,7 +119127,7 @@ sWC jWh jWh jWh -jAJ +tfO lAu bYn aag @@ -119423,7 +119296,7 @@ cuC cuC cuC bNM -ofK +mfI ptK uXL gPc @@ -119435,7 +119308,7 @@ fLl fLl eky eky -aNl +wFx eky uNV aHe @@ -119445,7 +119318,7 @@ aDQ aHe uNV eky -aNl +wFx eky rqj eZm @@ -119457,7 +119330,7 @@ hXG htG doU jWh -lbB +mRo uIv bYn bYn @@ -119626,7 +119499,7 @@ cuC uiG tfb rFy -ofK +mfI ptK uXL eet @@ -119638,7 +119511,7 @@ aqZ ptQ aMT aMT -dPm +wpq qeF aHe aHe @@ -119648,7 +119521,7 @@ aEm aHe aHe okg -dPm +wpq aMT aMT hbp @@ -119660,7 +119533,7 @@ mIP tcZ fWi jWh -lbB +mRo cKL xXa xoO @@ -119827,9 +119700,9 @@ bdH bdH cuC bNM -rmf -luY -ncp +bBP +wAD +utl ptK cQg wxj @@ -119841,7 +119714,7 @@ pKB fLl svf arV -wZX +oKl eky aDQ ayi @@ -119851,7 +119724,7 @@ eky jlX aDQ eky -wZX +oKl arV vUh eZm @@ -119863,9 +119736,9 @@ pgw rmE fWi jWh -xPZ -pcv -eYR +qcj +efl +nyT uIv bYn aaa @@ -120030,7 +119903,7 @@ bdH bdH cuC aeM -ofK +mfI ptK ptK ptK @@ -120044,7 +119917,7 @@ fLl fLl lDn arV -wZX +oKl eky aDQ pyy @@ -120054,7 +119927,7 @@ eky dLc aDQ eky -wZX +oKl arV wkA eZm @@ -120068,7 +119941,7 @@ jWh jWh jWh jWh -lbB +mRo oCf bYn aaa @@ -120233,7 +120106,7 @@ bdH bdH uMc bNM -ofK +mfI fLl uxl haO @@ -120247,7 +120120,7 @@ fLl xrq vVu arV -wZX +oKl eky aHe jMQ @@ -120257,7 +120130,7 @@ eky dEn aHe eky -wZX +oKl arV oIt xrq @@ -120271,7 +120144,7 @@ hkz ckj oaw eZm -lbB +mRo uIv pql bdH @@ -120436,7 +120309,7 @@ bdH bdH uMc bNM -ofK +mfI fLl uxl haO @@ -120450,17 +120323,17 @@ fLl vlk mKy aMT -svl -pzJ -qDt -uYg -vsh -oPf -vsh -uYg -qDt -pzJ -sQO +geZ +wXW +eSI +yld +oeI +eFu +oeI +yld +eSI +wXW +sNQ aMT wNS vlk @@ -120474,7 +120347,7 @@ jrB eoK xTG eZm -lbB +mRo uIv pql bdH @@ -120639,7 +120512,7 @@ bdH bdH uMc bNM -rtd +xWh ptQ aqZ aqZ @@ -120653,17 +120526,17 @@ fLl fLl wRk eky -wZX +oKl vUh aHe oxU bsy -oir +awg gzw shh aHe svf -wZX +oKl eky wuk eZm @@ -120677,7 +120550,7 @@ ksw ksw ksw hbp -uWV +bhw uIv pql bdH @@ -120842,7 +120715,7 @@ bdH bdH cuC blJ -pfc +tAC fLl fLl fLl @@ -120856,7 +120729,7 @@ aqZ ptQ qYG atM -bGc +hfk atK aHe aHe @@ -120866,7 +120739,7 @@ aHe aHe aHe atM -bGc +hfk atK qYG hbp @@ -120880,7 +120753,7 @@ eZm eZm eZm eZm -jAJ +tfO lAu bYn bdH @@ -121045,7 +120918,7 @@ aaa bdH cuC bNM -tgK +bDm tfb wuT lMx @@ -121059,17 +120932,17 @@ gJF gJF aPw avu -mhG -cFn -cYu +nXS +iSy +rzi aHe fdX wcR xJh aHe -qYu -dxK -dPC +iXu +jqu +uqH aMU aPw wxy @@ -121248,8 +121121,8 @@ bdH bdH cuC riJ -kHY -uhM +uVE +nov kdv lkm cuC @@ -121263,7 +121136,7 @@ aag aPw aqJ aBu -odu +rXG aMT aEg aDO @@ -121271,7 +121144,7 @@ aDO aDO aEg aMT -odV +hts aBu aqp aPw @@ -121285,8 +121158,8 @@ aag bYn dRs uAl -rDb -qjV +sxH +vfy rID bYn bdH @@ -121365,13 +121238,13 @@ wed uXk mlF jWb -unZ +wwO aPU aPU aPU aPU aPU -fbu +phI jWb tos uXk @@ -121452,7 +121325,7 @@ bdH cuC cuC umy -iKZ +iya pnL cuC cuC @@ -121466,7 +121339,7 @@ cus aPw aPw atM -bGc +hfk atK avu aMT @@ -121474,7 +121347,7 @@ arV aMT aMU atM -bGc +hfk atK aPw aPw @@ -121488,7 +121361,7 @@ qOk bYn bYn cWE -kHS +pzg rID bYn bYn @@ -121567,15 +121440,15 @@ hsy txS bVN oGJ -xpZ -llK +hca +sAx mVr mZL mZL mZL gSa -coH -oTO +pyq +fyA uqh iAE sct @@ -121655,7 +121528,7 @@ bdH aad cuC mkH -rtd +xWh fcP cuC ajZ @@ -121669,15 +121542,15 @@ xVk aad aPw vgD -mhG -had -eAL -pzJ -oPf -pzJ -had -eAL -dPC +nXS +vxQ +lYr +wXW +eFu +wXW +vxQ +lYr +uqH ihX aPw ajZ @@ -121691,7 +121564,7 @@ xVk aad bYn kcA -uWV +bhw uIv bYn ajZ @@ -121858,7 +121731,7 @@ bdH aad cuC vRu -ngU +pOQ ssU cuC ajZ @@ -121876,7 +121749,7 @@ aBA aqp avu eky -dPm +wpq eky aMU aqJ @@ -121894,7 +121767,7 @@ xVk aad bYn thV -uWV +bhw uIv bYn ajZ @@ -121973,15 +121846,15 @@ hsy igs nCn oGJ -uSW -kzO +hUi +ggy vaZ kYL hmv sCV rjO -suY -pdK +tCK +saB uqh pJr slv @@ -122061,7 +121934,7 @@ bdH aad uMc gbs -iEr +wXo hFw uMc ajZ @@ -122079,7 +121952,7 @@ aHe aHe mtD eky -wZX +oKl eky nKq aHe @@ -122097,7 +121970,7 @@ xVk aad pql thV -fCL +vOQ uIv pql ajZ @@ -122177,13 +122050,13 @@ hsy wTB mlF uXk -hmw +cyO gSa mtZ hmv fQn wSV -ulp +oFc uXk tos slv @@ -122264,7 +122137,7 @@ bdH aad uMc nrO -iEr +wXo fcP uMc ajZ @@ -122282,7 +122155,7 @@ aHe aHe avu eky -wZX +oKl eky aMU aHe @@ -122300,7 +122173,7 @@ xVk aad pql thV -fCL +vOQ uIv pql ajZ @@ -122467,7 +122340,7 @@ bdH aad uMc aVC -iEr +wXo fcP uMc ajZ @@ -122485,7 +122358,7 @@ uRs aDO qqu eky -aNl +wFx eky dFk aDO @@ -122503,7 +122376,7 @@ xVk aad pql thV -fCL +vOQ uIv pql ajZ @@ -122670,7 +122543,7 @@ bdH aad cuC mJx -rtd +xWh odb cuC ajZ @@ -122688,7 +122561,7 @@ dID eky eky nJu -aNl +wFx eky eky eky @@ -122706,7 +122579,7 @@ xVk aad bYn thV -uWV +bhw oCf bYn ajZ @@ -122787,11 +122660,11 @@ ylh mlF hsy hmv -eZp -kzO +kAO +ggy pzM -hip -ptZ +tgF +xbU hmv hsy tos @@ -122873,7 +122746,7 @@ bdH cuC cuC dqg -rtd +xWh fcP cuC cOK @@ -122891,7 +122764,7 @@ mRQ eky eky eky -aNl +wFx eky eky eky @@ -122909,7 +122782,7 @@ xVk wZv bYn thV -uWV +bhw uIv bYn bYn @@ -122991,9 +122864,9 @@ suJ hsy hsy gLG -khf +wHC bhI -iIj +kaP hQw hsy hsy @@ -123076,7 +122949,7 @@ aaa uMc iKc uiG -cMN +fpJ trB nVX jcP @@ -123094,7 +122967,7 @@ aDO atK eky eky -aNl +wFx eky eky atM @@ -123112,7 +122985,7 @@ xVk dbq xBn vME -hSt +iqb xoO rjG pql @@ -123279,7 +123152,7 @@ aaa uMc cIG vqD -iEr +wXo fcP blJ jcP @@ -123295,11 +123168,11 @@ aPz avu arV aMU -ssX -vsh -iPD -vsh -fCp +oOD +oeI +lzf +oeI +gqA avu arV aMU @@ -123315,7 +123188,7 @@ xVk dbq gIJ thV -fCL +vOQ lne wEI pql @@ -123480,9 +123353,9 @@ bdH aaa aaa uMc -dfg -rAP -vqK +gOu +wae +sUz lht blJ jcP @@ -123498,11 +123371,11 @@ aPz aqJ aBu aqp -nkn +bNR lyw iZg lyw -nkn +bNR aqJ aBu aqp @@ -123518,9 +123391,9 @@ xVk dbq gIJ tjj -ofH -gms -ydh +fyi +qRV +mME pql bdH bdH @@ -123685,7 +123558,7 @@ aaa cuC ptK bSD -iEr +wXo xKM cuC uiR @@ -123721,7 +123594,7 @@ xVk kMK bYn gEv -fCL +vOQ lol jWh bYn @@ -123888,7 +123761,7 @@ aaa cuC ptK new -iEr +wXo paI cuC cOK @@ -123924,7 +123797,7 @@ xVk wZv bYn vVw -fCL +vOQ tNP jWh bYn @@ -124091,7 +123964,7 @@ aaa uMc jMG uiG -iUW +rcL trB ozN jcP @@ -124127,7 +124000,7 @@ xVk dbq diz vME -hSt +iqb xoO adC pql @@ -124294,7 +124167,7 @@ aaa uMc msP ugJ -kNk +nOf cXY blJ jcP @@ -124330,7 +124203,7 @@ xVk dbq gIJ thV -fCL +vOQ lne wWq pql @@ -124495,9 +124368,9 @@ bdH aaa aaa uMc -spK -nlW -uZH +syM +xlc +nwl lht blJ jcP @@ -124533,9 +124406,9 @@ xVk dbq gIJ tjj -jRC -gms -qeK +sVs +qRV +jSs pql bdH bdH @@ -126194,9 +126067,9 @@ pmV eGr xDC dIn -rby +xVo bIp -euN +kIm ujn sEK etM @@ -126395,7 +126268,7 @@ kfU daz ebN ebN -lnS +liP uVv flf ebN @@ -126801,16 +126674,16 @@ mRn dJO vMt dkz -aGk +aEl ktQ teZ wkM ege -hWP -bZq -bZq -mIi -mIi +lsw +jLc +jLc +efL +efL daz lmz lmz @@ -127207,16 +127080,16 @@ fMt mEs gbm oBD -lFj +nnU vyE mTr wkM qNc -jdl -dpp -dpp -jgy -eii +eMM +bIE +bIE +rJc +uAg daz lmz lmz @@ -127613,7 +127486,7 @@ sTV daz ebN ebN -gbg +jfH uVv xwU ebN @@ -127818,9 +127691,9 @@ hTl jrH xDC yaQ -vLz +lLq mFN -kSy +nAx bFg dDp nYg diff --git a/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm b/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm index a4bf6beb2f44..0727066a1b51 100644 --- a/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm +++ b/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm @@ -136,6 +136,10 @@ /obj/structure/cargo_container/arious/leftmid, /turf/open/jungle, /area/whiskey_outpost/outside/south) +"az" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/gm/coast/beachcorner/north_east, +/area/whiskey_outpost/outside/river) "aA" = ( /mob/living/simple_animal/corgi{ name = "\improper Mr. Wiggles Sir" @@ -296,6 +300,14 @@ /obj/structure/disposalpipe/segment, /turf/open/jungle/impenetrable, /area/whiskey_outpost/outside/north/northwest) +"bk" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_ew_full_cap"; + layer = 3.5 + }, +/obj/structure/platform/metal/stair_cut/platform_right, +/turf/open/gm/dirt, +/area/whiskey_outpost/outside/north/platform) "bl" = ( /turf/open/jungle, /area/whiskey_outpost/outside/lane/one_north) @@ -303,6 +315,13 @@ /obj/effect/landmark/ert_spawns/distress_wo, /turf/open/gm/dirt, /area/whiskey_outpost/inside/caves/tunnel) +"bn" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform/metal/almayer, +/obj/structure/platform_decoration/metal/almayer/southwest, +/obj/structure/platform_decoration/metal/almayer/southwest, +/turf/open/gm/river, +/area/whiskey_outpost/outside/river/east) "bo" = ( /turf/open/gm/dirt/desert0, /area/whiskey_outpost/outside/lane/two_south) @@ -626,6 +645,10 @@ }, /turf/open/floor/prison/floor_plate, /area/whiskey_outpost/inside/cic) +"cK" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/gm/river, +/area/whiskey_outpost/outside/river/west) "cL" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/paper_bin, @@ -638,6 +661,14 @@ /obj/structure/machinery/light/small, /turf/open/floor/wood, /area/whiskey_outpost/inside/cic) +"cN" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/disposalpipe/segment, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/turf/open/floor/asteroidfloor/north, +/area/whiskey_outpost/outside/north/platform) "cO" = ( /obj/structure/machinery/cm_vending/sorted/medical/marinemed, /turf/open/floor/whitegreen, @@ -768,6 +799,10 @@ /obj/structure/flora/jungle/plantbot1, /turf/open/jungle, /area/whiskey_outpost/outside/south/far) +"dw" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/gm/coast/beachcorner2/north_east, +/area/whiskey_outpost/outside/lane/four_north) "dx" = ( /obj/structure/sign/poster, /turf/closed/wall/r_wall, @@ -947,6 +982,14 @@ "ee" = ( /turf/open/floor/almayer/red/southwest, /area/whiskey_outpost/inside/cic) +"ef" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/turf/open/gm/dirt, +/area/whiskey_outpost/outside/north/beach) "eg" = ( /obj/structure/sign/safety/medical{ name = "\improper Triage Center" @@ -971,6 +1014,10 @@ /obj/structure/largecrate/supply/supplies/sandbags, /turf/open/floor/prison/floor_marked/southwest, /area/whiskey_outpost/inside/bunker/bunker/front) +"en" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/gm/coast/north, +/area/whiskey_outpost/outside/river/east) "eo" = ( /turf/open/gm/coast/beachcorner2/south_east, /area/whiskey_outpost/outside/lane/four_south) @@ -1025,6 +1072,10 @@ /obj/structure/machinery/body_scanconsole, /turf/open/floor/whitegreenfull, /area/whiskey_outpost/inside/hospital/triage) +"eE" = ( +/obj/structure/platform/metal/almayer, +/turf/open/gm/coast/west, +/area/whiskey_outpost/outside/river/east) "eF" = ( /obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/prison, @@ -1263,12 +1314,6 @@ }, /turf/open/floor/whitegreenfull, /area/whiskey_outpost/inside/hospital) -"fI" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/gm/dirt, -/area/whiskey_outpost/outside/north/beach) "fJ" = ( /obj/structure/flora/jungle/alienplant1, /turf/open/gm/river, @@ -1284,6 +1329,10 @@ }, /turf/open/floor/whitegreen/east, /area/whiskey_outpost/inside/hospital) +"fO" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/gm/coast/beachcorner/north_west, +/area/whiskey_outpost/outside/river) "fQ" = ( /obj/structure/flora/jungle/planttop1, /turf/open/jungle, @@ -1790,12 +1839,6 @@ "hQ" = ( /turf/open/floor/prison/floor_plate, /area/whiskey_outpost/inside/living) -"hR" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/jungle, -/area/whiskey_outpost/outside/south) "hS" = ( /turf/open/floor/plating/warnplate/east, /area/whiskey_outpost/outside/lane/one_north) @@ -1897,26 +1940,18 @@ /obj/structure/machinery/power/apc/almayer/east, /turf/open/floor/whitegreen/east, /area/whiskey_outpost/inside/hospital) -"in" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/asteroidfloor/north, -/area/whiskey_outpost/outside/north/platform) "io" = ( /obj/structure/flora/jungle/plantbot1, /turf/open/jungle, /area/whiskey_outpost/outside/lane/one_south) -"ip" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/gm/coast/south, -/area/whiskey_outpost/outside/lane/four_north) "iq" = ( /obj/structure/largecrate/supply/supplies/mre, /turf/open/floor/prison/floor_marked/southwest, /area/whiskey_outpost/inside/living) +"ir" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/gm/dirt, +/area/whiskey_outpost/outside/north/beach) "is" = ( /obj/structure/disposalpipe/trunk, /obj/structure/machinery/disposal, @@ -1932,18 +1967,6 @@ "iu" = ( /turf/open/floor/whitegreen/west, /area/whiskey_outpost/inside/hospital/triage) -"iv" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 5 - }, -/turf/open/floor/asteroidfloor/north, -/area/whiskey_outpost/outside/north/platform) "iw" = ( /turf/open/floor/plating/warnplate/northeast, /area/whiskey_outpost/outside/north/northeast) @@ -2113,13 +2136,6 @@ /obj/item/weapon/gun/pistol/m4a3, /turf/open/gm/dirt, /area/whiskey_outpost/outside/lane/four_south) -"jg" = ( -/obj/structure/machinery/door/poddoor/two_tile/four_tile{ - breakable = 0; - explo_proof = 1 - }, -/turf/open/gm/dirt, -/area/whiskey_outpost/outside/south/very_far) "ji" = ( /obj/structure/machinery/autodoc_console{ dir = 1 @@ -2190,6 +2206,10 @@ /obj/effect/landmark/start/whiskey/tank_crew, /turf/open/floor/prison, /area/whiskey_outpost/inside/cic) +"jr" = ( +/obj/structure/platform/metal/almayer, +/turf/open/gm/river, +/area/whiskey_outpost/outside/river/west) "js" = ( /obj/effect/decal/medical_decals{ icon_state = "docstriping" @@ -2227,6 +2247,10 @@ /obj/structure/largecrate/supply/ammo/m56d, /turf/open/floor/prison/floor_plate, /area/whiskey_outpost/inside/supply) +"jw" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/gm/coast/north, +/area/whiskey_outpost/outside/lane/four_north) "jA" = ( /obj/effect/decal/medical_decals{ icon_state = "triagedecalleft" @@ -2236,6 +2260,12 @@ "jB" = ( /turf/closed/wall/r_wall/unmeltable, /area/whiskey_outpost/inside/bunker/bunker/front) +"jC" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/northwest, +/turf/open/gm/river, +/area/whiskey_outpost/outside/south) "jD" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/white, @@ -2277,10 +2307,6 @@ "jJ" = ( /turf/open/floor/whitegreencorner/east, /area/whiskey_outpost/inside/hospital) -"jL" = ( -/obj/structure/platform_decoration, -/turf/open/jungle, -/area/whiskey_outpost/outside/lane/two_south) "jM" = ( /turf/open/floor/prison/cell_stripe/north, /area/whiskey_outpost/inside/living) @@ -2535,18 +2561,20 @@ /obj/effect/landmark/start/whiskey/doctor, /turf/open/floor/whitegreen/east, /area/whiskey_outpost/inside/hospital) -"kQ" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/gm/grass/grassbeach/east, -/area/whiskey_outpost/outside/south) +"kR" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/gm/river, +/area/whiskey_outpost/outside/river/east) "kS" = ( /turf/open/floor/prison, /area/whiskey_outpost/inside/supply) "kV" = ( /turf/open/jungle/impenetrable, /area/whiskey_outpost/outside/south) +"kW" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/gm/coast/north, +/area/whiskey_outpost/outside/river/east) "kX" = ( /obj/structure/machinery/medical_pod/sleeper{ dir = 1 @@ -2657,6 +2685,16 @@ /obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep/wo, /turf/open/floor/prison/floor_plate, /area/whiskey_outpost/inside/bunker/bunker/front) +"ly" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/northwest, +/turf/open/floor/asteroidfloor/north, +/area/whiskey_outpost/outside/north/platform) +"lz" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/gm/river, +/area/whiskey_outpost/outside/south) "lA" = ( /turf/closed/wall/rock/brown, /area/whiskey_outpost) @@ -2749,6 +2787,10 @@ /obj/structure/largecrate/supply/medicine/iv, /turf/open/floor/whitegreen/north, /area/whiskey_outpost/inside/hospital/triage) +"lT" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/gm/river, +/area/whiskey_outpost/outside/lane/four_north) "lU" = ( /obj/effect/landmark/start/whiskey/engineer, /turf/open/floor/prison, @@ -3219,6 +3261,12 @@ }, /turf/open/floor/prison, /area/whiskey_outpost/inside/bunker) +"nT" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/northwest, +/turf/open/gm/coast/north, +/area/whiskey_outpost/outside/lane/four_north) "nV" = ( /obj/structure/disposalpipe/sortjunction/flipped{ sortType = "Mortar Pit" @@ -3244,6 +3292,10 @@ /obj/structure/barricade/plasteel/wired, /turf/open/gm/dirt, /area/whiskey_outpost/outside/lane/two_north) +"oc" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/gm/coast/south, +/area/whiskey_outpost/outside/river/east) "od" = ( /obj/structure/curtain/shower, /turf/open/floor/prison/sterile_white, @@ -3265,6 +3317,10 @@ /obj/structure/largecrate/random/case, /turf/open/floor/asteroidfloor/north, /area/whiskey_outpost/outside/lane/three_south) +"on" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/gm/dirt, +/area/whiskey_outpost/outside/north/beach) "oo" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -3285,6 +3341,10 @@ }, /turf/open/gm/dirt, /area/whiskey_outpost/outside/lane/four_north) +"ot" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/gm/grass/grassbeach/west, +/area/whiskey_outpost/outside/south) "ou" = ( /obj/structure/sign/prop3, /turf/closed/wall/r_wall, @@ -3466,12 +3526,6 @@ "pu" = ( /turf/open/gm/coast/east, /area/whiskey_outpost/outside/lane/four_north) -"pv" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/gm/coast/north, -/area/whiskey_outpost/outside/river/east) "pw" = ( /obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment{ @@ -3593,10 +3647,20 @@ /obj/item/mortar_shell/incendiary, /turf/open/gm/dirt, /area/whiskey_outpost/outside/mortar_pit) +"pS" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/northeast, +/turf/open/floor/asteroidfloor/north, +/area/whiskey_outpost/outside/north/platform) "pT" = ( /obj/structure/machinery/colony_floodlight, /turf/open/jungle, /area/whiskey_outpost/outside/south) +"pU" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/asteroidfloor/north, +/area/whiskey_outpost/outside/north/platform) "pW" = ( /turf/open/gm/river, /area/whiskey_outpost/outside/south/far) @@ -3687,6 +3751,15 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/asteroidfloor/north, /area/whiskey_outpost/inside/bunker/bunker/front) +"qm" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_ew_full_cap"; + layer = 3.5 + }, +/obj/structure/platform/metal/stair_cut/platform_left, +/turf/open/gm/dirt, +/area/whiskey_outpost/outside/north/platform) "qn" = ( /obj/structure/extinguisher_cabinet, /turf/closed/wall/r_wall, @@ -3850,6 +3923,12 @@ /obj/item/device/motiondetector, /turf/open/floor/prison, /area/whiskey_outpost/inside/bunker) +"qS" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform/metal/almayer, +/obj/structure/platform_decoration/metal/almayer/southeast, +/turf/open/gm/river, +/area/whiskey_outpost/outside/river/east) "qT" = ( /obj/structure/barricade/handrail{ dir = 1 @@ -4051,16 +4130,6 @@ /obj/item/reagent_container/food/drinks/bottle/whiskey, /turf/open/gm/dirt, /area/whiskey_outpost/inside/caves/caverns) -"rQ" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 10 - }, -/turf/open/gm/dirt, -/area/whiskey_outpost/outside/north/beach) "rS" = ( /obj/structure/filingcabinet, /turf/open/floor/prison/floor_plate, @@ -4155,6 +4224,10 @@ /obj/effect/spawner/gibspawner/human, /turf/open/gm/dirt, /area/whiskey_outpost/outside/lane/four_south) +"sj" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/gm/dirt, +/area/whiskey_outpost/outside/north/beach) "sk" = ( /obj/structure/surface/rack, /turf/open/floor/prison/floor_plate, @@ -4194,12 +4267,6 @@ }, /turf/open/floor/prison/floor_plate/southwest, /area/whiskey_outpost/inside/engineering) -"ss" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/gm/dirt, -/area/whiskey_outpost/outside/north/beach) "su" = ( /obj/structure/sign/ROsign, /turf/closed/wall/r_wall, @@ -4266,18 +4333,18 @@ "sP" = ( /turf/open/floor/plating/plating_catwalk/prison, /area/whiskey_outpost/inside/engineering) -"sQ" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/asteroidfloor/north, -/area/whiskey_outpost/outside/north/platform) "sR" = ( /obj/structure/machinery/colony_floodlight_switch{ pixel_x = -32 }, /turf/open/floor/prison/floor_plate/southwest, /area/whiskey_outpost/inside/engineering) +"sS" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/northeast, +/turf/open/gm/river, +/area/whiskey_outpost/outside/south) "sU" = ( /turf/closed/wall/r_wall/unmeltable, /area/whiskey_outpost/outside/mortar_pit) @@ -4327,6 +4394,9 @@ /area/whiskey_outpost/outside/south) "tj" = ( /obj/structure/machinery/light/small, +/obj/structure/machinery/personal_gear_vendor{ + pixel_x = 6 + }, /turf/open/floor/asteroidfloor/north, /area/whiskey_outpost) "tk" = ( @@ -4339,6 +4409,11 @@ /obj/structure/sign/nosmoking_1, /turf/closed/wall/r_wall, /area/whiskey_outpost/inside/bunker) +"tm" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform_decoration/metal/almayer, +/turf/open/gm/coast/beachcorner/north_east, +/area/whiskey_outpost/outside/river/west) "tn" = ( /obj/structure/window/framed/colony/reinforced, /turf/open/floor/plating, @@ -4501,6 +4576,10 @@ /obj/structure/surface/rack, /turf/open/floor/prison/floor_plate/southwest, /area/whiskey_outpost/inside/bunker/pillbox/three) +"tU" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/gm/coast/south, +/area/whiskey_outpost/outside/river) "tV" = ( /obj/structure/holohoop{ density = 0; @@ -4508,6 +4587,14 @@ }, /turf/open/floor/asteroidfloor/north, /area/whiskey_outpost/inside/bunker/bunker/front) +"tX" = ( +/obj/structure/platform_decoration/metal/almayer, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/open/floor/asteroidwarning/north, +/area/whiskey_outpost/outside/north/platform) "tY" = ( /obj/structure/bed/chair/office/dark{ dir = 1 @@ -4515,6 +4602,10 @@ /obj/effect/landmark/start/whiskey/bridge, /turf/open/floor/almayer/emerald/northeast, /area/whiskey_outpost/inside/cic) +"tZ" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/gm/river, +/area/whiskey_outpost/outside/river/east) "ua" = ( /obj/effect/landmark/start/whiskey/engineer, /turf/open/gm/dirt, @@ -4538,6 +4629,11 @@ }, /turf/open/floor/almayer/emeraldfull, /area/whiskey_outpost/inside/living) +"uc" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform/metal/almayer, +/turf/open/gm/dirt, +/area/whiskey_outpost/outside/north/beach) "ue" = ( /obj/structure/window/reinforced{ dir = 8; @@ -4607,6 +4703,12 @@ "um" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/whiskey_outpost/outside/north) +"un" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/northeast, +/turf/open/gm/dirt, +/area/whiskey_outpost/outside/north/beach) "uo" = ( /obj/structure/largecrate/supply/supplies/flares, /turf/open/floor/prison/floor_marked/southwest, @@ -4777,6 +4879,10 @@ }, /turf/open/floor/asteroidfloor/north, /area/whiskey_outpost/inside/bunker/bunker/front) +"uS" = ( +/obj/structure/platform/metal/almayer, +/turf/open/gm/dirt, +/area/whiskey_outpost/outside/north/beach) "uT" = ( /obj/structure/disposalpipe/trunk, /obj/structure/machinery/disposal, @@ -4810,9 +4916,17 @@ "ve" = ( /turf/closed/wall, /area/whiskey_outpost/outside/lane/one_north) +"vf" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/gm/dirt, +/area/whiskey_outpost/outside/north/beach) "vg" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/whiskey_outpost/outside/north/beach) +"vh" = ( +/obj/structure/platform/metal/almayer, +/turf/open/gm/coast/beachcorner2/south_east, +/area/whiskey_outpost/outside/river/east) "vi" = ( /obj/structure/curtain/black, /turf/open/floor/almayer/bluefull, @@ -4887,6 +5001,10 @@ /obj/structure/sign/poster, /turf/closed/wall/r_wall, /area/whiskey_outpost/inside/bunker/pillbox/three) +"vz" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/gm/coast/east, +/area/whiskey_outpost/outside/river/west) "vA" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/prison/darkyellow2, @@ -4998,6 +5116,14 @@ /obj/structure/curtain/black, /turf/open/floor/almayer/orangefull, /area/whiskey_outpost/inside/living) +"wd" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer/west, +/obj/structure/disposalpipe/segment, +/turf/open/floor/asteroidfloor/north, +/area/whiskey_outpost/outside/north/platform) "we" = ( /obj/item/cell/high, /turf/open/shuttle/dropship/light_grey_middle, @@ -5100,12 +5226,6 @@ }, /turf/open/floor/asteroidwarning/west, /area/whiskey_outpost/outside/north/platform) -"wx" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/gm/dirt, -/area/whiskey_outpost/outside/north/beach) "wz" = ( /obj/structure/machinery/conveyor{ dir = 4; @@ -5134,6 +5254,10 @@ "wC" = ( /turf/open/floor/prison/floor_plate, /area/whiskey_outpost/inside/bunker) +"wD" = ( +/obj/structure/platform/metal/almayer, +/turf/open/gm/river, +/area/whiskey_outpost/outside/river/east) "wF" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/whiskey_outpost/outside/lane/four_south) @@ -5143,6 +5267,10 @@ }, /turf/open/floor/prison/darkyellowfull2/east, /area/whiskey_outpost/inside/supply) +"wH" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/asteroidfloor/north, +/area/whiskey_outpost/outside/north/platform) "wI" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ name = "Emergency NanoMed"; @@ -5302,12 +5430,6 @@ "xp" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west, /area/whiskey_outpost/outside/lane/two_north) -"xq" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/gm/coast/south, -/area/whiskey_outpost/outside/lane/four_north) "xr" = ( /obj/structure/surface/rack, /obj/item/ammo_box/magazine/m39, @@ -5326,6 +5448,10 @@ icon_state = "rasputin9" }, /area/whiskey_outpost/outside/lane/four_north) +"xy" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/gm/dirt, +/area/whiskey_outpost/outside/north/northwest) "xB" = ( /obj/structure/surface/rack, /obj/item/ammo_box/magazine/m4ra, @@ -5415,18 +5541,6 @@ }, /turf/open/floor/asteroidwarning/west, /area/whiskey_outpost/outside/north/platform) -"xR" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 5 - }, -/turf/open/gm/dirt, -/area/whiskey_outpost/outside/north/beach) "xT" = ( /obj/effect/landmark/start/whiskey/doctor, /turf/open/floor/white, @@ -5494,23 +5608,9 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/prison/darkyellowcorners2/west, /area/whiskey_outpost/inside/supply) -"yk" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/asteroidfloor/north, -/area/whiskey_outpost/outside/north/platform) "yl" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/whiskey_outpost/inside/caves/caverns/west) -"yn" = ( -/obj/structure/platform_decoration, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/open/floor/asteroidwarning/north, -/area/whiskey_outpost/outside/north/platform) "yo" = ( /obj/structure/barricade/sandbags/wired{ dir = 1; @@ -5518,12 +5618,6 @@ }, /turf/open/gm/coast/beachcorner/north_west, /area/whiskey_outpost/outside/lane/four_south) -"yp" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/asteroidfloor/north, -/area/whiskey_outpost/outside/north/platform) "yr" = ( /obj/structure/machinery/m56d_hmg/mg_turret, /obj/structure/barricade/metal/wired, @@ -5557,12 +5651,6 @@ }, /turf/open/floor/prison/darkyellowfull2/east, /area/whiskey_outpost/inside/supply) -"yA" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/asteroidfloor/north, -/area/whiskey_outpost/outside/north/platform) "yB" = ( /obj/structure/machinery/light{ unacidable = 1; @@ -5661,21 +5749,6 @@ }, /turf/open/floor/asteroidwarning/east, /area/whiskey_outpost/outside/north/platform) -"yS" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_ew_full_cap"; - layer = 3.5 - }, -/turf/open/gm/dirt, -/area/whiskey_outpost/outside/north/platform) -"yT" = ( -/obj/structure/platform_decoration, -/turf/open/gm/dirt, -/area/whiskey_outpost/outside/north/beach) "yU" = ( /obj/structure/flora/bush/ausbushes/reedbush, /turf/open/gm/river, @@ -5715,18 +5788,6 @@ /obj/structure/barricade/sandbags/wired, /turf/open/floor/asteroidfloor/north, /area/whiskey_outpost/outside/north/platform) -"zg" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 9 - }, -/turf/open/floor/asteroidfloor/north, -/area/whiskey_outpost/outside/north/platform) "zh" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/whiskey_outpost/outside/lane/two_north) @@ -5750,21 +5811,23 @@ /obj/item/storage/box/explosive_mines, /turf/open/floor/plating/platebot, /area/whiskey_outpost/outside/lane/one_north) +"zn" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/southwest, +/turf/open/gm/dirt, +/area/whiskey_outpost/outside/north/beach) "zo" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/asteroidwarning/east, /area/whiskey_outpost/outside/north/platform) +"zp" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/gm/coast/north, +/area/whiskey_outpost/outside/lane/four_north) "zq" = ( /turf/open/gm/river, /area/whiskey_outpost/outside/river/west) -"zr" = ( -/obj/structure/platform, -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" - }, -/turf/open/gm/dirt, -/area/whiskey_outpost/outside/north/platform) "zs" = ( /obj/structure/machinery/colony_floodlight, /turf/open/gm/dirt, @@ -5918,12 +5981,6 @@ /obj/structure/machinery/autodoc_console, /turf/open/floor/whitegreen/north, /area/whiskey_outpost/inside/hospital/triage) -"Ac" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/gm/coast/beachcorner2/north_east, -/area/whiskey_outpost/outside/lane/four_north) "Ad" = ( /obj/structure/machinery/colony_floodlight, /turf/open/jungle/impenetrable, @@ -5986,6 +6043,13 @@ /obj/structure/machinery/gel_refiller, /turf/open/floor/whitegreen/east, /area/whiskey_outpost/inside/hospital) +"Az" = ( +/obj/structure/machinery/door/poddoor/two_tile/four_tile{ + breakable = 0; + explo_proof = 1 + }, +/turf/open/gm/dirt, +/area/whiskey_outpost/outside/south/very_far) "AA" = ( /turf/open/jungle, /area/whiskey_outpost/outside/south/far) @@ -6016,6 +6080,10 @@ /obj/item/tool/crowbar, /turf/open/floor/prison/floor_plate/southwest, /area/whiskey_outpost/inside/bunker/pillbox/three) +"AG" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/gm/dirt, +/area/whiskey_outpost/outside/north/beach) "AH" = ( /obj/structure/barricade/sandbags/wired{ dir = 4; @@ -6041,18 +6109,11 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk/prison, /area/whiskey_outpost/inside/bunker) -"AQ" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 5 - }, -/turf/open/gm/river, -/area/whiskey_outpost/outside/south) +"AP" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/structure/disposalpipe/segment, +/turf/open/gm/dirt, +/area/whiskey_outpost/outside/north/beach) "AR" = ( /obj/structure/machinery/light/small{ dir = 1 @@ -6095,12 +6156,10 @@ }, /turf/open/floor/plating/asteroidwarning/southwest, /area/whiskey_outpost/outside/north/platform) -"Bb" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, +"Ba" = ( +/obj/structure/platform/metal/almayer/west, /turf/open/gm/river, -/area/whiskey_outpost/outside/south) +/area/whiskey_outpost/outside/lane/four_north) "Bc" = ( /obj/structure/machinery/defenses/sentry/premade, /turf/open/floor/asteroidfloor/north, @@ -6120,16 +6179,6 @@ /obj/structure/disposalpipe/segment, /turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/whiskey_outpost/outside/lane/three_north) -"Bg" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/open/floor/asteroidwarning/north, -/area/whiskey_outpost/outside/north/platform) "Bh" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, /turf/open/gm/river, @@ -6138,6 +6187,10 @@ /obj/structure/fence, /turf/open/gm/dirtgrassborder/north, /area/whiskey_outpost/inside/caves/caverns/west) +"Bk" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/gm/river, +/area/whiskey_outpost/outside/south) "Bl" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -6217,12 +6270,6 @@ "Bz" = ( /turf/open/gm/coast/beachcorner2/north_west, /area/whiskey_outpost/outside/river/east) -"BA" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/gm/dirt, -/area/whiskey_outpost/outside/north/beach) "BB" = ( /obj/structure/machinery/door/airlock/almayer/marine/charlie{ dir = 1; @@ -6261,12 +6308,6 @@ "BK" = ( /turf/open/jungle/clear, /area/whiskey_outpost/outside/south/very_far) -"BL" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/gm/dirt, -/area/whiskey_outpost/outside/north/beach) "BM" = ( /obj/structure/cargo_container/watatsumi/right, /turf/open/jungle/impenetrable, @@ -6308,16 +6349,6 @@ }, /turf/open/floor/asteroidfloor/north, /area/whiskey_outpost/outside/north/platform) -"BV" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/asteroidfloor/north, -/area/whiskey_outpost/outside/north/platform) "BW" = ( /obj/structure/flora/bush/ausbushes/var3/leafybush, /turf/open/gm/dirt, @@ -6335,14 +6366,12 @@ }, /turf/open/floor/asteroidfloor/north, /area/whiskey_outpost/outside/north/platform) -"Ca" = ( +"Cb" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/disposalpipe/segment, /obj/structure/stairs/perspective{ icon_state = "p_stair_full" }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, /turf/open/floor/asteroidfloor/north, /area/whiskey_outpost/outside/north/platform) "Cc" = ( @@ -6387,16 +6416,6 @@ /obj/structure/flora/jungle/plantbot1, /turf/open/jungle, /area/whiskey_outpost/outside/lane/three_north) -"Cn" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/stairs/perspective{ - icon_state = "p_stair_ew_full_cap"; - layer = 3.5 - }, -/turf/open/gm/dirt, -/area/whiskey_outpost/outside/north/platform) "Co" = ( /obj/effect/landmark/start/whiskey/marine, /turf/open/gm/dirt, @@ -6416,20 +6435,6 @@ }, /turf/open/floor/whitegreen/southeast, /area/whiskey_outpost/inside/hospital) -"Ct" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/asteroidfloor/north, -/area/whiskey_outpost/outside/north/platform) -"Cu" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/asteroidfloor/north, -/area/whiskey_outpost/outside/north/platform) "Cv" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/reagentgrinder, @@ -6480,6 +6485,11 @@ /obj/structure/machinery/cm_vending/clothing/medic, /turf/open/floor/asteroidfloor/north, /area/whiskey_outpost) +"CF" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/structure/disposalpipe/segment, +/turf/open/gm/dirt, +/area/whiskey_outpost/outside/north/beach) "CG" = ( /turf/open/gm/dirt, /area/whiskey_outpost/outside/lane/two_south) @@ -6511,6 +6521,10 @@ }, /turf/open/floor/wood, /area/whiskey_outpost/inside/caves/caverns) +"CP" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/asteroidfloor/north, +/area/whiskey_outpost/outside/north/platform) "CQ" = ( /obj/structure/barricade/plasteel/wired, /turf/open/floor/prison/floor_plate/southwest, @@ -6528,21 +6542,9 @@ }, /turf/open/floor/plating/asteroidwarning/northeast, /area/whiskey_outpost/outside/north/platform) -"CY" = ( -/obj/structure/platform, -/turf/open/gm/river, -/area/whiskey_outpost/outside/river/west) -"CZ" = ( -/obj/structure/platform, -/turf/open/gm/coast/east, -/area/whiskey_outpost/outside/river/west) "Db" = ( /turf/open/gm/dirt, /area/whiskey_outpost/outside/lane/two_north) -"Dc" = ( -/obj/structure/platform, -/turf/open/gm/dirt, -/area/whiskey_outpost/outside/north/beach) "Dd" = ( /turf/open/floor/wood, /area/whiskey_outpost/inside/caves/caverns) @@ -6650,14 +6652,6 @@ /obj/effect/landmark/start/whiskey/marine, /turf/open/floor/asteroidfloor/north, /area/whiskey_outpost/outside/north/platform) -"DA" = ( -/obj/structure/platform, -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, -/turf/open/gm/dirt, -/area/whiskey_outpost/outside/north/platform) "DB" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -6689,13 +6683,6 @@ }, /turf/open/gm/coast/north, /area/whiskey_outpost/outside/river/east) -"DH" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform, -/turf/open/gm/dirt, -/area/whiskey_outpost/outside/north/beach) "DJ" = ( /obj/structure/machinery/cryopod, /turf/open/floor/prison/floor_plate/southwest, @@ -6732,12 +6719,6 @@ /obj/effect/landmark/start/whiskey/smartgunner, /turf/open/floor/asteroidfloor/north, /area/whiskey_outpost/outside/north/platform) -"DP" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/gm/river, -/area/whiskey_outpost/outside/river/east) "DQ" = ( /obj/effect/decal/warning_stripes/asteroid{ dir = 4; @@ -6745,6 +6726,10 @@ }, /turf/open/floor/asteroidfloor/north, /area/whiskey_outpost/inside/bunker/bunker/front) +"DT" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/gm/coast/west, +/area/whiskey_outpost/outside/river/east) "DU" = ( /obj/item/lightstick/red/planted, /turf/open/gm/dirt, @@ -6820,6 +6805,10 @@ }, /turf/open/floor/almayer/orangefull, /area/whiskey_outpost/inside/living) +"Ej" = ( +/obj/structure/platform/metal/almayer, +/turf/open/gm/coast/east, +/area/whiskey_outpost/outside/river/west) "Ek" = ( /obj/structure/filtration/machine_96x96/indestructible{ icon_state = "distribution" @@ -6838,12 +6827,6 @@ /obj/effect/landmark/start/whiskey/marine, /turf/open/floor/asteroidfloor/north, /area/whiskey_outpost/outside/lane/three_south) -"Er" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/gm/coast/beachcorner2/south_east, -/area/whiskey_outpost/outside/lane/four_north) "Eu" = ( /turf/open/gm/coast/beachcorner/north_east, /area/whiskey_outpost/outside/river/west) @@ -6959,12 +6942,6 @@ "EV" = ( /turf/open/jungle/impenetrable, /area/whiskey_outpost/outside/lane/three_north) -"EX" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/gm/coast/west, -/area/whiskey_outpost/outside/river/west) "EY" = ( /obj/effect/landmark/whiskey_outpost/xenospawn, /turf/open/jungle/clear, @@ -6993,6 +6970,10 @@ }, /turf/open/floor/asteroidfloor/north, /area/whiskey_outpost/outside/north/platform) +"Fe" = ( +/obj/structure/platform/metal/almayer, +/turf/open/gm/coast/beachcorner2/south_west, +/area/whiskey_outpost/outside/river/west) "Fg" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -7008,12 +6989,6 @@ /obj/effect/landmark/start/whiskey/marine, /turf/open/floor/asteroidfloor/north, /area/whiskey_outpost/inside/bunker/bunker/front) -"Fi" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/gm/coast/south, -/area/whiskey_outpost/outside/river) "Fj" = ( /obj/effect/decal/cleanable/blood/writing{ dir = 1 @@ -7035,23 +7010,10 @@ "Fn" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/whiskey_outpost/outside/south/very_far) -"Fp" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/gm/coast/beachcorner2/north_east, -/area/whiskey_outpost/outside/river/west) "Fr" = ( /obj/structure/machinery/light/small, /turf/open/floor/prison/floor_plate/southwest, /area/whiskey_outpost/inside/bunker/bunker/front) -"Fs" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform_decoration, -/turf/open/gm/coast/beachcorner/north_east, -/area/whiskey_outpost/outside/river/west) "Fu" = ( /turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/inside/caves/caverns/east) @@ -7064,14 +7026,6 @@ /obj/structure/surface/rack, /turf/open/floor/prison/floor_marked/southwest, /area/whiskey_outpost/inside/bunker/bunker/front) -"Fw" = ( -/obj/structure/platform, -/turf/open/gm/coast/west, -/area/whiskey_outpost/outside/river/east) -"Fx" = ( -/obj/structure/platform, -/turf/open/gm/coast/beachcorner2/south_east, -/area/whiskey_outpost/outside/river/east) "Fy" = ( /obj/structure/barricade/sandbags/wired, /turf/open/gm/dirt, @@ -7087,12 +7041,6 @@ "FC" = ( /turf/open/gm/coast/beachcorner/south_west, /area/whiskey_outpost/outside/river/west) -"FD" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/gm/coast/east, -/area/whiskey_outpost/outside/river/west) "FE" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -7102,18 +7050,6 @@ }, /turf/open/floor/prison/floor_plate/southwest, /area/whiskey_outpost/inside/bunker/pillbox/three) -"FF" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/gm/coast/north, -/area/whiskey_outpost/outside/lane/four_north) -"FG" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/gm/coast/north, -/area/whiskey_outpost/outside/lane/four_north) "FH" = ( /obj/structure/flora/jungle/alienplant1, /turf/open/gm/river, @@ -7122,6 +7058,14 @@ /obj/structure/flora/jungle/plantbot1, /turf/open/jungle, /area/whiskey_outpost/outside/south/very_far) +"FK" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer/east, +/obj/structure/disposalpipe/segment, +/turf/open/floor/asteroidfloor/north, +/area/whiskey_outpost/outside/north/platform) "FL" = ( /turf/open/jungle/impenetrable, /area/whiskey_outpost/outside/lane/three_south) @@ -7177,18 +7121,6 @@ "FW" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/whiskey_outpost/inside/caves/caverns/east) -"FX" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 9 - }, -/turf/open/gm/dirt, -/area/whiskey_outpost/outside/north/beach) "FY" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -7235,16 +7167,6 @@ "Gl" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/whiskey_outpost/outside/north/beach) -"Gm" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" - }, -/turf/open/gm/dirt, -/area/whiskey_outpost/outside/north/beach) "Gn" = ( /obj/structure/barricade/metal/wired, /turf/open/gm/dirt, @@ -7256,6 +7178,10 @@ /obj/structure/barricade/sandbags/wired, /turf/open/gm/dirt, /area/whiskey_outpost/outside/lane/four_north) +"Gs" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/gm/grass/grassbeach/east, +/area/whiskey_outpost/outside/south) "Gt" = ( /obj/structure/barricade/sandbags/wired{ dir = 4; @@ -7309,30 +7235,10 @@ }, /turf/open/floor/asteroidwarning, /area/whiskey_outpost/outside/north/platform) -"GF" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/turf/open/floor/asteroidfloor/north, -/area/whiskey_outpost/outside/north/platform) "GG" = ( /obj/structure/machinery/colony_floodlight, /turf/open/floor/plating, /area/whiskey_outpost/outside/north/beach) -"GI" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/turf/open/floor/asteroidfloor/north, -/area/whiskey_outpost/outside/north/platform) "GJ" = ( /turf/open/jungle, /area/whiskey_outpost/outside/lane/two_north) @@ -7427,14 +7333,6 @@ "Hj" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/whiskey_outpost/inside/caves/caverns/west) -"Hk" = ( -/obj/structure/platform, -/turf/open/gm/coast/beachcorner/south_west, -/area/whiskey_outpost/outside/river/west) -"Hl" = ( -/obj/structure/platform, -/turf/open/gm/coast/beachcorner2/south_west, -/area/whiskey_outpost/outside/river/west) "Hm" = ( /obj/effect/decal/warning_stripes/asteroid{ icon_state = "warning_s" @@ -7464,13 +7362,6 @@ "Hr" = ( /turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/outside/lane/one_north) -"Hs" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/turf/open/gm/dirt, -/area/whiskey_outpost/outside/north/beach) "Ht" = ( /obj/structure/disposalpipe/segment, /turf/open/jungle, @@ -7479,13 +7370,6 @@ /obj/structure/fence, /turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/whiskey_outpost/inside/caves/caverns/west) -"Hv" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/turf/open/gm/dirt, -/area/whiskey_outpost/outside/north/beach) "Hw" = ( /turf/open/shuttle/dropship/light_grey_top_right, /area/whiskey_outpost/outside/lane/four_north) @@ -7507,6 +7391,18 @@ "HB" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/whiskey_outpost/outside/lane/three_south) +"HC" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/gm/coast/beachcorner/north_west, +/area/whiskey_outpost/outside/river/east) +"HD" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/gm/river, +/area/whiskey_outpost/outside/river/east) +"HE" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/gm/coast/north, +/area/whiskey_outpost/outside/river) "HH" = ( /obj/effect/landmark/start/whiskey/leader, /turf/open/floor/prison, @@ -7514,6 +7410,10 @@ "HI" = ( /turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/inside/caves/caverns/west) +"HJ" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/gm/river, +/area/whiskey_outpost/outside/river/east) "HK" = ( /obj/structure/barricade/sandbags/wired{ dir = 4; @@ -7558,6 +7458,12 @@ }, /turf/open/floor/asteroidfloor/north, /area/whiskey_outpost/outside/north/beach) +"HS" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/northwest, +/turf/open/gm/dirt, +/area/whiskey_outpost/outside/north/beach) "HT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -7606,6 +7512,10 @@ }, /turf/open/floor/plating/asteroidwarning/southwest, /area/whiskey_outpost/outside/north/platform) +"Ib" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/asteroidfloor/north, +/area/whiskey_outpost/outside/north/platform) "Ic" = ( /obj/structure/barricade/sandbags/wired, /obj/structure/barricade/sandbags/wired{ @@ -7720,6 +7630,10 @@ /obj/item/lightstick/red/planted, /turf/open/jungle, /area/whiskey_outpost/outside/north/northwest) +"IE" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/gm/coast/beachcorner2/north_east, +/area/whiskey_outpost/outside/river/west) "IF" = ( /obj/structure/machinery/m56d_hmg/mg_turret, /obj/structure/barricade/sandbags/wired, @@ -7743,12 +7657,6 @@ "IM" = ( /turf/open/gm/coast/beachcorner2/south_west, /area/whiskey_outpost/outside/lane/four_south) -"IN" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/gm/coast/west, -/area/whiskey_outpost/outside/river/east) "IO" = ( /turf/closed/shuttle/dropship{ icon_state = "rasputin8" @@ -7759,18 +7667,6 @@ /obj/item/tool/hand_labeler, /turf/open/floor/prison/floor_plate, /area/whiskey_outpost/inside/supply) -"IQ" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/gm/river, -/area/whiskey_outpost/outside/river/east) -"IR" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/gm/coast/east, -/area/whiskey_outpost/outside/river/east) "IU" = ( /obj/effect/landmark/start/whiskey/marine, /turf/open/floor/prison/cell_stripe, @@ -7868,10 +7764,6 @@ }, /turf/open/gm/dirt, /area/whiskey_outpost/outside/north/northwest) -"Jp" = ( -/obj/structure/platform, -/turf/open/gm/river, -/area/whiskey_outpost/outside/river/east) "Jq" = ( /obj/structure/filingcabinet, /turf/open/floor/prison, @@ -7882,6 +7774,10 @@ }, /turf/open/gm/dirt, /area/whiskey_outpost/outside/north/northwest) +"Js" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/jungle, +/area/whiskey_outpost/outside/lane/two_south) "Jt" = ( /obj/structure/flora/bush/ausbushes/var3/sparsegrass, /obj/structure/disposalpipe/segment{ @@ -7911,12 +7807,6 @@ }, /turf/open/gm/dirt, /area/whiskey_outpost/outside/north/beach) -"JC" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/gm/river, -/area/whiskey_outpost/outside/south) "JE" = ( /obj/effect/landmark/start/whiskey/doctor, /turf/open/floor/whitegreen/southwest, @@ -7932,12 +7822,6 @@ /obj/item/storage/box/m56d_hmg, /turf/open/shuttle/dropship/light_grey_top, /area/whiskey_outpost/outside/lane/four_north) -"JH" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/gm/grass/grassbeach/west, -/area/whiskey_outpost/outside/south) "JJ" = ( /obj/structure/machinery/iv_drip, /turf/open/floor/whitegreen/west, @@ -7978,6 +7862,10 @@ }, /turf/open/floor/asteroidfloor/north, /area/whiskey_outpost/inside/bunker/bunker/front) +"JS" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/gm/coast/south, +/area/whiskey_outpost/outside/river/east) "JT" = ( /turf/open/floor/whitegreencorner/west, /area/whiskey_outpost/inside/hospital) @@ -7987,6 +7875,10 @@ "JX" = ( /turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/outside/lane/four_south) +"JY" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/gm/river, +/area/whiskey_outpost/outside/river/east) "JZ" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/whiskey_outpost/outside/north/beach) @@ -8012,6 +7904,11 @@ /obj/structure/flora/jungle/planttop1, /turf/open/jungle, /area/whiskey_outpost/outside/lane/three_south) +"Ki" = ( +/obj/structure/machinery/colony_floodlight, +/obj/structure/platform/metal/almayer/north, +/turf/open/gm/dirt, +/area/whiskey_outpost/outside/north/beach) "Kl" = ( /obj/structure/extinguisher_cabinet, /turf/closed/wall/r_wall, @@ -8060,6 +7957,14 @@ /obj/structure/disposalpipe/segment, /turf/open/gm/dirt, /area/whiskey_outpost/outside/lane/three_north) +"Kw" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/turf/open/gm/dirt, +/area/whiskey_outpost/outside/north/platform) "Kx" = ( /turf/open/floor/whitegreencorner, /area/whiskey_outpost/inside/hospital/triage) @@ -8106,12 +8011,6 @@ }, /turf/open/gm/dirt, /area/whiskey_outpost/outside/north/northwest) -"KR" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/gm/river, -/area/whiskey_outpost/outside/river) "KT" = ( /turf/open/gm/coast/beachcorner/north_west, /area/whiskey_outpost/outside/lane/four_north) @@ -8132,12 +8031,6 @@ /obj/effect/landmark/start/whiskey/marine, /turf/open/gm/dirt, /area/whiskey_outpost/outside/north/northwest) -"Lc" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/gm/dirt, -/area/whiskey_outpost/outside/north/northwest) "Ld" = ( /turf/open/gm/coast/west, /area/whiskey_outpost/outside/river/west) @@ -8291,6 +8184,10 @@ /obj/item/stack/medical/bruise_pack, /turf/open/floor/plating/warnplate, /area/whiskey_outpost/outside/lane/one_north) +"LV" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/gm/coast/south, +/area/whiskey_outpost/outside/lane/four_north) "LX" = ( /turf/open/gm/coast/beachcorner/north_west, /area/whiskey_outpost/outside/river/east) @@ -8316,6 +8213,14 @@ }, /turf/open/gm/dirt, /area/whiskey_outpost/outside/lane/four_north) +"Md" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/stairs/perspective{ + dir = 1; + icon_state = "p_stair_full" + }, +/turf/open/gm/dirt, +/area/whiskey_outpost/outside/north/beach) "Me" = ( /turf/open/gm/grass/gbcorner/south_west, /area/whiskey_outpost/outside/lane/one_south) @@ -8347,12 +8252,6 @@ "Mi" = ( /turf/open/floor/asteroidwarning/west, /area/whiskey_outpost/outside/north/northeast) -"Mj" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/gm/coast/north, -/area/whiskey_outpost/outside/river/east) "Mk" = ( /obj/structure/sign/safety/north, /obj/structure/sign/safety/medical{ @@ -8394,6 +8293,11 @@ /obj/effect/landmark/start/whiskey/leader, /turf/open/floor/asteroidfloor/north, /area/whiskey_outpost/outside/north/platform) +"Mu" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/gm/dirt, +/area/whiskey_outpost/outside/north/beach) "Mw" = ( /obj/structure/fence, /turf/open/jungle/impenetrable, @@ -8414,20 +8318,6 @@ }, /turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/outside/north) -"MB" = ( -/obj/structure/platform{ - layer = 3.6 - }, -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_ew_full_cap"; - layer = 3.5 - }, -/turf/open/gm/dirt, -/area/whiskey_outpost/outside/north/beach) "ME" = ( /obj/structure/sink/puddle, /turf/open/jungle, @@ -8466,15 +8356,6 @@ "MP" = ( /turf/open/gm/dirt, /area/whiskey_outpost/outside/north/northeast) -"MQ" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/gm/dirt, -/area/whiskey_outpost/outside/north/beach) "MR" = ( /obj/structure/flora/jungle/alienplant1, /turf/open/gm/river, @@ -8529,16 +8410,6 @@ }, /turf/open/gm/dirt, /area/whiskey_outpost/outside/north/beach) -"Nk" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/stairs/perspective{ - dir = 1; - icon_state = "p_stair_full" - }, -/turf/open/gm/dirt, -/area/whiskey_outpost/outside/north/beach) "Nl" = ( /obj/structure/barricade/sandbags/wired{ dir = 4; @@ -8584,6 +8455,10 @@ /obj/structure/flora/jungle/alienplant1, /turf/open/gm/grass/grassbeach/north, /area/whiskey_outpost/outside/lane/one_north) +"Nx" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/gm/river, +/area/whiskey_outpost/outside/south) "Ny" = ( /obj/structure/barricade/sandbags/wired{ dir = 8; @@ -8625,22 +8500,9 @@ /obj/structure/flora/bush/ausbushes/grassybush, /turf/open/gm/dirt, /area/whiskey_outpost/outside/north/northwest) -"NG" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/gm/coast/east, -/area/whiskey_outpost/outside/river/west) "NI" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/whiskey_outpost/inside/caves/caverns/east) -"NJ" = ( -/obj/structure/machinery/colony_floodlight, -/obj/structure/platform{ - dir = 1 - }, -/turf/open/gm/dirt, -/area/whiskey_outpost/outside/north/beach) "NL" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/whiskey_outpost/outside/north/beach) @@ -8686,6 +8548,10 @@ }, /turf/open/floor/prison/floor_plate/southwest, /area/whiskey_outpost/inside/bunker/bunker/front) +"Oa" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/gm/coast/east, +/area/whiskey_outpost/outside/river/east) "Ob" = ( /obj/structure/flora/jungle/alienplant1, /turf/open/gm/river, @@ -8757,6 +8623,10 @@ "Oq" = ( /turf/closed/wall/r_wall, /area/whiskey_outpost/outside/lane/two_north) +"Or" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/gm/coast/beachcorner2/south_east, +/area/whiskey_outpost/outside/lane/four_north) "Ot" = ( /obj/structure/disposalpipe/segment, /turf/open/jungle/impenetrable, @@ -8780,6 +8650,15 @@ /obj/structure/flora/jungle/alienplant1, /turf/open/gm/river, /area/whiskey_outpost/outside/lane/four_north) +"OB" = ( +/obj/structure/barricade/sandbags/wired, +/obj/structure/platform/metal/almayer/west, +/turf/open/gm/dirt, +/area/whiskey_outpost/outside/north/beach) +"OC" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/gm/dirtgrassborder/north, +/area/whiskey_outpost/outside/lane/two_south) "OD" = ( /obj/structure/barricade/metal/wired, /turf/open/gm/dirt, @@ -8842,12 +8721,6 @@ "OU" = ( /turf/open/gm/coast/beachcorner2/north_east, /area/whiskey_outpost/outside/river) -"OV" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/gm/coast/beachcorner/north_west, -/area/whiskey_outpost/outside/river) "OX" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -8855,15 +8728,13 @@ /obj/effect/landmark/start/whiskey/medic, /turf/open/floor/asteroidfloor/north, /area/whiskey_outpost) -"OY" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/gm/coast/north, -/area/whiskey_outpost/outside/river) "OZ" = ( /turf/open/floor/asteroidfloor/north, /area/whiskey_outpost/outside/lane/three_south) +"Pb" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/gm/river, +/area/whiskey_outpost/outside/river) "Pc" = ( /obj/structure/disposalpipe/segment, /turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, @@ -8886,13 +8757,10 @@ "Ph" = ( /turf/open/shuttle/dropship/light_grey_bottom_right, /area/whiskey_outpost/outside/lane/four_north) -"Pi" = ( -/obj/structure/barricade/sandbags/wired, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/gm/dirt, -/area/whiskey_outpost/outside/north/beach) +"Pj" = ( +/obj/structure/platform/metal/almayer, +/turf/open/gm/coast/beachcorner/south_west, +/area/whiskey_outpost/outside/river/west) "Pk" = ( /turf/open/gm/coast/beachcorner/south_west, /area/whiskey_outpost/outside/river/east) @@ -8944,6 +8812,10 @@ }, /turf/open/floor/whitegreen/north, /area/whiskey_outpost/inside/hospital/triage) +"Py" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/gm/river, +/area/whiskey_outpost/outside/river) "Pz" = ( /turf/closed/shuttle/dropship{ icon_state = "rasputin6" @@ -8978,33 +8850,19 @@ "PH" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/whiskey_outpost/outside/lane/three_north) +"PK" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/jungle, +/area/whiskey_outpost/outside/lane/two_south) "PL" = ( /turf/open/gm/grass/grassbeach/north, /area/whiskey_outpost/outside/lane/one_north) "PM" = ( /turf/open/floor/plating/plating_catwalk, /area/whiskey_outpost/inside/cic) -"PN" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/gm/river, -/area/whiskey_outpost/outside/river) "PO" = ( /turf/open/gm/river, /area/whiskey_outpost/outside/lane/four_north) -"PP" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/gm/coast/north, -/area/whiskey_outpost/outside/river) -"PQ" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/gm/river, -/area/whiskey_outpost/outside/river/west) "PR" = ( /obj/structure/surface/rack, /obj/item/fuel_cell, @@ -9046,12 +8904,6 @@ /obj/structure/flora/jungle/alienplant1, /turf/open/gm/river, /area/whiskey_outpost/outside/river/east) -"Qc" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/gm/coast/beachcorner/north_west, -/area/whiskey_outpost/outside/river/east) "Qe" = ( /turf/open/floor, /area/whiskey_outpost/outside/south/far) @@ -9155,6 +9007,10 @@ /obj/structure/cargo_container/grant/right, /turf/open/jungle, /area/whiskey_outpost/outside/south) +"QI" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/gm/coast/north, +/area/whiskey_outpost/outside/lane/four_north) "QJ" = ( /turf/open/gm/grass/gbcorner/north_west, /area/whiskey_outpost/outside/lane/one_north) @@ -9194,34 +9050,18 @@ }, /turf/open/gm/dirtgrassborder/grassdirt_corner2/north_west, /area/whiskey_outpost/outside/north) -"QY" = ( -/obj/structure/platform_decoration, -/turf/open/gm/river, -/area/whiskey_outpost/outside/river/east) -"QZ" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform, -/obj/structure/platform_decoration{ - dir = 6 - }, -/turf/open/gm/river, -/area/whiskey_outpost/outside/river/east) "Ra" = ( /obj/structure/barricade/plasteel/wired, /turf/open/gm/dirt, /area/whiskey_outpost/outside/lane/four_south) +"Rb" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/gm/coast/east, +/area/whiskey_outpost/outside/river/west) "Rc" = ( /obj/structure/flora/bush/ausbushes/var3/stalkybush, /turf/open/gm/river, /area/whiskey_outpost/outside/lane/four_south) -"Rd" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/gm/river, -/area/whiskey_outpost/outside/river/east) "Re" = ( /obj/structure/machinery/cm_vending/clothing/marine/charlie{ density = 0; @@ -9287,12 +9127,6 @@ /obj/effect/landmark/start/whiskey/leader, /turf/open/floor/prison/floor_plate/southwest, /area/whiskey_outpost/inside/bunker/pillbox/four) -"RB" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/gm/river, -/area/whiskey_outpost/outside/river/east) "RC" = ( /obj/effect/decal/warning_stripes/asteroid{ dir = 8; @@ -9333,6 +9167,14 @@ "RP" = ( /turf/open/gm/grass/grassbeach/north, /area/whiskey_outpost/outside/south) +"RQ" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/turf/open/gm/dirt, +/area/whiskey_outpost/outside/north/platform) "RR" = ( /obj/structure/barricade/plasteel/wired, /turf/open/floor/prison/floor_plate/southwest, @@ -9341,6 +9183,10 @@ /obj/structure/flora/bush/ausbushes/var3/stalkybush, /turf/open/gm/dirtgrassborder/south, /area/whiskey_outpost/outside/lane/one_north) +"RT" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/jungle, +/area/whiskey_outpost/outside/south) "RU" = ( /obj/structure/machinery/cm_vending/clothing/medic, /turf/open/floor/asteroidfloor/north, @@ -9356,22 +9202,6 @@ /obj/structure/largecrate/random/case, /turf/open/floor/asteroidfloor/north, /area/whiskey_outpost/inside/bunker/bunker/front) -"Sa" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/gm/coast/south, -/area/whiskey_outpost/outside/river) -"Sb" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 6 - }, -/turf/open/gm/river, -/area/whiskey_outpost/outside/river/east) "Se" = ( /obj/structure/sign/safety/four, /obj/structure/sign/safety/ammunition{ @@ -9506,12 +9336,11 @@ }, /turf/open/floor/prison/floor_plate/southwest, /area/whiskey_outpost/inside/bunker/pillbox/four) -"SL" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/gm/dirtgrassborder/north, -/area/whiskey_outpost/outside/lane/two_south) +"SM" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/structure/disposalpipe/segment, +/turf/open/floor/asteroidfloor/north, +/area/whiskey_outpost/outside/north/platform) "SN" = ( /obj/structure/window/framed/colony/reinforced, /turf/open/floor/plating, @@ -9533,12 +9362,6 @@ }, /turf/open/floor/asteroidfloor/north, /area/whiskey_outpost/inside/bunker/bunker/front) -"SQ" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/jungle, -/area/whiskey_outpost/outside/lane/two_south) "SS" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -9582,12 +9405,6 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/gm/grass/gbcorner/north_west, /area/whiskey_outpost/outside/north/northwest) -"Tc" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/gm/coast/south, -/area/whiskey_outpost/outside/river/east) "Td" = ( /obj/structure/sink{ dir = 8; @@ -9608,6 +9425,14 @@ /obj/structure/barricade/plasteel/wired, /turf/open/gm/dirt, /area/whiskey_outpost/outside/lane/one_north) +"Ti" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/open/floor/asteroidwarning/north, +/area/whiskey_outpost/outside/north/platform) "Tj" = ( /obj/structure/barricade/metal/wired, /obj/structure/barricade/sandbags/wired{ @@ -9628,18 +9453,6 @@ /obj/effect/landmark/wo_supplies/ammo/box/m41a, /turf/open/floor/prison/floor_plate/southwest, /area/whiskey_outpost/inside/bunker/pillbox/four) -"Tn" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/gm/river, -/area/whiskey_outpost/outside/south) -"To" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/gm/coast/south, -/area/whiskey_outpost/outside/river/east) "Tp" = ( /obj/structure/machinery/door/airlock/almayer/marine/alpha{ dir = 1; @@ -9751,12 +9564,6 @@ }, /turf/open/gm/dirt, /area/whiskey_outpost/outside/north) -"TU" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/gm/coast/beachcorner/north_east, -/area/whiskey_outpost/outside/river) "TW" = ( /obj/structure/machinery/door/airlock/almayer/marine/bravo{ dir = 1; @@ -9898,6 +9705,10 @@ }, /turf/open/floor/prison/floor_plate/southwest, /area/whiskey_outpost/inside/bunker/pillbox/one) +"UE" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/gm/coast/west, +/area/whiskey_outpost/outside/river/west) "UF" = ( /turf/open/gm/coast/beachcorner2/south_east, /area/whiskey_outpost/outside/lane/four_north) @@ -9928,12 +9739,6 @@ }, /turf/open/floor/prison/floor_plate/southwest, /area/whiskey_outpost/inside/bunker/pillbox/one) -"UN" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/gm/dirt, -/area/whiskey_outpost/outside/north/beach) "UO" = ( /obj/item/lightstick/red/planted, /turf/open/gm/grass/grass1, @@ -9950,6 +9755,10 @@ /obj/structure/flora/jungle/plantbot1, /turf/open/jungle, /area/whiskey_outpost/outside/lane/three_south) +"UU" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/gm/coast/south, +/area/whiskey_outpost/outside/river) "UW" = ( /obj/structure/barricade/plasteel/wired, /turf/open/gm/dirt, @@ -10135,18 +9944,6 @@ /obj/item/toy/beach_ball/holoball, /turf/open/floor/asteroidfloor/north, /area/whiskey_outpost/inside/bunker/bunker/front) -"VQ" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 9 - }, -/turf/open/gm/river, -/area/whiskey_outpost/outside/south) "VR" = ( /obj/structure/surface/rack, /obj/item/device/binoculars, @@ -10396,6 +10193,12 @@ }, /turf/open/gm/dirt, /area/whiskey_outpost/outside/lane/three_north) +"WQ" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/northeast, +/turf/open/gm/coast/north, +/area/whiskey_outpost/outside/lane/four_north) "WR" = ( /obj/effect/decal/cleanable/blood/oil, /obj/effect/landmark/start/whiskey/medic, @@ -10558,6 +10361,10 @@ }, /turf/open/floor/prison/floor_plate/southwest, /area/whiskey_outpost/inside/bunker/pillbox/two) +"XL" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/gm/dirt, +/area/whiskey_outpost/outside/north/beach) "XM" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/prison/floor_plate/southwest, @@ -10593,6 +10400,10 @@ /obj/effect/landmark/start/whiskey/marine, /turf/open/jungle, /area/whiskey_outpost/outside/lane/three_south) +"XT" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/gm/coast/north, +/area/whiskey_outpost/outside/river) "XV" = ( /obj/structure/machinery/power/apc/almayer/north, /turf/open/floor/prison/floor_plate/southwest, @@ -10602,6 +10413,16 @@ icon_state = "rasputin4" }, /area/whiskey_outpost/outside/lane/four_north) +"XX" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_ew_full_cap"; + layer = 3.5 + }, +/obj/structure/platform/metal/stair_cut/platform_left, +/turf/open/gm/dirt, +/area/whiskey_outpost/outside/north/beach) "XY" = ( /turf/closed/shuttle/dropship, /area/whiskey_outpost/outside/lane/four_north) @@ -10660,12 +10481,6 @@ "Yo" = ( /turf/open/gm/coast/north, /area/whiskey_outpost/outside/river) -"Yp" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/gm/coast/north, -/area/whiskey_outpost/outside/lane/four_north) "Yq" = ( /turf/open/floor/prison/floor_marked/southwest, /area/whiskey_outpost/inside/bunker/bunker/front) @@ -10692,30 +10507,6 @@ /obj/structure/machinery/colony_floodlight, /turf/open/gm/dirt, /area/whiskey_outpost/outside/north/northeast) -"Yy" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform_decoration{ - dir = 9 - }, -/turf/open/gm/coast/north, -/area/whiskey_outpost/outside/lane/four_north) -"YA" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform_decoration{ - dir = 5 - }, -/turf/open/gm/coast/north, -/area/whiskey_outpost/outside/lane/four_north) "YB" = ( /obj/effect/decal/warning_stripes/asteroid{ icon_state = "warning_s" @@ -10730,6 +10521,16 @@ }, /turf/open/floor/asteroidfloor/north, /area/whiskey_outpost/outside/north) +"YC" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/asteroidfloor/north, +/area/whiskey_outpost/outside/north/platform) +"YD" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/southeast, +/turf/open/gm/river, +/area/whiskey_outpost/outside/river/east) "YE" = ( /obj/structure/bed/chair, /turf/open/floor/prison, @@ -10740,6 +10541,10 @@ /obj/effect/landmark/wo_supplies/ammo/box/m41a, /turf/open/floor/prison/floor_plate/southwest, /area/whiskey_outpost/inside/bunker/pillbox/two) +"YG" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/gm/dirt, +/area/whiskey_outpost/outside/north/beach) "YH" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner/north_west, /area/whiskey_outpost/inside/caves/caverns/west) @@ -10781,6 +10586,10 @@ "YV" = ( /turf/open/gm/coast/beachcorner2/south_west, /area/whiskey_outpost/outside/river) +"YW" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/gm/coast/south, +/area/whiskey_outpost/outside/lane/four_north) "YY" = ( /turf/closed/shuttle/dropship{ dir = 1; @@ -10838,21 +10647,9 @@ }, /turf/open/floor/prison/cell_stripe/east, /area/whiskey_outpost/inside/bunker/bunker/front) -"Zh" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/gm/river, -/area/whiskey_outpost/outside/lane/four_north) "Zi" = ( /turf/open/gm/grass/grassbeach/east, /area/whiskey_outpost/outside/lane/two_north) -"Zj" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/gm/river, -/area/whiskey_outpost/outside/lane/four_north) "Zl" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/tool/screwdriver{ @@ -10995,6 +10792,11 @@ /obj/effect/landmark/wo_supplies/storage/machete, /turf/open/floor/prison/floor_plate/southwest, /area/whiskey_outpost/inside/bunker/pillbox/two) +"ZR" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/structure/disposalpipe/segment, +/turf/open/floor/asteroidfloor/north, +/area/whiskey_outpost/outside/north/platform) "ZT" = ( /obj/item/lightstick/red/planted, /turf/open/gm/dirtgrassborder/west, @@ -11022,19 +10824,6 @@ icon_state = "rasputin10" }, /area/whiskey_outpost/outside/lane/four_north) -"ZX" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform, -/obj/structure/platform_decoration{ - dir = 10 - }, -/obj/structure/platform_decoration{ - dir = 10 - }, -/turf/open/gm/river, -/area/whiskey_outpost/outside/river/east) (1,1,1) = {" mT @@ -15750,12 +15539,12 @@ zq Ls Ld Ld -Hk +Pj HY Ix Ix Ev -Lc +xy KY KY KY @@ -15952,12 +15741,12 @@ zq zq zq zq -Hl +Fe HY Ix Ix Ev -EX +UE FC KY KY @@ -16154,12 +15943,12 @@ zq FH zq zq -CY +jr HY Ix Ix Ev -PQ +cK Ls Ld Ld @@ -16356,12 +16145,12 @@ zq zq zq XD -CY +jr HY Ix Ix Ev -PQ +cK zq zq zq @@ -16558,12 +16347,12 @@ zq zq zq zq -CY +jr HY Ix Ix Ev -PQ +cK FH zq zq @@ -16760,12 +16549,12 @@ zq zq Bh zq -CY +jr Dt DD DD Ew -PQ +cK zq zq zq @@ -16962,12 +16751,12 @@ zq zq zq zq -CY +jr Dt DD DD Ew -PQ +cK XD zq zq @@ -17164,12 +16953,12 @@ zq XD zq zq -CY +jr Dt DD DD Ew -PQ +cK zq zq zq @@ -17366,12 +17155,12 @@ EG EG EG EG -CZ +Ej Dt DD DD Ew -Fp +IE zq zq zq @@ -17568,16 +17357,16 @@ zR fy fy zR -Dc +uS Dt DD DD Ew -Fs -FD -FD -FD -NG +tm +Rb +Rb +Rb +vz BF zq zq @@ -17775,11 +17564,11 @@ zR fy zR jU -Dc +uS LI Mp Nn -fI +XL AV zq zq @@ -17977,11 +17766,11 @@ fy fy fy jU -Dc +uS BJ Gz Nq -NJ +Ki mT zq zq @@ -18179,11 +17968,11 @@ GY fy fy jU -Dc +uS LK -MB +XX Nt -fI +XL mT mT zq @@ -18381,11 +18170,11 @@ fy fy fy jU -ss -BL -MQ -BL -wx +vf +AG +Mu +AG +sj mT mT zq @@ -20988,18 +20777,18 @@ yj Ks nr nr -UN -UN -UN -BA +on +on +on +YG fy fy fy -yT -UN -UN -UN -BA +ir +on +on +on +YG fy fy fy @@ -21193,20 +20982,20 @@ nr zS AB AZ -FX -BA +HS +YG fy -yT -DH +ir +uc DY AB EH -FX -BA +HS +YG fy -yT -UN -BA +ir +on +YG fy jU fy @@ -21396,28 +21185,28 @@ BT BT BT BC -Cn +bk Di -DA +RQ DN BT BT BT BC -Cn +bk Di -DA +RQ Ia -fI +XL fy jU fy -yT -UN -UN -UN -UN -TU +ir +on +on +on +on +az OU eY eY @@ -21610,16 +21399,16 @@ Cr Cr Cr kI -fI +XL fy jU fy -Dc +uS LI Ny Ny Nn -fI +XL Pt eY eY @@ -21812,16 +21601,16 @@ xN Cx ed kI -fI +XL fy jU fy -ss -Gm +vf +Md Gz Gz GR -fI +XL Yo eY eY @@ -21996,7 +21785,7 @@ rZ jv kS nr -sQ +CP ed BN BN @@ -22014,7 +21803,7 @@ aj CU Dn kI -fI +XL fy tJ fy @@ -22023,7 +21812,7 @@ Nj GG Kq Nq -fI +XL Yo eY eY @@ -22198,7 +21987,7 @@ kS kS vP ZH -sQ +CP ed BN BN @@ -22216,16 +22005,16 @@ aj aj AR kI -fI +XL fy jU fy -yT -Nk +ir +ef Gz Gz GR -fI +XL Yo Pr eY @@ -22400,7 +22189,7 @@ fl eW kS nr -sQ +CP ed BN BN @@ -22418,16 +22207,16 @@ fj Cy Dn kI -fI +XL fy jU fy -Dc +uS Nl Nz Nz Nt -fI +XL Yo eY eY @@ -22602,12 +22391,12 @@ tS wQ kS nr -zg -yk -yk -yk -yk -yA +ly +pU +pU +pU +pU +YC ed ed Dp @@ -22620,16 +22409,16 @@ Tl Cz Dn kI -fI +XL fy jU fy -ss -BL -BL -BL -BL -OV +vf +AG +AG +AG +AG +fO PE eY eY @@ -22809,7 +22598,7 @@ zG Av qa AC -sQ +CP ed ed Dp @@ -22822,7 +22611,7 @@ fj Cy Dn kI -fI +XL fy jU fy @@ -23011,7 +22800,7 @@ fj fj aj aj -sQ +CP ed ed yV @@ -23024,7 +22813,7 @@ qn aj AR kI -fI +XL fy jU fy @@ -23213,7 +23002,7 @@ wC fj fj Cy -sQ +CP ed ed Dp @@ -23226,8 +23015,8 @@ aj Ef Dn kI -FX -BA +HS +YG jU fy fy @@ -23280,11 +23069,11 @@ Df mT mT gM -jL -SQ -SQ -SQ -SL +Js +PK +PK +PK +OC CG Pw CG @@ -23415,7 +23204,7 @@ Bm Op fj yr -sQ +CP ed ed ed @@ -23429,7 +23218,7 @@ BT ed Dp AZ -fI +XL tJ fy fy @@ -23494,7 +23283,7 @@ mT mT mT mT -JH +ot SU nj UP @@ -23617,8 +23406,8 @@ Bu zV fj Cy -zg -yA +ly +YC ed zM ed @@ -23631,7 +23420,7 @@ ed zf Dp IF -fI +XL jU fy fy @@ -23696,7 +23485,7 @@ ks ks ks ks -Tn +Bk SX lk kV @@ -23820,7 +23609,7 @@ rB qn aj BG -sQ +CP ed zM ed @@ -23833,7 +23622,7 @@ ed zf Dp CM -fI +XL jU fy fy @@ -23898,7 +23687,7 @@ ks Ss WX kt -Tn +Bk SX lk kV @@ -24022,7 +23811,7 @@ mY qa Bc zf -sQ +CP ed ed qK @@ -24034,8 +23823,8 @@ ed ed Hn Ic -xR -wx +un +sj jU fy fy @@ -24100,7 +23889,7 @@ HL Ss YE Te -Tn +Bk SX lk kV @@ -24224,7 +24013,7 @@ zW AO pP BU -sQ +CP ed ed qK @@ -24234,9 +24023,9 @@ Bn FO ed GE -xR -BL -wx +un +AG +sj fy jU fy @@ -24245,12 +24034,12 @@ Ga JZ fy Fy -OY -PN -PN -PN -PN -Sa +XT +Pb +Pb +Pb +Pb +tU Sz QU TT @@ -24302,8 +24091,8 @@ ks Ss lU kt -VQ -JC +jC +lz lk kV kV @@ -24424,9 +24213,9 @@ zc fj pc Cz -Bg -BV -Ct +Ti +wd +ZR Dm DB Dz @@ -24435,8 +24224,8 @@ Ey Fd FP sm -GF -Hs +Cb +AP GB GB GB @@ -24505,7 +24294,7 @@ dx ks ks ks -Tn +Bk lk kV kV @@ -24707,7 +24496,7 @@ ks VR SJ kt -Tn +Bk lk kV kV @@ -24828,9 +24617,9 @@ zc fj pc Cz -yn -Ca -Cu +tX +FK +SM Du iP BN @@ -24909,7 +24698,7 @@ Gh lU xl qI -Tn +Bk lk UP kV @@ -25032,7 +24821,7 @@ xt AO Bl BG -sQ +CP rA ed qK @@ -25111,7 +24900,7 @@ Ss lU YE UJ -Tn +Bk lk kV kV @@ -25156,7 +24945,7 @@ ce ce ce ce -jg +Az ce ce ce @@ -25164,7 +24953,7 @@ ce ce ce ce -jg +Az ce ce ce @@ -25234,7 +25023,7 @@ zY qa Bc zf -sQ +CP Dv sm DO @@ -25243,8 +25032,8 @@ sm Fg FU sm -GI -Hv +cN +CF GB GB GB @@ -25313,7 +25102,7 @@ Gh lU Ps kt -Tn +Bk lk kV kV @@ -25436,7 +25225,7 @@ fj qn aj BU -sQ +CP ed qK ed @@ -25446,9 +25235,9 @@ rA rA qK GL -FX -UN -BA +HS +on +YG fy jU fy @@ -25457,12 +25246,12 @@ fy fy fy fy -Pi -PP -KR -KR -KR -Fi +OB +HE +Py +Py +Py +UU uW bW Un @@ -25515,7 +25304,7 @@ ks tP HP kt -Tn +Bk lk kV kV @@ -25637,8 +25426,8 @@ wS fj fj Cy -iv -in +pS +wH ed qK ed @@ -25650,8 +25439,8 @@ qK ed vI If -FX -BA +HS +YG jU fy fy @@ -25717,7 +25506,7 @@ ks ks ks ks -Tn +Bk lk kV kV @@ -25839,7 +25628,7 @@ Bm Op fj yr -sQ +CP ed ed zM @@ -25853,7 +25642,7 @@ ed ed Dp AZ -fI +XL jU fy fy @@ -25918,8 +25707,8 @@ ks lU lU kt -AQ -Bb +sS +Nx lk kV UP @@ -26041,7 +25830,7 @@ wC fj fj Cy -sQ +CP ed ed zf @@ -26055,7 +25844,7 @@ Cx ed Dp IF -fI +XL jU fy fy @@ -26120,7 +25909,7 @@ HL Ss YE Te -Tn +Bk SX lk kV @@ -26243,7 +26032,7 @@ fj fj aj aj -sQ +CP ed ed Dp @@ -26257,7 +26046,7 @@ CU Dn Dp CM -fI +XL jU fy fy @@ -26322,7 +26111,7 @@ ks Ss HP kt -Tn +Bk SX lk kV @@ -26445,7 +26234,7 @@ wX xM qa hJ -sQ +CP ed ed yV @@ -26458,8 +26247,8 @@ qn aj AR kI -xR -wx +un +sj jU fy fy @@ -26524,7 +26313,7 @@ ks dx ks ks -kQ +Gs Gi ti kV @@ -26636,18 +26425,18 @@ aj tl uV uV -iv -yp -yp -yp -yp -yp -yp -yp -yp -yp -yp -in +pS +Ib +Ib +Ib +Ib +Ib +Ib +Ib +Ib +Ib +Ib +wH ed ed Dp @@ -26660,7 +26449,7 @@ fj Cy Dn kI -fI +XL fy jU fy @@ -26726,7 +26515,7 @@ mT mT mT mT -hR +RT kV kV kV @@ -26838,7 +26627,7 @@ sO ts uu sU -sQ +CP ed Cx xN @@ -26862,17 +26651,17 @@ Tl Cz Dn kI -fI +XL fy jU fy fy -yT -UN -UN -UN -UN -TU +ir +on +on +on +on +az OU eY eY @@ -27040,7 +26829,7 @@ ry ho uv sU -sQ +CP Dp pn aj @@ -27064,17 +26853,17 @@ fj Cy Dn kI -fI +XL fy jU fy fy -Dc +uS LI Ny Ny Nn -fI +XL Pt eY eY @@ -27242,7 +27031,7 @@ pe ry ux sU -sQ +CP yV aj aj @@ -27266,17 +27055,17 @@ aj aj AR kI -fI +XL fy jU fy fy -ss -Gm +vf +Md Gz Gz GR -fI +XL Yo eY eY @@ -27444,7 +27233,7 @@ ry rE uz sU -sQ +CP Dp Au fj @@ -27468,7 +27257,7 @@ aj Ef Dn kI -fI +XL fy jU fy @@ -27478,7 +27267,7 @@ Nj GG Kq Nq -fI +XL Yo eY eK @@ -27645,8 +27434,8 @@ rN pe ry sU -iv -in +pS +wH Dp Ar fj @@ -27670,17 +27459,17 @@ xQ BT ed kI -fI +XL fy jU fy fy -yT -Nk +ir +ef Gz Gz GR -fI +XL Yo eK eK @@ -27847,7 +27636,7 @@ ry ry ij sU -sQ +CP ed Dp Au @@ -27862,8 +27651,8 @@ ed ed ed nt -yS -zr +qm +Kw qO Be Be @@ -27872,17 +27661,17 @@ Cx Cx Cx CM -fI +XL fy jU fy fy -Dc +uS Nl Nz Nz Nt -fI +XL Gf eK eK @@ -28049,7 +27838,7 @@ rN pe rE sU -sQ +CP ed yV aj @@ -28063,28 +27852,28 @@ AR ed ed kI -xR -wx -ss -BL -BL -BL -rQ +un +sj +vf +AG +AG +AG +zn Bq Cg CM -xR -wx +un +sj fy jU fy fy -ss -BL -BL -BL -BL -Qc +vf +AG +AG +AG +AG +HC Bz eK eK @@ -28251,7 +28040,7 @@ ry ry dg mT -in +wH ed Dp Xi @@ -28265,17 +28054,17 @@ Dn ed AC kI -fI +XL fy fy fy fy fy -ss -BL -BL -BL -wx +vf +AG +AG +AG +sj fy fy jU @@ -28467,7 +28256,7 @@ ed ed ed kI -fI +XL fy fy fy @@ -28661,15 +28450,15 @@ ed ed Be nt -yS -zr +qm +Kw Jl Be Be Cx Cx Cw -fI +XL fy fy fy @@ -28861,17 +28650,17 @@ ed ed ed kI -xR -BL -wx -ss -BL -BL -rQ +un +AG +sj +vf +AG +AG +zn Bq Cg CM -fI +XL fy fy fy @@ -29063,17 +28852,17 @@ mT ed Bc kI -fI +XL fy fy fy fy fy -ss -BL -BL -BL -wx +vf +AG +AG +AG +sj fy fy vF @@ -29265,7 +29054,7 @@ mT mT mT mT -wx +sj GY fy fy @@ -30492,13 +30281,13 @@ fy LX zw zw -Fw +eE Dt DD DD Do Ih -IN +DT zw zw zw @@ -30694,13 +30483,13 @@ zs Gf eK eK -Jp +wD Dt DD DD Do Ih -IQ +HJ eK eK eK @@ -30896,13 +30685,13 @@ zw Bz eK eK -Jp +wD Dt DD DD Do Ih -IQ +HJ eK eK eK @@ -31098,13 +30887,13 @@ eK eK eK eK -Jp +wD Gd to to Dq Ii -IQ +HJ eK eK eK @@ -31300,13 +31089,13 @@ eK Qa eK eK -Jp +wD Gd to to Dq Ii -IQ +HJ eK eK eK @@ -31320,13 +31109,13 @@ eK eK eK eK -QY -RB -Tc +JY +tZ +oc mT mT mT -Yp +zp PO PO PO @@ -31502,13 +31291,13 @@ eK eK eK eK -Fx +vh Gd to to Dq Ii -IR +Oa Ee Ee Ee @@ -31521,14 +31310,14 @@ Bz eK eK eK -QY -Sb +JY +YD sn sn sn sn sn -FF +QI PO OA PO @@ -31723,14 +31512,14 @@ eK eK eK eK -Jp +wD sn SB Tm Up VJ sn -FF +QI PO PO PO @@ -31916,33 +31705,33 @@ MP Yw Ku Le -pv -RB -RB -RB -RB -RB -RB -RB -RB -QZ +kW +tZ +tZ +tZ +tZ +tZ +tZ +tZ +tZ +qS sn SG Xm Xm Xm WY -Yy -Zh -Zh -Er +nT +lT +lT +Or pu pu pu pu pu -Ac -ip +dw +LV mp aO jQ @@ -33128,26 +32917,26 @@ DM Ec MP Fz -Mj -DP -DP -DP -DP -DP -DP -DP -DP -ZX +en +HD +HD +HD +HD +HD +HD +HD +HD +bn sn Pl Xm Xm ml WY -YA -Zj -Zj -xq +WQ +Ba +Ba +YW jQ jQ jQ @@ -33339,14 +33128,14 @@ QD eK Qa eK -Jp +wD sn sn DJ Uu Wf sn -FF +QI PO PO yt @@ -33541,14 +33330,14 @@ Gf eK eK eK -Rd -ZX +kR +bn sn gG sn sn sn -FF +QI Zn PO yt @@ -33744,13 +33533,13 @@ DE Ee QD eK -Rd -DP -To +kR +HD +JS mT mT mT -FG +jw PO PO yt diff --git a/maps/predship/huntership.dmm b/maps/predship/huntership.dmm index 6e14f4f09ecb..93c46def5428 100644 --- a/maps/predship/huntership.dmm +++ b/maps/predship/huntership.dmm @@ -33,166 +33,12 @@ "af" = ( /turf/closed/wall/cult, /area/yautja) -"ag" = ( -/turf/closed/wall/mineral/sandstone/runed, -/area/yautja) -"ah" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/door/window/southleft, -/obj/item/clothing/shoes/yautja/hunter, -/obj/item/clothing/suit/armor/yautja/hunter, -/obj/item/clothing/mask/gas/yautja/hunter, -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/turf/open/floor/sandstone/runed, -/area/yautja) -"ai" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/door/window/southleft, -/obj/item/clothing/shoes/yautja/hunter, -/obj/item/clothing/suit/armor/yautja/hunter, -/obj/item/clothing/mask/gas/yautja/hunter, -/obj/structure/window/reinforced{ - dir = 8; - health = 80 - }, -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/turf/open/floor/sandstone/runed, -/area/yautja) -"aj" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/door/window/southleft, -/obj/item/clothing/shoes/yautja/hunter, -/obj/item/clothing/suit/armor/yautja/hunter, -/obj/item/clothing/mask/gas/yautja/hunter, -/obj/structure/window/reinforced{ - dir = 8; - health = 80 - }, -/turf/open/floor/sandstone/runed, -/area/yautja) -"ak" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/door/window/southright, -/obj/item/clothing/shoes/yautja/hunter, -/obj/item/clothing/suit/armor/yautja/hunter, -/obj/item/clothing/mask/gas/yautja/hunter, -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/turf/open/floor/sandstone/runed, -/area/yautja) -"al" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/door/window/southright, -/obj/item/clothing/shoes/yautja/hunter, -/obj/item/clothing/suit/armor/yautja/hunter, -/obj/item/clothing/mask/gas/yautja/hunter, -/obj/structure/window/reinforced{ - dir = 8; - health = 80 - }, -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/turf/open/floor/sandstone/runed, -/area/yautja) -"am" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/machinery/door/window/southright, -/obj/item/clothing/shoes/yautja/hunter, -/obj/item/clothing/suit/armor/yautja/hunter, -/obj/item/clothing/mask/gas/yautja/hunter, -/obj/structure/window/reinforced{ - dir = 8; - health = 80 - }, -/turf/open/floor/sandstone/runed, -/area/yautja) "an" = ( /obj/structure/machinery/medical_pod/autodoc{ dir = 4 }, /turf/open/floor/corsat/squareswood/north, /area/yautja) -"ao" = ( -/obj/item/clothing/yautja_cape/ceremonial{ - anchored = 1; - color = "#292b29"; - pixel_x = 2; - pixel_y = 32 - }, -/obj/item/clothing/shoes/yautja/hunter{ - anchored = 1; - color = "#FFE55C"; - icon_state = "y-boots2"; - pixel_y = 29 - }, -/obj/item/clothing/suit/armor/yautja/hunter{ - anchored = 1; - color = "#FFE55C"; - icon_state = "halfarmor_elder_n"; - pixel_y = 30 - }, -/obj/item/clothing/mask/gas/yautja/hunter{ - anchored = 1; - color = "#FFE55C"; - icon_state = "pred_mask_elder_n"; - pixel_y = 29 - }, -/turf/open/floor/corsat/squareswood/north, -/area/yautja) -"ap" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - icon_state = "p_stair_full" - }, -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/turf/open/shuttle/predship, -/area/yautja) -"aq" = ( -/obj/item/clothing/yautja_cape/ceremonial{ - anchored = 1; - color = "#292b29"; - pixel_x = 2; - pixel_y = 32 - }, -/obj/item/clothing/shoes/yautja/hunter{ - anchored = 1; - color = "#FFE55C"; - icon_state = "y-boots2"; - pixel_y = 30 - }, -/obj/item/clothing/suit/armor/yautja/hunter{ - anchored = 1; - color = "#FFE55C"; - icon_state = "halfarmor_elder_joshuu"; - pixel_y = 30 - }, -/obj/item/clothing/mask/gas/yautja/hunter{ - anchored = 1; - color = "#FFE55C"; - icon_state = "pred_mask_elder_joshuu"; - pixel_y = 30 - }, -/turf/open/floor/corsat/squareswood/north, -/area/yautja) -"ar" = ( -/obj/structure/machinery/door/airlock/yautja/secure{ - dir = 1; - name = "\improper Wargear Storage" - }, -/turf/open/shuttle/predship, -/area/yautja) "as" = ( /obj/structure/pipes/standard/simple/hidden{ dir = 6 @@ -232,19 +78,6 @@ /obj/structure/curtain/red, /turf/open/shuttle/predship, /area/yautja) -"ay" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/obj/structure/machinery/door/window/southright, -/obj/item/clothing/suit/armor/yautja/thrall, -/obj/item/clothing/mask/gas/yautja/thrall, -/obj/item/clothing/shoes/yautja/thrall, -/obj/item/clothing/under/chainshirt/thrall, -/turf/open/floor/sandstone/runed, -/area/yautja) "az" = ( /obj/structure/window/phoronreinforced{ dir = 10; @@ -252,42 +85,11 @@ }, /turf/open/floor/light, /area/yautja) -"aA" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/structure/window/reinforced{ - dir = 8; - health = 80 - }, -/obj/structure/machinery/door/window/southright, -/obj/item/clothing/suit/armor/yautja/thrall, -/obj/item/clothing/mask/gas/yautja/thrall, -/obj/item/clothing/shoes/yautja/thrall, -/obj/item/clothing/under/chainshirt/thrall, -/turf/open/floor/sandstone/runed, -/area/yautja) "aB" = ( /obj/structure/closet/crate/critter, /obj/effect/decal/cleanable/blood, /turf/open/floor/strata/grey_multi_tiles, /area/yautja) -"aC" = ( -/obj/structure/surface/rack{ - color = "#6b675e"; - layer = 2.79 - }, -/obj/item/hunting_trap, -/obj/item/hunting_trap, -/obj/item/hunting_trap, -/obj/item/hunting_trap, -/obj/item/hunting_trap, -/obj/item/hunting_trap, -/obj/item/hunting_trap, -/obj/item/hunting_trap, -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/turf/open/floor/corsat/squareswood/north, -/area/yautja) "aD" = ( /obj/structure/xenoautopsy/tank/hugger, /turf/open/floor/corsat/squareswood/north, @@ -359,6 +161,15 @@ /obj/structure/machinery/computer/cryopod/yautja, /turf/open/floor/corsat/squareswood/north, /area/yautja) +"aO" = ( +/obj/structure/surface/table/reinforced/prison{ + color = "#6b675e" + }, +/obj/item/weapon/gun/pistol/m1911/socom{ + pixel_y = 0 + }, +/turf/open/floor/corsat/squareswood/north, +/area/yautja) "aP" = ( /obj/structure/machinery/door/airlock/yautja{ dir = 1; @@ -382,16 +193,6 @@ }, /turf/open/shuttle/predship, /area/yautja) -"aV" = ( -/obj/structure/surface/rack{ - color = "#6b675e"; - layer = 2.79 - }, -/obj/item/weapon/yautja/knife, -/obj/item/reagent_container/hypospray/autoinjector/yautja, -/obj/item/reagent_container/hypospray/autoinjector/yautja, -/turf/open/floor/corsat/squareswood/north, -/area/yautja) "aW" = ( /obj/structure/machinery/optable, /turf/open/floor/corsat/squareswood/north, @@ -462,16 +263,6 @@ /obj/item/stack/sheet/mineral/sandstone/large_stack, /turf/open/floor/corsat/squareswood/north, /area/yautja) -"bh" = ( -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/obj/structure/stairs/perspective{ - color = "#b29082"; - icon_state = "p_stair_full" - }, -/turf/open/shuttle/predship, -/area/yautja) "bj" = ( /turf/closed/wall/huntership, /area/yautja) @@ -487,17 +278,6 @@ }, /turf/open/shuttle/predship, /area/yautja) -"bn" = ( -/obj/structure/surface/rack{ - color = "#6b675e"; - layer = 2.79 - }, -/obj/item/weapon/harpoon/yautja, -/obj/item/weapon/harpoon/yautja, -/obj/item/weapon/harpoon/yautja, -/obj/item/weapon/harpoon/yautja, -/turf/open/floor/corsat/squareswood/north, -/area/yautja) "bo" = ( /obj/structure/machinery/body_scanconsole{ dir = 1 @@ -554,18 +334,6 @@ }, /turf/open/shuttle/predship, /area/yautja) -"by" = ( -/obj/structure/showcase{ - desc = "An ancient, dusty tomb with strange alien writing. It's best not to touch it."; - icon_state = "yaut"; - name = "alien sarcophagus" - }, -/obj/item/clothing/mask/gas/yautja/hunter{ - anchored = 1; - pixel_y = 20 - }, -/turf/open/floor/corsat/squareswood/north, -/area/yautja) "bz" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -654,23 +422,6 @@ name = "runed hull" }, /area/yautja) -"bO" = ( -/obj/structure/bed/alien{ - color = "#aba9a9" - }, -/turf/open/floor/corsat/squareswood/north, -/area/yautja) -"bQ" = ( -/obj/structure/surface/table/reinforced/prison{ - color = "#6b675e" - }, -/obj/item/weapon/zombie_claws{ - anchored = 1; - desc = "Claws from a creature that defies nature, you dare not touch it."; - force = 1 - }, -/turf/open/floor/corsat/squareswood/north, -/area/yautja) "bS" = ( /obj/structure/pipes/standard/simple/hidden{ dir = 9 @@ -729,19 +480,6 @@ /obj/item/stack/sheet/xenochitin, /turf/open/floor/corsat/squareswood/north, /area/yautja) -"bZ" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/turf/open/shuttle/predship, -/area/yautja) -"ca" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - icon_state = "p_stair_full" - }, -/turf/open/shuttle/predship, -/area/yautja) "cb" = ( /obj/structure/machinery/door_control{ id = "Cell Lockdown 2"; @@ -1311,10 +1049,6 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/strata/grey_multi_tiles, /area/yautja) -"cZ" = ( -/obj/structure/machinery/prop/almayer/CICmap/yautja, -/turf/open/floor/strata/grey_multi_tiles/southwest, -/area/yautja) "da" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -1418,12 +1152,29 @@ "dw" = ( /turf/open/gm/dirtgrassborder/south, /area/yautja) +"dz" = ( +/obj/structure/machinery/cm_vending/clothing/yautja/left_centre, +/turf/open/floor/strata/grey_multi_tiles, +/area/yautja) +"dD" = ( +/obj/structure/stairs/perspective{ + color = "#6b675e"; + dir = 8; + icon_state = "p_stair_full" + }, +/obj/item/clothing/mask/gas/yautja/hunter{ + pixel_y = 27; + anchored = 1 + }, +/obj/structure/platform/metal/stair_cut/kutjevo_smooth_left, +/turf/open/shuttle/predship, +/area/yautja) "dI" = ( /turf/open/space/basic, /area/space) -"dS" = ( -/obj/structure/platform/kutjevo{ - dir = 1 +"ef" = ( +/obj/structure/surface/table/reinforced/prison{ + color = "#6b675e" }, /turf/open/shuttle/predship, /area/yautja) @@ -1441,6 +1192,14 @@ }, /turf/open/floor/corsat/squareswood/north, /area/yautja) +"es" = ( +/obj/structure/machinery/cm_vending/clothing/yautja/elder/right, +/turf/open/shuttle/predship, +/area/yautja) +"et" = ( +/obj/structure/platform/metal/kutjevo_smooth/north, +/turf/open/floor/corsat/squareswood/north, +/area/yautja) "eS" = ( /obj/item/stack/sheet/animalhide/xeno{ anchored = 1; @@ -1654,6 +1413,17 @@ }, /turf/open/gm/dirtgrassborder/weedable/grass1, /area/yautja) +"hL" = ( +/obj/structure/surface/rack{ + color = "#6b675e"; + layer = 2.79 + }, +/obj/item/weapon/harpoon/yautja, +/obj/item/weapon/harpoon/yautja, +/obj/item/weapon/harpoon/yautja, +/obj/item/weapon/harpoon/yautja, +/turf/open/floor/strata/grey_multi_tiles, +/area/yautja) "hY" = ( /obj/structure/kitchenspike, /obj/item/reagent_container/food/snacks/meat, @@ -1662,6 +1432,27 @@ /obj/item/reagent_container/food/snacks/meat, /turf/open/floor/darkred2/west, /area/yautja) +"ig" = ( +/obj/item/clothing/yautja_cape/ceremonial{ + anchored = 1; + color = "#292b29"; + pixel_x = 2; + pixel_y = 32 + }, +/obj/item/clothing/suit/armor/yautja/hunter{ + anchored = 1; + color = "#FFE55C"; + icon_state = "halfarmor_elder_n"; + pixel_y = 30 + }, +/obj/item/clothing/mask/gas/yautja/hunter{ + anchored = 1; + color = "#FFE55C"; + icon_state = "pred_mask_elder_n"; + pixel_y = 40 + }, +/turf/open/floor/corsat/squareswood/north, +/area/yautja) "is" = ( /obj/structure/kitchenspike, /obj/item/reagent_container/food/snacks/sliceable/xenomeatbread, @@ -1673,16 +1464,6 @@ /obj/item/reagent_container/food/snacks/sliceable/xenomeatbread, /turf/open/floor/darkred2/west, /area/yautja) -"iL" = ( -/obj/structure/stairs/perspective{ - color = "#b29082"; - icon_state = "p_stair_full" - }, -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/turf/open/shuttle/predship, -/area/yautja) "iV" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -1736,14 +1517,22 @@ }, /turf/open/floor/corsat/squareswood/north, /area/yautja) -"kA" = ( -/obj/structure/surface/table/reinforced/prison{ - color = "#6b675e" - }, -/obj/item/weapon/twohanded/dualsaber{ - force_wielded = 35 +"ko" = ( +/obj/structure/machinery/cm_vending/clothing/yautja/elder, +/obj/structure/machinery/cm_vending/clothing/yautja/elder/right, +/turf/open/shuttle/predship, +/area/yautja) +"ku" = ( +/obj/structure/stairs/perspective{ + color = "#6b675e"; + icon_state = "p_stair_full" }, -/turf/open/floor/corsat/squareswood/north, +/obj/structure/platform/metal/kutjevo_smooth/west, +/turf/open/floor/strata/grey_multi_tiles, +/area/yautja) +"kI" = ( +/obj/structure/platform/metal/kutjevo_smooth/east, +/turf/open/shuttle/predship, /area/yautja) "lr" = ( /obj/structure/lamarr, @@ -1752,6 +1541,10 @@ "lw" = ( /turf/open/gm/dirtgrassborder/desert1, /area/yautja) +"mm" = ( +/obj/structure/machinery/cm_vending/clothing/yautja/right_centre, +/turf/open/floor/strata/grey_multi_tiles, +/area/yautja) "mn" = ( /obj/structure/surface/rack{ color = "#6b675e"; @@ -1835,27 +1628,16 @@ /obj/item/weapon/twohanded/yautja/spear, /turf/open/floor/strata/grey_multi_tiles, /area/yautja) -"nT" = ( -/obj/structure/surface/table/reinforced/prison{ - color = "#6b675e" - }, -/obj/structure/window/reinforced{ - dir = 4; - health = 80 - }, -/obj/structure/window/reinforced{ - dir = 8; - health = 80 - }, -/obj/structure/machinery/door/window/southright, -/turf/open/floor/corsat/squareswood/north, -/area/yautja) "nW" = ( /obj/structure/pipes/standard/simple/hidden{ dir = 6 }, /turf/open/shuttle/predship, /area/yautja) +"nX" = ( +/obj/structure/machinery/cm_vending/clothing/yautja/right, +/turf/open/floor/strata/grey_multi_tiles, +/area/yautja) "ob" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -1865,16 +1647,6 @@ }, /turf/open/floor/strata/grey_multi_tiles, /area/yautja) -"og" = ( -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/obj/structure/stairs/perspective{ - color = "#b29082"; - icon_state = "p_stair_full" - }, -/turf/open/shuttle/predship, -/area/yautja) "ov" = ( /obj/structure/surface/rack{ color = "#6b675e"; @@ -1889,6 +1661,12 @@ /obj/item/stack/yautja_rope, /turf/open/floor/corsat/squareswood/north, /area/yautja) +"oC" = ( +/obj/structure/bed/alien{ + color = "#aba9a9" + }, +/turf/open/shuttle/predship, +/area/yautja) "oO" = ( /obj/item/weapon/yautja/chain{ anchored = 1; @@ -1898,6 +1676,33 @@ }, /turf/open/floor/strata/grey_multi_tiles, /area/yautja) +"pF" = ( +/obj/structure/surface/table/reinforced/prison{ + color = "#6b675e" + }, +/obj/item/reagent_container/blood/OMinus, +/obj/item/reagent_container/blood/OMinus, +/obj/item/reagent_container/blood/OMinus, +/obj/item/reagent_container/blood/OMinus, +/obj/item/reagent_container/blood/OMinus, +/turf/open/floor/corsat/squareswood/north, +/area/yautja) +"pN" = ( +/obj/structure/closet/crate{ + color = "#6b675e" + }, +/turf/open/floor/corsat/squareswood/north, +/area/yautja) +"pW" = ( +/obj/structure/surface/rack{ + color = "#6b675e"; + layer = 2.79 + }, +/obj/item/weapon/yautja/knife, +/obj/item/reagent_container/hypospray/autoinjector/yautja, +/obj/item/reagent_container/hypospray/autoinjector/yautja, +/turf/open/floor/strata/grey_multi_tiles, +/area/yautja) "qj" = ( /obj/structure/surface/rack{ color = "#6b675e"; @@ -1906,6 +1711,12 @@ /obj/item/tool/crowbar, /turf/open/floor/corsat/squareswood/north, /area/yautja) +"qp" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/turf/open/shuttle/predship, +/area/yautja) "qS" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -2001,6 +1812,10 @@ }, /turf/open/floor/corsat/squareswood/north, /area/yautja) +"sT" = ( +/obj/structure/curtain/red, +/turf/open/floor/strata/grey_multi_tiles, +/area/yautja) "sV" = ( /obj/structure/machinery/door/airlock/yautja{ dir = 1; @@ -2100,6 +1915,10 @@ /obj/item/frame/table/gambling, /turf/open/floor/corsat/squareswood/north, /area/yautja) +"ul" = ( +/obj/structure/platform_decoration/metal/kutjevo_smooth/west, +/turf/open/floor/corsat/squareswood/north, +/area/yautja) "um" = ( /obj/structure/surface/rack{ color = "#6b675e"; @@ -2127,6 +1946,10 @@ /obj/item/weapon/sword/ceremonial, /turf/open/floor/corsat/squareswood/north, /area/yautja) +"vC" = ( +/obj/structure/platform_decoration/metal/kutjevo_smooth/east, +/turf/open/shuttle/predship, +/area/yautja) "vO" = ( /obj/structure/machinery/shower{ dir = 4 @@ -2253,6 +2076,14 @@ }, /turf/open/gm/dirtgrassborder/east, /area/yautja) +"zj" = ( +/obj/structure/machinery/cm_vending/clothing/yautja/elder, +/turf/open/shuttle/predship, +/area/yautja) +"zs" = ( +/obj/structure/bed/chair/comfy/black, +/turf/open/shuttle/predship, +/area/yautja) "zA" = ( /turf/open/floor/dark2, /area/yautja) @@ -2285,6 +2116,10 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/corsat/squareswood/north, /area/yautja) +"Bd" = ( +/obj/structure/platform_decoration/metal/kutjevo_smooth/west, +/turf/open/shuttle/predship, +/area/yautja) "Be" = ( /obj/structure/machinery/cryopod/no_store/right, /turf/open/shuttle/predship, @@ -2302,6 +2137,10 @@ /obj/item/weapon/yautja/chained/combistick, /turf/open/floor/strata/grey_multi_tiles, /area/yautja) +"Bk" = ( +/obj/structure/machinery/cm_vending/clothing/yautja, +/turf/open/floor/strata/grey_multi_tiles, +/area/yautja) "Br" = ( /turf/open/gm/dirtgrassborder/desert2, /area/yautja) @@ -2346,6 +2185,20 @@ }, /turf/open/floor/corsat/squareswood/north, /area/yautja) +"CQ" = ( +/obj/structure/platform_decoration/metal/kutjevo_smooth/north, +/turf/open/shuttle/predship, +/area/yautja) +"CT" = ( +/obj/structure/surface/rack{ + color = "#6b675e"; + layer = 2.79 + }, +/obj/item/stack/yautja_rope, +/obj/item/stack/yautja_rope, +/obj/item/stack/yautja_rope, +/turf/open/floor/strata/grey_multi_tiles, +/area/yautja) "Dk" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -2364,6 +2217,19 @@ /obj/structure/blocker/invisible_wall, /turf/open/space, /area/yautja) +"Dw" = ( +/obj/structure/stairs/perspective{ + color = "#6b675e"; + dir = 8; + icon_state = "p_stair_full" + }, +/obj/item/clothing/mask/gas/yautja/hunter{ + pixel_y = 27; + anchored = 1 + }, +/obj/structure/platform/metal/stair_cut/kutjevo_smooth_right, +/turf/open/shuttle/predship, +/area/yautja) "DF" = ( /obj/item/reagent_container/food/snacks/xenomeatbreadslice, /obj/item/reagent_container/food/snacks/xenomeatbreadslice, @@ -2447,6 +2313,14 @@ }, /turf/open/floor/corsat/squareswood/north, /area/yautja) +"Go" = ( +/obj/item/weapon/yautja/knife{ + name = "sacred ceremonial dagger"; + pixel_y = 34; + anchored = 1 + }, +/turf/open/floor/strata/grey_multi_tiles, +/area/yautja) "Gr" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -2480,12 +2354,6 @@ "GM" = ( /turf/open/gm/dirtgrassborder/desert_dug, /area/yautja) -"GP" = ( -/obj/structure/prop/brazier/torch{ - pixel_y = -2 - }, -/turf/closed/wall/mineral/sandstone/runed, -/area/yautja) "GY" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -2614,6 +2482,10 @@ }, /turf/open/shuttle/predship, /area/yautja) +"IV" = ( +/obj/structure/machinery/cm_vending/clothing/yautja/centre, +/turf/open/floor/strata/grey_multi_tiles, +/area/yautja) "Je" = ( /obj/structure/surface/rack{ color = "#6b675e"; @@ -2651,6 +2523,33 @@ }, /turf/open/floor/corsat/squareswood/north, /area/yautja) +"Jg" = ( +/obj/structure/closet/crate{ + color = "#6b675e" + }, +/obj/item/bracer_attachments/scimitars, +/obj/item/bracer_attachments/scimitars, +/obj/item/bracer_attachments/scimitars_alt, +/obj/item/bracer_attachments/scimitars_alt, +/obj/item/bracer_attachments/scimitars, +/obj/item/bracer_attachments/scimitars, +/obj/item/bracer_attachments/scimitars, +/obj/item/bracer_attachments/scimitars, +/turf/open/floor/strata/grey_multi_tiles, +/area/yautja) +"JC" = ( +/obj/structure/stairs/perspective{ + color = "#6b675e"; + dir = 10; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/stair_cut/kutjevo_smooth_right, +/obj/item/clothing/mask/gas/yautja/hunter{ + pixel_y = 27; + anchored = 1 + }, +/turf/open/floor/strata/grey_multi_tiles, +/area/yautja) "JH" = ( /turf/open/floor/strata/grey_multi_tiles, /area/yautja) @@ -2662,6 +2561,30 @@ }, /turf/open/floor/corsat/squareswood/north, /area/yautja) +"JZ" = ( +/obj/structure/machinery/prop/almayer/CICmap/yautja{ + pixel_y = 2 + }, +/turf/open/floor/strata/grey_multi_tiles, +/area/yautja) +"Ku" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 1 + }, +/turf/open/shuttle/predship, +/area/yautja) +"Kx" = ( +/obj/structure/showcase{ + desc = "An ancient, dusty tomb with strange alien writing. It's best not to touch it."; + icon_state = "yaut"; + name = "alien sarcophagus" + }, +/obj/item/clothing/mask/gas/yautja/hunter{ + anchored = 1; + pixel_y = 20 + }, +/turf/open/floor/corsat/squareswood/north, +/area/yautja) "KD" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -2725,6 +2648,21 @@ }, /turf/open/floor/corsat/squareswood/north, /area/yautja) +"Mz" = ( +/obj/structure/surface/rack{ + color = "#6b675e"; + layer = 2.79 + }, +/obj/item/hunting_trap, +/obj/item/hunting_trap, +/obj/item/hunting_trap, +/obj/item/hunting_trap, +/obj/item/hunting_trap, +/obj/item/hunting_trap, +/obj/item/hunting_trap, +/obj/item/hunting_trap, +/turf/open/floor/strata/grey_multi_tiles, +/area/yautja) "ME" = ( /obj/structure/stairs/perspective{ color = "#6b675e"; @@ -2742,6 +2680,25 @@ "NA" = ( /turf/open/floor/darkred2, /area/yautja) +"NS" = ( +/obj/structure/machinery/prop/almayer/CICmap/yautja{ + pixel_y = 2 + }, +/turf/open/floor/strata/grey_multi_tiles/southwest, +/area/yautja) +"Oj" = ( +/obj/structure/stairs/perspective{ + color = "#6b675e"; + dir = 6; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/stair_cut/kutjevo_smooth_left, +/obj/item/clothing/mask/gas/yautja/hunter{ + pixel_y = 27; + anchored = 1 + }, +/turf/open/floor/strata/grey_multi_tiles, +/area/yautja) "Ok" = ( /turf/open/gm/dirtgrassborder/desert, /area/yautja) @@ -2777,14 +2734,15 @@ }, /turf/open/floor/strata/grey_multi_tiles, /area/yautja) -"PN" = ( -/obj/item/stack/sheet/animalhide/xeno{ - anchored = 1; - name = "Spitter Hide"; - pixel_y = 30 - }, -/turf/open/shuttle/predship, -/area/yautja) +"Pv" = ( +/obj/structure/stairs/perspective{ + color = "#6b675e"; + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/kutjevo_smooth, +/turf/open/floor/strata/grey_multi_tiles, +/area/yautja) "Qi" = ( /obj/structure/machinery/gibber, /turf/open/floor/darkred2/southeast, @@ -2811,20 +2769,21 @@ }, /turf/open/floor/corsat/squareswood/north, /area/yautja) -"QK" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 +"Rj" = ( +/obj/structure/surface/table/reinforced/prison{ + color = "#6b675e" }, -/turf/open/shuttle/predship, -/area/yautja) -"Rq" = ( -/obj/structure/machinery/prop/almayer/CICmap/yautja, -/turf/open/floor/strata/grey_multi_tiles, +/obj/item/weapon/gun/pistol/heavy/co/gold, +/turf/open/floor/corsat/squareswood/north, /area/yautja) "RE" = ( /obj/structure/closet/secure_closet/freezer/fridge/groceries, /turf/open/floor/darkred2/southeast, /area/yautja) +"RG" = ( +/obj/structure/platform_decoration/metal/kutjevo_smooth/east, +/turf/open/floor/corsat/squareswood/north, +/area/yautja) "RS" = ( /turf/open/gm/dirtgrassborder/north, /area/yautja) @@ -2837,23 +2796,17 @@ }, /turf/open/shuttle/predship, /area/yautja) -"SM" = ( -/obj/structure/surface/rack{ +"SW" = ( +/obj/structure/platform_decoration/metal/kutjevo_smooth, +/turf/open/shuttle/predship, +/area/yautja) +"TR" = ( +/obj/structure/stairs/perspective{ color = "#6b675e"; - layer = 2.79 - }, -/obj/item/hunting_trap, -/obj/item/hunting_trap, -/obj/item/hunting_trap, -/obj/item/hunting_trap, -/obj/item/hunting_trap, -/obj/item/hunting_trap, -/obj/item/hunting_trap, -/obj/item/hunting_trap, -/obj/structure/platform/kutjevo{ - dir = 4 + icon_state = "p_stair_full" }, -/turf/open/floor/corsat/squareswood/north, +/obj/structure/platform/metal/kutjevo_smooth/east, +/turf/open/floor/strata/grey_multi_tiles, /area/yautja) "Ut" = ( /obj/structure/surface/rack{ @@ -2890,6 +2843,10 @@ }, /turf/open/shuttle/predship, /area/yautja) +"UJ" = ( +/obj/structure/platform/metal/kutjevo_smooth/east, +/turf/open/floor/corsat/squareswood/north, +/area/yautja) "UR" = ( /obj/structure/stairs/perspective{ color = "#6b675e"; @@ -2956,6 +2913,10 @@ /obj/item/tool/kitchen/utensil/spoon, /turf/open/floor/corsat/squareswood/north, /area/yautja) +"Xc" = ( +/obj/structure/platform/metal/kutjevo_smooth/west, +/turf/open/floor/corsat/squareswood/north, +/area/yautja) "Xg" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -2967,6 +2928,12 @@ }, /turf/open/floor/corsat/squareswood/north, /area/yautja) +"Xl" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 8 + }, +/turf/open/shuttle/predship, +/area/yautja) "Xp" = ( /obj/structure/surface/rack{ color = "#6b675e"; @@ -3006,6 +2973,27 @@ }, /turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/yautja) +"XA" = ( +/obj/item/clothing/yautja_cape/ceremonial{ + anchored = 1; + color = "#292b29"; + pixel_x = 2; + pixel_y = 32 + }, +/obj/item/clothing/suit/armor/yautja/hunter{ + anchored = 1; + color = "#FFE55C"; + icon_state = "halfarmor_elder_joshuu"; + pixel_y = 30 + }, +/obj/item/clothing/mask/gas/yautja/hunter{ + anchored = 1; + color = "#FFE55C"; + icon_state = "pred_mask_elder_joshuu"; + pixel_y = 40 + }, +/turf/open/floor/corsat/squareswood/north, +/area/yautja) "XP" = ( /obj/structure/machinery/cryopod/no_store, /turf/open/floor/strata/grey_multi_tiles, @@ -3021,15 +3009,16 @@ }, /turf/open/shuttle/predship, /area/yautja) -"YM" = ( -/turf/closed/wall/mineral/sandstone/runed/decor, -/area/yautja) "Zi" = ( /obj/structure/sink{ pixel_y = 25 }, /turf/open/shuttle/predship, /area/yautja) +"Zq" = ( +/obj/structure/platform/metal/kutjevo_smooth/west, +/turf/open/shuttle/predship, +/area/yautja) "Zs" = ( /obj/structure/machinery/door/airlock/yautja/secure{ name = "\improper Heavy Armory" @@ -3063,14 +3052,8 @@ }, /turf/open/floor/corsat/squareswood/north, /area/yautja) -"ZR" = ( -/obj/structure/surface/rack{ - color = "#6b675e"; - layer = 2.79 - }, -/obj/item/stack/yautja_rope, -/obj/item/stack/yautja_rope, -/obj/item/stack/yautja_rope, +"ZQ" = ( +/obj/structure/machinery/iv_drip, /turf/open/floor/corsat/squareswood/north, /area/yautja) @@ -4171,7 +4154,7 @@ bj as bJ aY -ZM +pF cj bL an @@ -4456,7 +4439,7 @@ aa ae bj bj -bL +ZQ bL bL bj @@ -4887,9 +4870,9 @@ bj bj bj bj -bj -bj -bj +sx +sx +sx bj bj bj @@ -4952,18 +4935,18 @@ aa aa ac bj -bN -ZR -aV -bn bj -av -ZM -bO +CT +pW +hL bj -av +bj +ZM +pN +bL +pN ZM -bO +bj bj wQ cP @@ -5024,18 +5007,18 @@ aa aa ae bj -bN -SM -QK -bL bj -bL -SB -bL +cP +JH +Mz bj -bL -SB -bL +et +FG +FG +FG +FG +cP +wQ bj wQ cP @@ -5096,18 +5079,18 @@ aa aa ad bj -ag -GP -dS -bL -bj -bL +zj cP -bL -bj -bL +JH +JH +ku +RG +oC +oC +oC +oC cP -bL +wQ bj KD bL @@ -5168,18 +5151,18 @@ aa bj bj bj -ay -og -bZ +ko +cP +cP +JH +df bL bj -eS -cP -KK +bj +bj bj eS -cP -Uv +wQ bj BS JH @@ -5240,18 +5223,18 @@ aa aa ac bj -aA -bh -QK -bL bj -nT +kI +Bd cP +df bL -bj -nT +zs +ef +ef +Ku cP -bL +wQ bj JH JH @@ -5312,18 +5295,18 @@ aa aa ad bj -ag -YM -dS -bL bj -fg -cP -bL bj -fg +JC cP -bL +TR +UJ +Bd +Xl +Xl +SW +kI +bj bj JH bL @@ -5360,7 +5343,7 @@ bL bL jP bj -aq +XA cP cP cP @@ -5384,21 +5367,21 @@ aa bj bj bj -ah -ap -bZ -bL -bj bj -aw +Go +df +cP bj bj +Dw +ME +ME +Pv bj -aw bj bj JH -bQ +Rj ab cP cP @@ -5456,17 +5439,17 @@ aa aa ac bj -ai -ca +Bk +JH +df cP +bj bL -bL -ti -FG cP cP cP -FG +cP +cP ti JH JH @@ -5528,12 +5511,12 @@ aa aa ae bj -aj -iL -QK -cP +dz +JH +df +JH +sT cP -ar cP Fh Fh @@ -5600,15 +5583,15 @@ aa aa ae bj -ag -GP -dS -bL -bL -ti +IV +cP +df +cP +aw +cP cP Fh -cZ +NS Fh cP ti @@ -5650,7 +5633,7 @@ cP cP sx JH -Rq +JZ JH sx cP @@ -5672,12 +5655,12 @@ aa aa ae bj -ak -ap -bZ -cP +mm +JH +df +JH +sT cP -ar cP Fh Fh @@ -5744,17 +5727,17 @@ aa aa ad bj -al -ca +nX +JH +df cP +bj bL -bL -ti -FG cP cP cP -FG +cP +cP ti JH JH @@ -5816,17 +5799,17 @@ aa bj bj bj -am -iL -QK -bL -bj bj -aw +Go +df +cP bj bj +dD +ME +ME +Pv bj -aw bj bj JH @@ -5888,22 +5871,22 @@ aa aa ac bj -ag -YM -dS -bL bj -fg -cP -bL bj -fg +Oj cP -bL +ku +Xc +vC +qp +qp +CQ +Zq +bj bj JH bL -kA +aO bL bL cP @@ -5936,7 +5919,7 @@ bL bL fF bj -ao +ig cP cP cP @@ -5960,18 +5943,18 @@ aa aa ad bj -ay -ap -bZ -bL bj -nT +Zq +vC cP +df bL -bj -nT +zs +ef +ef +Ku cP -bL +wQ bj JH JH @@ -6032,18 +6015,18 @@ aa bj bj bj -aA -iL -QK +zj +cP +cP +JH +df bL bj -ww -cP -Uv bj -PN -cP -KK +bj +bj +ww +wQ bj bL JH @@ -6104,18 +6087,18 @@ aa aa ac bj -ag -GP -dS -bL -bj -bL +es cP -bL -bj -bL +JH +JH +TR +ul +oC +oC +oC +oC cP -bL +wQ bj bL bL @@ -6176,18 +6159,18 @@ aa aa ae bj -bN -aC -bZ -bL bj -bL -eY -bL +cP +JH +Mz bj -bL -eY -bL +et +FG +FG +FG +FG +cP +wQ bj cQ cP @@ -6248,18 +6231,18 @@ aa aa ad bj -bN -ZR -aV -bn bj -av -ZM -bO +CT +pW +hL +bj bj -av ZM -bO +pN +bL +pN +ZM +bj bj tD cP @@ -6327,9 +6310,9 @@ bj bj bj bj -bj -bj -bj +sx +sx +sx bj bj bj @@ -6782,7 +6765,7 @@ bv bv bv bj -gb +Jg JH JH JH @@ -6999,7 +6982,7 @@ gG bL Fy dl -JH +gb bj bj bj @@ -7064,11 +7047,11 @@ bj cP cP bj -by +Kx bj -by +Kx bj -by +Kx bj bj bj diff --git a/maps/shuttles/dropship_devana.dmm b/maps/shuttles/dropship_devana.dmm new file mode 100644 index 000000000000..5f09c8db9c25 --- /dev/null +++ b/maps/shuttles/dropship_devana.dmm @@ -0,0 +1,855 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aq" = ( +/turf/closed/shuttle/upp_dropship2{ + icon_state = "32" + }, +/area/shuttle/drop_upp2/devana) +"ar" = ( +/obj/structure/blocker/invisible_wall, +/turf/closed/shuttle/upp_dropship2{ + icon_state = "93a" + }, +/area/shuttle/drop_upp2/devana) +"aw" = ( +/turf/closed/shuttle/upp_dropship2{ + icon_state = "38" + }, +/area/shuttle/drop_upp2/devana) +"aQ" = ( +/obj/structure/machinery/computer/shuttle/dropship/flight/upp{ + req_one_access = list(235, 240) + }, +/obj/structure/blocker/invisible_wall, +/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/area/shuttle/drop_upp2/devana) +"aT" = ( +/turf/closed/shuttle/upp_dropship2{ + icon_state = "53"; + dir = 1 + }, +/area/shuttle/drop_upp2/devana) +"bM" = ( +/obj/structure/platform/metal/strata/north, +/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/area/shuttle/drop_upp2/devana) +"bT" = ( +/turf/closed/shuttle/upp_dropship2/transparent{ + icon_state = "86" + }, +/area/shuttle/drop_upp2/devana) +"cU" = ( +/obj/structure/shuttle/part/dropshipupp2/left_outer_wing_connector{ + icon_state = "tail_3_red" + }, +/turf/template_noop, +/area/shuttle/drop_upp2/devana) +"da" = ( +/turf/closed/shuttle/upp_dropship2/transparent{ + icon_state = "78" + }, +/area/shuttle/drop_upp2/devana) +"dl" = ( +/obj/item/device/radio/intercom/devana{ + pixel_y = 26 + }, +/turf/open/shuttle/dropship/light_grey_top_right, +/area/shuttle/drop_upp2/devana) +"dV" = ( +/obj/effect/attach_point/crew_weapon/dropship_upp2, +/obj/item/device/radio/intercom/devana{ + pixel_y = 26 + }, +/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/area/shuttle/drop_upp2/devana) +"er" = ( +/obj/structure/shuttle/part/dropshipupp2/transparent/nose_top_left, +/turf/template_noop, +/area/shuttle/drop_upp2/devana) +"eN" = ( +/obj/item/device/radio/intercom/devana{ + pixel_y = 26 + }, +/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/area/shuttle/drop_upp2/devana) +"fp" = ( +/obj/structure/stairs, +/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/area/shuttle/drop_upp2/devana) +"fs" = ( +/turf/closed/shuttle/upp_dropship2{ + icon_state = "81" + }, +/area/shuttle/drop_upp2/devana) +"fK" = ( +/obj/structure/shuttle/part/dropshipupp2/left_inner_wing_connector, +/turf/template_noop, +/area/shuttle/drop_upp2/devana) +"fN" = ( +/turf/closed/shuttle/upp_dropship2{ + icon_state = "23" + }, +/area/shuttle/drop_upp2/devana) +"gz" = ( +/turf/closed/shuttle/upp_dropship2{ + icon_state = "30" + }, +/area/shuttle/drop_upp2/devana) +"hK" = ( +/turf/closed/shuttle/upp_dropship2{ + icon_state = "64" + }, +/area/shuttle/drop_upp2/devana) +"ja" = ( +/turf/closed/shuttle/upp_dropship2{ + icon_state = "29" + }, +/area/shuttle/drop_upp2/devana) +"ju" = ( +/turf/open/shuttle/dropship/light_grey_left_to_right, +/area/shuttle/drop_upp2/devana) +"lj" = ( +/obj/structure/shuttle/part/dropshipupp2/lower_right_wall, +/turf/template_noop, +/area/shuttle/drop_upp2/devana) +"lM" = ( +/obj/structure/shuttle/part/dropshipupp2/transparent/right_inner_bottom_wing{ + icon_state = "tail_5_red" + }, +/turf/template_noop, +/area/shuttle/drop_upp2/devana) +"mb" = ( +/turf/closed/shuttle/upp_dropship2/transparent{ + icon_state = "98" + }, +/area/shuttle/drop_upp2/devana) +"mh" = ( +/obj/item/device/radio/intercom/devana{ + pixel_y = 50; + pixel_x = 32 + }, +/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/area/shuttle/drop_upp2/devana) +"mO" = ( +/obj/structure/shuttle/part/dropshipupp2/transparent/outer_left_weapons, +/obj/effect/attach_point/weapon/dropship_upp2/left_fore, +/turf/template_noop, +/area/shuttle/drop_upp2/devana) +"nn" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/upp2{ + id = "aft_door" + }, +/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/area/shuttle/drop_upp2/devana) +"oi" = ( +/turf/closed/shuttle/upp_dropship2/transparent{ + icon_state = "89" + }, +/area/shuttle/drop_upp2/devana) +"oG" = ( +/obj/structure/shuttle/part/dropshipupp2/nose_front_left, +/turf/template_noop, +/area/shuttle/drop_upp2/devana) +"pC" = ( +/turf/open/shuttle/dropship/light_grey_top_right, +/area/shuttle/drop_upp2/devana) +"qc" = ( +/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/area/shuttle/drop_upp2/devana) +"qB" = ( +/turf/closed/shuttle/upp_dropship2{ + icon_state = "47" + }, +/area/shuttle/drop_upp2/devana) +"qV" = ( +/obj/structure/shuttle/part/dropshipupp2/transparent/engine_right_cap, +/turf/template_noop, +/area/shuttle/drop_upp2/devana) +"rf" = ( +/obj/structure/shuttle/part/dropshipupp2/transparent/middle_left_wing{ + icon_state = "upp_wing_left_red_logo" + }, +/obj/structure/machinery/light/dropship/red{ + dir = 8 + }, +/turf/template_noop, +/area/shuttle/drop_upp2/devana) +"rV" = ( +/obj/effect/attach_point/crew_weapon/dropship_upp2, +/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/area/shuttle/drop_upp2/devana) +"sC" = ( +/obj/structure/shuttle/part/dropshipupp2/transparent/nose_center, +/turf/template_noop, +/area/shuttle/drop_upp2/devana) +"te" = ( +/obj/effect/attach_point/fuel/dropship_upp2{ + dir = 1 + }, +/turf/closed/shuttle/upp_dropship2{ + icon_state = "28" + }, +/area/shuttle/drop_upp2/devana) +"ti" = ( +/obj/structure/shuttle/part/dropshipupp2/transparent/nose_top_right, +/turf/template_noop, +/area/shuttle/drop_upp2/devana) +"tP" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/shuttle/dropship/light_grey_single_wide_up_to_down, +/area/shuttle/drop_upp2/devana) +"tX" = ( +/turf/closed/shuttle/upp_dropship2{ + icon_state = "39" + }, +/area/shuttle/drop_upp2/devana) +"uw" = ( +/obj/structure/shuttle/part/dropshipupp2/lower_left_wall, +/turf/template_noop, +/area/shuttle/drop_upp2/devana) +"uB" = ( +/obj/structure/shuttle/part/dropshipupp2/transparent/lower_left_wing{ + icon_state = "upp_wing_eng_left_red" + }, +/obj/effect/attach_point/weapon/dropship_upp2/left_wing, +/turf/template_noop, +/area/shuttle/drop_upp2/devana) +"uR" = ( +/turf/closed/shuttle/upp_dropship2{ + icon_state = "27" + }, +/area/shuttle/drop_upp2/devana) +"uX" = ( +/obj/structure/machinery/door_control{ + name = "Dropship Lockdown"; + pixel_y = -19; + id = "dropship_korolev"; + throw_range = 15; + normaldoorcontrol = 3; + req_one_access_txt = "235;240" + }, +/turf/open/shuttle/dropship/light_grey_left_to_right, +/area/shuttle/drop_upp2/devana) +"vy" = ( +/obj/structure/shuttle/part/dropshipupp2/transparent/middle_right_wing{ + icon_state = "upp_wing_right_red_logo" + }, +/obj/structure/machinery/light/dropship/green{ + dir = 4 + }, +/turf/template_noop, +/area/shuttle/drop_upp2/devana) +"vZ" = ( +/turf/closed/shuttle/upp_dropship2{ + icon_state = "22" + }, +/area/shuttle/drop_upp2/devana) +"wa" = ( +/turf/closed/shuttle/upp_dropship2{ + icon_state = "10" + }, +/area/shuttle/drop_upp2/devana) +"wk" = ( +/obj/structure/shuttle/part/dropshipupp2/transparent/upper_right_wing{ + icon_state = "upp_wing_top_right_red" + }, +/turf/template_noop, +/area/shuttle/drop_upp2/devana) +"wx" = ( +/turf/closed/shuttle/upp_dropship2{ + icon_state = "31" + }, +/area/shuttle/drop_upp2/devana) +"wL" = ( +/turf/closed/shuttle/upp_dropship2{ + icon_state = "25" + }, +/area/shuttle/drop_upp2/devana) +"wQ" = ( +/turf/closed/shuttle/upp_dropship2{ + icon_state = "17" + }, +/area/shuttle/drop_upp2/devana) +"xm" = ( +/obj/item/device/radio/intercom/devana{ + pixel_y = 26 + }, +/turf/open/shuttle/dropship/light_grey_top_left, +/area/shuttle/drop_upp2/devana) +"xK" = ( +/turf/closed/shuttle/upp_dropship2{ + icon_state = "53" + }, +/area/shuttle/drop_upp2/devana) +"xL" = ( +/turf/closed/shuttle/upp_dropship2{ + icon_state = "56" + }, +/area/shuttle/drop_upp2/devana) +"zz" = ( +/turf/closed/shuttle/upp_dropship2{ + icon_state = "75" + }, +/area/shuttle/drop_upp2/devana) +"zI" = ( +/obj/structure/shuttle/part/dropshipupp2/transparent/upper_right_wing{ + icon_state = "tail_6_red" + }, +/turf/template_noop, +/area/shuttle/drop_upp2/devana) +"AB" = ( +/turf/closed/shuttle/upp_dropship2{ + icon_state = "19" + }, +/area/shuttle/drop_upp2/devana) +"Bv" = ( +/turf/open/shuttle/dropship/light_grey_bottom_left, +/area/shuttle/drop_upp2/devana) +"BA" = ( +/obj/structure/shuttle/part/dropshipupp2/transparent/left_outer_inner_wing{ + icon_state = "tail_2_red" + }, +/turf/template_noop, +/area/shuttle/drop_upp2/devana) +"Cg" = ( +/turf/closed/shuttle/upp_dropship2{ + icon_state = "21" + }, +/area/shuttle/drop_upp2/devana) +"Cq" = ( +/obj/structure/shuttle/part/dropshipupp2/transparent/lower_right_wing{ + icon_state = "upp_wing_eng_right_red" + }, +/obj/effect/attach_point/weapon/dropship_upp2/right_wing, +/turf/template_noop, +/area/shuttle/drop_upp2/devana) +"CR" = ( +/turf/open/shuttle/dropship/light_grey_bottom_right, +/area/shuttle/drop_upp2/devana) +"Dh" = ( +/turf/closed/shuttle/upp_dropship2{ + icon_state = "73" + }, +/area/shuttle/drop_upp2/devana) +"Dt" = ( +/turf/closed/shuttle/upp_dropship2/transparent{ + icon_state = "97" + }, +/area/shuttle/drop_upp2/devana) +"DO" = ( +/turf/closed/shuttle/upp_dropship2{ + icon_state = "77" + }, +/area/shuttle/drop_upp2/devana) +"Gq" = ( +/obj/item/device/radio/intercom/devana{ + pixel_x = -10 + }, +/turf/closed/shuttle/upp_dropship2{ + icon_state = "18" + }, +/area/shuttle/drop_upp2/devana) +"Gr" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/upp2{ + dir = 1; + id = "starboard_door" + }, +/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/area/shuttle/drop_upp2/devana) +"GN" = ( +/turf/closed/shuttle/upp_dropship2{ + icon_state = "69" + }, +/area/shuttle/drop_upp2/devana) +"GO" = ( +/obj/structure/shuttle/part/dropshipupp2/nose_front_right, +/turf/template_noop, +/area/shuttle/drop_upp2/devana) +"Ha" = ( +/obj/structure/shuttle/part/dropshipupp2/right_outer_wing_connector{ + icon_state = "tail_4_red" + }, +/turf/template_noop, +/area/shuttle/drop_upp2/devana) +"Hg" = ( +/obj/structure/shuttle/part/dropshipupp2/transparent/inner_left_weapons, +/obj/effect/attach_point/electronics/dropship_upp2, +/turf/template_noop, +/area/shuttle/drop_upp2/devana) +"Hi" = ( +/turf/template_noop, +/area/space) +"HQ" = ( +/turf/closed/shuttle/upp_dropship2/transparent{ + icon_state = "96" + }, +/area/shuttle/drop_upp2/devana) +"HY" = ( +/obj/structure/shuttle/part/dropshipupp2/transparent/outer_right_weapons, +/obj/effect/attach_point/weapon/dropship_upp2/right_fore, +/turf/template_noop, +/area/shuttle/drop_upp2/devana) +"Id" = ( +/obj/structure/bed/chair/vehicle{ + pixel_x = -8 + }, +/obj/structure/bed/chair/vehicle{ + pixel_x = 8 + }, +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_x = 30 + }, +/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/area/shuttle/drop_upp2/devana) +"Iq" = ( +/turf/closed/shuttle/upp_dropship2{ + icon_state = "67" + }, +/area/shuttle/drop_upp2/devana) +"Iu" = ( +/obj/structure/machinery/door/airlock/hatch/cockpit/upp{ + req_access = null; + req_one_access = list(235, 240) + }, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/area/shuttle/drop_upp2/devana) +"Kj" = ( +/turf/closed/shuttle/upp_dropship2{ + icon_state = "94" + }, +/area/shuttle/drop_upp2/devana) +"KV" = ( +/obj/structure/shuttle/part/dropshipupp2/transparent/engine_left_cap, +/turf/template_noop, +/area/shuttle/drop_upp2/devana) +"Lj" = ( +/obj/structure/shuttle/part/dropshipupp2/transparent/upper_left_wing{ + icon_state = "tail_1_red" + }, +/turf/template_noop, +/area/shuttle/drop_upp2/devana) +"Lu" = ( +/obj/structure/blocker/invisible_wall, +/turf/closed/shuttle/upp_dropship2{ + icon_state = "93b" + }, +/area/shuttle/drop_upp2/devana) +"LN" = ( +/turf/closed/shuttle/upp_dropship2{ + icon_state = "35" + }, +/area/shuttle/drop_upp2/devana) +"MI" = ( +/turf/closed/shuttle/upp_dropship2{ + icon_state = "83" + }, +/area/shuttle/drop_upp2/devana) +"NI" = ( +/obj/effect/attach_point/fuel/dropship_upp2{ + dir = 1; + pixel_x = -32 + }, +/turf/closed/shuttle/upp_dropship2{ + icon_state = "33" + }, +/area/shuttle/drop_upp2/devana) +"NP" = ( +/obj/structure/barricade/handrail/strata, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/area/shuttle/drop_upp2/devana) +"Oe" = ( +/obj/structure/bed/chair/dropship/pilot{ + dir = 1 + }, +/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/area/shuttle/drop_upp2/devana) +"Ph" = ( +/obj/structure/bed/chair/vehicle{ + pixel_x = -8 + }, +/obj/structure/bed/chair/vehicle{ + pixel_x = 8 + }, +/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/area/shuttle/drop_upp2/devana) +"PD" = ( +/obj/item/device/radio/intercom/devana{ + pixel_x = 10 + }, +/turf/closed/shuttle/upp_dropship2{ + icon_state = "19" + }, +/area/shuttle/drop_upp2/devana) +"Qj" = ( +/obj/structure/shuttle/part/dropshipupp2/transparent/upper_left_wing{ + icon_state = "upp_wing_top_left_red" + }, +/turf/template_noop, +/area/shuttle/drop_upp2/devana) +"QP" = ( +/obj/structure/shuttle/part/dropshipupp2/right_inner_wing_connector, +/turf/template_noop, +/area/shuttle/drop_upp2/devana) +"QS" = ( +/turf/closed/shuttle/upp_dropship2{ + icon_state = "92" + }, +/area/shuttle/drop_upp2/devana) +"RA" = ( +/obj/docking_port/mobile/marine_dropship/devana, +/turf/closed/shuttle/upp_dropship2{ + icon_state = "53"; + dir = 1 + }, +/area/shuttle/drop_upp2/devana) +"Sg" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/upp2{ + dir = 2; + id = "port_door" + }, +/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/area/shuttle/drop_upp2/devana) +"SR" = ( +/turf/closed/shuttle/upp_dropship2{ + icon_state = "48" + }, +/area/shuttle/drop_upp2/devana) +"Tj" = ( +/turf/open/shuttle/dropship/light_grey_top_left, +/area/shuttle/drop_upp2/devana) +"TD" = ( +/turf/closed/shuttle/upp_dropship2{ + icon_state = "16" + }, +/area/shuttle/drop_upp2/devana) +"Ub" = ( +/turf/closed/shuttle/upp_dropship2{ + icon_state = "62" + }, +/area/shuttle/drop_upp2/devana) +"Ud" = ( +/turf/closed/shuttle/upp_dropship2{ + icon_state = "34" + }, +/area/shuttle/drop_upp2/devana) +"Ux" = ( +/turf/open/shuttle/dropship/light_grey_single_wide_up_to_down, +/area/shuttle/drop_upp2/devana) +"VY" = ( +/turf/closed/shuttle/upp_dropship2{ + icon_state = "82" + }, +/area/shuttle/drop_upp2/devana) +"Wf" = ( +/turf/closed/shuttle/upp_dropship2{ + icon_state = "18" + }, +/area/shuttle/drop_upp2/devana) +"WJ" = ( +/obj/structure/bed/chair/vehicle{ + pixel_x = -8 + }, +/obj/structure/bed/chair/vehicle{ + pixel_x = 8 + }, +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_x = -30 + }, +/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/area/shuttle/drop_upp2/devana) +"WU" = ( +/turf/closed/shuttle/upp_dropship2{ + icon_state = "72" + }, +/area/shuttle/drop_upp2/devana) +"Xy" = ( +/turf/closed/shuttle/upp_dropship2{ + icon_state = "20" + }, +/area/shuttle/drop_upp2/devana) +"Yp" = ( +/turf/closed/shuttle/upp_dropship2{ + icon_state = "26" + }, +/area/shuttle/drop_upp2/devana) +"Yw" = ( +/obj/structure/sign/flag/upp{ + pixel_y = 30 + }, +/obj/structure/bed/chair/vehicle{ + pixel_x = -8 + }, +/obj/structure/bed/chair/vehicle{ + pixel_x = 8 + }, +/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/area/shuttle/drop_upp2/devana) +"Zb" = ( +/turf/closed/shuttle/upp_dropship2{ + icon_state = "24" + }, +/area/shuttle/drop_upp2/devana) +"ZO" = ( +/obj/structure/shuttle/part/dropshipupp2/transparent/inner_right_weapons, +/obj/effect/attach_point/electronics/dropship_upp2, +/turf/template_noop, +/area/shuttle/drop_upp2/devana) + +(1,1,1) = {" +Hi +Hi +Hi +Hi +Hi +Qj +rf +uB +Hi +Hi +Hi +Hi +Hi +KV +Ud +te +vZ +TD +Hi +Hi +Hi +"} +(2,1,1) = {" +Hi +Hi +Hi +mO +zz +WU +Iq +Ub +qc +Sg +Gq +Wf +uw +qV +LN +ja +fN +wQ +Hi +Hi +Lj +"} +(3,1,1) = {" +Hi +Hi +Hi +Hg +VY +Yw +Ph +Ph +qc +qc +Ph +Ph +qB +Wf +Wf +gz +Zb +Wf +uw +Hi +BA +"} +(4,1,1) = {" +er +oG +QS +bT +fs +xm +Ux +Ux +Ux +Ux +Ux +Bv +NP +bM +Ph +WJ +Ph +Ph +wa +fK +cU +"} +(5,1,1) = {" +sC +HQ +ar +Oe +da +ju +Ph +Ph +Ph +ju +Ph +pC +tP +fp +Ux +Ux +Ux +Ux +nn +Hi +Hi +"} +(6,1,1) = {" +sC +Dt +aQ +mh +Iu +uX +aT +xK +dV +ju +RA +xL +xL +xK +eN +rV +qc +rV +qc +Hi +Hi +"} +(7,1,1) = {" +sC +mb +Lu +Oe +da +ju +Ph +Ph +Ph +ju +Ph +Tj +tP +fp +Ux +Ux +Ux +Ux +qc +Hi +Hi +"} +(8,1,1) = {" +ti +GO +Kj +oi +DO +dl +Ux +Ux +Ux +Ux +Ux +CR +NP +bM +Ph +Id +Ph +Ph +wa +QP +Ha +"} +(9,1,1) = {" +Hi +Hi +Hi +ZO +VY +Yw +Ph +Ph +qc +qc +Ph +Ph +SR +AB +AB +wx +wL +AB +lj +Hi +lM +"} +(10,1,1) = {" +Hi +Hi +Hi +HY +MI +Dh +GN +hK +qc +Gr +PD +AB +lj +KV +aw +aq +Yp +Xy +Hi +Hi +zI +"} +(11,1,1) = {" +Hi +Hi +Hi +Hi +Hi +wk +vy +Cq +Hi +Hi +Hi +Hi +Hi +qV +tX +NI +uR +Cg +Hi +Hi +Hi +"} diff --git a/maps/shuttles/dropship_morana.dmm b/maps/shuttles/dropship_morana.dmm new file mode 100644 index 000000000000..63740a60d6aa --- /dev/null +++ b/maps/shuttles/dropship_morana.dmm @@ -0,0 +1,851 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"ah" = ( +/obj/structure/shuttle/part/dropshipupp/transparent/nose_center, +/turf/template_noop, +/area/shuttle/drop_upp/morana) +"am" = ( +/obj/structure/stairs, +/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/area/shuttle/drop_upp/morana) +"ax" = ( +/turf/open/shuttle/dropship/light_grey_bottom_right, +/area/shuttle/drop_upp/morana) +"aL" = ( +/obj/item/device/radio/intercom/morana{ + pixel_y = 26 + }, +/turf/open/shuttle/dropship/light_grey_top_left, +/area/shuttle/drop_upp/morana) +"bd" = ( +/obj/structure/blocker/invisible_wall, +/obj/structure/machinery/computer/shuttle/dropship/flight/upp{ + req_one_access = list(235, 240) + }, +/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/area/shuttle/drop_upp/morana) +"bg" = ( +/turf/open/shuttle/dropship/light_grey_top_left, +/area/shuttle/drop_upp/morana) +"bv" = ( +/obj/structure/shuttle/part/dropshipupp/transparent/upper_left_wing{ + icon_state = "upp_wing_top_left" + }, +/turf/template_noop, +/area/shuttle/drop_upp/morana) +"bI" = ( +/obj/structure/machinery/door_control{ + name = "Dropship Lockdown"; + pixel_y = -19; + id = "dropship_morana"; + throw_range = 15; + normaldoorcontrol = 3; + req_one_access_txt = "235;240" + }, +/turf/open/shuttle/dropship/light_grey_left_to_right, +/area/shuttle/drop_upp/morana) +"bM" = ( +/obj/structure/shuttle/part/dropshipupp/transparent/outer_left_weapons, +/obj/effect/attach_point/weapon/dropship_upp/left_fore, +/turf/template_noop, +/area/shuttle/drop_upp/morana) +"bR" = ( +/obj/structure/bed/chair/vehicle{ + pixel_x = -8 + }, +/obj/structure/bed/chair/vehicle{ + pixel_x = 8 + }, +/obj/structure/sign/flag/upp{ + dir = 8; + pixel_y = 28 + }, +/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/area/shuttle/drop_upp/morana) +"bS" = ( +/obj/structure/blocker/invisible_wall, +/turf/closed/shuttle/upp_dropship/transparent{ + icon_state = "93b" + }, +/area/shuttle/drop_upp/morana) +"bZ" = ( +/turf/open/shuttle/dropship/light_grey_left_to_right, +/area/shuttle/drop_upp/morana) +"cw" = ( +/obj/structure/shuttle/part/dropshipupp/transparent/upper_right_wing{ + icon_state = "upp_wing_top_right" + }, +/turf/template_noop, +/area/shuttle/drop_upp/morana) +"cC" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/upp{ + id = "aft_door" + }, +/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/area/shuttle/drop_upp/morana) +"dd" = ( +/turf/closed/shuttle/upp_dropship{ + icon_state = "67" + }, +/area/shuttle/drop_upp/morana) +"dx" = ( +/turf/closed/shuttle/upp_dropship{ + icon_state = "73" + }, +/area/shuttle/drop_upp/morana) +"dT" = ( +/obj/structure/shuttle/part/dropshipupp/transparent/right_inner_bottom_wing{ + icon_state = "tail_5" + }, +/turf/template_noop, +/area/shuttle/drop_upp/morana) +"ex" = ( +/turf/closed/shuttle/upp_dropship{ + icon_state = "30" + }, +/area/shuttle/drop_upp/morana) +"fu" = ( +/turf/open/shuttle/dropship/light_grey_top_right, +/area/shuttle/drop_upp/morana) +"fD" = ( +/turf/closed/shuttle/upp_dropship/transparent{ + icon_state = "78" + }, +/area/shuttle/drop_upp/morana) +"fJ" = ( +/obj/structure/shuttle/part/dropshipupp/nose_front_left, +/turf/template_noop, +/area/shuttle/drop_upp/morana) +"fO" = ( +/obj/structure/shuttle/part/dropshipupp/transparent/nose_top_left, +/turf/template_noop, +/area/shuttle/drop_upp/morana) +"gH" = ( +/obj/structure/shuttle/part/dropshipupp/nose_front_right, +/turf/template_noop, +/area/shuttle/drop_upp/morana) +"gQ" = ( +/obj/structure/shuttle/part/dropshipupp/left_inner_wing_connector, +/obj/structure/machinery/light/dropship/blue{ + dir = 4 + }, +/turf/template_noop, +/area/shuttle/drop_upp/morana) +"hI" = ( +/obj/docking_port/mobile/marine_dropship/morana, +/turf/closed/shuttle/upp_dropship{ + icon_state = "68" + }, +/area/shuttle/drop_upp/morana) +"hN" = ( +/obj/structure/shuttle/part/dropshipupp/transparent/inner_left_weapons, +/obj/effect/attach_point/electronics/dropship_upp, +/turf/template_noop, +/area/shuttle/drop_upp/morana) +"hP" = ( +/obj/item/device/radio/intercom/morana{ + pixel_y = 50; + pixel_x = 32 + }, +/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/area/shuttle/drop_upp/morana) +"is" = ( +/obj/structure/bed/chair/vehicle{ + pixel_x = -8 + }, +/obj/structure/bed/chair/vehicle{ + pixel_x = 8 + }, +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_x = 30 + }, +/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/area/shuttle/drop_upp/morana) +"jp" = ( +/turf/closed/shuttle/upp_dropship{ + icon_state = "92" + }, +/area/shuttle/drop_upp/morana) +"jO" = ( +/turf/closed/shuttle/upp_dropship{ + icon_state = "25" + }, +/area/shuttle/drop_upp/morana) +"kE" = ( +/turf/closed/shuttle/upp_dropship/transparent{ + icon_state = "23" + }, +/area/shuttle/drop_upp/morana) +"kV" = ( +/turf/closed/shuttle/upp_dropship{ + icon_state = "48" + }, +/area/shuttle/drop_upp/morana) +"mk" = ( +/turf/closed/shuttle/upp_dropship/transparent{ + icon_state = "96" + }, +/area/shuttle/drop_upp/morana) +"mz" = ( +/turf/closed/shuttle/upp_dropship{ + icon_state = "69" + }, +/area/shuttle/drop_upp/morana) +"mG" = ( +/obj/structure/shuttle/part/dropshipupp/transparent/right_outer_bottom_wing{ + icon_state = "tail_6" + }, +/turf/template_noop, +/area/shuttle/drop_upp/morana) +"nk" = ( +/obj/structure/shuttle/part/dropshipupp/lower_right_wall, +/turf/template_noop, +/area/shuttle/drop_upp/morana) +"nW" = ( +/turf/closed/shuttle/upp_dropship/transparent{ + icon_state = "21" + }, +/area/shuttle/drop_upp/morana) +"ow" = ( +/obj/structure/machinery/light/dropship/green{ + dir = 4 + }, +/obj/structure/shuttle/part/dropshipupp/transparent/middle_right_wing{ + icon_state = "wing_right_red" + }, +/turf/template_noop, +/area/shuttle/drop_upp/morana) +"oJ" = ( +/obj/structure/shuttle/part/dropshipupp/transparent/inner_right_weapons, +/obj/effect/attach_point/electronics/dropship_upp, +/turf/template_noop, +/area/shuttle/drop_upp/morana) +"oX" = ( +/turf/closed/shuttle/upp_dropship/transparent{ + icon_state = "39" + }, +/area/shuttle/drop_upp/morana) +"po" = ( +/obj/structure/bed/chair/vehicle{ + pixel_x = -8 + }, +/obj/structure/bed/chair/vehicle{ + pixel_x = 8 + }, +/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/area/shuttle/drop_upp/morana) +"pK" = ( +/turf/closed/shuttle/upp_dropship/transparent{ + icon_state = "27" + }, +/area/shuttle/drop_upp/morana) +"qj" = ( +/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/area/shuttle/drop_upp/morana) +"re" = ( +/turf/closed/shuttle/upp_dropship{ + icon_state = "64" + }, +/area/shuttle/drop_upp/morana) +"rh" = ( +/obj/structure/shuttle/part/dropshipupp/transparent/outer_right_weapons, +/obj/effect/attach_point/weapon/dropship_upp/right_fore, +/turf/template_noop, +/area/shuttle/drop_upp/morana) +"rt" = ( +/turf/closed/shuttle/upp_dropship{ + icon_state = "31" + }, +/area/shuttle/drop_upp/morana) +"sf" = ( +/turf/closed/shuttle/upp_dropship/transparent{ + icon_state = "26" + }, +/area/shuttle/drop_upp/morana) +"tD" = ( +/obj/structure/bed/chair/vehicle{ + pixel_x = -8 + }, +/obj/structure/bed/chair/vehicle{ + pixel_x = 8 + }, +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_x = -30 + }, +/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/area/shuttle/drop_upp/morana) +"tK" = ( +/turf/closed/shuttle/upp_dropship{ + icon_state = "19" + }, +/area/shuttle/drop_upp/morana) +"va" = ( +/turf/closed/shuttle/upp_dropship/transparent{ + icon_state = "97" + }, +/area/shuttle/drop_upp/morana) +"vM" = ( +/turf/closed/shuttle/upp_dropship/transparent{ + icon_state = "89" + }, +/area/shuttle/drop_upp/morana) +"wV" = ( +/obj/item/device/radio/intercom/morana{ + pixel_y = 26 + }, +/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/area/shuttle/drop_upp/morana) +"xd" = ( +/turf/closed/shuttle/upp_dropship{ + icon_state = "63" + }, +/area/shuttle/drop_upp/morana) +"xm" = ( +/turf/closed/shuttle/upp_dropship/transparent{ + icon_state = "32" + }, +/area/shuttle/drop_upp/morana) +"xT" = ( +/turf/open/shuttle/dropship/light_grey_single_wide_up_to_down, +/area/shuttle/drop_upp/morana) +"yf" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/upp{ + dir = 2; + id = "port_door" + }, +/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/area/shuttle/drop_upp/morana) +"yk" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/upp{ + id = "starboard_door"; + dir = 1 + }, +/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/area/shuttle/drop_upp/morana) +"yJ" = ( +/obj/structure/shuttle/part/dropshipupp/lower_left_wall, +/turf/template_noop, +/area/shuttle/drop_upp/morana) +"yQ" = ( +/obj/structure/blocker/forcefield/multitile_vehicles, +/obj/structure/machinery/door/airlock/hatch/cockpit/upp{ + req_access = null; + req_one_access = list(235, 240) + }, +/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/area/shuttle/drop_upp/morana) +"yU" = ( +/turf/closed/shuttle/upp_dropship{ + icon_state = "47" + }, +/area/shuttle/drop_upp/morana) +"zk" = ( +/turf/closed/shuttle/upp_dropship{ + icon_state = "10" + }, +/area/shuttle/drop_upp/morana) +"zq" = ( +/turf/closed/shuttle/upp_dropship{ + icon_state = "68"; + dir = 1 + }, +/area/shuttle/drop_upp/morana) +"zJ" = ( +/turf/closed/shuttle/upp_dropship{ + icon_state = "81" + }, +/area/shuttle/drop_upp/morana) +"zS" = ( +/obj/structure/shuttle/part/dropshipupp/transparent/nose_top_right, +/turf/template_noop, +/area/shuttle/drop_upp/morana) +"Dj" = ( +/turf/closed/shuttle/upp_dropship{ + icon_state = "72" + }, +/area/shuttle/drop_upp/morana) +"DW" = ( +/turf/open/shuttle/dropship/light_grey_bottom_left, +/area/shuttle/drop_upp/morana) +"Ei" = ( +/turf/closed/shuttle/upp_dropship/transparent{ + icon_state = "34" + }, +/area/shuttle/drop_upp/morana) +"EC" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/shuttle/dropship/light_grey_single_wide_up_to_down, +/area/shuttle/drop_upp/morana) +"EN" = ( +/obj/structure/shuttle/part/dropshipupp/transparent/engine_left_cap, +/turf/template_noop, +/area/shuttle/drop_upp/morana) +"FI" = ( +/obj/structure/platform/metal/strata/north, +/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/area/shuttle/drop_upp/morana) +"FO" = ( +/obj/effect/attach_point/fuel/dropship_upp{ + dir = 1 + }, +/turf/closed/shuttle/upp_dropship/transparent{ + icon_state = "28" + }, +/area/shuttle/drop_upp/morana) +"FS" = ( +/turf/closed/shuttle/upp_dropship/transparent{ + icon_state = "86" + }, +/area/shuttle/drop_upp/morana) +"Gx" = ( +/obj/effect/attach_point/crew_weapon/dropship_upp, +/obj/item/device/radio/intercom/morana{ + pixel_y = 26 + }, +/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/area/shuttle/drop_upp/morana) +"GJ" = ( +/obj/item/device/radio/intercom/morana{ + pixel_x = -10 + }, +/turf/closed/shuttle/upp_dropship{ + icon_state = "18" + }, +/area/shuttle/drop_upp/morana) +"Hp" = ( +/obj/structure/barricade/handrail/strata, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/area/shuttle/drop_upp/morana) +"HE" = ( +/turf/closed/shuttle/upp_dropship{ + icon_state = "83" + }, +/area/shuttle/drop_upp/morana) +"HX" = ( +/turf/closed/shuttle/upp_dropship/transparent{ + icon_state = "22" + }, +/area/shuttle/drop_upp/morana) +"Iy" = ( +/obj/structure/machinery/light/dropship/red{ + dir = 8 + }, +/obj/structure/shuttle/part/dropshipupp/transparent/middle_left_wing{ + icon_state = "wing_left_red" + }, +/turf/template_noop, +/area/shuttle/drop_upp/morana) +"IM" = ( +/obj/structure/shuttle/part/dropshipupp/transparent/left_outer_inner_wing{ + icon_state = "tail_2" + }, +/turf/template_noop, +/area/shuttle/drop_upp/morana) +"JB" = ( +/turf/closed/shuttle/upp_dropship/transparent{ + icon_state = "98" + }, +/area/shuttle/drop_upp/morana) +"JO" = ( +/turf/closed/shuttle/upp_dropship{ + icon_state = "68" + }, +/area/shuttle/drop_upp/morana) +"Kc" = ( +/obj/structure/shuttle/part/dropshipupp/transparent/lower_left_wing{ + icon_state = "upp_wing_eng_left" + }, +/obj/effect/attach_point/weapon/dropship_upp/left_wing, +/turf/template_noop, +/area/shuttle/drop_upp/morana) +"Kl" = ( +/obj/effect/attach_point/crew_weapon/dropship_upp, +/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/area/shuttle/drop_upp/morana) +"Ky" = ( +/turf/closed/shuttle/upp_dropship{ + icon_state = "76" + }, +/area/shuttle/drop_upp/morana) +"KQ" = ( +/obj/structure/blocker/invisible_wall, +/turf/closed/shuttle/upp_dropship/transparent{ + icon_state = "93a" + }, +/area/shuttle/drop_upp/morana) +"KW" = ( +/obj/structure/shuttle/part/dropshipupp/transparent/engine_right_cap, +/turf/template_noop, +/area/shuttle/drop_upp/morana) +"Lb" = ( +/turf/closed/shuttle/upp_dropship{ + icon_state = "18" + }, +/area/shuttle/drop_upp/morana) +"Nd" = ( +/turf/closed/shuttle/upp_dropship{ + icon_state = "24" + }, +/area/shuttle/drop_upp/morana) +"Nv" = ( +/obj/item/device/radio/intercom/morana{ + pixel_x = 10 + }, +/turf/closed/shuttle/upp_dropship{ + icon_state = "19" + }, +/area/shuttle/drop_upp/morana) +"Op" = ( +/obj/item/device/radio/intercom/morana{ + pixel_y = 26 + }, +/turf/open/shuttle/dropship/light_grey_top_right, +/area/shuttle/drop_upp/morana) +"Or" = ( +/obj/effect/attach_point/fuel/dropship_upp{ + dir = 1; + pixel_x = -32 + }, +/turf/closed/shuttle/upp_dropship/transparent{ + icon_state = "33" + }, +/area/shuttle/drop_upp/morana) +"Pc" = ( +/obj/structure/bed/chair/dropship/pilot{ + dir = 1 + }, +/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, +/area/shuttle/drop_upp/morana) +"Qn" = ( +/turf/closed/shuttle/upp_dropship{ + icon_state = "77" + }, +/area/shuttle/drop_upp/morana) +"RW" = ( +/obj/structure/shuttle/part/dropshipupp/right_outer_wing_connector{ + icon_state = "tail_4" + }, +/turf/template_noop, +/area/shuttle/drop_upp/morana) +"RX" = ( +/turf/closed/shuttle/upp_dropship/transparent{ + icon_state = "35" + }, +/area/shuttle/drop_upp/morana) +"Ti" = ( +/turf/closed/shuttle/upp_dropship{ + icon_state = "94" + }, +/area/shuttle/drop_upp/morana) +"TT" = ( +/obj/structure/shuttle/part/dropshipupp/transparent/upper_left_wing{ + icon_state = "tail_1" + }, +/turf/template_noop, +/area/shuttle/drop_upp/morana) +"Vk" = ( +/turf/closed/shuttle/upp_dropship/transparent{ + icon_state = "20" + }, +/area/shuttle/drop_upp/morana) +"VN" = ( +/turf/template_noop, +/area/space) +"VO" = ( +/turf/closed/shuttle/upp_dropship/transparent{ + icon_state = "29" + }, +/area/shuttle/drop_upp/morana) +"Wc" = ( +/obj/structure/shuttle/part/dropshipupp/left_outer_wing_connector{ + icon_state = "tail_3" + }, +/turf/template_noop, +/area/shuttle/drop_upp/morana) +"Xl" = ( +/turf/closed/shuttle/upp_dropship/transparent{ + icon_state = "38" + }, +/area/shuttle/drop_upp/morana) +"XZ" = ( +/obj/structure/shuttle/part/dropshipupp/right_inner_wing_connector, +/obj/structure/machinery/light/dropship/blue{ + dir = 8 + }, +/turf/template_noop, +/area/shuttle/drop_upp/morana) +"Yi" = ( +/obj/structure/shuttle/part/dropshipupp/transparent/lower_right_wing{ + icon_state = "upp_wing_eng_right" + }, +/obj/effect/attach_point/weapon/dropship_upp/right_wing, +/turf/template_noop, +/area/shuttle/drop_upp/morana) +"YV" = ( +/turf/closed/shuttle/upp_dropship{ + icon_state = "75" + }, +/area/shuttle/drop_upp/morana) +"ZX" = ( +/turf/closed/shuttle/upp_dropship{ + icon_state = "62" + }, +/area/shuttle/drop_upp/morana) + +(1,1,1) = {" +VN +VN +VN +VN +VN +bv +Iy +Kc +VN +VN +VN +VN +VN +EN +Ei +FO +HX +Vk +VN +VN +VN +"} +(2,1,1) = {" +VN +VN +VN +bM +YV +Dj +dd +ZX +qj +yf +GJ +Lb +yJ +KW +RX +VO +kE +nW +VN +VN +TT +"} +(3,1,1) = {" +VN +VN +VN +hN +Ky +bR +po +po +qj +qj +po +po +yU +Lb +Lb +ex +Nd +Lb +yJ +VN +IM +"} +(4,1,1) = {" +fO +fJ +jp +FS +zJ +aL +xT +xT +xT +xT +xT +DW +Hp +FI +po +tD +po +po +zk +gQ +Wc +"} +(5,1,1) = {" +ah +mk +KQ +Pc +fD +bZ +po +po +po +bZ +po +fu +EC +am +xT +xT +xT +xT +cC +VN +VN +"} +(6,1,1) = {" +ah +va +bd +hP +yQ +bI +JO +zq +Gx +bZ +hI +xd +xd +zq +wV +Kl +qj +Kl +qj +VN +VN +"} +(7,1,1) = {" +ah +JB +bS +Pc +fD +bZ +po +po +po +bZ +po +bg +EC +am +xT +xT +xT +xT +qj +VN +VN +"} +(8,1,1) = {" +zS +gH +Ti +vM +Qn +Op +xT +xT +xT +xT +xT +ax +Hp +FI +po +is +po +po +zk +XZ +RW +"} +(9,1,1) = {" +VN +VN +VN +oJ +Ky +bR +po +po +qj +qj +po +po +kV +tK +tK +rt +jO +tK +nk +VN +dT +"} +(10,1,1) = {" +VN +VN +VN +rh +HE +dx +mz +re +qj +yk +Nv +tK +nk +EN +Xl +xm +sf +Vk +VN +VN +mG +"} +(11,1,1) = {" +VN +VN +VN +VN +VN +cw +ow +Yi +VN +VN +VN +VN +VN +KW +oX +Or +pK +nW +VN +VN +VN +"} diff --git a/maps/shuttles/dropship_resolute.dmm b/maps/shuttles/dropship_saipan.dmm similarity index 100% rename from maps/shuttles/dropship_resolute.dmm rename to maps/shuttles/dropship_saipan.dmm diff --git a/maps/templates/Chinook.dmm b/maps/templates/Chinook.dmm index 476f40c10970..98a8e8bb3f91 100644 --- a/maps/templates/Chinook.dmm +++ b/maps/templates/Chinook.dmm @@ -35,12 +35,6 @@ "ai" = ( /turf/open/floor/almayer_hull/outerhull_dir/southwest, /area/space) -"aj" = ( -/obj/structure/bed/chair/dropship/passenger{ - dir = 4 - }, -/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, -/area/adminlevel/chinook/shuttle/unpowered) "al" = ( /turf/open/floor/almayer_hull, /area/space) @@ -95,15 +89,6 @@ /obj/structure/machinery/vending/cola, /turf/open/floor/kutjevo/plate, /area/adminlevel/chinook/offices) -"ay" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N" - }, -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/chinook/cargo) "aA" = ( /obj/structure/machinery/vending/coffee, /turf/open/floor/almayer, @@ -432,6 +417,11 @@ /obj/structure/filingcabinet, /turf/open/floor/kutjevo/plate, /area/adminlevel/chinook/offices) +"br" = ( +/obj/structure/largecrate/supply, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/chinook/cargo) "bu" = ( /obj/structure/surface/table/reinforced/black, /obj/structure/machinery/light{ @@ -604,6 +594,13 @@ /obj/structure/surface/table/reinforced/black, /turf/open/floor/carpet, /area/adminlevel/chinook/sec) +"bT" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/chinook/cargo) "bV" = ( /obj/item/device/flashlight/lamp/green, /obj/structure/surface/table/reinforced/black, @@ -625,6 +622,10 @@ }, /turf/open/floor/kutjevo/plate, /area/adminlevel/chinook/offices) +"cb" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/chinook/cargo) "ce" = ( /turf/open/floor/almayer/green/southeast, /area/adminlevel/chinook/cargo) @@ -658,15 +659,6 @@ "cl" = ( /turf/open/floor/almayer/sterile_green_side/west, /area/adminlevel/chinook/offices) -"cm" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/chinook/engineering) "cp" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal8"; @@ -694,6 +686,10 @@ }, /turf/open/floor/wood, /area/adminlevel/chinook) +"cq" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/kutjevo, +/area/adminlevel/chinook/event) "cr" = ( /obj/structure/surface/table/reinforced/black, /obj/item/storage/fancy/cigar, @@ -942,6 +938,13 @@ /obj/structure/machinery/cm_vending/sorted/marine_food, /turf/open/floor/kutjevo/plate, /area/adminlevel/chinook/offices) +"dm" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/chinook/cargo) "dn" = ( /obj/structure/closet/crate, /turf/open/floor/almayer/cargo, @@ -1204,14 +1207,6 @@ }, /turf/open/floor/almayer/dark_sterile, /area/adminlevel/chinook/offices) -"eq" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform/strata/metal, -/turf/open/floor/almayer, -/area/adminlevel/chinook) "er" = ( /obj/structure/closet/fireaxecabinet{ pixel_y = 25 @@ -1236,6 +1231,10 @@ }, /turf/open/floor/almayer/blue/north, /area/adminlevel/chinook/offices) +"ev" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/kutjevo, +/area/adminlevel/chinook/event) "ew" = ( /obj/structure/closet/secure_closet{ name = "secure evidence locker"; @@ -1267,16 +1266,6 @@ /obj/structure/bed/sofa/south/grey/right, /turf/open/floor/almayer/blue/north, /area/adminlevel/chinook/offices) -"eA" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/prop/invuln/fusion_reactor, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/chinook/engineering) "eB" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 @@ -1306,13 +1295,6 @@ /obj/item/storage/box/bodybags, /turf/open/floor/almayer/plate, /area/adminlevel/chinook/medical) -"eG" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/prop/invuln/fusion_reactor, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/chinook/engineering) "eH" = ( /obj/structure/machinery/light{ dir = 1 @@ -1350,12 +1332,6 @@ /obj/structure/machinery/light, /turf/open/floor/almayer/blue, /area/adminlevel/chinook/offices) -"eO" = ( -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/turf/open/gm/river/pool, -/area/adminlevel/chinook) "eP" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -1484,6 +1460,14 @@ /obj/structure/machinery/iv_drip, /turf/open/floor/almayer/sterile_green_side/east, /area/adminlevel/chinook/medical) +"ft" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_ew_full_cap"; + layer = 3.5 + }, +/obj/structure/platform/metal/strata/north, +/turf/open/floor/almayer, +/area/adminlevel/chinook) "fu" = ( /obj/structure/window/framed/almayer/hull, /turf/open/floor/plating, @@ -1492,12 +1476,6 @@ /obj/structure/machinery/disposal, /turf/open/floor/almayer/sterile_green_side/north, /area/adminlevel/chinook/medical) -"fw" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - dir = 2 - }, -/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, -/area/adminlevel/chinook/shuttle/unpowered) "fx" = ( /obj/structure/machinery/light{ dir = 1 @@ -1552,11 +1530,6 @@ }, /turf/open/floor/wood, /area/adminlevel/chinook/offices) -"fD" = ( -/turf/closed/shuttle/ert{ - icon_state = "stan_leftengine" - }, -/area/adminlevel/chinook/shuttle/unpowered) "fE" = ( /obj/structure/machinery/light{ dir = 4 @@ -1621,11 +1594,6 @@ }, /turf/open/floor/wood, /area/adminlevel/chinook/offices) -"fP" = ( -/turf/closed/shuttle/ert{ - icon_state = "rightengine_3" - }, -/area/adminlevel/chinook/shuttle/unpowered) "fQ" = ( /obj/effect/decal/warning_stripes{ icon_state = "N" @@ -1723,6 +1691,14 @@ /obj/structure/machinery/light, /turf/open/floor/plating/plating_catwalk, /area/adminlevel/chinook/engineering) +"gn" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/turf/open/floor/kutjevo/plate, +/area/adminlevel/chinook/event) "go" = ( /obj/structure/machinery/shower{ dir = 4 @@ -1764,11 +1740,10 @@ }, /turf/open/floor/carpet, /area/adminlevel/chinook) -"gy" = ( -/turf/closed/shuttle/ert{ - icon_state = "stan20" - }, -/area/adminlevel/chinook/shuttle/unpowered) +"gx" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/chinook/engineering) "gz" = ( /obj/structure/closet/crate/freezer, /obj/item/reagent_container/food/snacks/creamcheesebreadslice, @@ -1840,10 +1815,6 @@ "gL" = ( /turf/open/floor/almayer/red/northwest, /area/adminlevel/chinook) -"gM" = ( -/obj/structure/platform_decoration/strata/metal, -/turf/open/gm/river/pool, -/area/adminlevel/chinook) "gN" = ( /obj/structure/machinery/cm_vending/sorted/marine_food, /turf/open/floor/almayer/red/west, @@ -1920,9 +1891,6 @@ }, /turf/open/floor/prison/kitchen, /area/adminlevel/chinook/event) -"hc" = ( -/turf/open/shuttle/dropship/light_grey_top_left, -/area/adminlevel/chinook/shuttle/unpowered) "hd" = ( /obj/structure/largecrate/random, /obj/item/circuitboard/airlock, @@ -2202,6 +2170,19 @@ }, /turf/open/floor/almayer/dark_sterile, /area/adminlevel/chinook/medical) +"if" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_ew_full_cap"; + layer = 3.5 + }, +/obj/structure/platform/metal/stair_cut/platform_left, +/turf/open/floor/almayer, +/area/adminlevel/chinook/cargo) +"ig" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/almayer/plating_striped/east, +/area/adminlevel/chinook/cargo) "ih" = ( /obj/structure/machinery/light{ dir = 4 @@ -2214,21 +2195,14 @@ }, /turf/open/floor/almayer/plating/northeast, /area/adminlevel/chinook/cargo) -"il" = ( -/obj/structure/platform{ - dir = 1; - layer = 2 - }, -/turf/open/floor/kutjevo/plate, -/area/adminlevel/chinook/event) -"in" = ( +"io" = ( /obj/structure/stairs/perspective{ - icon_state = "p_stair_ew_full_cap"; - layer = 2.1 + dir = 4; + icon_state = "p_stair_sn_full_cap" }, -/obj/structure/platform/stair_cut/alt, -/turf/open/floor/kutjevo/plate, -/area/adminlevel/chinook/event) +/obj/structure/platform/metal/strata/east, +/turf/open/gm/river/pool, +/area/adminlevel/chinook) "ip" = ( /turf/open/floor/kutjevo/tan/alt_inner_edge, /area/adminlevel/chinook/event) @@ -2256,27 +2230,6 @@ }, /turf/open/floor/almayer/plate, /area/adminlevel/chinook/sec) -"iu" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_ew_full_cap"; - layer = 2.1 - }, -/obj/structure/platform/stair_cut, -/turf/open/floor/kutjevo/plate, -/area/adminlevel/chinook/event) -"iw" = ( -/obj/structure/platform/stair_cut, -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_ew_full_cap"; - layer = 3.5 - }, -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = 25 - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/chinook/engineering) "ix" = ( /obj/structure/machinery/door_control{ id = "chinookarmory1"; @@ -2307,24 +2260,12 @@ }, /turf/open/floor/almayer/plate, /area/adminlevel/chinook/medical) -"iD" = ( -/obj/structure/platform_decoration, -/turf/open/floor/kutjevo, -/area/adminlevel/chinook/event) "iF" = ( /obj/structure/sign/prop2{ pixel_y = 30 }, /turf/open/floor/strata/faux_wood, /area/adminlevel/chinook/offices) -"iG" = ( -/obj/structure/platform, -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, -/turf/open/floor/kutjevo/plate, -/area/adminlevel/chinook/event) "iH" = ( /turf/open/floor/kutjevo/tan/alt_inner_edge/east, /area/adminlevel/chinook/event) @@ -2335,18 +2276,8 @@ }, /turf/open/floor/almayer/plate, /area/adminlevel/chinook/medical) -"iL" = ( -/obj/structure/platform, -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" - }, -/turf/open/floor/kutjevo/plate, -/area/adminlevel/chinook/event) -"iN" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, +"iM" = ( +/obj/structure/platform_decoration/metal/almayer/west, /turf/open/floor/kutjevo, /area/adminlevel/chinook/event) "iO" = ( @@ -2416,15 +2347,6 @@ /obj/item/storage/firstaid/adv, /turf/open/floor/almayer/sterile_green_side/east, /area/adminlevel/chinook/medical) -"jb" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/chinook/cargo) "jc" = ( /obj/structure/machinery/door/airlock/almayer/command{ dir = 1; @@ -2491,17 +2413,6 @@ /obj/item/roller, /turf/open/floor/almayer/sterile_green, /area/adminlevel/chinook/sec) -"jp" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_ew_full_cap"; - layer = 3.5 - }, -/obj/structure/platform/stair_cut/alt, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/chinook/engineering) -"jq" = ( -/turf/closed/wall/almayer/outer, -/area/adminlevel/chinook/shuttle/unpowered) "jr" = ( /obj/structure/cargo_container/arious/right, /turf/open/floor/corsat/squares, @@ -2603,18 +2514,6 @@ /obj/item/device/multitool, /turf/open/floor/almayer, /area/adminlevel/chinook/engineering) -"jN" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/kutjevo, -/area/adminlevel/chinook/event) -"jO" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/kutjevo, -/area/adminlevel/chinook/event) "jQ" = ( /obj/structure/sign/safety/maint{ pixel_x = 12; @@ -2622,11 +2521,6 @@ }, /turf/open/floor/almayer/silver/north, /area/adminlevel/chinook) -"jR" = ( -/turf/closed/shuttle/ert{ - icon_state = "stan3" - }, -/area/adminlevel/chinook/shuttle/unpowered) "jS" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 @@ -2660,6 +2554,14 @@ /obj/item/storage/toolbox/mechanical, /turf/open/floor/almayer/plating/northeast, /area/adminlevel/chinook/offices) +"jX" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/chinook/engineering) "jY" = ( /turf/open/floor/almayer/silvercorner, /area/adminlevel/chinook) @@ -2674,6 +2576,14 @@ /obj/structure/machinery/vending/cola, /turf/open/floor/almayer/plate, /area/adminlevel/chinook) +"ke" = ( +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/chinook/engineering) "kf" = ( /obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/wood, @@ -2920,12 +2830,6 @@ }, /turf/open/floor/almayer/plating/northeast, /area/adminlevel/chinook/cargo) -"ld" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/kutjevo, -/area/adminlevel/chinook/event) "lf" = ( /obj/structure/machinery/door/airlock/almayer/command{ dir = 1; @@ -2981,12 +2885,10 @@ }, /turf/open/floor/plating/plating_catwalk, /area/adminlevel/chinook/sec) -"ls" = ( -/obj/structure/platform{ - dir = 4 - }, +"lp" = ( +/obj/structure/platform_decoration/metal/almayer, /turf/open/floor/almayer/plating/northeast, -/area/adminlevel/chinook/cargo) +/area/adminlevel/chinook/engineering) "lu" = ( /obj/structure/machinery/light{ dir = 1 @@ -3226,6 +3128,21 @@ }, /turf/open/floor/almayer, /area/adminlevel/chinook/cargo) +"mx" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/chinook/cargo) +"my" = ( +/obj/structure/platform/metal/stair_cut/platform_right, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_ew_full_cap"; + layer = 3.5 + }, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/chinook/engineering) "mz" = ( /obj/structure/bed/chair/comfy{ dir = 4 @@ -3242,19 +3159,6 @@ /obj/structure/machinery/iv_drip, /turf/open/floor/almayer/sterile_green_side/north, /area/adminlevel/chinook/medical) -"mC" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 8 - }, -/turf/open/gm/river/pool, -/area/adminlevel/chinook) -"mD" = ( -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/obj/structure/platform/strata/metal, -/turf/open/gm/river/pool, -/area/adminlevel/chinook) "mF" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/pizzabox/meat{ @@ -3296,6 +3200,11 @@ "mK" = ( /turf/open/floor/almayer/orange, /area/adminlevel/chinook) +"mL" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/largecrate/random/barrel/yellow, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/chinook/cargo) "mN" = ( /obj/structure/surface/table/reinforced/black, /obj/item/device/flashlight/lamp/green{ @@ -3337,9 +3246,6 @@ }, /turf/open/floor/wood, /area/adminlevel/chinook/offices) -"mX" = ( -/turf/open/shuttle/dropship/light_grey_single_wide_left_to_right, -/area/adminlevel/chinook/shuttle/unpowered) "mY" = ( /obj/structure/surface/table/reinforced/black, /obj/structure/machinery/computer/emails{ @@ -3398,18 +3304,6 @@ /obj/structure/bed/sofa/south/grey/right, /turf/open/floor/almayer/plate, /area/adminlevel/chinook/offices) -"nj" = ( -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/chinook/engineering) -"nk" = ( -/obj/structure/platform/strata/metal, -/turf/open/gm/river/pool, -/area/adminlevel/chinook) "nl" = ( /obj/structure/surface/table/reinforced/black, /obj/structure/sign/prop1{ @@ -3484,6 +3378,15 @@ }, /turf/open/floor/carpet, /area/adminlevel/chinook/offices) +"nw" = ( +/obj/structure/platform/metal/stair_cut/platform_left, +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_ew_full_cap"; + layer = 3.5 + }, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/chinook/engineering) "ny" = ( /obj/structure/surface/table/reinforced/black, /obj/item/ashtray/glass{ @@ -3561,6 +3464,10 @@ }, /turf/open/floor/strata/faux_wood, /area/adminlevel/chinook/offices) +"nK" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/chinook/cargo) "nL" = ( /obj/structure/machinery/light{ dir = 8 @@ -3613,6 +3520,10 @@ }, /turf/open/floor/wood, /area/adminlevel/chinook/event) +"nW" = ( +/obj/structure/platform_decoration/metal/almayer, +/turf/open/floor/kutjevo, +/area/adminlevel/chinook/event) "nX" = ( /obj/structure/surface/table/reinforced/black, /obj/item/reagent_container/food/drinks/coffee{ @@ -3676,16 +3587,6 @@ }, /turf/open/floor/kutjevo, /area/adminlevel/chinook/event) -"oh" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_sn_full_cap" - }, -/turf/open/floor/kutjevo, -/area/adminlevel/chinook/event) "oi" = ( /turf/open/space/basic, /area/space) @@ -3737,12 +3638,6 @@ }, /turf/open/floor/almayer/plating/northeast, /area/adminlevel/chinook/cargo) -"ot" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/chinook/engineering) "ou" = ( /turf/open/floor/almayer/uscm/directional/north, /area/adminlevel/chinook/shuttle) @@ -3773,15 +3668,6 @@ /obj/item/device/lightreplacer, /turf/open/floor/almayer/plate, /area/adminlevel/chinook/offices) -"oz" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/stairs/perspective{ - icon_state = "p_stair_sn_full_cap" - }, -/turf/open/floor/kutjevo, -/area/adminlevel/chinook/event) "oA" = ( /obj/structure/machinery/cm_vending/sorted/medical, /turf/open/floor/almayer/sterile_green_side/east, @@ -3805,12 +3691,6 @@ }, /turf/open/floor/almayer/red, /area/adminlevel/chinook/sec) -"oD" = ( -/turf/closed/shuttle/ert{ - icon_state = "leftengine_2"; - opacity = 0 - }, -/area/adminlevel/chinook/shuttle/unpowered) "oE" = ( /obj/structure/reagent_dispensers/peppertank{ pixel_x = -30 @@ -3950,22 +3830,9 @@ }, /turf/open/floor/wood, /area/adminlevel/chinook/event) -"pg" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/platform, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/chinook/engineering) "ph" = ( /turf/open/floor/almayer/sterile_green_side, /area/adminlevel/chinook/medical) -"pi" = ( -/turf/closed/shuttle/ert{ - icon_state = "stan8" - }, -/area/adminlevel/chinook/shuttle/unpowered) "pj" = ( /obj/item/trash/burger, /turf/open/floor/plating/plating_catwalk, @@ -3974,16 +3841,6 @@ /obj/structure/target, /turf/open/floor/almayer/redfull, /area/adminlevel/chinook) -"pl" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/stairs/perspective{ - icon_state = "p_stair_ew_full_cap"; - layer = 3.5 - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/chinook/cargo) "pm" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/plating/plating_catwalk, @@ -4022,12 +3879,6 @@ }, /turf/open/floor/almayer, /area/adminlevel/chinook/sec) -"pv" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/gm/river/pool, -/area/adminlevel/chinook) "pw" = ( /turf/open/floor/almayer/plating/northeast, /area/adminlevel/chinook/cargo) @@ -4093,12 +3944,6 @@ }, /turf/open/floor/almayer/red/north, /area/adminlevel/chinook/sec) -"pG" = ( -/obj/structure/bed/chair/dropship/passenger{ - dir = 8 - }, -/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, -/area/adminlevel/chinook/shuttle/unpowered) "pH" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor{ name = "\improper Command Offices" @@ -4141,12 +3986,13 @@ /obj/structure/machinery/computer/telecomms/traffic, /turf/open/floor/almayer/plate, /area/adminlevel/chinook/engineering) -"pP" = ( -/obj/structure/platform{ - dir = 1 +"pO" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/effect/decal/warning_stripes{ + icon_state = "N" }, -/turf/open/floor/carpet, -/area/adminlevel/chinook/event) +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/chinook/cargo) "pQ" = ( /turf/closed/shuttle/elevator{ dir = 6 @@ -4162,27 +4008,6 @@ }, /turf/open/floor/kutjevo, /area/adminlevel/chinook/event) -"pT" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/prop/invuln/fusion_reactor, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/chinook/engineering) -"pU" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_ew_full_cap"; - layer = 3.5 - }, -/turf/open/floor/almayer, -/area/adminlevel/chinook/cargo) "pV" = ( /obj/structure/machinery/light{ dir = 1 @@ -4303,19 +4128,14 @@ }, /turf/open/floor/carpet, /area/adminlevel/chinook/offices) +"qs" = ( +/obj/docking_port/stationary/emergency_response/idle_port3, +/turf/open/floor/almayer/orange, +/area/adminlevel/chinook/engineering) "qu" = ( /obj/item/toy/inflatable_duck, /turf/open/gm/river/pool, /area/adminlevel/chinook) -"qv" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/gm/river/pool, -/area/adminlevel/chinook) "qw" = ( /obj/item/storage/box/m56d/m2c, /turf/open/floor/almayer/plating/northeast, @@ -4434,12 +4254,6 @@ }, /turf/open/floor/kutjevo/tan, /area/adminlevel/chinook/event) -"qS" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/chinook/cargo) "qT" = ( /obj/item/clothing/glasses/sunglasses, /obj/structure/surface/table/reinforced/black, @@ -4500,16 +4314,18 @@ }, /turf/open/floor/almayer/silver/east, /area/adminlevel/chinook) +"rg" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/strata, +/turf/open/floor/almayer, +/area/adminlevel/chinook) "rh" = ( /obj/structure/machinery/cm_vending/sorted/medical/chemistry, /turf/open/floor/almayer/dark_sterile, /area/adminlevel/chinook/medical) -"ri" = ( -/turf/closed/shuttle/ert{ - icon_state = "leftengine_1"; - opacity = 0 - }, -/area/adminlevel/chinook/shuttle/unpowered) "rj" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -4563,12 +4379,6 @@ /obj/structure/machinery/cm_vending/sorted/medical, /turf/open/floor/almayer/sterile_green_side/north, /area/adminlevel/chinook/medical) -"rw" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/chinook/cargo) "rx" = ( /turf/open/floor/almayer/sterile_green_side/north, /area/adminlevel/chinook/medical) @@ -4684,6 +4494,13 @@ /obj/structure/machinery/power/smes, /turf/open/floor/almayer/plating/northeast, /area/adminlevel/chinook/engineering) +"rZ" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" + }, +/obj/structure/platform/metal/strata/west, +/turf/open/gm/river/pool, +/area/adminlevel/chinook) "sa" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/device/flashlight/lamp, @@ -4742,6 +4559,9 @@ /obj/structure/target, /turf/open/floor/almayer/plating_striped/east, /area/adminlevel/chinook) +"sq" = ( +/turf/open/floor/plating, +/area/adminlevel/chinook/shuttle) "sr" = ( /turf/open/floor/almayer/blue/north, /area/adminlevel/chinook/offices) @@ -4920,15 +4740,6 @@ /obj/item/tool/weldpack, /turf/open/floor/almayer/orange/west, /area/adminlevel/chinook/engineering) -"sU" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/almayer/plating_striped/east, -/area/adminlevel/chinook/cargo) "sV" = ( /obj/structure/surface/table/reinforced/black, /obj/item/device/flashlight/lamp/green{ @@ -4936,15 +4747,6 @@ }, /turf/open/floor/wood, /area/adminlevel/chinook/offices) -"sW" = ( -/obj/structure/platform/stair_cut, -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_ew_full_cap"; - layer = 3.5 - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/chinook/engineering) "sX" = ( /obj/structure/surface/table/reinforced/almayer_B, /turf/open/floor/almayer/cargo, @@ -4986,11 +4788,14 @@ /obj/item/storage/fancy/cigarettes/lucky_strikes, /turf/open/floor/almayer/cargo, /area/adminlevel/chinook/cargo) -"tf" = ( -/turf/closed/shuttle/ert{ - icon_state = "stan22" +"tg" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_sn_full_cap" }, -/area/adminlevel/chinook/shuttle/unpowered) +/turf/open/floor/kutjevo, +/area/adminlevel/chinook/event) "tj" = ( /obj/structure/machinery/door/airlock/almayer/engineering{ dir = 1; @@ -5010,13 +4815,6 @@ }, /turf/open/floor/kutjevo/tan, /area/adminlevel/chinook/event) -"to" = ( -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/obj/structure/platform/strata/metal, -/turf/open/gm/river/pool, -/area/adminlevel/chinook) "tp" = ( /obj/structure/machinery/light{ dir = 1 @@ -5128,11 +4926,6 @@ }, /turf/open/floor/almayer/plate, /area/adminlevel/chinook) -"tN" = ( -/turf/closed/shuttle/ert{ - icon_state = "stan25" - }, -/area/adminlevel/chinook/shuttle/unpowered) "tO" = ( /obj/structure/target/syndicate, /turf/open/floor/almayer/redfull, @@ -5321,12 +5114,6 @@ }, /turf/open/floor/almayer, /area/adminlevel/chinook/shuttle) -"uC" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/chinook/cargo) "uD" = ( /obj/structure/machinery/door/airlock/almayer/security/glass{ name = "Firing Range"; @@ -5401,10 +5188,6 @@ /obj/item/weapon/gun/shotgun/combat, /turf/open/floor/almayer/cargo, /area/adminlevel/chinook/offices) -"uR" = ( -/obj/structure/machinery/floodlight/landing, -/turf/open/floor/plating, -/area/adminlevel/chinook/shuttle/unpowered) "uS" = ( /obj/structure/desertdam/decals/road_edge{ pixel_x = 2; @@ -5582,9 +5365,6 @@ }, /turf/open/floor/almayer/emerald, /area/adminlevel/chinook/shuttle) -"vC" = ( -/turf/open/shuttle/dropship/light_grey_top_right, -/area/adminlevel/chinook/shuttle/unpowered) "vE" = ( /obj/structure/sign/safety/ammunition{ pixel_x = 32; @@ -5631,6 +5411,13 @@ /obj/structure/surface/table/reinforced/black, /turf/open/floor/kutjevo/tan, /area/adminlevel/chinook/event) +"vL" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/chinook/cargo) "vM" = ( /obj/structure/surface/rack, /obj/item/device/binoculars, @@ -5651,13 +5438,6 @@ /obj/structure/surface/table/reinforced/black, /turf/open/floor/carpet, /area/adminlevel/chinook/event) -"vQ" = ( -/obj/structure/largecrate/supply, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/chinook/cargo) "vR" = ( /obj/structure/bed/chair{ dir = 1 @@ -5694,10 +5474,20 @@ /obj/structure/machinery/light, /turf/open/floor/almayer/sterile_green_side, /area/adminlevel/chinook/medical) +"vY" = ( +/obj/structure/platform/metal/strata/north, +/obj/structure/platform/metal/strata/west, +/turf/open/gm/river/pool, +/area/adminlevel/chinook) "vZ" = ( /obj/structure/cargo_container/seegson/mid, /turf/open/floor/almayer/plating/northeast, /area/adminlevel/chinook/cargo) +"wa" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/prop/invuln/fusion_reactor, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/chinook/engineering) "wc" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/device/taperecorder, @@ -5894,12 +5684,6 @@ "wW" = ( /turf/open/floor/almayer/sterile_green_corner/north, /area/adminlevel/chinook/medical) -"wX" = ( -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/gm/river/pool, -/area/adminlevel/chinook) "wY" = ( /obj/structure/machinery/light{ dir = 1 @@ -5931,15 +5715,6 @@ }, /turf/open/floor/carpet, /area/adminlevel/chinook/event) -"xf" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/turf/open/gm/river/pool, -/area/adminlevel/chinook) "xg" = ( /obj/structure/closet/secure_closet/guncabinet/red, /obj/item/ammo_magazine/shotgun/buckshot, @@ -5986,15 +5761,6 @@ }, /turf/open/floor/almayer/cargo, /area/adminlevel/chinook/sec) -"xq" = ( -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/turf/open/gm/river/pool, -/area/adminlevel/chinook) "xr" = ( /obj/structure/machinery/door/airlock/almayer/security/glass{ dir = 2; @@ -6070,11 +5836,6 @@ }, /turf/open/floor/almayer/red, /area/adminlevel/chinook/sec) -"xK" = ( -/turf/closed/shuttle/ert{ - icon_state = "stan23" - }, -/area/adminlevel/chinook/shuttle/unpowered) "xL" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_18" @@ -6097,6 +5858,14 @@ }, /turf/open/floor/almayer/red/north, /area/adminlevel/chinook/offices) +"xQ" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/turf/open/floor/almayer, +/area/adminlevel/chinook/cargo) "xR" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_21" @@ -6117,9 +5886,6 @@ /obj/structure/machinery/autolathe/full, /turf/open/floor/almayer/sterile_green, /area/adminlevel/chinook/medical) -"xW" = ( -/turf/open/shuttle/dropship/light_grey_bottom_left, -/area/adminlevel/chinook/shuttle/unpowered) "xY" = ( /obj/structure/bed/chair/comfy, /turf/open/floor/strata/faux_wood, @@ -6154,11 +5920,6 @@ }, /turf/open/floor/almayer/plate, /area/adminlevel/chinook/event) -"yh" = ( -/turf/closed/shuttle/ert{ - icon_state = "stan27" - }, -/area/adminlevel/chinook/shuttle/unpowered) "yi" = ( /obj/structure/prop/ice_colony/tiger_rug{ pixel_x = -16 @@ -6169,6 +5930,14 @@ /obj/structure/machinery/vending/cola, /turf/open/floor/kutjevo/plate, /area/adminlevel/chinook/event) +"yk" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/platform/metal/almayer/east, +/obj/structure/prop/invuln/fusion_reactor, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/chinook/engineering) "yl" = ( /obj/structure/bed/chair/comfy/black{ dir = 8 @@ -6195,6 +5964,10 @@ /obj/structure/machinery/medical_pod/autodoc, /turf/open/floor/almayer/sterile_green, /area/adminlevel/chinook/medical) +"yt" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/chinook/engineering) "yu" = ( /obj/structure/surface/table/reinforced/black, /obj/structure/machinery/computer/secure_data{ @@ -6247,6 +6020,13 @@ /obj/item/trash/cigbutt, /turf/open/floor/kutjevo/multi_tiles, /area/adminlevel/chinook/event) +"yG" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/chinook/cargo) "yJ" = ( /obj/structure/cargo_container/arious/mid, /turf/open/floor/corsat/squares, @@ -6271,17 +6051,6 @@ "yN" = ( /turf/open/floor/almayer/cargo, /area/adminlevel/chinook) -"yO" = ( -/obj/structure/platform, -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" - }, -/obj/structure/barricade/handrail/strata{ - layer = 4.5 - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/chinook/engineering) "yP" = ( /obj/structure/machinery/photocopier, /obj/structure/machinery/light{ @@ -6400,6 +6169,11 @@ }, /turf/open/floor/almayer/red, /area/adminlevel/chinook/sec) +"zo" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/prop/invuln/fusion_reactor, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/chinook/engineering) "zp" = ( /obj/structure/surface/table/reinforced/black, /obj/item/paper_bin/uscm{ @@ -6433,6 +6207,13 @@ "zw" = ( /turf/open/floor/wood, /area/adminlevel/chinook/event) +"zy" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_full" + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/chinook/cargo) "zC" = ( /turf/open/floor/almayer, /area/adminlevel/chinook/engineering) @@ -6519,25 +6300,9 @@ /obj/structure/closet/secure_closet/medical2, /turf/open/floor/almayer/sterile_green_side/west, /area/adminlevel/chinook/medical) -"zU" = ( -/obj/structure/platform, -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" - }, -/obj/structure/barricade/handrail/strata{ - layer = 4.5 - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/chinook/engineering) "zW" = ( /turf/closed/wall/almayer/reinforced, /area/adminlevel/chinook/engineering) -"zX" = ( -/obj/structure/platform, -/obj/structure/prop/invuln/fusion_reactor, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/chinook/engineering) "zY" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/light, @@ -6553,11 +6318,6 @@ }, /turf/open/floor/almayer/red, /area/adminlevel/chinook/offices) -"Ad" = ( -/turf/closed/shuttle/ert{ - icon_state = "stan1" - }, -/area/adminlevel/chinook/shuttle/unpowered) "Ae" = ( /obj/structure/machinery/computer/crew, /turf/open/floor/almayer/red, @@ -6582,11 +6342,6 @@ /obj/structure/surface/table/reinforced/black, /turf/open/floor/carpet, /area/adminlevel/chinook/sec) -"Ai" = ( -/turf/closed/shuttle/ert{ - icon_state = "stan2" - }, -/area/adminlevel/chinook/shuttle/unpowered) "Aj" = ( /obj/structure/bed/sofa/vert/grey/top, /turf/open/floor/almayer/emeraldfull, @@ -6620,6 +6375,10 @@ "As" = ( /turf/closed/wall/almayer, /area/adminlevel/chinook/cargo) +"At" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/chinook/cargo) "Au" = ( /obj/structure/surface/table/reinforced/almayer_B, /turf/open/floor/prison/kitchen, @@ -6663,6 +6422,13 @@ }, /turf/open/floor/plating, /area/adminlevel/chinook/engineering) +"AA" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/stairs/perspective{ + icon_state = "p_stair_sn_full_cap" + }, +/turf/open/floor/kutjevo, +/area/adminlevel/chinook/event) "AB" = ( /obj/structure/machinery/optable, /turf/open/floor/almayer/sterile_green, @@ -6748,18 +6514,6 @@ /obj/structure/reagent_dispensers/water_cooler/stacks, /turf/open/floor/almayer/plate, /area/adminlevel/chinook/sec) -"AU" = ( -/turf/closed/shuttle/ert{ - icon_state = "stan9" - }, -/area/adminlevel/chinook/shuttle/unpowered) -"AV" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/prop/invuln/fusion_reactor, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/chinook/engineering) "AX" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/tool, @@ -6857,6 +6611,10 @@ }, /turf/open/floor/carpet, /area/adminlevel/chinook/event) +"Bm" = ( +/obj/structure/platform/metal/strata, +/turf/open/gm/river/pool, +/area/adminlevel/chinook) "Bn" = ( /obj/structure/surface/table/almayer, /obj/item/storage/belt/utility/full, @@ -6961,12 +6719,6 @@ /obj/structure/machinery/autolathe, /turf/open/floor/almayer/green/northwest, /area/adminlevel/chinook/cargo) -"BP" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/kutjevo, -/area/adminlevel/chinook/event) "BR" = ( /obj/structure/machinery/light, /turf/open/floor/almayer/sterile_green_side, @@ -6974,19 +6726,8 @@ "BS" = ( /turf/open/floor/plating/plating_catwalk, /area/adminlevel/chinook/shuttle) -"BU" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/chinook/cargo) -"BV" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, +"BT" = ( +/obj/structure/platform/metal/almayer/east, /turf/open/floor/kutjevo, /area/adminlevel/chinook/event) "BW" = ( @@ -7021,12 +6762,10 @@ }, /turf/open/floor/wood, /area/adminlevel/chinook) -"Cb" = ( -/turf/closed/shuttle/ert{ - icon_state = "leftengine_3"; - opacity = 0 - }, -/area/adminlevel/chinook/shuttle/unpowered) +"Cc" = ( +/obj/structure/platform/metal/strata/west, +/turf/open/gm/river/pool, +/area/adminlevel/chinook) "Cd" = ( /obj/structure/surface/table/reinforced/black, /obj/item/storage/fancy/cigar{ @@ -7086,15 +6825,6 @@ /obj/structure/machinery/vending/coffee, /turf/open/floor/kutjevo/plate, /area/adminlevel/chinook) -"Cp" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N" - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/chinook/cargo) "Cq" = ( /obj/structure/machinery/portable_atmospherics/hydroponics, /turf/open/floor/plating/plating_catwalk, @@ -7126,6 +6856,10 @@ }, /turf/open/floor/wood, /area/adminlevel/chinook/offices) +"Cv" = ( +/obj/structure/platform/metal/strata/east, +/turf/open/gm/river/pool, +/area/adminlevel/chinook) "Cw" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/sign/goldenplaque{ @@ -7153,6 +6887,10 @@ /obj/structure/bed/chair/comfy/black, /turf/open/floor/carpet, /area/adminlevel/chinook/offices) +"CD" = ( +/obj/structure/platform/metal/strata/north, +/turf/open/gm/river/pool, +/area/adminlevel/chinook) "CE" = ( /obj/structure/bed/chair/comfy{ dir = 1 @@ -7184,13 +6922,18 @@ /obj/structure/machinery/medical_pod/sleeper, /turf/open/floor/almayer/sterile_green_side, /area/adminlevel/chinook/medical) -"CP" = ( -/turf/open/shuttle/dropship/light_grey_bottom_right, -/area/adminlevel/chinook/shuttle/unpowered) +"CO" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/kutjevo, +/area/adminlevel/chinook/event) "CQ" = ( /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/almayer/plating/northeast, /area/adminlevel/chinook/engineering) +"CR" = ( +/obj/structure/platform_decoration/metal/strata/east, +/turf/open/gm/river/pool, +/area/adminlevel/chinook) "CS" = ( /obj/structure/machinery/cryopod/no_store, /turf/open/floor/almayer/sterile_green, @@ -7348,6 +7091,12 @@ }, /turf/open/floor/almayer, /area/adminlevel/chinook/offices) +"Du" = ( +/obj/structure/machinery/light, +/obj/structure/platform/metal/almayer, +/obj/structure/prop/invuln/fusion_reactor, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/chinook/engineering) "Dv" = ( /turf/closed/shuttle/elevator{ dir = 10 @@ -7367,11 +7116,6 @@ }, /turf/open/floor/almayer, /area/adminlevel/chinook) -"Dy" = ( -/turf/closed/shuttle/ert{ - icon_state = "rightengine_2" - }, -/area/adminlevel/chinook/shuttle/unpowered) "Dz" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal8"; @@ -7416,6 +7160,17 @@ }, /turf/open/floor/carpet, /area/adminlevel/chinook/offices) +"DF" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/obj/structure/barricade/handrail/strata{ + layer = 4.5 + }, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/chinook/engineering) "DH" = ( /obj/structure/bed/chair/comfy{ dir = 1 @@ -7425,9 +7180,14 @@ }, /turf/open/floor/carpet, /area/adminlevel/chinook/offices) -"DJ" = ( -/turf/closed/shuttle/ert, -/area/adminlevel/chinook/shuttle/unpowered) +"DI" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_ew_full_cap"; + layer = 2.1 + }, +/obj/structure/platform/metal/stair_cut/platform_right, +/turf/open/floor/kutjevo/plate, +/area/adminlevel/chinook/event) "DL" = ( /obj/structure/surface/table/almayer, /obj/effect/spawner/random/tool, @@ -7473,6 +7233,10 @@ }, /turf/open/floor/almayer/cargo, /area/adminlevel/chinook/cryo) +"DU" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/chinook/cargo) "DV" = ( /obj/structure/surface/rack, /turf/open/floor/almayer/plating/northeast, @@ -7497,6 +7261,10 @@ /obj/structure/machinery/cm_vending/clothing/dress, /turf/open/floor/almayer/plating/northeast, /area/adminlevel/chinook/offices) +"Ee" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/chinook/cargo) "Eg" = ( /obj/structure/closet/coffin, /turf/open/floor/almayer/plating/northeast, @@ -7540,10 +7308,6 @@ }, /turf/open/floor/wood, /area/adminlevel/chinook/offices) -"El" = ( -/obj/structure/bed/chair/dropship/passenger, -/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, -/area/adminlevel/chinook/shuttle/unpowered) "Em" = ( /turf/open/floor/kutjevo, /area/adminlevel/chinook/offices) @@ -7561,16 +7325,6 @@ }, /turf/open/floor/kutjevo/tan/alt_inner_edge, /area/adminlevel/chinook) -"Ep" = ( -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_sn_full_cap" - }, -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/turf/open/gm/river/pool, -/area/adminlevel/chinook) "Eq" = ( /obj/structure/machinery/vending/hydronutrients, /obj/structure/machinery/light{ @@ -7636,6 +7390,19 @@ }, /turf/open/floor/almayer, /area/adminlevel/chinook/offices) +"EH" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/sign/safety/high_voltage{ + pixel_x = -15; + pixel_y = 5 + }, +/obj/structure/sign/safety/hazard{ + pixel_x = -15; + pixel_y = -7 + }, +/obj/structure/prop/invuln/fusion_reactor, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/chinook/engineering) "EJ" = ( /obj/structure/surface/table/reinforced/black, /turf/open/floor/kutjevo/tan/plate, @@ -7684,6 +7451,18 @@ "EV" = ( /turf/open/floor/almayer/red/north, /area/adminlevel/chinook) +"EY" = ( +/obj/structure/platform/metal/stair_cut/platform_left, +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_ew_full_cap"; + layer = 3.5 + }, +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 25 + }, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/chinook/engineering) "EZ" = ( /obj/structure/machinery/light, /turf/open/floor/almayer/plating/northeast, @@ -7779,12 +7558,6 @@ /obj/structure/closet/toolcloset, /turf/open/floor/almayer/cargo, /area/adminlevel/chinook/engineering) -"Fv" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/chinook/engineering) "Fx" = ( /turf/closed/shuttle/elevator/gears, /area/adminlevel/chinook/offices) @@ -7899,15 +7672,6 @@ }, /turf/open/floor/wood, /area/adminlevel/chinook) -"FX" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/chinook/cargo) "FY" = ( /turf/open/floor/kutjevo/tan/alt_edge/east, /area/adminlevel/chinook) @@ -7948,15 +7712,6 @@ }, /turf/open/floor/almayer/silver/north, /area/adminlevel/chinook) -"Gi" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/chinook/engineering) "Gk" = ( /obj/structure/sign/safety/medical{ pixel_y = 25 @@ -7984,6 +7739,12 @@ }, /turf/open/floor/almayer/silver/north, /area/adminlevel/chinook) +"Gr" = ( +/obj/vehicle/powerloader, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/almayer/test_floor4, +/area/adminlevel/chinook/cargo) "Gt" = ( /obj/structure/sign/safety/galley{ pixel_y = 25 @@ -8023,6 +7784,10 @@ /obj/structure/surface/table/reinforced/almayer_B, /turf/open/floor/almayer/red/west, /area/adminlevel/chinook/sec) +"Gy" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/chinook/engineering) "Gz" = ( /obj/structure/bed/chair/comfy{ dir = 1 @@ -8044,10 +7809,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/adminlevel/chinook/sec) -"GD" = ( -/obj/structure/machinery/door/airlock/almayer/generic, -/turf/open/shuttle/dropship/light_grey_single_wide_up_to_down, -/area/adminlevel/chinook/shuttle/unpowered) "GE" = ( /obj/structure/largecrate/supply/medicine/blood, /turf/open/floor/almayer/plate, @@ -8151,8 +7912,15 @@ /obj/structure/bed/chair/comfy{ dir = 8 }, -/turf/open/floor/carpet, -/area/adminlevel/chinook/offices) +/turf/open/floor/carpet, +/area/adminlevel/chinook/offices) +"GY" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/chinook/cargo) "Ha" = ( /obj/structure/window/framed/almayer, /turf/open/floor/plating, @@ -8248,6 +8016,11 @@ }, /turf/open/floor/plating/almayer, /area/adminlevel/chinook/sec) +"Hw" = ( +/obj/structure/platform/metal/strata/east, +/obj/structure/platform/metal/strata, +/turf/open/gm/river/pool, +/area/adminlevel/chinook) "Hx" = ( /turf/open/floor/kutjevo/tan/alt_edge, /area/adminlevel/chinook) @@ -8265,16 +8038,6 @@ /obj/structure/surface/table/reinforced/black, /turf/open/floor/carpet, /area/adminlevel/chinook/event) -"HA" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_ew_full_cap"; - layer = 3.5 - }, -/obj/structure/platform/strata/metal{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/adminlevel/chinook) "HC" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 8; @@ -8303,6 +8066,10 @@ /obj/item/stack/sheet/metal/large_stack, /turf/open/floor/almayer, /area/adminlevel/chinook/engineering) +"HI" = ( +/obj/structure/machinery/floodlight/landing, +/turf/open/floor/plating, +/area/adminlevel/chinook/shuttle) "HJ" = ( /obj/structure/machinery/door/airlock/almayer/security/glass{ dir = 1; @@ -8365,17 +8132,6 @@ /obj/structure/machinery/vending/snack, /turf/open/floor/almayer/plate, /area/adminlevel/chinook/engineering) -"HQ" = ( -/obj/structure/largecrate/supply, -/obj/effect/spawner/random/tool, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/sign/safety/coffee{ - pixel_x = -16 - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/chinook/cargo) "HR" = ( /obj/structure/largecrate/random/case/double, /obj/effect/decal/warning_stripes{ @@ -8528,6 +8284,10 @@ /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/adminlevel/chinook/offices) +"Iz" = ( +/obj/docking_port/stationary/emergency_response/idle_port1, +/turf/closed/wall/almayer/white, +/area/adminlevel/chinook/medical) "IA" = ( /obj/structure/machinery/light{ dir = 4 @@ -8535,12 +8295,6 @@ /obj/structure/bed/sofa/south/grey/right, /turf/open/floor/kutjevo/tan, /area/adminlevel/chinook/event) -"IB" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/kutjevo/plate, -/area/adminlevel/chinook/event) "IC" = ( /obj/structure/bed/chair/comfy/black, /turf/open/floor/almayer/red/west, @@ -8559,11 +8313,6 @@ /obj/structure/machinery/disposal, /turf/open/floor/almayer/orange/east, /area/adminlevel/chinook/engineering) -"IK" = ( -/turf/closed/shuttle/ert{ - icon_state = "rightengine_1" - }, -/area/adminlevel/chinook/shuttle/unpowered) "IL" = ( /obj/structure/machinery/disposal, /turf/open/floor/almayer/green/north, @@ -8604,6 +8353,13 @@ }, /turf/open/floor/kutjevo/plate, /area/adminlevel/chinook) +"IV" = ( +/obj/vehicle/powerloader, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform/metal/almayer/west, +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/almayer/test_floor4, +/area/adminlevel/chinook/cargo) "IW" = ( /obj/structure/machinery/door/poddoor/almayer/open{ dir = 4; @@ -8666,6 +8422,13 @@ }, /turf/open/floor/almayer/blue/north, /area/adminlevel/chinook) +"Ji" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/barricade/handrail/strata{ + layer = 4.5 + }, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/chinook/engineering) "Jm" = ( /obj/structure/bed/sofa/south/grey/left, /turf/open/floor/kutjevo/tan, @@ -8742,12 +8505,6 @@ }, /turf/open/floor/almayer/plate, /area/adminlevel/chinook) -"JB" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/chinook/cargo) "JC" = ( /obj/structure/machinery/vending/hydroseeds, /turf/open/floor/plating/plating_catwalk, @@ -8773,14 +8530,6 @@ /obj/structure/machinery/light, /turf/open/floor/almayer/sterile_green, /area/adminlevel/chinook/medical) -"JI" = ( -/obj/structure/platform, -/obj/structure/stairs/perspective{ - dir = 4; - icon_state = "p_stair_full" - }, -/turf/open/floor/almayer, -/area/adminlevel/chinook/cargo) "JJ" = ( /obj/structure/surface/rack, /turf/open/floor/almayer/red/northeast, @@ -8836,10 +8585,6 @@ /obj/item/clothing/under/shorts/grey, /turf/open/floor/almayer/plate, /area/adminlevel/chinook) -"JU" = ( -/obj/structure/platform_decoration, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/chinook/engineering) "JV" = ( /obj/structure/surface/rack, /turf/open/floor/almayer/cargo, @@ -8859,15 +8604,11 @@ }, /turf/open/floor/almayer/plating/northeast, /area/adminlevel/chinook/cargo) -"Kd" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 4 - }, +"Kc" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, /turf/open/floor/almayer/plating/northeast, -/area/adminlevel/chinook/cargo) +/area/adminlevel/chinook/engineering) "Ke" = ( /obj/structure/window/framed/almayer/hull, /turf/open/floor/plating, @@ -8883,21 +8624,6 @@ /obj/structure/barricade/handrail/strata, /turf/open/floor/almayer, /area/adminlevel/chinook/engineering) -"Kj" = ( -/obj/structure/stairs/perspective{ - icon_state = "p_stair_full" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/chinook/cargo) -"Kl" = ( -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/chinook/engineering) "Km" = ( /obj/structure/bed, /obj/item/bedsheet/medical, @@ -9022,17 +8748,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/adminlevel/chinook) -"KK" = ( -/obj/structure/closet/crate, -/obj/item/clothing/gloves/marine/insulated, -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 1 - }, -/turf/open/floor/almayer/cargo, -/area/adminlevel/chinook/cargo) "KM" = ( /obj/structure/machinery/light{ dir = 8 @@ -9063,6 +8778,10 @@ "KT" = ( /turf/open/floor/almayer/silver/northeast, /area/adminlevel/chinook) +"KU" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/carpet, +/area/adminlevel/chinook/event) "KV" = ( /obj/structure/machinery/door/poddoor/almayer{ dir = 4; @@ -9392,6 +9111,10 @@ }, /turf/open/floor/almayer, /area/adminlevel/chinook) +"LZ" = ( +/obj/structure/platform_decoration/metal/strata, +/turf/open/gm/river/pool, +/area/adminlevel/chinook) "Mb" = ( /turf/open/floor/kutjevo/tan/plate, /area/adminlevel/chinook/event) @@ -9450,6 +9173,11 @@ }, /turf/open/floor/almayer/plate, /area/adminlevel/chinook/medical) +"Mo" = ( +/obj/structure/platform/metal/strata/north, +/obj/structure/platform/metal/strata/east, +/turf/open/gm/river/pool, +/area/adminlevel/chinook) "Mp" = ( /obj/structure/prop/almayer/name_stencil{ icon_state = "chinook4"; @@ -9461,11 +9189,6 @@ /obj/structure/machinery/iv_drip, /turf/open/floor/almayer/sterile_green_side/west, /area/adminlevel/chinook/medical) -"Ms" = ( -/turf/closed/shuttle/ert{ - icon_state = "stan5" - }, -/area/adminlevel/chinook/shuttle/unpowered) "Mt" = ( /obj/structure/surface/table/reinforced/black, /obj/item/book/manual/marine_law{ @@ -9474,6 +9197,11 @@ }, /turf/open/floor/carpet, /area/adminlevel/chinook/sec) +"Mu" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/almayer/plating_striped/east, +/area/adminlevel/chinook/cargo) "Mv" = ( /obj/effect/spawner/random/tool, /obj/item/clothing/gloves/marine/insulated, @@ -9522,12 +9250,6 @@ }, /turf/open/floor/almayer/red, /area/adminlevel/chinook/sec) -"MD" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/chinook/engineering) "ME" = ( /obj/structure/surface/table/reinforced/black, /obj/item/book/manual/marine_law{ @@ -9615,6 +9337,18 @@ /obj/structure/machinery/light, /turf/open/floor/almayer/plate, /area/adminlevel/chinook/engineering) +"MZ" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/chinook/cargo) +"Na" = ( +/obj/structure/machinery/door/poddoor/almayer{ + dir = 4; + id = "chinookairlock1"; + name = "\improper Chinook Shuttle Airlock" + }, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/chinook/shuttle) "Nb" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer/plating/northeast, @@ -9869,13 +9603,6 @@ }, /turf/open/floor/almayer/plate, /area/adminlevel/chinook/sec) -"Oj" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/largecrate/random/barrel/yellow, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/chinook/cargo) "On" = ( /obj/structure/surface/table/almayer, /obj/item/device/defibrillator, @@ -9907,6 +9634,14 @@ /obj/structure/closet/secure_closet/medical_doctor, /turf/open/floor/almayer/sterile_green_side/west, /area/adminlevel/chinook/medical) +"Ov" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" + }, +/turf/open/floor/kutjevo/plate, +/area/adminlevel/chinook/event) "Ow" = ( /obj/structure/bed/chair/comfy{ dir = 4 @@ -10010,13 +9745,6 @@ /obj/structure/machinery/vending/snack, /turf/open/floor/kutjevo/plate, /area/adminlevel/chinook/offices) -"OS" = ( -/obj/structure/prop/pred_flight{ - icon_state = "syndishuttle"; - name = "shuttle control console" - }, -/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, -/area/adminlevel/chinook/shuttle/unpowered) "OT" = ( /obj/structure/machinery/cm_vending/clothing/synth/snowflake, /obj/structure/machinery/light{ @@ -10060,13 +9788,6 @@ "OY" = ( /turf/open/floor/carpet, /area/adminlevel/chinook) -"OZ" = ( -/obj/structure/platform, -/obj/structure/barricade/handrail/strata{ - layer = 4.5 - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/chinook/engineering) "Pa" = ( /obj/structure/surface/table/almayer, /obj/item/storage/fancy/cigarettes/emeraldgreen{ @@ -10093,12 +9814,6 @@ /obj/structure/closet/emcloset, /turf/open/floor/almayer/red/north, /area/adminlevel/chinook/sec) -"Pe" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 4 - }, -/turf/open/gm/river/pool, -/area/adminlevel/chinook) "Pf" = ( /turf/open/floor/kutjevo/colors/blue/edge/east, /area/adminlevel/chinook) @@ -10140,15 +9855,6 @@ /obj/item/trash/uscm_mre, /turf/open/floor/almayer/plate, /area/adminlevel/chinook/engineering) -"Po" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N" - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/chinook/cargo) "Pp" = ( /obj/item/reagent_container/glass/bucket/janibucket, /turf/open/floor/almayer/plate, @@ -10243,6 +9949,10 @@ }, /turf/open/floor/almayer/cargo, /area/adminlevel/chinook/sec) +"PD" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/kutjevo, +/area/adminlevel/chinook/event) "PE" = ( /obj/structure/machinery/light{ dir = 8 @@ -10258,6 +9968,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plate, /area/adminlevel/chinook/sec) +"PH" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/platform/metal/almayer/west, +/obj/structure/prop/invuln/fusion_reactor, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/chinook/engineering) "PI" = ( /obj/structure/machinery/sleep_console{ dir = 8 @@ -10270,20 +9988,23 @@ /obj/item/reagent_container/glass/bucket/mopbucket, /turf/open/floor/almayer/plate, /area/adminlevel/chinook/sec) -"PL" = ( -/obj/structure/machinery/door/poddoor/almayer{ - dir = 4; - id = "chinookairlock1"; - name = "\improper Chinook Shuttle Airlock" - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/chinook/shuttle/unpowered) "PM" = ( /turf/open/floor/almayer/green/west, /area/adminlevel/chinook) "PP" = ( /turf/open/floor/almayer/green, /area/adminlevel/chinook) +"PQ" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/stairs/perspective{ + dir = 4; + icon_state = "p_stair_full" + }, +/obj/structure/barricade/handrail/strata{ + layer = 4.5 + }, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/chinook/engineering) "PR" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/storage/toolbox/mechanical, @@ -10389,11 +10110,10 @@ /obj/item/tool/soap, /turf/open/floor/almayer/plate, /area/adminlevel/chinook/engineering) -"Qk" = ( -/turf/closed/shuttle/ert{ - icon_state = "stan21" - }, -/area/adminlevel/chinook/shuttle/unpowered) +"Qj" = ( +/obj/docking_port/stationary/emergency_response/chinook_port, +/turf/open/floor/plating, +/area/adminlevel/chinook/shuttle) "Qm" = ( /turf/open/floor/almayer/blue/west, /area/adminlevel/chinook/offices) @@ -10678,12 +10398,6 @@ /obj/structure/machinery/cm_vending/sorted/tech/tool_storage, /turf/open/floor/almayer/plate, /area/adminlevel/chinook/offices) -"Rp" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/almayer/plating_striped/east, -/area/adminlevel/chinook/cargo) "Rq" = ( /obj/structure/closet/fireaxecabinet{ pixel_y = 25 @@ -10696,21 +10410,6 @@ }, /turf/open/floor/almayer/silver/north, /area/adminlevel/chinook) -"Rt" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/sign/safety/high_voltage{ - pixel_x = -15; - pixel_y = 5 - }, -/obj/structure/sign/safety/hazard{ - pixel_x = -15; - pixel_y = -7 - }, -/obj/structure/prop/invuln/fusion_reactor, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/chinook/engineering) "Rw" = ( /obj/structure/machinery/disposal, /turf/open/floor/almayer/sterile_green_corner/east, @@ -10741,12 +10440,6 @@ }, /turf/open/floor/almayer/red/northwest, /area/adminlevel/chinook/sec) -"RD" = ( -/obj/structure/machinery/light, -/obj/structure/platform, -/obj/structure/prop/invuln/fusion_reactor, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/chinook/engineering) "RE" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 26 @@ -10857,6 +10550,11 @@ }, /turf/open/floor/almayer/plating/northeast, /area/adminlevel/chinook/sec) +"Sf" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/chinook/engineering) "Sg" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/toolbox, @@ -11050,14 +10748,6 @@ }, /turf/open/floor/almayer/plate, /area/adminlevel/chinook) -"SV" = ( -/obj/structure/platform/stair_cut/alt, -/obj/structure/stairs/perspective{ - icon_state = "p_stair_ew_full_cap"; - layer = 3.5 - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/chinook/engineering) "SX" = ( /obj/structure/machinery/suit_storage_unit/compression_suit/uscm, /turf/open/floor/almayer/test_floor5, @@ -11098,9 +10788,6 @@ }, /turf/open/floor/almayer/plating/northeast, /area/adminlevel/chinook/engineering) -"Ti" = ( -/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, -/area/adminlevel/chinook/shuttle/unpowered) "Tj" = ( /turf/open/floor/almayer/bluecorner/west, /area/adminlevel/chinook) @@ -11483,6 +11170,15 @@ /obj/structure/machinery/computer/sentencing, /turf/open/floor/almayer/red/north, /area/adminlevel/chinook/sec) +"US" = ( +/obj/structure/closet/crate, +/obj/item/clothing/gloves/marine/insulated, +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/platform_decoration/metal/almayer/north, +/turf/open/floor/almayer/cargo, +/area/adminlevel/chinook/cargo) "UU" = ( /obj/structure/surface/rack, /obj/item/clothing/suit/straight_jacket, @@ -11499,11 +11195,6 @@ /obj/item/clothing/glasses/sunglasses/blindfold, /turf/open/floor/almayer/cargo, /area/adminlevel/chinook/sec) -"UV" = ( -/turf/closed/shuttle/ert{ - icon_state = "stan_rightengine" - }, -/area/adminlevel/chinook/shuttle/unpowered) "UW" = ( /obj/structure/surface/table/reinforced/black, /obj/item/reagent_container/food/drinks/coffeecup/uscm{ @@ -11520,16 +11211,6 @@ /obj/structure/machinery/disposal, /turf/open/floor/almayer/sterile_green_corner/west, /area/adminlevel/chinook/medical) -"UY" = ( -/obj/vehicle/powerloader, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/almayer/test_floor4, -/area/adminlevel/chinook/cargo) "UZ" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 @@ -11537,10 +11218,6 @@ /obj/structure/closet/secure_closet/brig, /turf/open/floor/almayer/cargo, /area/adminlevel/chinook/sec) -"Va" = ( -/obj/structure/surface/rack, -/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, -/area/adminlevel/chinook/shuttle/unpowered) "Vb" = ( /turf/open/floor/almayer/blue/west, /area/adminlevel/chinook) @@ -11639,6 +11316,14 @@ /obj/structure/largecrate/supply/generator, /turf/open/floor/almayer/plate, /area/adminlevel/chinook/medical) +"Vy" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_ew_full_cap"; + layer = 3.5 + }, +/obj/structure/platform/metal/stair_cut/platform_right, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/chinook/engineering) "Vz" = ( /turf/open/floor/almayer/silver/west, /area/adminlevel/chinook) @@ -11651,6 +11336,14 @@ }, /turf/open/floor/almayer/red/east, /area/adminlevel/chinook/sec) +"VC" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/chinook/engineering) +"VD" = ( +/obj/structure/platform_decoration/metal/strata/west, +/turf/open/gm/river/pool, +/area/adminlevel/chinook) "VE" = ( /obj/structure/machinery/light{ dir = 1 @@ -11678,6 +11371,15 @@ /obj/structure/machinery/telecomms/receiver, /turf/open/floor/almayer/tcomms, /area/adminlevel/chinook/engineering) +"VL" = ( +/obj/structure/largecrate/supply, +/obj/effect/spawner/random/tool, +/obj/structure/platform/metal/almayer/west, +/obj/structure/sign/safety/coffee{ + pixel_x = -16 + }, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/chinook/cargo) "VN" = ( /obj/item/smallDelivery{ pixel_x = -13; @@ -11754,6 +11456,14 @@ }, /turf/open/floor/almayer/sterile_green_side, /area/adminlevel/chinook/medical) +"VX" = ( +/obj/structure/stairs/perspective{ + icon_state = "p_stair_ew_full_cap"; + layer = 3.5 + }, +/obj/structure/platform/metal/stair_cut/platform_right, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/chinook/cargo) "VY" = ( /turf/open/floor/almayer/dark_sterile, /area/adminlevel/chinook/offices) @@ -11803,6 +11513,15 @@ }, /turf/open/floor/almayer/emerald/west, /area/adminlevel/chinook/shuttle) +"Wj" = ( +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_ew_full_cap"; + layer = 2.1 + }, +/obj/structure/platform/metal/stair_cut/platform_left, +/turf/open/floor/kutjevo/plate, +/area/adminlevel/chinook/event) "Wl" = ( /obj/structure/closet/crate, /obj/item/circuitboard, @@ -12012,6 +11731,10 @@ "WY" = ( /turf/open/floor/almayer_hull/outerhull_dir/southeast, /area/space) +"WZ" = ( +/obj/structure/platform/metal/almayer/north, +/turf/open/floor/kutjevo/plate, +/area/adminlevel/chinook/event) "Xa" = ( /obj/structure/surface/table/reinforced/black, /obj/item/reagent_container/food/drinks/cans/beer{ @@ -12082,9 +11805,6 @@ /obj/structure/closet/firecloset, /turf/open/floor/almayer/silver/northeast, /area/adminlevel/chinook) -"Xl" = ( -/turf/open/floor/plating, -/area/adminlevel/chinook/shuttle/unpowered) "Xm" = ( /obj/structure/window/framed/almayer/hull, /turf/open/floor/plating, @@ -12168,17 +11888,6 @@ /obj/structure/largecrate/supply/medicine/optable, /turf/open/floor/almayer/plate, /area/adminlevel/chinook/medical) -"XK" = ( -/obj/vehicle/powerloader, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/almayer/test_floor4, -/area/adminlevel/chinook/cargo) "XL" = ( /obj/structure/machinery/door/airlock/almayer/security/glass{ dir = 1; @@ -12251,6 +11960,11 @@ /obj/structure/machinery/light, /turf/open/floor/almayer/red/east, /area/adminlevel/chinook) +"XX" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/prop/invuln/fusion_reactor, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/chinook/engineering) "XZ" = ( /obj/structure/machinery/chem_dispenser, /turf/open/floor/almayer/sterile_green_side/east, @@ -12323,12 +12037,6 @@ "Yj" = ( /turf/open/floor/almayer, /area/adminlevel/chinook/cryo) -"Yk" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/chinook/cargo) "Ym" = ( /obj/structure/machinery/computer/crew, /turf/open/floor/almayer/sterile_green_corner/east, @@ -12446,6 +12154,11 @@ /obj/effect/spawner/random/toolbox, /turf/open/floor/almayer/test_floor5, /area/adminlevel/chinook/cryo) +"YJ" = ( +/obj/structure/platform/metal/strata/west, +/obj/structure/platform/metal/strata, +/turf/open/gm/river/pool, +/area/adminlevel/chinook) "YK" = ( /obj/structure/sign/poster{ pixel_y = 32 @@ -12646,9 +12359,6 @@ /obj/structure/machinery/constructable_frame, /turf/open/floor/almayer, /area/adminlevel/chinook/engineering) -"Zt" = ( -/turf/open/shuttle/dropship/light_grey_single_wide_up_to_down, -/area/adminlevel/chinook/shuttle/unpowered) "Zu" = ( /turf/open/floor/almayer_hull/outerhull_dir/north, /area/space) @@ -14261,17 +13971,17 @@ ow lO ZZ CF -xq -wX -wX -wX -wX -wX -wX -wX -wX -wX -to +vY +Cc +Cc +Cc +Cc +Cc +Cc +Cc +Cc +Cc +YJ bY fu af @@ -14388,7 +14098,7 @@ ZZ lO ZZ CF -pv +CD pX pX pX @@ -14398,7 +14108,7 @@ pX BJ pX pX -nk +Bm bY fu af @@ -14514,8 +14224,8 @@ ZZ Tl lO qZ -qv -Pe +rZ +CR pX pX pX @@ -14525,7 +14235,7 @@ pX pX pX pX -nk +Bm bY fu af @@ -14641,8 +14351,8 @@ ZZ Tl lO qZ -Ep -mC +io +VD pX pX pX @@ -14652,7 +14362,7 @@ pX pX pX pX -nk +Bm bY SP af @@ -14769,7 +14479,7 @@ ow lO ZZ CF -pv +CD pX BJ pX @@ -14779,7 +14489,7 @@ pX pX pX pX -nk +Bm fL SP af @@ -14896,17 +14606,17 @@ ZZ lO ZZ CF -xf -eO -eO -eO -eO -eO -eO -mC -gM -eO -mD +Mo +Cv +Cv +Cv +Cv +Cv +Cv +VD +LZ +Cv +Hw bY SP af @@ -15030,8 +14740,8 @@ oG Vb Vb gj -HA -eq +ft +rg Ry Vb ZZ @@ -18841,14 +18551,14 @@ UK YA bz Ki -sW -pg +nw +ke UK UK UK UK -iw -yO +EY +PQ ZX Ig RM @@ -18968,14 +18678,14 @@ UK YD bz Ki -ot -Kl -AV -eA -Rt -AV -Fv -OZ +VC +yt +wa +PH +EH +wa +gx +Ji IP zC Zz @@ -19095,14 +18805,14 @@ UK YG bz Ki -Gi -MD +Sf +Gy no no no no UE -OZ +Ji jk Ig RM @@ -19223,13 +18933,13 @@ Qr bz Ig uW -ot +VC mA mA mA mA iP -zX +XX UK jS RM @@ -19350,13 +19060,13 @@ HW ZB Il Rl -ot +VC Hn Hn Hn Hn iP -zX +XX UK Lm RM @@ -19477,13 +19187,13 @@ Mm Nv Il PR -ot +VC Hn Hn Hn Hn iP -RD +Du UK bJ RM @@ -19604,13 +19314,13 @@ et bz Ig Ct -ot +VC Vg Hy tS lV iP -zX +XX UK lH RM @@ -19621,7 +19331,7 @@ UK bz jI pp -RM +qs XH df df @@ -19730,14 +19440,14 @@ gh YI bz Ki -cm -Fv +Kc +gx mA mA mA mA UE -OZ +Ji jK Ig OC @@ -19857,14 +19567,14 @@ gh UF bz Ki -ot -JU -eG -pT -eG -eG -MD -OZ +VC +lp +zo +yk +zo +zo +Gy +Ji cv zC hd @@ -19984,14 +19694,14 @@ gh YK bz Ki -SV -nj +my +jX UK UK UK UK -jp -zU +Vy +DF dr iZ Qh @@ -20890,7 +20600,7 @@ Iv Zc Iv Iv -Iv +Iz Iv KI Iv @@ -22367,8 +22077,8 @@ Tl Tm TQ TQ -oh -ld +tg +iM SL wj wj @@ -22495,7 +22205,7 @@ Tm Vr Vr Vr -BP +cq SL wj wj @@ -22622,7 +22332,7 @@ Tm lD Vr Vr -BP +cq SL wj wj @@ -22749,7 +22459,7 @@ Tm WU Vr om -pP +KU Vr Vr Vr @@ -22811,7 +22521,7 @@ As pw JY pw -qS +DU pw gp pw @@ -22876,7 +22586,7 @@ Tm kG Vr om -pP +KU Vr Vr Vr @@ -22929,16 +22639,16 @@ aw aw lQ lQ -pU -JI +if +xQ As lQ As As pw pw -Kj -ay +zy +GY pw pw pw @@ -23003,7 +22713,7 @@ Tm Qt Vr Vr -BP +cq SL wj wj @@ -23051,18 +22761,18 @@ ph aw Vq dn -FX +bT LQ OD -KK -Yk -uC -rw -HQ -vQ +US +MZ +nK +cb +VL +br OH As -XK +IV WV hi ar @@ -23130,7 +22840,7 @@ Tm Vr Vr Vr -BP +cq SL wj wj @@ -23178,7 +22888,7 @@ pe aw Vq dn -qS +DU Nt pw te @@ -23256,8 +22966,8 @@ kq Tm TQ TQ -oz -BV +AA +PD SL wj wj @@ -23304,8 +23014,8 @@ uF qf aw Nw -BU -uC +yG +nK Vq pw Vq @@ -23316,10 +23026,10 @@ pw pw Nc As -UY +Gr WV -Kd -Cp +dm +pO pw Ex BC @@ -23446,7 +23156,7 @@ Ke fi os ik -qS +DU pw pw TA @@ -23558,8 +23268,8 @@ aw aw aw cQ -jb -JB +mx +At hS pw me @@ -23570,10 +23280,10 @@ pw pw pw zL -Po -Yk -Yk -uC +vL +MZ +MZ +nK pw pw vZ @@ -23686,13 +23396,13 @@ Nm lQ Vq cu -sU -Rp -Rp -Rp -Rp -ls -JB +Mu +ig +ig +ig +ig +Ee +At VN pw pw @@ -23819,7 +23529,7 @@ Vq Vq Vq Vq -pl +VX lb pw pw @@ -23947,8 +23657,8 @@ Vq Vq Vq Vq -jb -JB +mx +At pw Ke pw @@ -24075,7 +23785,7 @@ Mv Vq Go YM -qS +DU Cn Id vU @@ -24202,7 +23912,7 @@ uj Vq Vq bA -Oj +mL Sc Id BC @@ -25595,23 +25305,23 @@ QF QF QF Br -uR -Xl -Xl -Xl -Xl -Xl -Xl -Xl -Xl -Xl -Xl -Xl -Xl -Xl -Xl -Xl -uR +HI +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +HI tC af Wf @@ -25662,7 +25372,7 @@ Zu al Qx TQ -il +WZ SL SL kA @@ -25722,23 +25432,23 @@ Yp Yp Yp Br -Xl -Xl -Xl -gy -DJ -GD -DJ -DJ -DJ -GD -DJ -fD -Cb -oD -ri -Xl -Xl +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +Qj +sq +sq hM af Wf @@ -25789,11 +25499,11 @@ Zu al Qx NU -il -iD -jN -jN -ld +WZ +nW +BT +BT +iM Mc Mc zw @@ -25849,23 +25559,23 @@ lh lh tm Br -Xl -Xl -Xl -Qk -Va -Ti -aj -aj -aj -Ti -Va -pi -DJ -DJ -Ad -Xl -Xl +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq hM af Wf @@ -25916,11 +25626,11 @@ Zu al SR TQ -in -iG +DI +Ov dQ kB -IB +WZ Mc Mc nP @@ -25976,23 +25686,23 @@ Mh Mh Mh Br -Xl -Xl -gy -tf -hc -Zt -Zt -Zt -Zt -Zt -xW -Ti -Ti -Ti -fw -Xl -Xl +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq hM af Wf @@ -26047,7 +25757,7 @@ ip iH WQ Hz -IB +WZ Mc Mc nV @@ -26103,23 +25813,23 @@ Br Br Br Br -Xl -Xl -yh -OS -mX -El -El -El -El -El -mX -Zt -Zt -Zt -Ai -Xl -Xl +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq hM af Wf @@ -26174,7 +25884,7 @@ BX JR Vr kC -IB +WZ Hz Vr Vr @@ -26230,23 +25940,23 @@ yw WI mu Br -Xl -Xl -tN -xK -vC -Zt -Zt -Zt -Zt -Zt -CP -Ti -Ti -Ti -fw -Xl -Xl +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq hM af Wf @@ -26301,7 +26011,7 @@ BX JR WQ kD -IB +WZ mg IM Vr @@ -26357,23 +26067,23 @@ Um Um Um Br -Xl -Xl -Xl -Qk -Va -Ti -pG -pG -pG -Ti -Va -AU -Ms -Ms -jR -Xl -Xl +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq hM af Wf @@ -26428,7 +26138,7 @@ BX JR Vr kG -IB +WZ mi Vr Vr @@ -26484,23 +26194,23 @@ DO DO mh Br -Xl -Xl -Xl -tN -Ms -GD -Ms -Ms -Ms -GD -Ms -UV -fP -Dy -IK -Xl -Xl +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq hM af Wf @@ -26555,7 +26265,7 @@ iq JX WQ Hz -IB +WZ Mc Mc nX @@ -26611,23 +26321,23 @@ Tu Tu Tu Br -uR -Xl -Xl -Xl -Xl -Xl -Xl -Xl -Xl -Xl -Xl -Xl -Xl -Xl -Xl -Xl -uR +HI +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +sq +HI tC af Wf @@ -26678,11 +26388,11 @@ Zu al SR TQ -iu -iL +Wj +gn dQ kB -IB +WZ Mc Mc nY @@ -26738,23 +26448,23 @@ Se yy kk Br -jq -PL -PL -PL -PL -PL -PL -PL -PL -PL -PL -PL -PL -PL -PL -PL -jq +tC +Na +Na +Na +Na +Na +Na +Na +Na +Na +Na +Na +Na +Na +Na +Na +tC tC af oi @@ -26805,11 +26515,11 @@ Zu al Qx NU -il -iN -jO -jO -BV +WZ +CO +ev +ev +PD Mc Mc zw @@ -26932,7 +26642,7 @@ Zu al Qx TQ -il +WZ SL SL kI diff --git a/maps/templates/lazy_templates/clf_ert_station.dmm b/maps/templates/lazy_templates/clf_ert_station.dmm index c1ec79d8770c..b3cccf7f03cd 100644 --- a/maps/templates/lazy_templates/clf_ert_station.dmm +++ b/maps/templates/lazy_templates/clf_ert_station.dmm @@ -82,35 +82,6 @@ }, /turf/open/floor/wood/wood_broken6, /area/adminlevel/ert_station/clf_station) -"aO" = ( -/obj/structure/stairs/perspective{ - color = "#6b675e"; - dir = 6; - icon_state = "p_stair_full" - }, -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/turf/open/auto_turf/strata_grass/layer1, -/area/adminlevel/ert_station/clf_station) -"aR" = ( -/obj/structure/platform/kutjevo, -/obj/structure/flora/bush/ausbushes/grassybush{ - icon_state = "fullgrass_1" - }, -/turf/open/auto_turf/strata_grass/layer0_mud_alt, -/area/adminlevel/ert_station/clf_station) -"bb" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - dir = 5; - icon_state = "p_stair_full" - }, -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/turf/open/auto_turf/strata_grass/layer1, -/area/adminlevel/ert_station/clf_station) "by" = ( /turf/open/auto_turf/strata_grass/layer0, /area/adminlevel/ert_station/clf_station) @@ -124,12 +95,6 @@ }, /turf/open/auto_turf/strata_grass/layer1, /area/adminlevel/ert_station/clf_station) -"bX" = ( -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/turf/open/auto_turf/strata_grass/layer0_mud_alt, -/area/adminlevel/ert_station/clf_station) "cc" = ( /obj/structure/closet/secure_closet/freezer/fridge/full, /obj/item/reagent_container/food/condiment/enzyme, @@ -158,6 +123,11 @@ "cH" = ( /turf/open/floor/wood/wood_broken, /area/adminlevel/ert_station/clf_station) +"cT" = ( +/obj/structure/platform/metal/kutjevo/north, +/obj/structure/platform/metal/kutjevo/east, +/turf/open/gm/grass, +/area/adminlevel/ert_station/clf_station) "dd" = ( /turf/open/gm/coast/south, /area/adminlevel/ert_station/clf_station) @@ -174,26 +144,9 @@ /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/grass, /area/adminlevel/ert_station/clf_station) -"dU" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/turf/open/auto_turf/strata_grass/layer1, -/area/adminlevel/ert_station/clf_station) -"dY" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/obj/structure/flora/jungle/vines/heavy, -/turf/open/auto_turf/strata_grass/layer1, -/area/adminlevel/ert_station/clf_station) -"eh" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, +"eg" = ( +/obj/structure/platform/metal/kutjevo/west, +/obj/structure/largecrate/random/barrel/yellow, /turf/open/auto_turf/strata_grass/layer1, /area/adminlevel/ert_station/clf_station) "eo" = ( @@ -203,13 +156,6 @@ }, /turf/open/auto_turf/strata_grass/layer1, /area/adminlevel/ert_station/clf_station) -"ey" = ( -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/obj/structure/largecrate/random/barrel/yellow, -/turf/open/auto_turf/strata_grass/layer1, -/area/adminlevel/ert_station/clf_station) "eE" = ( /obj/structure/largecrate/black_market/clf_supplies, /turf/open/auto_turf/strata_grass/layer1, @@ -218,15 +164,6 @@ /obj/structure/window/framed/wood/reinforced, /turf/open/floor/wood, /area/adminlevel/ert_station/clf_station) -"eO" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/obj/structure/flora/bush/ausbushes/grassybush{ - icon_state = "fullgrass_1" - }, -/turf/open/auto_turf/strata_grass/layer1, -/area/adminlevel/ert_station/clf_station) "eP" = ( /obj/structure/window/framed/wood, /turf/open/floor/wood, @@ -240,23 +177,18 @@ /obj/structure/pipes/vents/pump, /turf/closed/wall/wood, /area/adminlevel/ert_station/clf_station) -"fo" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/auto_turf/strata_grass/layer1, -/area/adminlevel/ert_station/clf_station) "fx" = ( /obj/structure/largecrate/supply/medicine/blood, /turf/open/floor/wood, /area/adminlevel/ert_station/clf_station) -"fA" = ( -/obj/structure/platform/kutjevo{ - dir = 8 +"fI" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 9; + icon_state = "p_stair_full" }, -/obj/structure/flora/jungle/vines/heavy, -/turf/open/auto_turf/strata_grass/layer1, +/turf/open/auto_turf/strata_grass/layer0, /area/adminlevel/ert_station/clf_station) "fX" = ( /obj/structure/prop/wooden_cross, @@ -286,6 +218,11 @@ }, /turf/open/floor/prison/kitchen, /area/adminlevel/ert_station/clf_station) +"hj" = ( +/obj/structure/largecrate/supply/weapons/shotgun, +/obj/structure/platform/metal/kutjevo/west, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) "hr" = ( /obj/structure/machinery/light/small/built{ dir = 4 @@ -296,6 +233,15 @@ /obj/structure/bed/chair, /turf/open/floor/wood, /area/adminlevel/ert_station/clf_station) +"hH" = ( +/obj/structure/platform/metal/kutjevo, +/obj/structure/platform/metal/kutjevo/west, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"hK" = ( +/obj/structure/platform/metal/kutjevo/west, +/turf/open/auto_turf/strata_grass/layer0, +/area/adminlevel/ert_station/clf_station) "hL" = ( /obj/structure/window/reinforced{ dir = 4; @@ -332,26 +278,12 @@ /obj/structure/surface/table/woodentable/fancy, /turf/open/floor/wood, /area/adminlevel/ert_station/clf_station) -"ie" = ( -/obj/structure/machinery/iv_drip, -/turf/open/floor/wood, -/area/adminlevel/ert_station/clf_station) -"iB" = ( -/obj/structure/flora/grass/tallgrass/jungle/corner{ - dir = 10 - }, -/turf/open/auto_turf/strata_grass/layer1, -/area/adminlevel/ert_station/clf_station) -"iG" = ( -/obj/structure/flora/grass/tallgrass/jungle, -/obj/structure/flora/jungle/vines/heavy, -/turf/open/auto_turf/strata_grass/layer1, -/area/adminlevel/ert_station/clf_station) -"iK" = ( -/obj/structure/barricade/sandbags, -/turf/open/auto_turf/strata_grass/layer1, +"hY" = ( +/obj/structure/platform/metal/kutjevo/east, +/obj/structure/flora/bush/ausbushes/genericbush, +/turf/open/gm/grass/grass2, /area/adminlevel/ert_station/clf_station) -"iO" = ( +"ib" = ( /obj/structure/showcase{ color = "#95948B"; desc = "A grey statue dawned in ancient armor, it stares into your soul."; @@ -369,27 +301,46 @@ }, /obj/item/clothing/mask/yautja_flavor{ anchored = 1; - unacidable = 0 + unacidable = 0; + pixel_y = 10 }, /turf/open/floor/sandstone/runed, /area/adminlevel/ert_station/clf_station) -"jc" = ( -/obj/structure/platform_decoration/kutjevo, -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - dir = 5; - icon_state = "p_stair_full" - }, -/turf/open/auto_turf/strata_grass/layer0, +"ie" = ( +/obj/structure/machinery/iv_drip, +/turf/open/floor/wood, /area/adminlevel/ert_station/clf_station) -"jj" = ( +"iB" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, -/obj/structure/platform_decoration/kutjevo{ - dir = 8 +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"iC" = ( +/obj/structure/platform/metal/kutjevo, +/obj/structure/flora/grass/tallgrass/jungle/corner{ + dir = 5 }, -/turf/open/gm/grass/grass2, +/turf/open/gm/grass, +/area/adminlevel/ert_station/clf_station) +"iG" = ( +/obj/structure/flora/grass/tallgrass/jungle, +/obj/structure/flora/jungle/vines/heavy, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"iK" = ( +/obj/structure/barricade/sandbags, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"iR" = ( +/obj/structure/platform/metal/kutjevo/north, +/obj/structure/flora/jungle/vines/heavy, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"jb" = ( +/obj/structure/platform/metal/kutjevo/west, +/obj/structure/largecrate/supply/weapons/flamers, +/turf/open/auto_turf/strata_grass/layer1, /area/adminlevel/ert_station/clf_station) "jp" = ( /obj/structure/surface/table/woodentable/poor, @@ -400,6 +351,11 @@ /obj/structure/flora/bush/ausbushes/grassybush, /turf/open/auto_turf/strata_grass/layer1, /area/adminlevel/ert_station/clf_station) +"jV" = ( +/obj/structure/platform/metal/kutjevo/north, +/obj/structure/platform/metal/kutjevo/east, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) "jZ" = ( /obj/structure/flora/jungle/plantbot1, /turf/open/auto_turf/strata_grass/layer1, @@ -412,30 +368,12 @@ /obj/item/ammo_box/magazine/l42a, /turf/open/floor/wood, /area/adminlevel/ert_station/clf_station) -"ko" = ( -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/obj/structure/flora/jungle/vines, -/obj/structure/flora/jungle/vines{ - icon_state = "heavy_1" - }, -/turf/open/auto_turf/strata_grass/layer1, -/area/adminlevel/ert_station/clf_station) "kr" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 6 }, /turf/open/auto_turf/strata_grass/layer1, /area/adminlevel/ert_station/clf_station) -"ks" = ( -/obj/structure/platform/kutjevo, -/obj/structure/flora/bush/ausbushes/ppflowers, -/obj/structure/flora/bush/ausbushes/grassybush{ - icon_state = "fullgrass_1" - }, -/turf/open/auto_turf/strata_grass/layer0_mud_alt, -/area/adminlevel/ert_station/clf_station) "kF" = ( /obj/effect/decal/cleanable/blood, /obj/structure/surface/table/woodentable/poor, @@ -458,11 +396,10 @@ /obj/item/reagent_container/food/drinks/shaker, /turf/open/floor/wood, /area/adminlevel/ert_station/clf_station) -"la" = ( -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/turf/open/gm/grass, +"lo" = ( +/obj/structure/platform/metal/kutjevo/west, +/obj/structure/largecrate/supply/explosives/grenades, +/turf/open/auto_turf/strata_grass/layer1, /area/adminlevel/ert_station/clf_station) "lp" = ( /obj/structure/surface/table/woodentable/poor, @@ -475,20 +412,23 @@ }, /turf/open/floor/wood, /area/adminlevel/ert_station/clf_station) +"lz" = ( +/obj/structure/platform/metal/kutjevo/west, +/obj/structure/largecrate/random/secure, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"lD" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, +/obj/structure/flora/jungle/vines/heavy, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) "lI" = ( /obj/structure/largecrate/random/barrel/green, /turf/open/auto_turf/strata_grass/layer1, /area/adminlevel/ert_station/clf_station) -"lN" = ( -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, -/area/adminlevel/ert_station/clf_station) -"lT" = ( -/obj/structure/platform/kutjevo{ - dir = 8 - }, +"lL" = ( +/obj/structure/platform_decoration/metal/kutjevo, +/obj/structure/flora/bush/ausbushes/grassybush, /turf/open/auto_turf/strata_grass/layer1, /area/adminlevel/ert_station/clf_station) "lX" = ( @@ -509,15 +449,9 @@ }, /turf/open/floor/wood, /area/adminlevel/ert_station/clf_station) -"me" = ( -/obj/structure/platform_decoration/kutjevo, -/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, -/area/adminlevel/ert_station/clf_station) -"mk" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/obj/structure/flora/jungle/vines/heavy, +"mp" = ( +/obj/structure/platform/metal/kutjevo/west, +/obj/structure/largecrate/random/barrel/green, /turf/open/auto_turf/strata_grass/layer1, /area/adminlevel/ert_station/clf_station) "ms" = ( @@ -539,6 +473,11 @@ "mw" = ( /turf/open/floor/wood, /area/adminlevel/ert_station/clf_station) +"mx" = ( +/obj/structure/platform/metal/kutjevo/east, +/obj/structure/flora/jungle/vines/heavy, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) "mR" = ( /obj/structure/machinery/gibber{ pixel_y = 10 @@ -562,17 +501,6 @@ /obj/structure/flora/grass/tallgrass/jungle, /turf/open/auto_turf/strata_grass/layer1, /area/adminlevel/ert_station/clf_station) -"nr" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - dir = 9; - icon_state = "p_stair_full" - }, -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/auto_turf/strata_grass/layer1, -/area/adminlevel/ert_station/clf_station) "nC" = ( /obj/structure/surface/table/woodentable/poor, /obj/item/reagent_container/food/drinks/bottle/vodka, @@ -582,13 +510,6 @@ /obj/item/clothing/shoes/jackboots, /turf/open/floor/wood, /area/adminlevel/ert_station/clf_station) -"nM" = ( -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/obj/structure/largecrate/random/secure, -/turf/open/auto_turf/strata_grass/layer1, -/area/adminlevel/ert_station/clf_station) "nQ" = ( /obj/item/clothing/mask/cigarette/cigar/classic, /obj/structure/surface/table/woodentable/fancy, @@ -604,6 +525,11 @@ }, /turf/open/floor/wood, /area/adminlevel/ert_station/clf_station) +"oe" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, +/obj/structure/flora/bush/ausbushes/grassybush, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) "om" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east, /area/adminlevel/ert_station/clf_station) @@ -647,32 +573,15 @@ /obj/structure/flora/jungle/vines, /turf/closed/wall/strata_ice/jungle, /area/adminlevel/ert_station/clf_station) -"oO" = ( -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - dir = 10; - icon_state = "p_stair_full" - }, -/obj/structure/platform_decoration/kutjevo, +"pj" = ( +/obj/structure/platform/metal/kutjevo, +/obj/structure/flora/bush/ausbushes/grassybush, /turf/open/auto_turf/strata_grass/layer1, /area/adminlevel/ert_station/clf_station) "pk" = ( /obj/structure/flora/grass/tallgrass/jungle, /turf/open/auto_turf/strata_grass/layer1, /area/adminlevel/ert_station/clf_station) -"pp" = ( -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/turf/open/gm/grass/grass2, -/area/adminlevel/ert_station/clf_station) -"pE" = ( -/obj/structure/platform/kutjevo, -/obj/structure/flora/grass/tallgrass/jungle/corner{ - dir = 9 - }, -/turf/open/auto_turf/strata_grass/layer1, -/area/adminlevel/ert_station/clf_station) "pF" = ( /turf/open/floor/wood/wood_broken6, /area/adminlevel/ert_station/clf_station) @@ -698,6 +607,16 @@ /obj/structure/flora/bush/ausbushes/reedbush, /turf/open/gm/river, /area/adminlevel/ert_station/clf_station) +"qI" = ( +/obj/structure/platform/metal/kutjevo/west, +/obj/structure/platform/metal/kutjevo, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"qM" = ( +/obj/structure/platform/metal/kutjevo/north, +/obj/structure/closet/coffin/woodencrate, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) "rm" = ( /obj/structure/surface/table/woodentable/poor, /obj/item/device/healthanalyzer{ @@ -715,18 +634,6 @@ }, /turf/open/auto_turf/strata_grass/layer1, /area/adminlevel/ert_station/clf_station) -"rO" = ( -/obj/structure/platform/kutjevo, -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/turf/open/auto_turf/strata_grass/layer1, -/area/adminlevel/ert_station/clf_station) -"rZ" = ( -/obj/structure/platform/kutjevo, -/obj/structure/flora/jungle/vines/heavy, -/turf/open/auto_turf/strata_grass/layer1, -/area/adminlevel/ert_station/clf_station) "sv" = ( /obj/structure/target/syndicate, /obj/item/weapon/throwing_knife, @@ -738,6 +645,13 @@ /obj/item/restraint/handcuffs, /turf/open/floor/wood, /area/adminlevel/ert_station/clf_station) +"sy" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, +/obj/structure/flora/grass/tallgrass/jungle/corner{ + dir = 6 + }, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) "sC" = ( /obj/structure/flora/jungle/planttop1, /turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, @@ -764,6 +678,29 @@ }, /turf/open/auto_turf/strata_grass/layer1, /area/adminlevel/ert_station/clf_station) +"tc" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 5; + icon_state = "p_stair_full" + }, +/obj/structure/platform_decoration/metal/kutjevo/east, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"tf" = ( +/obj/structure/platform_decoration/metal/kutjevo, +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 5; + icon_state = "p_stair_full" + }, +/turf/open/auto_turf/strata_grass/layer0, +/area/adminlevel/ert_station/clf_station) +"ti" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, +/obj/structure/flora/jungle/vines/heavy, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) "ts" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 @@ -832,13 +769,6 @@ }, /turf/open/floor/wood/wood_broken3, /area/adminlevel/ert_station/clf_station) -"uF" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/obj/structure/closet/coffin/woodencrate, -/turf/open/auto_turf/strata_grass/layer1, -/area/adminlevel/ert_station/clf_station) "uO" = ( /obj/structure/bed{ icon_state = "abed" @@ -846,6 +776,13 @@ /obj/item/bedsheet/yellow, /turf/open/floor/wood, /area/adminlevel/ert_station/clf_station) +"uR" = ( +/obj/structure/platform/metal/kutjevo, +/obj/structure/flora/bush/ausbushes/grassybush{ + icon_state = "fullgrass_1" + }, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) "uX" = ( /turf/open/floor/plating, /area/adminlevel/ert_station/clf_station) @@ -864,6 +801,10 @@ }, /turf/open/floor/wood, /area/adminlevel/ert_station/clf_station) +"vn" = ( +/obj/structure/platform/metal/kutjevo, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) "vx" = ( /obj/structure/surface/table/woodentable/poor, /obj/item/trash/candle, @@ -872,24 +813,36 @@ }, /turf/open/floor/wood, /area/adminlevel/ert_station/clf_station) +"vy" = ( +/obj/structure/platform/metal/kutjevo, +/obj/structure/flora/bush/ausbushes/ppflowers, +/obj/structure/flora/bush/ausbushes/grassybush{ + icon_state = "fullgrass_1" + }, +/turf/open/auto_turf/strata_grass/layer0_mud_alt, +/area/adminlevel/ert_station/clf_station) "vA" = ( /obj/structure/largecrate/random/barrel/yellow, /turf/open/auto_turf/strata_grass/layer1, /area/adminlevel/ert_station/clf_station) -"vE" = ( -/obj/structure/largecrate/supply/weapons/shotgun, -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/turf/open/auto_turf/strata_grass/layer1, -/area/adminlevel/ert_station/clf_station) "vI" = ( /turf/open/floor/sandstone/runed, /area/adminlevel/ert_station/clf_station) -"vQ" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 +"vJ" = ( +/obj/structure/platform/metal/kutjevo/east, +/turf/open/gm/grass, +/area/adminlevel/ert_station/clf_station) +"wa" = ( +/obj/structure/platform/metal/kutjevo/west, +/turf/open/auto_turf/strata_grass/layer0_mud_alt, +/area/adminlevel/ert_station/clf_station) +"we" = ( +/obj/structure/stairs/perspective{ + color = "#6b675e"; + dir = 6; + icon_state = "p_stair_full" }, +/obj/structure/platform_decoration/metal/kutjevo/north, /turf/open/auto_turf/strata_grass/layer1, /area/adminlevel/ert_station/clf_station) "wI" = ( @@ -898,16 +851,22 @@ }, /turf/open/gm/grass, /area/adminlevel/ert_station/clf_station) -"wW" = ( -/turf/open/gm/coast/south_east, -/area/adminlevel/ert_station/clf_station) -"xi" = ( -/obj/structure/platform/kutjevo{ - dir = 8 +"wP" = ( +/obj/structure/platform/metal/kutjevo/west, +/obj/structure/flora/jungle/vines, +/obj/structure/flora/jungle/vines{ + icon_state = "heavy_1" }, -/obj/structure/largecrate/random/barrel/white, /turf/open/auto_turf/strata_grass/layer1, /area/adminlevel/ert_station/clf_station) +"wS" = ( +/obj/structure/platform/metal/kutjevo/west, +/obj/structure/largecrate/supply/explosives/mines, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"wW" = ( +/turf/open/gm/coast/south_east, +/area/adminlevel/ert_station/clf_station) "xE" = ( /turf/open/gm/coast/beachcorner2/south_east, /area/adminlevel/ert_station/clf_station) @@ -939,21 +898,19 @@ }, /turf/open/floor/wood, /area/adminlevel/ert_station/clf_station) -"xS" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/obj/structure/flora/jungle/vines/heavy, -/turf/open/auto_turf/strata_grass/layer1, -/area/adminlevel/ert_station/clf_station) "ye" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 5 }, /turf/open/gm/grass, /area/adminlevel/ert_station/clf_station) -"yy" = ( -/obj/structure/platform_decoration/kutjevo, +"yh" = ( +/obj/structure/platform/metal/kutjevo/east, +/turf/open/gm/dirtgrassborder/east, +/area/adminlevel/ert_station/clf_station) +"yp" = ( +/obj/structure/platform/metal/kutjevo, +/obj/structure/flora/jungle/vines/heavy, /turf/open/auto_turf/strata_grass/layer1, /area/adminlevel/ert_station/clf_station) "yE" = ( @@ -975,27 +932,32 @@ /obj/item/ammo_magazine/pistol/clfpistol, /turf/open/floor/wood/wood_broken3, /area/adminlevel/ert_station/clf_station) -"yO" = ( -/obj/structure/platform/kutjevo{ - dir = 4 +"yS" = ( +/obj/structure/platform/metal/kutjevo, +/obj/structure/flora/bush/ausbushes/grassybush{ + icon_state = "fullgrass_1" }, -/obj/structure/flora/bush/ausbushes/genericbush, -/turf/open/gm/grass/grass2, +/turf/open/auto_turf/strata_grass/layer0_mud_alt, /area/adminlevel/ert_station/clf_station) "yU" = ( /turf/open/gm/river, /area/adminlevel/ert_station/clf_station) -"yW" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/obj/structure/largecrate/random/case/small, -/turf/open/auto_turf/strata_grass/layer1, -/area/adminlevel/ert_station/clf_station) "yY" = ( /obj/structure/prop/brazier/frame/full, /turf/open/floor/plating/asteroidwarning, /area/adminlevel/ert_station/clf_station) +"zg" = ( +/obj/structure/platform/metal/kutjevo/west, +/obj/structure/largecrate/random/case/double, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"zk" = ( +/obj/structure/platform/metal/kutjevo, +/obj/structure/flora/grass/tallgrass/jungle/corner{ + dir = 1 + }, +/turf/open/gm/grass, +/area/adminlevel/ert_station/clf_station) "zy" = ( /obj/structure/machinery/light/small/built{ dir = 1 @@ -1022,30 +984,16 @@ "Ag" = ( /turf/open/auto_turf/strata_grass/layer0_mud_alt, /area/adminlevel/ert_station/clf_station) -"Ah" = ( -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, -/area/adminlevel/ert_station/clf_station) "Aj" = ( /obj/structure/flora/jungle/planttop1, /turf/open/gm/grass, /area/adminlevel/ert_station/clf_station) -"AE" = ( -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/turf/open/gm/dirtgrassborder/east, -/area/adminlevel/ert_station/clf_station) -"AK" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, +"Ax" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ - dir = 6 + dir = 10 }, -/turf/open/auto_turf/strata_grass/layer1, +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/gm/grass/grass2, /area/adminlevel/ert_station/clf_station) "AO" = ( /obj/structure/surface/table/woodentable/poor, @@ -1057,6 +1005,10 @@ }, /turf/open/floor/wood, /area/adminlevel/ert_station/clf_station) +"AP" = ( +/obj/structure/platform/metal/kutjevo/north, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) "AV" = ( /obj/structure/surface/table/woodentable/poor, /obj/item/ammo_magazine/smg/mac15/extended, @@ -1086,14 +1038,10 @@ /obj/item/trash/burger, /turf/open/floor/wood, /area/adminlevel/ert_station/clf_station) -"Bt" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/turf/open/gm/grass, +"Bo" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, +/obj/structure/largecrate/random/case/small, +/turf/open/auto_turf/strata_grass/layer1, /area/adminlevel/ert_station/clf_station) "Bx" = ( /obj/structure/closet/secure_closet/freezer/meat, @@ -1117,29 +1065,6 @@ }, /turf/open/floor/prison/kitchen, /area/adminlevel/ert_station/clf_station) -"BQ" = ( -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/obj/structure/platform/kutjevo, -/turf/open/auto_turf/strata_grass/layer1, -/area/adminlevel/ert_station/clf_station) -"BS" = ( -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/turf/open/auto_turf/strata_grass/layer0, -/area/adminlevel/ert_station/clf_station) -"BU" = ( -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/turf/open/auto_turf/strata_grass/layer0_mud, -/area/adminlevel/ert_station/clf_station) -"Ch" = ( -/obj/structure/platform/kutjevo, -/turf/open/auto_turf/strata_grass/layer1, -/area/adminlevel/ert_station/clf_station) "Ck" = ( /obj/structure/surface/table/woodentable/poor, /obj/item/device/radio/headset/distress/CLF, @@ -1147,6 +1072,11 @@ /obj/structure/machinery/recharger, /turf/open/floor/wood, /area/adminlevel/ert_station/clf_station) +"Cu" = ( +/obj/structure/platform/metal/kutjevo/west, +/obj/structure/flora/jungle/vines, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) "CE" = ( /obj/structure/flora/jungle/planttop1, /obj/structure/largecrate/random/secure, @@ -1166,6 +1096,10 @@ }, /turf/open/auto_turf/strata_grass/layer0_mud, /area/adminlevel/ert_station/clf_station) +"DB" = ( +/obj/structure/platform_decoration/metal/kutjevo, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) "DF" = ( /turf/open/floor/wood/wood_broken3, /area/adminlevel/ert_station/clf_station) @@ -1180,17 +1114,6 @@ }, /turf/open/floor/wood, /area/adminlevel/ert_station/clf_station) -"Eb" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - dir = 9; - icon_state = "p_stair_full" - }, -/turf/open/auto_turf/strata_grass/layer0, -/area/adminlevel/ert_station/clf_station) "Ee" = ( /turf/open/gm/dirtgrassborder/east, /area/adminlevel/ert_station/clf_station) @@ -1213,29 +1136,38 @@ }, /turf/open/floor/wood/wood_broken, /area/adminlevel/ert_station/clf_station) +"EZ" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, +/obj/structure/flora/bush/ausbushes/grassybush{ + icon_state = "fullgrass_1" + }, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) "Fj" = ( /obj/structure/surface/table/woodentable/poor, /obj/item/reagent_container/food/drinks/bottle/vodka, /turf/open/floor/wood, /area/adminlevel/ert_station/clf_station) -"Fn" = ( -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/turf/open/auto_turf/strata_grass/layer1, -/area/adminlevel/ert_station/clf_station) "FD" = ( /turf/open/auto_turf/strata_grass/layer0_mud, /area/adminlevel/ert_station/clf_station) +"FT" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 10; + icon_state = "p_stair_full" + }, +/obj/structure/platform_decoration/metal/kutjevo, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) "FV" = ( /obj/item/reagent_container/food/drinks/bottle/vodka, /obj/structure/surface/table/woodentable/fancy, /turf/open/floor/wood, /area/adminlevel/ert_station/clf_station) -"Gj" = ( -/obj/structure/platform/kutjevo, -/obj/structure/flora/bush/ausbushes/grassybush, -/turf/open/auto_turf/strata_grass/layer1, +"Gh" = ( +/obj/structure/platform/metal/kutjevo/east, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/adminlevel/ert_station/clf_station) "Gl" = ( /obj/structure/surface/table/woodentable/poor, @@ -1254,12 +1186,9 @@ /obj/structure/flora/grass/tallgrass/jungle, /turf/open/gm/grass, /area/adminlevel/ert_station/clf_station) -"GR" = ( -/obj/structure/platform/kutjevo, -/obj/structure/flora/grass/tallgrass/jungle/corner{ - dir = 1 - }, -/turf/open/gm/grass, +"GK" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/auto_turf/strata_grass/layer1, /area/adminlevel/ert_station/clf_station) "GV" = ( /turf/open/floor/plating/asteroidwarning/west, @@ -1268,10 +1197,23 @@ /obj/docking_port/stationary/emergency_response/idle_port1, /turf/open/floor/plating, /area/adminlevel/ert_station/clf_station) +"HG" = ( +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 9; + icon_state = "p_stair_full" + }, +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) "HI" = ( /obj/structure/flora/jungle/vines/heavy, /turf/open/gm/dirt, /area/adminlevel/ert_station/clf_station) +"HN" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/gm/grass, +/area/adminlevel/ert_station/clf_station) "Ia" = ( /obj/structure/bed/chair{ dir = 4 @@ -1284,28 +1226,19 @@ "Ie" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east, /area/adminlevel/ert_station/clf_station) -"Ig" = ( +"Ip" = ( /obj/structure/largecrate/black_market/clf_supplies, -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/turf/open/auto_turf/strata_grass/layer1, -/area/adminlevel/ert_station/clf_station) -"Io" = ( -/obj/structure/platform/kutjevo, -/obj/structure/flora/grass/tallgrass/jungle/corner{ - dir = 5 - }, -/turf/open/gm/grass, -/area/adminlevel/ert_station/clf_station) -"Iz" = ( -/obj/structure/platform_decoration/kutjevo, -/obj/structure/flora/bush/ausbushes/grassybush, +/obj/structure/platform/metal/kutjevo/west, /turf/open/auto_turf/strata_grass/layer1, /area/adminlevel/ert_station/clf_station) "IH" = ( /turf/open/floor/wood/wood_broken4, /area/adminlevel/ert_station/clf_station) +"II" = ( +/obj/structure/platform/metal/kutjevo/west, +/obj/structure/largecrate/random/barrel/white, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) "IT" = ( /obj/structure/largecrate/random/barrel/white, /turf/open/floor/plating/asteroidfloor/north, @@ -1315,17 +1248,18 @@ /obj/item/clothing/mask/gas/swat, /turf/open/floor/wood/wood_broken6, /area/adminlevel/ert_station/clf_station) -"Jg" = ( -/obj/structure/platform/kutjevo, -/turf/open/gm/grass, +"Jj" = ( +/obj/structure/platform/metal/kutjevo/west, +/turf/open/auto_turf/strata_grass/layer1, /area/adminlevel/ert_station/clf_station) -"Jh" = ( -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/obj/structure/flora/jungle/vines/heavy, +"JR" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, /turf/open/auto_turf/strata_grass/layer1, /area/adminlevel/ert_station/clf_station) +"JY" = ( +/obj/structure/platform/metal/kutjevo/west, +/turf/open/auto_turf/strata_grass/layer0_mud, +/area/adminlevel/ert_station/clf_station) "Ke" = ( /obj/structure/flora/jungle/vines{ icon_state = "heavy_4" @@ -1359,17 +1293,17 @@ }, /turf/open/floor/wood, /area/adminlevel/ert_station/clf_station) +"Md" = ( +/obj/structure/platform/metal/kutjevo/north, +/obj/structure/platform/metal/kutjevo/west, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) "Me" = ( /obj/structure/flora/jungle/planttop1, /turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/adminlevel/ert_station/clf_station) -"MD" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/obj/structure/platform/kutjevo{ - dir = 8 - }, +"MA" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, /turf/open/auto_turf/strata_grass/layer1, /area/adminlevel/ert_station/clf_station) "ME" = ( @@ -1429,12 +1363,6 @@ /obj/structure/window/reinforced, /turf/open/floor/wood, /area/adminlevel/ert_station/clf_station) -"Ne" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/turf/open/auto_turf/strata_grass/layer1, -/area/adminlevel/ert_station/clf_station) "Ng" = ( /obj/structure/flora/jungle/plantbot1, /turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, @@ -1487,12 +1415,9 @@ /obj/structure/largecrate/random/case/small, /turf/open/floor/plating/asteroidfloor/north, /area/adminlevel/ert_station/clf_station) -"Op" = ( -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/obj/structure/largecrate/random/barrel/red, -/turf/open/auto_turf/strata_grass/layer1, +"Or" = ( +/obj/structure/platform/metal/kutjevo/east, +/turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/adminlevel/ert_station/clf_station) "Ou" = ( /obj/structure/window/reinforced{ @@ -1552,38 +1477,30 @@ /obj/structure/flora/grass/tallgrass/jungle, /turf/open/auto_turf/strata_grass/layer1, /area/adminlevel/ert_station/clf_station) -"OX" = ( -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/obj/structure/largecrate/random/case/double, -/turf/open/auto_turf/strata_grass/layer1, -/area/adminlevel/ert_station/clf_station) "OY" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, /area/adminlevel/ert_station/clf_station) -"OZ" = ( -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/obj/structure/largecrate/supply/weapons/flamers, +"Pf" = ( +/obj/structure/platform/metal/kutjevo/west, +/obj/structure/largecrate/random/barrel/red, /turf/open/auto_turf/strata_grass/layer1, /area/adminlevel/ert_station/clf_station) "Ph" = ( /turf/open/gm/coast/beachcorner/south_east, /area/adminlevel/ert_station/clf_station) -"Pj" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/gm/grass, -/area/adminlevel/ert_station/clf_station) "Pr" = ( /mob/living/simple_animal/cat{ name = "Edwin" }, /turf/open/floor/wood/wood_broken, /area/adminlevel/ert_station/clf_station) +"Pw" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, +/obj/structure/flora/grass/tallgrass/jungle/corner{ + dir = 5 + }, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) "PC" = ( /obj/item/trash/candle, /obj/structure/surface/table/woodentable/fancy, @@ -1606,14 +1523,9 @@ }, /turf/open/floor/wood, /area/adminlevel/ert_station/clf_station) -"PW" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/obj/structure/flora/grass/tallgrass/jungle/corner{ - dir = 5 - }, -/turf/open/auto_turf/strata_grass/layer1, +"PX" = ( +/obj/structure/platform/metal/kutjevo, +/turf/open/gm/grass, /area/adminlevel/ert_station/clf_station) "Qw" = ( /obj/structure/surface/table/woodentable/poor, @@ -1625,20 +1537,6 @@ "Qx" = ( /turf/open/gm/coast/east, /area/adminlevel/ert_station/clf_station) -"QA" = ( -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/obj/structure/largecrate/supply/explosives/mines, -/turf/open/auto_turf/strata_grass/layer1, -/area/adminlevel/ert_station/clf_station) -"QB" = ( -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/obj/structure/largecrate/supply/explosives/grenades, -/turf/open/auto_turf/strata_grass/layer1, -/area/adminlevel/ert_station/clf_station) "QE" = ( /obj/structure/closet/crate, /obj/item/storage/toolbox/syndicate, @@ -1692,13 +1590,6 @@ /obj/structure/surface/table/reinforced, /turf/open/floor/prison/kitchen, /area/adminlevel/ert_station/clf_station) -"Sc" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/obj/structure/machinery/floodlight, -/turf/open/auto_turf/strata_grass/layer1, -/area/adminlevel/ert_station/clf_station) "Sd" = ( /obj/effect/decal/cleanable/blood/drip, /obj/structure/machinery/light/small/built{ @@ -1712,13 +1603,6 @@ }, /turf/open/floor/wood/wood_broken4, /area/adminlevel/ert_station/clf_station) -"Sy" = ( -/obj/structure/platform/kutjevo, -/obj/structure/platform/kutjevo{ - dir = 4 - }, -/turf/open/auto_turf/strata_grass/layer1, -/area/adminlevel/ert_station/clf_station) "SD" = ( /obj/structure/largecrate/random/case/small, /turf/open/auto_turf/strata_grass/layer1, @@ -1730,13 +1614,6 @@ "Tr" = ( /turf/open/gm/dirtgrassborder/grassdirt_corner/north_east, /area/adminlevel/ert_station/clf_station) -"Tt" = ( -/obj/structure/platform/kutjevo, -/obj/structure/flora/bush/ausbushes/grassybush{ - icon_state = "fullgrass_1" - }, -/turf/open/auto_turf/strata_grass/layer1, -/area/adminlevel/ert_station/clf_station) "Tu" = ( /turf/open/floor/plating/asteroidwarning/east, /area/adminlevel/ert_station/clf_station) @@ -1798,13 +1675,6 @@ }, /turf/open/floor/prison/kitchen, /area/adminlevel/ert_station/clf_station) -"VE" = ( -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/obj/structure/largecrate/random/barrel/green, -/turf/open/auto_turf/strata_grass/layer1, -/area/adminlevel/ert_station/clf_station) "VO" = ( /obj/structure/flora/jungle/vines, /obj/structure/flora/jungle/vines{ @@ -1812,12 +1682,6 @@ }, /turf/open/auto_turf/strata_grass/layer1, /area/adminlevel/ert_station/clf_station) -"VR" = ( -/obj/structure/platform/kutjevo{ - dir = 1 - }, -/turf/open/gm/grass, -/area/adminlevel/ert_station/clf_station) "Wb" = ( /obj/structure/curtain/red, /turf/open/floor/wood, @@ -1832,6 +1696,10 @@ /obj/structure/flora/bush/ausbushes/ppflowers, /turf/open/auto_turf/strata_grass/layer0_mud_alt, /area/adminlevel/ert_station/clf_station) +"We" = ( +/obj/structure/platform/metal/kutjevo/east, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) "Wo" = ( /obj/item/weapon/throwing_knife, /turf/open/auto_turf/strata_grass/layer1, @@ -1852,10 +1720,9 @@ /obj/item/explosive/grenade/incendiary/molotov, /turf/open/floor/wood, /area/adminlevel/ert_station/clf_station) -"WM" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, +"WD" = ( +/obj/structure/platform/metal/kutjevo/west, +/obj/structure/flora/jungle/vines/heavy, /turf/open/auto_turf/strata_grass/layer1, /area/adminlevel/ert_station/clf_station) "WO" = ( @@ -1888,17 +1755,19 @@ /obj/structure/flora/bush/ausbushes/grassybush, /turf/open/auto_turf/strata_grass/layer0_mud, /area/adminlevel/ert_station/clf_station) +"XO" = ( +/obj/structure/platform_decoration/metal/kutjevo, +/turf/open/gm/dirtgrassborder/grassdirt_corner/south_east, +/area/adminlevel/ert_station/clf_station) "Yq" = ( /obj/structure/flora/grass/tallgrass/jungle/corner{ dir = 10 }, /turf/open/gm/grass, /area/adminlevel/ert_station/clf_station) -"Yv" = ( -/obj/structure/platform/kutjevo{ - dir = 8 - }, -/obj/structure/flora/jungle/vines, +"Yy" = ( +/obj/structure/platform/metal/kutjevo, +/obj/structure/platform/metal/kutjevo/east, /turf/open/auto_turf/strata_grass/layer1, /area/adminlevel/ert_station/clf_station) "YA" = ( @@ -1908,6 +1777,15 @@ "YB" = ( /turf/open/gm/grass/grass2, /area/adminlevel/ert_station/clf_station) +"YH" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/obj/structure/machinery/floodlight, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) +"YN" = ( +/obj/structure/platform/metal/kutjevo/north, +/turf/open/gm/grass, +/area/adminlevel/ert_station/clf_station) "Ze" = ( /obj/structure/bed/chair{ dir = 4 @@ -1941,10 +1819,21 @@ "ZI" = ( /turf/closed/wall/wood, /area/adminlevel/ert_station/clf_station) +"ZK" = ( +/obj/structure/platform/metal/kutjevo, +/obj/structure/flora/grass/tallgrass/jungle/corner{ + dir = 9 + }, +/turf/open/auto_turf/strata_grass/layer1, +/area/adminlevel/ert_station/clf_station) "ZO" = ( /obj/structure/prop/brazier/torch, /turf/closed/wall/mineral/sandstone/runed, /area/adminlevel/ert_station/clf_station) +"ZQ" = ( +/obj/structure/platform/metal/kutjevo/east, +/turf/open/gm/grass/grass2, +/area/adminlevel/ert_station/clf_station) "ZS" = ( /obj/structure/stairs/perspective{ color = "#6e6e6e"; @@ -2152,7 +2041,7 @@ ax ax Rg Rg -iO +ib LO ax ax @@ -2340,25 +2229,25 @@ Rg Ie Ee Ee -me -Ah -AE -AE -lN -la -pp -la -la -pp -pp -la -la -la -la -la -yO -la -Pj +XO +Or +yh +yh +Gh +vJ +ZQ +vJ +vJ +ZQ +ZQ +vJ +vJ +vJ +vJ +vJ +hY +vJ +HN QV QV Nk @@ -2382,7 +2271,7 @@ Ie OY YB ql -Jg +PX yY Tu Tu @@ -2400,7 +2289,7 @@ Tu Tu Tu az -VR +YN YB QV Nk @@ -2424,7 +2313,7 @@ OY QV QV YB -Jg +PX Uu uX uX @@ -2442,7 +2331,7 @@ uX uX uX UB -VR +YN Aj Xv Nk @@ -2466,7 +2355,7 @@ QV QV QV QV -Jg +PX Uu uX uX @@ -2484,10 +2373,10 @@ uX Hs uX UB -Bt -la -la -jj +cT +vJ +vJ +Ax pk pk BB @@ -2508,7 +2397,7 @@ CQ QV QV QV -Jg +PX Uu uX uX @@ -2529,7 +2418,7 @@ UB oI oI oI -eh +AP gj ON pk @@ -2550,7 +2439,7 @@ QV CQ wI ye -Jg +PX Uu uX uX @@ -2571,7 +2460,7 @@ UB oI cB oI -eh +AP iB Ez TZ @@ -2592,7 +2481,7 @@ sN LN Nk GG -Io +iC Uu uX uX @@ -2613,7 +2502,7 @@ UB oI oI Oi -eh +AP zO zO zO @@ -2634,7 +2523,7 @@ ZI ZI Yq GG -GR +zk Uu uX uX @@ -2655,7 +2544,7 @@ UB IT Rr qb -eh +AP zO yH zO @@ -2676,7 +2565,7 @@ aN Wb FD iB -pE +ZK Uu uX uX @@ -2694,10 +2583,10 @@ uX uX uX UB -MD -lT -lT -Ne +Md +Jj +Jj +JR zO zO zO @@ -2718,7 +2607,7 @@ ZI ZI FD zO -Ch +vn Uu uX uX @@ -2736,19 +2625,19 @@ uX uX uX UB -eh +AP bI jZ -yy -Fn -Fn -Fn -Fn -Fn -Fn -Fn -Jh -WM +DB +We +We +We +We +We +We +We +mx +GK KT KT "} @@ -2760,7 +2649,7 @@ ER Wb FD zO -Ch +vn Uu uX uX @@ -2778,10 +2667,10 @@ uX uX uX UB -eh +AP zO -yy -Sy +DB +Yy ZI eP eP @@ -2790,8 +2679,8 @@ ZI eP eP ZI -dU -WM +jV +GK KT "} (21,1,1) = {" @@ -2802,7 +2691,7 @@ ZI ZI FD zO -Ch +vn yY GV GV @@ -2820,9 +2709,9 @@ GV GV GV az -eh +AP zO -Ch +vn ZI ZI Ia @@ -2833,7 +2722,7 @@ Xp Xp ZI ZI -eh +AP KT "} (22,1,1) = {" @@ -2844,27 +2733,27 @@ zO zO FD zO -fo -nM -VE -vE -ey -OZ -Op -Op -QA -bb +oe +lz +mp +hj +eg +jb +Pf +Pf +wS +tc OK OK OK -aO -QB -xi -Ig -OX -yW +we +lo +II +Ip +zg +Bo jG -Ch +vn eP vx WU @@ -2875,7 +2764,7 @@ Xp Xp gi eP -eh +AP KT "} (23,1,1) = {" @@ -2906,7 +2795,7 @@ tt ki zO zO -Ch +vn eP jp Gl @@ -2917,7 +2806,7 @@ Xp Xp nC eP -xS +iR KT "} (24,1,1) = {" @@ -2948,7 +2837,7 @@ FD FD FD zO -Ch +vn eP Ns qa @@ -2959,7 +2848,7 @@ Xp Xp gN eP -xS +iR KT "} (25,1,1) = {" @@ -2990,7 +2879,7 @@ FD FD FD FD -Eb +fI ZI ce mw @@ -3001,7 +2890,7 @@ Wq Xp Xp eP -eh +AP KT "} (26,1,1) = {" @@ -3043,36 +2932,36 @@ ZI rz rz ZI -xS +iR KT "} (27,1,1) = {" ax zO -yy -Fn -nr +DB +We +HG Ba Ba -oO -Fn -WM -yy -Fn -nr +FT +We +GK +DB +We +HG Ba Ba -oO -Fn -WM -Iz -Fn -nr +FT +We +GK +lL +We +HG Ba Ba -oO -Fn -Sc +FT +We +YH FD ZS Wb @@ -3085,38 +2974,38 @@ Of Xp Xp eP -xS +iR KT "} (28,1,1) = {" DN zO -Ch +vn ZI ZI Wb Wb ZI ZI -eh -Ch +AP +vn ZI ZI Wb Wb ZI ZI -eh -Ch +AP +vn ZI ZI Wb Wb ZI ZI -eh +AP yH -jc +tf zZ ma mw @@ -3127,38 +3016,38 @@ Vm NY hd eP -xS +iR KT "} (29,1,1) = {" KT NV -Ch +vn ZI up mw mw YA ZI -eh -Ch +AP +vn ZI at mw DF Ou ZI -eh -Ch +AP +vn ZI zy pF mw tz ZI -uF +qM FD -Ch +vn eP Ns Bn @@ -3169,38 +3058,38 @@ mR Xp cc ZI -eh +AP KT "} (30,1,1) = {" KT DN -rZ +yp eP mw Vk lp pF eP -eh -Ch +AP +vn eP yE mw mw IW eP -eh -Ch +AP +vn ZI ZE kF DF TM eP -uF +qM FD -Ch +vn eP MQ mw @@ -3211,38 +3100,38 @@ BP Xp Bx ZI -eh +AP KT "} (31,1,1) = {" KT KT -rZ +yp eP mw Sj mw mw eP -eh -Ch +AP +vn zZ MP mw mw ow ZI -eh -Ch +AP +vn ZI rm mw mw aA eP -eh +AP FD -Ch +vn eP WU hE @@ -3253,38 +3142,38 @@ ms Xp fd ZI -eh +AP KT "} (32,1,1) = {" KT NV -rZ +yp zZ mw mw mw mw ZI -eh -Ch +AP +vn eP QE Xc DF WA eP -eh -Ch +AP +vn ZI zH cH mw fx eP -eh +AP FD -Ch +vn ZI ZI hE @@ -3295,39 +3184,39 @@ RR Xp ZI ZI -eh +AP KT "} (33,1,1) = {" KT jG -Ch +vn ZI eP Wb Rv eP ZI -eh -Ch +AP +vn ZI at mw mw Ou ZI -eh -Tt +AP +uR ZI PI MU mw ie ZI -eh +AP FD -eO -rO +EZ +hH ZI eP eP @@ -3336,79 +3225,79 @@ ZI ZI ZI ZI -MD -Ne +Md +JR KT "} (34,1,1) = {" KT zO -Ch +vn ZI oc mw mw AV ZI -eh -Gj +AP +pj eP Uj Pr mw Wz eP -eh -Ch +AP +vn ZI MT MU IH Xz ZI -eh +AP FD FD -vQ -lT -lT -lT -lT -lT -Yv -fA -ko -mk +MA +Jj +Jj +Jj +Jj +Jj +Cu +WD +wP +lD zO KT "} (35,1,1) = {" KT zO -Ch +vn ZI sK DF mw Bl ZI -eh -Ch +AP +vn zZ MP xO nJ MP ZI -eh -Ch +AP +vn ZI ZI ZI Wb ZI ZI -eh +AP EJ FD FD @@ -3427,30 +3316,30 @@ KT (36,1,1) = {" KT KT -Ch +vn ZI sK mw IH Ck ZI -eh -Ch +AP +vn eP yM mw mw av eP -eh -Ch +AP +vn ZI tG Sd NB aL ZI -eh +AP yH zO zO @@ -3469,39 +3358,39 @@ KT (37,1,1) = {" KT KT -Ch +vn ZI AO dg kk Qw ZI -eh -Ch +AP +vn ZI hL mw mw Ou ZI -eh -Gj +AP +pj ZI tG NB NB aL ZI -eh +AP zO -Iz -Fn -nr +lL +We +HG Ba Ba -oO -Fn -WM +FT +We +GK Ad un VO @@ -3511,39 +3400,39 @@ KT (38,1,1) = {" KT NV -Ch +vn ZI ZI QG lX ZI ZI -eh -Ch +AP +vn ZI ZI Zj gc ZI ZI -eh -Ch +AP +vn ZI fk cx xM ZI ZI -eh +AP zO -Ch +vn ZI ZI Wb Wb ZI ZI -eh +AP zO NV KT @@ -3553,39 +3442,39 @@ KT (39,1,1) = {" KT NV -dY -BQ +ti +qI ZI ZI ZI ZI -MD -Ne -vQ -BQ +Md +JR +MA +qI ZI eP eP ZI -MD -Ne -vQ -BQ +Md +JR +MA +qI ZI ZI ZI ZI -MD -Ne +Md +JR zO -Ch +vn ZI DW pF mw sx ZI -eh +AP zO KT KT @@ -3596,38 +3485,38 @@ KT KT jG zO -dY -lT -lT -lT -lT -AK +ti +Jj +Jj +Jj +Jj +sy ta ta -PW -lT -lT -lT -lT -Ne -zO -zO -vQ -BS -bX -BU -lT -Ne +Pw +Jj +Jj +Jj +Jj +JR +zO +zO +MA +hK +wa +JY +Jj +JR yH zO -Ch +vn ZI LH mw DF Ro ZI -eh +AP KT KT KT @@ -3662,14 +3551,14 @@ ta bL zO zO -Ch +vn ZI eH ME eH eH ZI -eh +AP KT KT KT @@ -3704,14 +3593,14 @@ pk pk bL uZ -ks +vy eH uO cH mw vm eH -eh +AP KT KT KT @@ -3746,7 +3635,7 @@ pk pk pk Wc -aR +yS eH Re mw diff --git a/maps/templates/lazy_templates/fax_responder_base.dmm b/maps/templates/lazy_templates/fax_responder_base.dmm new file mode 100644 index 000000000000..44b88044d63d --- /dev/null +++ b/maps/templates/lazy_templates/fax_responder_base.dmm @@ -0,0 +1,2751 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"am" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/folder/red{ + pixel_x = 6 + }, +/obj/item/folder/black{ + pixel_x = 12 + }, +/obj/structure/transmitter/rotary/fax_responder{ + networks_transmit = list("USCM","Colonist","UPP","Fax Responders"); + phone_id = "UPP Communications Officer"; + phone_color = "green" + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"fr" = ( +/obj/structure/machinery/cryopod/no_store, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"gu" = ( +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"id" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/computer/crew/alt{ + pixel_y = 24; + pixel_x = -12; + faction = "UPP"; + name = "UPP monitoring computer" + }, +/obj/item/tool/pen/clicky, +/obj/item/tool/pen/blue/clicky{ + pixel_y = 8 + }, +/obj/item/tool/pen/green/clicky{ + pixel_y = 8; + pixel_x = -8 + }, +/obj/item/tool/pen/red/clicky{ + pixel_x = -8 + }, +/obj/item/paper_bin/wy{ + pixel_y = 6; + pixel_x = 8 + }, +/obj/structure/machinery/computer/crew/alt{ + pixel_y = 24; + pixel_x = 8; + name = "USCM monitoring computer" + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"jh" = ( +/turf/closed/wall/r_wall/prison_unmeltable, +/area/adminlevel/ert_station/fax_response_station) +"jV" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/folder/red{ + pixel_x = 6 + }, +/obj/item/folder/black{ + pixel_x = 12 + }, +/obj/structure/transmitter/rotary/fax_responder{ + networks_transmit = list("USCM","Colonist","TWE","Fax Responders"); + phone_id = "TWE Communications Officer"; + phone_color = "yellow" + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"kT" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/computer/cameras/almayer{ + dir = 8; + admin_console = 1; + network = list("ARES","Almayer","Research","Containment","Containment Hidden"); + pixel_x = 16; + layer = 2.99; + name = "USS Almayer Cameras"; + pixel_y = -6; + colony_camera_mapload = 0 + }, +/obj/structure/machinery/computer/cameras/almayer{ + dir = 8; + admin_console = 1; + network = list("Overwatch"); + pixel_x = 16; + pixel_y = 8; + name = "Overwatch Cameras"; + colony_camera_mapload = 0 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"ny" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/faxmachine/cmb{ + pixel_y = 8 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"nB" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_x = -24 + }, +/obj/structure/machinery/cm_vending/sorted/marine_food{ + pixel_y = 16; + density = 0 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"ov" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/faxmachine/uscm/command/highcom{ + pixel_y = 8 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"oA" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/faxmachine/twe/highcom{ + pixel_y = 8 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"pu" = ( +/obj/structure/machinery/door_control/brbutton{ + pixel_y = 24; + id = "Faxes" + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/fax_response_station) +"pH" = ( +/obj/structure/machinery/door/airlock/almayer/maint/reinforced/colony{ + dir = 1; + req_one_access = null + }, +/obj/structure/machinery/door/poddoor/almayer{ + unacidable = 1; + use_power = 0; + needs_power = 0; + id = "Faxes" + }, +/turf/open/floor/almayer/test_floor4, +/area/adminlevel/ert_station/fax_response_station) +"qw" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/faxmachine/press/highcom{ + pixel_y = 8 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"rS" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/folder/red{ + pixel_x = 6 + }, +/obj/item/folder/black{ + pixel_x = 12 + }, +/obj/structure/transmitter/rotary/fax_responder{ + networks_transmit = list("USCM","Colonist","Press","Fax Responders"); + phone_id = "Free Press Relay" + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"rV" = ( +/obj/effect/landmark/late_join/responder/uscm/provost, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"sx" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/folder/white{ + pixel_x = -6 + }, +/obj/item/folder/white, +/obj/item/folder/white{ + pixel_x = 6 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"sZ" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/computer/cameras/almayer{ + dir = 8; + admin_console = 1; + network = list("Overwatch"); + pixel_x = 16; + pixel_y = 8; + name = "Overwatch Cameras"; + colony_camera_mapload = 0 + }, +/obj/structure/machinery/computer/cameras/almayer{ + dir = 8; + admin_console = 1; + network = list("ARES","Almayer","Research","Containment","Containment Hidden"); + pixel_x = 16; + layer = 2.99; + name = "USS Almayer Cameras"; + pixel_y = -6; + colony_camera_mapload = 0 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"tq" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/folder/red{ + pixel_x = 6 + }, +/obj/item/folder/black{ + pixel_x = 12 + }, +/obj/structure/transmitter/rotary/fax_responder{ + networks_transmit = list("USCM","Colonist","Fax Responders"); + phone_id = "USCM-HC Communications Officer"; + phone_color = "blue" + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"tM" = ( +/obj/effect/landmark/late_join/responder/clf, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"uX" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/faxmachine/clf/highcom{ + pixel_y = 8 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"vc" = ( +/turf/open/floor/plating, +/area/adminlevel/ert_station/fax_response_station) +"wv" = ( +/obj/effect/landmark/late_join/responder/cmb, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"wx" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/computer/crew/alt{ + pixel_y = 24; + pixel_x = -12; + faction = "Colonial Marshal"; + name = "CMB monitoring computer" + }, +/obj/item/tool/pen/clicky, +/obj/item/tool/pen/blue/clicky{ + pixel_y = 8 + }, +/obj/item/tool/pen/green/clicky{ + pixel_y = 8; + pixel_x = -8 + }, +/obj/item/tool/pen/red/clicky{ + pixel_x = -8 + }, +/obj/item/paper_bin/wy{ + pixel_y = 6; + pixel_x = 8 + }, +/obj/structure/machinery/computer/crew/alt{ + pixel_y = 24; + pixel_x = 8; + name = "USCM monitoring computer" + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"wz" = ( +/turf/closed/wall/r_wall/bunker{ + hull = 1 + }, +/area/adminlevel/ert_station/fax_response_station) +"xb" = ( +/obj/effect/landmark/late_join/responder/wey_yu, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"xc" = ( +/turf/closed/wall/r_wall/chigusa{ + hull = 1 + }, +/area/adminlevel/ert_station/fax_response_station) +"xX" = ( +/turf/closed/wall/r_wall/unmeltable, +/area/adminlevel/ert_station/fax_response_station) +"yv" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/computer/crew/alt{ + pixel_y = 24; + pixel_x = -12; + faction = "TWE"; + name = "TWE monitoring computer" + }, +/obj/item/tool/pen/clicky, +/obj/item/tool/pen/blue/clicky{ + pixel_y = 8 + }, +/obj/item/tool/pen/green/clicky{ + pixel_y = 8; + pixel_x = -8 + }, +/obj/item/tool/pen/red/clicky{ + pixel_x = -8 + }, +/obj/item/paper_bin/wy{ + pixel_y = 6; + pixel_x = 8 + }, +/obj/structure/machinery/computer/crew/alt{ + pixel_y = 24; + pixel_x = 8; + name = "USCM monitoring computer" + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"Ba" = ( +/obj/structure/filingcabinet{ + density = 0; + pixel_y = 24; + pixel_x = 9 + }, +/obj/structure/filingcabinet{ + density = 0; + pixel_y = 24; + pixel_x = -7 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"Bp" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/tool/stamp/hos{ + name = "red stamp"; + pixel_y = 8 + }, +/obj/item/tool/stamp/hop{ + name = "blue stamp" + }, +/obj/item/tool/stamp/ce{ + name = "yellow stamp"; + pixel_y = -8 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"Bz" = ( +/obj/effect/landmark/late_join/responder/press, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"BC" = ( +/turf/closed/wall/r_wall/biodome/biodome_unmeltable, +/area/adminlevel/ert_station/fax_response_station) +"Du" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/tool/pen/clicky, +/obj/item/tool/pen/blue/clicky{ + pixel_y = 8 + }, +/obj/item/tool/pen/green/clicky{ + pixel_y = 8; + pixel_x = -8 + }, +/obj/item/tool/pen/red/clicky{ + pixel_x = -8 + }, +/obj/structure/machinery/computer/crew/alt{ + pixel_y = 24; + name = "USCM monitoring computer" + }, +/obj/item/paper_bin/uscm{ + pixel_x = 8; + pixel_y = 6 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"Dy" = ( +/turf/closed/wall/solaris/reinforced/hull, +/area/adminlevel/ert_station/fax_response_station) +"Ei" = ( +/turf/closed/wall/almayer/outer, +/area/adminlevel/ert_station/fax_response_station) +"EI" = ( +/obj/structure/filingcabinet{ + density = 0; + pixel_y = 24; + pixel_x = -7 + }, +/obj/structure/filingcabinet{ + density = 0; + pixel_y = 24; + pixel_x = 9 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"EK" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/computer/crew/alt{ + pixel_y = 24; + pixel_x = -12; + faction = "Wey-Yu"; + name = "WY monitoring computer" + }, +/obj/item/tool/pen/clicky, +/obj/item/tool/pen/blue/clicky{ + pixel_y = 8 + }, +/obj/item/tool/pen/green/clicky{ + pixel_y = 8; + pixel_x = -8 + }, +/obj/item/tool/pen/red/clicky{ + pixel_x = -8 + }, +/obj/item/paper_bin/wy{ + pixel_y = 6; + pixel_x = 8 + }, +/obj/structure/machinery/computer/crew/alt{ + pixel_y = 24; + pixel_x = 8; + name = "USCM monitoring computer" + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"FB" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/folder/red{ + pixel_x = 6 + }, +/obj/item/folder/black{ + pixel_x = 12 + }, +/obj/structure/transmitter/rotary/fax_responder{ + networks_transmit = list("USCM","Colonist","Wey-Yu","PMC","Fax Responders"); + phone_id = "WY Communications Executive" + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"FD" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/faxmachine/corporate/highcom{ + pixel_y = 8 + }, +/obj/structure/machinery/computer/crew/alt{ + pixel_y = 24; + faction = "PMC"; + name = "PMC monitoring computer" + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"IO" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/computer/cameras/almayer{ + dir = 8; + admin_console = 1; + network = list("Overwatch"); + pixel_x = 16; + pixel_y = 16; + name = "Overwatch Cameras"; + colony_camera_mapload = 0 + }, +/obj/structure/machinery/computer/cameras/almayer{ + dir = 8; + admin_console = 1; + network = list("WY","Containment Hidden","Colony"); + pixel_x = 16; + name = "WY Cameras"; + colony_camera_mapload = 0 + }, +/obj/structure/machinery/computer/cameras/almayer{ + dir = 8; + admin_console = 1; + network = list("ARES","Almayer","Research","Containment"); + pixel_x = 16; + layer = 2.99; + name = "USS Almayer Cameras"; + pixel_y = -16; + colony_camera_mapload = 0 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"Ml" = ( +/turf/closed/wall/shiva/prefabricated/reinforced/hull, +/area/adminlevel/ert_station/fax_response_station) +"Nb" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/folder/red{ + pixel_x = 6 + }, +/obj/item/folder/black{ + pixel_x = 12 + }, +/obj/structure/transmitter/rotary/fax_responder{ + networks_transmit = list("USCM","Colonist","Colonial Marshal","Fax Responders"); + phone_id = "CMB Deputy Operations Officer"; + phone_color = "green" + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"NP" = ( +/obj/structure/machinery/light, +/obj/structure/surface/table/woodentable/fancy, +/obj/item/folder/red{ + pixel_x = 6 + }, +/obj/item/folder/black{ + pixel_x = 12 + }, +/obj/structure/transmitter/rotary/fax_responder{ + networks_transmit = list("USCM","Colonist","Fax Responders"); + phone_id = "Provost Communications Officer"; + phone_color = "red" + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"OA" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"Pn" = ( +/obj/structure/window/framed/almayer/hull, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"Rh" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/computer/crew/alt{ + pixel_y = 24; + pixel_x = -12; + faction = "CLF"; + name = "CLF monitoring computer" + }, +/obj/item/tool/pen/clicky, +/obj/item/tool/pen/blue/clicky{ + pixel_y = 8 + }, +/obj/item/tool/pen/green/clicky{ + pixel_y = 8; + pixel_x = -8 + }, +/obj/item/tool/pen/red/clicky{ + pixel_x = -8 + }, +/obj/item/paper_bin/wy{ + pixel_y = 6; + pixel_x = 8 + }, +/obj/structure/machinery/computer/crew/alt{ + pixel_y = 24; + pixel_x = 8; + name = "USCM monitoring computer" + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"ST" = ( +/obj/structure/bed/chair/comfy/teal{ + dir = 4 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"UB" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/faxmachine/uscm/brig/provost{ + pixel_y = 8 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"VV" = ( +/obj/effect/landmark/late_join/responder/upp, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"Wp" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/faxmachine/upp/highcom{ + pixel_y = 8 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"XW" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/tool/pen/clicky, +/obj/item/tool/pen/blue/clicky{ + pixel_y = 8 + }, +/obj/item/tool/pen/green/clicky{ + pixel_y = 8; + pixel_x = -8 + }, +/obj/item/tool/pen/red/clicky{ + pixel_x = -8 + }, +/obj/item/paper_bin/wy{ + pixel_y = 6; + pixel_x = 8 + }, +/obj/structure/machinery/computer/crew/alt{ + pixel_y = 24; + name = "USCM monitoring computer" + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"XZ" = ( +/obj/effect/landmark/late_join/responder/twe, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"Yv" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/folder/red{ + pixel_x = 6 + }, +/obj/item/folder/black{ + pixel_x = 12 + }, +/obj/structure/transmitter/rotary/fax_responder{ + networks_transmit = list("USCM","Colonist","CLF","Fax Responders"); + phone_id = "CLF Information Correspondant"; + phone_color = "orange" + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"Yy" = ( +/turf/open/space/basic, +/area/space) +"YO" = ( +/obj/effect/landmark/late_join/responder/uscm, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) +"YR" = ( +/obj/structure/machinery/cm_vending/sorted/marine_food{ + pixel_y = 16; + density = 0 + }, +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_x = -24 + }, +/turf/open/floor/wood/ship, +/area/adminlevel/ert_station/fax_response_station) + +(1,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(2,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(3,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(4,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(5,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(6,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Ei +Ei +Ei +Ei +Ei +Ei +Ei +Ei +Ei +Ei +Ei +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(7,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Ei +YR +OA +rV +fr +Ei +nB +OA +YO +fr +Ei +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(8,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +xX +xX +Ei +EI +gu +gu +gu +Pn +EI +gu +gu +gu +Ei +xX +xX +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(9,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +xX +vc +pH +gu +gu +gu +gu +Pn +gu +gu +gu +gu +pH +vc +xX +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(10,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +xX +vc +Ei +UB +ST +gu +NP +Pn +ov +ST +gu +tq +Ei +vc +xX +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(11,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +xX +vc +Ei +Du +sZ +Bp +sx +Ei +Du +sZ +Bp +sx +Ei +vc +xX +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(12,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +xX +vc +Ei +Ei +Ei +Ei +Ei +Ei +Ei +Ei +Ei +Ei +Ei +vc +xX +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(13,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +xX +vc +vc +vc +vc +vc +vc +vc +vc +vc +vc +vc +vc +vc +xX +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(14,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +xX +xX +xX +xX +xX +xX +xX +vc +xX +xX +xX +xX +xX +xX +xX +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(15,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +xX +BC +BC +BC +BC +BC +BC +vc +wz +wz +wz +wz +wz +wz +xX +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(16,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +xX +BC +YR +OA +xb +fr +BC +vc +wz +YR +OA +VV +fr +wz +xX +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(17,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +xX +BC +EI +gu +gu +gu +BC +vc +wz +Ba +gu +gu +gu +wz +xX +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(18,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +xX +BC +gu +gu +gu +gu +pH +vc +pH +gu +gu +gu +gu +wz +xX +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(19,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +xX +BC +FD +ST +gu +FB +BC +vc +wz +Wp +ST +gu +am +wz +xX +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(20,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +xX +BC +EK +IO +Bp +sx +BC +vc +wz +id +kT +Bp +sx +wz +xX +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(21,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +xX +BC +BC +BC +BC +BC +BC +vc +wz +wz +wz +wz +wz +wz +xX +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(22,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +xX +xX +xX +xX +xX +xX +xX +pu +xX +xX +xX +xX +xX +xX +xX +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(23,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +xX +xX +xX +xX +xX +xX +xX +vc +xX +xX +xX +xX +xX +xX +xX +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(24,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +xX +jh +jh +jh +jh +jh +jh +vc +xc +xc +xc +xc +xc +xc +xX +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(25,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +xX +jh +YR +OA +tM +fr +jh +vc +xc +YR +OA +XZ +fr +xc +xX +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(26,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +xX +jh +Ba +gu +gu +gu +jh +vc +xc +Ba +gu +gu +gu +xc +xX +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(27,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +xX +jh +gu +gu +gu +gu +pH +vc +pH +gu +gu +gu +gu +xc +xX +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(28,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +xX +jh +uX +ST +gu +Yv +jh +vc +xc +oA +ST +gu +jV +xc +xX +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(29,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +xX +jh +Rh +kT +Bp +sx +jh +vc +xc +yv +kT +Bp +sx +xc +xX +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(30,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +xX +jh +jh +jh +jh +jh +jh +vc +xc +xc +xc +xc +xc +xc +xX +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(31,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +xX +xX +xX +xX +xX +xX +xX +vc +xX +xX +xX +xX +xX +xX +xX +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(32,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +xX +xX +xX +xX +xX +xX +xX +pu +xX +xX +xX +xX +xX +xX +xX +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(33,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +xX +Dy +Dy +Dy +Dy +Dy +Dy +vc +Ml +Ml +Ml +Ml +Ml +Ml +xX +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(34,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +xX +Dy +nB +OA +wv +fr +Dy +vc +Ml +YR +OA +Bz +fr +Ml +xX +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(35,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +xX +Dy +EI +gu +gu +gu +Dy +vc +Ml +Ba +gu +gu +gu +Ml +xX +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(36,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +xX +Dy +gu +gu +gu +gu +pH +vc +pH +gu +gu +gu +gu +Ml +xX +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(37,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +xX +Dy +ny +ST +gu +Nb +Dy +vc +Ml +qw +ST +gu +rS +Ml +xX +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(38,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +xX +Dy +wx +kT +Bp +sx +Dy +vc +Ml +XW +kT +Bp +sx +Ml +xX +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(39,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +xX +Dy +Dy +Dy +Dy +Dy +Dy +vc +Ml +Ml +Ml +Ml +Ml +Ml +xX +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(40,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +xX +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(41,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(42,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(43,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(44,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} +(45,1,1) = {" +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +Yy +"} diff --git a/maps/templates/lazy_templates/pizza_ert_station.dmm b/maps/templates/lazy_templates/pizza_ert_station.dmm index a3cc4e7a02ec..98e5dec44fec 100644 --- a/maps/templates/lazy_templates/pizza_ert_station.dmm +++ b/maps/templates/lazy_templates/pizza_ert_station.dmm @@ -414,7 +414,7 @@ /turf/open/floor/cmo, /area/adminlevel/ert_station/pizza_station) "eI" = ( -/obj/structure/platform/kutjevo/smooth, +/obj/structure/platform/metal/kutjevo_smooth, /turf/open/space/basic, /area/space) "eK" = ( @@ -443,10 +443,8 @@ /turf/open/mars_dirt/mars_cave_11, /area/space) "fb" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/platform/kutjevo/smooth, +/obj/structure/platform/metal/kutjevo_smooth/west, +/obj/structure/platform/metal/kutjevo_smooth, /turf/open/space, /area/space) "fg" = ( @@ -467,17 +465,13 @@ /turf/open/floor/prison/yellowcorner/east, /area/adminlevel/ert_station/pizza_station) "fH" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, +/obj/structure/platform/metal/kutjevo_smooth/north, /obj/structure/barricade/handrail{ dir = 1; icon_state = "hr_kutjevo"; name = "solar lattice" }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, +/obj/structure/platform/metal/kutjevo_smooth/west, /turf/open/space, /area/space) "fN" = ( @@ -493,9 +487,7 @@ /turf/open/floor/redyellowfull, /area/adminlevel/ert_station/pizza_station) "fO" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, +/obj/structure/platform_decoration/metal/kutjevo/east, /turf/open/space/basic, /area/space) "gb" = ( @@ -563,9 +555,7 @@ /turf/open/floor/prison/kitchen, /area/adminlevel/ert_station/pizza_station) "ha" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, +/obj/structure/platform_decoration/metal/kutjevo/north, /turf/open/space, /area/space) "hb" = ( @@ -687,15 +677,9 @@ /turf/open/floor/prison/yellow/north, /area/adminlevel/ert_station/pizza_station) "ja" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, +/obj/structure/platform_decoration/metal/kutjevo/east, +/obj/structure/platform/metal/kutjevo_smooth/north, +/obj/structure/platform/metal/kutjevo_smooth/west, /obj/structure/barricade/handrail{ dir = 1; icon_state = "hr_kutjevo"; @@ -872,12 +856,8 @@ /turf/open/floor/redyellowfull, /area/adminlevel/ert_station/pizza_station) "lx" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, +/obj/structure/platform/metal/kutjevo_smooth/north, +/obj/structure/platform/metal/kutjevo_smooth/west, /obj/structure/barricade/handrail{ dir = 1; icon_state = "hr_kutjevo"; @@ -1158,9 +1138,7 @@ /turf/open/floor/prison/red/east, /area/adminlevel/ert_station/pizza_station) "oX" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, +/obj/structure/platform/metal/kutjevo_smooth/north, /obj/structure/barricade/handrail{ dir = 1; icon_state = "hr_kutjevo"; @@ -1248,9 +1226,7 @@ /turf/open/floor/plating/plating_catwalk, /area/adminlevel/ert_station/pizza_station) "qq" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, +/obj/structure/platform/metal/kutjevo_smooth/east, /turf/open/space/basic, /area/space) "qs" = ( @@ -1301,9 +1277,7 @@ /turf/open/floor/redyellowfull, /area/adminlevel/ert_station/pizza_station) "qX" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, +/obj/structure/platform_decoration/metal/kutjevo/west, /turf/open/space/basic, /area/space) "rj" = ( @@ -1327,9 +1301,7 @@ /turf/open/floor/redyellowfull, /area/adminlevel/ert_station/pizza_station) "rk" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, +/obj/structure/platform_decoration/metal/kutjevo/west, /obj/structure/lattice, /turf/open/space/basic, /area/space) @@ -1539,17 +1511,13 @@ /turf/open/floor/corsat/retrosquareslight, /area/adminlevel/ert_station/pizza_station) "tT" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, +/obj/structure/platform/metal/kutjevo_smooth/north, /obj/structure/barricade/handrail{ dir = 1; icon_state = "hr_kutjevo"; name = "solar lattice" }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, +/obj/structure/platform/metal/kutjevo_smooth/east, /turf/open/space, /area/space) "tX" = ( @@ -1574,9 +1542,7 @@ /turf/open/floor/prison/red/west, /area/adminlevel/ert_station/pizza_station) "uj" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, +/obj/structure/platform/metal/kutjevo_smooth/east, /turf/open/space, /area/space) "uo" = ( @@ -1604,10 +1570,8 @@ /turf/open/floor/cmo, /area/adminlevel/ert_station/pizza_station) "uK" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, +/obj/structure/platform/metal/kutjevo_smooth, +/obj/structure/platform/metal/kutjevo_smooth/west, /obj/structure/barricade/handrail/kutjevo{ layer = 3.01 }, @@ -1701,7 +1665,7 @@ /turf/open/floor/prison, /area/adminlevel/ert_station/pizza_station) "vR" = ( -/obj/structure/platform/kutjevo/smooth, +/obj/structure/platform/metal/kutjevo_smooth, /obj/structure/barricade/handrail/kutjevo{ layer = 3.01 }, @@ -1731,7 +1695,7 @@ /turf/open/floor/prison/kitchen, /area/adminlevel/ert_station/pizza_station) "wb" = ( -/obj/structure/platform/kutjevo/smooth, +/obj/structure/platform/metal/kutjevo_smooth, /turf/open/space, /area/space) "wi" = ( @@ -1785,7 +1749,7 @@ /turf/open/floor/prison/red/north, /area/adminlevel/ert_station/pizza_station) "wD" = ( -/obj/structure/platform_decoration/kutjevo, +/obj/structure/platform_decoration/metal/kutjevo, /obj/structure/lattice, /turf/open/space/basic, /area/space) @@ -1838,10 +1802,8 @@ /turf/open/floor/prison/red/north, /area/adminlevel/ert_station/pizza_station) "xe" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, +/obj/structure/platform/metal/kutjevo_smooth, +/obj/structure/platform/metal/kutjevo_smooth/west, /turf/open/space/basic, /area/space) "xh" = ( @@ -1879,7 +1841,7 @@ /turf/open/floor/redyellowfull, /area/adminlevel/ert_station/pizza_station) "xp" = ( -/obj/structure/platform/kutjevo/smooth, +/obj/structure/platform/metal/kutjevo_smooth, /obj/structure/disposalpipe/trunk, /obj/structure/barricade/handrail/kutjevo{ layer = 3.01 @@ -1918,7 +1880,7 @@ /turf/open/floor/redyellowfull, /area/adminlevel/ert_station/pizza_station) "yg" = ( -/obj/structure/platform_decoration/kutjevo, +/obj/structure/platform_decoration/metal/kutjevo, /turf/open/space/basic, /area/space) "yo" = ( @@ -2402,7 +2364,7 @@ /turf/open/floor/prison/kitchen, /area/adminlevel/ert_station/pizza_station) "DH" = ( -/obj/structure/platform/kutjevo/smooth, +/obj/structure/platform/metal/kutjevo_smooth, /obj/structure/barricade/handrail/kutjevo{ layer = 3.01 }, @@ -2413,9 +2375,7 @@ /turf/open/floor/prison/red/north, /area/adminlevel/ert_station/pizza_station) "Ee" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, +/obj/structure/platform/metal/kutjevo_smooth/west, /obj/structure/barricade/handrail/kutjevo{ dir = 8; layer = 3.01 @@ -2634,17 +2594,13 @@ /turf/open/floor/prison/red, /area/adminlevel/ert_station/pizza_station) "Gn" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, +/obj/structure/platform/metal/kutjevo_smooth/north, /obj/structure/barricade/handrail{ dir = 1; icon_state = "hr_kutjevo"; name = "solar lattice" }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, +/obj/structure/platform/metal/kutjevo_smooth/east, /turf/open/space/basic, /area/space) "Gp" = ( @@ -2690,9 +2646,7 @@ /turf/open/floor/prison/yellow/east, /area/adminlevel/ert_station/pizza_station) "Hg" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, +/obj/structure/platform/metal/kutjevo_smooth/west, /turf/open/space, /area/space) "HL" = ( @@ -2977,10 +2931,8 @@ /turf/open/floor/prison/yellow/northwest, /area/adminlevel/ert_station/pizza_station) "Mz" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, +/obj/structure/platform/metal/kutjevo_smooth, +/obj/structure/platform/metal/kutjevo_smooth/west, /turf/open/space, /area/space) "MB" = ( @@ -3130,9 +3082,7 @@ /turf/open/floor/cmo, /area/adminlevel/ert_station/pizza_station) "NT" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, +/obj/structure/platform_decoration/metal/kutjevo/west, /turf/open/space, /area/space) "NV" = ( @@ -3180,9 +3130,7 @@ /turf/open/floor/prison/red, /area/adminlevel/ert_station/pizza_station) "OG" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, +/obj/structure/platform/metal/kutjevo_smooth/north, /obj/structure/barricade/handrail{ dir = 1; icon_state = "hr_kutjevo"; @@ -3267,7 +3215,7 @@ /turf/open/floor/prison/kitchen, /area/adminlevel/ert_station/pizza_station) "Pq" = ( -/obj/structure/platform/kutjevo/smooth, +/obj/structure/platform/metal/kutjevo_smooth, /obj/structure/lattice, /turf/open/space/basic, /area/space) @@ -3283,12 +3231,8 @@ /turf/open/floor/prison/kitchen, /area/adminlevel/ert_station/pizza_station) "Py" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, +/obj/structure/platform/metal/kutjevo_smooth/north, +/obj/structure/platform/metal/kutjevo_smooth/east, /obj/structure/barricade/handrail{ dir = 1; icon_state = "hr_kutjevo"; @@ -3297,9 +3241,7 @@ /turf/open/space, /area/space) "PF" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, +/obj/structure/platform/metal/kutjevo_smooth/west, /turf/open/space/basic, /area/space) "PH" = ( @@ -3363,16 +3305,12 @@ /turf/open/floor/plating, /area/adminlevel/ert_station/pizza_station) "RC" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, +/obj/structure/platform_decoration/metal/kutjevo/north, /turf/open/space/basic, /area/space) "RG" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/platform/kutjevo/smooth, +/obj/structure/platform/metal/kutjevo_smooth/east, +/obj/structure/platform/metal/kutjevo_smooth, /turf/open/space/basic, /area/space) "RN" = ( @@ -3418,9 +3356,7 @@ /turf/open/floor/redyellowfull, /area/adminlevel/ert_station/pizza_station) "Sg" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, +/obj/structure/platform/metal/kutjevo_smooth/north, /obj/structure/barricade/handrail{ dir = 1; icon_state = "hr_kutjevo"; @@ -3828,9 +3764,7 @@ /turf/open/floor/prison/kitchen, /area/adminlevel/ert_station/pizza_station) "Xn" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, +/obj/structure/platform_decoration/metal/kutjevo/east, /turf/open/space, /area/space) "Xq" = ( @@ -3860,10 +3794,8 @@ /turf/open/floor/prison/kitchen, /area/adminlevel/ert_station/pizza_station) "Xw" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, +/obj/structure/platform/metal/kutjevo_smooth, +/obj/structure/platform/metal/kutjevo_smooth/east, /turf/open/space/basic, /area/space) "Xx" = ( @@ -3974,10 +3906,8 @@ /turf/open/space, /area/space) "Yu" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, +/obj/structure/platform/metal/kutjevo_smooth, +/obj/structure/platform/metal/kutjevo_smooth/east, /obj/structure/lattice, /turf/open/space/basic, /area/space) @@ -4004,9 +3934,7 @@ /turf/open/floor/prison/greenblue/southeast, /area/adminlevel/ert_station/pizza_station) "YF" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, +/obj/structure/platform_decoration/metal/kutjevo/north, /obj/structure/lattice, /turf/open/space/basic, /area/space) diff --git a/maps/templates/lazy_templates/twe_ert_station.dmm b/maps/templates/lazy_templates/twe_ert_station.dmm index 916600a34da4..f48712f7bd59 100644 --- a/maps/templates/lazy_templates/twe_ert_station.dmm +++ b/maps/templates/lazy_templates/twe_ert_station.dmm @@ -22,21 +22,6 @@ /obj/structure/machinery/cm_vending/clothing/antag, /turf/open/floor/almayer/plate, /area/adminlevel/ert_station/royal_marines_station) -"aH" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 5 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out" - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/ert_station/royal_marines_station) "aK" = ( /obj/structure/window/framed/almayer, /obj/structure/machinery/door/firedoor/border_only/almayer{ @@ -64,11 +49,29 @@ icon_state = "3,15" }, /area/adminlevel/ert_station/royal_marines_station) +"bA" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/southeast, +/turf/closed/shuttle/twe_dropship{ + icon_state = "2,0" + }, +/area/adminlevel/ert_station/royal_marines_station) "bG" = ( /turf/closed/shuttle/twe_dropship{ icon_state = "6,12" }, /area/adminlevel/ert_station/royal_marines_station) +"bL" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/southwest, +/obj/structure/blocker/invisible_wall, +/turf/open/void, +/area/adminlevel/ert_station/royal_marines_station) "bO" = ( /turf/closed/wall/r_wall/elevator{ dir = 9 @@ -78,6 +81,15 @@ /obj/structure/machinery/optable, /turf/open/floor/almayer/dark_sterile, /area/adminlevel/ert_station/royal_marines_station) +"cf" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/northeast, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" + }, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/ert_station/royal_marines_station) "co" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/red/east, @@ -88,20 +100,18 @@ }, /turf/open/floor/plating/plating_catwalk, /area/adminlevel/ert_station/royal_marines_station) +"cH" = ( +/obj/structure/platform/metal/almayer/east, +/turf/closed/shuttle/twe_dropship{ + icon_state = "2,1" + }, +/area/adminlevel/ert_station/royal_marines_station) "cJ" = ( /obj/structure/bed/chair{ dir = 4 }, /turf/open/floor/almayer/red/northwest, /area/adminlevel/ert_station/royal_marines_station) -"cL" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/closed/shuttle/twe_dropship{ - icon_state = "2,1" - }, -/area/adminlevel/ert_station/royal_marines_station) "dc" = ( /turf/open/floor/plating, /area/adminlevel/ert_station/royal_marines_station) @@ -136,25 +146,17 @@ }, /turf/open/floor/almayer/plate, /area/adminlevel/ert_station/royal_marines_station) -"du" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 6; - layer = 3.51 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 1 - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/ert_station/royal_marines_station) "dK" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/orange, /area/adminlevel/ert_station/royal_marines_station) +"dL" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/blocker/invisible_wall, +/turf/closed/shuttle/twe_dropship{ + icon_state = "8,0" + }, +/area/adminlevel/ert_station/royal_marines_station) "eh" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/red/southeast, @@ -165,6 +167,13 @@ }, /turf/open/floor/almayer/sterile_green, /area/adminlevel/ert_station/royal_marines_station) +"er" = ( +/obj/structure/machinery/cryopod/no_store{ + layer = 3.1; + pixel_y = 7 + }, +/turf/open/floor/almayer/cargo, +/area/adminlevel/ert_station/royal_marines_station) "eu" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/light, @@ -195,15 +204,6 @@ }, /turf/open/floor/almayer/sterile_green, /area/adminlevel/ert_station/royal_marines_station) -"fx" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/ert_station/royal_marines_station) "fD" = ( /turf/open/floor/almayer/red/east, /area/adminlevel/ert_station/royal_marines_station) @@ -214,19 +214,14 @@ }, /turf/open/floor/almayer/test_floor4, /area/adminlevel/ert_station/royal_marines_station) -"fM" = ( +"gc" = ( /obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 9 + icon_state = "N"; + pixel_y = 1 }, +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/southwest, /turf/open/floor/almayer/plating/northeast, /area/adminlevel/ert_station/royal_marines_station) "gg" = ( @@ -239,11 +234,6 @@ }, /turf/open/floor/almayer/red/west, /area/adminlevel/ert_station/royal_marines_station) -"go" = ( -/obj/structure/platform, -/obj/structure/blocker/invisible_wall, -/turf/closed/shuttle/twe_dropship, -/area/adminlevel/ert_station/royal_marines_station) "gq" = ( /turf/open/floor/almayer/orange/east, /area/adminlevel/ert_station/royal_marines_station) @@ -253,6 +243,10 @@ "gJ" = ( /turf/open/floor/almayer/orange/west, /area/adminlevel/ert_station/royal_marines_station) +"gN" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/turf/open/floor/almayer/test_floor4, +/area/adminlevel/ert_station/royal_marines_station) "gS" = ( /turf/closed/wall/almayer/outer, /area/adminlevel/ert_station/royal_marines_station) @@ -327,22 +321,6 @@ /obj/item/storage/surgical_tray, /turf/open/floor/almayer/sterile_green, /area/adminlevel/ert_station/royal_marines_station) -"iR" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/plating/kutjevo, -/area/adminlevel/ert_station/royal_marines_station) -"iS" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/void, -/area/adminlevel/ert_station/royal_marines_station) "ja" = ( /obj/structure/machinery/light{ dir = 4 @@ -369,18 +347,6 @@ "ju" = ( /turf/open/shuttle/dropship/light_grey_top_left, /area/adminlevel/ert_station/royal_marines_station) -"jB" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 6 - }, -/turf/closed/shuttle/twe_dropship{ - icon_state = "2,0" - }, -/area/adminlevel/ert_station/royal_marines_station) "jD" = ( /obj/structure/surface/table/almayer, /turf/open/floor/almayer/redfull, @@ -393,6 +359,24 @@ "jL" = ( /turf/open/space/basic, /area/space) +"jN" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/southwest, +/turf/closed/shuttle/twe_dropship{ + icon_state = "6,0" + }, +/area/adminlevel/ert_station/royal_marines_station) +"jP" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/southwest, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/ert_station/royal_marines_station) "jU" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, @@ -427,19 +411,17 @@ /obj/structure/surface/table/almayer, /turf/open/floor/almayer, /area/adminlevel/ert_station/royal_marines_station) -"kx" = ( -/obj/structure/machinery/light, -/turf/open/floor/almayer/plate, -/area/adminlevel/ert_station/royal_marines_station) -"ky" = ( -/obj/structure/platform{ - dir = 1 - }, +"kt" = ( /obj/effect/decal/warning_stripes{ - icon_state = "S" + icon_state = "E" }, +/obj/structure/platform/metal/almayer/west, /turf/open/floor/almayer/plating/northeast, /area/adminlevel/ert_station/royal_marines_station) +"kx" = ( +/obj/structure/machinery/light, +/turf/open/floor/almayer/plate, +/area/adminlevel/ert_station/royal_marines_station) "kH" = ( /obj/structure/largecrate/random/barrel/blue, /turf/open/floor/almayer/plate, @@ -470,6 +452,16 @@ "kX" = ( /turf/open/floor/almayer/red, /area/adminlevel/ert_station/royal_marines_station) +"li" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/northeast, +/obj/structure/blocker/invisible_wall, +/turf/open/void, +/area/adminlevel/ert_station/royal_marines_station) "ll" = ( /turf/open/floor/almayer/cargo_arrow/east, /area/adminlevel/ert_station/royal_marines_station) @@ -488,6 +480,13 @@ }, /turf/open/floor/almayer/plate, /area/adminlevel/ert_station/royal_marines_station) +"lx" = ( +/obj/structure/machinery/cryopod/no_store{ + dir = 1; + pixel_y = 7 + }, +/turf/open/floor/almayer/cargo, +/area/adminlevel/ert_station/royal_marines_station) "lF" = ( /obj/structure/bed, /obj/item/bedsheet/medical, @@ -514,19 +513,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/adminlevel/ert_station/royal_marines_station) -"lW" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/plating/kutjevo, -/area/adminlevel/ert_station/royal_marines_station) -"lX" = ( -/obj/structure/machinery/cryopod/no_store{ - layer = 3.1; - pixel_y = 7 - }, -/turf/open/floor/almayer/cargo, -/area/adminlevel/ert_station/royal_marines_station) "mb" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/prop/almayer/computers/sensor_computer1{ @@ -535,14 +521,16 @@ }, /turf/open/floor/almayer/plate, /area/adminlevel/ert_station/royal_marines_station) -"mc" = ( -/obj/structure/platform, -/obj/structure/blocker/invisible_wall, -/turf/open/void, -/area/adminlevel/ert_station/royal_marines_station) "mo" = ( /turf/open/floor/almayer/cargo_arrow/west, /area/adminlevel/ert_station/royal_marines_station) +"mu" = ( +/obj/structure/machinery/cryopod/no_store/right{ + layer = 3.1; + pixel_y = 13 + }, +/turf/open/floor/almayer/cargo, +/area/adminlevel/ert_station/royal_marines_station) "mw" = ( /turf/closed/shuttle/twe_dropship{ icon_state = "7,4" @@ -562,6 +550,22 @@ }, /turf/open/floor/almayer/test_floor4, /area/adminlevel/ert_station/royal_marines_station) +"mR" = ( +/obj/structure/platform/metal/almayer, +/turf/closed/shuttle/twe_dropship{ + icon_state = "1,0" + }, +/area/adminlevel/ert_station/royal_marines_station) +"na" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/southeast, +/obj/structure/blocker/invisible_wall, +/turf/open/void, +/area/adminlevel/ert_station/royal_marines_station) "nj" = ( /turf/closed/wall/r_wall/elevator{ dir = 4 @@ -587,15 +591,15 @@ }, /turf/open/floor/almayer/dark_sterile, /area/adminlevel/ert_station/royal_marines_station) -"nI" = ( -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/structure/machinery/cryopod/no_store{ - layer = 3.1; - pixel_y = 7 +"nC" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/turf/open/floor/almayer/cargo, +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/southeast, +/turf/open/floor/almayer/plating/northeast, /area/adminlevel/ert_station/royal_marines_station) "nT" = ( /obj/structure/bed/chair/comfy{ @@ -631,18 +635,6 @@ }, /turf/open/floor/almayer, /area/adminlevel/ert_station/royal_marines_station) -"op" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/open/floor/plating/kutjevo, -/area/adminlevel/ert_station/royal_marines_station) -"oA" = ( -/obj/structure/platform, -/turf/closed/shuttle/twe_dropship{ - icon_state = "1,0" - }, -/area/adminlevel/ert_station/royal_marines_station) "oC" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -661,10 +653,6 @@ }, /turf/open/floor/almayer/orange/northwest, /area/adminlevel/ert_station/royal_marines_station) -"pk" = ( -/obj/structure/machinery/cryopod/no_store/right, -/turf/open/floor/almayer/cargo, -/area/adminlevel/ert_station/royal_marines_station) "ps" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/cargo_arrow/west, @@ -691,47 +679,28 @@ }, /turf/open/floor/almayer/red/west, /area/adminlevel/ert_station/royal_marines_station) -"qi" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 9 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - layer = 2.5 - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/ert_station/royal_marines_station) "qj" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/table/almayer, /obj/structure/machinery/recharger, /turf/open/floor/almayer/sterile_green, /area/adminlevel/ert_station/royal_marines_station) +"qw" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/turf/open/floor/almayer/test_floor4, +/area/adminlevel/ert_station/royal_marines_station) "qx" = ( /obj/structure/surface/table/almayer, /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/red/east, /area/adminlevel/ert_station/royal_marines_station) -"qG" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 10; - layer = 3.51 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1 +"qI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/cryopod/no_store{ + dir = 1; + pixel_y = 7 }, -/turf/open/floor/almayer/plating/northeast, +/turf/open/floor/almayer/cargo, /area/adminlevel/ert_station/royal_marines_station) "qN" = ( /obj/effect/decal/warning_stripes{ @@ -772,20 +741,28 @@ dir = 5 }, /area/adminlevel/ert_station/royal_marines_station) -"rP" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/cryopod/no_store{ - dir = 1; - pixel_y = 7 - }, -/turf/open/floor/almayer/cargo, -/area/adminlevel/ert_station/royal_marines_station) "rS" = ( /turf/open/shuttle/dropship/light_grey_bottom_left, /area/adminlevel/ert_station/royal_marines_station) "sb" = ( /turf/open/floor/almayer/orange/north, /area/adminlevel/ert_station/royal_marines_station) +"sf" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/northwest, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/ert_station/royal_marines_station) +"sh" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/ert_station/royal_marines_station) "su" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/cm_vending/clothing/antag, @@ -822,14 +799,6 @@ /obj/item/roller, /turf/open/floor/almayer/dark_sterile, /area/adminlevel/ert_station/royal_marines_station) -"sR" = ( -/obj/structure/platform{ - dir = 8 - }, -/turf/closed/shuttle/twe_dropship{ - icon_state = "6,1" - }, -/area/adminlevel/ert_station/royal_marines_station) "te" = ( /obj/structure/bed/chair/comfy{ dir = 4 @@ -842,19 +811,17 @@ icon_state = "3,14" }, /area/adminlevel/ert_station/royal_marines_station) -"tv" = ( -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/structure/machinery/cryopod/no_store{ - dir = 1; - pixel_y = 7 - }, -/turf/open/floor/almayer/cargo, -/area/adminlevel/ert_station/royal_marines_station) "tw" = ( /turf/open/floor/almayer/red/southeast, /area/adminlevel/ert_station/royal_marines_station) +"tU" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/platform/metal/almayer, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/ert_station/royal_marines_station) "uc" = ( /turf/closed/shuttle/twe_dropship{ icon_state = "0,4" @@ -864,19 +831,16 @@ /obj/structure/largecrate/random/barrel, /turf/open/floor/almayer/plate, /area/adminlevel/ert_station/royal_marines_station) -"uC" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/void, -/area/adminlevel/ert_station/royal_marines_station) "uE" = ( /obj/structure/machinery/light{ dir = 4 }, /turf/open/floor/almayer/plate, /area/adminlevel/ert_station/royal_marines_station) +"uG" = ( +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/plating/kutjevo, +/area/adminlevel/ert_station/royal_marines_station) "uK" = ( /obj/structure/machinery/light{ dir = 1 @@ -920,6 +884,17 @@ }, /turf/open/floor/almayer/test_floor4, /area/adminlevel/ert_station/royal_marines_station) +"vF" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/ert_station/royal_marines_station) +"vG" = ( +/obj/structure/machinery/cryopod/no_store, +/turf/open/floor/almayer/cargo, +/area/adminlevel/ert_station/royal_marines_station) "vR" = ( /obj/structure/surface/table/almayer, /obj/item/book/manual/marine_law{ @@ -940,13 +915,6 @@ }, /turf/open/floor/almayer, /area/adminlevel/ert_station/royal_marines_station) -"wF" = ( -/obj/structure/machinery/cryopod/no_store/right{ - layer = 3.1; - pixel_y = 13 - }, -/turf/open/floor/almayer/cargo, -/area/adminlevel/ert_station/royal_marines_station) "xb" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/prop/almayer/computers/sensor_computer2{ @@ -1026,6 +994,16 @@ icon_state = "7,12" }, /area/adminlevel/ert_station/royal_marines_station) +"zz" = ( +/obj/structure/machinery/light{ + dir = 8 + }, +/obj/structure/machinery/cryopod/no_store{ + layer = 3.1; + pixel_y = 7 + }, +/turf/open/floor/almayer/cargo, +/area/adminlevel/ert_station/royal_marines_station) "zL" = ( /obj/structure/closet/secure_closet/brig{ name = "Spare Prison Uniforms"; @@ -1081,19 +1059,15 @@ }, /turf/open/floor/almayer/sterile_green, /area/adminlevel/ert_station/royal_marines_station) -"Ai" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E" - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/ert_station/royal_marines_station) "Am" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/orange/north, /area/adminlevel/ert_station/royal_marines_station) +"Ap" = ( +/obj/structure/platform_decoration/metal/almayer/east, +/obj/structure/blocker/invisible_wall, +/turf/open/void, +/area/adminlevel/ert_station/royal_marines_station) "Aq" = ( /obj/structure/machinery/light{ dir = 8 @@ -1107,6 +1081,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/dark_sterile, /area/adminlevel/ert_station/royal_marines_station) +"AI" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/northwest, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + layer = 2.5 + }, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/ert_station/royal_marines_station) "AQ" = ( /turf/closed/shuttle/twe_dropship{ icon_state = "8,6" @@ -1117,6 +1101,12 @@ icon_state = "8,4" }, /area/adminlevel/ert_station/royal_marines_station) +"AZ" = ( +/obj/structure/platform/metal/almayer/north, +/turf/closed/shuttle/twe_dropship{ + icon_state = "0,8" + }, +/area/adminlevel/ert_station/royal_marines_station) "Ba" = ( /turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, /area/adminlevel/ert_station/royal_marines_station) @@ -1137,6 +1127,12 @@ "BV" = ( /turf/open/shuttle/dropship/light_grey_bottom_right, /area/adminlevel/ert_station/royal_marines_station) +"Ch" = ( +/obj/structure/platform/metal/almayer/north, +/turf/closed/shuttle/twe_dropship{ + icon_state = "8,8" + }, +/area/adminlevel/ert_station/royal_marines_station) "Ci" = ( /turf/open/shuttle/dropship/light_grey_left_to_right, /area/adminlevel/ert_station/royal_marines_station) @@ -1159,6 +1155,16 @@ "Cu" = ( /turf/open/void, /area/adminlevel/ert_station/royal_marines_station) +"CQ" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/machinery/cryopod/no_store{ + dir = 1; + pixel_y = 7 + }, +/turf/open/floor/almayer/cargo, +/area/adminlevel/ert_station/royal_marines_station) "CT" = ( /turf/closed/wall/r_wall/elevator/gears, /area/adminlevel/ert_station/royal_marines_station) @@ -1225,12 +1231,23 @@ /obj/structure/window/framed/almayer, /turf/open/floor/plating, /area/adminlevel/ert_station/royal_marines_station) +"DW" = ( +/obj/structure/platform/metal/almayer/west, +/turf/closed/shuttle/twe_dropship{ + icon_state = "6,1" + }, +/area/adminlevel/ert_station/royal_marines_station) "Ei" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/table/almayer, /obj/item/tool/hand_labeler, /turf/open/floor/almayer/sterile_green, /area/adminlevel/ert_station/royal_marines_station) +"Er" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/blocker/invisible_wall, +/turf/open/void, +/area/adminlevel/ert_station/royal_marines_station) "EG" = ( /turf/closed/shuttle/twe_dropship{ icon_state = "8,8" @@ -1259,19 +1276,6 @@ /obj/structure/surface/table/almayer, /turf/open/floor/almayer/red/east, /area/adminlevel/ert_station/royal_marines_station) -"Fp" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 9 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/void, -/area/adminlevel/ert_station/royal_marines_station) "Fw" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -1297,51 +1301,18 @@ /obj/structure/machinery/cm_vending/gear/antag_guns, /turf/open/floor/almayer/plate, /area/adminlevel/ert_station/royal_marines_station) -"Gd" = ( -/obj/structure/machinery/cryopod/no_store, -/turf/open/floor/almayer/cargo, -/area/adminlevel/ert_station/royal_marines_station) "GM" = ( /turf/open/floor/almayer/red/southwest, /area/adminlevel/ert_station/royal_marines_station) -"GO" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 5 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/void, -/area/adminlevel/ert_station/royal_marines_station) -"GQ" = ( -/obj/structure/platform, -/obj/structure/blocker/invisible_wall, -/turf/closed/shuttle/twe_dropship{ - icon_state = "8,0" - }, -/area/adminlevel/ert_station/royal_marines_station) -"GX" = ( -/obj/structure/platform, -/turf/closed/shuttle/twe_dropship{ - icon_state = "7,0" - }, +"GU" = ( +/obj/structure/machinery/cryopod/no_store/right, +/turf/open/floor/almayer/cargo, /area/adminlevel/ert_station/royal_marines_station) "GZ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/light, /turf/open/floor/almayer/orange, /area/adminlevel/ert_station/royal_marines_station) -"He" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/void, -/area/adminlevel/ert_station/royal_marines_station) "Hg" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/table/almayer, @@ -1381,14 +1352,7 @@ "HM" = ( /turf/closed/shuttle/twe_dropship{ icon_state = "0,6" - }, -/area/adminlevel/ert_station/royal_marines_station) -"HX" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/void, + }, /area/adminlevel/ert_station/royal_marines_station) "Id" = ( /obj/structure/surface/table/almayer, @@ -1397,6 +1361,10 @@ }, /turf/open/floor/almayer/plate, /area/adminlevel/ert_station/royal_marines_station) +"Ie" = ( +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/plating/kutjevo, +/area/adminlevel/ert_station/royal_marines_station) "Ip" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -1414,19 +1382,10 @@ }, /turf/open/floor/almayer, /area/adminlevel/ert_station/royal_marines_station) -"Iw" = ( -/obj/structure/platform, -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 10 - }, +"IB" = ( +/obj/structure/platform/metal/almayer, /obj/structure/blocker/invisible_wall, -/turf/open/void, +/turf/closed/shuttle/twe_dropship, /area/adminlevel/ert_station/royal_marines_station) "IC" = ( /obj/structure/bed/chair/vehicle{ @@ -1437,6 +1396,13 @@ }, /turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down, /area/adminlevel/ert_station/royal_marines_station) +"IG" = ( +/obj/structure/machinery/cryopod/no_store{ + layer = 3.1; + pixel_y = 13 + }, +/turf/open/floor/almayer/cargo, +/area/adminlevel/ert_station/royal_marines_station) "IH" = ( /obj/structure/machinery/door/airlock/almayer/security/colony{ dir = 8; @@ -1449,13 +1415,8 @@ }, /turf/open/floor/almayer/test_floor4, /area/adminlevel/ert_station/royal_marines_station) -"IK" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, +"IM" = ( +/obj/structure/platform/metal/almayer/north, /turf/open/floor/plating/kutjevo, /area/adminlevel/ert_station/royal_marines_station) "IQ" = ( @@ -1464,16 +1425,6 @@ }, /turf/open/floor/almayer/orange/west, /area/adminlevel/ert_station/royal_marines_station) -"IY" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/ert_station/royal_marines_station) "Jg" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/cm_vending/gear/antag_guns, @@ -1501,6 +1452,11 @@ }, /turf/open/floor/almayer/plate, /area/adminlevel/ert_station/royal_marines_station) +"JF" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/plating/kutjevo, +/area/adminlevel/ert_station/royal_marines_station) "JM" = ( /obj/structure/toilet{ dir = 8 @@ -1517,16 +1473,6 @@ /obj/structure/reagent_dispensers/fueltank/custom, /turf/open/floor/almayer/dark_sterile, /area/adminlevel/ert_station/royal_marines_station) -"Ko" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/prop/vehicles/tank/twe{ - layer = 5.1; - pixel_y = -6 - }, -/turf/open/floor/plating/kutjevo, -/area/adminlevel/ert_station/royal_marines_station) "Ks" = ( /turf/open/shuttle/elevator/grating, /area/adminlevel/ert_station/royal_marines_station) @@ -1534,16 +1480,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/red/southwest, /area/adminlevel/ert_station/royal_marines_station) -"KD" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/void, -/area/adminlevel/ert_station/royal_marines_station) "KF" = ( /turf/open/shuttle/elevator, /area/adminlevel/ert_station/royal_marines_station) +"KG" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/decal/warning_stripes{ + icon_state = "E" + }, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/ert_station/royal_marines_station) "KJ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/light{ @@ -1551,6 +1497,11 @@ }, /turf/open/floor/almayer/plate, /area/adminlevel/ert_station/royal_marines_station) +"KX" = ( +/obj/structure/platform_decoration/metal/almayer/west, +/obj/structure/blocker/invisible_wall, +/turf/open/void, +/area/adminlevel/ert_station/royal_marines_station) "Lj" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/redfull, @@ -1599,6 +1550,14 @@ }, /turf/open/floor/almayer/plate, /area/adminlevel/ert_station/royal_marines_station) +"MH" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/prop/vehicles/tank/twe{ + layer = 5.1; + pixel_y = -6 + }, +/turf/open/floor/plating/kutjevo, +/area/adminlevel/ert_station/royal_marines_station) "MJ" = ( /turf/open/floor/almayer, /area/adminlevel/ert_station/royal_marines_station) @@ -1649,14 +1608,6 @@ /obj/structure/machinery/light, /turf/open/floor/almayer/red, /area/adminlevel/ert_station/royal_marines_station) -"Ni" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/closed/shuttle/twe_dropship{ - icon_state = "8,8" - }, -/area/adminlevel/ert_station/royal_marines_station) "Nl" = ( /obj/structure/machinery/cm_vending/gear/antag, /turf/open/floor/almayer/plate, @@ -1691,31 +1642,11 @@ /obj/structure/machinery/medical_pod/sleeper, /turf/open/floor/almayer/sterile_green, /area/adminlevel/ert_station/royal_marines_station) -"Ok" = ( -/obj/structure/machinery/cryopod/no_store{ - dir = 1; - pixel_y = 7 - }, -/turf/open/floor/almayer/cargo, -/area/adminlevel/ert_station/royal_marines_station) -"Or" = ( -/obj/structure/machinery/cryopod/no_store{ - layer = 3.1; - pixel_y = 13 - }, -/turf/open/floor/almayer/cargo, -/area/adminlevel/ert_station/royal_marines_station) "Os" = ( /turf/closed/shuttle/twe_dropship{ icon_state = "1,2" }, /area/adminlevel/ert_station/royal_marines_station) -"OA" = ( -/obj/structure/platform_decoration{ - dir = 8 - }, -/turf/open/floor/almayer/test_floor4, -/area/adminlevel/ert_station/royal_marines_station) "OB" = ( /obj/structure/surface/table/almayer, /obj/item/storage/syringe_case{ @@ -1733,32 +1664,22 @@ /obj/structure/largecrate, /turf/open/floor/almayer/plate, /area/adminlevel/ert_station/royal_marines_station) -"OK" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/ert_station/royal_marines_station) "OO" = ( /turf/closed/shuttle/twe_dropship{ icon_state = "5,14" }, /area/adminlevel/ert_station/royal_marines_station) +"OQ" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/blocker/invisible_wall, +/turf/open/void, +/area/adminlevel/ert_station/royal_marines_station) "Pb" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ dir = 1 }, /turf/open/floor/almayer/test_floor4, /area/adminlevel/ert_station/royal_marines_station) -"Pd" = ( -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/plating/kutjevo, -/area/adminlevel/ert_station/royal_marines_station) "Pg" = ( /turf/open/shuttle/dropship, /area/adminlevel/ert_station/royal_marines_station) @@ -1781,6 +1702,11 @@ }, /turf/open/floor/almayer/sterile_green, /area/adminlevel/ert_station/royal_marines_station) +"Pp" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/plating/kutjevo, +/area/adminlevel/ert_station/royal_marines_station) "Px" = ( /turf/closed/shuttle/twe_dropship{ icon_state = "4,14" @@ -1789,15 +1715,6 @@ "PB" = ( /turf/open/floor/almayer/cargo_arrow, /area/adminlevel/ert_station/royal_marines_station) -"PC" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/ert_station/royal_marines_station) "PD" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/door_control/brbutton{ @@ -1806,27 +1723,21 @@ }, /turf/open/floor/almayer/red/west, /area/adminlevel/ert_station/royal_marines_station) +"PH" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E" + }, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform/metal/almayer, +/obj/structure/platform_decoration/metal/almayer/southwest, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/ert_station/royal_marines_station) "PL" = ( /obj/structure/bed/chair/comfy{ dir = 8 }, /turf/open/floor/almayer, /area/adminlevel/ert_station/royal_marines_station) -"PM" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/platform, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 10; - layer = 3.51 - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/ert_station/royal_marines_station) "PN" = ( /obj/structure/machinery/light{ dir = 8 @@ -1866,6 +1777,22 @@ }, /turf/open/floor/plating, /area/adminlevel/ert_station/royal_marines_station) +"Qq" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/northwest, +/obj/structure/blocker/invisible_wall, +/turf/open/void, +/area/adminlevel/ert_station/royal_marines_station) +"Qt" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E" + }, +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/northeast, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/ert_station/royal_marines_station) "QP" = ( /turf/closed/shuttle/twe_dropship{ icon_state = "1,12" @@ -1885,14 +1812,6 @@ /obj/structure/machinery/cm_vending/clothing/antag, /turf/open/floor/almayer/plate, /area/adminlevel/ert_station/royal_marines_station) -"Rw" = ( -/obj/structure/platform{ - dir = 1 - }, -/turf/closed/shuttle/twe_dropship{ - icon_state = "0,8" - }, -/area/adminlevel/ert_station/royal_marines_station) "Ry" = ( /turf/open/floor/almayer/red/north, /area/adminlevel/ert_station/royal_marines_station) @@ -1904,6 +1823,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plate, /area/adminlevel/ert_station/royal_marines_station) +"RQ" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/southeast, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/ert_station/royal_marines_station) "Sb" = ( /obj/docking_port/stationary/emergency_response/idle_port6, /turf/open/floor/plating, @@ -1933,6 +1862,11 @@ }, /turf/open/floor/almayer/plate, /area/adminlevel/ert_station/royal_marines_station) +"Sp" = ( +/obj/structure/platform/metal/almayer/east, +/obj/structure/blocker/invisible_wall, +/turf/open/void, +/area/adminlevel/ert_station/royal_marines_station) "Sv" = ( /obj/structure/surface/table/almayer, /turf/open/floor/almayer/plate, @@ -1942,6 +1876,13 @@ icon_state = "7,2" }, /area/adminlevel/ert_station/royal_marines_station) +"Sz" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/northeast, +/obj/structure/blocker/invisible_wall, +/turf/open/void, +/area/adminlevel/ert_station/royal_marines_station) "ST" = ( /turf/closed/shuttle/twe_dropship{ icon_state = "0,3" @@ -1979,36 +1920,10 @@ /obj/structure/machinery/cm_vending/sorted/marine_food, /turf/open/floor/almayer/plate, /area/adminlevel/ert_station/royal_marines_station) -"Ub" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 10 - }, -/turf/closed/shuttle/twe_dropship{ - icon_state = "6,0" - }, -/area/adminlevel/ert_station/royal_marines_station) "Uc" = ( /obj/structure/largecrate/machine, /turf/open/floor/almayer/plate, /area/adminlevel/ert_station/royal_marines_station) -"Uk" = ( -/obj/structure/platform, -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 6 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/void, -/area/adminlevel/ert_station/royal_marines_station) "Ul" = ( /obj/structure/machinery/light{ dir = 8 @@ -2090,33 +2005,12 @@ icon_state = "5,15" }, /area/adminlevel/ert_station/royal_marines_station) -"Vv" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/platform, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/ert_station/royal_marines_station) "VA" = ( /obj/structure/surface/table/almayer, /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/faxmachine/uscm/brig, /turf/open/floor/almayer/plate, /area/adminlevel/ert_station/royal_marines_station) -"VF" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E" - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform, -/obj/structure/platform_decoration{ - dir = 10 - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/ert_station/royal_marines_station) "VG" = ( /obj/structure/machinery/cm_vending/sorted/medical/blood, /turf/open/floor/almayer/dark_sterile, @@ -2147,6 +2041,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/redfull, /area/adminlevel/ert_station/royal_marines_station) +"VU" = ( +/obj/structure/platform/metal/almayer, +/turf/closed/shuttle/twe_dropship{ + icon_state = "7,0" + }, +/area/adminlevel/ert_station/royal_marines_station) "Wa" = ( /obj/structure/surface/table/almayer, /obj/item/device/flashlight/lamp/green{ @@ -2174,36 +2074,6 @@ }, /turf/open/floor/almayer/plate, /area/adminlevel/ert_station/royal_marines_station) -"Wo" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/platform, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 6; - layer = 3.51 - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/ert_station/royal_marines_station) -"Wt" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E" - }, -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 5 - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/ert_station/royal_marines_station) "Wx" = ( /obj/structure/bed/chair/comfy{ dir = 4 @@ -2211,22 +2081,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/adminlevel/ert_station/royal_marines_station) -"WB" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/machinery/light{ - dir = 4 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 9 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/void, -/area/adminlevel/ert_station/royal_marines_station) "WC" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/cargo_arrow/east, @@ -2276,22 +2130,6 @@ }, /turf/open/floor/almayer/dark_sterile, /area/adminlevel/ert_station/royal_marines_station) -"WY" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/machinery/light{ - dir = 8 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 5 - }, -/obj/structure/blocker/invisible_wall, -/turf/open/void, -/area/adminlevel/ert_station/royal_marines_station) "WZ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/toilet{ @@ -2306,6 +2144,15 @@ "Xh" = ( /turf/open/floor/almayer/redfull, /area/adminlevel/ert_station/royal_marines_station) +"Xs" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform/metal/almayer, +/obj/structure/platform_decoration/metal/almayer/southeast, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/ert_station/royal_marines_station) "Xz" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/orange/southwest, @@ -2327,6 +2174,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plate, /area/adminlevel/ert_station/royal_marines_station) +"XJ" = ( +/obj/structure/platform/metal/almayer/west, +/obj/structure/blocker/invisible_wall, +/turf/open/void, +/area/adminlevel/ert_station/royal_marines_station) "XN" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -2354,6 +2206,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/cargo_arrow, /area/adminlevel/ert_station/royal_marines_station) +"Yh" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/machinery/light{ + dir = 4 + }, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/northwest, +/obj/structure/blocker/invisible_wall, +/turf/open/void, +/area/adminlevel/ert_station/royal_marines_station) "Yk" = ( /obj/structure/machinery/autodoc_console, /turf/open/floor/almayer/sterile_green, @@ -2363,28 +2225,9 @@ /obj/structure/machinery/body_scanconsole, /turf/open/floor/almayer/sterile_green, /area/adminlevel/ert_station/royal_marines_station) -"YZ" = ( -/obj/structure/platform_decoration{ - dir = 4 - }, -/turf/open/floor/almayer/test_floor4, -/area/adminlevel/ert_station/royal_marines_station) "Zf" = ( /turf/open/floor/almayer/dark_sterile, /area/adminlevel/ert_station/royal_marines_station) -"Zk" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform, -/obj/structure/platform_decoration{ - dir = 6 - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/ert_station/royal_marines_station) "Zl" = ( /turf/open/shuttle/dropship/light_grey_single_wide_up_to_down, /area/adminlevel/ert_station/royal_marines_station) @@ -2418,6 +2261,13 @@ }, /turf/open/floor/almayer/plate, /area/adminlevel/ert_station/royal_marines_station) +"ZX" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/ert_station/royal_marines_station) (1,1,1) = {" jL @@ -2892,11 +2742,11 @@ jL (11,1,1) = {" jL gS -Ok +lx Ur Ip vB -rP +qI WS TY yK @@ -2986,18 +2836,18 @@ jL (13,1,1) = {" jL gS -lX +er Ur MM Ur -lX +er aK -nI +zz zM zk zk ls -nI +zz WS Hz qN @@ -3080,18 +2930,18 @@ jL (15,1,1) = {" jL gS -pk -wF -Ok -pk -wF +GU +mu +lx +GU +mu aK -pk -wF -pk -wF -pk -wF +GU +mu +GU +mu +GU +mu WS ds zk @@ -3192,22 +3042,22 @@ Ur PN Ur Ur -WY -HX -HX -HX -Iw +li +XJ +XJ +XJ +bL Ur Ur -WY -HX -HX -HX -HX -HX -HX -HX -Iw +li +XJ +XJ +XJ +XJ +XJ +XJ +XJ +bL Ur Ur Sm @@ -3239,14 +3089,14 @@ Ur Ur Ur Ur -uC +OQ Cu Cu Cu -mc +Er Ur Ur -uC +OQ dd xm uc @@ -3254,7 +3104,7 @@ ST Cu Cu Cu -mc +Er Ur vB XF @@ -3268,32 +3118,32 @@ jL (19,1,1) = {" gS yK -aH -Ai -OK -OK -VF -Ur -Wt -OK -VF -Ur -Wt -OK -OK -Ai -qG +cf +KG +kt +kt +PH +Ur +Qt +kt +PH +Ur +Qt +kt +kt +KG +jP yK Ur Ur -uC +OQ Cu Cu Cu -mc +Er Ur Ur -Rw +AZ xm HM MQ @@ -3301,7 +3151,7 @@ uc ST Cu Cu -go +IB Ur vB XF @@ -3315,7 +3165,7 @@ gS (20,1,1) = {" gS yK -ky +vF dc dc dc @@ -3329,11 +3179,11 @@ dc dc dc Sb -Vv +tU yK Ur Ur -uC +OQ Cu Cu QP @@ -3348,7 +3198,7 @@ jW gU Os aW -oA +mR Ur vB XF @@ -3362,7 +3212,7 @@ gS (21,1,1) = {" gS xy -ky +vF dc dc dc @@ -3376,11 +3226,11 @@ dc dc dc dc -Wo +nC yK Ur -GO -iS +Sz +Ap Cu pO bG @@ -3394,8 +3244,8 @@ Ba Ba MN wl -cL -jB +cH +bA Ur vB hI @@ -3409,7 +3259,7 @@ gS (22,1,1) = {" gS XF -ky +vF dc dc dc @@ -3426,7 +3276,7 @@ dc yK yK Ur -uC +OQ bs tr hp @@ -3437,10 +3287,10 @@ xW IC xW Ci -iR -lW -Ko -YZ +Pp +uG +MH +gN Ur Ur Ur @@ -3456,7 +3306,7 @@ gS (23,1,1) = {" gS XF -ky +vF dc dc dc @@ -3473,7 +3323,7 @@ dc yK yK Ur -uC +OQ DS Px iE @@ -3484,7 +3334,7 @@ Va Va jr Ci -op +IM sy sy Nm @@ -3503,7 +3353,7 @@ gS (24,1,1) = {" gS XF -ky +vF dc dc dc @@ -3520,7 +3370,7 @@ dc yK yK Ur -uC +OQ Vu OO bp @@ -3531,10 +3381,10 @@ xW IC xW Ci -IK -Pd -Pd -OA +JF +Ie +Ie +qw Ur Ur Ur @@ -3550,7 +3400,7 @@ gS (25,1,1) = {" gS ai -ky +vF dc dc dc @@ -3564,11 +3414,11 @@ dc dc dc dc -PM +gc yK Ur -Fp -KD +Qq +KX Cu WL bG @@ -3582,8 +3432,8 @@ Ba Ba MN Cj -sR -Ub +DW +jN Ur Ur kx @@ -3597,7 +3447,7 @@ gS (26,1,1) = {" gS yK -ky +vF dc dc dc @@ -3611,11 +3461,11 @@ dc dc dc dc -Vv +tU yK Ur Ur -uC +OQ Cu Cu zw @@ -3630,7 +3480,7 @@ iI NE Sw iK -GX +VU Ur Ur yK @@ -3644,32 +3494,32 @@ gS (27,1,1) = {" gS yK -qi -fx -PC -PC -Zk -Ur -fM -PC -IY -Ur -fM -PC -PC -fx -du +AI +ZX +sh +sh +Xs +Ur +sf +sh +Xs +Ur +sf +sh +sh +ZX +RQ yK Ur Ur -uC +OQ Cu Cu Cu -mc +Er Ur Ur -Ni +Ch hm AQ ZO @@ -3677,7 +3527,7 @@ AU jI Cu Cu -GQ +dL Ur Ur yK @@ -3709,14 +3559,14 @@ Ur Ur Ur Ur -uC +OQ Cu Cu Cu -mc +Er Ur Ur -uC +OQ EG hm AU @@ -3724,7 +3574,7 @@ jI Cu Cu Cu -mc +Er Ur Ur yK @@ -3756,22 +3606,22 @@ Ur Ri Ur Ur -WB -He -He -He -Uk +Yh +Sp +Sp +Sp +na Ur Ur -WB -He -He -He -He -He -He -He -Uk +Yh +Sp +Sp +Sp +Sp +Sp +Sp +Sp +na Ur Ur uE @@ -3832,18 +3682,18 @@ jL (31,1,1) = {" jL gS -Gd -Or -lX -Gd -Or +vG +IG +er +vG +IG aK -Gd -Or -Gd -Or -Gd -Or +vG +IG +vG +IG +vG +IG WS Hz qN @@ -3926,18 +3776,18 @@ jL (33,1,1) = {" jL gS -Ok +lx Ur Sc Ur -Ok +lx aK -tv +CQ UV jV jV sI -tv +CQ WS ds zk @@ -4020,11 +3870,11 @@ jL (35,1,1) = {" jL gS -lX +er Ur XN Ur -lX +er WS TY yK diff --git a/maps/templates/lazy_templates/upp_ert_station.dmm b/maps/templates/lazy_templates/upp_ert_station.dmm index f5baa3293d2d..2a2fec57b2ac 100644 --- a/maps/templates/lazy_templates/upp_ert_station.dmm +++ b/maps/templates/lazy_templates/upp_ert_station.dmm @@ -24,12 +24,6 @@ }, /turf/open/floor/strata/green3/west, /area/adminlevel/ert_station/upp_station) -"au" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/turf/open/space, -/area/space) "ax" = ( /obj/structure/surface/rack, /obj/item/tool/weldpack{ @@ -114,6 +108,17 @@ "bd" = ( /turf/open/floor/strata/green3/east, /area/adminlevel/ert_station/upp_station) +"be" = ( +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/obj/structure/platform/metal/kutjevo_smooth/east, +/obj/structure/platform/metal/kutjevo_smooth/north, +/obj/structure/platform/metal/kutjevo_smooth, +/turf/open/space/basic, +/area/space) "bh" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 @@ -227,13 +232,6 @@ }, /turf/open/floor/strata/blue1, /area/adminlevel/ert_station/upp_station) -"di" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/obj/structure/platform_decoration/kutjevo, -/turf/open/space, -/area/space) "dz" = ( /obj/structure/pipes/vents/pump, /turf/open/floor/strata/multi_tiles/southeast, @@ -241,6 +239,16 @@ "dB" = ( /turf/open/floor/strata/green4, /area/adminlevel/ert_station/upp_station) +"dC" = ( +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/obj/structure/platform/metal/kutjevo_smooth, +/obj/structure/platform/metal/kutjevo_smooth/north, +/turf/open/floor/almayer_hull, +/area/space) "dH" = ( /obj/structure/largecrate/random/secure, /obj/structure/machinery/light/double/blue, @@ -301,11 +309,6 @@ }, /turf/open/floor/prison/darkyellowfull2, /area/adminlevel/ert_station/upp_station) -"eV" = ( -/obj/structure/platform_decoration/kutjevo, -/obj/structure/lattice, -/turf/open/space/basic, -/area/space) "eX" = ( /obj/structure/filingcabinet{ density = 0; @@ -319,26 +322,6 @@ }, /turf/open/floor/strata/green4/north, /area/adminlevel/ert_station/upp_station) -"eY" = ( -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/turf/open/space, -/area/space) -"fc" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/turf/open/space/basic, -/area/space) "fd" = ( /obj/structure/largecrate/random/barrel/green, /obj/structure/prop/invuln/overhead_pipe{ @@ -352,6 +335,11 @@ }, /turf/open/floor/strata/green3/east, /area/adminlevel/ert_station/upp_station) +"fg" = ( +/obj/structure/lattice, +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/space/basic, +/area/space) "fi" = ( /obj/structure/machinery/door/airlock/almayer/medical/colony{ name = "\improper Morgue" @@ -368,6 +356,26 @@ }, /turf/open/floor/strata/purp3/east, /area/adminlevel/ert_station/upp_station) +"fm" = ( +/obj/structure/platform/metal/strata, +/turf/open/floor/strata/floor3/east, +/area/adminlevel/ert_station/upp_station) +"fn" = ( +/obj/structure/platform/metal/kutjevo_smooth/west, +/obj/structure/platform/metal/kutjevo_smooth/north, +/obj/structure/platform/metal/kutjevo_smooth, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/turf/open/space/basic, +/area/space) +"ft" = ( +/obj/structure/platform/metal/kutjevo_smooth/west, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) "fA" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -417,15 +425,15 @@ }, /turf/open/floor/strata/white_cyan4/south, /area/adminlevel/ert_station/upp_station) -"gx" = ( -/obj/structure/platform_decoration/strata/metal{ - dir = 1 - }, -/obj/effect/decal/strata_decals/catwalk/prison, -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 10 +"gO" = ( +/obj/structure/machinery/cryopod/no_store/right{ + pixel_y = 6 }, -/turf/open/floor/plating, +/turf/open/floor/prison/floor_marked/west, +/area/adminlevel/ert_station/upp_station) +"hd" = ( +/obj/structure/platform/metal/strata, +/turf/open/floor/strata/multi_tiles/west, /area/adminlevel/ert_station/upp_station) "he" = ( /obj/structure/largecrate/random/barrel/green, @@ -441,12 +449,20 @@ }, /turf/open/floor/strata/floor3/east, /area/adminlevel/ert_station/upp_station) -"hA" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 +"ht" = ( +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" }, -/obj/structure/platform/kutjevo/smooth, -/turf/open/space/basic, +/obj/structure/platform/metal/kutjevo_smooth/east, +/obj/structure/platform/metal/kutjevo_smooth/north, +/obj/structure/platform/metal/kutjevo_smooth, +/turf/open/space, +/area/space) +"hC" = ( +/obj/structure/platform/metal/kutjevo_smooth/west, +/turf/open/space, /area/space) "hF" = ( /turf/open/floor/strata/green4/west, @@ -502,6 +518,11 @@ }, /turf/open/floor/strata/floor3/east, /area/adminlevel/ert_station/upp_station) +"iN" = ( +/obj/structure/platform_decoration/metal/kutjevo/north, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) "iV" = ( /turf/open/floor/strata/green3/northwest, /area/adminlevel/ert_station/upp_station) @@ -520,11 +541,6 @@ /obj/item/storage/box/bodybags, /turf/open/floor/strata/multi_tiles/southwest, /area/adminlevel/ert_station/upp_station) -"jt" = ( -/obj/structure/lattice, -/obj/structure/platform_decoration/kutjevo, -/turf/open/space/basic, -/area/space) "jH" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 10 @@ -532,6 +548,10 @@ /obj/effect/decal/strata_decals/catwalk/prison, /turf/open/floor/plating, /area/adminlevel/ert_station/upp_station) +"jV" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, +/turf/open/space/basic, +/area/space) "kc" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/strata/multi_tiles/west, @@ -576,6 +596,11 @@ /obj/item/storage/toolbox/mechanical, /turf/open/floor/strata/floor3/east, /area/adminlevel/ert_station/upp_station) +"kZ" = ( +/obj/structure/lattice, +/obj/structure/platform/metal/kutjevo_smooth, +/turf/open/space/basic, +/area/space) "lb" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -595,6 +620,16 @@ }, /turf/closed/wall/strata_outpost/reinforced, /area/adminlevel/ert_station/upp_station) +"lg" = ( +/obj/structure/platform/metal/kutjevo_smooth/north, +/obj/structure/platform/metal/kutjevo_smooth/north, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/turf/open/space/basic, +/area/space) "lm" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 @@ -686,11 +721,6 @@ }, /turf/open/floor/strata/floor2, /area/adminlevel/ert_station/upp_station) -"mJ" = ( -/obj/structure/lattice, -/obj/structure/platform/kutjevo/smooth, -/turf/open/space/basic, -/area/space) "mP" = ( /obj/structure/machinery/computer/cameras/almayer_network/vehicle{ dir = 1 @@ -698,6 +728,14 @@ /obj/structure/surface/table/reinforced/almayer_B, /turf/open/floor/strata/floor3/east, /area/adminlevel/ert_station/upp_station) +"nc" = ( +/obj/structure/platform_decoration/metal/strata/north, +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 10 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) "ne" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/strata/orange_icorner/north, @@ -722,6 +760,10 @@ }, /turf/open/floor/plating, /area/adminlevel/ert_station/upp_station) +"nF" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/turf/open/space/basic, +/area/space) "nO" = ( /obj/structure/bed/chair, /obj/structure/pipes/vents/pump{ @@ -776,24 +818,6 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/comdoor/colony, /turf/open/floor/strata/floor3/east, /area/adminlevel/ert_station/upp_station) -"oP" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/obj/structure/lattice, -/turf/open/space/basic, -/area/space) -"oS" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/space/basic, -/area/space) "pb" = ( /turf/open/floor/strata/white_cyan3/south, /area/adminlevel/ert_station/upp_station) @@ -829,13 +853,6 @@ }, /turf/open/floor/plating/prison, /area/space) -"pN" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/obj/structure/lattice, -/turf/open/space/basic, -/area/space) "qd" = ( /obj/structure/machinery/bioprinter{ stored_metal = 1000 @@ -848,21 +865,19 @@ }, /turf/open/floor/strata/green3, /area/adminlevel/ert_station/upp_station) -"qA" = ( -/obj/effect/decal/strata_decals/catwalk/prison, -/obj/structure/platform_decoration/strata/metal, -/obj/structure/curtain/open/black, -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/plating, -/area/adminlevel/ert_station/upp_station) "qF" = ( /obj/structure/machinery/cm_vending/sorted/medical/no_access{ req_access = null }, /turf/open/floor/strata/white_cyan3/north, /area/adminlevel/ert_station/upp_station) +"qG" = ( +/obj/structure/machinery/cryopod/no_store/right{ + layer = 3.1; + pixel_y = 13 + }, +/turf/open/floor/prison/floor_marked/west, +/area/adminlevel/ert_station/upp_station) "qH" = ( /turf/open/floor/strata/floorscorched2, /area/adminlevel/ert_station/upp_station) @@ -894,12 +909,6 @@ }, /turf/open/floor/strata/blue1, /area/adminlevel/ert_station/upp_station) -"rk" = ( -/obj/structure/machinery/cryopod/no_store/right{ - pixel_y = 6 - }, -/turf/open/floor/prison/floor_marked/west, -/area/adminlevel/ert_station/upp_station) "rr" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/structure/pipes/standard/simple/hidden/cyan{ @@ -924,6 +933,10 @@ /obj/structure/closet/crate/ammo, /turf/open/floor/corsat/plate, /area/adminlevel/ert_station/upp_station) +"rD" = ( +/obj/structure/platform/metal/kutjevo_smooth/north, +/turf/open/floor/almayer_hull, +/area/space) "rL" = ( /obj/structure/machinery/light/double/blue{ dir = 8 @@ -968,13 +981,6 @@ /obj/item/tool/pickaxe/diamonddrill, /turf/open/floor/plating/platebot, /area/adminlevel/ert_station/upp_station) -"sr" = ( -/obj/structure/lattice, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/turf/open/space/basic, -/area/space) "sy" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/strata/damaged3, @@ -1023,6 +1029,14 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/strata/white_cyan2, /area/adminlevel/ert_station/upp_station) +"sN" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/platform/metal/strata, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) "sU" = ( /obj/structure/window/framed/strata, /turf/open/floor/plating, @@ -1076,18 +1090,6 @@ }, /turf/open/floor/strata/floor3/east, /area/adminlevel/ert_station/upp_station) -"ue" = ( -/obj/structure/lattice, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/turf/open/space/basic, -/area/space) "uf" = ( /obj/structure/machinery/blackbox_recorder, /turf/open/floor/strata/green1, @@ -1095,10 +1097,6 @@ "uj" = ( /turf/open/floor/strata/white_cyan2, /area/adminlevel/ert_station/upp_station) -"uE" = ( -/obj/structure/platform_decoration/strata/metal, -/turf/open/floor/strata/floor3/east, -/area/adminlevel/ert_station/upp_station) "uI" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/structure/pipes/standard/simple/hidden/cyan{ @@ -1106,11 +1104,6 @@ }, /turf/open/floor/strata/floor3/east, /area/adminlevel/ert_station/upp_station) -"uL" = ( -/obj/structure/platform/kutjevo/smooth, -/obj/structure/lattice, -/turf/open/space/basic, -/area/space) "uP" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/structure/pipes/standard/simple/hidden/cyan{ @@ -1136,6 +1129,16 @@ "ve" = ( /turf/open/floor/prison/floor_marked/west, /area/adminlevel/ert_station/upp_station) +"vi" = ( +/obj/structure/lattice, +/obj/structure/platform/metal/kutjevo_smooth/north, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/turf/open/space/basic, +/area/space) "vn" = ( /turf/open/floor/strata/floor3/east, /area/adminlevel/ert_station/upp_station) @@ -1166,53 +1169,16 @@ }, /turf/open/floor/plating, /area/adminlevel/ert_station/upp_station) -"vS" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/lattice, -/turf/open/space, -/area/space) "vY" = ( /obj/structure/machinery/washing_machine, /turf/open/floor/strata/floor3/east, /area/adminlevel/ert_station/upp_station) -"vZ" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/turf/open/space/basic, -/area/space) "we" = ( /obj/structure/pipes/vents/pump{ dir = 8 }, /turf/open/floor/strata/multi_tiles/southeast, /area/adminlevel/ert_station/upp_station) -"wr" = ( -/obj/structure/platform/strata/metal{ - dir = 4 - }, -/obj/effect/decal/strata_decals/catwalk/prison{ - layer = 2.2 - }, -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - dir = 8; - icon_state = "p_stair_sn_full_cap"; - layer = 2.5 - }, -/turf/open/floor/plating, -/area/adminlevel/ert_station/upp_station) "ws" = ( /turf/open/floor/solarpanel, /area/space) @@ -1307,10 +1273,19 @@ }, /turf/open/floor/strata/green4, /area/adminlevel/ert_station/upp_station) -"yt" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 +"yr" = ( +/obj/structure/lattice, +/obj/structure/platform/metal/kutjevo_smooth/east, +/turf/open/space/basic, +/area/space) +"yx" = ( +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" }, +/obj/structure/platform/metal/kutjevo_smooth/west, +/obj/structure/platform/metal/kutjevo_smooth/north, /turf/open/space, /area/space) "yH" = ( @@ -1389,6 +1364,13 @@ }, /turf/open/floor/greengrid, /area/adminlevel/ert_station/upp_station) +"AH" = ( +/obj/structure/machinery/cryopod/no_store/right, +/obj/structure/machinery/light/double/blue{ + dir = 4 + }, +/turf/open/floor/prison/floor_marked/west, +/area/adminlevel/ert_station/upp_station) "AI" = ( /obj/structure/closet/crate, /turf/open/floor/strata/orange_edge/east, @@ -1440,17 +1422,30 @@ }, /turf/open/floor/plating, /area/adminlevel/ert_station/upp_station) -"Bw" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/turf/open/space/basic, -/area/space) "BH" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/structure/pipes/standard/manifold/fourway/hidden/cyan, /turf/open/floor/plating, /area/adminlevel/ert_station/upp_station) +"BR" = ( +/obj/structure/platform/metal/kutjevo_smooth, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) +"BT" = ( +/obj/structure/platform/metal/strata/west, +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 8; + icon_state = "p_stair_sn_full_cap"; + layer = 2.5 + }, +/obj/effect/decal/strata_decals/catwalk/prison{ + layer = 2.2 + }, +/obj/structure/pipes/standard/simple/hidden/cyan, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) "BX" = ( /obj/structure/prop/invuln/overhead_pipe{ dir = 4; @@ -1526,6 +1521,11 @@ }, /turf/open/floor/corsat/plate, /area/adminlevel/ert_station/upp_station) +"CN" = ( +/obj/structure/platform_decoration/metal/kutjevo, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) "CW" = ( /obj/structure/machinery/cm_vending/sorted/medical/chemistry/no_access{ req_access = null @@ -1539,6 +1539,10 @@ /obj/structure/closet/firecloset, /turf/open/floor/strata/green4/east, /area/adminlevel/ert_station/upp_station) +"Dj" = ( +/obj/structure/platform/metal/kutjevo_smooth, +/turf/open/space/basic, +/area/space) "Dv" = ( /turf/closed/wall/strata_outpost, /area/adminlevel/ert_station/upp_station) @@ -1556,6 +1560,11 @@ /obj/structure/machinery/light/double/blue, /turf/open/floor/strata/multi_tiles/southeast, /area/adminlevel/ert_station/upp_station) +"DL" = ( +/obj/structure/lattice, +/obj/structure/platform_decoration/metal/kutjevo, +/turf/open/space/basic, +/area/space) "Eg" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 9 @@ -1588,16 +1597,15 @@ /obj/item/tool/pen, /turf/open/floor/strata/green3, /area/adminlevel/ert_station/upp_station) +"Fk" = ( +/obj/structure/lattice, +/obj/structure/platform/metal/kutjevo_smooth/north, +/turf/open/space/basic, +/area/space) "FA" = ( /obj/effect/decal/strata_decals/catwalk/prison, /turf/open/floor/strata/floor3/east, /area/adminlevel/ert_station/upp_station) -"FF" = ( -/obj/effect/decal/strata_decals/catwalk/prison, -/obj/structure/platform/strata/metal, -/obj/structure/pipes/standard/manifold/hidden/cyan, -/turf/open/floor/plating, -/area/adminlevel/ert_station/upp_station) "FI" = ( /obj/structure/bed/chair/comfy/black, /turf/open/floor/strata/multi_tiles/southeast, @@ -1608,6 +1616,11 @@ }, /turf/open/floor/strata/multi_tiles/southeast, /area/adminlevel/ert_station/upp_station) +"FK" = ( +/obj/structure/platform/metal/kutjevo_smooth/east, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) "FL" = ( /obj/structure/surface/table/reinforced/black, /obj/item/device/megaphone, @@ -1631,6 +1644,16 @@ /obj/structure/pipes/standard/simple/hidden/cyan, /turf/open/floor/greengrid, /area/adminlevel/ert_station/upp_station) +"Gc" = ( +/obj/structure/platform/metal/kutjevo_smooth/west, +/obj/structure/lattice, +/turf/open/space, +/area/space) +"Gf" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/obj/structure/platform/metal/kutjevo_smooth, +/turf/open/space/basic, +/area/space) "Gl" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/effect/decal/warning_stripes{ @@ -1649,13 +1672,6 @@ /obj/effect/decal/strata_decals/catwalk/prison, /turf/open/floor/plating, /area/adminlevel/ert_station/upp_station) -"Gu" = ( -/obj/structure/lattice, -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/turf/open/space/basic, -/area/space) "Gw" = ( /turf/open/floor/strata/red3/south, /area/adminlevel/ert_station/upp_station) @@ -1673,28 +1689,10 @@ /obj/structure/machinery/cm_vending/sorted/tech/electronics_storage/antag, /turf/open/floor/greengrid, /area/adminlevel/ert_station/upp_station) -"GN" = ( -/obj/effect/decal/strata_decals/catwalk/prison, -/obj/structure/platform/strata/metal, -/obj/structure/pipes/standard/simple/hidden/cyan{ - dir = 4 - }, -/turf/open/floor/plating, -/area/adminlevel/ert_station/upp_station) "Hb" = ( /obj/structure/largecrate/supply, /turf/open/floor/strata/floor3/east, /area/adminlevel/ert_station/upp_station) -"Hc" = ( -/obj/structure/platform_decoration/kutjevo{ - dir = 4 - }, -/obj/structure/platform_decoration/kutjevo{ - dir = 1 - }, -/obj/structure/lattice, -/turf/open/space, -/area/space) "Hl" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/effect/decal/warning_stripes{ @@ -1714,29 +1712,10 @@ /obj/structure/machinery/cm_vending/sorted/tech/comp_storage/antag, /turf/open/floor/greengrid, /area/adminlevel/ert_station/upp_station) -"HR" = ( -/obj/structure/platform/strata/metal, -/turf/open/floor/strata/multi_tiles/west, -/area/adminlevel/ert_station/upp_station) "Is" = ( /obj/structure/largecrate/random/barrel/white, /turf/open/floor/strata/green3/east, /area/adminlevel/ert_station/upp_station) -"IC" = ( -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth, -/turf/open/space, -/area/space) "IK" = ( /obj/effect/decal/warning_stripes{ icon_state = "N" @@ -1785,6 +1764,11 @@ /obj/structure/machinery/light/double/blue, /turf/open/floor/strata/floor3/east, /area/adminlevel/ert_station/upp_station) +"Ji" = ( +/obj/structure/platform_decoration/metal/kutjevo/west, +/obj/structure/platform_decoration/metal/kutjevo, +/turf/open/space, +/area/space) "Jj" = ( /obj/structure/closet/emcloset, /turf/open/floor/strata/green3/west, @@ -1839,18 +1823,6 @@ }, /turf/open/floor/strata/green3, /area/adminlevel/ert_station/upp_station) -"Kj" = ( -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/obj/structure/platform/kutjevo/smooth, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/turf/open/floor/almayer_hull, -/area/space) "Kn" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/asphalt/cement, @@ -1884,6 +1856,15 @@ /obj/structure/surface/table/reinforced, /turf/open/floor/strata/floor3/east, /area/adminlevel/ert_station/upp_station) +"KZ" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/platform_decoration/metal/strata, +/obj/structure/curtain/open/black, +/obj/structure/pipes/standard/simple/hidden/cyan{ + dir = 4 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) "Lg" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/structure/pipes/standard/simple/hidden/cyan{ @@ -1921,19 +1902,6 @@ }, /turf/open/asphalt/cement/cement1/north, /area/adminlevel/ert_station/upp_station) -"LG" = ( -/obj/structure/lattice, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/turf/open/space/basic, -/area/space) -"LI" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/turf/open/space/basic, -/area/space) "LK" = ( /obj/structure/machinery/light/double/blue{ dir = 4 @@ -1976,10 +1944,6 @@ /obj/item/storage/belt/medical/lifesaver/upp/full, /turf/open/floor/strata/white_cyan3/north, /area/adminlevel/ert_station/upp_station) -"Mt" = ( -/obj/structure/platform/kutjevo/smooth, -/turf/open/space/basic, -/area/space) "MB" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 6 @@ -2040,40 +2004,16 @@ /obj/structure/bed/chair/comfy/black, /turf/open/floor/strata/red3/south, /area/adminlevel/ert_station/upp_station) -"NQ" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/turf/open/space/basic, -/area/space) "NU" = ( /obj/effect/decal/strata_decals/catwalk/prison, /obj/structure/curtain/medical, /obj/structure/pipes/standard/simple/hidden/cyan, /turf/open/floor/plating, /area/adminlevel/ert_station/upp_station) -"OA" = ( -/obj/structure/platform/strata/metal{ - dir = 8 - }, -/obj/structure/stairs/perspective{ - color = "#6e6e6e"; - dir = 8; - icon_state = "p_stair_sn_full_cap"; - layer = 2.5 - }, -/obj/effect/decal/strata_decals/catwalk/prison{ - layer = 2.2 - }, -/obj/structure/pipes/standard/simple/hidden/cyan, +"Oq" = ( +/obj/effect/decal/strata_decals/catwalk/prison, +/obj/structure/platform/metal/strata, +/obj/structure/pipes/standard/manifold/hidden/cyan, /turf/open/floor/plating, /area/adminlevel/ert_station/upp_station) "OK" = ( @@ -2086,18 +2026,25 @@ /obj/item/storage/large_holster/machete/full, /turf/open/floor/strata/white_cyan4/north, /area/adminlevel/ert_station/upp_station) +"OU" = ( +/obj/structure/platform/metal/strata/east, +/obj/effect/decal/strata_decals/catwalk/prison{ + layer = 2.2 + }, +/obj/structure/stairs/perspective{ + color = "#6e6e6e"; + dir = 8; + icon_state = "p_stair_sn_full_cap"; + layer = 2.5 + }, +/turf/open/floor/plating, +/area/adminlevel/ert_station/upp_station) "Ph" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" }, /turf/open/floor/strata/multi_tiles/southeast, /area/adminlevel/ert_station/upp_station) -"Pj" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/turf/open/floor/almayer_hull, -/area/space) "PI" = ( /turf/open/floor/almayer_hull, /area/space) @@ -2128,6 +2075,10 @@ /obj/structure/pipes/vents/pump, /turf/open/floor/strata/white_cyan3, /area/adminlevel/ert_station/upp_station) +"Qq" = ( +/obj/structure/platform/metal/kutjevo_smooth/west, +/turf/open/space/basic, +/area/space) "Qu" = ( /obj/structure/bed{ icon_state = "abed" @@ -2193,6 +2144,12 @@ }, /turf/open/floor/strata/floor3/east, /area/adminlevel/ert_station/upp_station) +"RD" = ( +/obj/structure/platform_decoration/metal/kutjevo/east, +/obj/structure/platform_decoration/metal/kutjevo/north, +/obj/structure/lattice, +/turf/open/space, +/area/space) "RK" = ( /obj/structure/machinery/iv_drip, /obj/structure/machinery/light/double/blue, @@ -2216,6 +2173,16 @@ /obj/structure/pipes/standard/simple/hidden/cyan, /turf/open/floor/strata/floor3/east, /area/adminlevel/ert_station/upp_station) +"RT" = ( +/obj/structure/platform/metal/kutjevo_smooth/north, +/obj/structure/barricade/handrail{ + dir = 1; + icon_state = "hr_kutjevo"; + name = "solar lattice" + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) "RU" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -2266,13 +2233,6 @@ /obj/structure/machinery/light/double/blue, /turf/open/floor/greengrid, /area/adminlevel/ert_station/upp_station) -"Sx" = ( -/obj/structure/machinery/cryopod/no_store/right{ - layer = 3.1; - pixel_y = 13 - }, -/turf/open/floor/prison/floor_marked/west, -/area/adminlevel/ert_station/upp_station) "Sy" = ( /obj/structure/pipes/vents/pump{ dir = 8 @@ -2342,6 +2302,10 @@ }, /turf/open/floor/strata/floor3/east, /area/adminlevel/ert_station/upp_station) +"Ti" = ( +/obj/structure/platform_decoration/metal/strata, +/turf/open/floor/strata/floor3/east, +/area/adminlevel/ert_station/upp_station) "Tj" = ( /turf/open/asphalt/cement/cement12, /area/adminlevel/ert_station/upp_station) @@ -2351,6 +2315,11 @@ }, /turf/open/floor/strata/multi_tiles/southeast, /area/adminlevel/ert_station/upp_station) +"Tq" = ( +/obj/structure/lattice, +/obj/structure/platform/metal/kutjevo_smooth/west, +/turf/open/space/basic, +/area/space) "Tr" = ( /obj/effect/landmark/wo_supplies/storage/m56d, /obj/structure/machinery/light/double/blue{ @@ -2385,13 +2354,6 @@ /obj/item/storage/surgical_tray, /turf/open/floor/strata/white_cyan4/south, /area/adminlevel/ert_station/upp_station) -"TE" = ( -/obj/structure/machinery/cryopod/no_store/right, -/obj/structure/machinery/light/double/blue{ - dir = 4 - }, -/turf/open/floor/prison/floor_marked/west, -/area/adminlevel/ert_station/upp_station) "TG" = ( /turf/open/floor/strata/green3, /area/adminlevel/ert_station/upp_station) @@ -2407,25 +2369,6 @@ /obj/item/tool/kitchen/rollingpin, /turf/open/floor/strata/floor3/east, /area/adminlevel/ert_station/upp_station) -"TI" = ( -/obj/structure/platform/strata/metal, -/turf/open/floor/strata/floor3/east, -/area/adminlevel/ert_station/upp_station) -"TM" = ( -/obj/structure/barricade/handrail{ - dir = 1; - icon_state = "hr_kutjevo"; - name = "solar lattice" - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/platform/kutjevo/smooth{ - dir = 1 - }, -/obj/structure/platform/kutjevo/smooth, -/turf/open/space/basic, -/area/space) "TQ" = ( /obj/structure/closet/emcloset, /turf/open/floor/strata/multi_tiles/west, @@ -2441,6 +2384,10 @@ }, /turf/open/floor/strata/floor3/east, /area/adminlevel/ert_station/upp_station) +"TX" = ( +/obj/structure/platform/metal/kutjevo_smooth/east, +/turf/open/space, +/area/space) "Ug" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/clipboard, @@ -2605,6 +2552,10 @@ }, /turf/open/floor/plating, /area/adminlevel/ert_station/upp_station) +"VH" = ( +/obj/structure/platform/metal/kutjevo_smooth/east, +/turf/open/space/basic, +/area/space) "VI" = ( /turf/closed/wall/rock/brown, /area/space) @@ -2626,13 +2577,6 @@ /obj/structure/window/framed/strata/hull, /turf/open/floor/plating, /area/adminlevel/ert_station/upp_station) -"Wi" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 8 - }, -/obj/structure/lattice, -/turf/open/space/basic, -/area/space) "Wj" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -2655,13 +2599,6 @@ /obj/structure/largecrate/random/barrel/green, /turf/open/floor/strata/orange_edge/east, /area/adminlevel/ert_station/upp_station) -"WQ" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/obj/structure/lattice, -/turf/open/space/basic, -/area/space) "WX" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 @@ -2711,6 +2648,10 @@ }, /turf/open/floor/strata/green3/east, /area/adminlevel/ert_station/upp_station) +"Yf" = ( +/obj/structure/platform/metal/kutjevo_smooth/north, +/turf/open/space/basic, +/area/space) "Yy" = ( /obj/effect/decal/warning_stripes{ icon_state = "N" @@ -2728,12 +2669,6 @@ }, /turf/open/floor/plating, /area/adminlevel/ert_station/upp_station) -"YK" = ( -/obj/structure/platform/kutjevo/smooth{ - dir = 4 - }, -/turf/open/space/basic, -/area/space) "YO" = ( /obj/structure/machinery/gibber{ pixel_y = 10 @@ -2771,13 +2706,6 @@ /obj/structure/largecrate/random/barrel/blue, /turf/open/floor/prison/floor_marked/west, /area/adminlevel/ert_station/upp_station) -"ZH" = ( -/obj/structure/lattice, -/obj/structure/platform_decoration/kutjevo{ - dir = 8 - }, -/turf/open/space/basic, -/area/space) "ZM" = ( /obj/structure/largecrate/random/case/small, /obj/structure/machinery/light/double/blue{ @@ -2830,11 +2758,11 @@ Cp Cp GI GI -eV -YK -YK -YK -oS +CN +VH +VH +VH +nF AN AN AN @@ -2853,13 +2781,13 @@ AN GI AN AN -jt -LG -LG -LG -LG -LG -ZH +DL +yr +yr +yr +yr +yr +fg GI GI GI @@ -2872,11 +2800,11 @@ Cp Cp Cp VI -uL +BR ws ws ws -oP +RT GI GI GI @@ -2895,13 +2823,13 @@ GI GI GI GI -mJ +kZ ws ws ws ws ws -ue +vi AN GI Cp @@ -2914,11 +2842,11 @@ qU qU QG Cp -Mt +Dj ws IV ws -NQ +lg Cp Cp GI @@ -2937,7 +2865,7 @@ We We El AN -mJ +kZ ws ws ws @@ -2980,10 +2908,10 @@ YW El El El -Gu -Gu -Gu -Gu +Tq +Tq +Tq +Tq Cp Cp Cp @@ -3798,7 +3726,7 @@ xy xy zs po -qA +KZ po po po @@ -3840,7 +3768,7 @@ lb sA Gl po -GN +sN ME yH yH @@ -3882,7 +3810,7 @@ RU RU po po -GN +sN bY dz tx @@ -3924,7 +3852,7 @@ UE Bq bi UE -FF +Oq SI Zm uI @@ -3966,8 +3894,8 @@ aP tv Zm vn -gx -OA +nc +BT cO rr Mi @@ -4008,8 +3936,8 @@ MM tv Zm vn -uE -wr +Ti +OU Zm FA Sa @@ -4050,14 +3978,14 @@ ZS Bt gf Wj -TI +fm IX Zm pv mq Cp Cp -ZH +fg GI AN "} @@ -4092,14 +4020,14 @@ Jz Bp Tm yH -HR +hd YO kc yH Cp Cp PI -sr +Fk AN AN "} @@ -4139,9 +4067,9 @@ Dv Cp Cp Cp -Mt +Dj PI -Bw +Yf AN AN "} @@ -4181,9 +4109,9 @@ Dv Cp Cp GI -uL +BR PI -Bw +Yf AN AN "} @@ -4223,9 +4151,9 @@ Dv Cp GI AN -Mt +Dj PI -Bw +Yf AN AN "} @@ -4257,17 +4185,17 @@ LB JX LN Dv -TE -Sx -rk +AH +qG +gO Cp Cp Cp GI AN -Mt +Dj PI -Bw +Yf AN AN "} @@ -4303,13 +4231,13 @@ Dv Cp Cp Cp -di -yt -WQ -yt -hA +Ji +TX +FK +TX +Gf PI -Bw +Yf AN AN "} @@ -4345,13 +4273,13 @@ Cp ws ws ws -TM +be ws ws ws -IC +ht PI -Bw +Yf AN AN "} @@ -4383,17 +4311,17 @@ Cp Cp Cp Cp -uL +BR ws IV ws -Kj +dC ws IV ws -Pj +rD PI -Bw +Yf AN AN "} @@ -4425,17 +4353,17 @@ Cp Cp GI GI -uL +BR ws ws ws -vZ +fn ws ws ws -eY -LI -fc +yx +Qq +jV AN AN "} @@ -4467,15 +4395,15 @@ GI GI GI AN -pN -vS -Wi -vS -Hc -vS -Wi -au -fc +iN +Gc +ft +Gc +RD +Gc +ft +hC +jV AN AN AN diff --git a/maps/templates/lazy_templates/uscm_ert_station.dmm b/maps/templates/lazy_templates/uscm_ert_station.dmm index 06713fbff6e5..4584c14e8cc6 100644 --- a/maps/templates/lazy_templates/uscm_ert_station.dmm +++ b/maps/templates/lazy_templates/uscm_ert_station.dmm @@ -107,15 +107,6 @@ }, /turf/open/floor/almayer/sterile_green_side/west, /area/adminlevel/ert_station/uscm_station) -"bv" = ( -/obj/structure/platform{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/ert_station/uscm_station) "bB" = ( /obj/structure/bed/chair/comfy/orange{ dir = 1 @@ -208,11 +199,6 @@ /obj/item/storage/box/pillbottles, /turf/open/floor/almayer/sterile_green_side/east, /area/adminlevel/ert_station/uscm_station) -"cX" = ( -/obj/structure/platform, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/ert_station/uscm_station) "cZ" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -234,6 +220,24 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/dark, /area/adminlevel/ert_station/uscm_station) +"dj" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/southeast, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/ert_station/uscm_station) +"dl" = ( +/obj/structure/platform_decoration/metal/almayer, +/obj/item/hardpoint/armor/paladin, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/ert_station/uscm_station) +"do" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/southwest, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/ert_station/uscm_station) "du" = ( /obj/structure/bed/roller, /turf/open/floor/almayer/sterile_green_side/east, @@ -347,10 +351,6 @@ /obj/effect/decal/cleanable/cobweb, /turf/open/floor/plating, /area/adminlevel/ert_station/uscm_station) -"eu" = ( -/obj/structure/platform, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/ert_station/uscm_station) "eF" = ( /obj/structure/bed/chair/office/light{ dir = 8 @@ -432,12 +432,13 @@ }, /turf/open/floor/almayer/dark_sterile, /area/adminlevel/ert_station/uscm_station) -"fo" = ( -/obj/structure/platform_decoration{ - dir = 1 +"fp" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/northeast, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" }, -/obj/item/hardpoint/special/firing_port_weapon, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plating/northeast, /area/adminlevel/ert_station/uscm_station) "fu" = ( @@ -508,6 +509,15 @@ }, /turf/open/floor/almayer/dark_sterile, /area/adminlevel/ert_station/uscm_station) +"gd" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/northwest, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/ert_station/uscm_station) "gj" = ( /obj/structure/pipes/standard/manifold/hidden/cyan, /turf/open/floor/almayer/dark_sterile, @@ -535,9 +545,11 @@ }, /turf/open/floor/almayer/plate, /area/adminlevel/ert_station/uscm_station) -"gW" = ( -/obj/structure/platform, -/obj/effect/decal/cleanable/blood/oil, +"gU" = ( +/obj/structure/platform/metal/almayer/east, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, /turf/open/floor/almayer/plating/northeast, /area/adminlevel/ert_station/uscm_station) "gY" = ( @@ -574,13 +586,10 @@ }, /turf/open/floor/carpet, /area/adminlevel/ert_station/uscm_station) -"ho" = ( -/obj/structure/platform{ - dir = 8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E" - }, +"hn" = ( +/obj/structure/platform/metal/almayer, +/obj/item/storage/toolbox/mechanical, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/plating/northeast, /area/adminlevel/ert_station/uscm_station) "hq" = ( @@ -593,21 +602,6 @@ }, /turf/open/floor/almayer/plate, /area/adminlevel/ert_station/uscm_station) -"hv" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/platform, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 10; - layer = 3.51 - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/ert_station/uscm_station) "hw" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -651,13 +645,6 @@ /obj/item/clothing/suit/storage/marine/light/vest, /turf/open/floor/red/southwest, /area/adminlevel/ert_station/uscm_station) -"hN" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor{ - explo_proof = 1; - locked = 1 - }, -/turf/open/floor/almayer/no_build, -/area/adminlevel/ert_station/uscm_station) "hO" = ( /obj/structure/ladder{ id = "regladder5"; @@ -827,21 +814,6 @@ }, /turf/open/floor/almayer/plate, /area/adminlevel/ert_station/uscm_station) -"jM" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 9 - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/ert_station/uscm_station) "jP" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 @@ -858,6 +830,13 @@ }, /turf/open/floor/almayer/tcomms, /area/adminlevel/ert_station/uscm_station) +"jX" = ( +/obj/structure/platform/metal/almayer/west, +/obj/effect/decal/warning_stripes{ + icon_state = "E" + }, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/ert_station/uscm_station) "jZ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/manifold/hidden/cyan{ @@ -905,6 +884,24 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/test_floor5, /area/adminlevel/ert_station/uscm_station) +"kL" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor{ + explo_proof = 1; + locked = 1 + }, +/turf/open/floor/almayer/no_build, +/area/adminlevel/ert_station/uscm_station) +"kQ" = ( +/obj/structure/machinery/cryopod/no_store/right, +/obj/structure/sign/safety/cryo{ + pixel_y = 30 + }, +/obj/structure/sign/safety/refridgeration{ + pixel_y = 30; + pixel_x = 15 + }, +/turf/open/floor/almayer/sterile_green_corner, +/area/adminlevel/ert_station/uscm_station) "kX" = ( /obj/structure/largecrate/random/barrel/red, /turf/open/floor/almayer/orange, @@ -1027,21 +1024,6 @@ /obj/structure/pipes/standard/manifold/fourway/hidden/cyan, /turf/open/floor/almayer/uscm/directional/logo_c/west, /area/adminlevel/ert_station/uscm_station) -"mo" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 5 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out" - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/ert_station/uscm_station) "mp" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{ name = "\improper Medical Bay"; @@ -1049,6 +1031,11 @@ }, /turf/open/floor/almayer/sterile_green, /area/adminlevel/ert_station/uscm_station) +"mr" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/ert_station/uscm_station) "ms" = ( /obj/structure/sign/safety/medical{ pixel_x = 8; @@ -1290,16 +1277,6 @@ "oD" = ( /turf/open/floor/almayer/red, /area/adminlevel/ert_station/uscm_station) -"oE" = ( -/obj/structure/machinery/door/airlock/almayer/engineering{ - name = "\improper Engineering Hallway"; - req_one_access = null; - explo_proof = 1; - locked = 1; - opacity = 1 - }, -/turf/open/floor/almayer/orange, -/area/adminlevel/ert_station/uscm_station) "oT" = ( /obj/structure/pipes/standard/simple/hidden/cyan, /turf/open/floor/carpet, @@ -1472,6 +1449,15 @@ }, /turf/open/floor/almayer/plate, /area/adminlevel/ert_station/uscm_station) +"rm" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E" + }, +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/northeast, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/ert_station/uscm_station) "rr" = ( /turf/open/floor/almayer_hull/outerhull_dir/west, /area/space) @@ -1555,12 +1541,6 @@ }, /turf/open/floor/almayer/plate, /area/adminlevel/ert_station/uscm_station) -"sd" = ( -/obj/structure/platform, -/obj/item/storage/toolbox/mechanical, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/ert_station/uscm_station) "sg" = ( /obj/structure/closet/emcloset, /turf/open/floor/almayer/plating_striped, @@ -1600,21 +1580,6 @@ }, /turf/open/floor/almayer/plate, /area/adminlevel/ert_station/uscm_station) -"sH" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 10; - layer = 3.51 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_y = 1 - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/ert_station/uscm_station) "sL" = ( /obj/structure/machinery/optable, /obj/item/tank/anesthetic, @@ -1709,6 +1674,16 @@ }, /turf/open/floor/plating/plating_catwalk, /area/adminlevel/ert_station/uscm_station) +"tR" = ( +/obj/structure/machinery/door/airlock/almayer/engineering{ + name = "\improper Engineering Hallway"; + req_one_access = null; + explo_proof = 1; + locked = 1; + opacity = 1 + }, +/turf/open/floor/almayer/orange, +/area/adminlevel/ert_station/uscm_station) "tY" = ( /obj/structure/sign/safety/refridgeration{ pixel_y = 32 @@ -1739,6 +1714,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/adminlevel/ert_station/uscm_station) +"uu" = ( +/obj/structure/platform/metal/almayer/north, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/northwest, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + layer = 2.5 + }, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/ert_station/uscm_station) "ux" = ( /obj/structure/machinery/portable_atmospherics/powered/pump, /obj/structure/sign/safety/high_rad{ @@ -1755,14 +1740,6 @@ }, /turf/open/floor/almayer/plate, /area/adminlevel/ert_station/uscm_station) -"uD" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/platform, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/ert_station/uscm_station) "uF" = ( /obj/structure/barricade/metal{ dir = 4 @@ -1842,6 +1819,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/warnplate/west, /area/adminlevel/ert_station/uscm_station) +"vA" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/southwest, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/ert_station/uscm_station) "vF" = ( /obj/structure/surface/rack, /obj/item/storage/box/bodybags, @@ -1853,16 +1840,6 @@ /obj/structure/window/framed/almayer/white, /turf/open/floor/plating, /area/adminlevel/ert_station/uscm_station) -"vH" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/ert_station/uscm_station) "vI" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/nosmoking_2{ @@ -1886,22 +1863,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/dark, /area/adminlevel/ert_station/uscm_station) -"wp" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 9 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - layer = 2.5 - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/ert_station/uscm_station) "wr" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/redfull/northwest, @@ -2212,6 +2173,13 @@ }, /turf/open/floor/plating/plating_catwalk, /area/adminlevel/ert_station/uscm_station) +"zs" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/platform/metal/almayer/east, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/ert_station/uscm_station) "zt" = ( /obj/structure/pipes/vents/pump{ dir = 1 @@ -2257,6 +2225,16 @@ }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/uscm_station) +"zU" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/southeast, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/ert_station/uscm_station) "zW" = ( /obj/item/storage/box/bodybags{ pixel_x = 3; @@ -2414,6 +2392,16 @@ /obj/structure/pipes/standard/simple/hidden/cyan, /turf/open/floor/almayer/plate, /area/adminlevel/ert_station/uscm_station) +"Ce" = ( +/obj/structure/machinery/door/airlock/almayer/engineering{ + name = "\improper Engineering Hallway"; + req_one_access = null; + explo_proof = 1; + locked = 1; + opacity = 1 + }, +/turf/open/floor/almayer/no_build, +/area/adminlevel/ert_station/uscm_station) "Ch" = ( /obj/structure/surface/table/reinforced/black, /obj/item/weapon/gun/rifle/l42a/training, @@ -2548,21 +2536,6 @@ /obj/structure/closet/emcloset, /turf/open/floor/almayer/plating_striped/north, /area/adminlevel/ert_station/uscm_station) -"DG" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 6; - layer = 3.51 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 1 - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/ert_station/uscm_station) "DH" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/largecrate/random/barrel/blue, @@ -2588,6 +2561,15 @@ }, /turf/open/floor/almayer/plating/northeast, /area/adminlevel/ert_station/uscm_station) +"DU" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E" + }, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform/metal/almayer, +/obj/structure/platform_decoration/metal/almayer/southwest, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/ert_station/uscm_station) "DW" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -2624,6 +2606,10 @@ }, /turf/open/floor/almayer/plate, /area/adminlevel/ert_station/uscm_station) +"Ek" = ( +/obj/structure/platform/metal/almayer, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/ert_station/uscm_station) "Eq" = ( /obj/structure/bed/chair/office/light, /obj/effect/decal/cleanable/dirt, @@ -2637,15 +2623,6 @@ /obj/structure/blocker/invisible_wall, /turf/open/floor/plating, /area/adminlevel/ert_station/uscm_station) -"Ey" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/structure/platform{ - dir = 4 - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/ert_station/uscm_station) "EA" = ( /obj/structure/machinery/power/port_gen/pacman, /turf/open/floor/almayer/plating_striped/north, @@ -2710,19 +2687,6 @@ }, /turf/open/floor/almayer/plate, /area/adminlevel/ert_station/uscm_station) -"Fk" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E" - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform, -/obj/structure/platform_decoration{ - dir = 10 - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/ert_station/uscm_station) "Fm" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/cyan{ @@ -2790,16 +2754,6 @@ /obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, /turf/open/floor/almayer/plate, /area/adminlevel/ert_station/uscm_station) -"FV" = ( -/obj/structure/machinery/door/airlock/almayer/engineering{ - name = "\improper Engineering Hallway"; - req_one_access = null; - explo_proof = 1; - locked = 1; - opacity = 1 - }, -/turf/open/floor/almayer/no_build, -/area/adminlevel/ert_station/uscm_station) "FX" = ( /obj/structure/machinery/door/airlock/almayer/security/glass/reinforced{ name = "\improper Armory" @@ -2815,11 +2769,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/adminlevel/ert_station/uscm_station) -"Gd" = ( -/obj/structure/platform_decoration, -/obj/item/hardpoint/armor/paladin, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/ert_station/uscm_station) "Ge" = ( /obj/structure/pipes/standard/simple/hidden/cyan, /obj/structure/sign/safety/medical{ @@ -3002,15 +2951,6 @@ }, /turf/open/floor/almayer/plate, /area/adminlevel/ert_station/uscm_station) -"Ie" = ( -/obj/structure/platform{ - dir = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/ert_station/uscm_station) "Ii" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/cyan{ @@ -3086,6 +3026,14 @@ }, /turf/open/floor/plating/plating_catwalk, /area/adminlevel/ert_station/uscm_station) +"Jh" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/platform/metal/almayer, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/ert_station/uscm_station) "Ji" = ( /turf/open/floor/almayer_hull/outerhull_dir/northwest, /area/space) @@ -3165,6 +3113,16 @@ }, /turf/open/floor/almayer, /area/adminlevel/ert_station/uscm_station) +"Kq" = ( +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/west, +/obj/structure/platform_decoration/metal/almayer/southwest, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_y = 1 + }, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/ert_station/uscm_station) "Ks" = ( /obj/structure/machinery/line_nexter{ id = "line2"; @@ -3407,6 +3365,14 @@ /obj/structure/closet/coffin, /turf/open/floor/almayer/plate, /area/adminlevel/ert_station/uscm_station) +"Ow" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor{ + dir = 2; + explo_proof = 1; + locked = 1 + }, +/turf/open/floor/almayer/no_build, +/area/adminlevel/ert_station/uscm_station) "OA" = ( /turf/open/floor/almayer/tcomms, /area/adminlevel/ert_station/uscm_station) @@ -3446,14 +3412,6 @@ }, /turf/open/floor/almayer/plate, /area/adminlevel/ert_station/uscm_station) -"OZ" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor{ - dir = 2; - explo_proof = 1; - locked = 1 - }, -/turf/open/floor/almayer/no_build, -/area/adminlevel/ert_station/uscm_station) "Pa" = ( /obj/structure/prop/almayer/name_stencil{ icon_state = "kurtz2"; @@ -3561,18 +3519,6 @@ }, /turf/open/floor/almayer/plate, /area/adminlevel/ert_station/uscm_station) -"Qh" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 6; - layer = 3.51 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/ert_station/uscm_station) "Qj" = ( /obj/structure/pipes/standard/manifold/hidden/cyan, /turf/open/floor/plating/plating_catwalk, @@ -3731,19 +3677,6 @@ "Sj" = ( /turf/open/floor/wood/ship, /area/adminlevel/ert_station/uscm_station) -"Sr" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform, -/obj/structure/platform_decoration{ - dir = 6 - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/ert_station/uscm_station) "SC" = ( /obj/item/weapon/gun/shotgun/combat{ pixel_x = 4; @@ -3843,21 +3776,6 @@ /obj/structure/pipes/standard/simple/hidden/cyan, /turf/open/floor/plating/plating_catwalk, /area/adminlevel/ert_station/uscm_station) -"Uc" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E" - }, -/obj/structure/platform{ - dir = 1 - }, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 5 - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/ert_station/uscm_station) "Ug" = ( /obj/structure/pipes/unary/outlet_injector{ dir = 1 @@ -3917,6 +3835,13 @@ }, /turf/open/floor/almayer, /area/adminlevel/ert_station/uscm_station) +"Ve" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E" + }, +/obj/structure/platform/metal/almayer/west, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/ert_station/uscm_station) "Vk" = ( /obj/structure/largecrate/random/barrel/true_random, /turf/open/floor/almayer/plate, @@ -3931,6 +3856,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer/sterile_green_side/north, /area/adminlevel/ert_station/uscm_station) +"Vx" = ( +/obj/structure/platform/metal/almayer/north, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/ert_station/uscm_station) "VA" = ( /obj/structure/pipes/standard/simple/hidden/cyan{ dir = 4 @@ -3955,6 +3887,15 @@ /obj/structure/closet/wardrobe/chemistry_white, /turf/open/floor/almayer/sterile_green_side/east, /area/adminlevel/ert_station/uscm_station) +"VT" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform/metal/almayer, +/obj/structure/platform_decoration/metal/almayer/southeast, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/ert_station/uscm_station) "VZ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/ash, @@ -4061,21 +4002,6 @@ }, /turf/open/floor/almayer/cargo_arrow, /area/adminlevel/ert_station/uscm_station) -"WZ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/platform, -/obj/structure/platform{ - dir = 4 - }, -/obj/structure/platform_decoration{ - dir = 6; - layer = 3.51 - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/ert_station/uscm_station) "Xb" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/cyan{ @@ -4124,6 +4050,12 @@ }, /turf/open/floor/almayer/plate, /area/adminlevel/ert_station/uscm_station) +"XB" = ( +/obj/structure/platform_decoration/metal/almayer/north, +/obj/item/hardpoint/special/firing_port_weapon, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/ert_station/uscm_station) "XC" = ( /obj/item/tool/warning_cone{ pixel_y = 5; @@ -4132,6 +4064,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/adminlevel/ert_station/uscm_station) +"XJ" = ( +/obj/structure/platform/metal/almayer, +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/ert_station/uscm_station) "XM" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/vomit, @@ -4149,26 +4086,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/adminlevel/ert_station/uscm_station) -"Yb" = ( -/obj/structure/machinery/cryopod/no_store/right, -/obj/structure/sign/safety/cryo{ - pixel_y = 30 - }, -/obj/structure/sign/safety/refridgeration{ - pixel_y = 30; - pixel_x = 15 - }, -/turf/open/floor/almayer/sterile_green_corner, -/area/adminlevel/ert_station/uscm_station) -"Yo" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E" - }, -/obj/structure/platform{ - dir = 8 - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/ert_station/uscm_station) "Yp" = ( /obj/structure/machinery/pipedispenser, /obj/effect/decal/cleanable/dirt, @@ -4268,21 +4185,20 @@ /obj/structure/closet/secure_closet/guncabinet/red/cic_armory_shotgun, /turf/open/floor/red/west, /area/adminlevel/ert_station/uscm_station) +"ZM" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/platform/metal/almayer, +/obj/structure/platform/metal/almayer/east, +/obj/structure/platform_decoration/metal/almayer/southeast, +/turf/open/floor/almayer/plating/northeast, +/area/adminlevel/ert_station/uscm_station) "ZS" = ( /obj/structure/target, /turf/open/floor/almayer/plating_striped, /area/adminlevel/ert_station/uscm_station) -"ZW" = ( -/obj/structure/platform, -/obj/structure/platform{ - dir = 8 - }, -/obj/structure/platform_decoration{ - dir = 10; - layer = 3.51 - }, -/turf/open/floor/almayer/plating/northeast, -/area/adminlevel/ert_station/uscm_station) (1,1,1) = {" kZ @@ -5699,7 +5615,7 @@ Eu zK zK dP -OZ +Ow zK kZ kZ @@ -5797,7 +5713,7 @@ kZ kZ kZ zK -hN +kL rs rs JP @@ -5903,10 +5819,10 @@ kZ kZ zK zK -FV +Ce zK zK -oE +tR zK zK kZ @@ -6751,7 +6667,7 @@ zK Lo Hc mD -Yb +kQ du iS CO @@ -6912,21 +6828,21 @@ Px PD MJ MJ -mo -ho -Yo -Fk +fp +jX +Ve +DU Rv -Uc -Yo -Fk +rm +Ve +DU Rv -Uc -Yo -Yo -Yo -ho -sH +rm +Ve +Ve +Ve +jX +Kq tD nP ps @@ -6964,7 +6880,7 @@ pR PD QU Rv -Ie +Vx qI qI qI @@ -6978,7 +6894,7 @@ qI qI qI IH -uD +Jh fI yR ir @@ -7016,7 +6932,7 @@ er jZ ot rj -Ie +Vx qI qI qI @@ -7030,7 +6946,7 @@ qI qI qI qI -WZ +ZM kf zr ir @@ -7068,7 +6984,7 @@ er ks MJ tD -Ie +Vx qI qI qI @@ -7120,7 +7036,7 @@ er ks MJ qL -Ie +Vx qI qI qI @@ -7172,7 +7088,7 @@ er ks MJ tD -Ie +Vx qI qI qI @@ -7224,7 +7140,7 @@ er jZ ot zt -Ie +Vx qI qI qI @@ -7238,7 +7154,7 @@ qI qI qI qI -hv +vA OE zr ir @@ -7276,7 +7192,7 @@ OU ks MJ Rv -Ie +Vx qI qI qI @@ -7290,7 +7206,7 @@ qI qI qI qI -uD +Jh Ii yR ir @@ -7328,21 +7244,21 @@ yr PD MJ MJ -wp -bv -Ey -Sr +uu +gU +zs +VT Rv -jM -Ey -vH +gd +zs +VT Rv -jM -Ey -Ey -Ey -bv -DG +gd +zs +zs +zs +gU +zU tD EL WV @@ -8891,8 +8807,8 @@ kZ kZ zK zK -fo -ZW +XB +do Fm Pw Lf @@ -8944,7 +8860,7 @@ kZ zK cz na -sd +hn JI yf TB @@ -8996,7 +8912,7 @@ kZ zK RR Bc -cX +mr dP qu mF @@ -9048,7 +8964,7 @@ kZ zK Bc IJ -cX +mr ow RI Cl @@ -9100,7 +9016,7 @@ kZ zK Bc RR -eu +Ek dP Tm nv @@ -9152,7 +9068,7 @@ kZ zK Bc RR -eu +Ek yU mw Ee @@ -9204,7 +9120,7 @@ kZ zK VI lu -gW +XJ Po aP lI @@ -9255,8 +9171,8 @@ kZ kZ zK zK -Gd -Qh +dl +dj HM Fg ue diff --git a/maps/templates/lazy_templates/weyland_ert_station.dmm b/maps/templates/lazy_templates/weyland_ert_station.dmm index 0496c52cf6b3..d855ace4882e 100644 --- a/maps/templates/lazy_templates/weyland_ert_station.dmm +++ b/maps/templates/lazy_templates/weyland_ert_station.dmm @@ -1,13 +1,4 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"ab" = ( -/obj/structure/machinery/light/double{ - dir = 4; - pixel_x = 10; - pixel_y = 1 - }, -/obj/effect/decal/warning_stripes, -/turf/open/floor/corsat/squares, -/area/adminlevel/ert_station/weyland_station) "al" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -30,6 +21,15 @@ }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/weyland_station) +"aZ" = ( +/obj/structure/machinery/door/poddoor/almayer/blended/white/open{ + id = "WY Bio" + }, +/turf/closed/wall/almayer/research/containment/wall/purple{ + dir = 8; + icon_state = "containment_window_h" + }, +/area/adminlevel/ert_station/weyland_station) "bf" = ( /obj/structure/surface/table/reinforced/black, /obj/item/tool/stamp/internalaffairs{ @@ -44,12 +44,6 @@ }, /turf/open/floor/corsat/blue/northeast, /area/adminlevel/ert_station/weyland_station) -"bk" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/turf/open/floor/corsat/squares, -/area/adminlevel/ert_station/weyland_station) "bp" = ( /obj/structure/bed/chair{ dir = 8 @@ -73,9 +67,6 @@ /obj/item/bedsheet/orange, /turf/open/floor/corsat/squares, /area/adminlevel/ert_station/weyland_station) -"bF" = ( -/turf/open/floor/almayer/research/containment/corner/east, -/area/adminlevel/ert_station/weyland_station) "bG" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 6 @@ -170,6 +161,12 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat/squares, /area/adminlevel/ert_station/weyland_station) +"dh" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/open/floor/corsat/squares, +/area/adminlevel/ert_station/weyland_station) "dx" = ( /obj/structure/window/framed/corsat/indestructible/research, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ @@ -218,13 +215,6 @@ }, /turf/open/floor/corsat/redcorner/north, /area/adminlevel/ert_station/weyland_station) -"dT" = ( -/turf/closed/wall/almayer/research/containment/wall/corner, -/area/adminlevel/ert_station/weyland_station) -"dU" = ( -/obj/structure/bed/chair, -/turf/open/floor/corsat/squares, -/area/adminlevel/ert_station/weyland_station) "ee" = ( /obj/structure/bed/roller, /turf/open/floor/corsat/darkgreen, @@ -248,12 +238,6 @@ }, /turf/open/floor/corsat/green/west, /area/adminlevel/ert_station/weyland_station) -"ek" = ( -/obj/structure/machinery/sleep_console{ - dir = 1 - }, -/turf/open/floor/corsat/squares, -/area/adminlevel/ert_station/weyland_station) "el" = ( /turf/open/floor/corsat/greencorner/north, /area/adminlevel/ert_station/weyland_station) @@ -265,6 +249,10 @@ }, /turf/open/floor/corsat/red/north, /area/adminlevel/ert_station/weyland_station) +"ev" = ( +/obj/structure/bed/chair, +/turf/open/floor/corsat/squares, +/area/adminlevel/ert_station/weyland_station) "eA" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/item/clothing/gloves/yellow, @@ -296,12 +284,6 @@ /obj/structure/pipes/standard/manifold/hidden/green, /turf/open/floor/corsat/squares, /area/adminlevel/ert_station/weyland_station) -"eX" = ( -/obj/structure/morgue/crematorium{ - id = "WY Cremate" - }, -/turf/open/floor/corsat/green/northeast, -/area/adminlevel/ert_station/weyland_station) "fe" = ( /obj/structure/machinery/door/poddoor/shutters/almayer/open{ dir = 4; @@ -313,12 +295,6 @@ }, /turf/open/floor/corsat/sigma, /area/adminlevel/ert_station/weyland_station) -"fh" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/tool/portadialysis, -/obj/item/book/manual/medical_diagnostics_manual, -/turf/open/floor/corsat/green/southeast, -/area/adminlevel/ert_station/weyland_station) "fl" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_10" @@ -365,9 +341,24 @@ }, /turf/open/floor/corsat/plate, /area/adminlevel/ert_station/weyland_station) +"fR" = ( +/turf/open/floor/almayer/research/containment/entrance, +/area/adminlevel/ert_station/weyland_station) "fX" = ( /turf/closed/wall/r_wall/biodome, /area/adminlevel/ert_station/weyland_station) +"ga" = ( +/obj/structure/surface/table/reinforced/prison, +/obj/item/tool/surgery/scalpel, +/obj/item/tool/surgery/hemostat, +/obj/item/tool/surgery/circular_saw, +/obj/item/tool/surgery/cautery, +/obj/item/tool/surgery/retractor, +/obj/item/device/autopsy_scanner{ + pixel_y = 9 + }, +/turf/open/floor/corsat/green/southeast, +/area/adminlevel/ert_station/weyland_station) "gf" = ( /obj/structure/machinery/body_scanconsole, /obj/structure/machinery/autodoc_console{ @@ -375,6 +366,15 @@ }, /turf/open/floor/corsat/green/north, /area/adminlevel/ert_station/weyland_station) +"gg" = ( +/obj/structure/machinery/light/double{ + dir = 4; + pixel_x = 10; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes, +/turf/open/floor/corsat/squares, +/area/adminlevel/ert_station/weyland_station) "gh" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -431,9 +431,6 @@ /obj/item/storage/box/wy_mre, /turf/open/floor/corsat/whitetan, /area/adminlevel/ert_station/weyland_station) -"gS" = ( -/turf/closed/wall/almayer/research/containment/wall/east, -/area/adminlevel/ert_station/weyland_station) "gW" = ( /obj/structure/machinery/chem_dispenser, /obj/item/reagent_container/glass/beaker/bluespace, @@ -454,6 +451,15 @@ /obj/item/tank/anesthetic, /turf/open/floor/corsat/darkgreen/north, /area/adminlevel/ert_station/weyland_station) +"hy" = ( +/obj/structure/morgue, +/obj/structure/machinery/light/double{ + dir = 8; + pixel_x = -10; + pixel_y = 1 + }, +/turf/open/floor/corsat/green/west, +/area/adminlevel/ert_station/weyland_station) "hz" = ( /obj/structure/bed/chair/office/light{ dir = 8 @@ -481,9 +487,6 @@ }, /turf/open/floor/corsat/red, /area/adminlevel/ert_station/weyland_station) -"hO" = ( -/turf/open/floor/almayer/research/containment/corner2, -/area/adminlevel/ert_station/weyland_station) "hZ" = ( /obj/structure/closet/secure_closet/brig{ density = 0; @@ -538,21 +541,6 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat/redcorner, /area/adminlevel/ert_station/weyland_station) -"iP" = ( -/obj/structure/closet/fireaxecabinet{ - pixel_y = 32 - }, -/obj/structure/machinery/light/double{ - dir = 1 - }, -/obj/structure/closet/crate/medical, -/obj/item/storage/firstaid/toxin, -/obj/item/storage/firstaid/rad{ - pixel_x = 7; - pixel_y = 6 - }, -/turf/open/floor/corsat/greencorner/east, -/area/adminlevel/ert_station/weyland_station) "iT" = ( /obj/structure/surface/table/reinforced, /obj/item/tool/kitchen/tray, @@ -565,14 +553,6 @@ /obj/item/tool/kitchen/rollingpin, /turf/open/floor/corsat/sterileplate, /area/adminlevel/ert_station/weyland_station) -"iU" = ( -/obj/structure/closet/crate/internals, -/obj/item/storage/firstaid/adv{ - pixel_y = 6 - }, -/obj/item/storage/firstaid/fire, -/turf/open/floor/corsat/green/north, -/area/adminlevel/ert_station/weyland_station) "iV" = ( /obj/structure/machinery/autolathe/full, /turf/open/floor/corsat/yellow/west, @@ -595,6 +575,9 @@ }, /turf/open/floor/corsat/squares, /area/adminlevel/ert_station/weyland_station) +"jn" = ( +/turf/open/floor/almayer/research/containment/floor2, +/area/adminlevel/ert_station/weyland_station) "jz" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 @@ -619,33 +602,6 @@ }, /turf/open/floor/corsat/red/west, /area/adminlevel/ert_station/weyland_station) -"jY" = ( -/obj/structure/machinery/light/double{ - dir = 8; - pixel_x = -10; - pixel_y = 1 - }, -/obj/structure/surface/rack, -/obj/item/storage/fancy/vials/random, -/obj/item/storage/fancy/vials/random, -/obj/item/storage/fancy/vials/random, -/turf/open/floor/corsat/green/west, -/area/adminlevel/ert_station/weyland_station) -"ka" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/recharger, -/obj/item/storage/box/masks{ - pixel_x = 7 - }, -/obj/item/storage/box/gloves{ - pixel_x = 3; - pixel_y = 3 - }, -/turf/open/floor/corsat/green/north, -/area/adminlevel/ert_station/weyland_station) -"kn" = ( -/turf/open/floor/almayer/research/containment/floor2/west, -/area/adminlevel/ert_station/weyland_station) "kq" = ( /obj/structure/bed/chair/wheelchair, /obj/structure/machinery/light/double, @@ -658,11 +614,6 @@ }, /turf/open/floor/strata/multi_tiles/southeast, /area/adminlevel/ert_station/weyland_station) -"kx" = ( -/turf/closed/wall/almayer/research/containment/wall/corner{ - dir = 1 - }, -/area/adminlevel/ert_station/weyland_station) "ky" = ( /obj/structure/closet/secure_closet/engineering_personal, /obj/item/clothing/suit/storage/hazardvest/blue, @@ -675,6 +626,9 @@ /obj/structure/machinery/power/smes, /turf/open/floor/corsat/plate, /area/adminlevel/ert_station/weyland_station) +"kI" = ( +/turf/closed/wall/almayer/research/containment/wall/corner, +/area/adminlevel/ert_station/weyland_station) "kM" = ( /obj/structure/largecrate/supply/weapons/flamers, /obj/structure/pipes/standard/simple/hidden/green, @@ -696,9 +650,6 @@ }, /turf/open/floor/corsat/tan/north, /area/adminlevel/ert_station/weyland_station) -"kW" = ( -/turf/open/floor/almayer/research/containment/floor2, -/area/adminlevel/ert_station/weyland_station) "la" = ( /obj/structure/machinery/light/double, /obj/structure/pipes/standard/simple/hidden/green{ @@ -706,6 +657,12 @@ }, /turf/open/floor/corsat/redcorner, /area/adminlevel/ert_station/weyland_station) +"lc" = ( +/obj/structure/machinery/cryopod/no_store/right{ + pixel_y = 6 + }, +/turf/open/floor/corsat/cargo, +/area/adminlevel/ert_station/weyland_station) "lh" = ( /turf/open/floor/corsat/marked, /area/adminlevel/ert_station/weyland_station) @@ -769,6 +726,9 @@ /obj/structure/pipes/standard/manifold/hidden/green, /turf/open/floor/corsat/red, /area/adminlevel/ert_station/weyland_station) +"lR" = ( +/turf/open/floor/almayer/research/containment/floor2/west, +/area/adminlevel/ert_station/weyland_station) "lS" = ( /obj/structure/largecrate/supply/medicine/blood, /obj/structure/machinery/light/double{ @@ -778,13 +738,6 @@ }, /turf/open/floor/corsat/green/northeast, /area/adminlevel/ert_station/weyland_station) -"lT" = ( -/obj/structure/machinery/cryopod/no_store/right{ - layer = 3.1; - pixel_y = 13 - }, -/turf/open/floor/corsat/cargo, -/area/adminlevel/ert_station/weyland_station) "lU" = ( /obj/effect/decal/warning_stripes{ icon_state = "E" @@ -816,6 +769,10 @@ /obj/item/storage/toolbox/mechanical, /turf/open/floor/corsat/yellow/southeast, /area/adminlevel/ert_station/weyland_station) +"mm" = ( +/obj/structure/machinery/medical_pod/sleeper, +/turf/open/floor/corsat/green/east, +/area/adminlevel/ert_station/weyland_station) "mn" = ( /obj/structure/closet/toolcloset, /turf/open/floor/corsat/yellow/northeast, @@ -839,35 +796,16 @@ /obj/structure/closet/firecloset/full, /turf/open/floor/corsat/red/southeast, /area/adminlevel/ert_station/weyland_station) -"mI" = ( -/obj/structure/pipes/standard/simple/hidden/green, -/turf/closed/wall/r_wall/biodome, -/area/adminlevel/ert_station/weyland_station) "mV" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/almayer{ name = "\improper Telecomms" }, /turf/open/floor/corsat/plate, /area/adminlevel/ert_station/weyland_station) -"nb" = ( -/obj/structure/machinery/light/double{ - dir = 4; - pixel_x = 10; - pixel_y = 1 - }, -/turf/open/floor/corsat/green/east, -/area/adminlevel/ert_station/weyland_station) "ng" = ( /obj/structure/machinery/cm_vending/sorted/tech/comp_storage/antag, /turf/open/floor/corsat/plate, /area/adminlevel/ert_station/weyland_station) -"nq" = ( -/obj/structure/machinery/cm_vending/sorted/medical/chemistry/no_access{ - req_access = null - }, -/obj/structure/medical_supply_link, -/turf/open/floor/corsat/green/southwest, -/area/adminlevel/ert_station/weyland_station) "ns" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 1; @@ -943,17 +881,6 @@ }, /turf/open/floor/corsat/plate, /area/adminlevel/ert_station/weyland_station) -"nY" = ( -/obj/structure/filingcabinet/filingcabinet{ - density = 0; - pixel_x = 8 - }, -/obj/structure/filingcabinet/filingcabinet{ - density = 0; - pixel_x = -7 - }, -/turf/open/floor/corsat/green/northeast, -/area/adminlevel/ert_station/weyland_station) "ob" = ( /obj/structure/closet/secure_closet/chemical{ req_access_txt = "100" @@ -968,10 +895,6 @@ }, /turf/open/floor/corsat/brown/east, /area/adminlevel/ert_station/weyland_station) -"ou" = ( -/obj/structure/closet/l3closet/virology, -/turf/open/floor/corsat/green, -/area/adminlevel/ert_station/weyland_station) "oE" = ( /turf/open/floor/corsat/bluecorner/west, /area/adminlevel/ert_station/weyland_station) @@ -986,6 +909,26 @@ }, /turf/open/floor/plating, /area/adminlevel/ert_station/weyland_station) +"oN" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/storage/box/monkeycubes{ + pixel_x = 7; + pixel_y = 7 + }, +/obj/item/paper_bin/wy{ + pixel_x = -5; + pixel_y = 6 + }, +/obj/item/tool/pen{ + pixel_y = 4; + pixel_x = -4 + }, +/obj/item/device/camera{ + pixel_x = 7; + pixel_y = -6 + }, +/turf/open/floor/corsat/green, +/area/adminlevel/ert_station/weyland_station) "oQ" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/almayer/glass{ dir = 1 @@ -1003,17 +946,6 @@ }, /turf/open/floor/corsat/green/northeast, /area/adminlevel/ert_station/weyland_station) -"oX" = ( -/obj/structure/machinery/flasher{ - alpha = 1; - id = "Containment Cell WY"; - layer = 2.1; - name = "Mounted Flash"; - pixel_x = -15; - pixel_y = 30 - }, -/turf/open/floor/almayer/research/containment/corner_var1/containment_corner_variant_2, -/area/adminlevel/ert_station/weyland_station) "pa" = ( /obj/vehicle/powerloader/ft{ dir = 4 @@ -1044,6 +976,10 @@ }, /turf/open/floor/corsat/squares, /area/adminlevel/ert_station/weyland_station) +"pz" = ( +/obj/structure/machinery/light/double, +/turf/open/floor/almayer/research/containment/floor2/north, +/area/adminlevel/ert_station/weyland_station) "pB" = ( /obj/structure/machinery/cm_vending/sorted/cargo_guns/antag_guns{ hacked = 1; @@ -1064,10 +1000,28 @@ /obj/structure/machinery/cm_vending/sorted/tech/tool_storage/antag, /turf/open/floor/corsat/plate, /area/adminlevel/ert_station/weyland_station) +"pL" = ( +/turf/open/floor/almayer/research/containment/corner/east, +/area/adminlevel/ert_station/weyland_station) "pY" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat/arrow_east, /area/adminlevel/ert_station/weyland_station) +"qa" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/door_control/brbutton/alt{ + id = "WY Bio"; + name = "BIOHAZARD LOCKDOWN" + }, +/obj/structure/machinery/door_control{ + id = "WY_aft_medbay"; + name = "Aft Medbay Shutters"; + pixel_x = 7; + pixel_y = 12; + req_access_txt = "200" + }, +/turf/open/floor/corsat/green, +/area/adminlevel/ert_station/weyland_station) "qu" = ( /obj/structure/machinery/door/airlock/almayer/security/colony{ dir = 1; @@ -1094,6 +1048,13 @@ /obj/structure/morgue, /turf/open/floor/corsat/green/southwest, /area/adminlevel/ert_station/weyland_station) +"qO" = ( +/obj/structure/machinery/cm_vending/sorted/medical/chemistry/no_access{ + req_access = null + }, +/obj/structure/medical_supply_link, +/turf/open/floor/corsat/green/southwest, +/area/adminlevel/ert_station/weyland_station) "qV" = ( /obj/structure/bed/chair{ dir = 8 @@ -1154,21 +1115,6 @@ }, /turf/open/floor/corsat/blue/northwest, /area/adminlevel/ert_station/weyland_station) -"rO" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/structure/machinery/door_control/brbutton/alt{ - id = "WY Bio"; - name = "BIOHAZARD LOCKDOWN" - }, -/obj/structure/machinery/door_control{ - id = "WY_aft_medbay"; - name = "Aft Medbay Shutters"; - pixel_x = 7; - pixel_y = 12; - req_access_txt = "200" - }, -/turf/open/floor/corsat/green, -/area/adminlevel/ert_station/weyland_station) "rX" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -1241,6 +1187,20 @@ }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/weyland_station) +"sW" = ( +/obj/structure/machinery/crema_switch{ + pixel_x = 25; + pixel_y = 25; + id = "WY Cremate"; + req_access = null; + req_access_txt = "200" + }, +/obj/structure/surface/rack, +/obj/item/storage/box/bodybags, +/obj/item/storage/box/bodybags, +/obj/item/storage/box/bodybags, +/turf/open/floor/corsat/green/north, +/area/adminlevel/ert_station/weyland_station) "sX" = ( /obj/structure/window/framed/corsat/research, /obj/structure/machinery/door/poddoor/shutters/almayer/open{ @@ -1342,6 +1302,27 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat/cargo, /area/adminlevel/ert_station/weyland_station) +"uF" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 9 + }, +/turf/closed/wall/r_wall/biodome, +/area/adminlevel/ert_station/weyland_station) +"uG" = ( +/obj/structure/machinery/cm_vending/sorted/medical/no_access{ + req_access = null + }, +/obj/structure/medical_supply_link, +/turf/open/floor/corsat/green/northwest, +/area/adminlevel/ert_station/weyland_station) +"uQ" = ( +/obj/structure/machinery/light/double{ + dir = 4; + pixel_x = 10; + pixel_y = 1 + }, +/turf/open/floor/corsat/green/east, +/area/adminlevel/ert_station/weyland_station) "uR" = ( /obj/structure/closet/secure_closet/freezer/fridge/full, /obj/item/reagent_container/food/condiment/enzyme, @@ -1385,6 +1366,11 @@ "vh" = ( /turf/open/floor/corsat/yellow, /area/adminlevel/ert_station/weyland_station) +"vp" = ( +/turf/closed/wall/almayer/research/containment/wall/corner{ + dir = 8 + }, +/area/adminlevel/ert_station/weyland_station) "vv" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 1 @@ -1397,24 +1383,6 @@ }, /turf/open/floor/plating, /area/adminlevel/ert_station/weyland_station) -"vN" = ( -/obj/structure/machinery/door_display/research_cell{ - dir = 4; - id = "Containment Cell WY"; - name = "Control Panel"; - pixel_x = -15; - req_access_txt = "200" - }, -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/storage/xeno_tag_case/full{ - pixel_y = 8 - }, -/obj/item/restraint/adjustable/cable/red{ - pixel_x = 5; - pixel_y = -4 - }, -/turf/open/floor/corsat/green/southwest, -/area/adminlevel/ert_station/weyland_station) "vP" = ( /obj/structure/machinery/light/double, /obj/structure/pipes/standard/simple/hidden/green{ @@ -1436,10 +1404,6 @@ }, /turf/open/floor/corsat/sterileplate, /area/adminlevel/ert_station/weyland_station) -"vX" = ( -/obj/structure/machinery/cryopod/no_store/right, -/turf/open/floor/corsat/cargo, -/area/adminlevel/ert_station/weyland_station) "wa" = ( /obj/item/device/defibrillator/upgraded, /obj/structure/surface/table/reinforced/almayer_B, @@ -1450,18 +1414,6 @@ /obj/item/bedsheet/orange, /turf/open/floor/corsat/brown, /area/adminlevel/ert_station/weyland_station) -"wU" = ( -/obj/structure/surface/table/reinforced/prison, -/obj/item/tool/surgery/scalpel, -/obj/item/tool/surgery/hemostat, -/obj/item/tool/surgery/circular_saw, -/obj/item/tool/surgery/cautery, -/obj/item/tool/surgery/retractor, -/obj/item/device/autopsy_scanner{ - pixel_y = 9 - }, -/turf/open/floor/corsat/green/southeast, -/area/adminlevel/ert_station/weyland_station) "xg" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -1484,6 +1436,14 @@ /obj/item/tool/lighter/zippo/gold, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/weyland_station) +"xp" = ( +/obj/structure/surface/rack, +/obj/item/reagent_container/spray/cleaner{ + desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; + name = "Surgery Cleaner" + }, +/turf/open/floor/corsat/green/northwest, +/area/adminlevel/ert_station/weyland_station) "xA" = ( /turf/open/floor/corsat/red/southwest, /area/adminlevel/ert_station/weyland_station) @@ -1529,9 +1489,6 @@ /obj/structure/surface/table/reinforced/almayer_B, /turf/open/floor/corsat/squares, /area/adminlevel/ert_station/weyland_station) -"ye" = ( -/turf/open/floor/almayer/research/containment/entrance, -/area/adminlevel/ert_station/weyland_station) "yi" = ( /obj/structure/surface/table/woodentable/fancy, /obj/structure/machinery/faxmachine/corporate, @@ -1558,15 +1515,11 @@ }, /turf/open/floor/corsat/blue, /area/adminlevel/ert_station/weyland_station) -"yp" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/almayer/glass{ - name = "\improper Medical Storage" - }, -/obj/structure/machinery/door/poddoor/shutters/almayer/open{ - id = "WY_aft_medbay"; - name = "\improper Aft Medbay Shutters" +"yC" = ( +/obj/structure/machinery/body_scanconsole{ + dir = 8 }, -/turf/open/floor/corsat/marked, +/turf/open/floor/corsat/squares, /area/adminlevel/ert_station/weyland_station) "yD" = ( /obj/structure/bed{ @@ -1581,26 +1534,9 @@ "yM" = ( /turf/open/floor/corsat/red/southeast, /area/adminlevel/ert_station/weyland_station) -"yP" = ( -/obj/structure/machinery/crema_switch{ - pixel_x = 25; - pixel_y = 25; - id = "WY Cremate"; - req_access = null; - req_access_txt = "200" - }, -/obj/structure/surface/rack, -/obj/item/storage/box/bodybags, -/obj/item/storage/box/bodybags, -/obj/item/storage/box/bodybags, -/turf/open/floor/corsat/green/north, -/area/adminlevel/ert_station/weyland_station) "zh" = ( /turf/open/floor/corsat/yellow/southwest, /area/adminlevel/ert_station/weyland_station) -"zC" = ( -/turf/open/floor/almayer/research/containment/corner_var1/east, -/area/adminlevel/ert_station/weyland_station) "zD" = ( /obj/structure/surface/rack, /turf/open/floor/wood/ship, @@ -1648,20 +1584,29 @@ }, /turf/open/floor/corsat/darkgreencorner/west, /area/adminlevel/ert_station/weyland_station) -"zS" = ( -/obj/structure/machinery/door/poddoor/almayer/blended/white/open{ - id = "WY Bio" - }, -/turf/closed/wall/almayer/research/containment/wall/purple{ - dir = 8; - icon_state = "containment_window_h" - }, -/area/adminlevel/ert_station/weyland_station) "zT" = ( /obj/structure/window/reinforced/toughened, /obj/structure/closet/crate/ammo, /turf/open/floor/corsat/browncorner/north, /area/adminlevel/ert_station/weyland_station) +"Ab" = ( +/turf/closed/wall/almayer/research/containment/wall/south, +/area/adminlevel/ert_station/weyland_station) +"Af" = ( +/obj/structure/closet/fireaxecabinet{ + pixel_y = 32 + }, +/obj/structure/machinery/light/double{ + dir = 1 + }, +/obj/structure/closet/crate/medical, +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/rad{ + pixel_x = 7; + pixel_y = 6 + }, +/turf/open/floor/corsat/greencorner/east, +/area/adminlevel/ert_station/weyland_station) "Ai" = ( /obj/item/device/defibrillator/upgraded, /obj/structure/surface/table/reinforced/almayer_B, @@ -1689,6 +1634,18 @@ }, /turf/open/floor/corsat/white/north, /area/adminlevel/ert_station/weyland_station) +"Az" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/structure/machinery/recharger, +/obj/item/storage/box/masks{ + pixel_x = 7 + }, +/obj/item/storage/box/gloves{ + pixel_x = 3; + pixel_y = 3 + }, +/turf/open/floor/corsat/green/north, +/area/adminlevel/ert_station/weyland_station) "AA" = ( /obj/structure/machinery/portable_atmospherics/powered/pump, /turf/open/floor/corsat/squares, @@ -1716,12 +1673,6 @@ }, /turf/open/floor/corsat/blue, /area/adminlevel/ert_station/weyland_station) -"AQ" = ( -/obj/structure/machinery/optable{ - name = "Autopsy Table" - }, -/turf/open/floor/corsat/green, -/area/adminlevel/ert_station/weyland_station) "AR" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -1866,23 +1817,23 @@ }, /turf/open/floor/corsat/red/northwest, /area/adminlevel/ert_station/weyland_station) +"CN" = ( +/obj/structure/machinery/cryopod/no_store/right, +/turf/open/floor/corsat/cargo, +/area/adminlevel/ert_station/weyland_station) "CU" = ( /obj/structure/pipes/standard/manifold/fourway/hidden/green, /turf/open/floor/corsat/tan/north, /area/adminlevel/ert_station/weyland_station) -"CW" = ( -/turf/closed/wall/almayer/research/containment/wall/corner{ - dir = 4 - }, -/area/adminlevel/ert_station/weyland_station) "De" = ( /obj/structure/pipes/standard/simple/visible{ dir = 9 }, /turf/open/floor/corsat/squares, /area/adminlevel/ert_station/weyland_station) -"Dk" = ( -/turf/closed/wall/almayer/research/containment/wall/west, +"Dh" = ( +/obj/structure/closet/l3closet/virology, +/turf/open/floor/corsat/green, /area/adminlevel/ert_station/weyland_station) "Dn" = ( /turf/open/floor/corsat/green/north, @@ -1926,6 +1877,11 @@ }, /turf/open/floor/corsat/plate, /area/adminlevel/ert_station/weyland_station) +"DM" = ( +/turf/closed/wall/almayer/research/containment/wall/corner{ + dir = 1 + }, +/area/adminlevel/ert_station/weyland_station) "DO" = ( /obj/structure/showcase{ icon_state = "relay"; @@ -1933,10 +1889,6 @@ }, /turf/open/floor/corsat/plate, /area/adminlevel/ert_station/weyland_station) -"DS" = ( -/obj/structure/machinery/medical_pod/bodyscanner, -/turf/open/floor/corsat/green/east, -/area/adminlevel/ert_station/weyland_station) "DT" = ( /obj/structure/surface/table/woodentable/fancy, /obj/item/folder/black, @@ -1947,6 +1899,24 @@ "DZ" = ( /turf/open/floor/corsat/browncorner, /area/adminlevel/ert_station/weyland_station) +"Ea" = ( +/obj/structure/machinery/door_display/research_cell{ + dir = 4; + id = "Containment Cell WY"; + name = "Control Panel"; + pixel_x = -15; + req_access_txt = "200" + }, +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/storage/xeno_tag_case/full{ + pixel_y = 8 + }, +/obj/item/restraint/adjustable/cable/red{ + pixel_x = 5; + pixel_y = -4 + }, +/turf/open/floor/corsat/green/southwest, +/area/adminlevel/ert_station/weyland_station) "Eg" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/almayer/glass{ name = "\improper Medical & Surgery" @@ -1972,6 +1942,18 @@ }, /turf/open/floor/corsat/browncorner, /area/adminlevel/ert_station/weyland_station) +"Es" = ( +/obj/structure/machinery/light/double{ + dir = 8; + pixel_x = -10; + pixel_y = 1 + }, +/obj/structure/surface/rack, +/obj/item/storage/fancy/vials/random, +/obj/item/storage/fancy/vials/random, +/obj/item/storage/fancy/vials/random, +/turf/open/floor/corsat/green/west, +/area/adminlevel/ert_station/weyland_station) "EB" = ( /obj/structure/barricade/handrail/wire, /turf/open/floor/corsat/yellow, @@ -1979,15 +1961,6 @@ "EC" = ( /turf/open/floor/corsat/yellowcorner/east, /area/adminlevel/ert_station/weyland_station) -"ED" = ( -/obj/structure/machinery/door/poddoor/almayer/blended/white/open{ - id = "WY Bio" - }, -/turf/closed/wall/almayer/research/containment/wall/purple{ - dir = 4; - icon_state = "containment_window_h" - }, -/area/adminlevel/ert_station/weyland_station) "EG" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 9 @@ -2019,22 +1992,7 @@ }, /turf/open/floor/corsat/brown/southeast, /area/adminlevel/ert_station/weyland_station) -"FA" = ( -/obj/structure/bed, -/obj/structure/window/reinforced/toughened{ - dir = 1; - layer = 2.9 - }, -/obj/item/bedsheet/orange, -/turf/open/floor/corsat/squares, -/area/adminlevel/ert_station/weyland_station) -"FD" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/tool/weldingtool, -/obj/item/clothing/glasses/welding, -/turf/open/floor/corsat/squares, -/area/adminlevel/ert_station/weyland_station) -"FE" = ( +"Ft" = ( /obj/structure/machinery/door/poddoor/shutters/almayer/containment{ id = "Containment Cell WY"; name = "\improper Containment Cell" @@ -2053,12 +2011,24 @@ }, /turf/open/floor/almayer/test_floor4, /area/adminlevel/ert_station/weyland_station) -"FN" = ( -/obj/structure/machinery/body_scanconsole{ - dir = 8 +"FA" = ( +/obj/structure/bed, +/obj/structure/window/reinforced/toughened{ + dir = 1; + layer = 2.9 }, +/obj/item/bedsheet/orange, /turf/open/floor/corsat/squares, /area/adminlevel/ert_station/weyland_station) +"FD" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/tool/weldingtool, +/obj/item/clothing/glasses/welding, +/turf/open/floor/corsat/squares, +/area/adminlevel/ert_station/weyland_station) +"FJ" = ( +/turf/closed/wall/almayer/research/containment/wall/east, +/area/adminlevel/ert_station/weyland_station) "FO" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -2079,6 +2049,10 @@ /obj/structure/machinery/iv_drip, /turf/open/floor/corsat/green/east, /area/adminlevel/ert_station/weyland_station) +"Gk" = ( +/obj/structure/machinery/medical_pod/bodyscanner, +/turf/open/floor/corsat/green/east, +/area/adminlevel/ert_station/weyland_station) "Gs" = ( /obj/structure/machinery/light/double{ dir = 8; @@ -2105,6 +2079,10 @@ }, /turf/open/floor/corsat/green/north, /area/adminlevel/ert_station/weyland_station) +"GE" = ( +/obj/structure/window/framed/corsat/research, +/turf/open/floor/corsat/squares, +/area/adminlevel/ert_station/weyland_station) "GM" = ( /obj/structure/machinery/blackbox_recorder, /turf/open/floor/corsat/blue/northwest, @@ -2141,6 +2119,11 @@ }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/weyland_station) +"HM" = ( +/obj/structure/closet/l3closet/virology, +/obj/structure/machinery/light/double, +/turf/open/floor/corsat/green, +/area/adminlevel/ert_station/weyland_station) "HN" = ( /obj/structure/bed{ icon_state = "psychbed" @@ -2170,9 +2153,6 @@ }, /turf/open/floor/corsat/damaged1, /area/adminlevel/ert_station/weyland_station) -"Im" = ( -/turf/open/floor/almayer/research/containment/floor2/north, -/area/adminlevel/ert_station/weyland_station) "Iv" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -2197,6 +2177,13 @@ /obj/structure/machinery/light/double, /turf/open/floor/corsat/bluecorner, /area/adminlevel/ert_station/weyland_station) +"IZ" = ( +/obj/structure/machinery/cryopod/no_store/right{ + layer = 3.1; + pixel_y = 13 + }, +/turf/open/floor/corsat/cargo, +/area/adminlevel/ert_station/weyland_station) "Jc" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -2204,15 +2191,6 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat/white/west, /area/adminlevel/ert_station/weyland_station) -"Jd" = ( -/obj/structure/morgue, -/obj/structure/machinery/light/double{ - dir = 8; - pixel_x = -10; - pixel_y = 1 - }, -/turf/open/floor/corsat/green/west, -/area/adminlevel/ert_station/weyland_station) "Je" = ( /turf/open/floor/corsat/red, /area/adminlevel/ert_station/weyland_station) @@ -2294,11 +2272,6 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat/plate, /area/adminlevel/ert_station/weyland_station) -"Kg" = ( -/obj/structure/closet/l3closet/virology, -/obj/structure/machinery/light/double, -/turf/open/floor/corsat/green, -/area/adminlevel/ert_station/weyland_station) "Kk" = ( /obj/effect/decal/warning_stripes{ icon_state = "N" @@ -2321,6 +2294,11 @@ }, /turf/open/floor/corsat/sterileplate, /area/adminlevel/ert_station/weyland_station) +"Ky" = ( +/turf/closed/wall/almayer/research/containment/wall/corner{ + dir = 4 + }, +/area/adminlevel/ert_station/weyland_station) "KC" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/almayer/glass{ dir = 1; @@ -2363,13 +2341,6 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat/squares, /area/adminlevel/ert_station/weyland_station) -"KP" = ( -/obj/structure/machinery/cm_vending/sorted/medical/no_access{ - req_access = null - }, -/obj/structure/medical_supply_link, -/turf/open/floor/corsat/green/northwest, -/area/adminlevel/ert_station/weyland_station) "KW" = ( /obj/structure/window/framed/corsat/indestructible/security, /turf/open/floor/plating, @@ -2384,14 +2355,6 @@ }, /turf/open/floor/corsat/white/north, /area/adminlevel/ert_station/weyland_station) -"Le" = ( -/obj/structure/machinery/door/airlock/almayer/medical/glass/colony{ - name = "Morgue"; - req_one_access = null; - dir = 2 - }, -/turf/open/floor/corsat/squares, -/area/adminlevel/ert_station/weyland_station) "Ls" = ( /obj/structure/machinery/light/double/blue{ dir = 8 @@ -2409,12 +2372,6 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/plating, /area/adminlevel/ert_station/weyland_station) -"LP" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 9 - }, -/turf/closed/wall/r_wall/biodome, -/area/adminlevel/ert_station/weyland_station) "Ma" = ( /turf/open/floor/corsat/blue/northeast, /area/adminlevel/ert_station/weyland_station) @@ -2426,11 +2383,22 @@ }, /turf/open/floor/corsat/marked, /area/adminlevel/ert_station/weyland_station) +"Mx" = ( +/turf/open/floor/almayer/research/containment/corner_var1/east, +/area/adminlevel/ert_station/weyland_station) "MA" = ( /obj/structure/bed, /obj/item/bedsheet/medical, /turf/open/floor/corsat/green/east, /area/adminlevel/ert_station/weyland_station) +"MC" = ( +/obj/structure/closet/crate/internals, +/obj/item/storage/firstaid/adv{ + pixel_y = 6 + }, +/obj/item/storage/firstaid/fire, +/turf/open/floor/corsat/green/north, +/area/adminlevel/ert_station/weyland_station) "MP" = ( /turf/open/floor/corsat/redcorner/east, /area/adminlevel/ert_station/weyland_station) @@ -2535,26 +2503,6 @@ "Og" = ( /turf/open/floor/corsat/arrow_west, /area/adminlevel/ert_station/weyland_station) -"Oi" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/storage/box/monkeycubes{ - pixel_x = 7; - pixel_y = 7 - }, -/obj/item/paper_bin/wy{ - pixel_x = -5; - pixel_y = 6 - }, -/obj/item/tool/pen{ - pixel_y = 4; - pixel_x = -4 - }, -/obj/item/device/camera{ - pixel_x = 7; - pixel_y = -6 - }, -/turf/open/floor/corsat/green, -/area/adminlevel/ert_station/weyland_station) "Oj" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -2565,10 +2513,6 @@ /obj/structure/machinery/vending/snack, /turf/open/floor/corsat/red/north, /area/adminlevel/ert_station/weyland_station) -"Oo" = ( -/obj/structure/closet/coffin, -/turf/open/floor/corsat/green, -/area/adminlevel/ert_station/weyland_station) "Oq" = ( /obj/structure/surface/table/reinforced, /obj/structure/machinery/gibber{ @@ -2576,6 +2520,15 @@ }, /turf/open/floor/corsat/sterileplate, /area/adminlevel/ert_station/weyland_station) +"Or" = ( +/obj/structure/machinery/door/poddoor/almayer/blended/white/open{ + id = "WY Bio" + }, +/turf/closed/wall/almayer/research/containment/wall/purple{ + dir = 4; + icon_state = "containment_window_h" + }, +/area/adminlevel/ert_station/weyland_station) "Ot" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 1 @@ -2590,6 +2543,9 @@ /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/corsat/plate, /area/adminlevel/ert_station/weyland_station) +"Ow" = ( +/turf/open/floor/almayer/research/containment/floor2/north, +/area/adminlevel/ert_station/weyland_station) "OD" = ( /obj/structure/machinery/cm_vending/sorted/medical/wall_med{ pixel_y = 25 @@ -2617,6 +2573,12 @@ "Pc" = ( /turf/open/floor/corsat/brown, /area/adminlevel/ert_station/weyland_station) +"Pg" = ( +/obj/structure/morgue/crematorium{ + id = "WY Cremate" + }, +/turf/open/floor/corsat/green/northeast, +/area/adminlevel/ert_station/weyland_station) "Pk" = ( /obj/structure/machinery/light/double, /obj/structure/pipes/standard/simple/hidden/green{ @@ -2624,6 +2586,20 @@ }, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/weyland_station) +"PH" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/almayer/glass{ + name = "\improper Medical Storage" + }, +/obj/structure/machinery/door/poddoor/shutters/almayer/open{ + id = "WY_aft_medbay"; + name = "\improper Aft Medbay Shutters" + }, +/turf/open/floor/corsat/marked, +/area/adminlevel/ert_station/weyland_station) +"PI" = ( +/obj/structure/pipes/standard/simple/hidden/green, +/turf/closed/wall/r_wall/biodome, +/area/adminlevel/ert_station/weyland_station) "PL" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 1; @@ -2654,9 +2630,11 @@ }, /turf/open/floor/almayer/tcomms, /area/adminlevel/ert_station/weyland_station) -"Qk" = ( -/obj/structure/machinery/medical_pod/sleeper, -/turf/open/floor/corsat/green/east, +"Qm" = ( +/obj/structure/machinery/optable{ + name = "Autopsy Table" + }, +/turf/open/floor/corsat/green, /area/adminlevel/ert_station/weyland_station) "Qr" = ( /obj/structure/surface/table/reinforced/almayer_B, @@ -2743,8 +2721,12 @@ /obj/structure/window/framed/corsat/cell/security, /turf/open/floor/corsat/squares, /area/adminlevel/ert_station/weyland_station) -"Rv" = ( -/obj/structure/window/framed/corsat/research, +"Rt" = ( +/obj/structure/machinery/door/airlock/almayer/medical/glass/colony{ + name = "Morgue"; + req_one_access = null; + dir = 2 + }, /turf/open/floor/corsat/squares, /area/adminlevel/ert_station/weyland_station) "RB" = ( @@ -2794,6 +2776,17 @@ }, /turf/open/floor/corsat/white/north, /area/adminlevel/ert_station/weyland_station) +"RY" = ( +/obj/structure/machinery/flasher{ + alpha = 1; + id = "Containment Cell WY"; + layer = 2.1; + name = "Mounted Flash"; + pixel_x = -15; + pixel_y = 30 + }, +/turf/open/floor/almayer/research/containment/corner_var1/containment_corner_variant_2, +/area/adminlevel/ert_station/weyland_station) "RZ" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -2860,19 +2853,10 @@ "SI" = ( /turf/open/floor/almayer/tcomms, /area/adminlevel/ert_station/weyland_station) -"SJ" = ( -/turf/closed/wall/almayer/research/containment/wall/south, -/area/adminlevel/ert_station/weyland_station) "SM" = ( /obj/structure/machinery/vending/cigarette/colony, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/weyland_station) -"SO" = ( -/obj/structure/machinery/cryopod/no_store/right{ - pixel_y = 6 - }, -/turf/open/floor/corsat/cargo, -/area/adminlevel/ert_station/weyland_station) "SY" = ( /obj/structure/surface/table/reinforced, /obj/item/trash/plate{ @@ -2994,6 +2978,10 @@ "Ux" = ( /turf/open/space/basic, /area/space) +"UB" = ( +/obj/structure/closet/coffin, +/turf/open/floor/corsat/green, +/area/adminlevel/ert_station/weyland_station) "UJ" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -3018,6 +3006,12 @@ }, /turf/open/floor/corsat/white, /area/adminlevel/ert_station/weyland_station) +"Vo" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/tool/portadialysis, +/obj/item/book/manual/medical_diagnostics_manual, +/turf/open/floor/corsat/green/southeast, +/area/adminlevel/ert_station/weyland_station) "Vp" = ( /turf/open/floor/corsat/brown/east, /area/adminlevel/ert_station/weyland_station) @@ -3078,10 +3072,6 @@ }, /turf/open/floor/corsat/whitecorner, /area/adminlevel/ert_station/weyland_station) -"Wx" = ( -/obj/structure/machinery/light/double, -/turf/open/floor/almayer/research/containment/floor2/north, -/area/adminlevel/ert_station/weyland_station) "WD" = ( /obj/structure/flora/pottedplant{ icon_state = "pottedplant_10"; @@ -3092,13 +3082,22 @@ "WE" = ( /turf/open/floor/corsat/whitetan/east, /area/adminlevel/ert_station/weyland_station) +"WK" = ( +/turf/open/floor/almayer/research/containment/corner2, +/area/adminlevel/ert_station/weyland_station) "WU" = ( /turf/open/floor/corsat/plate, /area/adminlevel/ert_station/weyland_station) -"WW" = ( -/turf/closed/wall/almayer/research/containment/wall/corner{ - dir = 8 +"WZ" = ( +/obj/structure/filingcabinet/filingcabinet{ + density = 0; + pixel_x = 8 + }, +/obj/structure/filingcabinet/filingcabinet{ + density = 0; + pixel_x = -7 }, +/turf/open/floor/corsat/green/northeast, /area/adminlevel/ert_station/weyland_station) "Xh" = ( /obj/structure/window/reinforced/toughened{ @@ -3117,13 +3116,14 @@ /obj/item/tool/pen, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/weyland_station) -"Xn" = ( -/obj/structure/surface/rack, -/obj/item/reagent_container/spray/cleaner{ - desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; - name = "Surgery Cleaner" +"Xl" = ( +/obj/structure/machinery/sleep_console{ + dir = 1 }, -/turf/open/floor/corsat/green/northwest, +/turf/open/floor/corsat/squares, +/area/adminlevel/ert_station/weyland_station) +"Xm" = ( +/turf/closed/wall/almayer/research/containment/wall/west, /area/adminlevel/ert_station/weyland_station) "Xo" = ( /obj/structure/machinery/vending/dinnerware, @@ -3155,6 +3155,17 @@ /obj/structure/machinery/vending/coffee, /turf/open/floor/corsat/red/north, /area/adminlevel/ert_station/weyland_station) +"XJ" = ( +/obj/structure/surface/rack, +/obj/item/storage/pill_bottle/kelotane{ + pixel_x = -7 + }, +/obj/item/storage/pill_bottle/tramadol, +/obj/item/storage/pill_bottle/bicaridine{ + pixel_x = 5 + }, +/turf/open/floor/corsat/green/west, +/area/adminlevel/ert_station/weyland_station) "XQ" = ( /turf/open/floor/corsat/brown/north, /area/adminlevel/ert_station/weyland_station) @@ -3166,17 +3177,6 @@ }, /turf/open/floor/corsat/brown/west, /area/adminlevel/ert_station/weyland_station) -"XX" = ( -/obj/structure/surface/rack, -/obj/item/storage/pill_bottle/kelotane{ - pixel_x = -7 - }, -/obj/item/storage/pill_bottle/tramadol, -/obj/item/storage/pill_bottle/bicaridine{ - pixel_x = 5 - }, -/turf/open/floor/corsat/green/west, -/area/adminlevel/ert_station/weyland_station) "Ya" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -3915,11 +3915,11 @@ fX fX fX fX -kx -Dk -Dk -Dk -WW +DM +Xm +Xm +Xm +vp QT "} (16,1,1) = {" @@ -3943,9 +3943,9 @@ Jk Ns fX fX -KP +uG Hc -nq +qO fX fX lh @@ -3953,15 +3953,15 @@ oQ fX fX fX -Xn -XX -jY -vN -zS -oX -kn -bF -SJ +xp +XJ +Es +Ea +aZ +RY +lR +pL +Ab QT "} (17,1,1) = {" @@ -3999,11 +3999,11 @@ Sw Dr WU Xt -ED -Im -kW -Im -SJ +Or +Ow +jn +Ow +Ab QT "} (18,1,1) = {" @@ -4041,11 +4041,11 @@ NC ZU Dr Xt -FE -ye -kW -Wx -SJ +Ft +fR +jn +pz +Ab QT "} (19,1,1) = {" @@ -4081,13 +4081,13 @@ oM Gz NC in -dU -Oi -zS -Im -kW -Im -SJ +ev +oN +aZ +Ow +jn +Ow +Ab QT "} (20,1,1) = {" @@ -4123,13 +4123,13 @@ fX MQ De RQ -dU -rO -ED -zC -kn -hO -SJ +ev +qa +Or +Mx +lR +WK +Ab QT "} (21,1,1) = {" @@ -4161,17 +4161,17 @@ Eg Dr NN al -yp +PH Dr WU al Dr -ou -CW -gS -gS -gS -dT +Dh +Ky +FJ +FJ +FJ +kI QT "} (22,1,1) = {" @@ -4208,9 +4208,9 @@ dc IQ eQ Dr -Kg -mI -LP +HM +PI +uF fX fX QT @@ -4238,7 +4238,7 @@ Dr Dr Dr Dr -ek +Xl dE kq fX @@ -4246,14 +4246,14 @@ AH Dr la fX -iP +Af pF al WU -ou +Dh fX Za -Jd +hy qL QT Ux @@ -4280,7 +4280,7 @@ Gg MA Si Gg -Qk +mm Tx fX fX @@ -4288,12 +4288,12 @@ kA Bx lI oM -iU +MC Dr al WU Xt -Rv +GE Dn Dr Xt @@ -4330,15 +4330,15 @@ UV WU Hh oM -ka -bk +Az +dh YC Dr Xt -Le +Rt Dn pF -Oo +UB dx Ux "} @@ -4374,13 +4374,13 @@ TW oM lS Gb -FN +yC Dr Xt -Rv -yP +GE +sW Dr -AQ +Qm dx Ux "} @@ -4415,14 +4415,14 @@ eQ dz fX fX -nY -DS -nb -fh +WZ +Gk +uQ +Vo fX -eX -ab -wU +Pg +gg +ga QT Ux "} @@ -4905,14 +4905,14 @@ QT QT QT QT -vX -lT -SO -vX -lT -vX -lT -SO +CN +IZ +lc +CN +IZ +CN +IZ +lc QT QT QT diff --git a/sound/ATTRIBUTION.txt b/sound/ATTRIBUTION.txt index 03dd02d49db4..8af04e22fa3e 100644 --- a/sound/ATTRIBUTION.txt +++ b/sound/ATTRIBUTION.txt @@ -1,3 +1,4 @@ giant_lizard_growl1.ogg, giant_lizard_growl2.ogg by D.jones -- https://freesound.org/s/527844/ -- License: Creative Commons 0 giant_lizard_death.wav by craigsmith -- https://freesound.org/s/437933/ -- License: Creative Commons 0 giant_lizard_hiss1.ogg, giant_lizard_hiss2.ogg by ZapSplat -- https://www.zapsplat.com/sound-effect-category/alligators-and-crocodiles/ -- License: ZapSplat Standard License +ghost_whisper_12.ogg by ondrosik -- https://freesound.org/s/207797/ -- License: Creative Commons 0 diff --git a/sound/effects/rock_creaking.ogg b/sound/effects/rock_creaking.ogg new file mode 100644 index 000000000000..df80df9607d1 Binary files /dev/null and b/sound/effects/rock_creaking.ogg differ diff --git a/sound/hallucinations/ears_ringing.ogg b/sound/hallucinations/ears_ringing.ogg new file mode 100644 index 000000000000..78c6ee4edf0f Binary files /dev/null and b/sound/hallucinations/ears_ringing.ogg differ diff --git a/sound/hallucinations/ghost_whisper_01.ogg b/sound/hallucinations/ghost_whisper_01.ogg new file mode 100644 index 000000000000..d1b625437f62 Binary files /dev/null and b/sound/hallucinations/ghost_whisper_01.ogg differ diff --git a/sound/hallucinations/ghost_whisper_02.ogg b/sound/hallucinations/ghost_whisper_02.ogg new file mode 100644 index 000000000000..8ab9f5968550 Binary files /dev/null and b/sound/hallucinations/ghost_whisper_02.ogg differ diff --git a/sound/hallucinations/ghost_whisper_03.ogg b/sound/hallucinations/ghost_whisper_03.ogg new file mode 100644 index 000000000000..8f71bdd7a420 Binary files /dev/null and b/sound/hallucinations/ghost_whisper_03.ogg differ diff --git a/sound/hallucinations/ghost_whisper_04.ogg b/sound/hallucinations/ghost_whisper_04.ogg new file mode 100644 index 000000000000..c2cc57548a93 Binary files /dev/null and b/sound/hallucinations/ghost_whisper_04.ogg differ diff --git a/sound/hallucinations/ghost_whisper_05.ogg b/sound/hallucinations/ghost_whisper_05.ogg new file mode 100644 index 000000000000..c45e37b9dc69 Binary files /dev/null and b/sound/hallucinations/ghost_whisper_05.ogg differ diff --git a/sound/hallucinations/ghost_whisper_06.ogg b/sound/hallucinations/ghost_whisper_06.ogg new file mode 100644 index 000000000000..de13528a9a0f Binary files /dev/null and b/sound/hallucinations/ghost_whisper_06.ogg differ diff --git a/sound/hallucinations/ghost_whisper_07.ogg b/sound/hallucinations/ghost_whisper_07.ogg new file mode 100644 index 000000000000..69eafb2ac6d5 Binary files /dev/null and b/sound/hallucinations/ghost_whisper_07.ogg differ diff --git a/sound/hallucinations/ghost_whisper_08.ogg b/sound/hallucinations/ghost_whisper_08.ogg new file mode 100644 index 000000000000..a4ad866591a9 Binary files /dev/null and b/sound/hallucinations/ghost_whisper_08.ogg differ diff --git a/sound/hallucinations/ghost_whisper_09.ogg b/sound/hallucinations/ghost_whisper_09.ogg new file mode 100644 index 000000000000..9ed86957e369 Binary files /dev/null and b/sound/hallucinations/ghost_whisper_09.ogg differ diff --git a/sound/hallucinations/ghost_whisper_10.ogg b/sound/hallucinations/ghost_whisper_10.ogg new file mode 100644 index 000000000000..40704e7e217b Binary files /dev/null and b/sound/hallucinations/ghost_whisper_10.ogg differ diff --git a/sound/hallucinations/ghost_whisper_11.ogg b/sound/hallucinations/ghost_whisper_11.ogg new file mode 100644 index 000000000000..53dd309133c7 Binary files /dev/null and b/sound/hallucinations/ghost_whisper_11.ogg differ diff --git a/sound/hallucinations/ghost_whisper_12.ogg b/sound/hallucinations/ghost_whisper_12.ogg new file mode 100644 index 000000000000..e4f4cc3c186a Binary files /dev/null and b/sound/hallucinations/ghost_whisper_12.ogg differ diff --git a/sound/hallucinations/ghost_whisper_13.ogg b/sound/hallucinations/ghost_whisper_13.ogg new file mode 100644 index 000000000000..3718c96fb4db Binary files /dev/null and b/sound/hallucinations/ghost_whisper_13.ogg differ diff --git a/sound/hallucinations/ghost_whisper_female_01.ogg b/sound/hallucinations/ghost_whisper_female_01.ogg new file mode 100644 index 000000000000..c0a14eb6d9f8 Binary files /dev/null and b/sound/hallucinations/ghost_whisper_female_01.ogg differ diff --git a/sound/hallucinations/ghost_whisper_female_02.ogg b/sound/hallucinations/ghost_whisper_female_02.ogg new file mode 100644 index 000000000000..60d46890d631 Binary files /dev/null and b/sound/hallucinations/ghost_whisper_female_02.ogg differ diff --git a/sound/hallucinations/ghost_whisper_female_03.ogg b/sound/hallucinations/ghost_whisper_female_03.ogg new file mode 100644 index 000000000000..cbd24d15aad4 Binary files /dev/null and b/sound/hallucinations/ghost_whisper_female_03.ogg differ diff --git a/sound/hallucinations/ghost_whisper_female_04.ogg b/sound/hallucinations/ghost_whisper_female_04.ogg new file mode 100644 index 000000000000..bd0fe87e33f4 Binary files /dev/null and b/sound/hallucinations/ghost_whisper_female_04.ogg differ diff --git a/sound/hallucinations/ghost_whisper_female_05.ogg b/sound/hallucinations/ghost_whisper_female_05.ogg new file mode 100644 index 000000000000..b47a305bb531 Binary files /dev/null and b/sound/hallucinations/ghost_whisper_female_05.ogg differ diff --git a/sound/hallucinations/ghost_whisper_female_06.ogg b/sound/hallucinations/ghost_whisper_female_06.ogg new file mode 100644 index 000000000000..0636b9028ae3 Binary files /dev/null and b/sound/hallucinations/ghost_whisper_female_06.ogg differ diff --git a/sound/hallucinations/ghost_whisper_female_07.ogg b/sound/hallucinations/ghost_whisper_female_07.ogg new file mode 100644 index 000000000000..7a7ddcd58a13 Binary files /dev/null and b/sound/hallucinations/ghost_whisper_female_07.ogg differ diff --git a/sound/hallucinations/ghost_whisper_female_08.ogg b/sound/hallucinations/ghost_whisper_female_08.ogg new file mode 100644 index 000000000000..0c6a51ac5660 Binary files /dev/null and b/sound/hallucinations/ghost_whisper_female_08.ogg differ diff --git a/sound/hallucinations/ghost_whisper_female_09.ogg b/sound/hallucinations/ghost_whisper_female_09.ogg new file mode 100644 index 000000000000..cae3db314bbd Binary files /dev/null and b/sound/hallucinations/ghost_whisper_female_09.ogg differ diff --git a/sound/hallucinations/ghost_whisper_female_10.ogg b/sound/hallucinations/ghost_whisper_female_10.ogg new file mode 100644 index 000000000000..eb942c5f16f3 Binary files /dev/null and b/sound/hallucinations/ghost_whisper_female_10.ogg differ diff --git a/sound/hallucinations/ghost_whisper_female_11.ogg b/sound/hallucinations/ghost_whisper_female_11.ogg new file mode 100644 index 000000000000..e7a6b8c3734c Binary files /dev/null and b/sound/hallucinations/ghost_whisper_female_11.ogg differ diff --git a/sound/hallucinations/ghost_whisper_female_12.ogg b/sound/hallucinations/ghost_whisper_female_12.ogg new file mode 100644 index 000000000000..1e001fd181d6 Binary files /dev/null and b/sound/hallucinations/ghost_whisper_female_12.ogg differ diff --git a/sound/hallucinations/ghost_whisper_female_13.ogg b/sound/hallucinations/ghost_whisper_female_13.ogg new file mode 100644 index 000000000000..fedcd225d329 Binary files /dev/null and b/sound/hallucinations/ghost_whisper_female_13.ogg differ diff --git a/sound/hallucinations/ghost_whisper_female_14.ogg b/sound/hallucinations/ghost_whisper_female_14.ogg new file mode 100644 index 000000000000..c0bd20bdb87a Binary files /dev/null and b/sound/hallucinations/ghost_whisper_female_14.ogg differ diff --git a/sound/hallucinations/ghost_whisper_female_15.ogg b/sound/hallucinations/ghost_whisper_female_15.ogg new file mode 100644 index 000000000000..3bbc89b80db6 Binary files /dev/null and b/sound/hallucinations/ghost_whisper_female_15.ogg differ diff --git a/sound/voice/barkstrong1.ogg b/sound/voice/barkstrong1.ogg new file mode 100644 index 000000000000..06a5eb7305b5 Binary files /dev/null and b/sound/voice/barkstrong1.ogg differ diff --git a/sound/voice/barkstrong2.ogg b/sound/voice/barkstrong2.ogg new file mode 100644 index 000000000000..d71b2b6c63e0 Binary files /dev/null and b/sound/voice/barkstrong2.ogg differ diff --git a/sound/voice/barkstrong3.ogg b/sound/voice/barkstrong3.ogg new file mode 100644 index 000000000000..7ed03b754d78 Binary files /dev/null and b/sound/voice/barkstrong3.ogg differ diff --git a/sound/voice/deep_alien_screech.ogg b/sound/voice/deep_alien_screech.ogg new file mode 100644 index 000000000000..994ac0abee1c Binary files /dev/null and b/sound/voice/deep_alien_screech.ogg differ diff --git a/sound/voice/deep_alien_screech2.ogg b/sound/voice/deep_alien_screech2.ogg new file mode 100644 index 000000000000..1f13e8859d61 Binary files /dev/null and b/sound/voice/deep_alien_screech2.ogg differ diff --git a/sound/voice/growl1.ogg b/sound/voice/growl1.ogg new file mode 100644 index 000000000000..386050fd97a2 Binary files /dev/null and b/sound/voice/growl1.ogg differ diff --git a/sound/voice/growl2.ogg b/sound/voice/growl2.ogg new file mode 100644 index 000000000000..bcab9251df7d Binary files /dev/null and b/sound/voice/growl2.ogg differ diff --git a/sound/voice/growl3.ogg b/sound/voice/growl3.ogg new file mode 100644 index 000000000000..26e9df05653f Binary files /dev/null and b/sound/voice/growl3.ogg differ diff --git a/sound/voice/growl4.ogg b/sound/voice/growl4.ogg new file mode 100644 index 000000000000..91062e5f869d Binary files /dev/null and b/sound/voice/growl4.ogg differ diff --git a/sound/misc/facehugged_female.ogg b/sound/voice/human_female_facehugged1.ogg similarity index 100% rename from sound/misc/facehugged_female.ogg rename to sound/voice/human_female_facehugged1.ogg diff --git a/sound/voice/human_female_facehugged2.ogg b/sound/voice/human_female_facehugged2.ogg new file mode 100644 index 000000000000..01352c449d9f Binary files /dev/null and b/sound/voice/human_female_facehugged2.ogg differ diff --git a/sound/voice/human_female_preburst1.ogg b/sound/voice/human_female_preburst1.ogg new file mode 100644 index 000000000000..8e4923eb93f4 Binary files /dev/null and b/sound/voice/human_female_preburst1.ogg differ diff --git a/sound/voice/human_female_preburst2.ogg b/sound/voice/human_female_preburst2.ogg new file mode 100644 index 000000000000..f4e8990f49d8 Binary files /dev/null and b/sound/voice/human_female_preburst2.ogg differ diff --git a/sound/voice/human_female_preburst3.ogg b/sound/voice/human_female_preburst3.ogg new file mode 100644 index 000000000000..481063183201 Binary files /dev/null and b/sound/voice/human_female_preburst3.ogg differ diff --git a/sound/voice/human_female_preburst4.ogg b/sound/voice/human_female_preburst4.ogg new file mode 100644 index 000000000000..6d2141b47ba3 Binary files /dev/null and b/sound/voice/human_female_preburst4.ogg differ diff --git a/sound/voice/human_female_preburst5.ogg b/sound/voice/human_female_preburst5.ogg new file mode 100644 index 000000000000..8cab84545179 Binary files /dev/null and b/sound/voice/human_female_preburst5.ogg differ diff --git a/sound/voice/human_female_preburst6.ogg b/sound/voice/human_female_preburst6.ogg new file mode 100644 index 000000000000..8f50196853e5 Binary files /dev/null and b/sound/voice/human_female_preburst6.ogg differ diff --git a/sound/voice/human_female_preburst7.ogg b/sound/voice/human_female_preburst7.ogg new file mode 100644 index 000000000000..691115dfe098 Binary files /dev/null and b/sound/voice/human_female_preburst7.ogg differ diff --git a/sound/misc/facehugged_male.ogg b/sound/voice/human_male_facehugged1.ogg similarity index 100% rename from sound/misc/facehugged_male.ogg rename to sound/voice/human_male_facehugged1.ogg diff --git a/sound/voice/human_male_facehugged2.ogg b/sound/voice/human_male_facehugged2.ogg new file mode 100644 index 000000000000..b701e1f50ea4 Binary files /dev/null and b/sound/voice/human_male_facehugged2.ogg differ diff --git a/sound/voice/human_male_facehugged3.ogg b/sound/voice/human_male_facehugged3.ogg new file mode 100644 index 000000000000..6d1292d0918a Binary files /dev/null and b/sound/voice/human_male_facehugged3.ogg differ diff --git a/sound/voice/human_male_preburst1.ogg b/sound/voice/human_male_preburst1.ogg new file mode 100644 index 000000000000..6f3e76997acc Binary files /dev/null and b/sound/voice/human_male_preburst1.ogg differ diff --git a/sound/voice/human_male_preburst2.ogg b/sound/voice/human_male_preburst2.ogg new file mode 100644 index 000000000000..40aea6a8ae8d Binary files /dev/null and b/sound/voice/human_male_preburst2.ogg differ diff --git a/sound/voice/human_male_preburst3.ogg b/sound/voice/human_male_preburst3.ogg new file mode 100644 index 000000000000..813c123ac8f2 Binary files /dev/null and b/sound/voice/human_male_preburst3.ogg differ diff --git a/sound/voice/human_male_preburst4.ogg b/sound/voice/human_male_preburst4.ogg new file mode 100644 index 000000000000..b58b7e6cabd6 Binary files /dev/null and b/sound/voice/human_male_preburst4.ogg differ diff --git a/sound/voice/human_male_preburst5.ogg b/sound/voice/human_male_preburst5.ogg new file mode 100644 index 000000000000..1d54adcaa7aa Binary files /dev/null and b/sound/voice/human_male_preburst5.ogg differ diff --git a/sound/voice/human_male_preburst6.ogg b/sound/voice/human_male_preburst6.ogg new file mode 100644 index 000000000000..c5b0f3d27a56 Binary files /dev/null and b/sound/voice/human_male_preburst6.ogg differ diff --git a/sound/voice/human_male_preburst7.ogg b/sound/voice/human_male_preburst7.ogg new file mode 100644 index 000000000000..adc8ea3a8c7b Binary files /dev/null and b/sound/voice/human_male_preburst7.ogg differ diff --git a/sound/voice/human_male_preburst8.ogg b/sound/voice/human_male_preburst8.ogg new file mode 100644 index 000000000000..f52d9da063b9 Binary files /dev/null and b/sound/voice/human_male_preburst8.ogg differ diff --git a/sound/voice/human_male_preburst9.ogg b/sound/voice/human_male_preburst9.ogg new file mode 100644 index 000000000000..c10942822113 Binary files /dev/null and b/sound/voice/human_male_preburst9.ogg differ diff --git a/sound/weapons/Scims_alt_off.ogg b/sound/weapons/Scims_alt_off.ogg new file mode 100644 index 000000000000..fd29750b18cc Binary files /dev/null and b/sound/weapons/Scims_alt_off.ogg differ diff --git a/sound/weapons/Scims_alt_on.ogg b/sound/weapons/Scims_alt_on.ogg new file mode 100644 index 000000000000..f3af08c1aadb Binary files /dev/null and b/sound/weapons/Scims_alt_on.ogg differ diff --git a/sound/weapons/Scims_off.ogg b/sound/weapons/Scims_off.ogg new file mode 100644 index 000000000000..b52c44d9d92b Binary files /dev/null and b/sound/weapons/Scims_off.ogg differ diff --git a/sound/weapons/Scims_on.ogg b/sound/weapons/Scims_on.ogg new file mode 100644 index 000000000000..d74db1f59086 Binary files /dev/null and b/sound/weapons/Scims_on.ogg differ diff --git a/sound/weapons/pred_attach.ogg b/sound/weapons/pred_attach.ogg new file mode 100644 index 000000000000..9f7ff56b6777 Binary files /dev/null and b/sound/weapons/pred_attach.ogg differ diff --git a/sound/weapons/wristblades_off.ogg b/sound/weapons/wristblades_off.ogg index b52c44d9d92b..ed161d232587 100644 Binary files a/sound/weapons/wristblades_off.ogg and b/sound/weapons/wristblades_off.ogg differ diff --git a/sound/weapons/wristblades_on.ogg b/sound/weapons/wristblades_on.ogg index d74db1f59086..b9610ee52d25 100644 Binary files a/sound/weapons/wristblades_on.ogg and b/sound/weapons/wristblades_on.ogg differ diff --git a/strings/marinetips.txt b/strings/marinetips.txt index 92f674b36906..b2c638d508bc 100644 --- a/strings/marinetips.txt +++ b/strings/marinetips.txt @@ -105,3 +105,4 @@ The Queen can unbolt and break dropship doors by prying them open, even if they If you jump out of a dropship with a parachute on (when there is no paradrop system active), you will land at a random location on the map. If you push crates out of a dropship when paradropping, it will land near the paradrop drop point. When paradropping, you can toss any large item (such as a backpack, pouch, or gun) into hyperspace, and it will land near the paradrop drop point. However, smaller items such as flares will not survive the fall. +Medbay cryotubes will process chemicals in the dead if Cryoxadone and or Clonexadone is present. In a mass-casualty situation or when a patient has severe injuries, consider injecting the dead with chemicals and putting them in the tubes. diff --git a/tgui/packages/common/color.ts b/tgui/packages/common/color.ts index 943b52a71fae..144237305fdb 100644 --- a/tgui/packages/common/color.ts +++ b/tgui/packages/common/color.ts @@ -92,3 +92,294 @@ export class Color { return this.lerp(colors[index], colors[index + 1], ratio); } } + +/* + * MIT License + * https://github.com/omgovich/react-colorful/ + * + * Copyright (c) 2020 Vlad Shilov + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +const round = ( + number: number, + digits = 0, + base = Math.pow(10, digits), +): number => { + return Math.round(base * number) / base; +}; + +export interface RgbColor { + r: number; + g: number; + b: number; +} + +export interface RgbaColor extends RgbColor { + a: number; +} + +export interface HslColor { + h: number; + s: number; + l: number; +} + +export interface HslaColor extends HslColor { + a: number; +} + +export interface HsvColor { + h: number; + s: number; + v: number; +} + +export interface HsvaColor extends HsvColor { + a: number; +} + +export type ObjectColor = + | RgbColor + | HslColor + | HsvColor + | RgbaColor + | HslaColor + | HsvaColor; + +export type AnyColor = string | ObjectColor; + +/** + * Valid CSS units. + * https://developer.mozilla.org/en-US/docs/Web/CSS/angle + */ +const angleUnits: Record = { + grad: 360 / 400, + turn: 360, + rad: 360 / (Math.PI * 2), +}; + +export const hexToHsva = (hex: string): HsvaColor => rgbaToHsva(hexToRgba(hex)); + +export const hexToRgba = (hex: string): RgbaColor => { + if (hex[0] === '#') hex = hex.substring(1); + + if (hex.length < 6) { + return { + r: parseInt(hex[0] + hex[0], 16), + g: parseInt(hex[1] + hex[1], 16), + b: parseInt(hex[2] + hex[2], 16), + a: hex.length === 4 ? round(parseInt(hex[3] + hex[3], 16) / 255, 2) : 1, + }; + } + + return { + r: parseInt(hex.substring(0, 2), 16), + g: parseInt(hex.substring(2, 4), 16), + b: parseInt(hex.substring(4, 6), 16), + a: hex.length === 8 ? round(parseInt(hex.substring(6, 8), 16) / 255, 2) : 1, + }; +}; + +export const parseHue = (value: string, unit = 'deg'): number => { + return Number(value) * (angleUnits[unit] || 1); +}; + +export const hslaStringToHsva = (hslString: string): HsvaColor => { + const matcher = + /hsla?\(?\s*(-?\d*\.?\d+)(deg|rad|grad|turn)?[,\s]+(-?\d*\.?\d+)%?[,\s]+(-?\d*\.?\d+)%?,?\s*[/\s]*(-?\d*\.?\d+)?(%)?\s*\)?/i; + const match = matcher.exec(hslString); + + if (!match) return { h: 0, s: 0, v: 0, a: 1 }; + + return hslaToHsva({ + h: parseHue(match[1], match[2]), + s: Number(match[3]), + l: Number(match[4]), + a: match[5] === undefined ? 1 : Number(match[5]) / (match[6] ? 100 : 1), + }); +}; + +export const hslStringToHsva = hslaStringToHsva; + +export const hslaToHsva = ({ h, s, l, a }: HslaColor): HsvaColor => { + s *= (l < 50 ? l : 100 - l) / 100; + + return { + h: h, + s: s > 0 ? ((2 * s) / (l + s)) * 100 : 0, + v: l + s, + a, + }; +}; + +export const hsvaToHex = (hsva: HsvaColor): string => + rgbaToHex(hsvaToRgba(hsva)); + +export const hsvaToHsla = ({ h, s, v, a }: HsvaColor): HslaColor => { + const hh = ((200 - s) * v) / 100; + + return { + h: round(h), + s: round( + hh > 0 && hh < 200 + ? ((s * v) / 100 / (hh <= 100 ? hh : 200 - hh)) * 100 + : 0, + ), + l: round(hh / 2), + a: round(a, 2), + }; +}; + +export const hsvaToHslString = (hsva: HsvaColor): string => { + const { h, s, l } = hsvaToHsla(hsva); + return `hsl(${h}, ${s}%, ${l}%)`; +}; + +export const hsvaToHsvString = (hsva: HsvaColor): string => { + const { h, s, v } = roundHsva(hsva); + return `hsv(${h}, ${s}%, ${v}%)`; +}; + +export const hsvaToHsvaString = (hsva: HsvaColor): string => { + const { h, s, v, a } = roundHsva(hsva); + return `hsva(${h}, ${s}%, ${v}%, ${a})`; +}; + +export const hsvaToHslaString = (hsva: HsvaColor): string => { + const { h, s, l, a } = hsvaToHsla(hsva); + return `hsla(${h}, ${s}%, ${l}%, ${a})`; +}; + +export const hsvaToRgba = ({ h, s, v, a }: HsvaColor): RgbaColor => { + h = (h / 360) * 6; + s = s / 100; + v = v / 100; + + const hh = Math.floor(h), + b = v * (1 - s), + c = v * (1 - (h - hh) * s), + d = v * (1 - (1 - h + hh) * s), + module = hh % 6; + + return { + r: [v, c, b, b, d, v][module] * 255, + g: [d, v, v, c, b, b][module] * 255, + b: [b, b, d, v, v, c][module] * 255, + a: round(a, 2), + }; +}; + +export const hsvaToRgbString = (hsva: HsvaColor): string => { + const { r, g, b } = hsvaToRgba(hsva); + return `rgb(${round(r)}, ${round(g)}, ${round(b)})`; +}; + +export const hsvaToRgbaString = (hsva: HsvaColor): string => { + const { r, g, b, a } = hsvaToRgba(hsva); + return `rgba(${round(r)}, ${round(g)}, ${round(b)}, ${round(a, 2)})`; +}; + +export const hsvaStringToHsva = (hsvString: string): HsvaColor => { + const matcher = + /hsva?\(?\s*(-?\d*\.?\d+)(deg|rad|grad|turn)?[,\s]+(-?\d*\.?\d+)%?[,\s]+(-?\d*\.?\d+)%?,?\s*[/\s]*(-?\d*\.?\d+)?(%)?\s*\)?/i; + const match = matcher.exec(hsvString); + + if (!match) return { h: 0, s: 0, v: 0, a: 1 }; + + return roundHsva({ + h: parseHue(match[1], match[2]), + s: Number(match[3]), + v: Number(match[4]), + a: match[5] === undefined ? 1 : Number(match[5]) / (match[6] ? 100 : 1), + }); +}; + +export const hsvStringToHsva = hsvaStringToHsva; + +export const rgbaStringToHsva = (rgbaString: string): HsvaColor => { + const matcher = + /rgba?\(?\s*(-?\d*\.?\d+)(%)?[,\s]+(-?\d*\.?\d+)(%)?[,\s]+(-?\d*\.?\d+)(%)?,?\s*[/\s]*(-?\d*\.?\d+)?(%)?\s*\)?/i; + const match = matcher.exec(rgbaString); + + if (!match) return { h: 0, s: 0, v: 0, a: 1 }; + + return rgbaToHsva({ + r: Number(match[1]) / (match[2] ? 100 / 255 : 1), + g: Number(match[3]) / (match[4] ? 100 / 255 : 1), + b: Number(match[5]) / (match[6] ? 100 / 255 : 1), + a: match[7] === undefined ? 1 : Number(match[7]) / (match[8] ? 100 : 1), + }); +}; + +export const rgbStringToHsva = rgbaStringToHsva; + +const format = (number: number) => { + const hex = number.toString(16); + return hex.length < 2 ? '0' + hex : hex; +}; + +export const rgbaToHex = ({ r, g, b, a }: RgbaColor): string => { + const alphaHex = a < 1 ? format(round(a * 255)) : ''; + return ( + '#' + format(round(r)) + format(round(g)) + format(round(b)) + alphaHex + ); +}; + +export const rgbaToHsva = ({ r, g, b, a }: RgbaColor): HsvaColor => { + const max = Math.max(r, g, b); + const delta = max - Math.min(r, g, b); + + // prettier-ignore + const hh = delta + ? max === r + ? (g - b) / delta + : max === g + ? 2 + (b - r) / delta + : 4 + (r - g) / delta + : 0; + + return { + h: 60 * (hh < 0 ? hh + 6 : hh), + s: max ? (delta / max) * 100 : 0, + v: (max / 255) * 100, + a, + }; +}; + +export const roundHsva = (hsva: HsvaColor): HsvaColor => ({ + h: round(hsva.h), + s: round(hsva.s), + + v: round(hsva.v), + a: round(hsva.a, 2), +}); + +export const rgbaToRgb = ({ r, g, b }: RgbaColor): RgbColor => ({ r, g, b }); + +export const hslaToHsl = ({ h, s, l }: HslaColor): HslColor => ({ h, s, l }); + +export const hsvaToHsv = (hsva: HsvaColor): HsvColor => { + const { h, s, v } = roundHsva(hsva); + return { h, s, v }; +}; + +const hexMatcher = /^#?([0-9A-F]{3,8})$/i; + +export const validHex = (value: string, alpha?: boolean): boolean => { + const match = hexMatcher.exec(value); + const length = match ? match[1].length : 0; + + return ( + length === 3 || // '#rgb' format + length === 6 || // '#rrggbb' format + (!!alpha && length === 4) || // '#rgba' format + (!!alpha && length === 8) // '#rrggbbaa' format + ); +}; diff --git a/tgui/packages/tgui/components/Button.tsx b/tgui/packages/tgui/components/Button.tsx index 764d589337ca..c6e39264fd32 100644 --- a/tgui/packages/tgui/components/Button.tsx +++ b/tgui/packages/tgui/components/Button.tsx @@ -256,7 +256,7 @@ const ButtonConfirm = (props: ConfirmProps) => { }} {...rest} > - {clickedOnce ? confirmContent : children} + {clickedOnce && confirmContent ? confirmContent : children} ); }; @@ -329,11 +329,15 @@ const ButtonInput = (props: InputProps) => { setInInput(true)} + onClick={() => { + if (disabled) return; + setInInput(true); + }} > {icon && }
{toDisplay}
diff --git a/tgui/packages/tgui/components/Input.tsx b/tgui/packages/tgui/components/Input.tsx index 82b0d1904236..dce80c7a8a18 100644 --- a/tgui/packages/tgui/components/Input.tsx +++ b/tgui/packages/tgui/components/Input.tsx @@ -164,6 +164,9 @@ export function Input(props: Props) { monospace && 'Input--monospace', className, ])} + onClick={() => { + inputRef.current?.focus(); + }} {...rest} >
.
diff --git a/tgui/packages/tgui/components/Interactive.tsx b/tgui/packages/tgui/components/Interactive.tsx new file mode 100644 index 000000000000..241a10623868 --- /dev/null +++ b/tgui/packages/tgui/components/Interactive.tsx @@ -0,0 +1,153 @@ +/** + * MIT License + * https://github.com/omgovich/react-colorful/ + * + * Copyright (c) 2020 Vlad Shilov + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +import { clamp } from 'common/math'; +import { Component, createRef, ReactNode, RefObject } from 'react'; + +export interface Interaction { + left: number; + top: number; +} + +// Finds the proper window object to fix iframe embedding issues +const getParentWindow = (node?: HTMLDivElement | null): Window => { + return (node && node.ownerDocument.defaultView) || self; +}; + +// Returns a relative position of the pointer inside the node's bounding box +const getRelativePosition = ( + node: HTMLDivElement, + event: MouseEvent | React.MouseEvent, +): Interaction => { + const rect = node.getBoundingClientRect(); + const pointer = event as React.MouseEvent; + return { + left: clamp( + (pointer.pageX - (rect.left + getParentWindow(node).pageXOffset)) / + rect.width, + 0, + 1, + ), + top: clamp( + (pointer.pageY - (rect.top + getParentWindow(node).pageYOffset)) / + rect.height, + 0, + 1, + ), + }; +}; + +export interface InteractiveProps { + readonly onMove: (interaction: Interaction) => void; + readonly onKey: (offset: Interaction) => void; + readonly children: ReactNode | ReactNode[]; + readonly style?: any; +} + +export class Interactive extends Component { + containerRef: RefObject; + props: InteractiveProps; + + constructor(props: InteractiveProps) { + super(props); + this.props = props; + this.containerRef = createRef(); + } + + handleMoveStart = (event: React.MouseEvent) => { + const el = this.containerRef?.current; + if (!el) return; + + // Prevent text selection + event.preventDefault(); + el.focus(); + this.props.onMove(getRelativePosition(el, event)); + this.toggleDocumentEvents(true); + }; + + handleMove = (event: MouseEvent) => { + // Prevent text selection + event.preventDefault(); + + // If user moves the pointer outside of the window or iframe bounds and release it there, + // `mouseup`/`touchend` won't be fired. In order to stop the picker from following the cursor + // after the user has moved the mouse/finger back to the document, we check `event.buttons` + // and `event.touches`. It allows us to detect that the user is just moving his pointer + // without pressing it down + const isDown = event.buttons > 0; + + if (isDown && this.containerRef?.current) { + this.props.onMove(getRelativePosition(this.containerRef.current, event)); + } else { + this.toggleDocumentEvents(false); + } + }; + + handleMoveEnd = () => { + this.toggleDocumentEvents(false); + }; + + handleKeyDown = (event: React.KeyboardEvent) => { + const keyCode = event.which || event.keyCode; + + // Ignore all keys except arrow ones + if (keyCode < 37 || keyCode > 40) return; + // Do not scroll page by arrow keys when document is focused on the element + event.preventDefault(); + // Send relative offset to the parent component. + // We use codes (37←, 38↑, 39→, 40↓) instead of keys ('ArrowRight', 'ArrowDown', etc) + // to reduce the size of the library + this.props.onKey({ + left: keyCode === 39 ? 0.05 : keyCode === 37 ? -0.05 : 0, + top: keyCode === 40 ? 0.05 : keyCode === 38 ? -0.05 : 0, + }); + }; + + toggleDocumentEvents(state?: boolean) { + const el = this.containerRef?.current; + const parentWindow = getParentWindow(el); + + // Add or remove additional pointer event listeners + const toggleEvent = state + ? parentWindow.addEventListener + : parentWindow.removeEventListener; + toggleEvent('mousemove', this.handleMove); + toggleEvent('mouseup', this.handleMoveEnd); + } + + componentDidMount() { + this.toggleDocumentEvents(true); + } + + componentWillUnmount() { + this.toggleDocumentEvents(false); + } + + render() { + return ( +
+ {this.props.children} +
+ ); + } +} diff --git a/tgui/packages/tgui/components/Pointer.tsx b/tgui/packages/tgui/components/Pointer.tsx new file mode 100644 index 000000000000..554b69dca510 --- /dev/null +++ b/tgui/packages/tgui/components/Pointer.tsx @@ -0,0 +1,46 @@ +/** + * MIT License + * https://github.com/omgovich/react-colorful/ + * + * Copyright (c) 2020 Vlad Shilov + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +import { classes } from 'common/react'; +import { ReactNode } from 'react'; + +interface PointerProps { + readonly className?: string; + readonly top?: number; + readonly left: number; + readonly color: string; +} + +export const Pointer = ({ + className, + color, + left, + top = 0.5, +}: PointerProps): ReactNode => { + const nodeClassName = classes(['react-colorful__pointer', className]); + + const style = { + top: `${top * 100}%`, + left: `${left * 100}%`, + }; + + return ( +
+
+
+ ); +}; diff --git a/tgui/packages/tgui/components/index.ts b/tgui/packages/tgui/components/index.ts index e50589f16f09..ea9a90719f30 100644 --- a/tgui/packages/tgui/components/index.ts +++ b/tgui/packages/tgui/components/index.ts @@ -26,6 +26,7 @@ export { Icon } from './Icon'; export { Image } from './Image'; export { InfinitePlane } from './InfinitePlane'; export { Input } from './Input'; +export { Interactive } from './Interactive'; export { KeyListener } from './KeyListener'; export { Knob } from './Knob'; export { LabeledControls } from './LabeledControls'; @@ -34,6 +35,7 @@ export { MenuBar } from './MenuBar'; export { Modal } from './Modal'; export { NoticeBox } from './NoticeBox'; export { NumberInput } from './NumberInput'; +export { Pointer } from './Pointer'; export { Popper } from './Popper'; export { ProgressBar } from './ProgressBar'; export { RestrictedInput } from './RestrictedInput'; diff --git a/tgui/packages/tgui/index.tsx b/tgui/packages/tgui/index.tsx index ac046ffcc29c..29b27c60807c 100644 --- a/tgui/packages/tgui/index.tsx +++ b/tgui/packages/tgui/index.tsx @@ -11,6 +11,7 @@ import './styles/themes/cardtable.scss'; import './styles/themes/crt/crt-blue.scss'; import './styles/themes/crt/crt-green.scss'; import './styles/themes/crt/crt-red.scss'; +import './styles/themes/crt/crt-upp.scss'; import './styles/themes/crt/crt-yellow.scss'; import './styles/themes/spookyconsole.scss'; import './styles/themes/hackerman.scss'; diff --git a/tgui/packages/tgui/interfaces/BodyPicker.tsx b/tgui/packages/tgui/interfaces/BodyPicker.tsx new file mode 100644 index 000000000000..4ca0c03acdf7 --- /dev/null +++ b/tgui/packages/tgui/interfaces/BodyPicker.tsx @@ -0,0 +1,183 @@ +import { useState } from 'react'; + +import { useBackend } from '../backend'; +import { + Box, + Button, + ColorBox, + DmIcon, + Modal, + Stack, + Tooltip, +} from '../components'; +import { Window } from '../layouts'; + +type PickerData = { + icon: string; + body_types: { name: string; icon: string }[]; + skin_colors: { name: string; icon: string; color: string }[]; + body_sizes: { name: string; icon: string }[]; + + body_type: string; + skin_color: string; + body_size: string; +}; + +export const BodyPicker = () => { + const { data } = useBackend(); + + const { icon, body_size, body_type, skin_color, body_types, body_sizes } = + data; + + const [picker, setPicker] = useState<'type' | 'size' | undefined>(); + + const unselectedBodyType = body_types.filter( + (val) => val.icon !== body_type, + )[0]; + + const unselectedBodySize = body_sizes.filter( + (val) => val.icon !== body_size, + )[0]; + + return ( + + + {picker && ( + + + + )} + + + + + + + + + + + + + + + + + + + + + + + ); +}; + +const TypePicker = (props: { + readonly picker: (_) => void; + readonly toUse: 'type' | 'size'; +}) => { + const { data, act } = useBackend(); + + const { picker, toUse } = props; + + const { body_type, body_types, skin_color, body_size, body_sizes, icon } = + data; + + const toIterate = toUse === 'type' ? body_types : body_sizes; + + const active = toUse === 'type' ? body_type : body_size; + + return ( + + {toIterate.map((type) => ( + + + { + picker(undefined); + act(toUse, { name: type.name }); + }} + position="relative" + className={`typePicker ${active === type.icon ? 'active' : ''}`} + > + + + + + ))} + + ); +}; + +const ColorOptions = () => { + const { data, act } = useBackend(); + + const { skin_color, skin_colors } = data; + + return ( + + {skin_colors.map((color) => ( + + act('color', { name: color.name })} + className={`colorPicker ${skin_color === color.icon ? 'active' : ''}`} + /> + + ))} + + ); +}; diff --git a/tgui/packages/tgui/interfaces/CanvasLayer.jsx b/tgui/packages/tgui/interfaces/CanvasLayer.jsx index aab80933632a..d3f45b5c221c 100644 --- a/tgui/packages/tgui/interfaces/CanvasLayer.jsx +++ b/tgui/packages/tgui/interfaces/CanvasLayer.jsx @@ -274,14 +274,16 @@ export class CanvasLayer extends Component { size={2} position="absolute" mx="50%" - mt="25px" + mt="140px" + color="red" + style={{ zIndex: '1' }} /> )} this.handleMouseDown(e)} onMouseUp={(e) => this.handleMouseUp(e)} onMouseMove={(e) => this.handleMouseMove(e)} diff --git a/tgui/packages/tgui/interfaces/ChemMaster.tsx b/tgui/packages/tgui/interfaces/ChemMaster.tsx new file mode 100644 index 000000000000..4ffa0bb655a7 --- /dev/null +++ b/tgui/packages/tgui/interfaces/ChemMaster.tsx @@ -0,0 +1,522 @@ +import { useState } from 'react'; + +import { useBackend, useSharedState } from '../backend'; +import { + Box, + Button, + DmIcon, + Icon, + Input, + Modal, + NoticeBox, + NumberInput, + Section, + Stack, +} from '../components'; +import { Window } from '../layouts'; + +type ChemMasterData = { + is_connected: boolean; + pill_bottle?: { + size: number; + max_size: number; + label?: string; + icon_state: string; + }; + color_pill: { + icon: string; + colors: { [key: string]: string }; + base: string; + }; + beaker?: { + reagents_volume: number; + reagents: Reagent[]; + }; + buffer?: Reagent[]; + mode: boolean; + pill_or_bottle_icon: string; + pill_icon_choices: number; + bottle_icon_choices: number; + bottlesprite: number; + pillsprite: number; + is_pillmaker: boolean; + is_condiment: boolean; + is_vialmaker: boolean; + internal_reagent_name: string; +}; + +type Reagent = { + name: string; + volume: number; + id: number; +}; + +export const ChemMaster = () => { + const { act, data } = useBackend(); + + const { is_connected, beaker, buffer, mode } = data; + + const [glasswarePicker, setGlasswarePicker] = useState< + 'pill' | 'bottle' | false + >(false); + + const [pillPicker, setPillPicker] = useState(false); + + return ( + + +
+ + + + + Beaker: + + + {beaker ? ( + beaker.reagents_volume + 'u' + ) : ( + No beaker inserted. + )} + + + + + + + + {beaker && !is_connected && ( + + )} + + +
+ {beaker && ( +
act('eject')} + > + Eject + + } + > + {beaker.reagents ? ( + + ) : ( + Beaker is empty. + )} +
+ )} +
act('toggle')} + > + {mode ? 'To Beaker' : 'To Disposal'} + + } + > + {buffer?.length ? ( + + ) : ( + Buffer is empty. + )} +
+ + {glasswarePicker && ( + + )} + {pillPicker && } + + + ); +}; + +const PillPicker = (props: { readonly setPicker: (_) => void }) => { + const { setPicker } = props; + + const { act, data } = useBackend(); + + const { color_pill } = data; + + return ( + + + {Object.keys(color_pill.colors).map((color) => ( + + { + act('color_pill', { color: color }); + setPicker(false); + }} + > + + + + ))} + + + ); +}; + +const GlasswarePicker = (props: { + readonly setPicker: (_) => void; + readonly type: 'pill' | 'bottle'; +}) => { + const { act, data } = useBackend(); + + const { pill_icon_choices, bottle_icon_choices, pill_or_bottle_icon } = data; + + const { setPicker, type } = props; + + return ( + + + {Array.from( + { + length: type === 'pill' ? pill_icon_choices : bottle_icon_choices, + }, + (_, index) => ( + + { + act(type === 'pill' ? 'change_pill' : 'change_bottle', { + picked: index + 1, + }); + setPicker(false); + }} + > + + + + ), + )} + + + ); +}; + +const PillBottle = (props: { readonly setPicker: (_) => void }) => { + const { data, act } = useBackend(); + + const { setPicker } = props; + + const { pill_bottle, is_connected, color_pill } = data; + + const [tag, setTag] = useState(''); + + return ( + + + Pill Bottle: + + + {pill_bottle ? ( + + + + + + {pill_bottle.size} / {pill_bottle.max_size} + + + + {pill_bottle.label && ({pill_bottle.label})} + + + + + + { + act('label_pill', { text: value }); + }} + > + Label + + + + + + + + {!!is_connected && ( + + + + )} + + + + + + ) : ( + No pill bottle inserted. + )} + + + ); +}; + +const Glassware = (props: { readonly setPicker: (type) => void }) => { + const { data, act } = useBackend(); + + const { setPicker } = props; + + const { + pill_or_bottle_icon, + pillsprite, + is_pillmaker, + is_condiment, + is_connected, + is_vialmaker, + bottlesprite, + internal_reagent_name, + buffer, + } = data; + + const [numPills, setNumPills] = useSharedState('pillNum', 16); + + return ( +
+ {!is_condiment ? ( + + + {!!is_pillmaker && ( + + + setPicker('pill')}> + + + setNumPills(value)} + /> + + )} + + + + + + + act('create_glass', { + type: 'glass', + label: value, + }) + } + > + Create Bottle (60u) + + {!!is_connected && ( + + act('create_glass', { + type: 'glass', + label: value, + store: true, + }) + } + > + Create and Transfer + + )} + + setPicker('bottle')}> + + + + + + {!!is_vialmaker && ( + + + + + + act('create_glass', { type: 'vial', label: value }) + } + > + Create Vial (30u) + + {!!is_connected && ( + + act('create_glass', { + type: 'vial', + label: value, + store: true, + }) + } + > + Create and Transfer + + )} + + + + + )} + + ) : ( + + + + + + + + )} +
+ ); +}; + +const Reagents = (props: { + readonly reagents: Reagent[]; + readonly type: 'beaker' | 'buffer'; +}) => { + const { reagents, type } = props; + + const { act } = useBackend(); + + return ( + + {reagents.map((reagent) => ( + + + + {reagent.name}, {reagent.volume} units + + + + + + + + + + { + act(type === 'beaker' ? 'add' : 'remove', { + amount: parseInt(value, 10), + id: reagent.id, + }); + }} + /> + + + + + ))} + + + + + ); +}; + +const ReagentButton = (props: { + readonly amount: number | 'All'; + readonly reagent: Reagent; + readonly type: 'buffer' | 'beaker'; +}) => { + const { act } = useBackend(); + + const { amount, reagent, type } = props; + + return ( + + + + ); +}; diff --git a/tgui/packages/tgui/interfaces/ColorPickerModal.tsx b/tgui/packages/tgui/interfaces/ColorPickerModal.tsx new file mode 100644 index 000000000000..18c4ca73eca5 --- /dev/null +++ b/tgui/packages/tgui/interfaces/ColorPickerModal.tsx @@ -0,0 +1,695 @@ +/** + * @file + * @copyright 2023 itsmeow + * @license MIT + */ + +import { + hexToHsva, + HsvaColor, + hsvaToHex, + hsvaToHslString, + hsvaToRgba, + rgbaToHsva, + validHex, +} from 'common/color'; +import { KEY } from 'common/keys'; +import { clamp } from 'common/math'; +import { classes } from 'common/react'; +import { + Component, + FocusEvent, + FormEvent, + KeyboardEvent, + ReactNode, + useState, +} from 'react'; +import { Interaction, Interactive } from 'tgui/components/Interactive'; + +import { useBackend } from '../backend'; +import { + Autofocus, + Box, + Button, + Flex, + NumberInput, + Pointer, + Section, + Stack, + Tooltip, +} from '../components'; +import { Window } from '../layouts'; +import { InputButtons } from './common/InputButtons'; +import { Loader } from './common/Loader'; + +type ColorPickerData = { + autofocus: boolean; + buttons: string[]; + message: string; + large_buttons: boolean; + swapped_buttons: boolean; + timeout: number; + title: string; + default_color: string; +}; + +export const ColorPickerModal = () => { + const { data } = useBackend(); + const { + timeout, + message, + title, + autofocus, + default_color = '#000000', + } = data; + + let [selectedColor, setSelectedColor] = useState( + hexToHsva(default_color), + ); + + return ( + + {!!timeout && } + + + {message && ( + +
+ + {message} + +
+ + )} + +
+ {!!autofocus && } + +
+ + + + + + + + ); +}; + +export const ColorSelector = ({ + color, + setColor, + defaultColor, + onConfirm, +}: { + readonly color: HsvaColor; + readonly setColor: (_) => void; + readonly defaultColor: string; + readonly onConfirm?: (_) => void; +}) => { + const handleChange = (params: Partial) => { + setColor((current: HsvaColor) => { + return Object.assign({}, current, params); + }); + }; + const rgb = hsvaToRgba(color); + const hexColor = hsvaToHex(color); + return ( + + + + +
+ + +
+ + + + Current + + + Previous + +
+ + + + + + + + + + + + + + + Hex: + + + { + setColor(hexToHsva(value)); + }} + prefixed + /> + + + + + + + + H: + + + + + + handleChange({ h: v })} + max={360} + unit="°" + /> + + + + + + + S: + + + + + + handleChange({ s: v })} + unit="%" + /> + + + + + + + V: + + + + + + handleChange({ v: v })} + unit="%" + /> + + + + + + + + R: + + + + + + { + rgb.r = v; + handleChange(rgbaToHsva(rgb)); + }} + max={255} + /> + + + + + + + G: + + + + + + { + rgb.g = v; + handleChange(rgbaToHsva(rgb)); + }} + max={255} + /> + + + + + + + B: + + + + + + { + rgb.b = v; + handleChange(rgbaToHsva(rgb)); + }} + max={255} + /> + + + + {onConfirm && ( + + + + )} + + + + ); +}; + +const TextSetter = ({ + value, + callback, + min = 0, + max = 100, + unit, +}: { + readonly value: number; + readonly callback: any; + readonly min?: number; + readonly max?: number; + readonly unit?: string; +}) => { + return ( + + ); +}; + +/** + * MIT License + * https://github.com/omgovich/react-colorful/ + * + * Copyright (c) 2020 Vlad Shilov + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +interface HexColorInputProps + extends Omit { + /** Enables `#` prefix displaying */ + readonly prefixed?: boolean; + /** Allows `#rgba` and `#rrggbbaa` color formats */ + readonly alpha?: boolean; +} + +/** Adds "#" symbol to the beginning of the string */ +const prefix = (value: string) => '#' + value; + +export const HexColorInput = (props: HexColorInputProps): ReactNode => { + const { prefixed, alpha, color, fluid, onChange, ...rest } = props; + + /** Escapes all non-hexadecimal characters including "#" */ + const escape = (value: string) => + value.replace(/([^0-9A-F]+)/gi, '').substring(0, alpha ? 8 : 6); + + /** Validates hexadecimal strings */ + const validate = (value: string) => validHex(value, alpha); + + return ( + + ); +}; + +interface ColorInputBaseProps { + readonly fluid?: boolean; + readonly color: string; + readonly onChange: (newColor: string) => void; + /** Blocks typing invalid characters and limits string length */ + readonly escape: (value: string) => string; + /** Checks that value is valid color string */ + readonly validate: (value: string) => boolean; + /** Processes value before displaying it in the input */ + readonly format?: (value: string) => string; +} + +export class ColorInput extends Component { + props: ColorInputBaseProps; + state: { localValue: string }; + + constructor(props: ColorInputBaseProps) { + super(props); + this.props = props; + this.state = { localValue: this.props.escape(this.props.color) }; + } + + // Trigger `onChange` handler only if the input value is a valid color + handleInput = (e: FormEvent) => { + const inputValue = this.props.escape(e.currentTarget.value); + this.setState({ localValue: inputValue }); + }; + + // Take the color from props if the last typed color (in local state) is not valid + handleBlur = (e: FocusEvent) => { + if (e.currentTarget) { + if (!this.props.validate(e.currentTarget.value)) { + this.setState({ localValue: this.props.escape(this.props.color) }); // return to default; + } else { + this.props.onChange( + this.props.escape + ? this.props.escape(e.currentTarget.value) + : e.currentTarget.value, + ); + } + } + }; + + handleKeyDown = (e: KeyboardEvent) => { + if (e.key === KEY.Enter) { + e.currentTarget.blur(); + return; + } + if (e.key === KEY.Escape) { + e.currentTarget.blur(); + } + }; + + componentDidUpdate(prevProps, prevState): void { + if (prevProps.color !== this.props.color) { + // Update the local state when `color` property value is changed + this.setState({ localValue: this.props.escape(this.props.color) }); + } + } + + render() { + return ( + +
.
+ + + ); + } +} + +const SaturationValue = ({ hsva, onChange }) => { + const handleMove = (interaction: Interaction) => { + onChange({ + s: interaction.left * 100, + v: 100 - interaction.top * 100, + }); + }; + + const handleKey = (offset: Interaction) => { + // Saturation and brightness always fit into [0, 100] range + onChange({ + s: clamp(hsva.s + offset.left * 100, 0, 100), + v: clamp(hsva.v - offset.top * 100, 0, 100), + }); + }; + + const containerStyle = { + backgroundColor: `${hsvaToHslString({ h: hsva.h, s: 100, v: 100, a: 1 })} !important`, + }; + + return ( +
+ + + +
+ ); +}; + +const Hue = ({ + className, + hue, + onChange, +}: { + readonly className?: string; + readonly hue: number; + readonly onChange: (newHue: { h: number }) => void; +}) => { + const handleMove = (interaction: Interaction) => { + onChange({ h: 360 * interaction.left }); + }; + + const handleKey = (offset: Interaction) => { + // Hue measured in degrees of the color circle ranging from 0 to 360 + onChange({ + h: clamp(hue + offset.left * 360, 0, 360), + }); + }; + + const nodeClassName = classes(['react-colorful__hue', className]); + + return ( +
+ + + +
+ ); +}; + +const Saturation = ({ + className, + color, + onChange, +}: { + readonly className?: string; + readonly color: HsvaColor; + readonly onChange: (newSaturation: { s: number }) => void; +}) => { + const handleMove = (interaction: Interaction) => { + onChange({ s: 100 * interaction.left }); + }; + + const handleKey = (offset: Interaction) => { + // Hue measured in degrees of the color circle ranging from 0 to 100 + onChange({ + s: clamp(color.s + offset.left * 100, 0, 100), + }); + }; + + const nodeClassName = classes(['react-colorful__saturation', className]); + + return ( +
+ + + +
+ ); +}; + +const Value = ({ + className, + color, + onChange, +}: { + readonly className?: string; + readonly color: HsvaColor; + readonly onChange: (newValue: { v: number }) => void; +}) => { + const handleMove = (interaction: Interaction) => { + onChange({ v: 100 * interaction.left }); + }; + + const handleKey = (offset: Interaction) => { + onChange({ + v: clamp(color.v + offset.left * 100, 0, 100), + }); + }; + + const nodeClassName = classes(['react-colorful__value', className]); + + return ( +
+ + + +
+ ); +}; + +const RGBSlider = ({ + className, + color, + onChange, + target, +}: { + readonly className?: string; + readonly color: HsvaColor; + readonly onChange: (newValue: HsvaColor) => void; + readonly target: string; +}) => { + const rgb = hsvaToRgba(color); + + const setNewTarget = (value: number) => { + rgb[target] = value; + onChange(rgbaToHsva(rgb)); + }; + + const handleMove = (interaction: Interaction) => { + setNewTarget(255 * interaction.left); + }; + + const handleKey = (offset: Interaction) => { + setNewTarget(clamp(rgb[target] + offset.left * 255, 0, 255)); + }; + + const nodeClassName = classes([`react-colorful__${target}`, className]); + + let selected = + target === 'r' + ? `rgb(${Math.round(rgb.r)},0,0)` + : target === 'g' + ? `rgb(0,${Math.round(rgb.g)},0)` + : `rgb(0,0,${Math.round(rgb.b)})`; + + return ( +
+ + + +
+ ); +}; diff --git a/tgui/packages/tgui/interfaces/DrawnMap.jsx b/tgui/packages/tgui/interfaces/DrawnMap.jsx index 714b28b8bbef..171a605e5c85 100644 --- a/tgui/packages/tgui/interfaces/DrawnMap.jsx +++ b/tgui/packages/tgui/interfaces/DrawnMap.jsx @@ -51,10 +51,10 @@ export class DrawnMap extends Component { getSize() { const ratio = Math.min( - (self.innerWidth - 50) / 650, - (self.innerHeight - 150) / 600, + (self.innerWidth - 16) / 684, + (self.innerHeight - 166) / 684, ); - return { width: 650 * ratio, height: 600 * ratio }; + return { width: 684 * ratio, height: 684 * ratio }; } render() { @@ -62,35 +62,21 @@ export class DrawnMap extends Component { const size = this.getSize(); return ( -
+
{this.state.loadingBackup && !this.state.mapLoad && (

Loading map...

 )} {this.img && this.state.mapLoad && ( - + )} {parsedSvgData && this.state.mapLoad && ( {parsedSvgData.map((line, index) => ( { +const EmoteTab = () => { const { data, act } = useBackend(); const { categories, emotes, on_cooldown } = data; - const [categoryIndex, setCategoryIndex] = useState('Farewell'); + const [categoryIndex, setCategoryIndex] = useState(categories[0]); + + const [search, setSearch] = useState(''); + const mapped_emote = emotes.filter( - (emote) => emote && emote.category === categoryIndex, + (emote) => + (emote && !search && emote.category === categoryIndex) || + (search && emote.text.toLowerCase().includes(search.toLowerCase())), ); + return ( @@ -35,11 +50,21 @@ const EmoteTab = (props) => { }} > +
+ Message responses + {awake_responder ? ' are likely to be swift.' : ' may be delayed.'} + + )} ); }; diff --git a/tgui/packages/tgui/interfaces/HairPicker.tsx b/tgui/packages/tgui/interfaces/HairPicker.tsx new file mode 100644 index 000000000000..932c96097454 --- /dev/null +++ b/tgui/packages/tgui/interfaces/HairPicker.tsx @@ -0,0 +1,226 @@ +import { hexToHsva, HsvaColor, hsvaToHex } from 'common/color'; +import { BooleanLike } from 'common/react'; +import { createRef, useState } from 'react'; + +import { useBackend } from '../backend'; +import { + Box, + Button, + ColorBox, + DmIcon, + Dropdown, + Modal, + Section, + Stack, + Tooltip, +} from '../components'; +import { Window } from '../layouts'; +import { ColorSelector } from './ColorPickerModal'; + +type HairPickerData = { + hair_icon: string; + hair_styles: { name: string; icon: string }[]; + hair_style: string; + hair_color: string; + + facial_hair_icon: string; + facial_hair_styles: { name: string; icon: string }[]; + facial_hair_style: string; + facial_hair_color: string; + + gradient_available: BooleanLike; + gradient_styles: string[]; + gradient_style: string; + gradient_color: string; +}; + +export const HairPicker = () => { + const { act, data } = useBackend(); + + const { + hair_icon, + hair_style, + hair_styles, + hair_color, + facial_hair_icon, + facial_hair_style, + facial_hair_styles, + facial_hair_color, + gradient_available, + gradient_style, + gradient_styles, + gradient_color, + } = data; + + const [colorPicker, setColorPicker] = useState< + 'hair' | 'facial_hair' | 'gradient' | false + >(false); + + let height = 340; + if (facial_hair_styles.length > 1) { + height = height + 310; + } + + if (gradient_available) { + height = height + 85; + } + + let defaultColor = '#000000'; + switch (colorPicker) { + case 'hair': + defaultColor = hair_color; + break; + case 'facial_hair': + defaultColor = facial_hair_color; + break; + case 'gradient': + defaultColor = gradient_color; + break; + + default: + break; + } + + return ( + + + + {!!(facial_hair_styles.length > 1) && ( + + )} + {!!gradient_available && ( +
setColorPicker('gradient')}> + + Color + + } + > + act('gradient', { name: selected })} + over + /> +
+ )} + {!!colorPicker && ( + setColorPicker(false)} + default_color={defaultColor} + /> + )} + + + ); +}; + +const ColorPicker = (props: { + readonly type: 'hair' | 'facial_hair' | 'gradient'; + readonly close: () => void; + readonly default_color: string; +}) => { + const { act } = useBackend(); + + const { type, close, default_color } = props; + + const [currentColor, setCurrentColor] = useState( + hexToHsva(default_color || '#000000'), + ); + + return ( + + + + + { + close(); + act(`${type}_color`, { color: hsvaToHex(currentColor) }); + }} + /> + + + + + ); +}; + +const PickerElement = (props: { + readonly name: string; + readonly icon: string; + readonly active: string; + readonly hair: { icon: string; name: string }[]; + readonly action: 'hair' | 'facial_hair'; + readonly setColor: (_) => void; + readonly color: string; +}) => { + const { name, icon, hair, active, action, setColor, color } = props; + + const { act } = useBackend(); + + const scrollRef = createRef(); + + return ( +
setColor(action)}> + + Color + + } + ref={scrollRef} + onMouseOver={() => { + scrollRef.current?.focus(); + }} + > + + {hair.map((hair) => ( + + + act(action, { name: hair.name })} + > + + + + + ))} + +
+ ); +}; diff --git a/tgui/packages/tgui/interfaces/LoadoutPicker.tsx b/tgui/packages/tgui/interfaces/LoadoutPicker.tsx new file mode 100644 index 000000000000..08f7285bf2c5 --- /dev/null +++ b/tgui/packages/tgui/interfaces/LoadoutPicker.tsx @@ -0,0 +1,131 @@ +import { useState } from 'react'; + +import { useBackend } from '../backend'; +import { Box, Button, DmIcon, Section, Stack } from '../components'; +import { Window } from '../layouts'; +import { Loader } from './common/Loader'; + +type LoadoutPickerData = { + categories: { + name: string; + items: LoadoutItem[]; + }[]; + points: number; + max_points: number; + loadout: LoadoutItem[]; +}; + +type LoadoutItem = { + name: string; + cost: number; + icon: string; + icon_state: string; +}; + +export const LoadoutPicker = () => { + const { data } = useBackend(); + + const { categories, points, max_points, loadout } = data; + + const [selected, setSelected] = useState(categories[0]); + + return ( + + + + + + +
+ + {categories.map((category) => ( + + + + ))} + +
+ + +
+ + {loadout.map((item) => ( + + + + ))} + +
+ + + + +
+ + {selected.items.map((item) => ( + + + + ))} + +
+ + + + + ); +}; + +const ItemRender = (props: { + readonly item: LoadoutItem; + readonly loadout?: boolean; +}) => { + const { item, loadout } = props; + + const { icon, icon_state, name, cost } = item; + + const { data, act } = useBackend(); + + const { points, max_points } = data; + + const atLimit = points + cost > max_points; + + return ( + + + + + + ); +}; diff --git a/tgui/packages/tgui/interfaces/Orbit/index.tsx b/tgui/packages/tgui/interfaces/Orbit/index.tsx index 49cbb8d95737..2a493ef1f15b 100644 --- a/tgui/packages/tgui/interfaces/Orbit/index.tsx +++ b/tgui/packages/tgui/interfaces/Orbit/index.tsx @@ -287,6 +287,7 @@ const ObservableContent = () => { const { data } = useBackend(); const { humans = [], + responders = [], marines = [], survivors = [], xenos = [], @@ -376,6 +377,11 @@ const ObservableContent = () => { section={marshal} title="Colonial Marshal Bureau" /> + { const { act } = useBackend(); const { color, item } = props; - const { health, icon, full_name, nickname, orbiters, ref, background_color } = - item; + const { + health, + icon, + full_name, + nickname, + orbiters, + ref, + background_color, + background_icon, + } = item; const displayHealth = typeof health === 'number'; @@ -465,7 +479,11 @@ const ObservableItem = (props: { > {displayHealth && } {!!icon && ( - + )} {capitalizeFirst(getDisplayName(full_name, nickname))} {!!orbiters && ( @@ -482,7 +500,15 @@ const ObservableItem = (props: { /** Displays some info on the mob as a tooltip. */ const ObservableTooltip = (props: { readonly item: Observable }) => { const { - item: { caste, health, job, full_name, icon, background_color }, + item: { + caste, + health, + job, + full_name, + icon, + background_color, + background_icon, + }, } = props; const displayHealth = typeof health === 'number'; @@ -496,7 +522,11 @@ const ObservableTooltip = (props: { readonly item: Observable }) => { {!!caste && ( {!!icon && ( - + )} {caste} @@ -504,7 +534,11 @@ const ObservableTooltip = (props: { readonly item: Observable }) => { {!!job && ( {!!icon && ( - + )} {job} @@ -520,24 +554,40 @@ const ObservableTooltip = (props: { readonly item: Observable }) => { const ObservableIcon = (props: { readonly icon: Observable['icon']; readonly background_color: Observable['background_color']; + readonly background_icon: Observable['background_icon']; }) => { const { data } = useBackend(); const { icons = [] } = data; - const { icon, background_color } = props; - if (!icon || !icons[icon]) { + const { icon, background_color, background_icon } = props; + if (!icon || !icons[icon] || !background_icon || !icons[background_icon]) { return null; } return ( - + <> + + + ); }; diff --git a/tgui/packages/tgui/interfaces/Orbit/types.ts b/tgui/packages/tgui/interfaces/Orbit/types.ts index d1a360de0d72..9d9ec528a59f 100644 --- a/tgui/packages/tgui/interfaces/Orbit/types.ts +++ b/tgui/packages/tgui/interfaces/Orbit/types.ts @@ -7,6 +7,7 @@ export type OrbitData = { survivors: Observable[]; xenos: Observable[]; ert_members: Observable[]; + responders: Observable[]; upp: Observable[]; twe: Observable[]; clf: Observable[]; @@ -35,6 +36,7 @@ export type Observable = { icon?: string; job?: string; background_color?: string; + background_icon?: string; full_name: string; nickname?: string; orbiters?: number; diff --git a/tgui/packages/tgui/interfaces/TacticalMap.tsx b/tgui/packages/tgui/interfaces/TacticalMap.tsx index fd6dde487b82..4ad68286eb59 100644 --- a/tgui/packages/tgui/interfaces/TacticalMap.tsx +++ b/tgui/packages/tgui/interfaces/TacticalMap.tsx @@ -163,8 +163,10 @@ const ViewMapPanel = (props) => { } return ( -
+
{ const OldMapPanel = (props) => { const { data } = useBackend(); return ( -
+
{data.canViewCanvas ? ( { title="Canvas Options" className={'canvas-options'} width="688px" + position="absolute" + style={{ zIndex: '1' }} > @@ -320,7 +324,13 @@ const DrawMapPanel = (props) => {
-
+
{ + const { data } = useBackend(); + + const { categories, traits, trait_points, starting_points } = data; + + const [selected, setSelected] = useState(categories[0]); + + const disableAll = + selected.mutually_exclusive && + selected.traits.some((trait) => + traits.flatMap((trait) => trait.name).includes(trait.name), + ); + + return ( + + + + +
( + + ))} + scrollable + height="490px" + > + + + + {selected.traits.map((trait) => ( + + + + ))} + + + +
+ + +
+ + {traits.map((trait) => ( + + + + ))} + +
+ + + + + ); +}; + +const RenderTrait = (props: { + readonly trait: Trait; + readonly disabled?: boolean; +}) => { + const { trait, disabled } = props; + + const { act, data } = useBackend(); + + const { traits, trait_points } = data; + + const activated = traits.flatMap((trait) => trait.name).includes(trait.name); + + return ( +
+ act(activated ? 'remove' : 'add', { type: trait.type }) + } + disabled={ + !activated && ((trait.cost > 0 && trait_points === 0) || disabled) + } + > + {activated ? 'Remove' : 'Add'} + + } + > + {trait.desc} +
+ ); +}; diff --git a/tgui/packages/tgui/interfaces/VendingSorted.tsx b/tgui/packages/tgui/interfaces/VendingSorted.tsx index 565d76ba8661..d533f0c7e951 100644 --- a/tgui/packages/tgui/interfaces/VendingSorted.tsx +++ b/tgui/packages/tgui/interfaces/VendingSorted.tsx @@ -23,6 +23,7 @@ const THEME_COMP = 0; const THEME_USCM = 1; const THEME_CLF = 2; const THEME_UPP = 3; +const THEME_YAUTJA = 4; const VENDOR_ITEM_REGULAR = 1; const VENDOR_ITEM_MANDATORY = 2; @@ -313,6 +314,8 @@ const getTheme = (value: string | number): string => { return 'retro'; case THEME_COMP: return 'weyland'; + case THEME_YAUTJA: + return 'ntos_spooky'; default: return 'usmc'; } diff --git a/tgui/packages/tgui/interfaces/YautjaEmotes.tsx b/tgui/packages/tgui/interfaces/YautjaEmotes.tsx deleted file mode 100644 index f95a3bab8ac6..000000000000 --- a/tgui/packages/tgui/interfaces/YautjaEmotes.tsx +++ /dev/null @@ -1,111 +0,0 @@ -import { useState } from 'react'; - -import { BooleanLike } from '../../common/react'; -import { useBackend } from '../backend'; -import { Box, Button, Divider, Section, Stack, Tabs } from '../components'; -import { Window } from '../layouts'; - -type Emote = { - id: string; - text: string; - category: string; - path: string; -}; - -type BackendContext = { - categories: string[]; - emotes: Emote[]; - on_cooldown: BooleanLike; -}; - -const EmoteTab = (props) => { - const { data, act } = useBackend(); - const { categories, emotes, on_cooldown } = data; - const [categoryIndex, setCategoryIndex] = useState('Fake Sound'); - const mapped_emote = emotes.filter( - (emote) => emote && emote.category === categoryIndex, - ); - return ( - - - - - {categories.map((item, key) => ( - { - setCategoryIndex(item); - }} - > - {item} - - ))} - - - - -
- - - {mapped_emote.map((item) => ( - - - {' '} - - - - - - - - - - ))} - -
- - - ); -}; - -export const YautjaEmotes = (props) => { - return ( - - - - - - ); -}; diff --git a/tgui/packages/tgui/styles/interfaces/BodyPicker.scss b/tgui/packages/tgui/styles/interfaces/BodyPicker.scss new file mode 100644 index 000000000000..d60cd2112493 --- /dev/null +++ b/tgui/packages/tgui/styles/interfaces/BodyPicker.scss @@ -0,0 +1,19 @@ +.theme-crtblue { + .BodyPicker { + .Stack--horizontal > .colorPickerContainer:first-of-type { + margin-left: 6px; + } + + .typePicker { + border: 1px dotted #8ac8ff; + } + + .typePicker.active { + border: 1px solid #8ac8ff; + } + + .colorPicker.active { + outline: solid 2px #8ac8ff; + } + } +} diff --git a/tgui/packages/tgui/styles/interfaces/ChemMaster.scss b/tgui/packages/tgui/styles/interfaces/ChemMaster.scss new file mode 100644 index 000000000000..de9fcc35fa71 --- /dev/null +++ b/tgui/packages/tgui/styles/interfaces/ChemMaster.scss @@ -0,0 +1,14 @@ +.ChemMaster { + .icon { + border-radius: 4px; + border: 3px solid #484949; + } + + .icon:hover { + border: 3px solid #858585; + } + + .picker:first-of-type { + padding-left: 6px; + } +} diff --git a/tgui/packages/tgui/styles/interfaces/ColorPicker.scss b/tgui/packages/tgui/styles/interfaces/ColorPicker.scss new file mode 100644 index 000000000000..99f628c35e2e --- /dev/null +++ b/tgui/packages/tgui/styles/interfaces/ColorPicker.scss @@ -0,0 +1,153 @@ +/** + * MIT License + * https://github.com/omgovich/react-colorful/ + * + * Copyright (c) 2020 Vlad Shilov + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +@use '../colors.scss'; +@use '../base.scss'; + +.react-colorful { + position: relative; + display: flex; + flex-direction: column; + width: 200px; + height: 200px; + user-select: none; + cursor: default; +} + +.react-colorful__saturation_value { + position: relative; + flex-grow: 1; + border-color: transparent; /* Fixes https://github.com/omgovich/react-colorful/issues/139 */ + border-bottom: 12px solid #000; + border-radius: 8px 8px 0 0; + background-image: linear-gradient( + to top, + rgba(0, 0, 0, 255), + rgba(0, 0, 0, 0) + ), + linear-gradient(to right, rgba(255, 255, 255, 255), rgba(255, 255, 255, 0)); +} + +.react-colorful__pointer-fill, +.react-colorful__alpha-gradient { + content: ''; + position: absolute; + left: 0; + top: 0; + right: 0; + bottom: 0; + pointer-events: none; + border-radius: inherit; +} + +/* Improve elements rendering on light backgrounds */ +.react-colorful__alpha-gradient, +.react-colorful__saturation_value { + box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.05); +} + +.react-colorful__hue, +.react-colorful__r, +.react-colorful__g, +.react-colorful__b, +.react-colorful__alpha, +.react-colorful__saturation, +.react-colorful__value { + position: relative; + height: 24px; +} + +.react-colorful__hue { + background: linear-gradient( + to right, + #f00 0%, + #ff0 17%, + #0f0 33%, + #0ff 50%, + #00f 67%, + #f0f 83%, + #f00 100% + ); +} + +.react-colorful__r { + background: linear-gradient(to right, #000, #f00); +} + +.react-colorful__g { + background: linear-gradient(to right, #000, #0f0); +} + +.react-colorful__b { + background: linear-gradient(to right, #000, #00f); +} + +/* Round bottom corners of the last element: `Hue` for `ColorPicker` or `Alpha` for `AlphaColorPicker` */ +.react-colorful__last-control { + border-radius: 0 0 8px 8px; +} + +.react-colorful__interactive { + position: absolute; + left: 0; + top: 0; + right: 0; + bottom: 0; + border-radius: inherit; + outline: none; + /* Don't trigger the default scrolling behavior when the event is originating from this element */ + touch-action: none; +} + +.react-colorful__pointer { + position: absolute; + z-index: 1; + box-sizing: border-box; + width: 28px; + height: 28px; + transform: translate(-50%, -50%); + background-color: #cfcfcf; + border: 2px solid #cfcfcf; + border-radius: 50%; + box-shadow: 0 2px 5px rgba(0, 0, 0, 0.4); +} + +.react-colorful__interactive:focus .react-colorful__pointer { + transform: translate(-50%, -50%) scale(1.1); + background-color: #fff; + border-color: #fff; +} + +/* Chessboard-like pattern for alpha related elements */ +.react-colorful__alpha, +.react-colorful__alpha-pointer { + background-color: #fff; + background-image: url('data:image/svg+xml,'); +} + +.react-colorful__saturation-pointer, +.react-colorful__value-pointer, +.react-colorful__hue-pointer, +.react-colorful__r-pointer, +.react-colorful__g-pointer, +.react-colorful__b-pointer { + z-index: 1; + width: 20px; + height: 20px; +} + +/* Display the saturation value pointer over the hue one */ +.react-colorful__saturation_value-pointer { + z-index: 3; +} diff --git a/tgui/packages/tgui/styles/interfaces/HairPicker.scss b/tgui/packages/tgui/styles/interfaces/HairPicker.scss new file mode 100644 index 000000000000..716741fbf859 --- /dev/null +++ b/tgui/packages/tgui/styles/interfaces/HairPicker.scss @@ -0,0 +1,15 @@ +.theme-crtblue { + .HairPicker { + .Stack--horizontal > .Picker:first-of-type { + margin-left: 6px; + } + + .Picker.Active { + outline: 4px solid #8ac8ff; + } + + .Picker img { + background: white; + } + } +} diff --git a/tgui/packages/tgui/styles/interfaces/LoadoutPicker.scss b/tgui/packages/tgui/styles/interfaces/LoadoutPicker.scss new file mode 100644 index 000000000000..4e77b3e9f1e7 --- /dev/null +++ b/tgui/packages/tgui/styles/interfaces/LoadoutPicker.scss @@ -0,0 +1,7 @@ +.theme-crtblue { + .LoadoutPicker { + .Stack--horizontal > .ItemPicker:first-of-type { + margin-left: 6px; + } + } +} diff --git a/tgui/packages/tgui/styles/interfaces/TacticalMap.scss b/tgui/packages/tgui/styles/interfaces/TacticalMap.scss index 84f81d62a681..35c0e36a0508 100644 --- a/tgui/packages/tgui/styles/interfaces/TacticalMap.scss +++ b/tgui/packages/tgui/styles/interfaces/TacticalMap.scss @@ -1,12 +1,11 @@ @use '../base.scss'; .TacticalMap { - position: absolute; - top: base.em(1px); + top: 0; bottom: 0; left: 0; right: 0; - margin: 0.5em; + margin: 0; text-align: center; } @@ -21,3 +20,22 @@ color: white !important; } } + +.TacticalMapDrawn { + img { + z-index: 0; + position: absolute; + margin: auto; + width: fit-content; + left: 0; + right: 0; + } + svg { + z-index: 1; + position: absolute; + margin: auto; + width: fit-content; + left: 0; + right: 0; + } +} diff --git a/tgui/packages/tgui/styles/main.scss b/tgui/packages/tgui/styles/main.scss index 7c1c65a324cc..d8995a546f47 100644 --- a/tgui/packages/tgui/styles/main.scss +++ b/tgui/packages/tgui/styles/main.scss @@ -48,7 +48,9 @@ @include meta.load-css('./components/Tooltip.scss'); // Interfaces +@include meta.load-css('./interfaces/BodyPicker.scss'); @include meta.load-css('./interfaces/Changelog.scss'); +@include meta.load-css('./interfaces/ColorPicker.scss'); @include meta.load-css('./interfaces/ListInput.scss'); @include meta.load-css('./interfaces/CasSim.scss'); @include meta.load-css('./interfaces/AlertModal.scss'); @@ -56,10 +58,13 @@ @include meta.load-css('./interfaces/CrtPanel.scss'); @include meta.load-css('./interfaces/ChooseResin.scss'); @include meta.load-css('./interfaces/CameraConsole.scss'); +@include meta.load-css('./interfaces/ChemMaster.scss'); @include meta.load-css('./interfaces/BugReportForm.scss'); @include meta.load-css('./interfaces/DropshipWeapons.scss'); @include meta.load-css('./interfaces/ElevatorControl.scss'); @include meta.load-css('./interfaces/ExperimentConfigure.scss'); +@include meta.load-css('./interfaces/HairPicker.scss'); +@include meta.load-css('./interfaces/LoadoutPicker.scss'); @include meta.load-css('./interfaces/MarkMenu.scss'); @include meta.load-css('./interfaces/MedalsViewer.scss'); @include meta.load-css('./interfaces/NavigationShuttle.scss'); diff --git a/tgui/packages/tgui/styles/themes/crt.scss b/tgui/packages/tgui/styles/themes/crt.scss index 9f9436f275a3..be947a81465d 100644 --- a/tgui/packages/tgui/styles/themes/crt.scss +++ b/tgui/packages/tgui/styles/themes/crt.scss @@ -4,6 +4,7 @@ $font-family: monospace; $background-radial-opacity: 0.2 !default; +$scrollbar-color-multiplier: 0.5 !default; @use '../base.scss'; @@ -74,7 +75,7 @@ $background-radial-opacity: 0.2 !default; ); @include meta.load-css( '../layouts/Layout.scss', - $with: ('scrollbar-color-multiplier': 0.5) + $with: ('scrollbar-color-multiplier': $scrollbar-color-multiplier) ); @include meta.load-css( '../components/Section.scss', @@ -99,6 +100,11 @@ $background-radial-opacity: 0.2 !default; ) ); + @include meta.load-css( + '../components/Modal.scss', + $with: ('background-color': base.$color-bg) + ); + .Layout__content { background-image: none; background: radial-gradient( @@ -163,6 +169,9 @@ $background-radial-opacity: 0.2 !default; font-family: $font-family; font-weight: bold; border: 1px solid base.$color-fg; + } + + .Button:not(.Button--selected) { &:hover, &:focus, &:visited, @@ -208,6 +217,13 @@ $background-radial-opacity: 0.2 !default; } } + .Dropdown__control { + & > .Dropdown__selected-text, + & > .Dropdown__arrow-button { + color: rgba(0, 0, 0, 1); + } + } + hr { color: base.$color-fg; border: 1px solid base.$color-fg; diff --git a/tgui/packages/tgui/styles/themes/crt/crt-blue.scss b/tgui/packages/tgui/styles/themes/crt/crt-blue.scss index bb3a4d4adea5..3c8827bf2a83 100644 --- a/tgui/packages/tgui/styles/themes/crt/crt-blue.scss +++ b/tgui/packages/tgui/styles/themes/crt/crt-blue.scss @@ -8,7 +8,9 @@ $dark: #000011; $color-fg: $light ); -@use '../crt.scss'; +@use '../crt.scss' with ( + $scrollbar-color-multiplier: 1 +); .theme-crtblue { @extend %theme-crt; diff --git a/tgui/packages/tgui/styles/themes/crt/crt-upp.scss b/tgui/packages/tgui/styles/themes/crt/crt-upp.scss new file mode 100644 index 000000000000..4261174cd66a --- /dev/null +++ b/tgui/packages/tgui/styles/themes/crt/crt-upp.scss @@ -0,0 +1,37 @@ +@use 'sass:meta'; + +$light: #dbbf23; +$dark: #511814; + +@use '../../base.scss' with ( + $color-bg: $dark, + $color-fg: $light +); + +@use '../crt.scss'; + +.theme-crtupp { + @extend %theme-crt; + + @keyframes redConfirmFlicker { + 0% { + background-color: $light; + color: $dark; + } + 50% { + background-color: $dark; + color: $light; + } + 100% { + background-color: $light; + color: $dark; + } + } + + .Button.ConfirmButton { + animation: redConfirmFlicker 5s infinite; + &:hover { + animation: none; + } + } +} diff --git a/tools/UpdatePaths/6656-no-more-open-turf-edits.txt b/tools/UpdatePaths/6656-no-more-open-turf-edits.txt deleted file mode 100644 index 9eebcd7f11d8..000000000000 --- a/tools/UpdatePaths/6656-no-more-open-turf-edits.txt +++ /dev/null @@ -1,1482 +0,0 @@ -/turf/open/asphalt/cement_sunbleached{icon_state="cement_sunbleached1";} : /turf/open/asphalt/cement_sunbleached/cement_sunbleached1 -/turf/open/asphalt/cement_sunbleached{icon_state="cement_sunbleached12";} : /turf/open/asphalt/cement_sunbleached/cement_sunbleached12 -/turf/open/asphalt/cement_sunbleached{icon_state="cement_sunbleached13";} : /turf/open/asphalt/cement_sunbleached/cement_sunbleached13 -/turf/open/asphalt/cement_sunbleached{icon_state="cement_sunbleached14";} : /turf/open/asphalt/cement_sunbleached/cement_sunbleached14 -/turf/open/asphalt/cement_sunbleached{icon_state="cement_sunbleached15";} : /turf/open/asphalt/cement_sunbleached/cement_sunbleached15 -/turf/open/asphalt/cement_sunbleached{icon_state="cement_sunbleached16";} : /turf/open/asphalt/cement_sunbleached/cement_sunbleached16 -/turf/open/asphalt/cement_sunbleached{icon_state="cement_sunbleached17";} : /turf/open/asphalt/cement_sunbleached/cement_sunbleached17 -/turf/open/asphalt/cement_sunbleached{icon_state="cement_sunbleached18";} : /turf/open/asphalt/cement_sunbleached/cement_sunbleached18 -/turf/open/asphalt/cement_sunbleached{icon_state="cement_sunbleached19";} : /turf/open/asphalt/cement_sunbleached/cement_sunbleached19 -/turf/open/asphalt/cement_sunbleached{icon_state="cement_sunbleached2";} : /turf/open/asphalt/cement_sunbleached/cement_sunbleached2 -/turf/open/asphalt/cement_sunbleached{icon_state="cement_sunbleached20";} : /turf/open/asphalt/cement_sunbleached/cement_sunbleached20 -/turf/open/asphalt/cement_sunbleached{icon_state="cement_sunbleached3";} : /turf/open/asphalt/cement_sunbleached/cement_sunbleached3 -/turf/open/asphalt/cement_sunbleached{icon_state="cement_sunbleached4";} : /turf/open/asphalt/cement_sunbleached/cement_sunbleached4 -/turf/open/asphalt/cement_sunbleached{icon_state="cement_sunbleached6";} : /turf/open/asphalt/cement_sunbleached/cement_sunbleached6 -/turf/open/asphalt/cement_sunbleached{icon_state="cement_sunbleached9";} : /turf/open/asphalt/cement_sunbleached/cement_sunbleached9 -/turf/open/asphalt/cement{icon_state="cement1";dir=1;} : /turf/open/asphalt/cement/cement1/north -/turf/open/asphalt/cement{icon_state="cement1";} : /turf/open/asphalt/cement/cement1 -/turf/open/asphalt/cement{icon_state="cement12";} : /turf/open/asphalt/cement/cement12 -/turf/open/asphalt/cement{icon_state="cement13";} : /turf/open/asphalt/cement/cement13 -/turf/open/asphalt/cement{icon_state="cement14";} : /turf/open/asphalt/cement/cement14 -/turf/open/asphalt/cement{icon_state="cement15";} : /turf/open/asphalt/cement/cement15 -/turf/open/asphalt/cement{icon_state="cement2";} : /turf/open/asphalt/cement/cement2 -/turf/open/asphalt/cement{icon_state="cement3";} : /turf/open/asphalt/cement/cement3 -/turf/open/asphalt/cement{icon_state="cement4";} : /turf/open/asphalt/cement/cement4 -/turf/open/asphalt/cement{icon_state="cement7";} : /turf/open/asphalt/cement/cement7 -/turf/open/asphalt/cement{icon_state="cement9";} : /turf/open/asphalt/cement/cement9 -/turf/open/asphalt{icon_state="tile";} : /turf/open/asphalt/tile -/turf/open/desert/cave/cave_shore{dir=4;} : /turf/open/desert/cave/cave_shore/east -/turf/open/desert/cave/cave_shore{dir=5;} : /turf/open/desert/cave/cave_shore/northeast -/turf/open/desert/cave/cave_shore{dir=6;} : /turf/open/desert/cave/cave_shore/southeast -/turf/open/desert/desert_shore/desert_shore1{dir=1;} : /turf/open/desert/desert_shore/desert_shore1/north -/turf/open/desert/desert_shore/desert_shore1{dir=4;} : /turf/open/desert/desert_shore/desert_shore1/east -/turf/open/desert/desert_shore/desert_shore1{dir=8;} : /turf/open/desert/desert_shore/desert_shore1/west -/turf/open/desert/desert_shore/shore_corner1{dir=1;} : /turf/open/desert/desert_shore/shore_corner1/north -/turf/open/desert/desert_shore/shore_corner1{dir=8;} : /turf/open/desert/desert_shore/shore_corner1/west -/turf/open/desert/desert_shore/shore_corner2{dir=1;} : /turf/open/desert/desert_shore/shore_corner2/north -/turf/open/desert/desert_shore/shore_corner2{dir=4;} : /turf/open/desert/desert_shore/shore_corner2/east -/turf/open/desert/desert_shore/shore_corner2{dir=8;} : /turf/open/desert/desert_shore/shore_corner2/west -/turf/open/desert/desert_shore/shore_edge1{dir=1;} : /turf/open/desert/desert_shore/shore_edge1/north -/turf/open/desert/desert_shore/shore_edge1{dir=4;} : /turf/open/desert/desert_shore/shore_edge1/east -/turf/open/desert/desert_shore/shore_edge1{dir=8;} : /turf/open/desert/desert_shore/shore_edge1/west -/turf/open/desert/dirt{dir=10;icon_state="desert_transition_edge1";} : /turf/open/desert/dirt/desert_transition_edge1/southwest -/turf/open/desert/dirt{dir=1;icon_state="desert_transition_corner1";} : /turf/open/desert/dirt/desert_transition_corner1/north -/turf/open/desert/dirt{dir=1;icon_state="desert_transition_edge1";} : /turf/open/desert/dirt/desert_transition_edge1/north -/turf/open/desert/dirt{dir=4;icon_state="desert_transition_corner1";} : /turf/open/desert/dirt/desert_transition_corner1/east -/turf/open/desert/dirt{dir=4;icon_state="desert_transition_edge1";} : /turf/open/desert/dirt/desert_transition_edge1/east -/turf/open/desert/dirt{dir=5;icon_state="desert_transition_edge1";} : /turf/open/desert/dirt/desert_transition_edge1/northeast -/turf/open/desert/dirt{dir=6;icon_state="desert_transition_edge1";} : /turf/open/desert/dirt/desert_transition_edge1/southeast -/turf/open/desert/dirt{dir=8;icon_state="desert_transition_corner1";} : /turf/open/desert/dirt/desert_transition_corner1/west -/turf/open/desert/dirt{dir=8;icon_state="desert_transition_edge1";} : /turf/open/desert/dirt/desert_transition_edge1/west -/turf/open/desert/dirt{dir=9;icon_state="desert_transition_edge1";} : /turf/open/desert/dirt/desert_transition_edge1/northwest -/turf/open/desert/dirt{icon_state="desert_transition_corner1";} : /turf/open/desert/dirt/desert_transition_corner1 -/turf/open/desert/dirt{icon_state="desert_transition_edge1";} : /turf/open/desert/dirt/desert_transition_edge1 -/turf/open/desert/dirt{icon_state="dirt2";} : /turf/open/desert/dirt/dirt2 -/turf/open/desert/dirt{icon_state="rock1";} : /turf/open/desert/dirt/rock1 -/turf/open/desert/excavation/component1{dir=10;} : /turf/open/desert/excavation/component1/southwest -/turf/open/desert/excavation/component1{dir=1;} : /turf/open/desert/excavation/component1/north -/turf/open/desert/excavation/component1{dir=4;} : /turf/open/desert/excavation/component1/east -/turf/open/desert/excavation/component1{dir=5;} : /turf/open/desert/excavation/component1/northeast -/turf/open/desert/excavation/component1{dir=6;} : /turf/open/desert/excavation/component1/southeast -/turf/open/desert/excavation/component1{dir=8;} : /turf/open/desert/excavation/component1/west -/turf/open/desert/excavation/component2{dir=1;} : /turf/open/desert/excavation/component2/north -/turf/open/desert/excavation/component2{dir=4;} : /turf/open/desert/excavation/component2/east -/turf/open/desert/excavation/component2{dir=6;} : /turf/open/desert/excavation/component2/southeast -/turf/open/desert/excavation/component2{dir=8;} : /turf/open/desert/excavation/component2/west -/turf/open/desert/excavation/component3{dir=10;} : /turf/open/desert/excavation/component3/southwest -/turf/open/desert/excavation/component3{dir=1;} : /turf/open/desert/excavation/component3/north -/turf/open/desert/excavation/component3{dir=4;} : /turf/open/desert/excavation/component3/east -/turf/open/desert/excavation/component3{dir=5;} : /turf/open/desert/excavation/component3/northeast -/turf/open/desert/excavation/component3{dir=6;} : /turf/open/desert/excavation/component3/southeast -/turf/open/desert/excavation/component3{dir=8;} : /turf/open/desert/excavation/component3/west -/turf/open/desert/excavation/component4{dir=1;} : /turf/open/desert/excavation/component4/north -/turf/open/desert/excavation/component4{dir=4;} : /turf/open/desert/excavation/component4/east -/turf/open/desert/excavation/component4{dir=6;} : /turf/open/desert/excavation/component4/southeast -/turf/open/desert/excavation/component4{dir=8;} : /turf/open/desert/excavation/component4/west -/turf/open/desert/excavation/component5{dir=10;} : /turf/open/desert/excavation/component5/southwest -/turf/open/desert/excavation/component5{dir=1;} : /turf/open/desert/excavation/component5/north -/turf/open/desert/excavation/component5{dir=4;} : /turf/open/desert/excavation/component5/east -/turf/open/desert/excavation/component5{dir=5;} : /turf/open/desert/excavation/component5/northeast -/turf/open/desert/excavation/component5{dir=6;} : /turf/open/desert/excavation/component5/southeast -/turf/open/desert/excavation/component5{dir=8;} : /turf/open/desert/excavation/component5/west -/turf/open/desert/excavation/component6{dir=10;} : /turf/open/desert/excavation/component6/southwest -/turf/open/desert/excavation/component6{dir=1;} : /turf/open/desert/excavation/component6/north -/turf/open/desert/excavation/component6{dir=4;} : /turf/open/desert/excavation/component6/east -/turf/open/desert/excavation/component6{dir=5;} : /turf/open/desert/excavation/component6/northeast -/turf/open/desert/excavation/component6{dir=6;} : /turf/open/desert/excavation/component6/southeast -/turf/open/desert/excavation/component6{dir=8;} : /turf/open/desert/excavation/component6/west -/turf/open/desert/excavation/component7{dir=10;} : /turf/open/desert/excavation/component7/southwest -/turf/open/desert/excavation/component7{dir=1;} : /turf/open/desert/excavation/component7/north -/turf/open/desert/excavation/component7{dir=4;} : /turf/open/desert/excavation/component7/east -/turf/open/desert/excavation/component7{dir=5;} : /turf/open/desert/excavation/component7/northeast -/turf/open/desert/excavation/component7{dir=6;} : /turf/open/desert/excavation/component7/southeast -/turf/open/desert/excavation/component7{dir=8;} : /turf/open/desert/excavation/component7/west -/turf/open/desert/excavation/component8{dir=10;} : /turf/open/desert/excavation/component8/southwest -/turf/open/desert/excavation/component8{dir=1;} : /turf/open/desert/excavation/component8/north -/turf/open/desert/excavation/component8{dir=4;} : /turf/open/desert/excavation/component8/east -/turf/open/desert/excavation/component8{dir=5;} : /turf/open/desert/excavation/component8/northeast -/turf/open/desert/excavation/component8{dir=6;} : /turf/open/desert/excavation/component8/southeast -/turf/open/desert/excavation/component8{dir=8;} : /turf/open/desert/excavation/component8/west -/turf/open/desert/excavation/component8{dir=9;} : /turf/open/desert/excavation/component8/northwest -/turf/open/desert/excavation/component9{dir=10;} : /turf/open/desert/excavation/component9/southwest -/turf/open/desert/excavation/component9{dir=1;} : /turf/open/desert/excavation/component9/north -/turf/open/desert/excavation/component9{dir=4;} : /turf/open/desert/excavation/component9/east -/turf/open/desert/excavation/component9{dir=6;} : /turf/open/desert/excavation/component9/southeast -/turf/open/desert/excavation/component9{dir=8;} : /turf/open/desert/excavation/component9/west -/turf/open/desert/rock/deep/transition{dir=10;} : /turf/open/desert/rock/deep/transition/southwest -/turf/open/desert/rock/deep/transition{dir=1;} : /turf/open/desert/rock/deep/transition/north -/turf/open/desert/rock/deep/transition{dir=4;} : /turf/open/desert/rock/deep/transition/east -/turf/open/desert/rock/deep/transition{dir=5;} : /turf/open/desert/rock/deep/transition/northeast -/turf/open/desert/rock/deep/transition{dir=6;} : /turf/open/desert/rock/deep/transition/southeast -/turf/open/desert/rock/deep/transition{dir=8;} : /turf/open/desert/rock/deep/transition/west -/turf/open/desert/rock/deep/transition{dir=9;} : /turf/open/desert/rock/deep/transition/northwest -/turf/open/desert/rock/deep{icon_state="rock3";} : /turf/open/desert/rock/deep/rock3 -/turf/open/desert/rock/deep{icon_state="rock4";} : /turf/open/desert/rock/deep/rock4 -/turf/open/desert/rock/edge1{dir=4;} : /turf/open/desert/rock/edge1/east -/turf/open/floor/airless{dir=5;icon_state="asteroidfloor";} : /turf/open/floor/airless/asteroidfloor/northeast -/turf/open/floor/almayer/aicore/glowing/no_build{icon_state="ai_floor3";light_range=4;} : /turf/open/floor/almayer/aicore/glowing/no_build/ai_floor3_4range -/turf/open/floor/almayer/aicore/glowing/no_build{icon_state="ai_floor3";} : /turf/open/floor/almayer/aicore/glowing/no_build/ai_floor3 -/turf/open/floor/almayer/aicore/no_build{dir=4;icon_state="ai_arrow";} : /turf/open/floor/almayer/aicore/no_build/ai_arrow/east -/turf/open/floor/almayer/aicore/no_build{dir=4;icon_state="ai_silver";} : /turf/open/floor/almayer/aicore/no_build/ai_silver/east -/turf/open/floor/almayer/aicore/no_build{dir=8;icon_state="ai_arrow";} : /turf/open/floor/almayer/aicore/no_build/ai_arrow/west -/turf/open/floor/almayer/aicore/no_build{dir=8;icon_state="ai_silver";} : /turf/open/floor/almayer/aicore/no_build/ai_silver/west -/turf/open/floor/almayer/aicore/no_build{icon_state="ai_arrow";} : /turf/open/floor/almayer/aicore/no_build/ai_arrow -/turf/open/floor/almayer/aicore/no_build{icon_state="ai_cargo";} : /turf/open/floor/almayer/aicore/no_build/ai_cargo -/turf/open/floor/almayer/aicore/no_build{icon_state="ai_floor2";} : /turf/open/floor/almayer/aicore/no_build/ai_floor2 -/turf/open/floor/almayer/aicore/no_build{icon_state="ai_plates";} : /turf/open/floor/almayer/aicore/no_build/ai_plates -/turf/open/floor/almayer/no_build{icon_state="ai_floors";} : /turf/open/floor/almayer/no_build/ai_floors -/turf/open/floor/almayer/no_build{icon_state="plating";} : /turf/open/floor/almayer/no_build/plating -/turf/open/floor/almayer/no_build{icon_state="test_floor4";} : /turf/open/floor/almayer/no_build/test_floor4 -/turf/open/floor/almayer/research/containment/corner_var1{dir=4;} : /turf/open/floor/almayer/research/containment/corner_var1/east -/turf/open/floor/almayer/research/containment/corner_var1{icon_state="containment_corner_variant_2";} : /turf/open/floor/almayer/research/containment/corner_var1/containment_corner_variant_2 -/turf/open/floor/almayer/research/containment/corner{dir=1;} : /turf/open/floor/almayer/research/containment/corner/north -/turf/open/floor/almayer/research/containment/corner{dir=4;} : /turf/open/floor/almayer/research/containment/corner/east -/turf/open/floor/almayer/research/containment/entrance{dir=8;} : /turf/open/floor/almayer/research/containment/entrance/west -/turf/open/floor/almayer/research/containment/floor2{dir=1;} : /turf/open/floor/almayer/research/containment/floor2/north -/turf/open/floor/almayer/research/containment/floor2{dir=8;} : /turf/open/floor/almayer/research/containment/floor2/west -/turf/open/floor/almayer/uscm/directional{dir=10;} : /turf/open/floor/almayer/uscm/directional/southwest -/turf/open/floor/almayer/uscm/directional{dir=1;} : /turf/open/floor/almayer/uscm/directional/north -/turf/open/floor/almayer/uscm/directional{dir=4;} : /turf/open/floor/almayer/uscm/directional/east -/turf/open/floor/almayer/uscm/directional{dir=5;} : /turf/open/floor/almayer/uscm/directional/northeast -/turf/open/floor/almayer/uscm/directional{dir=6;} : /turf/open/floor/almayer/uscm/directional/southeast -/turf/open/floor/almayer/uscm/directional{dir=8;icon_state="logo_c";} : /turf/open/floor/almayer/uscm/directional/logo_c/west -/turf/open/floor/almayer/uscm/directional{dir=8;} : /turf/open/floor/almayer/uscm/directional/west -/turf/open/floor/almayer/uscm/directional{dir=9;} : /turf/open/floor/almayer/uscm/directional/northwest -/turf/open/floor/almayer_hull{dir=10;icon_state="outerhull_dir";} : /turf/open/floor/almayer_hull/outerhull_dir/southwest -/turf/open/floor/almayer_hull{dir=1;icon_state="outerhull_dir";} : /turf/open/floor/almayer_hull/outerhull_dir/north -/turf/open/floor/almayer_hull{dir=4;icon_state="outerhull_dir";} : /turf/open/floor/almayer_hull/outerhull_dir/east -/turf/open/floor/almayer_hull{dir=5;icon_state="outerhull_dir";} : /turf/open/floor/almayer_hull/outerhull_dir/northeast -/turf/open/floor/almayer_hull{dir=6;icon_state="outerhull_dir";} : /turf/open/floor/almayer_hull/outerhull_dir/southeast -/turf/open/floor/almayer_hull{dir=8;icon_state="outerhull_dir";} : /turf/open/floor/almayer_hull/outerhull_dir/west -/turf/open/floor/almayer_hull{dir=9;icon_state="outerhull_dir";} : /turf/open/floor/almayer_hull/outerhull_dir/northwest -/turf/open/floor/almayer_hull{icon_state="outerhull_dir";} : /turf/open/floor/almayer_hull/outerhull_dir -/turf/open/floor/almayer{allow_construction=0;icon_state="plate";} : /turf/open/floor/almayer/no_build/plate -/turf/open/floor/almayer{allow_construction=0;} : /turf/open/floor/almayer/no_build -/turf/open/floor/almayer{desc="There's a hatch above it, presumably to allow pods to drop in.";icon_state="test_floor4";name="pod landing floor";} : /turf/open/floor/almayer/pod_landing_floor -/turf/open/floor/almayer{dir=10;icon_state="blue";} : /turf/open/floor/almayer/blue/southwest -/turf/open/floor/almayer{dir=10;icon_state="cargo";} : /turf/open/floor/almayer/cargo/southwest -/turf/open/floor/almayer{dir=10;icon_state="emerald";} : /turf/open/floor/almayer/emerald/southwest -/turf/open/floor/almayer{dir=10;icon_state="green";} : /turf/open/floor/almayer/green/southwest -/turf/open/floor/almayer{dir=10;icon_state="orange";} : /turf/open/floor/almayer/orange/southwest -/turf/open/floor/almayer{dir=10;icon_state="red";} : /turf/open/floor/almayer/red/southwest -/turf/open/floor/almayer{dir=10;icon_state="silver";} : /turf/open/floor/almayer/silver/southwest -/turf/open/floor/almayer{dir=10;icon_state="sterile_green_side";} : /turf/open/floor/almayer/sterile_green_side/southwest -/turf/open/floor/almayer{dir=1;icon_state="blue";} : /turf/open/floor/almayer/blue/north -/turf/open/floor/almayer{dir=1;icon_state="bluecorner";} : /turf/open/floor/almayer/bluecorner/north -/turf/open/floor/almayer{dir=1;icon_state="cargo_arrow";} : /turf/open/floor/almayer/cargo_arrow/north -/turf/open/floor/almayer{dir=1;icon_state="emerald";} : /turf/open/floor/almayer/emerald/north -/turf/open/floor/almayer{dir=1;icon_state="emeraldcorner";} : /turf/open/floor/almayer/emeraldcorner/north -/turf/open/floor/almayer{dir=1;icon_state="green";} : /turf/open/floor/almayer/green/north -/turf/open/floor/almayer{dir=1;icon_state="greencorner";} : /turf/open/floor/almayer/greencorner/north -/turf/open/floor/almayer{dir=1;icon_state="orange";} : /turf/open/floor/almayer/orange/north -/turf/open/floor/almayer{dir=1;icon_state="orangecorner";} : /turf/open/floor/almayer/orangecorner/north -/turf/open/floor/almayer{dir=1;icon_state="plating_striped";} : /turf/open/floor/almayer/plating_striped/north -/turf/open/floor/almayer{dir=1;icon_state="red";} : /turf/open/floor/almayer/red/north -/turf/open/floor/almayer{dir=1;icon_state="redcorner";} : /turf/open/floor/almayer/redcorner/north -/turf/open/floor/almayer{dir=1;icon_state="silver";} : /turf/open/floor/almayer/silver/north -/turf/open/floor/almayer{dir=1;icon_state="silvercorner";} : /turf/open/floor/almayer/silvercorner/north -/turf/open/floor/almayer{dir=1;icon_state="sterile_green_corner";} : /turf/open/floor/almayer/sterile_green_corner/north -/turf/open/floor/almayer{dir=1;icon_state="sterile_green_side";} : /turf/open/floor/almayer/sterile_green_side/north -/turf/open/floor/almayer{dir=1;icon_state="w-y0";} : /turf/open/floor/almayer/w_y0/north -/turf/open/floor/almayer{dir=1;icon_state="w-y1";} : /turf/open/floor/almayer/w_y1/north -/turf/open/floor/almayer{dir=1;icon_state="w-y2";} : /turf/open/floor/almayer/w_y2/north -/turf/open/floor/almayer{dir=2;icon_state="green";} : /turf/open/floor/almayer/green/south -/turf/open/floor/almayer{dir=4;icon_state="blue";} : /turf/open/floor/almayer/blue/east -/turf/open/floor/almayer{dir=4;icon_state="bluecorner";} : /turf/open/floor/almayer/bluecorner/east -/turf/open/floor/almayer{dir=4;icon_state="cargo_arrow";} : /turf/open/floor/almayer/cargo_arrow/east -/turf/open/floor/almayer{dir=4;icon_state="emerald";} : /turf/open/floor/almayer/emerald/east -/turf/open/floor/almayer{dir=4;icon_state="emeraldcorner";} : /turf/open/floor/almayer/emeraldcorner/east -/turf/open/floor/almayer{dir=4;icon_state="green";} : /turf/open/floor/almayer/green/east -/turf/open/floor/almayer{dir=4;icon_state="greencorner";} : /turf/open/floor/almayer/greencorner/east -/turf/open/floor/almayer{dir=4;icon_state="orange";} : /turf/open/floor/almayer/orange/east -/turf/open/floor/almayer{dir=4;icon_state="orangecorner";} : /turf/open/floor/almayer/orangecorner/east -/turf/open/floor/almayer{dir=4;icon_state="plating_striped";} : /turf/open/floor/almayer/plating_striped/east -/turf/open/floor/almayer{dir=4;icon_state="red";} : /turf/open/floor/almayer/red/east -/turf/open/floor/almayer{dir=4;icon_state="redcorner";} : /turf/open/floor/almayer/redcorner/east -/turf/open/floor/almayer{dir=4;icon_state="silver";} : /turf/open/floor/almayer/silver/east -/turf/open/floor/almayer{dir=4;icon_state="silvercorner";} : /turf/open/floor/almayer/silvercorner/east -/turf/open/floor/almayer{dir=4;icon_state="sterile_green_corner";} : /turf/open/floor/almayer/sterile_green_corner/east -/turf/open/floor/almayer{dir=4;icon_state="sterile_green_side";} : /turf/open/floor/almayer/sterile_green_side/east -/turf/open/floor/almayer{dir=5;icon_state="blue";} : /turf/open/floor/almayer/blue/northeast -/turf/open/floor/almayer{dir=5;icon_state="emerald";} : /turf/open/floor/almayer/emerald/northeast -/turf/open/floor/almayer{dir=5;icon_state="green";} : /turf/open/floor/almayer/green/northeast -/turf/open/floor/almayer{dir=5;icon_state="orange";} : /turf/open/floor/almayer/orange/northeast -/turf/open/floor/almayer{dir=5;icon_state="plating";} : /turf/open/floor/almayer/plating/northeast -/turf/open/floor/almayer{dir=5;icon_state="red";} : /turf/open/floor/almayer/red/northeast -/turf/open/floor/almayer{dir=5;icon_state="silver";} : /turf/open/floor/almayer/silver/northeast -/turf/open/floor/almayer{dir=5;icon_state="sterile_green_side";} : /turf/open/floor/almayer/sterile_green_side/northeast -/turf/open/floor/almayer{dir=6;icon_state="blue";} : /turf/open/floor/almayer/blue/southeast -/turf/open/floor/almayer{dir=6;icon_state="emerald";} : /turf/open/floor/almayer/emerald/southeast -/turf/open/floor/almayer{dir=6;icon_state="green";} : /turf/open/floor/almayer/green/southeast -/turf/open/floor/almayer{dir=6;icon_state="orange";} : /turf/open/floor/almayer/orange/southeast -/turf/open/floor/almayer{dir=6;icon_state="red";} : /turf/open/floor/almayer/red/southeast -/turf/open/floor/almayer{dir=6;icon_state="silver";} : /turf/open/floor/almayer/silver/southeast -/turf/open/floor/almayer{dir=6;icon_state="sterile_green_side";} : /turf/open/floor/almayer/sterile_green_side/southeast -/turf/open/floor/almayer{dir=8;icon_state="blue";} : /turf/open/floor/almayer/blue/west -/turf/open/floor/almayer{dir=8;icon_state="bluecorner";} : /turf/open/floor/almayer/bluecorner/west -/turf/open/floor/almayer{dir=8;icon_state="cargo_arrow";} : /turf/open/floor/almayer/cargo_arrow/west -/turf/open/floor/almayer{dir=8;icon_state="emerald";} : /turf/open/floor/almayer/emerald/west -/turf/open/floor/almayer{dir=8;icon_state="emeraldcorner";} : /turf/open/floor/almayer/emeraldcorner/west -/turf/open/floor/almayer{dir=8;icon_state="green";} : /turf/open/floor/almayer/green/west -/turf/open/floor/almayer{dir=8;icon_state="greencorner";} : /turf/open/floor/almayer/greencorner/west -/turf/open/floor/almayer{dir=8;icon_state="orange";} : /turf/open/floor/almayer/orange/west -/turf/open/floor/almayer{dir=8;icon_state="orangecorner";} : /turf/open/floor/almayer/orangecorner/west -/turf/open/floor/almayer{dir=8;icon_state="plating_striped";} : /turf/open/floor/almayer/plating_striped/west -/turf/open/floor/almayer{dir=8;icon_state="red";} : /turf/open/floor/almayer/red/west -/turf/open/floor/almayer{dir=8;icon_state="redcorner";} : /turf/open/floor/almayer/redcorner/west -/turf/open/floor/almayer{dir=8;icon_state="silver";} : /turf/open/floor/almayer/silver/west -/turf/open/floor/almayer{dir=8;icon_state="silvercorner";} : /turf/open/floor/almayer/silvercorner/west -/turf/open/floor/almayer{dir=8;icon_state="sterile_green_corner";} : /turf/open/floor/almayer/sterile_green_corner/west -/turf/open/floor/almayer{dir=8;icon_state="sterile_green_side";} : /turf/open/floor/almayer/sterile_green_side/west -/turf/open/floor/almayer{dir=9;icon_state="blue";} : /turf/open/floor/almayer/blue/northwest -/turf/open/floor/almayer{dir=9;icon_state="emerald";} : /turf/open/floor/almayer/emerald/northwest -/turf/open/floor/almayer{dir=9;icon_state="green";} : /turf/open/floor/almayer/green/northwest -/turf/open/floor/almayer{dir=9;icon_state="orange";} : /turf/open/floor/almayer/orange/northwest -/turf/open/floor/almayer{dir=9;icon_state="red";} : /turf/open/floor/almayer/red/northwest -/turf/open/floor/almayer{dir=9;icon_state="silver";} : /turf/open/floor/almayer/silver/northwest -/turf/open/floor/almayer{dir=9;icon_state="sterile_green_side";} : /turf/open/floor/almayer/sterile_green_side/northwest -/turf/open/floor/almayer{icon_state="ai_floors";} : /turf/open/floor/almayer/ai_floors -/turf/open/floor/almayer{icon_state="blue";} : /turf/open/floor/almayer/blue -/turf/open/floor/almayer{icon_state="bluecorner";} : /turf/open/floor/almayer/bluecorner -/turf/open/floor/almayer{icon_state="bluefull";} : /turf/open/floor/almayer/bluefull -/turf/open/floor/almayer{icon_state="cargo";} : /turf/open/floor/almayer/cargo -/turf/open/floor/almayer{icon_state="cargo_arrow";} : /turf/open/floor/almayer/cargo_arrow -/turf/open/floor/almayer{icon_state="dark_sterile";} : /turf/open/floor/almayer/dark_sterile -/turf/open/floor/almayer{icon_state="emerald";} : /turf/open/floor/almayer/emerald -/turf/open/floor/almayer{icon_state="emeraldcorner";} : /turf/open/floor/almayer/emeraldcorner -/turf/open/floor/almayer{icon_state="emeraldfull";} : /turf/open/floor/almayer/emeraldfull -/turf/open/floor/almayer{icon_state="floor";} : /turf/open/floor/almayer/floor -/turf/open/floor/almayer{icon_state="green";} : /turf/open/floor/almayer/green -/turf/open/floor/almayer{icon_state="greencorner";} : /turf/open/floor/almayer/greencorner -/turf/open/floor/almayer{icon_state="greenfull";} : /turf/open/floor/almayer/greenfull -/turf/open/floor/almayer{icon_state="mono";} : /turf/open/floor/almayer/mono -/turf/open/floor/almayer{icon_state="orange";} : /turf/open/floor/almayer/orange -/turf/open/floor/almayer{icon_state="orangecorner";} : /turf/open/floor/almayer/orangecorner -/turf/open/floor/almayer{icon_state="orangefull";} : /turf/open/floor/almayer/orangefull -/turf/open/floor/almayer{icon_state="plate";} : /turf/open/floor/almayer/plate -/turf/open/floor/almayer{icon_state="plating";} : /turf/open/floor/almayer/plating -/turf/open/floor/almayer{icon_state="plating_striped";} : /turf/open/floor/almayer/plating_striped -/turf/open/floor/almayer{icon_state="red";} : /turf/open/floor/almayer/red -/turf/open/floor/almayer{icon_state="redcorner";} : /turf/open/floor/almayer/redcorner -/turf/open/floor/almayer{icon_state="redfull";} : /turf/open/floor/almayer/redfull -/turf/open/floor/almayer{icon_state="silver";} : /turf/open/floor/almayer/silver -/turf/open/floor/almayer{icon_state="silvercorner";} : /turf/open/floor/almayer/silvercorner -/turf/open/floor/almayer{icon_state="silverfull";} : /turf/open/floor/almayer/silverfull -/turf/open/floor/almayer{icon_state="sterile";} : /turf/open/floor/almayer/sterile -/turf/open/floor/almayer{icon_state="sterile_green";} : /turf/open/floor/almayer/sterile_green -/turf/open/floor/almayer{icon_state="sterile_green_corner";} : /turf/open/floor/almayer/sterile_green_corner -/turf/open/floor/almayer{icon_state="sterile_green_side";} : /turf/open/floor/almayer/sterile_green_side -/turf/open/floor/almayer{icon_state="tcomms";} : /turf/open/floor/almayer/tcomms -/turf/open/floor/almayer{icon_state="test_floor4";} : /turf/open/floor/almayer/test_floor4 -/turf/open/floor/almayer{icon_state="test_floor5";} : /turf/open/floor/almayer/test_floor5 -/turf/open/floor/bluegrid{icon_state="bcircuitoff";} : /turf/open/floor/bluegrid/bcircuitoff -/turf/open/floor/bluegrid{icon_state="damaged3";} : /turf/open/floor/bluegrid/damaged3 -/turf/open/floor/bluegrid{icon_state="damaged4";} : /turf/open/floor/bluegrid/damaged4 -/turf/open/floor/bluegrid{icon_state="damaged5";} : /turf/open/floor/bluegrid/damaged5 -/turf/open/floor/carpet/edge{dir=10;} : /turf/open/floor/carpet/edge/southwest -/turf/open/floor/carpet/edge{dir=1;} : /turf/open/floor/carpet/edge/north -/turf/open/floor/carpet/edge{dir=4;} : /turf/open/floor/carpet/edge/east -/turf/open/floor/carpet/edge{dir=5;} : /turf/open/floor/carpet/edge/northeast -/turf/open/floor/carpet/edge{dir=6;} : /turf/open/floor/carpet/edge/southeast -/turf/open/floor/carpet/edge{dir=8;} : /turf/open/floor/carpet/edge/west -/turf/open/floor/carpet/edge{dir=9;} : /turf/open/floor/carpet/edge/northwest -/turf/open/floor/carpet{desc="Plush, waterproof carpet. Apparently it's fire resistant while remaining quite soft.";name="\improper carpet";} : /turf/open/floor/carpet -/turf/open/floor/carpet{icon_state="bcarpet01";} : /turf/open/floor/carpet/bcarpet01 -/turf/open/floor/carpet{icon_state="bcarpet02";} : /turf/open/floor/carpet/bcarpet02 -/turf/open/floor/carpet{icon_state="bcarpet03";} : /turf/open/floor/carpet/bcarpet03 -/turf/open/floor/carpet{icon_state="bcarpet07";} : /turf/open/floor/carpet/bcarpet07 -/turf/open/floor/carpet{icon_state="bcarpet08";} : /turf/open/floor/carpet/bcarpet08 -/turf/open/floor/carpet{icon_state="bcarpet09";} : /turf/open/floor/carpet/bcarpet09 -/turf/open/floor/carpet{name="\improper carpet";} : /turf/open/floor/carpet -/turf/open/floor/coagulation{icon_state="0,0";} : /turf/open/floor/coagulation/icon0_0 -/turf/open/floor/coagulation{icon_state="0,4";} : /turf/open/floor/coagulation/icon0_4 -/turf/open/floor/coagulation{icon_state="0,5";} : /turf/open/floor/coagulation/icon0_5 -/turf/open/floor/coagulation{icon_state="0,8";} : /turf/open/floor/coagulation/icon0_8 -/turf/open/floor/coagulation{icon_state="1,1";} : /turf/open/floor/coagulation/icon1_1 -/turf/open/floor/coagulation{icon_state="1,7";} : /turf/open/floor/coagulation/icon1_7 -/turf/open/floor/coagulation{icon_state="2,0";} : /turf/open/floor/coagulation/icon2_0 -/turf/open/floor/coagulation{icon_state="4,8";} : /turf/open/floor/coagulation/icon4_8 -/turf/open/floor/coagulation{icon_state="5,8";} : /turf/open/floor/coagulation/icon5_8 -/turf/open/floor/coagulation{icon_state="6,8";} : /turf/open/floor/coagulation/icon6_8 -/turf/open/floor/coagulation{icon_state="6,8-2";} : /turf/open/floor/coagulation/icon6_8_2 -/turf/open/floor/coagulation{icon_state="7,0";} : /turf/open/floor/coagulation/icon7_0 -/turf/open/floor/coagulation{icon_state="7,1";} : /turf/open/floor/coagulation/icon7_1 -/turf/open/floor/coagulation{icon_state="7,7";} : /turf/open/floor/coagulation/icon7_7 -/turf/open/floor/coagulation{icon_state="7,7-2";} : /turf/open/floor/coagulation/icon7_7_2 -/turf/open/floor/coagulation{icon_state="7,8";} : /turf/open/floor/coagulation/icon7_8 -/turf/open/floor/coagulation{icon_state="7,8-2";} : /turf/open/floor/coagulation/icon7_8_2 -/turf/open/floor/coagulation{icon_state="8,0";} : /turf/open/floor/coagulation/icon8_0 -/turf/open/floor/coagulation{icon_state="8,3";} : /turf/open/floor/coagulation/icon8_3 -/turf/open/floor/coagulation{icon_state="8,4";} : /turf/open/floor/coagulation/icon8_4 -/turf/open/floor/coagulation{icon_state="8,6";} : /turf/open/floor/coagulation/icon8_6 -/turf/open/floor/coagulation{icon_state="8,7";} : /turf/open/floor/coagulation/icon8_7 -/turf/open/floor/coagulation{icon_state="8,7-2";} : /turf/open/floor/coagulation/icon8_7_2 -/turf/open/floor/coagulation{icon_state="8,8";} : /turf/open/floor/coagulation/icon8_8 -/turf/open/floor/corsat{dir=10;icon_state="blue";} : /turf/open/floor/corsat/blue/southwest -/turf/open/floor/corsat{dir=10;icon_state="bluegrey";} : /turf/open/floor/corsat/bluegrey/southwest -/turf/open/floor/corsat{dir=10;icon_state="brown";} : /turf/open/floor/corsat/brown/southwest -/turf/open/floor/corsat{dir=10;icon_state="corsat_teleporter_static";} : /turf/open/floor/corsat/corsat_teleporter_static/southwest -/turf/open/floor/corsat{dir=10;icon_state="darkgreen";} : /turf/open/floor/corsat/darkgreen/southwest -/turf/open/floor/corsat{dir=10;icon_state="green";} : /turf/open/floor/corsat/green/southwest -/turf/open/floor/corsat{dir=10;icon_state="greenwhite";} : /turf/open/floor/corsat/greenwhite/southwest -/turf/open/floor/corsat{dir=10;icon_state="purple";} : /turf/open/floor/corsat/purple/southwest -/turf/open/floor/corsat{dir=10;icon_state="purplewhite";} : /turf/open/floor/corsat/purplewhite/southwest -/turf/open/floor/corsat{dir=10;icon_state="red";} : /turf/open/floor/corsat/red/southwest -/turf/open/floor/corsat{dir=10;icon_state="tcomms";} : /turf/open/floor/corsat/tcomms/southwest -/turf/open/floor/corsat{dir=10;icon_state="white";} : /turf/open/floor/corsat/white/southwest -/turf/open/floor/corsat{dir=10;icon_state="whitebluefull";} : /turf/open/floor/corsat/whitebluefull/southwest -/turf/open/floor/corsat{dir=10;icon_state="whitetan";} : /turf/open/floor/corsat/whitetan/southwest -/turf/open/floor/corsat{dir=10;icon_state="yellow";} : /turf/open/floor/corsat/yellow/southwest -/turf/open/floor/corsat{dir=1;icon_state="blue";} : /turf/open/floor/corsat/blue/north -/turf/open/floor/corsat{dir=1;icon_state="bluecorner";} : /turf/open/floor/corsat/bluecorner/north -/turf/open/floor/corsat{dir=1;icon_state="bluegrey";} : /turf/open/floor/corsat/bluegrey/north -/turf/open/floor/corsat{dir=1;icon_state="bluegreycorner";} : /turf/open/floor/corsat/bluegreycorner/north -/turf/open/floor/corsat{dir=1;icon_state="brown";} : /turf/open/floor/corsat/brown/north -/turf/open/floor/corsat{dir=1;icon_state="browncorner";} : /turf/open/floor/corsat/browncorner/north -/turf/open/floor/corsat{dir=1;icon_state="darkgreen";} : /turf/open/floor/corsat/darkgreen/north -/turf/open/floor/corsat{dir=1;icon_state="darkgreencorner";} : /turf/open/floor/corsat/darkgreencorner/north -/turf/open/floor/corsat{dir=1;icon_state="green";} : /turf/open/floor/corsat/green/north -/turf/open/floor/corsat{dir=1;icon_state="greencorner";} : /turf/open/floor/corsat/greencorner/north -/turf/open/floor/corsat{dir=1;icon_state="greenwhite";} : /turf/open/floor/corsat/greenwhite/north -/turf/open/floor/corsat{dir=1;icon_state="greenwhitecorner";} : /turf/open/floor/corsat/greenwhitecorner/north -/turf/open/floor/corsat{dir=1;icon_state="purple";} : /turf/open/floor/corsat/purple/north -/turf/open/floor/corsat{dir=1;icon_state="purplecorner";} : /turf/open/floor/corsat/purplecorner/north -/turf/open/floor/corsat{dir=1;icon_state="purplewhite";} : /turf/open/floor/corsat/purplewhite/north -/turf/open/floor/corsat{dir=1;icon_state="purplewhitecorner";} : /turf/open/floor/corsat/purplewhitecorner/north -/turf/open/floor/corsat{dir=1;icon_state="red";} : /turf/open/floor/corsat/red/north -/turf/open/floor/corsat{dir=1;icon_state="redcorner";} : /turf/open/floor/corsat/redcorner/north -/turf/open/floor/corsat{dir=1;icon_state="squareswood";} : /turf/open/floor/corsat/squareswood/north -/turf/open/floor/corsat{dir=1;icon_state="tan";} : /turf/open/floor/corsat/tan/north -/turf/open/floor/corsat{dir=1;icon_state="white";} : /turf/open/floor/corsat/white/north -/turf/open/floor/corsat{dir=1;icon_state="whitecorner";} : /turf/open/floor/corsat/whitecorner/north -/turf/open/floor/corsat{dir=1;icon_state="whitetan";} : /turf/open/floor/corsat/whitetan/north -/turf/open/floor/corsat{dir=1;icon_state="whitetancorner";} : /turf/open/floor/corsat/whitetancorner/north -/turf/open/floor/corsat{dir=1;icon_state="yellow";} : /turf/open/floor/corsat/yellow/north -/turf/open/floor/corsat{dir=1;icon_state="yellowcorner";} : /turf/open/floor/corsat/yellowcorner/north -/turf/open/floor/corsat{dir=4;icon_state="blue";} : /turf/open/floor/corsat/blue/east -/turf/open/floor/corsat{dir=4;icon_state="bluecorner";} : /turf/open/floor/corsat/bluecorner/east -/turf/open/floor/corsat{dir=4;icon_state="bluegrey";} : /turf/open/floor/corsat/bluegrey/east -/turf/open/floor/corsat{dir=4;icon_state="bluegreycorner";} : /turf/open/floor/corsat/bluegreycorner/east -/turf/open/floor/corsat{dir=4;icon_state="brown";} : /turf/open/floor/corsat/brown/east -/turf/open/floor/corsat{dir=4;icon_state="browncorner";} : /turf/open/floor/corsat/browncorner/east -/turf/open/floor/corsat{dir=4;icon_state="darkgreen";} : /turf/open/floor/corsat/darkgreen/east -/turf/open/floor/corsat{dir=4;icon_state="darkgreencorner";} : /turf/open/floor/corsat/darkgreencorner/east -/turf/open/floor/corsat{dir=4;icon_state="green";} : /turf/open/floor/corsat/green/east -/turf/open/floor/corsat{dir=4;icon_state="greencorner";} : /turf/open/floor/corsat/greencorner/east -/turf/open/floor/corsat{dir=4;icon_state="greenwhite";} : /turf/open/floor/corsat/greenwhite/east -/turf/open/floor/corsat{dir=4;icon_state="greenwhitecorner";} : /turf/open/floor/corsat/greenwhitecorner/east -/turf/open/floor/corsat{dir=4;icon_state="purple";} : /turf/open/floor/corsat/purple/east -/turf/open/floor/corsat{dir=4;icon_state="purplecorner";} : /turf/open/floor/corsat/purplecorner/east -/turf/open/floor/corsat{dir=4;icon_state="purplewhite";} : /turf/open/floor/corsat/purplewhite/east -/turf/open/floor/corsat{dir=4;icon_state="purplewhitecorner";} : /turf/open/floor/corsat/purplewhitecorner/east -/turf/open/floor/corsat{dir=4;icon_state="red";} : /turf/open/floor/corsat/red/east -/turf/open/floor/corsat{dir=4;icon_state="redcorner";} : /turf/open/floor/corsat/redcorner/east -/turf/open/floor/corsat{dir=4;icon_state="white";} : /turf/open/floor/corsat/white/east -/turf/open/floor/corsat{dir=4;icon_state="whitecorner";} : /turf/open/floor/corsat/whitecorner/east -/turf/open/floor/corsat{dir=4;icon_state="whitetan";} : /turf/open/floor/corsat/whitetan/east -/turf/open/floor/corsat{dir=4;icon_state="whitetancorner";} : /turf/open/floor/corsat/whitetancorner/east -/turf/open/floor/corsat{dir=4;icon_state="yellow";} : /turf/open/floor/corsat/yellow/east -/turf/open/floor/corsat{dir=4;icon_state="yellowcorner";} : /turf/open/floor/corsat/yellowcorner/east -/turf/open/floor/corsat{dir=5;icon_state="blue";} : /turf/open/floor/corsat/blue/northeast -/turf/open/floor/corsat{dir=5;icon_state="bluegrey";} : /turf/open/floor/corsat/bluegrey/northeast -/turf/open/floor/corsat{dir=5;icon_state="brown";} : /turf/open/floor/corsat/brown/northeast -/turf/open/floor/corsat{dir=5;icon_state="darkgreen";} : /turf/open/floor/corsat/darkgreen/northeast -/turf/open/floor/corsat{dir=5;icon_state="green";} : /turf/open/floor/corsat/green/northeast -/turf/open/floor/corsat{dir=5;icon_state="greenwhite";} : /turf/open/floor/corsat/greenwhite/northeast -/turf/open/floor/corsat{dir=5;icon_state="purple";} : /turf/open/floor/corsat/purple/northeast -/turf/open/floor/corsat{dir=5;icon_state="purplewhite";} : /turf/open/floor/corsat/purplewhite/northeast -/turf/open/floor/corsat{dir=5;icon_state="red";} : /turf/open/floor/corsat/red/northeast -/turf/open/floor/corsat{dir=5;icon_state="white";} : /turf/open/floor/corsat/white/northeast -/turf/open/floor/corsat{dir=5;icon_state="whitetan";} : /turf/open/floor/corsat/whitetan/northeast -/turf/open/floor/corsat{dir=5;icon_state="yellow";} : /turf/open/floor/corsat/yellow/northeast -/turf/open/floor/corsat{dir=6;icon_state="blue";} : /turf/open/floor/corsat/blue/southeast -/turf/open/floor/corsat{dir=6;icon_state="bluegrey";} : /turf/open/floor/corsat/bluegrey/southeast -/turf/open/floor/corsat{dir=6;icon_state="brown";} : /turf/open/floor/corsat/brown/southeast -/turf/open/floor/corsat{dir=6;icon_state="darkgreen";} : /turf/open/floor/corsat/darkgreen/southeast -/turf/open/floor/corsat{dir=6;icon_state="green";} : /turf/open/floor/corsat/green/southeast -/turf/open/floor/corsat{dir=6;icon_state="greenwhite";} : /turf/open/floor/corsat/greenwhite/southeast -/turf/open/floor/corsat{dir=6;icon_state="purple";} : /turf/open/floor/corsat/purple/southeast -/turf/open/floor/corsat{dir=6;icon_state="purplewhite";} : /turf/open/floor/corsat/purplewhite/southeast -/turf/open/floor/corsat{dir=6;icon_state="red";} : /turf/open/floor/corsat/red/southeast -/turf/open/floor/corsat{dir=6;icon_state="white";} : /turf/open/floor/corsat/white/southeast -/turf/open/floor/corsat{dir=6;icon_state="whitetan";} : /turf/open/floor/corsat/whitetan/southeast -/turf/open/floor/corsat{dir=6;icon_state="yellow";} : /turf/open/floor/corsat/yellow/southeast -/turf/open/floor/corsat{dir=8;icon_state="blue";} : /turf/open/floor/corsat/blue/west -/turf/open/floor/corsat{dir=8;icon_state="bluecorner";} : /turf/open/floor/corsat/bluecorner/west -/turf/open/floor/corsat{dir=8;icon_state="bluegrey";} : /turf/open/floor/corsat/bluegrey/west -/turf/open/floor/corsat{dir=8;icon_state="bluegreycorner";} : /turf/open/floor/corsat/bluegreycorner/west -/turf/open/floor/corsat{dir=8;icon_state="brown";} : /turf/open/floor/corsat/brown/west -/turf/open/floor/corsat{dir=8;icon_state="browncorner";} : /turf/open/floor/corsat/browncorner/west -/turf/open/floor/corsat{dir=8;icon_state="darkgreen";} : /turf/open/floor/corsat/darkgreen/west -/turf/open/floor/corsat{dir=8;icon_state="darkgreencorner";} : /turf/open/floor/corsat/darkgreencorner/west -/turf/open/floor/corsat{dir=8;icon_state="green";} : /turf/open/floor/corsat/green/west -/turf/open/floor/corsat{dir=8;icon_state="greencorner";} : /turf/open/floor/corsat/greencorner/west -/turf/open/floor/corsat{dir=8;icon_state="greenwhite";} : /turf/open/floor/corsat/greenwhite/west -/turf/open/floor/corsat{dir=8;icon_state="greenwhitecorner";} : /turf/open/floor/corsat/greenwhitecorner/west -/turf/open/floor/corsat{dir=8;icon_state="purple";} : /turf/open/floor/corsat/purple/west -/turf/open/floor/corsat{dir=8;icon_state="purplecorner";} : /turf/open/floor/corsat/purplecorner/west -/turf/open/floor/corsat{dir=8;icon_state="purplewhite";} : /turf/open/floor/corsat/purplewhite/west -/turf/open/floor/corsat{dir=8;icon_state="purplewhitecorner";} : /turf/open/floor/corsat/purplewhitecorner/west -/turf/open/floor/corsat{dir=8;icon_state="red";} : /turf/open/floor/corsat/red/west -/turf/open/floor/corsat{dir=8;icon_state="redcorner";} : /turf/open/floor/corsat/redcorner/west -/turf/open/floor/corsat{dir=8;icon_state="white";} : /turf/open/floor/corsat/white/west -/turf/open/floor/corsat{dir=8;icon_state="whitecorner";} : /turf/open/floor/corsat/whitecorner/west -/turf/open/floor/corsat{dir=8;icon_state="whitetan";} : /turf/open/floor/corsat/whitetan/west -/turf/open/floor/corsat{dir=8;icon_state="whitetancorner";} : /turf/open/floor/corsat/whitetancorner/west -/turf/open/floor/corsat{dir=8;icon_state="yellow";} : /turf/open/floor/corsat/yellow/west -/turf/open/floor/corsat{dir=8;icon_state="yellowcorner";} : /turf/open/floor/corsat/yellowcorner/west -/turf/open/floor/corsat{dir=9;icon_state="blue";} : /turf/open/floor/corsat/blue/northwest -/turf/open/floor/corsat{dir=9;icon_state="bluegrey";} : /turf/open/floor/corsat/bluegrey/northwest -/turf/open/floor/corsat{dir=9;icon_state="brown";} : /turf/open/floor/corsat/brown/northwest -/turf/open/floor/corsat{dir=9;icon_state="darkgreen";} : /turf/open/floor/corsat/darkgreen/northwest -/turf/open/floor/corsat{dir=9;icon_state="green";} : /turf/open/floor/corsat/green/northwest -/turf/open/floor/corsat{dir=9;icon_state="greenwhite";} : /turf/open/floor/corsat/greenwhite/northwest -/turf/open/floor/corsat{dir=9;icon_state="purple";} : /turf/open/floor/corsat/purple/northwest -/turf/open/floor/corsat{dir=9;icon_state="purplewhite";} : /turf/open/floor/corsat/purplewhite/northwest -/turf/open/floor/corsat{dir=9;icon_state="red";} : /turf/open/floor/corsat/red/northwest -/turf/open/floor/corsat{dir=9;icon_state="white";} : /turf/open/floor/corsat/white/northwest -/turf/open/floor/corsat{dir=9;icon_state="whitetan";} : /turf/open/floor/corsat/whitetan/northwest -/turf/open/floor/corsat{dir=9;icon_state="yellow";} : /turf/open/floor/corsat/yellow/northwest -/turf/open/floor/corsat{icon_state="arrow_east";} : /turf/open/floor/corsat/arrow_east -/turf/open/floor/corsat{icon_state="arrow_north";} : /turf/open/floor/corsat/arrow_north -/turf/open/floor/corsat{icon_state="arrow_south";} : /turf/open/floor/corsat/arrow_south -/turf/open/floor/corsat{icon_state="arrow_west";} : /turf/open/floor/corsat/arrow_west -/turf/open/floor/corsat{icon_state="blue";} : /turf/open/floor/corsat/blue -/turf/open/floor/corsat{icon_state="bluecorner";} : /turf/open/floor/corsat/bluecorner -/turf/open/floor/corsat{icon_state="bluegrey";} : /turf/open/floor/corsat/bluegrey -/turf/open/floor/corsat{icon_state="bluegreycorner";} : /turf/open/floor/corsat/bluegreycorner -/turf/open/floor/corsat{icon_state="brown";} : /turf/open/floor/corsat/brown -/turf/open/floor/corsat{icon_state="browncorner";} : /turf/open/floor/corsat/browncorner -/turf/open/floor/corsat{icon_state="cargo";} : /turf/open/floor/corsat/cargo -/turf/open/floor/corsat{icon_state="damaged1";} : /turf/open/floor/corsat/damaged1 -/turf/open/floor/corsat{icon_state="darkgreen";} : /turf/open/floor/corsat/darkgreen -/turf/open/floor/corsat{icon_state="darkgreencorner";} : /turf/open/floor/corsat/darkgreencorner -/turf/open/floor/corsat{icon_state="gamma";} : /turf/open/floor/corsat/gamma -/turf/open/floor/corsat{icon_state="green";} : /turf/open/floor/corsat/green -/turf/open/floor/corsat{icon_state="greencorner";} : /turf/open/floor/corsat/greencorner -/turf/open/floor/corsat{icon_state="greenwhite";} : /turf/open/floor/corsat/greenwhite -/turf/open/floor/corsat{icon_state="greenwhitecorner";} : /turf/open/floor/corsat/greenwhitecorner -/turf/open/floor/corsat{icon_state="lightplate";} : /turf/open/floor/corsat/lightplate -/turf/open/floor/corsat{icon_state="marked";} : /turf/open/floor/corsat/marked -/turf/open/floor/corsat{icon_state="officesquares";} : /turf/open/floor/corsat/officesquares -/turf/open/floor/corsat{icon_state="omega";} : /turf/open/floor/corsat/omega -/turf/open/floor/corsat{icon_state="plate";} : /turf/open/floor/corsat/plate -/turf/open/floor/corsat{icon_state="purple";} : /turf/open/floor/corsat/purple -/turf/open/floor/corsat{icon_state="purplecorner";} : /turf/open/floor/corsat/purplecorner -/turf/open/floor/corsat{icon_state="purplewhite";} : /turf/open/floor/corsat/purplewhite -/turf/open/floor/corsat{icon_state="purplewhitecorner";} : /turf/open/floor/corsat/purplewhitecorner -/turf/open/floor/corsat{icon_state="red";dir=10;} : /turf/open/floor/corsat/red/southwest -/turf/open/floor/corsat{icon_state="red";dir=1;} : /turf/open/floor/corsat/red/north -/turf/open/floor/corsat{icon_state="red";dir=4;} : /turf/open/floor/corsat/red/east -/turf/open/floor/corsat{icon_state="red";dir=5;} : /turf/open/floor/corsat/red/northeast -/turf/open/floor/corsat{icon_state="red";dir=6;} : /turf/open/floor/corsat/red/southeast -/turf/open/floor/corsat{icon_state="red";dir=8;} : /turf/open/floor/corsat/red/west -/turf/open/floor/corsat{icon_state="red";dir=9;} : /turf/open/floor/corsat/red/northwest -/turf/open/floor/corsat{icon_state="red";} : /turf/open/floor/corsat/red -/turf/open/floor/corsat{icon_state="redcorner";dir=1;} : /turf/open/floor/corsat/redcorner/north -/turf/open/floor/corsat{icon_state="redcorner";dir=4;} : /turf/open/floor/corsat/redcorner/east -/turf/open/floor/corsat{icon_state="redcorner";} : /turf/open/floor/corsat/redcorner -/turf/open/floor/corsat{icon_state="retrosquares";} : /turf/open/floor/corsat/retrosquares -/turf/open/floor/corsat{icon_state="retrosquareslight";} : /turf/open/floor/corsat/retrosquareslight -/turf/open/floor/corsat{icon_state="sigma";} : /turf/open/floor/corsat/sigma -/turf/open/floor/corsat{icon_state="spiralplate";} : /turf/open/floor/corsat/spiralplate -/turf/open/floor/corsat{icon_state="spiralwoodalt";} : /turf/open/floor/corsat/spiralwoodalt -/turf/open/floor/corsat{icon_state="squares";} : /turf/open/floor/corsat/squares -/turf/open/floor/corsat{icon_state="sterileplate";} : /turf/open/floor/corsat/sterileplate -/turf/open/floor/corsat{icon_state="theta";} : /turf/open/floor/corsat/theta -/turf/open/floor/corsat{icon_state="white";} : /turf/open/floor/corsat/white -/turf/open/floor/corsat{icon_state="whitecorner";} : /turf/open/floor/corsat/whitecorner -/turf/open/floor/corsat{icon_state="whitetan";} : /turf/open/floor/corsat/whitetan -/turf/open/floor/corsat{icon_state="whitetancorner";} : /turf/open/floor/corsat/whitetancorner -/turf/open/floor/corsat{icon_state="yellow";dir=1;} : /turf/open/floor/corsat/yellow/north -/turf/open/floor/corsat{icon_state="yellow";dir=4;} : /turf/open/floor/corsat/yellow/east -/turf/open/floor/corsat{icon_state="yellow";} : /turf/open/floor/corsat/yellow -/turf/open/floor/corsat{icon_state="yellowcorner";dir=4;} : /turf/open/floor/corsat/yellowcorner/east -/turf/open/floor/corsat{icon_state="yellowcorner";} : /turf/open/floor/corsat/yellowcorner -/turf/open/floor/engine{color="#AAAAAA";} : /turf/open/floor/engine/simulator_center -/turf/open/floor/filtrationside{dir=10;} : /turf/open/floor/filtrationside/southwest -/turf/open/floor/filtrationside{dir=1;} : /turf/open/floor/filtrationside/north -/turf/open/floor/filtrationside{dir=4;} : /turf/open/floor/filtrationside/east -/turf/open/floor/filtrationside{dir=5;} : /turf/open/floor/filtrationside/northeast -/turf/open/floor/filtrationside{dir=6;} : /turf/open/floor/filtrationside/southeast -/turf/open/floor/filtrationside{dir=8;} : /turf/open/floor/filtrationside/west -/turf/open/floor/filtrationside{dir=9;} : /turf/open/floor/filtrationside/northwest -/turf/open/floor/holofloor{dir=2;icon_state="cult";} : /turf/open/floor/holofloor/cult/south -/turf/open/floor/holofloor{icon_state="cult";} : /turf/open/floor/holofloor/cult -/turf/open/floor/icefloor{icon='icons/turf/shuttle.dmi';icon_state="floor6";} : /turf/open/floor/icefloor/shuttle_floor6 -/turf/open/floor/icefloor{icon='icons/turf/shuttle.dmi';icon_state="floor7";} : /turf/open/floor/icefloor/shuttle_floor7 -/turf/open/floor/icefloor{icon='icons/turf/shuttle.dmi';icon_state="vfloor";} : /turf/open/floor/icefloor/shuttle_vfloor -/turf/open/floor/icefloor{icon_state="ramptop";} : /turf/open/floor/icefloor/ramptop -/turf/open/floor/icefloor{icon_state="rockvault";} : /turf/open/floor/icefloor/rockvault -/turf/open/floor/kutjevo/colors/blue/edge{dir=4;} : /turf/open/floor/kutjevo/colors/blue/edge/east -/turf/open/floor/kutjevo/colors/blue/edge{dir=8;} : /turf/open/floor/kutjevo/colors/blue/edge/west -/turf/open/floor/kutjevo/colors/cyan/edge{dir=1;} : /turf/open/floor/kutjevo/colors/cyan/edge/north -/turf/open/floor/kutjevo/colors/cyan/edge{dir=4;} : /turf/open/floor/kutjevo/colors/cyan/edge/east -/turf/open/floor/kutjevo/colors/cyan/edge{dir=8;} : /turf/open/floor/kutjevo/colors/cyan/edge/west -/turf/open/floor/kutjevo/colors/cyan/inner_corner{dir=1;} : /turf/open/floor/kutjevo/colors/cyan/inner_corner/north -/turf/open/floor/kutjevo/colors/cyan/inner_corner{dir=4;} : /turf/open/floor/kutjevo/colors/cyan/inner_corner/east -/turf/open/floor/kutjevo/colors/cyan/inner_corner{dir=8;} : /turf/open/floor/kutjevo/colors/cyan/inner_corner/west -/turf/open/floor/kutjevo/colors/orange/edge{dir=10;} : /turf/open/floor/kutjevo/colors/orange/edge/southwest -/turf/open/floor/kutjevo/colors/orange/edge{dir=1;} : /turf/open/floor/kutjevo/colors/orange/edge/north -/turf/open/floor/kutjevo/colors/orange/edge{dir=4;} : /turf/open/floor/kutjevo/colors/orange/edge/east -/turf/open/floor/kutjevo/colors/orange/edge{dir=5;} : /turf/open/floor/kutjevo/colors/orange/edge/northeast -/turf/open/floor/kutjevo/colors/orange/edge{dir=6;} : /turf/open/floor/kutjevo/colors/orange/edge/southeast -/turf/open/floor/kutjevo/colors/orange/edge{dir=8;} : /turf/open/floor/kutjevo/colors/orange/edge/west -/turf/open/floor/kutjevo/colors/orange/edge{dir=9;} : /turf/open/floor/kutjevo/colors/orange/edge/northwest -/turf/open/floor/kutjevo/colors/orange/inner_corner{dir=1;} : /turf/open/floor/kutjevo/colors/orange/inner_corner/north -/turf/open/floor/kutjevo/colors/orange/inner_corner{dir=4;} : /turf/open/floor/kutjevo/colors/orange/inner_corner/east -/turf/open/floor/kutjevo/colors/orange/inner_corner{dir=8;} : /turf/open/floor/kutjevo/colors/orange/inner_corner/west -/turf/open/floor/kutjevo/colors/purple/edge{dir=1;} : /turf/open/floor/kutjevo/colors/purple/edge/north -/turf/open/floor/kutjevo/colors/purple/edge{dir=4;} : /turf/open/floor/kutjevo/colors/purple/edge/east -/turf/open/floor/kutjevo/colors/purple/edge{dir=5;} : /turf/open/floor/kutjevo/colors/purple/edge/northeast -/turf/open/floor/kutjevo/colors/purple/edge{dir=8;} : /turf/open/floor/kutjevo/colors/purple/edge/west -/turf/open/floor/kutjevo/colors/purple/inner_corner{dir=1;} : /turf/open/floor/kutjevo/colors/purple/inner_corner/north -/turf/open/floor/kutjevo/colors/purple/inner_corner{dir=4;} : /turf/open/floor/kutjevo/colors/purple/inner_corner/east -/turf/open/floor/kutjevo/colors/purple/inner_corner{dir=8;} : /turf/open/floor/kutjevo/colors/purple/inner_corner/west -/turf/open/floor/kutjevo/multi_tiles{dir=10;} : /turf/open/floor/kutjevo/multi_tiles/southwest -/turf/open/floor/kutjevo/multi_tiles{dir=1;} : /turf/open/floor/kutjevo/multi_tiles/north -/turf/open/floor/kutjevo/multi_tiles{dir=4;} : /turf/open/floor/kutjevo/multi_tiles/east -/turf/open/floor/kutjevo/multi_tiles{dir=6;} : /turf/open/floor/kutjevo/multi_tiles/southeast -/turf/open/floor/kutjevo/multi_tiles{dir=8;} : /turf/open/floor/kutjevo/multi_tiles/west -/turf/open/floor/kutjevo/tan/alt_edge{dir=10;} : /turf/open/floor/kutjevo/tan/alt_edge/southwest -/turf/open/floor/kutjevo/tan/alt_edge{dir=1;} : /turf/open/floor/kutjevo/tan/alt_edge/north -/turf/open/floor/kutjevo/tan/alt_edge{dir=4;} : /turf/open/floor/kutjevo/tan/alt_edge/east -/turf/open/floor/kutjevo/tan/alt_edge{dir=5;} : /turf/open/floor/kutjevo/tan/alt_edge/northeast -/turf/open/floor/kutjevo/tan/alt_edge{dir=6;} : /turf/open/floor/kutjevo/tan/alt_edge/southeast -/turf/open/floor/kutjevo/tan/alt_edge{dir=8;} : /turf/open/floor/kutjevo/tan/alt_edge/west -/turf/open/floor/kutjevo/tan/alt_edge{dir=9;} : /turf/open/floor/kutjevo/tan/alt_edge/northwest -/turf/open/floor/kutjevo/tan/alt_inner_edge{dir=1;} : /turf/open/floor/kutjevo/tan/alt_inner_edge/north -/turf/open/floor/kutjevo/tan/alt_inner_edge{dir=4;} : /turf/open/floor/kutjevo/tan/alt_inner_edge/east -/turf/open/floor/kutjevo/tan/alt_inner_edge{dir=8;} : /turf/open/floor/kutjevo/tan/alt_inner_edge/west -/turf/open/floor/kutjevo/tan/grey_edge{dir=10;} : /turf/open/floor/kutjevo/tan/grey_edge/southwest -/turf/open/floor/kutjevo/tan/grey_edge{dir=1;} : /turf/open/floor/kutjevo/tan/grey_edge/north -/turf/open/floor/kutjevo/tan/grey_edge{dir=4;} : /turf/open/floor/kutjevo/tan/grey_edge/east -/turf/open/floor/kutjevo/tan/grey_edge{dir=5;} : /turf/open/floor/kutjevo/tan/grey_edge/northeast -/turf/open/floor/kutjevo/tan/grey_edge{dir=6;} : /turf/open/floor/kutjevo/tan/grey_edge/southeast -/turf/open/floor/kutjevo/tan/grey_edge{dir=8;} : /turf/open/floor/kutjevo/tan/grey_edge/west -/turf/open/floor/kutjevo/tan/grey_edge{dir=9;} : /turf/open/floor/kutjevo/tan/grey_edge/northwest -/turf/open/floor/kutjevo/tan/grey_inner_edge{dir=1;} : /turf/open/floor/kutjevo/tan/grey_inner_edge/north -/turf/open/floor/kutjevo/tan/grey_inner_edge{dir=4;} : /turf/open/floor/kutjevo/tan/grey_inner_edge/east -/turf/open/floor/kutjevo/tan/grey_inner_edge{dir=8;} : /turf/open/floor/kutjevo/tan/grey_inner_edge/west -/turf/open/floor/kutjevo/tan/multi_tiles{dir=1;} : /turf/open/floor/kutjevo/tan/multi_tiles/north -/turf/open/floor/kutjevo/tan/multi_tiles{dir=4;} : /turf/open/floor/kutjevo/tan/multi_tiles/east -/turf/open/floor/kutjevo/tan/multi_tiles{dir=6;} : /turf/open/floor/kutjevo/tan/multi_tiles/southeast -/turf/open/floor/kutjevo/tan/multi_tiles{dir=8;} : /turf/open/floor/kutjevo/tan/multi_tiles/west -/turf/open/floor/mech_bay_recharge_floor{name="Shuttle Landing Lights";} : /turf/open/floor/mech_bay_recharge_floor/shuttle_landing_lights -/turf/open/floor/plating/almayer{allow_construction=0;} : /turf/open/floor/plating/almayer/no_build -/turf/open/floor/plating/icefloor{dir=10;icon_state="warnplate";} : /turf/open/floor/plating/icefloor/warnplate/southwest -/turf/open/floor/plating/icefloor{dir=1;icon_state="warnplate";} : /turf/open/floor/plating/icefloor/warnplate/north -/turf/open/floor/plating/icefloor{dir=4;icon_state="warnplate";} : /turf/open/floor/plating/icefloor/warnplate/east -/turf/open/floor/plating/icefloor{dir=5;icon_state="warnplate";} : /turf/open/floor/plating/icefloor/warnplate/northeast -/turf/open/floor/plating/icefloor{dir=6;icon_state="warnplate";} : /turf/open/floor/plating/icefloor/warnplate/southeast -/turf/open/floor/plating/icefloor{dir=8;icon_state="warnplate";} : /turf/open/floor/plating/icefloor/warnplate/west -/turf/open/floor/plating/icefloor{dir=9;icon_state="warnplate";} : /turf/open/floor/plating/icefloor/warnplate/northwest -/turf/open/floor/plating/icefloor{icon_state="asteroidplating";} : /turf/open/floor/plating/icefloor/asteroidplating -/turf/open/floor/plating/icefloor{icon_state="warnplate";} : /turf/open/floor/plating/icefloor/warnplate -/turf/open/floor/plating/kutjevo{icon_state="panelscorched";} : /turf/open/floor/plating/kutjevo/panelscorched -/turf/open/floor/plating/kutjevo{icon_state="platingdmg1";} : /turf/open/floor/plating/kutjevo/platingdmg1 -/turf/open/floor/plating/kutjevo{icon_state="platingdmg3";} : /turf/open/floor/plating/kutjevo/platingdmg3 -/turf/open/floor/plating{burnt=1;dir=8;icon_state="platingdmg3";} : /turf/open/floor/plating/burnt_platingdmg3/west -/turf/open/floor/plating{dir=10;icon_state="asteroidwarning";} : /turf/open/floor/plating/asteroidwarning/southwest -/turf/open/floor/plating{dir=10;icon_state="warnplate";} : /turf/open/floor/plating/warnplate/southwest -/turf/open/floor/plating{dir=1;icon_state="asteroidfloor";} : /turf/open/floor/plating/asteroidfloor/north -/turf/open/floor/plating{dir=1;icon_state="asteroidwarning";} : /turf/open/floor/plating/asteroidwarning/north -/turf/open/floor/plating{dir=1;icon_state="warnplate";} : /turf/open/floor/plating/warnplate/north -/turf/open/floor/plating{dir=1;icon_state="warnplatecorner";} : /turf/open/floor/plating/warnplatecorner/north -/turf/open/floor/plating{dir=4;icon_state="asteroidwarning";} : /turf/open/floor/plating/asteroidwarning/east -/turf/open/floor/plating{dir=4;icon_state="warnplate";} : /turf/open/floor/plating/warnplate/east -/turf/open/floor/plating{dir=5;icon_state="asteroidwarning";} : /turf/open/floor/plating/asteroidwarning/northeast -/turf/open/floor/plating{dir=5;icon_state="warnplate";} : /turf/open/floor/plating/warnplate/northeast -/turf/open/floor/plating{dir=6;icon_state="asteroidwarning";} : /turf/open/floor/plating/asteroidwarning/southeast -/turf/open/floor/plating{dir=6;icon_state="warnplate";} : /turf/open/floor/plating/warnplate/southeast -/turf/open/floor/plating{dir=8;icon_state="asteroidwarning";} : /turf/open/floor/plating/asteroidwarning/west -/turf/open/floor/plating{dir=8;icon_state="platingdmg2";} : /turf/open/floor/plating/platingdmg2/west -/turf/open/floor/plating{dir=8;icon_state="platingdmg3";} : /turf/open/floor/plating/platingdmg3/west -/turf/open/floor/plating{dir=8;icon_state="warnplate";} : /turf/open/floor/plating/warnplate/west -/turf/open/floor/plating{dir=9;icon_state="asteroidwarning";} : /turf/open/floor/plating/asteroidwarning/northwest -/turf/open/floor/plating{dir=9;icon_state="warnplate";} : /turf/open/floor/plating/warnplate/northwest -/turf/open/floor/plating{icon_state="asteroidwarning";} : /turf/open/floor/plating/asteroidwarning -/turf/open/floor/plating{icon_state="panelscorched";} : /turf/open/floor/plating/panelscorched -/turf/open/floor/plating{icon_state="platebot";} : /turf/open/floor/plating/platebot -/turf/open/floor/plating{icon_state="platebotc";} : /turf/open/floor/plating/platebotc -/turf/open/floor/plating{icon_state="platingdmg1";} : /turf/open/floor/plating/platingdmg1 -/turf/open/floor/plating{icon_state="platingdmg2";} : /turf/open/floor/plating/platingdmg2 -/turf/open/floor/plating{icon_state="platingdmg3";} : /turf/open/floor/plating/platingdmg3 -/turf/open/floor/plating{icon_state="warnplate";} : /turf/open/floor/plating/warnplate -/turf/open/floor/plating{icon_state="wood";} : /turf/open/floor/plating/wood -/turf/open/floor/plating{icon_state="wood-broken2";} : /turf/open/floor/plating/wood_broken2 -/turf/open/floor/plating{icon_state="wood-broken3";} : /turf/open/floor/plating/wood_broken3 -/turf/open/floor/plating{icon_state="wood-broken4";} : /turf/open/floor/plating/wood_broken4 -/turf/open/floor/plating{icon_state="wood-broken5";} : /turf/open/floor/plating/wood_broken5 -/turf/open/floor/plating{icon_state="wood-broken6";} : /turf/open/floor/plating/wood_broken6 -/turf/open/floor/prison/chapel_carpet{dir=1;icon_state="doubleside";} : /turf/open/floor/prison/chapel_carpet/doubleside/north -/turf/open/floor/prison/chapel_carpet{icon_state="doubleside";} : /turf/open/floor/prison/chapel_carpet/doubleside -/turf/open/floor/prison{dir=10;icon_state="blue";} : /turf/open/floor/prison/blue/southwest -/turf/open/floor/prison{dir=10;icon_state="bright_clean";} : /turf/open/floor/prison/bright_clean/southwest -/turf/open/floor/prison{dir=10;icon_state="bright_clean2";} : /turf/open/floor/prison/bright_clean2/southwest -/turf/open/floor/prison{dir=10;icon_state="bright_clean_marked";} : /turf/open/floor/prison/bright_clean_marked/southwest -/turf/open/floor/prison{dir=10;icon_state="damaged1";} : /turf/open/floor/prison/damaged1/southwest -/turf/open/floor/prison{dir=10;icon_state="damaged2";} : /turf/open/floor/prison/damaged2/southwest -/turf/open/floor/prison{dir=10;icon_state="darkbrown2";} : /turf/open/floor/prison/darkbrown2/southwest -/turf/open/floor/prison{dir=10;icon_state="darkbrown3";} : /turf/open/floor/prison/darkbrown3/southwest -/turf/open/floor/prison{dir=10;icon_state="darkbrowncorners2";} : /turf/open/floor/prison/darkbrowncorners2/southwest -/turf/open/floor/prison{dir=10;icon_state="darkpurple2";} : /turf/open/floor/prison/darkpurple2/southwest -/turf/open/floor/prison{dir=10;icon_state="darkred2";} : /turf/open/floor/prison/darkred2/southwest -/turf/open/floor/prison{dir=10;icon_state="darkredcorners2";} : /turf/open/floor/prison/darkredcorners2/southwest -/turf/open/floor/prison{dir=10;icon_state="darkredfull2";} : /turf/open/floor/prison/darkredfull2/southwest -/turf/open/floor/prison{dir=10;icon_state="darkyellow2";} : /turf/open/floor/prison/darkyellow2/southwest -/turf/open/floor/prison{dir=10;icon_state="darkyellowcorners2";} : /turf/open/floor/prison/darkyellowcorners2/southwest -/turf/open/floor/prison{dir=10;icon_state="floor_marked";} : /turf/open/floor/prison/floor_marked/southwest -/turf/open/floor/prison{dir=10;icon_state="floor_plate";} : /turf/open/floor/prison/floor_plate/southwest -/turf/open/floor/prison{dir=10;icon_state="green";} : /turf/open/floor/prison/green/southwest -/turf/open/floor/prison{dir=10;icon_state="greenblue";} : /turf/open/floor/prison/greenblue/southwest -/turf/open/floor/prison{dir=10;icon_state="kitchen";} : /turf/open/floor/prison/kitchen/southwest -/turf/open/floor/prison{dir=10;icon_state="red";} : /turf/open/floor/prison/red/southwest -/turf/open/floor/prison{dir=10;icon_state="sterile_white";} : /turf/open/floor/prison/sterile_white/southwest -/turf/open/floor/prison{dir=10;icon_state="whitegreen";} : /turf/open/floor/prison/whitegreen/southwest -/turf/open/floor/prison{dir=10;icon_state="whitegreenfull";} : /turf/open/floor/prison/whitegreenfull/southwest -/turf/open/floor/prison{dir=10;icon_state="whitepurple";} : /turf/open/floor/prison/whitepurple/southwest -/turf/open/floor/prison{dir=10;icon_state="whitered";} : /turf/open/floor/prison/whitered/southwest -/turf/open/floor/prison{dir=10;icon_state="yellow";} : /turf/open/floor/prison/yellow/southwest -/turf/open/floor/prison{dir=10;icon_state="yellowfull";} : /turf/open/floor/prison/yellowfull/southwest -/turf/open/floor/prison{dir=10;} : /turf/open/floor/prison/southwest -/turf/open/floor/prison{dir=1;icon_state="blue";} : /turf/open/floor/prison/blue/north -/turf/open/floor/prison{dir=1;icon_state="blue_plate";} : /turf/open/floor/prison/blue_plate/north -/turf/open/floor/prison{dir=1;icon_state="bluecorner";} : /turf/open/floor/prison/bluecorner/north -/turf/open/floor/prison{dir=1;icon_state="cell_stripe";} : /turf/open/floor/prison/cell_stripe/north -/turf/open/floor/prison{dir=1;icon_state="darkbrown2";} : /turf/open/floor/prison/darkbrown2/north -/turf/open/floor/prison{dir=1;icon_state="darkbrown3";} : /turf/open/floor/prison/darkbrown3/north -/turf/open/floor/prison{dir=1;icon_state="darkbrowncorners2";} : /turf/open/floor/prison/darkbrowncorners2/north -/turf/open/floor/prison{dir=1;icon_state="darkbrowncorners3";} : /turf/open/floor/prison/darkbrowncorners3/north -/turf/open/floor/prison{dir=1;icon_state="darkpurple2";} : /turf/open/floor/prison/darkpurple2/north -/turf/open/floor/prison{dir=1;icon_state="darkpurplecorners2";} : /turf/open/floor/prison/darkpurplecorners2/north -/turf/open/floor/prison{dir=1;icon_state="darkred2";} : /turf/open/floor/prison/darkred2/north -/turf/open/floor/prison{dir=1;icon_state="darkredcorners2";} : /turf/open/floor/prison/darkredcorners2/north -/turf/open/floor/prison{dir=1;icon_state="darkyellow2";} : /turf/open/floor/prison/darkyellow2/north -/turf/open/floor/prison{dir=1;icon_state="darkyellowcorners2";} : /turf/open/floor/prison/darkyellowcorners2/north -/turf/open/floor/prison{dir=1;icon_state="green";} : /turf/open/floor/prison/green/north -/turf/open/floor/prison{dir=1;icon_state="greenblue";} : /turf/open/floor/prison/greenblue/north -/turf/open/floor/prison{dir=1;icon_state="greenbluecorner";} : /turf/open/floor/prison/greenbluecorner/north -/turf/open/floor/prison{dir=1;icon_state="greencorner";} : /turf/open/floor/prison/greencorner/north -/turf/open/floor/prison{dir=1;icon_state="rampbottom";} : /turf/open/floor/prison/rampbottom/north -/turf/open/floor/prison{dir=1;icon_state="red";} : /turf/open/floor/prison/red/north -/turf/open/floor/prison{dir=1;icon_state="redcorner";} : /turf/open/floor/prison/redcorner/north -/turf/open/floor/prison{dir=1;icon_state="whitegreen";} : /turf/open/floor/prison/whitegreen/north -/turf/open/floor/prison{dir=1;icon_state="whitegreencorner";} : /turf/open/floor/prison/whitegreencorner/north -/turf/open/floor/prison{dir=1;icon_state="whitepurple";} : /turf/open/floor/prison/whitepurple/north -/turf/open/floor/prison{dir=1;icon_state="whitepurplecorner";} : /turf/open/floor/prison/whitepurplecorner/north -/turf/open/floor/prison{dir=1;icon_state="whitered";} : /turf/open/floor/prison/whitered/north -/turf/open/floor/prison{dir=1;icon_state="yellow";} : /turf/open/floor/prison/yellow/north -/turf/open/floor/prison{dir=1;icon_state="yellowcorner";} : /turf/open/floor/prison/yellowcorner/north -/turf/open/floor/prison{dir=2;icon_state="sterile_white";} : /turf/open/floor/prison/sterile_white/south -/turf/open/floor/prison{dir=4;icon_state="blue";} : /turf/open/floor/prison/blue/east -/turf/open/floor/prison{dir=4;icon_state="blue_plate";} : /turf/open/floor/prison/blue_plate/east -/turf/open/floor/prison{dir=4;icon_state="bluecorner";} : /turf/open/floor/prison/bluecorner/east -/turf/open/floor/prison{dir=4;icon_state="cell_stripe";} : /turf/open/floor/prison/cell_stripe/east -/turf/open/floor/prison{dir=4;icon_state="darkbrown2";} : /turf/open/floor/prison/darkbrown2/east -/turf/open/floor/prison{dir=4;icon_state="darkbrown3";} : /turf/open/floor/prison/darkbrown3/east -/turf/open/floor/prison{dir=4;icon_state="darkbrowncorners2";} : /turf/open/floor/prison/darkbrowncorners2/east -/turf/open/floor/prison{dir=4;icon_state="darkbrowncorners3";} : /turf/open/floor/prison/darkbrowncorners3/east -/turf/open/floor/prison{dir=4;icon_state="darkpurple2";} : /turf/open/floor/prison/darkpurple2/east -/turf/open/floor/prison{dir=4;icon_state="darkpurplecorners2";} : /turf/open/floor/prison/darkpurplecorners2/east -/turf/open/floor/prison{dir=4;icon_state="darkred2";} : /turf/open/floor/prison/darkred2/east -/turf/open/floor/prison{dir=4;icon_state="darkredcorners2";} : /turf/open/floor/prison/darkredcorners2/east -/turf/open/floor/prison{dir=4;icon_state="darkyellow2";} : /turf/open/floor/prison/darkyellow2/east -/turf/open/floor/prison{dir=4;icon_state="darkyellowcorners2";} : /turf/open/floor/prison/darkyellowcorners2/east -/turf/open/floor/prison{dir=4;icon_state="darkyellowfull2";} : /turf/open/floor/prison/darkyellowfull2/east -/turf/open/floor/prison{dir=4;icon_state="green";} : /turf/open/floor/prison/green/east -/turf/open/floor/prison{dir=4;icon_state="greenblue";} : /turf/open/floor/prison/greenblue/east -/turf/open/floor/prison{dir=4;icon_state="greenbluecorner";} : /turf/open/floor/prison/greenbluecorner/east -/turf/open/floor/prison{dir=4;icon_state="greencorner";} : /turf/open/floor/prison/greencorner/east -/turf/open/floor/prison{dir=4;icon_state="greenfull";} : /turf/open/floor/prison/greenfull/east -/turf/open/floor/prison{dir=4;icon_state="rampbottom";} : /turf/open/floor/prison/rampbottom/east -/turf/open/floor/prison{dir=4;icon_state="red";} : /turf/open/floor/prison/red/east -/turf/open/floor/prison{dir=4;icon_state="redcorner";} : /turf/open/floor/prison/redcorner/east -/turf/open/floor/prison{dir=4;icon_state="whitegreen";} : /turf/open/floor/prison/whitegreen/east -/turf/open/floor/prison{dir=4;icon_state="whitegreencorner";} : /turf/open/floor/prison/whitegreencorner/east -/turf/open/floor/prison{dir=4;icon_state="whitepurple";} : /turf/open/floor/prison/whitepurple/east -/turf/open/floor/prison{dir=4;icon_state="whitepurplecorner";} : /turf/open/floor/prison/whitepurplecorner/east -/turf/open/floor/prison{dir=4;icon_state="whitered";} : /turf/open/floor/prison/whitered/east -/turf/open/floor/prison{dir=4;icon_state="whiteredcorner";} : /turf/open/floor/prison/whiteredcorner/east -/turf/open/floor/prison{dir=4;icon_state="yellow";} : /turf/open/floor/prison/yellow/east -/turf/open/floor/prison{dir=4;icon_state="yellowcorner";} : /turf/open/floor/prison/yellowcorner/east -/turf/open/floor/prison{dir=5;icon_state="blue";} : /turf/open/floor/prison/blue/northeast -/turf/open/floor/prison{dir=5;icon_state="darkbrown2";} : /turf/open/floor/prison/darkbrown2/northeast -/turf/open/floor/prison{dir=5;icon_state="darkpurple2";} : /turf/open/floor/prison/darkpurple2/northeast -/turf/open/floor/prison{dir=5;icon_state="darkred2";} : /turf/open/floor/prison/darkred2/northeast -/turf/open/floor/prison{dir=5;icon_state="darkyellow2";} : /turf/open/floor/prison/darkyellow2/northeast -/turf/open/floor/prison{dir=5;icon_state="green";} : /turf/open/floor/prison/green/northeast -/turf/open/floor/prison{dir=5;icon_state="greenblue";} : /turf/open/floor/prison/greenblue/northeast -/turf/open/floor/prison{dir=5;icon_state="red";} : /turf/open/floor/prison/red/northeast -/turf/open/floor/prison{dir=5;icon_state="whitegreen";} : /turf/open/floor/prison/whitegreen/northeast -/turf/open/floor/prison{dir=5;icon_state="whitepurple";} : /turf/open/floor/prison/whitepurple/northeast -/turf/open/floor/prison{dir=5;icon_state="whitered";} : /turf/open/floor/prison/whitered/northeast -/turf/open/floor/prison{dir=5;icon_state="yellow";} : /turf/open/floor/prison/yellow/northeast -/turf/open/floor/prison{dir=6;icon_state="blue";} : /turf/open/floor/prison/blue/southeast -/turf/open/floor/prison{dir=6;icon_state="darkbrown2";} : /turf/open/floor/prison/darkbrown2/southeast -/turf/open/floor/prison{dir=6;icon_state="darkpurple2";} : /turf/open/floor/prison/darkpurple2/southeast -/turf/open/floor/prison{dir=6;icon_state="darkred2";} : /turf/open/floor/prison/darkred2/southeast -/turf/open/floor/prison{dir=6;icon_state="darkyellow2";} : /turf/open/floor/prison/darkyellow2/southeast -/turf/open/floor/prison{dir=6;icon_state="green";} : /turf/open/floor/prison/green/southeast -/turf/open/floor/prison{dir=6;icon_state="greenblue";} : /turf/open/floor/prison/greenblue/southeast -/turf/open/floor/prison{dir=6;icon_state="red";} : /turf/open/floor/prison/red/southeast -/turf/open/floor/prison{dir=6;icon_state="whitegreen";} : /turf/open/floor/prison/whitegreen/southeast -/turf/open/floor/prison{dir=6;icon_state="whitepurple";} : /turf/open/floor/prison/whitepurple/southeast -/turf/open/floor/prison{dir=6;icon_state="whitered";} : /turf/open/floor/prison/whitered/southeast -/turf/open/floor/prison{dir=6;icon_state="yellow";} : /turf/open/floor/prison/yellow/southeast -/turf/open/floor/prison{dir=8;icon_state="blue";} : /turf/open/floor/prison/blue/west -/turf/open/floor/prison{dir=8;icon_state="blue_plate";} : /turf/open/floor/prison/blue_plate/west -/turf/open/floor/prison{dir=8;icon_state="bluecorner";} : /turf/open/floor/prison/bluecorner/west -/turf/open/floor/prison{dir=8;icon_state="bluefull";} : /turf/open/floor/prison/bluefull/west -/turf/open/floor/prison{dir=8;icon_state="cell_stripe";} : /turf/open/floor/prison/cell_stripe/west -/turf/open/floor/prison{dir=8;icon_state="darkbrown2";} : /turf/open/floor/prison/darkbrown2/west -/turf/open/floor/prison{dir=8;icon_state="darkbrown3";} : /turf/open/floor/prison/darkbrown3/west -/turf/open/floor/prison{dir=8;icon_state="darkbrowncorners2";} : /turf/open/floor/prison/darkbrowncorners2/west -/turf/open/floor/prison{dir=8;icon_state="darkbrowncorners3";} : /turf/open/floor/prison/darkbrowncorners3/west -/turf/open/floor/prison{dir=8;icon_state="darkpurple2";} : /turf/open/floor/prison/darkpurple2/west -/turf/open/floor/prison{dir=8;icon_state="darkpurplecorners2";} : /turf/open/floor/prison/darkpurplecorners2/west -/turf/open/floor/prison{dir=8;icon_state="darkred2";} : /turf/open/floor/prison/darkred2/west -/turf/open/floor/prison{dir=8;icon_state="darkredcorners2";} : /turf/open/floor/prison/darkredcorners2/west -/turf/open/floor/prison{dir=8;icon_state="darkyellow2";} : /turf/open/floor/prison/darkyellow2/west -/turf/open/floor/prison{dir=8;icon_state="darkyellowcorners2";} : /turf/open/floor/prison/darkyellowcorners2/west -/turf/open/floor/prison{dir=8;icon_state="floor_marked";} : /turf/open/floor/prison/floor_marked/west -/turf/open/floor/prison{dir=8;icon_state="green";} : /turf/open/floor/prison/green/west -/turf/open/floor/prison{dir=8;icon_state="greenblue";} : /turf/open/floor/prison/greenblue/west -/turf/open/floor/prison{dir=8;icon_state="greenbluecorner";} : /turf/open/floor/prison/greenbluecorner/west -/turf/open/floor/prison{dir=8;icon_state="greencorner";} : /turf/open/floor/prison/greencorner/west -/turf/open/floor/prison{dir=8;icon_state="rampbottom";} : /turf/open/floor/prison/rampbottom/west -/turf/open/floor/prison{dir=8;icon_state="red";} : /turf/open/floor/prison/red/west -/turf/open/floor/prison{dir=8;icon_state="redcorner";} : /turf/open/floor/prison/redcorner/west -/turf/open/floor/prison{dir=8;icon_state="sterile_white";} : /turf/open/floor/prison/sterile_white/west -/turf/open/floor/prison{dir=8;icon_state="whitegreen";} : /turf/open/floor/prison/whitegreen/west -/turf/open/floor/prison{dir=8;icon_state="whitegreencorner";} : /turf/open/floor/prison/whitegreencorner/west -/turf/open/floor/prison{dir=8;icon_state="whitepurple";} : /turf/open/floor/prison/whitepurple/west -/turf/open/floor/prison{dir=8;icon_state="whitepurplecorner";} : /turf/open/floor/prison/whitepurplecorner/west -/turf/open/floor/prison{dir=8;icon_state="whitered";} : /turf/open/floor/prison/whitered/west -/turf/open/floor/prison{dir=8;icon_state="whiteredcorner";} : /turf/open/floor/prison/whiteredcorner/west -/turf/open/floor/prison{dir=8;icon_state="yellow";} : /turf/open/floor/prison/yellow/west -/turf/open/floor/prison{dir=8;icon_state="yellowcorner";} : /turf/open/floor/prison/yellowcorner/west -/turf/open/floor/prison{dir=8;} : /turf/open/floor/prison/west -/turf/open/floor/prison{dir=9;icon_state="blue";} : /turf/open/floor/prison/blue/northwest -/turf/open/floor/prison{dir=9;icon_state="darkbrown2";} : /turf/open/floor/prison/darkbrown2/northwest -/turf/open/floor/prison{dir=9;icon_state="darkbrown3";} : /turf/open/floor/prison/darkbrown3/northwest -/turf/open/floor/prison{dir=9;icon_state="darkpurple2";} : /turf/open/floor/prison/darkpurple2/northwest -/turf/open/floor/prison{dir=9;icon_state="darkpurplefull2";} : /turf/open/floor/prison/darkpurplefull2/northwest -/turf/open/floor/prison{dir=9;icon_state="darkred2";} : /turf/open/floor/prison/darkred2/northwest -/turf/open/floor/prison{dir=9;icon_state="darkyellow2";} : /turf/open/floor/prison/darkyellow2/northwest -/turf/open/floor/prison{dir=9;icon_state="green";} : /turf/open/floor/prison/green/northwest -/turf/open/floor/prison{dir=9;icon_state="greenblue";} : /turf/open/floor/prison/greenblue/northwest -/turf/open/floor/prison{dir=9;icon_state="greenfull";} : /turf/open/floor/prison/greenfull/northwest -/turf/open/floor/prison{dir=9;icon_state="red";} : /turf/open/floor/prison/red/northwest -/turf/open/floor/prison{dir=9;icon_state="whitegreen";} : /turf/open/floor/prison/whitegreen/northwest -/turf/open/floor/prison{dir=9;icon_state="whitepurple";} : /turf/open/floor/prison/whitepurple/northwest -/turf/open/floor/prison{dir=9;icon_state="whitered";} : /turf/open/floor/prison/whitered/northwest -/turf/open/floor/prison{dir=9;icon_state="yellow";} : /turf/open/floor/prison/yellow/northwest -/turf/open/floor/prison{icon_state="blue";} : /turf/open/floor/prison/blue -/turf/open/floor/prison{icon_state="blue_plate";} : /turf/open/floor/prison/blue_plate -/turf/open/floor/prison{icon_state="bluecorner";} : /turf/open/floor/prison/bluecorner -/turf/open/floor/prison{icon_state="bluefull";} : /turf/open/floor/prison/bluefull -/turf/open/floor/prison{icon_state="bright_clean2";} : /turf/open/floor/prison/bright_clean2 -/turf/open/floor/prison{icon_state="bright_clean_marked";} : /turf/open/floor/prison/bright_clean_marked -/turf/open/floor/prison{icon_state="cell_stripe";} : /turf/open/floor/prison/cell_stripe -/turf/open/floor/prison{icon_state="damaged2";} : /turf/open/floor/prison/damaged2 -/turf/open/floor/prison{icon_state="damaged3";} : /turf/open/floor/prison/damaged3 -/turf/open/floor/prison{icon_state="darkbrown2";} : /turf/open/floor/prison/darkbrown2 -/turf/open/floor/prison{icon_state="darkbrown3";} : /turf/open/floor/prison/darkbrown3 -/turf/open/floor/prison{icon_state="darkbrowncorners2";} : /turf/open/floor/prison/darkbrowncorners2 -/turf/open/floor/prison{icon_state="darkbrowncorners3";} : /turf/open/floor/prison/darkbrowncorners3 -/turf/open/floor/prison{icon_state="darkbrownfull2";} : /turf/open/floor/prison/darkbrownfull2 -/turf/open/floor/prison{icon_state="darkpurple2";} : /turf/open/floor/prison/darkpurple2 -/turf/open/floor/prison{icon_state="darkpurplecorners2";} : /turf/open/floor/prison/darkpurplecorners2 -/turf/open/floor/prison{icon_state="darkpurplefull2";} : /turf/open/floor/prison/darkpurplefull2 -/turf/open/floor/prison{icon_state="darkred2";} : /turf/open/floor/prison/darkred2 -/turf/open/floor/prison{icon_state="darkredcorners2";} : /turf/open/floor/prison/darkredcorners2 -/turf/open/floor/prison{icon_state="darkredfull2";} : /turf/open/floor/prison/darkredfull2 -/turf/open/floor/prison{icon_state="darkyellow2";} : /turf/open/floor/prison/darkyellow2 -/turf/open/floor/prison{icon_state="darkyellowcorners2";} : /turf/open/floor/prison/darkyellowcorners2 -/turf/open/floor/prison{icon_state="darkyellowfull2";} : /turf/open/floor/prison/darkyellowfull2 -/turf/open/floor/prison{icon_state="floor_marked";} : /turf/open/floor/prison/floor_marked -/turf/open/floor/prison{icon_state="floor_plate";} : /turf/open/floor/prison/floor_plate -/turf/open/floor/prison{icon_state="floorscorched1";} : /turf/open/floor/prison/floorscorched1 -/turf/open/floor/prison{icon_state="floorscorched2";} : /turf/open/floor/prison/floorscorched2 -/turf/open/floor/prison{icon_state="green";} : /turf/open/floor/prison/green -/turf/open/floor/prison{icon_state="greenblue";dir=10;} : /turf/open/floor/prison/greenblue/southwest -/turf/open/floor/prison{icon_state="greenblue";dir=1;} : /turf/open/floor/prison/greenblue/north -/turf/open/floor/prison{icon_state="greenblue";dir=4;} : /turf/open/floor/prison/greenblue/east -/turf/open/floor/prison{icon_state="greenblue";dir=5;} : /turf/open/floor/prison/greenblue/northeast -/turf/open/floor/prison{icon_state="greenblue";dir=6;} : /turf/open/floor/prison/greenblue/southeast -/turf/open/floor/prison{icon_state="greenblue";dir=8;} : /turf/open/floor/prison/greenblue/west -/turf/open/floor/prison{icon_state="greenblue";dir=9;} : /turf/open/floor/prison/greenblue/northwest -/turf/open/floor/prison{icon_state="greenblue";} : /turf/open/floor/prison/greenblue -/turf/open/floor/prison{icon_state="greenbluecorner";dir=4;} : /turf/open/floor/prison/greenbluecorner/east -/turf/open/floor/prison{icon_state="greenbluecorner";} : /turf/open/floor/prison/greenbluecorner -/turf/open/floor/prison{icon_state="greencorner";} : /turf/open/floor/prison/greencorner -/turf/open/floor/prison{icon_state="greenfull";} : /turf/open/floor/prison/greenfull -/turf/open/floor/prison{icon_state="kitchen";} : /turf/open/floor/prison/kitchen -/turf/open/floor/prison{icon_state="panelscorched";} : /turf/open/floor/prison/panelscorched -/turf/open/floor/prison{icon_state="platingdmg1";} : /turf/open/floor/prison/platingdmg1 -/turf/open/floor/prison{icon_state="platingdmg2";} : /turf/open/floor/prison/platingdmg2 -/turf/open/floor/prison{icon_state="platingdmg3";} : /turf/open/floor/prison/platingdmg3 -/turf/open/floor/prison{icon_state="rampbottom";} : /turf/open/floor/prison/rampbottom -/turf/open/floor/prison{icon_state="red";dir=10;} : /turf/open/floor/prison/red/southwest -/turf/open/floor/prison{icon_state="red";dir=1;} : /turf/open/floor/prison/red/north -/turf/open/floor/prison{icon_state="red";dir=4;} : /turf/open/floor/prison/red/east -/turf/open/floor/prison{icon_state="red";dir=5;} : /turf/open/floor/prison/red/northeast -/turf/open/floor/prison{icon_state="red";dir=6;} : /turf/open/floor/prison/red/southeast -/turf/open/floor/prison{icon_state="red";dir=8;} : /turf/open/floor/prison/red/west -/turf/open/floor/prison{icon_state="red";dir=9;} : /turf/open/floor/prison/red/northwest -/turf/open/floor/prison{icon_state="red";} : /turf/open/floor/prison/red -/turf/open/floor/prison{icon_state="redcorner";dir=1;} : /turf/open/floor/prison/redcorner/north -/turf/open/floor/prison{icon_state="redcorner";dir=4;} : /turf/open/floor/prison/redcorner/east -/turf/open/floor/prison{icon_state="redcorner";} : /turf/open/floor/prison/redcorner -/turf/open/floor/prison{icon_state="redfull";} : /turf/open/floor/prison/redfull -/turf/open/floor/prison{icon_state="sterile_white";} : /turf/open/floor/prison/sterile_white -/turf/open/floor/prison{icon_state="whitegreen";} : /turf/open/floor/prison/whitegreen -/turf/open/floor/prison{icon_state="whitegreencorner";} : /turf/open/floor/prison/whitegreencorner -/turf/open/floor/prison{icon_state="whitegreenfull";} : /turf/open/floor/prison/whitegreenfull -/turf/open/floor/prison{icon_state="whitepurple";} : /turf/open/floor/prison/whitepurple -/turf/open/floor/prison{icon_state="whitepurplecorner";} : /turf/open/floor/prison/whitepurplecorner -/turf/open/floor/prison{icon_state="whitepurplefull";} : /turf/open/floor/prison/whitepurplefull -/turf/open/floor/prison{icon_state="whitered";} : /turf/open/floor/prison/whitered -/turf/open/floor/prison{icon_state="yellow";} : /turf/open/floor/prison/yellow -/turf/open/floor/prison{icon_state="yellowcorner";} : /turf/open/floor/prison/yellowcorner -/turf/open/floor/prison{icon_state="yellowfull";} : /turf/open/floor/prison/yellowfull -/turf/open/floor/shiva{dir=10;icon_state="blue";} : /turf/open/floor/shiva/blue/southwest -/turf/open/floor/shiva{dir=10;icon_state="green";} : /turf/open/floor/shiva/green/southwest -/turf/open/floor/shiva{dir=10;icon_state="purple";} : /turf/open/floor/shiva/purple/southwest -/turf/open/floor/shiva{dir=10;icon_state="red";} : /turf/open/floor/shiva/red/southwest -/turf/open/floor/shiva{dir=10;icon_state="wred";} : /turf/open/floor/shiva/wred/southwest -/turf/open/floor/shiva{dir=10;icon_state="yellow";} : /turf/open/floor/shiva/yellow/southwest -/turf/open/floor/shiva{dir=1;icon_state="blue";} : /turf/open/floor/shiva/blue/north -/turf/open/floor/shiva{dir=1;icon_state="green";} : /turf/open/floor/shiva/green/north -/turf/open/floor/shiva{dir=1;icon_state="greencorners";} : /turf/open/floor/shiva/greencorners/north -/turf/open/floor/shiva{dir=1;icon_state="multi_tiles";} : /turf/open/floor/shiva/multi_tiles/north -/turf/open/floor/shiva{dir=1;icon_state="purple";} : /turf/open/floor/shiva/purple/north -/turf/open/floor/shiva{dir=1;icon_state="purplefull";} : /turf/open/floor/shiva/purplefull/north -/turf/open/floor/shiva{dir=1;icon_state="red";} : /turf/open/floor/shiva/red/north -/turf/open/floor/shiva{dir=1;icon_state="redcorners";} : /turf/open/floor/shiva/redcorners/north -/turf/open/floor/shiva{dir=1;icon_state="snow_mat";} : /turf/open/floor/shiva/snow_mat/north -/turf/open/floor/shiva{dir=1;icon_state="wred";} : /turf/open/floor/shiva/wred/north -/turf/open/floor/shiva{dir=1;icon_state="wredcorners";} : /turf/open/floor/shiva/wredcorners/north -/turf/open/floor/shiva{dir=1;icon_state="yellow";} : /turf/open/floor/shiva/yellow/north -/turf/open/floor/shiva{dir=1;icon_state="yellowcorners";} : /turf/open/floor/shiva/yellowcorners/north -/turf/open/floor/shiva{dir=1;} : /turf/open/floor/shiva/north -/turf/open/floor/shiva{dir=4;icon_state="blue";} : /turf/open/floor/shiva/blue/east -/turf/open/floor/shiva{dir=4;icon_state="green";} : /turf/open/floor/shiva/green/east -/turf/open/floor/shiva{dir=4;icon_state="greencorners";} : /turf/open/floor/shiva/greencorners/east -/turf/open/floor/shiva{dir=4;icon_state="multi_tiles";} : /turf/open/floor/shiva/multi_tiles/east -/turf/open/floor/shiva{dir=4;icon_state="purple";} : /turf/open/floor/shiva/purple/east -/turf/open/floor/shiva{dir=4;icon_state="purplefull";} : /turf/open/floor/shiva/purplefull/east -/turf/open/floor/shiva{dir=4;icon_state="red";} : /turf/open/floor/shiva/red/east -/turf/open/floor/shiva{dir=4;icon_state="redcorners";} : /turf/open/floor/shiva/redcorners/east -/turf/open/floor/shiva{dir=4;icon_state="snow_mat";} : /turf/open/floor/shiva/snow_mat/east -/turf/open/floor/shiva{dir=4;icon_state="wred";} : /turf/open/floor/shiva/wred/east -/turf/open/floor/shiva{dir=4;icon_state="wredcorners";} : /turf/open/floor/shiva/wredcorners/east -/turf/open/floor/shiva{dir=4;icon_state="yellow";} : /turf/open/floor/shiva/yellow/east -/turf/open/floor/shiva{dir=4;icon_state="yellowcorners";} : /turf/open/floor/shiva/yellowcorners/east -/turf/open/floor/shiva{dir=5;icon_state="blue";} : /turf/open/floor/shiva/blue/northeast -/turf/open/floor/shiva{dir=5;icon_state="green";} : /turf/open/floor/shiva/green/northeast -/turf/open/floor/shiva{dir=5;icon_state="purple";} : /turf/open/floor/shiva/purple/northeast -/turf/open/floor/shiva{dir=5;icon_state="red";} : /turf/open/floor/shiva/red/northeast -/turf/open/floor/shiva{dir=5;icon_state="wred";} : /turf/open/floor/shiva/wred/northeast -/turf/open/floor/shiva{dir=5;icon_state="yellow";} : /turf/open/floor/shiva/yellow/northeast -/turf/open/floor/shiva{dir=6;icon_state="blue";} : /turf/open/floor/shiva/blue/southeast -/turf/open/floor/shiva{dir=6;icon_state="green";} : /turf/open/floor/shiva/green/southeast -/turf/open/floor/shiva{dir=6;icon_state="multi_tiles";} : /turf/open/floor/shiva/multi_tiles/southeast -/turf/open/floor/shiva{dir=6;icon_state="purple";} : /turf/open/floor/shiva/purple/southeast -/turf/open/floor/shiva{dir=6;icon_state="red";} : /turf/open/floor/shiva/red/southeast -/turf/open/floor/shiva{dir=6;icon_state="wred";} : /turf/open/floor/shiva/wred/southeast -/turf/open/floor/shiva{dir=6;icon_state="yellow";} : /turf/open/floor/shiva/yellow/southeast -/turf/open/floor/shiva{dir=8;icon_state="blue";} : /turf/open/floor/shiva/blue/west -/turf/open/floor/shiva{dir=8;icon_state="bluecorners";} : /turf/open/floor/shiva/bluecorners/west -/turf/open/floor/shiva{dir=8;icon_state="bluefull";} : /turf/open/floor/shiva/bluefull/west -/turf/open/floor/shiva{dir=8;icon_state="green";} : /turf/open/floor/shiva/green/west -/turf/open/floor/shiva{dir=8;icon_state="greencorners";} : /turf/open/floor/shiva/greencorners/west -/turf/open/floor/shiva{dir=8;icon_state="greenfull";} : /turf/open/floor/shiva/greenfull/west -/turf/open/floor/shiva{dir=8;icon_state="multi_tiles";} : /turf/open/floor/shiva/multi_tiles/west -/turf/open/floor/shiva{dir=8;icon_state="purple";} : /turf/open/floor/shiva/purple/west -/turf/open/floor/shiva{dir=8;icon_state="purplecorners";} : /turf/open/floor/shiva/purplecorners/west -/turf/open/floor/shiva{dir=8;icon_state="purplefull";} : /turf/open/floor/shiva/purplefull/west -/turf/open/floor/shiva{dir=8;icon_state="red";} : /turf/open/floor/shiva/red/west -/turf/open/floor/shiva{dir=8;icon_state="redcorners";} : /turf/open/floor/shiva/redcorners/west -/turf/open/floor/shiva{dir=8;icon_state="redfull";} : /turf/open/floor/shiva/redfull/west -/turf/open/floor/shiva{dir=8;icon_state="snow_mat";} : /turf/open/floor/shiva/snow_mat/west -/turf/open/floor/shiva{dir=8;icon_state="wred";} : /turf/open/floor/shiva/wred/west -/turf/open/floor/shiva{dir=8;icon_state="wredcorners";} : /turf/open/floor/shiva/wredcorners/west -/turf/open/floor/shiva{dir=8;icon_state="yellow";} : /turf/open/floor/shiva/yellow/west -/turf/open/floor/shiva{dir=8;icon_state="yellowcorners";} : /turf/open/floor/shiva/yellowcorners/west -/turf/open/floor/shiva{dir=8;icon_state="yellowfull";} : /turf/open/floor/shiva/yellowfull/west -/turf/open/floor/shiva{dir=9;icon_state="blue";} : /turf/open/floor/shiva/blue/northwest -/turf/open/floor/shiva{dir=9;icon_state="green";} : /turf/open/floor/shiva/green/northwest -/turf/open/floor/shiva{dir=9;icon_state="purple";} : /turf/open/floor/shiva/purple/northwest -/turf/open/floor/shiva{dir=9;icon_state="red";} : /turf/open/floor/shiva/red/northwest -/turf/open/floor/shiva{dir=9;icon_state="wred";} : /turf/open/floor/shiva/wred/northwest -/turf/open/floor/shiva{dir=9;icon_state="yellow";} : /turf/open/floor/shiva/yellow/northwest -/turf/open/floor/shiva{icon_state="blue";} : /turf/open/floor/shiva/blue -/turf/open/floor/shiva{icon_state="bluecorners";} : /turf/open/floor/shiva/bluecorners -/turf/open/floor/shiva{icon_state="bluefull";} : /turf/open/floor/shiva/bluefull -/turf/open/floor/shiva{icon_state="floor3";} : /turf/open/floor/shiva/floor3 -/turf/open/floor/shiva{icon_state="green";} : /turf/open/floor/shiva/green -/turf/open/floor/shiva{icon_state="greencorners";} : /turf/open/floor/shiva/greencorners -/turf/open/floor/shiva{icon_state="greenfull";} : /turf/open/floor/shiva/greenfull -/turf/open/floor/shiva{icon_state="multi_tiles";} : /turf/open/floor/shiva/multi_tiles -/turf/open/floor/shiva{icon_state="purple";} : /turf/open/floor/shiva/purple -/turf/open/floor/shiva{icon_state="purplecorners";} : /turf/open/floor/shiva/purplecorners -/turf/open/floor/shiva{icon_state="purplefull";} : /turf/open/floor/shiva/purplefull -/turf/open/floor/shiva{icon_state="radiator_tile";} : /turf/open/floor/shiva/radiator_tile -/turf/open/floor/shiva{icon_state="radiator_tile2";} : /turf/open/floor/shiva/radiator_tile2 -/turf/open/floor/shiva{icon_state="red";} : /turf/open/floor/shiva/red -/turf/open/floor/shiva{icon_state="redcorners";} : /turf/open/floor/shiva/redcorners -/turf/open/floor/shiva{icon_state="redfull";} : /turf/open/floor/shiva/redfull -/turf/open/floor/shiva{icon_state="snow_mat";} : /turf/open/floor/shiva/snow_mat -/turf/open/floor/shiva{icon_state="wred";} : /turf/open/floor/shiva/wred -/turf/open/floor/shiva{icon_state="wredcorners";} : /turf/open/floor/shiva/wredcorners -/turf/open/floor/shiva{icon_state="wredfull";} : /turf/open/floor/shiva/wredfull -/turf/open/floor/shiva{icon_state="yellow";} : /turf/open/floor/shiva/yellow -/turf/open/floor/shiva{icon_state="yellowcorners";} : /turf/open/floor/shiva/yellowcorners -/turf/open/floor/shiva{icon_state="yellowfull";} : /turf/open/floor/shiva/yellowfull -/turf/open/floor/strata{color="#5e5d5d";dir=10;icon_state="multi_tiles";} : /turf/open/floor/strata/grey_multi_tiles/southwest -/turf/open/floor/strata{color="#5e5d5d";icon_state="multi_tiles";} : /turf/open/floor/strata/grey_multi_tiles -/turf/open/floor/strata{desc="Faux wooden floor boards, certified fire resistant. Begrudgingly put in place of actual wood due to concerns about 'fire safety'. Whatever that means.";icon='icons/turf/floors/floors.dmi';icon_state="wood";} : /turf/open/floor/strata/faux_wood -/turf/open/floor/strata{desc="This metal floor has been painted to look like one made of wood. Unfortunately, wood and high pressure internal atmosphere don't mix well. Wood is a major fire hazard don't'cha know.";icon='icons/turf/floors/floors.dmi';icon_state="wood";} : /turf/open/floor/strata/faux_metal -/turf/open/floor/strata{dir=10;icon_state="multi_tiles";} : /turf/open/floor/strata/multi_tiles/southwest -/turf/open/floor/strata{dir=10;icon_state="white_cyan3";} : /turf/open/floor/strata/white_cyan3/southwest -/turf/open/floor/strata{dir=1;icon_state="blue4";} : /turf/open/floor/strata/blue4/north -/turf/open/floor/strata{dir=1;icon_state="red3";} : /turf/open/floor/strata/red3/north -/turf/open/floor/strata{dir=1;icon_state="white_cyan3";} : /turf/open/floor/strata/white_cyan3/north -/turf/open/floor/strata{dir=1;icon_state="white_cyan4";} : /turf/open/floor/strata/white_cyan4/north -/turf/open/floor/strata{dir=2;icon_state="red3";} : /turf/open/floor/strata/red3/south -/turf/open/floor/strata{dir=2;icon_state="white_cyan3";} : /turf/open/floor/strata/white_cyan3/south -/turf/open/floor/strata{dir=2;icon_state="white_cyan4";} : /turf/open/floor/strata/white_cyan4/south -/turf/open/floor/strata{dir=4;icon_state="blue3";} : /turf/open/floor/strata/blue3/east -/turf/open/floor/strata{dir=4;icon_state="cyan1";} : /turf/open/floor/strata/cyan1/east -/turf/open/floor/strata{dir=4;icon_state="cyan2";} : /turf/open/floor/strata/cyan2/east -/turf/open/floor/strata{dir=4;icon_state="cyan3";} : /turf/open/floor/strata/cyan3/east -/turf/open/floor/strata{dir=4;icon_state="cyan4";} : /turf/open/floor/strata/cyan4/east -/turf/open/floor/strata{dir=4;icon_state="floor3";} : /turf/open/floor/strata/floor3/east -/turf/open/floor/strata{dir=4;icon_state="orange_edge";} : /turf/open/floor/strata/orange_edge/east -/turf/open/floor/strata{dir=4;icon_state="red3";} : /turf/open/floor/strata/red3/east -/turf/open/floor/strata{dir=4;icon_state="white_cyan1";} : /turf/open/floor/strata/white_cyan1/east -/turf/open/floor/strata{dir=4;icon_state="white_cyan3";} : /turf/open/floor/strata/white_cyan3/east -/turf/open/floor/strata{dir=4;icon_state="white_cyan4";} : /turf/open/floor/strata/white_cyan4/east -/turf/open/floor/strata{dir=5;icon_state="white_cyan3";} : /turf/open/floor/strata/white_cyan3/northeast -/turf/open/floor/strata{dir=6;icon_state="multi_tiles";} : /turf/open/floor/strata/multi_tiles/southeast -/turf/open/floor/strata{dir=6;icon_state="white_cyan3";} : /turf/open/floor/strata/white_cyan3/southeast -/turf/open/floor/strata{dir=8;icon_state="blue3";} : /turf/open/floor/strata/blue3/west -/turf/open/floor/strata{dir=8;icon_state="cyan3";} : /turf/open/floor/strata/cyan3/west -/turf/open/floor/strata{dir=8;icon_state="multi_tiles";} : /turf/open/floor/strata/multi_tiles/west -/turf/open/floor/strata{dir=8;icon_state="orange_edge";} : /turf/open/floor/strata/orange_edge/west -/turf/open/floor/strata{dir=8;icon_state="red3";} : /turf/open/floor/strata/red3/west -/turf/open/floor/strata{dir=8;icon_state="white_cyan2";} : /turf/open/floor/strata/white_cyan2/west -/turf/open/floor/strata{dir=8;icon_state="white_cyan3";} : /turf/open/floor/strata/white_cyan3/west -/turf/open/floor/strata{dir=8;icon_state="white_cyan4";} : /turf/open/floor/strata/white_cyan4/west -/turf/open/floor/strata{dir=9;icon_state="white_cyan3";} : /turf/open/floor/strata/white_cyan3/northwest -/turf/open/floor/strata{icon_state="blue1";} : /turf/open/floor/strata/blue1 -/turf/open/floor/strata{icon_state="blue3";dir=1;} : /turf/open/floor/strata/blue3/north -/turf/open/floor/strata{icon_state="blue4";} : /turf/open/floor/strata/blue4 -/turf/open/floor/strata{icon_state="damaged3";} : /turf/open/floor/strata/damaged3 -/turf/open/floor/strata{icon_state="fake_wood";} : /turf/open/floor/strata/fake_wood -/turf/open/floor/strata{icon_state="floor2";} : /turf/open/floor/strata/floor2 -/turf/open/floor/strata{icon_state="floor3";} : /turf/open/floor/strata/floor3 -/turf/open/floor/strata{icon_state="floorscorched1";} : /turf/open/floor/strata/floorscorched1 -/turf/open/floor/strata{icon_state="floorscorched2";} : /turf/open/floor/strata/floorscorched2 -/turf/open/floor/strata{icon_state="green1";} : /turf/open/floor/strata/green1 -/turf/open/floor/strata{icon_state="green3";dir=1;} : /turf/open/floor/strata/green3/north -/turf/open/floor/strata{icon_state="green3";dir=4;} : /turf/open/floor/strata/green3/east -/turf/open/floor/strata{icon_state="green3";dir=5;} : /turf/open/floor/strata/green3/northeast -/turf/open/floor/strata{icon_state="green3";dir=8;} : /turf/open/floor/strata/green3/west -/turf/open/floor/strata{icon_state="green3";dir=9;} : /turf/open/floor/strata/green3/northwest -/turf/open/floor/strata{icon_state="green3";} : /turf/open/floor/strata/green3 -/turf/open/floor/strata{icon_state="green4";dir=1;} : /turf/open/floor/strata/green4/north -/turf/open/floor/strata{icon_state="green4";dir=4;} : /turf/open/floor/strata/green4/east -/turf/open/floor/strata{icon_state="green4";dir=8;} : /turf/open/floor/strata/green4/west -/turf/open/floor/strata{icon_state="green4";} : /turf/open/floor/strata/green4 -/turf/open/floor/strata{icon_state="multi_tiles";} : /turf/open/floor/strata/multi_tiles -/turf/open/floor/strata{icon_state="orange_cover";} : /turf/open/floor/strata/orange_cover -/turf/open/floor/strata{icon_state="orange_icorner";dir=1;} : /turf/open/floor/strata/orange_icorner/north -/turf/open/floor/strata{icon_state="orange_icorner";dir=8;} : /turf/open/floor/strata/orange_icorner/west -/turf/open/floor/strata{icon_state="orange_tile";} : /turf/open/floor/strata/orange_tile -/turf/open/floor/strata{icon_state="purp1";} : /turf/open/floor/strata/purp1 -/turf/open/floor/strata{icon_state="purp2";} : /turf/open/floor/strata/purp2 -/turf/open/floor/strata{icon_state="purp3";dir=4;} : /turf/open/floor/strata/purp3/east -/turf/open/floor/strata{icon_state="red1";} : /turf/open/floor/strata/red1 -/turf/open/floor/strata{icon_state="red2";} : /turf/open/floor/strata/red2 -/turf/open/floor/strata{icon_state="red3";} : /turf/open/floor/strata/red3 -/turf/open/floor/strata{icon_state="red4";dir=1;} : /turf/open/floor/strata/red4/north -/turf/open/floor/strata{icon_state="red4";dir=4;} : /turf/open/floor/strata/red4/east -/turf/open/floor/strata{icon_state="red4";dir=8;} : /turf/open/floor/strata/red4/west -/turf/open/floor/strata{icon_state="white_cyan1";} : /turf/open/floor/strata/white_cyan1 -/turf/open/floor/strata{icon_state="white_cyan2";} : /turf/open/floor/strata/white_cyan2 -/turf/open/floor/strata{icon_state="white_cyan3";} : /turf/open/floor/strata/white_cyan3 -/turf/open/floor/strata{icon_state="white_cyan4";} : /turf/open/floor/strata/white_cyan4 -/turf/open/floor/tdome{dir=1;icon_state="w-y0";} : /turf/open/floor/tdome/w_y0/north -/turf/open/floor/tdome{dir=1;icon_state="w-y1";} : /turf/open/floor/tdome/w_y1/north -/turf/open/floor/tdome{dir=1;icon_state="w-y2";} : /turf/open/floor/tdome/w_y2/north -/turf/open/floor/tdome{dir=5;} : /turf/open/floor/tdome/northeast -/turf/open/floor/tdome{icon_state="bluefull";} : /turf/open/floor/tdome/bluefull -/turf/open/floor/tdome{icon_state="redfull";} : /turf/open/floor/tdome/redfull -/turf/open/floor/tdome{icon_state="tcomms";} : /turf/open/floor/tdome/tcomms -/turf/open/floor/tdome{icon_state="test_floor4";} : /turf/open/floor/tdome/test_floor4 -/turf/open/floor/wood{icon_state="wood-broken";} : /turf/open/floor/wood/wood_broken -/turf/open/floor/wood{icon_state="wood-broken2";} : /turf/open/floor/wood/wood_broken2 -/turf/open/floor/wood{icon_state="wood-broken3";} : /turf/open/floor/wood/wood_broken3 -/turf/open/floor/wood{icon_state="wood-broken4";} : /turf/open/floor/wood/wood_broken4 -/turf/open/floor/wood{icon_state="wood-broken5";} : /turf/open/floor/wood/wood_broken5 -/turf/open/floor/wood{icon_state="wood-broken6";} : /turf/open/floor/wood/wood_broken6 -/turf/open/floor/wood{icon_state="wood-broken7";} : /turf/open/floor/wood/wood_broken7 -/turf/open/floor{color="#525151";icon_state="dark2";} : /turf/open/floor/grey_dark2 -/turf/open/floor{desc="A sophisticated device that captures and converts light from the system's star into energy for the station.";icon_state="solarpanel";name="solarpanel";} : /turf/open/floor/solarpanel -/turf/open/floor{dir=10;icon_state="asteroidwarning";} : /turf/open/floor/asteroidwarning/southwest -/turf/open/floor{dir=10;icon_state="darkblue2";} : /turf/open/floor/darkblue2/southwest -/turf/open/floor{dir=10;icon_state="darkbrown2";} : /turf/open/floor/darkbrown2/southwest -/turf/open/floor{dir=10;icon_state="darkgreen2";} : /turf/open/floor/darkgreen2/southwest -/turf/open/floor{dir=10;icon_state="darkpurple2";} : /turf/open/floor/darkpurple2/southwest -/turf/open/floor{dir=10;icon_state="darkred2";} : /turf/open/floor/darkred2/southwest -/turf/open/floor{dir=10;icon_state="darkyellow2";} : /turf/open/floor/darkyellow2/southwest -/turf/open/floor{dir=10;icon_state="podhatch";} : /turf/open/floor/podhatch/southwest -/turf/open/floor{dir=10;icon_state="purple";} : /turf/open/floor/purple/southwest -/turf/open/floor{dir=10;icon_state="red";} : /turf/open/floor/red/southwest -/turf/open/floor{dir=10;icon_state="warning";} : /turf/open/floor/warning/southwest -/turf/open/floor{dir=10;icon_state="warnwhite";} : /turf/open/floor/warnwhite/southwest -/turf/open/floor{dir=10;icon_state="whiteblue";} : /turf/open/floor/whiteblue/southwest -/turf/open/floor{dir=10;icon_state="whitegreen";} : /turf/open/floor/whitegreen/southwest -/turf/open/floor{dir=10;icon_state="whitepurple";} : /turf/open/floor/whitepurple/southwest -/turf/open/floor{dir=10;icon_state="whitered";} : /turf/open/floor/whitered/southwest -/turf/open/floor{dir=10;icon_state="whiteyellow";} : /turf/open/floor/whiteyellow/southwest -/turf/open/floor{dir=1;icon_state="asteroidfloor";} : /turf/open/floor/asteroidfloor/north -/turf/open/floor{dir=1;icon_state="asteroidwarning";} : /turf/open/floor/asteroidwarning/north -/turf/open/floor{dir=1;icon_state="bot";} : /turf/open/floor/bot/north -/turf/open/floor{dir=1;icon_state="chapel";} : /turf/open/floor/chapel/north -/turf/open/floor{dir=1;icon_state="darkblue2";} : /turf/open/floor/darkblue2/north -/turf/open/floor{dir=1;icon_state="darkbrown2";} : /turf/open/floor/darkbrown2/north -/turf/open/floor{dir=1;icon_state="darkbrowncorners2";} : /turf/open/floor/darkbrowncorners2/north -/turf/open/floor{dir=1;icon_state="darkgreen2";} : /turf/open/floor/darkgreen2/north -/turf/open/floor{dir=1;icon_state="darkgreencorners2";} : /turf/open/floor/darkgreencorners2/north -/turf/open/floor{dir=1;icon_state="darkpurple2";} : /turf/open/floor/darkpurple2/north -/turf/open/floor{dir=1;icon_state="darkpurplecorners2";} : /turf/open/floor/darkpurplecorners2/north -/turf/open/floor{dir=1;icon_state="darkred2";} : /turf/open/floor/darkred2/north -/turf/open/floor{dir=1;icon_state="darkredcorners2";} : /turf/open/floor/darkredcorners2/north -/turf/open/floor{dir=1;icon_state="darkyellow2";} : /turf/open/floor/darkyellow2/north -/turf/open/floor{dir=1;icon_state="darkyellowcorners2";} : /turf/open/floor/darkyellowcorners2/north -/turf/open/floor{dir=1;icon_state="elevatorshaft";} : /turf/open/floor/elevatorshaft/north -/turf/open/floor{dir=1;icon_state="green";} : /turf/open/floor/green/north -/turf/open/floor{dir=1;icon_state="loadingarea";} : /turf/open/floor/loadingarea/north -/turf/open/floor{dir=1;icon_state="podhatch";} : /turf/open/floor/podhatch/north -/turf/open/floor{dir=1;icon_state="podhatchfloor";} : /turf/open/floor/podhatchfloor/north -/turf/open/floor{dir=1;icon_state="purple";} : /turf/open/floor/purple/north -/turf/open/floor{dir=1;icon_state="rampbottom";} : /turf/open/floor/rampbottom/north -/turf/open/floor{dir=1;icon_state="red";} : /turf/open/floor/red/north -/turf/open/floor{dir=1;icon_state="redcorner";} : /turf/open/floor/redcorner/north -/turf/open/floor{dir=1;icon_state="vault";} : /turf/open/floor/vault2/north -/turf/open/floor{dir=1;icon_state="warning";} : /turf/open/floor/warning/north -/turf/open/floor{dir=1;icon_state="warningcorner";} : /turf/open/floor/warningcorner/north -/turf/open/floor{dir=1;icon_state="warnwhite";} : /turf/open/floor/warnwhite/north -/turf/open/floor{dir=1;icon_state="whiteblue";} : /turf/open/floor/whiteblue/north -/turf/open/floor{dir=1;icon_state="whitebluecorner";} : /turf/open/floor/whitebluecorner/north -/turf/open/floor{dir=1;icon_state="whitegreen";} : /turf/open/floor/whitegreen/north -/turf/open/floor{dir=1;icon_state="whitegreencorner";} : /turf/open/floor/whitegreencorner/north -/turf/open/floor{dir=1;icon_state="whitepurple";} : /turf/open/floor/whitepurple/north -/turf/open/floor{dir=1;icon_state="whitepurplecorner";} : /turf/open/floor/whitepurplecorner/north -/turf/open/floor{dir=1;icon_state="whitered";} : /turf/open/floor/whitered/north -/turf/open/floor{dir=1;icon_state="whiteredcorner";} : /turf/open/floor/whiteredcorner/north -/turf/open/floor{dir=1;icon_state="whiteyellow";} : /turf/open/floor/whiteyellow/north -/turf/open/floor{dir=1;icon_state="whiteyellowcorner";} : /turf/open/floor/whiteyellowcorner/north -/turf/open/floor{dir=4;icon_state="asteroidwarning";} : /turf/open/floor/asteroidwarning/east -/turf/open/floor{dir=4;icon_state="chapel";} : /turf/open/floor/chapel/east -/turf/open/floor{dir=4;icon_state="darkblue2";} : /turf/open/floor/darkblue2/east -/turf/open/floor{dir=4;icon_state="darkbrown2";} : /turf/open/floor/darkbrown2/east -/turf/open/floor{dir=4;icon_state="darkbrowncorners2";} : /turf/open/floor/darkbrowncorners2/east -/turf/open/floor{dir=4;icon_state="darkgreen2";} : /turf/open/floor/darkgreen2/east -/turf/open/floor{dir=4;icon_state="darkgreencorners2";} : /turf/open/floor/darkgreencorners2/east -/turf/open/floor{dir=4;icon_state="darkpurple2";} : /turf/open/floor/darkpurple2/east -/turf/open/floor{dir=4;icon_state="darkpurplecorners2";} : /turf/open/floor/darkpurplecorners2/east -/turf/open/floor{dir=4;icon_state="darkred2";} : /turf/open/floor/darkred2/east -/turf/open/floor{dir=4;icon_state="darkredcorners2";} : /turf/open/floor/darkredcorners2/east -/turf/open/floor{dir=4;icon_state="darkyellow2";} : /turf/open/floor/darkyellow2/east -/turf/open/floor{dir=4;icon_state="darkyellowcorners2";} : /turf/open/floor/darkyellowcorners2/east -/turf/open/floor{dir=4;icon_state="loadingarea";} : /turf/open/floor/loadingarea/east -/turf/open/floor{dir=4;icon_state="purple";} : /turf/open/floor/purple/east -/turf/open/floor{dir=4;icon_state="red";} : /turf/open/floor/red/east -/turf/open/floor{dir=4;icon_state="redcorner";} : /turf/open/floor/redcorner/east -/turf/open/floor{dir=4;icon_state="warning";} : /turf/open/floor/warning/east -/turf/open/floor{dir=4;icon_state="warningcorner";} : /turf/open/floor/warningcorner/east -/turf/open/floor{dir=4;icon_state="warnwhite";} : /turf/open/floor/warnwhite/east -/turf/open/floor{dir=4;icon_state="whiteblue";} : /turf/open/floor/whiteblue/east -/turf/open/floor{dir=4;icon_state="whitebluecorner";} : /turf/open/floor/whitebluecorner/east -/turf/open/floor{dir=4;icon_state="whitegreen";} : /turf/open/floor/whitegreen/east -/turf/open/floor{dir=4;icon_state="whitegreencorner";} : /turf/open/floor/whitegreencorner/east -/turf/open/floor{dir=4;icon_state="whitepurple";} : /turf/open/floor/whitepurple/east -/turf/open/floor{dir=4;icon_state="whitepurplecorner";} : /turf/open/floor/whitepurplecorner/east -/turf/open/floor{dir=4;icon_state="whitered";} : /turf/open/floor/whitered/east -/turf/open/floor{dir=4;icon_state="whiteredcorner";} : /turf/open/floor/whiteredcorner/east -/turf/open/floor{dir=4;icon_state="whiteyellow";} : /turf/open/floor/whiteyellow/east -/turf/open/floor{dir=4;icon_state="whiteyellowcorner";} : /turf/open/floor/whiteyellowcorner/east -/turf/open/floor{dir=4;icon_state="whiteyellowfull";} : /turf/open/floor/whiteyellowfull/east -/turf/open/floor{dir=5;icon_state="asteroidwarning";} : /turf/open/floor/asteroidwarning/northeast -/turf/open/floor{dir=5;icon_state="chapel";} : /turf/open/floor/chapel/northeast -/turf/open/floor{dir=5;icon_state="darkblue2";} : /turf/open/floor/darkblue2/northeast -/turf/open/floor{dir=5;icon_state="darkbrown2";} : /turf/open/floor/darkbrown2/northeast -/turf/open/floor{dir=5;icon_state="darkgreen2";} : /turf/open/floor/darkgreen2/northeast -/turf/open/floor{dir=5;icon_state="darkpurple2";} : /turf/open/floor/darkpurple2/northeast -/turf/open/floor{dir=5;icon_state="darkred2";} : /turf/open/floor/darkred2/northeast -/turf/open/floor{dir=5;icon_state="darkyellow2";} : /turf/open/floor/darkyellow2/northeast -/turf/open/floor{dir=5;icon_state="podhatch";} : /turf/open/floor/podhatch/northeast -/turf/open/floor{dir=5;icon_state="purple";} : /turf/open/floor/purple/northeast -/turf/open/floor{dir=5;icon_state="red";} : /turf/open/floor/red/northeast -/turf/open/floor{dir=5;icon_state="vault";} : /turf/open/floor/vault2/northeast -/turf/open/floor{dir=5;icon_state="warning";} : /turf/open/floor/warning/northeast -/turf/open/floor{dir=5;icon_state="warnwhite";} : /turf/open/floor/warnwhite/northeast -/turf/open/floor{dir=5;icon_state="whiteblue";} : /turf/open/floor/whiteblue/northeast -/turf/open/floor{dir=5;icon_state="whitebluefull";} : /turf/open/floor/whitebluefull/northeast -/turf/open/floor{dir=5;icon_state="whitegreen";} : /turf/open/floor/whitegreen/northeast -/turf/open/floor{dir=5;icon_state="whitegreen_v";} : /turf/open/floor/whitegreen_v/northeast -/turf/open/floor{dir=5;icon_state="whitegreenfull";} : /turf/open/floor/whitegreenfull/northeast -/turf/open/floor{dir=5;icon_state="whitepurple";} : /turf/open/floor/whitepurple/northeast -/turf/open/floor{dir=5;icon_state="whitered";} : /turf/open/floor/whitered/northeast -/turf/open/floor{dir=5;icon_state="whiteyellow";} : /turf/open/floor/whiteyellow/northeast -/turf/open/floor{dir=6;icon_state="asteroidwarning";} : /turf/open/floor/asteroidwarning/southeast -/turf/open/floor{dir=6;icon_state="darkblue2";} : /turf/open/floor/darkblue2/southeast -/turf/open/floor{dir=6;icon_state="darkbrown2";} : /turf/open/floor/darkbrown2/southeast -/turf/open/floor{dir=6;icon_state="darkgreen2";} : /turf/open/floor/darkgreen2/southeast -/turf/open/floor{dir=6;icon_state="darkpurple2";} : /turf/open/floor/darkpurple2/southeast -/turf/open/floor{dir=6;icon_state="darkred2";} : /turf/open/floor/darkred2/southeast -/turf/open/floor{dir=6;icon_state="darkyellow2";} : /turf/open/floor/darkyellow2/southeast -/turf/open/floor{dir=6;icon_state="podhatch";} : /turf/open/floor/podhatch/southeast -/turf/open/floor{dir=6;icon_state="purple";} : /turf/open/floor/purple/southeast -/turf/open/floor{dir=6;icon_state="red";} : /turf/open/floor/red/southeast -/turf/open/floor{dir=6;icon_state="warning";} : /turf/open/floor/warning/southeast -/turf/open/floor{dir=6;icon_state="warnwhite";} : /turf/open/floor/warnwhite/southeast -/turf/open/floor{dir=6;icon_state="whiteblue";} : /turf/open/floor/whiteblue/southeast -/turf/open/floor{dir=6;icon_state="whitegreen";} : /turf/open/floor/whitegreen/southeast -/turf/open/floor{dir=6;icon_state="whitepurple";} : /turf/open/floor/whitepurple/southeast -/turf/open/floor{dir=6;icon_state="whitered";} : /turf/open/floor/whitered/southeast -/turf/open/floor{dir=6;icon_state="whiteyellow";} : /turf/open/floor/whiteyellow/southeast -/turf/open/floor{dir=8;icon_state="asteroidwarning";} : /turf/open/floor/asteroidwarning/west -/turf/open/floor{dir=8;icon_state="barber";} : /turf/open/floor/barber/west -/turf/open/floor{dir=8;icon_state="carpet10-8";} : /turf/open/floor/carpet10_8/west -/turf/open/floor{dir=8;icon_state="carpet11-12";} : /turf/open/floor/carpet11_12/west -/turf/open/floor{dir=8;icon_state="carpet13-5";} : /turf/open/floor/carpet13_5/west -/turf/open/floor{dir=8;icon_state="carpet14-10";} : /turf/open/floor/carpet14_10/west -/turf/open/floor{dir=8;icon_state="carpet15-15";} : /turf/open/floor/carpet15_15/west -/turf/open/floor{dir=8;icon_state="carpet5-1";} : /turf/open/floor/carpet5_1/west -/turf/open/floor{dir=8;icon_state="carpet6-2";} : /turf/open/floor/carpet6_2/west -/turf/open/floor{dir=8;icon_state="carpet7-3";} : /turf/open/floor/carpet7_3/west -/turf/open/floor{dir=8;icon_state="carpet9-4";} : /turf/open/floor/carpet9_4/west -/turf/open/floor{dir=8;icon_state="chapel";} : /turf/open/floor/chapel/west -/turf/open/floor{dir=8;icon_state="damaged2";} : /turf/open/floor/damaged2/west -/turf/open/floor{dir=8;icon_state="damaged3";} : /turf/open/floor/damaged3/west -/turf/open/floor{dir=8;icon_state="damaged4";} : /turf/open/floor/damaged4/west -/turf/open/floor{dir=8;icon_state="damaged5";} : /turf/open/floor/damaged5/west -/turf/open/floor{dir=8;icon_state="darkblue2";} : /turf/open/floor/darkblue2/west -/turf/open/floor{dir=8;icon_state="darkbrown2";} : /turf/open/floor/darkbrown2/west -/turf/open/floor{dir=8;icon_state="darkbrowncorners2";} : /turf/open/floor/darkbrowncorners2/west -/turf/open/floor{dir=8;icon_state="darkgreen2";} : /turf/open/floor/darkgreen2/west -/turf/open/floor{dir=8;icon_state="darkgreencorners2";} : /turf/open/floor/darkgreencorners2/west -/turf/open/floor{dir=8;icon_state="darkpurple2";} : /turf/open/floor/darkpurple2/west -/turf/open/floor{dir=8;icon_state="darkpurplecorners2";} : /turf/open/floor/darkpurplecorners2/west -/turf/open/floor{dir=8;icon_state="darkred2";} : /turf/open/floor/darkred2/west -/turf/open/floor{dir=8;icon_state="darkredcorners2";} : /turf/open/floor/darkredcorners2/west -/turf/open/floor{dir=8;icon_state="darkyellow2";} : /turf/open/floor/darkyellow2/west -/turf/open/floor{dir=8;icon_state="darkyellowcorners2";} : /turf/open/floor/darkyellowcorners2/west -/turf/open/floor{dir=8;icon_state="loadingarea";} : /turf/open/floor/loadingarea/west -/turf/open/floor{dir=8;icon_state="purple";} : /turf/open/floor/purple/west -/turf/open/floor{dir=8;icon_state="purplecorner";} : /turf/open/floor/purplecorner/west -/turf/open/floor{dir=8;icon_state="red";} : /turf/open/floor/red/west -/turf/open/floor{dir=8;icon_state="redcorner";} : /turf/open/floor/redcorner/west -/turf/open/floor{dir=8;icon_state="vault";} : /turf/open/floor/vault2/west -/turf/open/floor{dir=8;icon_state="warning";} : /turf/open/floor/warning/west -/turf/open/floor{dir=8;icon_state="warningcorner";} : /turf/open/floor/warningcorner/west -/turf/open/floor{dir=8;icon_state="warnwhite";} : /turf/open/floor/warnwhite/west -/turf/open/floor{dir=8;icon_state="whiteblue";} : /turf/open/floor/whiteblue/west -/turf/open/floor{dir=8;icon_state="whitebluecorner";} : /turf/open/floor/whitebluecorner/west -/turf/open/floor{dir=8;icon_state="whitegreen";} : /turf/open/floor/whitegreen/west -/turf/open/floor{dir=8;icon_state="whitegreencorner";} : /turf/open/floor/whitegreencorner/west -/turf/open/floor{dir=8;icon_state="whitepurple";} : /turf/open/floor/whitepurple/west -/turf/open/floor{dir=8;icon_state="whitepurplecorner";} : /turf/open/floor/whitepurplecorner/west -/turf/open/floor{dir=8;icon_state="whitered";} : /turf/open/floor/whitered/west -/turf/open/floor{dir=8;icon_state="whiteredcorner";} : /turf/open/floor/whiteredcorner/west -/turf/open/floor{dir=8;icon_state="whiteyellow";} : /turf/open/floor/whiteyellow/west -/turf/open/floor{dir=8;icon_state="whiteyellowcorner";} : /turf/open/floor/whiteyellowcorner/west -/turf/open/floor{dir=9;icon_state="asteroidwarning";} : /turf/open/floor/asteroidwarning/northwest -/turf/open/floor{dir=9;icon_state="brown";} : /turf/open/floor/brown/northwest -/turf/open/floor{dir=9;icon_state="darkblue2";} : /turf/open/floor/darkblue2/northwest -/turf/open/floor{dir=9;icon_state="darkbrown2";} : /turf/open/floor/darkbrown2/northwest -/turf/open/floor{dir=9;icon_state="darkgreen2";} : /turf/open/floor/darkgreen2/northwest -/turf/open/floor{dir=9;icon_state="darkpurple2";} : /turf/open/floor/darkpurple2/northwest -/turf/open/floor{dir=9;icon_state="darkred2";} : /turf/open/floor/darkred2/northwest -/turf/open/floor{dir=9;icon_state="darkyellow2";} : /turf/open/floor/darkyellow2/northwest -/turf/open/floor{dir=9;icon_state="green";} : /turf/open/floor/green/northwest -/turf/open/floor{dir=9;icon_state="podhatch";} : /turf/open/floor/podhatch/northwest -/turf/open/floor{dir=9;icon_state="purple";} : /turf/open/floor/purple/northwest -/turf/open/floor{dir=9;icon_state="red";} : /turf/open/floor/red/northwest -/turf/open/floor{dir=9;icon_state="redfull";} : /turf/open/floor/redfull/northwest -/turf/open/floor{dir=9;icon_state="warning";} : /turf/open/floor/warning/northwest -/turf/open/floor{dir=9;icon_state="warnwhite";} : /turf/open/floor/warnwhite/northwest -/turf/open/floor{dir=9;icon_state="whiteblue";} : /turf/open/floor/whiteblue/northwest -/turf/open/floor{dir=9;icon_state="whitegreen";} : /turf/open/floor/whitegreen/northwest -/turf/open/floor{dir=9;icon_state="whitegreen_v";} : /turf/open/floor/whitegreen_v/northwest -/turf/open/floor{dir=9;icon_state="whitepurple";} : /turf/open/floor/whitepurple/northwest -/turf/open/floor{dir=9;icon_state="whitered";} : /turf/open/floor/whitered/northwest -/turf/open/floor{dir=9;icon_state="whiteyellow";} : /turf/open/floor/whiteyellow/northwest -/turf/open/floor{icon_state="asteroid";} : /turf/open/floor/asteroid -/turf/open/floor{icon_state="asteroidfloor";dir=1;} : /turf/open/floor/asteroidfloor/north -/turf/open/floor{icon_state="asteroidplating";} : /turf/open/floor/asteroidplating -/turf/open/floor{icon_state="asteroidwarning";dir=10;} : /turf/open/floor/asteroidwarning/southwest -/turf/open/floor{icon_state="asteroidwarning";dir=1;} : /turf/open/floor/asteroidwarning/north -/turf/open/floor{icon_state="asteroidwarning";dir=4;} : /turf/open/floor/asteroidwarning/east -/turf/open/floor{icon_state="asteroidwarning";dir=5;} : /turf/open/floor/asteroidwarning/northeast -/turf/open/floor{icon_state="asteroidwarning";dir=6;} : /turf/open/floor/asteroidwarning/southeast -/turf/open/floor{icon_state="asteroidwarning";dir=8;} : /turf/open/floor/asteroidwarning/west -/turf/open/floor{icon_state="asteroidwarning";dir=9;} : /turf/open/floor/asteroidwarning/northwest -/turf/open/floor{icon_state="asteroidwarning";} : /turf/open/floor/asteroidwarning -/turf/open/floor{icon_state="bar";} : /turf/open/floor/bar -/turf/open/floor{icon_state="bcircuit";} : /turf/open/floor/bcircuit -/turf/open/floor{icon_state="bluecorner";} : /turf/open/floor/bluecorner -/turf/open/floor{icon_state="blueyellowfull";} : /turf/open/floor/blueyellowfull -/turf/open/floor{icon_state="bot";} : /turf/open/floor/bot -/turf/open/floor{icon_state="cafeteria";} : /turf/open/floor/cafeteria -/turf/open/floor{icon_state="chapel";} : /turf/open/floor/chapel -/turf/open/floor{icon_state="cmo";} : /turf/open/floor/cmo -/turf/open/floor{icon_state="cult";} : /turf/open/floor/cult -/turf/open/floor{icon_state="damaged2";} : /turf/open/floor/damaged2 -/turf/open/floor{icon_state="damaged3";} : /turf/open/floor/damaged3 -/turf/open/floor{icon_state="damaged4";} : /turf/open/floor/damaged4 -/turf/open/floor{icon_state="damaged5";} : /turf/open/floor/damaged5 -/turf/open/floor{icon_state="dark";} : /turf/open/floor/dark -/turf/open/floor{icon_state="dark2";} : /turf/open/floor/dark2 -/turf/open/floor{icon_state="darkblue2";} : /turf/open/floor/darkblue2 -/turf/open/floor{icon_state="darkbluecorners2";} : /turf/open/floor/darkbluecorners2 -/turf/open/floor{icon_state="darkbrown2";} : /turf/open/floor/darkbrown2 -/turf/open/floor{icon_state="darkbrowncorners2";} : /turf/open/floor/darkbrowncorners2 -/turf/open/floor{icon_state="darkgreen2";} : /turf/open/floor/darkgreen2 -/turf/open/floor{icon_state="darkgreencorners2";} : /turf/open/floor/darkgreencorners2 -/turf/open/floor{icon_state="darkish";} : /turf/open/floor/darkish -/turf/open/floor{icon_state="darkpurple2";} : /turf/open/floor/darkpurple2 -/turf/open/floor{icon_state="darkpurplecorners2";} : /turf/open/floor/darkpurplecorners2 -/turf/open/floor{icon_state="darkred2";} : /turf/open/floor/darkred2 -/turf/open/floor{icon_state="darkredcorners2";} : /turf/open/floor/darkredcorners2 -/turf/open/floor{icon_state="darkyellow2";} : /turf/open/floor/darkyellow2 -/turf/open/floor{icon_state="darkyellowcorners2";} : /turf/open/floor/darkyellowcorners2 -/turf/open/floor{icon_state="delivery";} : /turf/open/floor/delivery -/turf/open/floor{icon_state="floor4";} : /turf/open/floor/floor4 -/turf/open/floor{icon_state="floorscorched1";} : /turf/open/floor/floorscorched1 -/turf/open/floor{icon_state="floorscorched2";} : /turf/open/floor/floorscorched2 -/turf/open/floor{icon_state="freezerfloor";} : /turf/open/floor/freezerfloor -/turf/open/floor{icon_state="grimy";} : /turf/open/floor/grimy -/turf/open/floor{icon_state="hydrofloor";} : /turf/open/floor/hydrofloor -/turf/open/floor{icon_state="loadingarea";} : /turf/open/floor/loadingarea -/turf/open/floor{icon_state="neutral";} : /turf/open/floor/neutral -/turf/open/floor{icon_state="panelscorched";} : /turf/open/floor/panelscorched -/turf/open/floor{icon_state="platebot";} : /turf/open/floor/platebot -/turf/open/floor{icon_state="platingdmg1";} : /turf/open/floor/platingdmg1 -/turf/open/floor{icon_state="platingdmg3";} : /turf/open/floor/platingdmg3 -/turf/open/floor{icon_state="podhatch";} : /turf/open/floor/podhatch -/turf/open/floor{icon_state="podhatchfloor";} : /turf/open/floor/podhatchfloor -/turf/open/floor{icon_state="purple";} : /turf/open/floor/purple -/turf/open/floor{icon_state="purplecorner";} : /turf/open/floor/purplecorner -/turf/open/floor{icon_state="rampbottom";} : /turf/open/floor/rampbottom -/turf/open/floor{icon_state="red";} : /turf/open/floor/red -/turf/open/floor{icon_state="redcorner";} : /turf/open/floor/redcorner -/turf/open/floor{icon_state="redyellowfull";} : /turf/open/floor/redyellowfull -/turf/open/floor{icon_state="vault";} : /turf/open/floor/vault2 -/turf/open/floor{icon_state="wall_thermite";} : /turf/open/floor/wall_thermite -/turf/open/floor{icon_state="warning";} : /turf/open/floor/warning -/turf/open/floor{icon_state="warnwhite";dir=1;} : /turf/open/floor/warnwhite/north -/turf/open/floor{icon_state="warnwhite";} : /turf/open/floor/warnwhite -/turf/open/floor{icon_state="white";} : /turf/open/floor/white -/turf/open/floor{icon_state="whiteblue";} : /turf/open/floor/whiteblue -/turf/open/floor{icon_state="whitebluecorner";} : /turf/open/floor/whitebluecorner -/turf/open/floor{icon_state="whitebluefull";} : /turf/open/floor/whitebluefull -/turf/open/floor{icon_state="whitegreen";} : /turf/open/floor/whitegreen -/turf/open/floor{icon_state="whitegreencorner";} : /turf/open/floor/whitegreencorner -/turf/open/floor{icon_state="whitegreenfull";} : /turf/open/floor/whitegreenfull -/turf/open/floor{icon_state="whitepurple";} : /turf/open/floor/whitepurple -/turf/open/floor{icon_state="whitepurplecorner";} : /turf/open/floor/whitepurplecorner -/turf/open/floor{icon_state="whitepurplefull";} : /turf/open/floor/whitepurplefull -/turf/open/floor{icon_state="whitered";} : /turf/open/floor/whitered -/turf/open/floor{icon_state="whiteredcorner";} : /turf/open/floor/whiteredcorner -/turf/open/floor{icon_state="whiteredfull";} : /turf/open/floor/whiteredfull -/turf/open/floor{icon_state="whiteyellow";} : /turf/open/floor/whiteyellow -/turf/open/floor{icon_state="whiteyellowcorner";} : /turf/open/floor/whiteyellowcorner -/turf/open/floor{icon_state="whiteyellowfull";} : /turf/open/floor/whiteyellowfull -/turf/open/floor{icon_state="wood";} : /turf/open/floor/wood -/turf/open/floor{icon_state="yellowfull";} : /turf/open/floor/yellowfull -/turf/open/gm/coast{dir=1;} : /turf/open/gm/coast/south -/turf/open/gm/coast{dir=4;icon_state="beachcorner";} : /turf/open/gm/coast/beachcorner/south_east -/turf/open/gm/coast{dir=8;icon_state="beachcorner2";} : /turf/open/gm/coast/beachcorner2/south_east -/turf/open/gm/coast{dir=8;} : /turf/open/gm/coast/east -/turf/open/gm/coast{dir=9;} : /turf/open/gm/coast/south_east -/turf/open/gm/dirtgrassborder/weedable{icon_state="grass1";} : /turf/open/gm/dirtgrassborder/weedable/grass1 -/turf/open/gm/dirtgrassborder2{dir=1;} : /turf/open/gm/dirtgrassborder2/north -/turf/open/gm/dirtgrassborder2{dir=4;} : /turf/open/gm/dirtgrassborder2/east -/turf/open/gm/dirtgrassborder2{dir=8;} : /turf/open/gm/dirtgrassborder2/west -/turf/open/gm/dirtgrassborder2{icon_state="wall2";} : /turf/open/gm/dirtgrassborder2/wall2 -/turf/open/gm/dirtgrassborder2{icon_state="wall3";} : /turf/open/gm/dirtgrassborder2/wall3 -/turf/open/gm/dirtgrassborder{dir=1;icon_state="grassdirt_corner";} : /turf/open/gm/dirtgrassborder/grassdirt_corner/north_east -/turf/open/gm/dirtgrassborder{dir=1;icon_state="grassdirt_corner2";} : /turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east -/turf/open/gm/dirtgrassborder{dir=4;icon_state="grassdirt_corner";} : /turf/open/gm/dirtgrassborder/grassdirt_corner/south_east -/turf/open/gm/dirtgrassborder{dir=4;icon_state="grassdirt_corner2";} : /turf/open/gm/dirtgrassborder/grassdirt_corner2/north_east -/turf/open/gm/dirtgrassborder{dir=4;} : /turf/open/gm/dirtgrassborder/west -/turf/open/gm/dirtgrassborder{dir=8;} : /turf/open/gm/dirtgrassborder/east -/turf/open/gm/dirtgrassborder{icon_state="desert";} : /turf/open/gm/dirtgrassborder/desert -/turf/open/gm/dirtgrassborder{icon_state="desert0";} : /turf/open/gm/dirtgrassborder/desert0 -/turf/open/gm/dirtgrassborder{icon_state="desert1";} : /turf/open/gm/dirtgrassborder/desert1 -/turf/open/gm/dirtgrassborder{icon_state="desert2";} : /turf/open/gm/dirtgrassborder/desert2 -/turf/open/gm/dirtgrassborder{icon_state="desert3";} : /turf/open/gm/dirtgrassborder/desert3 -/turf/open/gm/dirtgrassborder{icon_state="desert_dug";} : /turf/open/gm/dirtgrassborder/desert_dug -/turf/open/gm/dirt{icon_state="desert0";} : /turf/open/gm/dirt/desert0 -/turf/open/gm/dirt{icon_state="desert1";} : /turf/open/gm/dirt/desert1 -/turf/open/gm/dirt{icon_state="desert2";} : /turf/open/gm/dirt/desert2 -/turf/open/gm/dirt{icon_state="desert3";} : /turf/open/gm/dirt/desert3 -/turf/open/gm/dirt{icon_state="desert_dug";} : /turf/open/gm/dirt/desert_dug -/turf/open/gm/grass{icon_state="grass2";} : /turf/open/gm/grass/grass2 -/turf/open/gm/river/desert/deep{base_river_slowdown=0;} : /turf/open/gm/river/desert/deep/no_slowdown -/turf/open/gm/river/desert/deep{icon='icons/turf/floors/desert_water_toxic.dmi';} : /turf/open/gm/river/desert/deep/toxic -/turf/open/gm/river/desert/shallow_corner{dir=1;} : /turf/open/gm/river/desert/shallow_corner/north -/turf/open/gm/river/desert/shallow_corner{dir=4;} : /turf/open/gm/river/desert/shallow_corner/east -/turf/open/gm/river/desert/shallow_corner{dir=8;} : /turf/open/gm/river/desert/shallow_corner/west -/turf/open/gm/river/desert/shallow_edge/covered{dir=1;} : /turf/open/gm/river/desert/shallow_edge/covered/north -/turf/open/gm/river/desert/shallow_edge/covered{dir=4;} : /turf/open/gm/river/desert/shallow_edge/covered/east -/turf/open/gm/river/desert/shallow_edge/covered{dir=5;} : /turf/open/gm/river/desert/shallow_edge/covered/northeast -/turf/open/gm/river/desert/shallow_edge/covered{dir=8;} : /turf/open/gm/river/desert/shallow_edge/covered/west -/turf/open/gm/river/desert/shallow_edge{dir=10;} : /turf/open/gm/river/desert/shallow_edge/southwest -/turf/open/gm/river/desert/shallow_edge{dir=1;} : /turf/open/gm/river/desert/shallow_edge/north -/turf/open/gm/river/desert/shallow_edge{dir=4;} : /turf/open/gm/river/desert/shallow_edge/east -/turf/open/gm/river/desert/shallow_edge{dir=5;} : /turf/open/gm/river/desert/shallow_edge/northeast -/turf/open/gm/river/desert/shallow_edge{dir=6;} : /turf/open/gm/river/desert/shallow_edge/southeast -/turf/open/gm/river/desert/shallow_edge{dir=8;} : /turf/open/gm/river/desert/shallow_edge/west -/turf/open/gm/river/desert/shallow_edge{dir=9;} : /turf/open/gm/river/desert/shallow_edge/northwest -/turf/open/gm/river/desert/shallow{icon='icons/turf/floors/desert_water_toxic.dmi';} : /turf/open/gm/river/desert/shallow/toxic -/turf/open/gm/river/desert/shallow{name="pool";} : /turf/open/gm/river/desert/shallow/pool -/turf/open/gm/river/ocean{name="deep ocean";default_name="deep ocean";} : /turf/open/gm/river/ocean/deep_ocean -/turf/open/gm/river{color="#990000";name="pool";} : /turf/open/gm/river/darkred_pool -/turf/open/gm/river{color="#990000";} : /turf/open/gm/river/darkred -/turf/open/gm/river{color="#995555";name="pool";} : /turf/open/gm/river/red_pool -/turf/open/gm/river{color="#995555";} : /turf/open/gm/river/red -/turf/open/gm/river{name="pool";} : /turf/open/gm/river/pool -/turf/open/gm/river{name="shallow ocean";default_name="shallow ocean";} : /turf/open/gm/river/shallow_ocean_shallow_ocean -/turf/open/jungle/impenetrable{icon_state="grass_clear";} : /turf/open/jungle/impenetrable/grass_clear -/turf/open/jungle{bushes_spawn=0;icon_state="grass_impenetrable";} : /turf/open/jungle/impenetrable -/turf/open/mars_cave{icon_state="mars_cave_10";} : /turf/open/mars_cave/mars_cave_10 -/turf/open/mars_cave{icon_state="mars_cave_11";} : /turf/open/mars_cave/mars_cave_11 -/turf/open/mars_cave{icon_state="mars_cave_12";} : /turf/open/mars_cave/mars_cave_12 -/turf/open/mars_cave{icon_state="mars_cave_13";} : /turf/open/mars_cave/mars_cave_13 -/turf/open/mars_cave{icon_state="mars_cave_14";} : /turf/open/mars_cave/mars_cave_14 -/turf/open/mars_cave{icon_state="mars_cave_15";} : /turf/open/mars_cave/mars_cave_15 -/turf/open/mars_cave{icon_state="mars_cave_16";} : /turf/open/mars_cave/mars_cave_16 -/turf/open/mars_cave{icon_state="mars_cave_17";} : /turf/open/mars_cave/mars_cave_17 -/turf/open/mars_cave{icon_state="mars_cave_18";} : /turf/open/mars_cave/mars_cave_18 -/turf/open/mars_cave{icon_state="mars_cave_19";} : /turf/open/mars_cave/mars_cave_19 -/turf/open/mars_cave{icon_state="mars_cave_2";} : /turf/open/mars_cave/mars_cave_2 -/turf/open/mars_cave{icon_state="mars_cave_20";} : /turf/open/mars_cave/mars_cave_20 -/turf/open/mars_cave{icon_state="mars_cave_22";} : /turf/open/mars_cave/mars_cave_22 -/turf/open/mars_cave{icon_state="mars_cave_23";} : /turf/open/mars_cave/mars_cave_23 -/turf/open/mars_cave{icon_state="mars_cave_3";} : /turf/open/mars_cave/mars_cave_3 -/turf/open/mars_cave{icon_state="mars_cave_4";} : /turf/open/mars_cave/mars_cave_4 -/turf/open/mars_cave{icon_state="mars_cave_5";} : /turf/open/mars_cave/mars_cave_5 -/turf/open/mars_cave{icon_state="mars_cave_6";} : /turf/open/mars_cave/mars_cave_6 -/turf/open/mars_cave{icon_state="mars_cave_7";} : /turf/open/mars_cave/mars_cave_7 -/turf/open/mars_cave{icon_state="mars_cave_8";} : /turf/open/mars_cave/mars_cave_8 -/turf/open/mars_cave{icon_state="mars_cave_9";} : /turf/open/mars_cave/mars_cave_9 -/turf/open/mars_cave{icon_state="mars_dirt_4";} : /turf/open/mars_cave/mars_dirt_4 -/turf/open/mars_cave{icon_state="mars_dirt_5";} : /turf/open/mars_cave/mars_dirt_5 -/turf/open/mars_cave{icon_state="mars_dirt_6";} : /turf/open/mars_cave/mars_dirt_6 -/turf/open/mars_cave{icon_state="mars_dirt_7";} : /turf/open/mars_cave/mars_dirt_7 -/turf/open/mars_dirt{icon_state="mars_cave_10";} : /turf/open/mars_dirt/mars_cave_10 -/turf/open/mars_dirt{icon_state="mars_cave_11";} : /turf/open/mars_dirt/mars_cave_11 -/turf/open/mars_dirt{icon_state="mars_cave_3";} : /turf/open/mars_dirt/mars_cave_3 -/turf/open/mars_dirt{icon_state="mars_cave_6";} : /turf/open/mars_dirt/mars_cave_6 -/turf/open/mars_dirt{icon_state="mars_cave_7";} : /turf/open/mars_dirt/mars_cave_7 -/turf/open/mars_dirt{icon_state="mars_cave_8";} : /turf/open/mars_dirt/mars_cave_8 -/turf/open/mars{icon_state="mars_cave_10";} : /turf/open/mars/mars_cave_10 -/turf/open/mars{icon_state="mars_dirt_10";} : /turf/open/mars/mars_dirt_10 -/turf/open/mars{icon_state="mars_dirt_11";} : /turf/open/mars/mars_dirt_11 -/turf/open/mars{icon_state="mars_dirt_12";} : /turf/open/mars/mars_dirt_12 -/turf/open/mars{icon_state="mars_dirt_13";} : /turf/open/mars/mars_dirt_13 -/turf/open/mars{icon_state="mars_dirt_14";} : /turf/open/mars/mars_dirt_14 -/turf/open/mars{icon_state="mars_dirt_3";} : /turf/open/mars/mars_dirt_3 -/turf/open/mars{icon_state="mars_dirt_5";} : /turf/open/mars/mars_dirt_5 -/turf/open/mars{icon_state="mars_dirt_6";} : /turf/open/mars/mars_dirt_6 -/turf/open/mars{icon_state="mars_dirt_8";} : /turf/open/mars/mars_dirt_8 -/turf/open/mars{icon_state="mars_dirt_9";} : /turf/open/mars/mars_dirt_9 -/turf/open/organic/grass{desc="It'll get in your shoes no matter what you do.";name="astroturf";} : /turf/open/organic/grass/astroturf -/turf/open/organic/grass{name="astroturf";} : /turf/open/organic/grass/astroturf -/turf/open/shuttle/dropship{icon_state="floor8";} : /turf/open/shuttle/dropship/light_grey_single_wide_left_to_right -/turf/open/shuttle/dropship{icon_state="rasputin10";supports_surgery=1;} : /turf/open/shuttle/dropship/can_surgery/light_grey_top -/turf/open/shuttle/dropship{icon_state="rasputin10";} : /turf/open/shuttle/dropship/light_grey_top -/turf/open/shuttle/dropship{icon_state="rasputin12";supports_surgery=1;} : /turf/open/shuttle/dropship/can_surgery/dark_grey_bottom -/turf/open/shuttle/dropship{icon_state="rasputin12";} : /turf/open/shuttle/dropship/dark_grey_bottom -/turf/open/shuttle/dropship{icon_state="rasputin13";} : /turf/open/shuttle/dropship/light_grey_middle -/turf/open/shuttle/dropship{icon_state="rasputin15";} : /turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down -/turf/open/shuttle/dropship{icon_state="rasputin3";} : /turf/open/shuttle/dropship/light_grey_single_wide_up_to_down -/turf/open/shuttle/dropship{icon_state="rasputin4";} : /turf/open/shuttle/dropship/light_grey_bottom_left -/turf/open/shuttle/dropship{icon_state="rasputin5";} : /turf/open/shuttle/dropship/light_grey_left_to_right -/turf/open/shuttle/dropship{icon_state="rasputin6";} : /turf/open/shuttle/dropship/light_grey_top_left -/turf/open/shuttle/dropship{icon_state="rasputin7";} : /turf/open/shuttle/dropship/light_grey_top_right -/turf/open/shuttle/dropship{icon_state="rasputin8";} : /turf/open/shuttle/dropship/light_grey_bottom_right -/turf/open/shuttle/escapepod{icon_state="floor0";dir=1;} : /turf/open/shuttle/escapepod/floor0/north -/turf/open/shuttle/escapepod{icon_state="floor0";dir=8;} : /turf/open/shuttle/escapepod/floor0/west -/turf/open/shuttle/escapepod{icon_state="floor0";} : /turf/open/shuttle/escapepod/floor0 -/turf/open/shuttle/escapepod{icon_state="floor1";dir=4;} : /turf/open/shuttle/escapepod/floor1/east -/turf/open/shuttle/escapepod{icon_state="floor1";} : /turf/open/shuttle/escapepod/floor1 -/turf/open/shuttle/escapepod{icon_state="floor11";} : /turf/open/shuttle/escapepod/floor11 -/turf/open/shuttle/escapepod{icon_state="floor12";} : /turf/open/shuttle/escapepod/floor12 -/turf/open/shuttle/escapepod{icon_state="floor2";} : /turf/open/shuttle/escapepod/floor2 -/turf/open/shuttle/escapepod{icon_state="floor4";} : /turf/open/shuttle/escapepod/floor4 -/turf/open/shuttle/escapepod{icon_state="floor5";} : /turf/open/shuttle/escapepod/floor5 -/turf/open/shuttle/escapepod{icon_state="floor7";} : /turf/open/shuttle/escapepod/floor7 -/turf/open/shuttle/escapepod{icon_state="floor8";} : /turf/open/shuttle/escapepod/floor8 -/turf/open/shuttle/escapepod{icon_state="floor9";} : /turf/open/shuttle/escapepod/floor9 -/turf/open/shuttle/escapepod{dir=1;} : /turf/open/shuttle/escapepod/north -/turf/open/shuttle/escapepod{dir=4;} : /turf/open/shuttle/escapepod/east -/turf/open/shuttle/escapepod{dir=8;} : /turf/open/shuttle/escapepod/west -/turf/open/shuttle/lifeboat{dir=1;icon_state="plating_striped";} : /turf/open/shuttle/lifeboat/plating_striped/north -/turf/open/shuttle/lifeboat{icon_state="plate";} : /turf/open/shuttle/lifeboat/plate -/turf/open/shuttle/lifeboat{icon_state="plating_striped";} : /turf/open/shuttle/lifeboat/plating_striped -/turf/open/shuttle/lifeboat{icon_state="test_floor4";} : /turf/open/shuttle/lifeboat/test_floor4 -/turf/open/shuttle/vehicle{icon_state="dark_sterile";} : /turf/open/shuttle/vehicle/dark_sterile -/turf/open/shuttle/vehicle{icon_state="dark_sterile_green_11";} : /turf/open/shuttle/vehicle/dark_sterile_green_11 -/turf/open/shuttle/vehicle{icon_state="dark_sterile_green_12";} : /turf/open/shuttle/vehicle/dark_sterile_green_12 -/turf/open/shuttle/vehicle{icon_state="dark_sterile_green_13";} : /turf/open/shuttle/vehicle/dark_sterile_green_13 -/turf/open/shuttle/vehicle{icon_state="dark_sterile_green_14";} : /turf/open/shuttle/vehicle/dark_sterile_green_14 -/turf/open/shuttle/vehicle{icon_state="dark_sterile_green_5";} : /turf/open/shuttle/vehicle/dark_sterile_green_5 -/turf/open/shuttle/vehicle{icon_state="dark_sterile_green_6";} : /turf/open/shuttle/vehicle/dark_sterile_green_6 -/turf/open/shuttle/vehicle{icon_state="dark_sterile_green_7";} : /turf/open/shuttle/vehicle/dark_sterile_green_7 -/turf/open/shuttle/vehicle{icon_state="dark_sterile_green_8";} : /turf/open/shuttle/vehicle/dark_sterile_green_8 -/turf/open/shuttle/vehicle{icon_state="floor_0_1_15";} : /turf/open/shuttle/vehicle/floor_0_1_15 -/turf/open/shuttle/vehicle{icon_state="floor_1_1";} : /turf/open/shuttle/vehicle/floor_1_1 -/turf/open/shuttle/vehicle{icon_state="floor_1_10";} : /turf/open/shuttle/vehicle/floor_1_10 -/turf/open/shuttle/vehicle{icon_state="floor_1_11";} : /turf/open/shuttle/vehicle/floor_1_11 -/turf/open/shuttle/vehicle{icon_state="floor_1_12";} : /turf/open/shuttle/vehicle/floor_1_12 -/turf/open/shuttle/vehicle{icon_state="floor_1_13";} : /turf/open/shuttle/vehicle/floor_1_13 -/turf/open/shuttle/vehicle{icon_state="floor_1_14";} : /turf/open/shuttle/vehicle/floor_1_14 -/turf/open/shuttle/vehicle{icon_state="floor_1_1_3";} : /turf/open/shuttle/vehicle/floor_1_1_3 -/turf/open/shuttle/vehicle{icon_state="floor_1_2";} : /turf/open/shuttle/vehicle/floor_1_2 -/turf/open/shuttle/vehicle{icon_state="floor_1_3_3";} : /turf/open/shuttle/vehicle/floor_1_3_3 -/turf/open/shuttle/vehicle{icon_state="floor_1_5";} : /turf/open/shuttle/vehicle/floor_1_5 -/turf/open/shuttle/vehicle{icon_state="floor_1_6";} : /turf/open/shuttle/vehicle/floor_1_6 -/turf/open/shuttle/vehicle{icon_state="floor_1_7";} : /turf/open/shuttle/vehicle/floor_1_7 -/turf/open/shuttle/vehicle{icon_state="floor_1_8";} : /turf/open/shuttle/vehicle/floor_1_8 -/turf/open/shuttle/vehicle{icon_state="floor_1_9";} : /turf/open/shuttle/vehicle/floor_1_9 -/turf/open/shuttle/vehicle{icon_state="floor_3";} : /turf/open/shuttle/vehicle/floor_3 -/turf/open/shuttle/vehicle{icon_state="floor_3_10_1";} : /turf/open/shuttle/vehicle/floor_3_10_1 -/turf/open/shuttle/vehicle{icon_state="floor_3_11";} : /turf/open/shuttle/vehicle/floor_3_11 -/turf/open/shuttle/vehicle{icon_state="floor_3_12";} : /turf/open/shuttle/vehicle/floor_3_12 -/turf/open/shuttle/vehicle{icon_state="floor_3_13";} : /turf/open/shuttle/vehicle/floor_3_13 -/turf/open/shuttle/vehicle{icon_state="floor_3_1_1";} : /turf/open/shuttle/vehicle/floor_3_1_1 -/turf/open/shuttle/vehicle{icon_state="floor_3_3";} : /turf/open/shuttle/vehicle/floor_3_3 -/turf/open/shuttle/vehicle{icon_state="floor_3_4";} : /turf/open/shuttle/vehicle/floor_3_4 -/turf/open/shuttle/vehicle{icon_state="floor_3_5";} : /turf/open/shuttle/vehicle/floor_3_5 -/turf/open/shuttle/vehicle{icon_state="floor_3_6";} : /turf/open/shuttle/vehicle/floor_3_6 -/turf/open/shuttle/vehicle{icon_state="floor_3_7";} : /turf/open/shuttle/vehicle/floor_3_7 -/turf/open/shuttle/vehicle{icon_state="floor_3_7_1";} : /turf/open/shuttle/vehicle/floor_3_7_1 -/turf/open/shuttle/vehicle{icon_state="floor_3_8";} : /turf/open/shuttle/vehicle/floor_3_8 -/turf/open/shuttle/vehicle{icon_state="floor_3_8_1";} : /turf/open/shuttle/vehicle/floor_3_8_1 -/turf/open/shuttle/vehicle{icon_state="floor_3_9";} : /turf/open/shuttle/vehicle/floor_3_9 -/turf/open/shuttle/vehicle{icon_state="floor_3_9_1";} : /turf/open/shuttle/vehicle/floor_3_9_1 -/turf/open/shuttle{icon_state="floor4";} : /turf/open/shuttle/bright_red -/turf/open/shuttle{icon_state="floor6";} : /turf/open/shuttle/red -/turf/open/shuttle{icon_state="floor7";} : /turf/open/shuttle/black - -/turf/open/shuttle/dropship/can_surgery/dark_grey : /turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down -/turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_top_to_bottom : /turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_up_to_down \ No newline at end of file diff --git a/tools/UpdatePaths/Scripts/7096-platforms-paths.txt b/tools/UpdatePaths/Scripts/7096-platforms-paths.txt new file mode 100644 index 000000000000..acd08a84494b --- /dev/null +++ b/tools/UpdatePaths/Scripts/7096-platforms-paths.txt @@ -0,0 +1,293 @@ +/obj/structure/platform{dir=1;icon_state="platform_deco"} : /obj/structure/platform_decoration/metal/almayer/north{@OLD;dir=@SKIP;layer=@SKIP;icon_state=@SKIP} +/obj/structure/platform{dir=4;icon_state="platform_deco"} : /obj/structure/platform_decoration/metal/almayer/east{@OLD;dir=@SKIP;layer=@SKIP;icon_state=@SKIP} +/obj/structure/platform{dir=8;icon_state="platform_deco"} : /obj/structure/platform_decoration/metal/almayer/west{@OLD;dir=@SKIP;layer=@SKIP;icon_state=@SKIP} +/obj/structure/platform{icon_state="platform_deco"} : /obj/structure/platform_decoration/metal/almayer{@OLD;dir=@SKIP;layer=@SKIP;icon_state=@SKIP} + +/obj/structure/platform{dir=1} : /obj/structure/platform/metal/almayer/north{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform{dir=4} : /obj/structure/platform/metal/almayer/east{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform{dir=8} : /obj/structure/platform/metal/almayer/west{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform : /obj/structure/platform/metal/almayer{@OLD;dir=@SKIP;layer=@SKIP} + +/obj/structure/platform_decoration{dir=1} : /obj/structure/platform_decoration/metal/almayer/north{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration{dir=4} : /obj/structure/platform_decoration/metal/almayer/east{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration{dir=5} : /obj/structure/platform_decoration/metal/almayer/northeast{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration{dir=6} : /obj/structure/platform_decoration/metal/almayer/southeast{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration{dir=8} : /obj/structure/platform_decoration/metal/almayer/west{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration{dir=9} : /obj/structure/platform_decoration/metal/almayer/northwest{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration{dir=10} : /obj/structure/platform_decoration/metal/almayer/southwest{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration : /obj/structure/platform_decoration/metal/almayer{@OLD;dir=@SKIP;layer=@SKIP} + + + +/obj/structure/platform/kutjevo{dir=1;icon_state="kutjevo_platform_deco"} : /obj/structure/platform_decoration/metal/kutjevo/north{@OLD;dir=@SKIP;layer=@SKIP;icon_state=@SKIP} +/obj/structure/platform/kutjevo{dir=4;icon_state="kutjevo_platform_deco"} : /obj/structure/platform_decoration/metal/kutjevo/east{@OLD;dir=@SKIP;layer=@SKIP;icon_state=@SKIP} +/obj/structure/platform/kutjevo{dir=8;icon_state="kutjevo_platform_deco"} : /obj/structure/platform_decoration/metal/kutjevo/west{@OLD;dir=@SKIP;layer=@SKIP;icon_state=@SKIP} +/obj/structure/platform/kutjevo{icon_state="kutjevo_platform_deco"} : /obj/structure/platform_decoration/metal/kutjevo{@OLD;dir=@SKIP;layer=@SKIP;icon_state=@SKIP} + +/obj/structure/platform/kutjevo{dir=1} : /obj/structure/platform/metal/kutjevo/north{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/kutjevo{dir=4} : /obj/structure/platform/metal/kutjevo/east{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/kutjevo{dir=8} : /obj/structure/platform/metal/kutjevo/west{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/kutjevo : /obj/structure/platform/metal/kutjevo{@OLD;dir=@SKIP;layer=@SKIP} + +/obj/structure/platform/kutjevo/smooth{dir=1;icon_state="kutjevo_platform_sm_deco"} : /obj/structure/platform_decoration/metal/kutjevo_smooth/north{@OLD;dir=@SKIP;layer=@SKIP;icon_state=@SKIP} +/obj/structure/platform/kutjevo/smooth{dir=4;icon_state="kutjevo_platform_sm_deco"} : /obj/structure/platform_decoration/metal/kutjevo_smooth/east{@OLD;dir=@SKIP;layer=@SKIP;icon_state=@SKIP} +/obj/structure/platform/kutjevo/smooth{dir=8;icon_state="kutjevo_platform_sm_deco"} : /obj/structure/platform_decoration/metal/kutjevo_smooth/west{@OLD;dir=@SKIP;layer=@SKIP;icon_state=@SKIP} +/obj/structure/platform/kutjevo/smooth{icon_state="kutjevo_platform_sm_deco"} : /obj/structure/platform_decoration/metal/kutjevo_smooth{@OLD;dir=@SKIP;layer=@SKIP;icon_state=@SKIP} + +/obj/structure/platform/kutjevo/smooth{dir=1} : /obj/structure/platform/metal/kutjevo_smooth/north{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/kutjevo/smooth{dir=4} : /obj/structure/platform/metal/kutjevo_smooth/east{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/kutjevo/smooth{dir=8} : /obj/structure/platform/metal/kutjevo_smooth/west{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/kutjevo/smooth : /obj/structure/platform/metal/kutjevo_smooth{@OLD;dir=@SKIP;layer=@SKIP} + +/obj/structure/platform/kutjevo/rock{dir=1;icon_state="kutjevo_rock_deco"} : /obj/structure/platform_decoration/stone/kutjevo/north{@OLD;dir=@SKIP;layer=@SKIP;icon_state=@SKIP} +/obj/structure/platform/kutjevo/rock{dir=4;icon_state="kutjevo_rock_deco"} : /obj/structure/platform_decoration/stone/kutjevo/east{@OLD;dir=@SKIP;layer=@SKIP;icon_state=@SKIP} +/obj/structure/platform/kutjevo/rock{dir=8;icon_state="kutjevo_rock_deco"} : /obj/structure/platform_decoration/stone/kutjevo/west{@OLD;dir=@SKIP;layer=@SKIP;icon_state=@SKIP} +/obj/structure/platform/kutjevo/rock{icon_state="kutjevo_rock_deco"} : /obj/structure/platform_decoration/stone/kutjevo{@OLD;dir=@SKIP;layer=@SKIP;icon_state=@SKIP} + +/obj/structure/platform/kutjevo/rock{dir=1} : /obj/structure/platform/stone/kutjevo/north{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/kutjevo/rock{dir=4} : /obj/structure/platform/stone/kutjevo/east{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/kutjevo/rock{dir=8} : /obj/structure/platform/stone/kutjevo/west{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/kutjevo/rock : /obj/structure/platform/stone/kutjevo{@OLD;dir=@SKIP;layer=@SKIP} + +/obj/structure/platform/kutjevo/smooth/stair_plate : /obj/structure/platform/metal/kutjevo_smooth/stair_plate{@OLD;layer=@SKIP} + +/obj/structure/platform_decoration/kutjevo{dir=1} : /obj/structure/platform_decoration/metal/kutjevo/north{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/kutjevo{dir=4} : /obj/structure/platform_decoration/metal/kutjevo/east{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/kutjevo{dir=8} : /obj/structure/platform_decoration/metal/kutjevo/west{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/kutjevo : /obj/structure/platform_decoration/metal/kutjevo{@OLD;dir=@SKIP;layer=@SKIP} + +/obj/structure/platform_decoration/kutjevo/smooth{dir=1} : /obj/structure/platform_decoration/metal/kutjevo_smooth/north{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/kutjevo/smooth{dir=4} : /obj/structure/platform_decoration/metal/kutjevo_smooth/east{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/kutjevo/smooth{dir=8} : /obj/structure/platform_decoration/metal/kutjevo_smooth/west{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/kutjevo/smooth : /obj/structure/platform_decoration/metal/kutjevo_smooth{@OLD;dir=@SKIP;layer=@SKIP} + +/obj/structure/platform_decoration/kutjevo/rock{dir=1} : /obj/structure/platform_decoration/stone/kutjevo/north{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/kutjevo/rock{dir=4} : /obj/structure/platform_decoration/stone/kutjevo/east{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/kutjevo/rock{dir=8} : /obj/structure/platform_decoration/stone/kutjevo/west{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/kutjevo/rock : /obj/structure/platform_decoration/stone/kutjevo{@OLD;dir=@SKIP;layer=@SKIP} + + + +/obj/structure/platform/shiva{dir=1;icon_state="platform_deco"} : /obj/structure/platform_decoration/metal/almayer/north{@OLD;dir=@SKIP;layer=@SKIP;icon_state=@SKIP} +/obj/structure/platform/shiva{dir=4;icon_state="platform_deco"} : /obj/structure/platform_decoration/metal/almayer/east{@OLD;dir=@SKIP;layer=@SKIP;icon_state=@SKIP} +/obj/structure/platform/shiva{dir=8;icon_state="platform_deco"} : /obj/structure/platform_decoration/metal/almayer/west{@OLD;dir=@SKIP;layer=@SKIP;icon_state=@SKIP} +/obj/structure/platform/shiva{icon_state="platform_deco"} : /obj/structure/platform_decoration/metal/almayer{@OLD;dir=@SKIP;layer=@SKIP;icon_state=@SKIP} + +/obj/structure/platform/shiva{dir=1} : /obj/structure/platform/metal/almayer/north{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/shiva{dir=4} : /obj/structure/platform/metal/almayer/east{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/shiva{dir=8} : /obj/structure/platform/metal/almayer/west{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/shiva : /obj/structure/platform/metal/almayer{@OLD;dir=@SKIP;layer=@SKIP} + +/obj/structure/platform/shiva/catwalk{dir=1;icon_state="shiva_deco"} : /obj/structure/platform_decoration/metal/shiva/north{@OLD;dir=@SKIP;layer=@SKIP;icon_state=@SKIP} +/obj/structure/platform/shiva/catwalk{dir=4;icon_state="shiva_deco"} : /obj/structure/platform_decoration/metal/shiva/east{@OLD;dir=@SKIP;layer=@SKIP;icon_state=@SKIP} +/obj/structure/platform/shiva/catwalk{dir=8;icon_state="shiva_deco"} : /obj/structure/platform_decoration_decoration/metal/shiva/west{@OLD;dir=@SKIP;layer=@SKIP;icon_state=@SKIP} +/obj/structure/platform/shiva/catwalk{icon_state="shiva_deco"} : /obj/structure/platform_decoration/metal/shiva{@OLD;dir=@SKIP;layer=@SKIP;icon_state=@SKIP} + +/obj/structure/platform/shiva/catwalk{dir=1} : /obj/structure/platform/metal/shiva/north{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/shiva/catwalk{dir=4} : /obj/structure/platform/metal/shiva/east{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/shiva/catwalk{dir=8} : /obj/structure/platform/metal/shiva/west{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/shiva/catwalk : /obj/structure/platform/metal/shiva{@OLD;dir=@SKIP;layer=@SKIP} + +/obj/structure/platform_decoration/shiva{dir=1} : /obj/structure/platform_decoration/metal/almayer/north{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/shiva{dir=4} : /obj/structure/platform_decoration/metal/almayer/east{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/shiva{dir=8} : /obj/structure/platform_decoration/metal/almayer/west{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/shiva : /obj/structure/platform_decoration/metal/almayer{@OLD;dir=@SKIP;layer=@SKIP} + +/obj/structure/platform_decoration/shiva/catwalk{dir=1} : /obj/structure/platform_decoration/metal/shiva/north{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/shiva/catwalk{dir=4} : /obj/structure/platform_decoration/metal/shiva/east{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/shiva/catwalk{dir=8} : /obj/structure/platform_decoration/metal/shiva/west{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/shiva/catwalk : /obj/structure/platform_decoration/metal/shiva{@OLD;dir=@SKIP;layer=@SKIP} + + +/obj/structure/platform/strata{dir=1;icon_state="strata_platform_deco"} : /obj/structure/platform_decoration/stone/strata/north{@OLD;dir=@SKIP;layer=@SKIP;icon_state=@SKIP} +/obj/structure/platform/strata{dir=4;icon_state="strata_platform_deco"} : /obj/structure/platform_decoration/stone/strata/east{@OLD;dir=@SKIP;layer=@SKIP;icon_state=@SKIP} +/obj/structure/platform/strata{dir=8;icon_state="strata_platform_deco"} : /obj/structure/platform_decoration/stone/strata/west{@OLD;dir=@SKIP;layer=@SKIP;icon_state=@SKIP} +/obj/structure/platform/strata{icon_state="strata_platform_deco"} : /obj/structure/platform_decoration/stone/strata{@OLD;dir=@SKIP;layer=@SKIP;icon_state=@SKIP} + +/obj/structure/platform/strata{dir=1} : /obj/structure/platform/stone/strata/north{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/strata{dir=4} : /obj/structure/platform/stone/strata/east{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/strata{dir=8} : /obj/structure/platform/stone/strata/west{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/strata : /obj/structure/platform/stone/strata{@OLD;dir=@SKIP;layer=@SKIP} + +/obj/structure/platform/strata/metal{dir=1;icon_state="strata_metalplatform_deco"} : /obj/structure/platform_decoration/metal/strata/north{@OLD;dir=@SKIP;layer=@SKIP;icon_state=@SKIP} +/obj/structure/platform/strata/metal{dir=4;icon_state="strata_metalplatform_deco"} : /obj/structure/platform_decoration/metal/strata/east{@OLD;dir=@SKIP;layer=@SKIP;icon_state=@SKIP} +/obj/structure/platform/strata/metal{dir=8;icon_state="strata_metalplatform_deco"} : /obj/structure/platform_decoration/metal/strata/west{@OLD;dir=@SKIP;layer=@SKIP;icon_state=@SKIP} +/obj/structure/platform/strata/metal{icon_state="strata_metalplatform_deco"} : /obj/structure/platform_decoration/metal/strata{@OLD;dir=@SKIP;layer=@SKIP;icon_state=@SKIP} + +/obj/structure/platform/strata/metal{dir=1} : /obj/structure/platform/metal/strata/north{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/strata/metal{dir=4} : /obj/structure/platform/metal/strata/east{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/strata/metal{dir=8} : /obj/structure/platform/metal/strata/west{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/strata/metal : /obj/structure/platform/metal/strata{@OLD;dir=@SKIP;layer=@SKIP} + +/obj/structure/platform_decoration/strata{dir=1} : /obj/structure/platform_decoration/stone/strata/north{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/strata{dir=4} : /obj/structure/platform_decoration/stone/strata/east{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/strata{dir=8} : /obj/structure/platform_decoration/stone/strata/west{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/strata : /obj/structure/platform_decoration/stone/strata{@OLD;dir=@SKIP;layer=@SKIP} + +/obj/structure/platform_decoration/strata/metal{dir=1} : /obj/structure/platform_decoration/metal/strata/north{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/strata/metal{dir=4} : /obj/structure/platform_decoration/metal/strata/east{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/strata/metal{dir=8} : /obj/structure/platform_decoration/metal/strata/west{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/strata/metal : /obj/structure/platform_decoration/metal/strata{@OLD;dir=@SKIP;layer=@SKIP} + + +/obj/structure/platform/mineral{dir=1;icon_state="stone_deco"} : /obj/structure/platform_decoration/stone/mineral/north{@OLD;dir=@SKIP;layer=@SKIP;icon_state=@SKIP} +/obj/structure/platform/mineral{dir=4;icon_state="stone_deco"} : /obj/structure/platform_decoration/stone/mineral/east{@OLD;dir=@SKIP;layer=@SKIP;icon_state=@SKIP} +/obj/structure/platform/mineral{dir=8;icon_state="stone_deco"} : /obj/structure/platform_decoration/stone/mineral/west{@OLD;dir=@SKIP;layer=@SKIP;icon_state=@SKIP} +/obj/structure/platform/mineral{icon_state="stone_deco"} : /obj/structure/platform_decoration/stone/mineral{@OLD;dir=@SKIP;layer=@SKIP;icon_state=@SKIP} + +/obj/structure/platform/mineral{dir=1} : /obj/structure/platform/stone/mineral/north{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/mineral{dir=4} : /obj/structure/platform/stone/mineral/east{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/mineral{dir=8} : /obj/structure/platform/stone/mineral/west{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/mineral : /obj/structure/platform/stone/mineral{@OLD;dir=@SKIP;layer=@SKIP} + +/obj/structure/platform_decoration/mineral{dir=1} : /obj/structure/platform_decoration/stone/mineral/north{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/mineral{dir=4} : /obj/structure/platform_decoration/stone/mineral/east{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/mineral{dir=8} : /obj/structure/platform_decoration/stone/mineral/west{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/mineral : /obj/structure/platform_decoration/stone/mineral{@OLD;dir=@SKIP;layer=@SKIP} + + +/obj/structure/platform/mineral/sandstone{dir=1;icon_state="sandstone_deco"} : /obj/structure/platform_decoration/stone/sandstone/north{@OLD;dir=@SKIP;layer=@SKIP;icon_state=@SKIP} +/obj/structure/platform/mineral/sandstone{dir=4;icon_state="sandstone_deco"} : /obj/structure/platform_decoration/stone/sandstone/east{@OLD;dir=@SKIP;layer=@SKIP;icon_state=@SKIP} +/obj/structure/platform/mineral/sandstone{dir=8;icon_state="sandstone_deco"} : /obj/structure/platform_decoration/stone/sandstone/west{@OLD;dir=@SKIP;layer=@SKIP;icon_state=@SKIP} +/obj/structure/platform/mineral/sandstone{icon_state="sandstone_deco"} : /obj/structure/platform_decoration/stone/sandstone{@OLD;dir=@SKIP;layer=@SKIP;icon_state=@SKIP} + +/obj/structure/platform/mineral/sandstone{dir=1} : /obj/structure/platform/stone/sandstone/north{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/mineral/sandstone{dir=4} : /obj/structure/platform/stone/sandstone/east{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/mineral/sandstone{dir=8} : /obj/structure/platform/stone/sandstone/west{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/mineral/sandstone : /obj/structure/platform/stone/sandstone{@OLD;dir=@SKIP;layer=@SKIP} + +/obj/structure/platform/mineral/sandstone/runed{dir=1;icon_state="stone_deco"} : /obj/structure/platform_decoration/stone/runed_sandstone/north{@OLD;dir=@SKIP;layer=@SKIP;icon_state=@SKIP} +/obj/structure/platform/mineral/sandstone/runed{dir=4;icon_state="stone_deco"} : /obj/structure/platform_decoration/stone/runed_sandstone/east{@OLD;dir=@SKIP;layer=@SKIP;icon_state=@SKIP} +/obj/structure/platform/mineral/sandstone/runed{dir=8;icon_state="stone_deco"} : /obj/structure/platform_decoration/stone/runed_sandstone/west{@OLD;dir=@SKIP;layer=@SKIP;icon_state=@SKIP} +/obj/structure/platform/mineral/sandstone/runed{icon_state="stone_deco"} : /obj/structure/platform_decoration/stone/runed_sandstone{@OLD;dir=@SKIP;layer=@SKIP;icon_state=@SKIP} + +/obj/structure/platform/mineral/sandstone/runed{dir=1} : /obj/structure/platform/stone/runed_sandstone/north{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/mineral/sandstone/runed{dir=4} : /obj/structure/platform/stone/runed_sandstone/east{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/mineral/sandstone/runed{dir=8} : /obj/structure/platform/stone/runed_sandstone/west{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/mineral/sandstone/runed : /obj/structure/platform/stone/runed_sandstone{@OLD;dir=@SKIP;layer=@SKIP} + + + +/obj/structure/platform_decoration/mineral/sandstone{dir=1} : /obj/structure/platform_decoration/stone/sandstone/north{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/mineral/sandstone{dir=4} : /obj/structure/platform_decoration/stone/sandstone/east{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/mineral/sandstone{dir=8} : /obj/structure/platform_decoration/stone/sandstone/west{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/mineral/sandstone : /obj/structure/platform_decoration/stone/sandstone{@OLD;dir=@SKIP;layer=@SKIP} + +/obj/structure/platform_decoration/mineral/sandstone/runed{dir=1} : /obj/structure/platform_decoration/stone/runed_sandstone/north{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/mineral/sandstone/runed{dir=4} : /obj/structure/platform_decoration/stone/runed_sandstone/east{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/mineral/sandstone/runed{dir=8} : /obj/structure/platform_decoration/stone/runed_sandstone/west{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/mineral/sandstone/runed : /obj/structure/platform_decoration/stone/runed_sandstone{@OLD;dir=@SKIP;layer=@SKIP} + + + +/obj/structure/platform/stair_cut{icon_state="kutjevo_platform_sm_stair_alt"} : /obj/structure/platform/metal/stair_cut/kutjevo_smooth_right{@OLD;layer=@SKIP;icon_state=@SKIP} +/obj/structure/platform/stair_cut/alt{icon_state="kutjevo_platform_sm_stair_alt"} : /obj/structure/platform/metal/stair_cut/kutjevo_smooth_right{@OLD;layer=@SKIP;icon_state=@SKIP} +/obj/structure/platform/stair_cut{icon_state="kutjevo_platform_sm_stair"} : /obj/structure/platform/metal/stair_cut/kutjevo_smooth_left{@OLD;layer=@SKIP;icon_state=@SKIP} + +/obj/structure/platform/stair_cut{icon_state="platform_stair_alt"} : /obj/structure/platform/metal/stair_cut/platform_right{@OLD;layer=@SKIP;icon_state=@SKIP} +/obj/structure/platform/stair_cut/alt{icon_state="platform_stair_alt"} : /obj/structure/platform/metal/stair_cut/platform_right{@OLD;layer=@SKIP;icon_state=@SKIP} +/obj/structure/platform/stair_cut{icon_state="platform_stair"} : /obj/structure/platform/metal/stair_cut/platform_left{@OLD;layer=@SKIP;icon_state=@SKIP} +/obj/structure/platform/stair_cut : /obj/structure/platform/metal/stair_cut/platform_left{@OLD;layer=@SKIP;icon_state=@SKIP} +/obj/structure/platform/stair_cut/alt : /obj/structure/platform/metal/stair_cut/platform_right{@OLD;layer=@SKIP;icon_state=@SKIP} + + + +/obj/structure/platform/hybrisa/engineer{dir=1} : /obj/structure/platform/metal/hybrisa/engineer/north{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/hybrisa/engineer{dir=4} : /obj/structure/platform/metal/hybrisa/engineer/east{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/hybrisa/engineer{dir=8} : /obj/structure/platform/metal/hybrisa/engineer/west{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/hybrisa/engineer : /obj/structure/platform/metal/hybrisa/engineer{@OLD;dir=@SKIP;layer=@SKIP} + +/obj/structure/platform_decoration/hybrisa/engineer_corner{dir=1} : /obj/structure/platform_decoration/metal/hybrisa/engineer_corner/north{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/hybrisa/engineer_corner{dir=4} : /obj/structure/platform_decoration/metal/hybrisa/engineer_corner/east{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/hybrisa/engineer_corner{dir=8} : /obj/structure/platform_decoration/metal/hybrisa/engineer_corner/west{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/hybrisa/engineer_corner : /obj/structure/platform_decoration/metal/hybrisa/engineer_corner{@OLD;dir=@SKIP;layer=@SKIP} + +/obj/structure/platform_decoration/hybrisa/engineer_cornerbits{dir=1} : /obj/structure/platform_decoration/metal/hybrisa/engineer_cornerbits/north{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/hybrisa/engineer_cornerbits{dir=4} : /obj/structure/platform_decoration/metal/hybrisa/engineer_cornerbits/east{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/hybrisa/engineer_cornerbits{dir=8} : /obj/structure/platform_decoration/metal/hybrisa/engineer_cornerbits/west{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/hybrisa/engineer_cornerbits : /obj/structure/platform_decoration/metal/hybrisa/engineer_cornerbits{@OLD;dir=@SKIP;layer=@SKIP} + + +/obj/structure/platform/hybrisa/rockdark{dir=1} : /obj/structure/platform/stone/hybrisa/rockdark/north{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/hybrisa/rockdark{dir=4} : /obj/structure/platform/stone/hybrisa/rockdark/east{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/hybrisa/rockdark{dir=8} : /obj/structure/platform/stone/hybrisa/rockdark/west{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/hybrisa/rockdark : /obj/structure/platform/stone/hybrisa/rockdark{@OLD;dir=@SKIP;layer=@SKIP} + +/obj/structure/platform_decoration/hybrisa/rockdark{dir=1} : /obj/structure/platform_decoration/stone/hybrisa/rockdark/north{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/hybrisa/rockdark{dir=4} : /obj/structure/platform_decoration/stone/hybrisa/rockdark/east{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/hybrisa/rockdark{dir=8} : /obj/structure/platform_decoration/stone/hybrisa/rockdark/west{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/hybrisa/rockdark : /obj/structure/platform_decoration/stone/hybrisa/rockdark{@OLD;dir=@SKIP;layer=@SKIP} + + +/obj/structure/platform/hybrisa/metalplatform1{dir=1} : /obj/structure/platform/metal/hybrisa/metalplatform1/north{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/hybrisa/metalplatform1{dir=4} : /obj/structure/platform/metal/hybrisa/metalplatform1/east{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/hybrisa/metalplatform1{dir=8} : /obj/structure/platform/metal/hybrisa/metalplatform1/west{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/hybrisa/metalplatform1 : /obj/structure/platform/metal/hybrisa/metalplatform1{@OLD;dir=@SKIP;layer=@SKIP} + +/obj/structure/platform_decoration/hybrisa/metalplatformdeco1{dir=1} : /obj/structure/platform_decoration/metal/hybrisa/metalplatformdeco1/north{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/hybrisa/metalplatformdeco1{dir=4} : /obj/structure/platform_decoration/metal/hybrisa/metalplatformdeco1/east{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/hybrisa/metalplatformdeco1{dir=8} : /obj/structure/platform_decoration/metal/hybrisa/metalplatformdeco1/west{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/hybrisa/metalplatformdeco1 : /obj/structure/platform_decoration/metal/hybrisa/metalplatformdeco1{@OLD;dir=@SKIP;layer=@SKIP} + + +/obj/structure/platform/hybrisa/metalplatform2{dir=1} : /obj/structure/platform/metal/hybrisa/metalplatform2/north{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/hybrisa/metalplatform2{dir=4} : /obj/structure/platform/metal/hybrisa/metalplatform2/east{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/hybrisa/metalplatform2{dir=8} : /obj/structure/platform/metal/hybrisa/metalplatform2/west{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/hybrisa/metalplatform2 : /obj/structure/platform/metal/hybrisa/metalplatform2{@OLD;dir=@SKIP;layer=@SKIP} + +/obj/structure/platform_decoration/hybrisa/metalplatformdeco2{dir=1} : /obj/structure/platform_decoration/metal/hybrisa/metalplatformdeco2/north{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/hybrisa/metalplatformdeco2{dir=4} : /obj/structure/platform_decoration/metal/hybrisa/metalplatformdeco2/east{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/hybrisa/metalplatformdeco2{dir=8} : /obj/structure/platform_decoration/metal/hybrisa/metalplatformdeco2/west{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/hybrisa/metalplatformdeco2 : /obj/structure/platform_decoration/metal/hybrisa/metalplatformdeco2{@OLD;dir=@SKIP;layer=@SKIP} + + +/obj/structure/platform/hybrisa/metalplatform3{dir=1} : /obj/structure/platform/metal/hybrisa/metalplatform3/north{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/hybrisa/metalplatform3{dir=4} : /obj/structure/platform/metal/hybrisa/metalplatform3/east{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/hybrisa/metalplatform3{dir=8} : /obj/structure/platform/metal/hybrisa/metalplatform3/west{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/hybrisa/metalplatform3 : /obj/structure/platform/metal/hybrisa/metalplatform3{@OLD;dir=@SKIP;layer=@SKIP} + +/obj/structure/platform_decoration/hybrisa/metalplatformdeco3{dir=1} : /obj/structure/platform_decoration/metal/hybrisa/metalplatformdeco3/north{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/hybrisa/metalplatformdeco3{dir=4} : /obj/structure/platform_decoration/metal/hybrisa/metalplatformdeco3/east{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/hybrisa/metalplatformdeco3{dir=8} : /obj/structure/platform_decoration/metal/hybrisa/metalplatformdeco3/west{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/hybrisa/metalplatformdeco3 : /obj/structure/platform_decoration/metal/hybrisa/metalplatformdeco3{@OLD;dir=@SKIP;layer=@SKIP} + + +/obj/structure/platform/hybrisa/metalplatform4{dir=1} : /obj/structure/platform/metal/hybrisa/metalplatform4/north{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/hybrisa/metalplatform4{dir=4} : /obj/structure/platform/metal/hybrisa/metalplatform4/east{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/hybrisa/metalplatform4{dir=8} : /obj/structure/platform/metal/hybrisa/metalplatform4/west{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/hybrisa/metalplatform4 : /obj/structure/platform/metal/hybrisa/metalplatform4{@OLD;dir=@SKIP;layer=@SKIP} + +/obj/structure/platform_decoration/hybrisa/metalplatformdeco4{dir=1} : /obj/structure/platform_decoration/metal/hybrisa/metalplatformdeco4/north{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/hybrisa/metalplatformdeco4{dir=4} : /obj/structure/platform_decoration/metal/hybrisa/metalplatformdeco4/east{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/hybrisa/metalplatformdeco4{dir=8} : /obj/structure/platform_decoration/metal/hybrisa/metalplatformdeco4/west{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/hybrisa/metalplatformdeco4 : /obj/structure/platform_decoration/metal/hybrisa/metalplatformdeco4{@OLD;dir=@SKIP;layer=@SKIP} + + +/obj/structure/platform/hybrisa/metalplatform5{dir=1} : /obj/structure/platform/metal/hybrisa/metalplatform5/north{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/hybrisa/metalplatform5{dir=4} : /obj/structure/platform/metal/hybrisa/metalplatform5/east{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/hybrisa/metalplatform5{dir=8} : /obj/structure/platform/metal/hybrisa/metalplatform5/west{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/hybrisa/metalplatform5 : /obj/structure/platform/metal/hybrisa/metalplatform5{@OLD;dir=@SKIP;layer=@SKIP} + +/obj/structure/platform_decoration/hybrisa/metalplatformdeco5{dir=1} : /obj/structure/platform_decoration/metal/hybrisa/metalplatformdeco5/north{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/hybrisa/metalplatformdeco5{dir=4} : /obj/structure/platform_decoration/metal/hybrisa/metalplatformdeco5/east{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/hybrisa/metalplatformdeco5{dir=8} : /obj/structure/platform_decoration/metal/hybrisa/metalplatformdeco5/west{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/hybrisa/metalplatformdeco5 : /obj/structure/platform_decoration/metal/hybrisa/metalplatformdeco5{@OLD;dir=@SKIP;layer=@SKIP} + + +/obj/structure/platform/hybrisa/metalplatform6{dir=1} : /obj/structure/platform/metal/hybrisa/metalplatform6/north{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/hybrisa/metalplatform6{dir=4} : /obj/structure/platform/metal/hybrisa/metalplatform6/east{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/hybrisa/metalplatform6{dir=8} : /obj/structure/platform/metal/hybrisa/metalplatform6/west{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/hybrisa/metalplatform6 : /obj/structure/platform/metal/hybrisa/metalplatform6{@OLD;dir=@SKIP;layer=@SKIP} + +/obj/structure/platform_decoration/hybrisa/metalplatformdeco6{dir=1} : /obj/structure/platform_decoration/metal/hybrisa/metalplatformdeco6/north{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/hybrisa/metalplatformdeco6{dir=4} : /obj/structure/platform_decoration/metal/hybrisa/metalplatformdeco6/east{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/hybrisa/metalplatformdeco6{dir=8} : /obj/structure/platform_decoration/metal/hybrisa/metalplatformdeco6/west{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform_decoration/hybrisa/metalplatformdeco6 : /obj/structure/platform_decoration/metal/hybrisa/metalplatformdeco6{@OLD;dir=@SKIP;layer=@SKIP} + +/obj/structure/platform/hybrisa/metalplatformstair1{dir=1} : /obj/structure/platform/metal/stair_cut/hybrisa_metal_left{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/hybrisa/metalplatformstair2{dir=1} : /obj/structure/platform/metal/stair_cut/hybrisa_metal_right{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/hybrisa/metalplatformstair1 : /obj/structure/platform/metal/stair_cut/hybrisa_metal_left{@OLD;dir=@SKIP;layer=@SKIP} +/obj/structure/platform/hybrisa/metalplatformstair2 : /obj/structure/platform/metal/stair_cut/hybrisa_metal_right{@OLD;dir=@SKIP;layer=@SKIP} + + + diff --git a/tools/build/lib/byond.js b/tools/build/lib/byond.js index 2d186e2254c6..55c9f63e5c15 100644 --- a/tools/build/lib/byond.js +++ b/tools/build/lib/byond.js @@ -174,14 +174,18 @@ export const DreamMaker = async (dmeFile, options = {}) => { testOutputFile(`${dmeBaseName}.rsc`); const runWithWarningChecks = async (dmPath, args) => { const execReturn = await Juke.exec(dmPath, args); - const ignoredWarningCodes = options.ignoreWarningCodes ?? []; - const reg = - ignoredWarningCodes.length > 0 - ? new RegExp(`\d+:warning: (?!(${ignoredWarningCodes.join("|")}))`) - : /\d+:warning: /; - if (options.warningsAsErrors && execReturn.combined.match(reg)) { - Juke.logger.error(`Compile warnings treated as errors`); - throw new Juke.ExitCode(2); + if(options.warningsAsErrors){ + const ignoredWarningCodes = options.ignoreWarningCodes ?? []; + if(ignoredWarningCodes.length > 0 ){ + Juke.logger.info('Ignored warning codes:', ignoredWarningCodes.join(', ')); + } + const base_regex = '\\d+:warning( \\([a-z_]*\\))?:' + const with_ignores = `\\d+:warning( \\([a-z_]*\\))?:(?!(${ignoredWarningCodes.map(x => `.*${x}.*$`).join('|')}))` + const reg = ignoredWarningCodes.length > 0 ? new RegExp(with_ignores, "m") : new RegExp(base_regex,"m") + if (options.warningsAsErrors && execReturn.combined.match(reg)) { + Juke.logger.error(`Compile warnings treated as errors`); + throw new Juke.ExitCode(2); + } } return execReturn; }; diff --git a/tools/maplint/source/dmm.py b/tools/maplint/source/dmm.py index 0a1045e1b838..46329f9c3508 100644 --- a/tools/maplint/source/dmm.py +++ b/tools/maplint/source/dmm.py @@ -94,7 +94,12 @@ def parse_pop(self): break elif content_end == "{": while (var_edit := self.parse_var_edit()) is not None: + if var_edit[0] == None and var_edit[1] == None: + break content.var_edits[var_edit[0]] = var_edit[1] + else: + continue # inner loop didn't break + break # inner loop did break indicating a }) elif content_end == ",": continue @@ -106,6 +111,8 @@ def parse_var_edit(self): line = self.next_line() if line == "\t},": return None + if line == "\t})": + return None, None var_edit_match = REGEX_VAR_EDIT.match(line) self.expect(var_edit_match is not None, "Var edits ended too early, expected a newline in between.") @@ -128,6 +135,8 @@ def parse_constant(self, constant): return Filename(constant[1:-1]) elif (list_match := re.match(r'^list\((?P.*)\)$', constant)): return ["NYI: list"] + elif (list_match := re.match(r'^newlist\((?P.*)\)$', constant)): + return ["NYI: newlist"] else: self.raise_error(f"Unknown constant type: {constant}") diff --git a/tools/mapmerge2/dmm.py b/tools/mapmerge2/dmm.py index bc12a39b3556..d44ddaa1a3a8 100644 --- a/tools/mapmerge2/dmm.py +++ b/tools/mapmerge2/dmm.py @@ -11,7 +11,7 @@ Coordinate = namedtuple('Coordinate', ['x', 'y', 'z']) class DMM: - __slots__ = ['key_length', 'size', 'dictionary', 'grid', 'header'] + __slots__ = ['key_length', 'size', 'dictionary', 'grid', 'header', 'lowest_free'] def __init__(self, key_length, size): self.key_length = key_length @@ -19,6 +19,7 @@ def __init__(self, key_length, size): self.dictionary = bidict.bidict() self.grid = {} self.header = None + self.lowest_free = 0 @staticmethod def from_file(fname): @@ -60,10 +61,14 @@ def set_tile(self, coord, tile): def generate_new_key(self): self._ensure_free_keys(1) max_key = max_key_for(self.key_length) - # choose one of the free keys at random - key = random.randint(0, max_key - 1) + # choose one of the free keys + key = self.lowest_free while key in self.dictionary: - key = random.randint(0, max_key - 1) + key = key + 1 + if key >= max_key: + print("The value for lowest_free was invalid!") + key = 0 + self.lowest_free = key return key def overwrite_key(self, key, fixed, bad_keys): @@ -90,6 +95,7 @@ def remove_unused_keys(self, modified_keys = None): unused_keys.remove(key) for key in unused_keys: del self.dictionary[key] + self.lowest_free = 0 def _presave_checks(self): # last-second handling of bogus keys to help prevent and fix broken maps diff --git a/tools/mapmerge2/dmm_test.py b/tools/mapmerge2/dmm_test.py index 02f5383f2abb..306e45fdb7a3 100644 --- a/tools/mapmerge2/dmm_test.py +++ b/tools/mapmerge2/dmm_test.py @@ -1,25 +1,88 @@ import os import sys +import pygit2 + from .dmm import * +from .mapmerge import merge_map + +def green(text): + return "\033[32m" + str(text) + "\033[0m" + +def red(text): + return "\033[31m" + str(text) + "\033[0m" + +def has_tgm_header(fname): + with open(fname, 'r', encoding=ENCODING) as f: + data = f.read(len(TGM_HEADER)) + return data.startswith(TGM_HEADER) +class LintException(Exception): + pass def _self_test(): - # test: can we load every DMM in the tree + repo = pygit2.Repository(pygit2.discover_repository(os.getcwd())) + + # Read the HEAD and ancestor commits + # Assumption: origin on the runner is what we'd normally call upstream + ancestor = repo.merge_base(repo.head.target, repo.revparse_single("refs/remotes/origin/master").id) + ancestor_commit = None + if not ancestor: + print("Unable to determine merge base!") + else: + ancestor_commit = repo[ancestor] + print("Determined ancestor commit SHA to be:", ancestor) + count = 0 + failed = 0 for dirpath, dirnames, filenames in os.walk('.'): if '.git' in dirnames: dirnames.remove('.git') for filename in filenames: if filename.endswith('.dmm'): fullpath = os.path.join(dirpath, filename) + path = fullpath.replace("\\", "/").removeprefix("./") try: - DMM.from_file(fullpath) + # test: can we load every DMM + index_map = DMM.from_file(fullpath) + + # test: is every DMM in TGM format + if not has_tgm_header(fullpath): + raise LintException('Map is not in TGM format! Please run `/tools/mapmerge2/I Forgot To Map Merge.bat`') + + # test: does every DMM convert cleanly + if ancestor_commit: + try: + ancestor_blob = ancestor_commit.tree[path] + except KeyError: + # New map, no entry in ancestor + print("New map? Could not find ancestor version of", path) + merged_map = merge_map(index_map, index_map) # basically only tests unused keys + original_bytes = index_map.to_bytes() + merged_bytes = merged_map.to_bytes() + if original_bytes != merged_bytes: + raise LintException('New map is pending updates! Please run `/tools/mapmerge2/I Forgot To Map Merge.bat`') + else: + # Entry in ancestor, merge the index over it + ancestor_map = DMM.from_bytes(ancestor_blob.read_raw()) + merged_map = merge_map(index_map, ancestor_map) + original_bytes = index_map.to_bytes() + merged_bytes = merged_map.to_bytes() + if original_bytes != merged_bytes: + raise LintException('Map is pending updates! Please run `/tools/mapmerge2/I Forgot To Map Merge.bat`') + except LintException as error: + failed += 1 + print(red(f'Failed on: {path}')) + print(error) except Exception: - print('Failed on:', fullpath) + failed += 1 + print(red(f'Failed on: {path}')) raise count += 1 - print(f"{os.path.relpath(__file__)}: successfully parsed {count} .dmm files") + print(f"{os.path.relpath(__file__)}: {green(f'successfully parsed {count-failed} .dmm files')}") + if failed > 0: + print(f"{os.path.relpath(__file__)}: {red(f'failed to parse {failed} .dmm files')}") + exit(1) def _usage(): diff --git a/tools/mapmerge2/fixup.py b/tools/mapmerge2/fixup.py index 6953e7ab7782..42b83cff44ec 100644 --- a/tools/mapmerge2/fixup.py +++ b/tools/mapmerge2/fixup.py @@ -40,7 +40,7 @@ def insert_into_tree(repo, tree_builder, path, blob_oid): tree_builder.insert(first, inner.write(), pygit2.GIT_FILEMODE_TREE) -def main(repo): +def main(repo : pygit2.Repository): if repo.index.conflicts: print("You need to resolve merge conflicts first.") return 1 @@ -51,54 +51,65 @@ def main(repo): continue if status & STATUS_INDEX: print("You have changes staged for commit. Commit them or unstage them first.") - print("If you are about to commit maps for the first time, run `Run Before Committing.bat`.") + print("If you are about to commit maps for the first time and can't use hooks, run `Run Before Committing.bat`.") return 1 if path.endswith(".dmm") and (status & STATUS_WT): print("You have modified maps. Commit them first.") - print("If you are about to commit maps for the first time, run `Run Before Committing.bat`.") + print("If you are about to commit maps for the first time and can't use hooks, run `Run Before Committing.bat`.") return 1 - # Read the HEAD commit. - head_commit = repo[repo.head.target] - head_files = {} - for path, blob in walk_tree(head_commit.tree): - if path.endswith(".dmm"): - data = blob.read_raw() - if not data.startswith(TGM_HEADER): - head_files[path] = dmm.DMM.from_bytes(data) + # Set up upstream remote if needed + try: + repo.remotes.create("upstream", "https://github.com/cmss13-devs/cmss13.git") + except ValueError: + pass + else: + print("Adding upstream remote...") - if not head_files: - print("All committed maps appear to be in the correct format.") - print("If you are about to commit maps for the first time, run `Run Before Committing.bat`.") + # Read the HEAD and ancestor commits. + head_commit = repo[repo.head.target] + repo.remotes["upstream"].fetch() + ancestor = repo.merge_base(repo.head.target, repo.revparse_single("refs/remotes/upstream/master").id) + if not ancestor: + print("Unable to automatically fix anything because merge base could not be determined.") return 1 + ancestor_commit = repo[ancestor] + print("Determined ancestor commit SHA to be:", ancestor) - # Work backwards to find a base for each map, converting as found. + # Walk the head commit tree and convert as needed converted = {} - if len(head_commit.parents) != 1: - print("Unable to automatically fix anything because HEAD is a merge commit.") - return 1 commit_message_lines = [] - working_commit = head_commit.parents[0] - while len(converted) < len(head_files): - for path in head_files.keys() - converted.keys(): + for path, blob in walk_tree(head_commit.tree): + if path.endswith(".dmm"): + head_data = blob.read_raw() + head_map = dmm.DMM.from_bytes(head_data) + + # test: does every DMM convert cleanly (including TGM conversion) try: - blob = working_commit.tree[path] + ancestor_blob = ancestor_commit.tree[path] except KeyError: - commit_message_lines.append(f"{'new':{ABBREV_LEN}}: {path}") - print(f"Converting new map: {path}") - converted[path] = head_files[path] + # New map, no entry in ancestor + merged_map = merge_map(head_map, head_map) + merged_bytes = merged_map.to_bytes() + if head_data != merged_bytes: + print(f"Updating new map: {path}") + commit_message_lines.append(f"{'new':{ABBREV_LEN}}: {path}") + converted[path] = merged_map else: - data = blob.read_raw() - if data.startswith(TGM_HEADER): - str_id = str(working_commit.id)[:ABBREV_LEN] + # Entry in ancestor + ancestor_map = dmm.DMM.from_bytes(ancestor_blob.read_raw()) + merged_map = merge_map(head_map, ancestor_map) + merged_bytes = merged_map.to_bytes() + if head_data != merged_bytes: + print(f"Updating map: {path}") + str_id = str(ancestor_commit.id)[:ABBREV_LEN] commit_message_lines.append(f"{str_id}: {path}") - print(f"Converting map: {path}") - converted[path] = merge_map(head_files[path], dmm.DMM.from_bytes(data)) - if len(working_commit.parents) != 1: - print("A merge commit was encountered before good versions of these maps were found:") - print("\n".join(f" {x}" for x in head_files.keys() - converted.keys())) - return 1 - working_commit = working_commit.parents[0] + converted[path] = merged_map + + if not converted: + print("All committed maps appear to be okay.") + print("If you are about to commit maps for the first time and can't use hooks, run `Run Before Committing.bat`.") + return 1 # Okay, do the actual work. tree_builder = repo.TreeBuilder(head_commit.tree) @@ -118,7 +129,7 @@ def main(repo): repo.head.name, signature, # author signature, # committer - f'Convert maps to TGM\n\n{joined}\n\nAutomatically commited by: {os.path.relpath(__file__, repo.workdir)}', + f'Fixup maps in TGM format\n\n{joined}\n\nAutomatically commited by: {os.path.relpath(__file__, repo.workdir)}', tree_builder.write(), [head_commit.id], ) diff --git a/tools/mapmerge2/mapmerge.py b/tools/mapmerge2/mapmerge.py index d9cdea24cfb6..43d2696c4be8 100644 --- a/tools/mapmerge2/mapmerge.py +++ b/tools/mapmerge2/mapmerge.py @@ -4,7 +4,7 @@ from . import frontend from .dmm import * -def merge_map(new_map, old_map, delete_unused=False): +def merge_map(new_map, old_map, delete_unused=True, suppress_notices=False): if new_map.key_length != old_map.key_length: print("Warning: Key lengths differ, taking new map") print(f" Old: {old_map.key_length}") @@ -65,8 +65,9 @@ def select_key(assigned): select_key(fresh_key) # step two: delete unused keys - if unused_keys: - #print(f"Notice: Trimming {len(unused_keys)} unused dictionary keys.") + if unused_keys and delete_unused: + if not suppress_notices: + print(f"Notice: Trimming {len(unused_keys)} unused dictionary keys.") for key in unused_keys: del merged.dictionary[key]